Remove warning when disabling cookies - option has been removed

Wed, 14 Feb 2018 22:03:39 +0100

author
Ansariel
date
Wed, 14 Feb 2018 22:03:39 +0100
changeset 55074
0908f0d606f9
parent 55073
05942a2562e7
child 55075
695fc7181284

Remove warning when disabling cookies - option has been removed

indra/newview/llfloaterpreference.cpp file | annotate | diff | revisions
indra/newview/llfloaterpreference.h file | annotate | diff | revisions
indra/newview/skins/default/xui/en/notifications.xml file | annotate | diff | revisions
indra/newview/skins/default/xui/es/notifications.xml file | annotate | diff | revisions
indra/newview/skins/default/xui/ja/notifications.xml file | annotate | diff | revisions
indra/newview/skins/default/xui/pl/notifications.xml file | annotate | diff | revisions
indra/newview/skins/default/xui/ru/notifications.xml file | annotate | diff | revisions
     1.1 --- a/indra/newview/llfloaterpreference.cpp	Wed Feb 14 21:56:53 2018 +0100
     1.2 +++ b/indra/newview/llfloaterpreference.cpp	Wed Feb 14 22:03:39 2018 +0100
     1.3 @@ -560,7 +560,6 @@
     1.4  	mCommitCallbackRegistrar.add("Pref.BrowseCrashLogs",		boost::bind(&LLFloaterPreference::onClickBrowseCrashLogs, this));
     1.5  	mCommitCallbackRegistrar.add("Pref.BrowseSettingsDir",		boost::bind(&LLFloaterPreference::onClickBrowseSettingsDir, this));
     1.6  	mCommitCallbackRegistrar.add("Pref.BrowseLogPath",			boost::bind(&LLFloaterPreference::onClickBrowseChatLogDir, this));
     1.7 -	mCommitCallbackRegistrar.add("Pref.Cookies",	    		boost::bind(&LLFloaterPreference::onClickCookies, this));
     1.8  	mCommitCallbackRegistrar.add("Pref.Javascript",	        	boost::bind(&LLFloaterPreference::onClickJavascript, this));
     1.9  	//[FIX FIRE-2765 : SJ] Making sure Reset button resets works
    1.10  	mCommitCallbackRegistrar.add("Pref.ResetLogPath",			boost::bind(&LLFloaterPreference::onClickResetLogPath, this));
    1.11 @@ -1849,12 +1848,6 @@
    1.12  	}
    1.13  }
    1.14  
    1.15 -//[FIX JIRA-1971 : SJ] Show an notify when Cookies setting change
    1.16 -void LLFloaterPreference::onClickCookies()
    1.17 -{
    1.18 -	LLNotificationsUtil::add("DisableCookiesBreaksSearch");
    1.19 -}
    1.20 -
    1.21  //[FIX JIRA-1971 : SJ] Show an notify when Javascript setting change
    1.22  void LLFloaterPreference::onClickJavascript()
    1.23  {
     2.1 --- a/indra/newview/llfloaterpreference.h	Wed Feb 14 21:56:53 2018 +0100
     2.2 +++ b/indra/newview/llfloaterpreference.h	Wed Feb 14 22:03:39 2018 +0100
     2.3 @@ -184,7 +184,6 @@
     2.4  	void onClickBrowseChatLogDir();
     2.5  	void onClickResetCache();
     2.6  	void onClickClearCache(); // AO: was protected, moved to public
     2.7 -	void onClickCookies();
     2.8  	void onClickJavascript();
     2.9  	void onClickBrowseSettingsDir();
    2.10  	void onClickSkin(LLUICtrl* ctrl,const LLSD& userdata);
     3.1 --- a/indra/newview/skins/default/xui/en/notifications.xml	Wed Feb 14 21:56:53 2018 +0100
     3.2 +++ b/indra/newview/skins/default/xui/en/notifications.xml	Wed Feb 14 22:03:39 2018 +0100
     3.3 @@ -1541,13 +1541,6 @@
     3.4  
     3.5    <notification
     3.6   icon="alertmodal.tga"
     3.7 - name="DisableCookiesBreaksSearch"
     3.8 - type="alertmodal">
     3.9 -If you disable cookies, the search function will not work properly, and you will not be able to use it.
    3.10 -  </notification>
    3.11 -
    3.12 -  <notification
    3.13 - icon="alertmodal.tga"
    3.14   name="DisableJavascriptBreaksSearch"
    3.15   type="alertmodal">
    3.16  If you disable Javascript, the search function will not work properly, and you will not be able to use it.
     4.1 --- a/indra/newview/skins/default/xui/es/notifications.xml	Wed Feb 14 21:56:53 2018 +0100
     4.2 +++ b/indra/newview/skins/default/xui/es/notifications.xml	Wed Feb 14 22:03:39 2018 +0100
     4.3 @@ -542,9 +542,6 @@
     4.4  	<notification name="CacheWillClear">
     4.5  		La caché se limpiará cuando reinicies [APP_NAME].
     4.6  	</notification>
     4.7 -	<notification name="DisableCookiesBreaksSearch">
     4.8 -		Si desactivas las cookies, la función de búsqueda no funcionará correctamente y no podrás usarla.
     4.9 -	</notification>
    4.10  	<notification name="DisableJavascriptBreaksSearch">
    4.11  		Si desactivas Javascript, la función de búsqueda no funcionará correctamente y no podrás usarla.
    4.12  	</notification>
     5.1 --- a/indra/newview/skins/default/xui/ja/notifications.xml	Wed Feb 14 21:56:53 2018 +0100
     5.2 +++ b/indra/newview/skins/default/xui/ja/notifications.xml	Wed Feb 14 22:03:39 2018 +0100
     5.3 @@ -616,9 +616,6 @@
     5.4  	<notification name="CacheWillClear">
     5.5  		[APP_NAME] を再起動後にキャッシュがクリアされます。
     5.6  	</notification>
     5.7 -	<notification name="DisableCookiesBreaksSearch">
     5.8 -		クッキーを無効にすると、検索機能が正しく働かず、検索を使用できなくなります。
     5.9 -	</notification>
    5.10  	<notification name="DisableJavascriptBreaksSearch">
    5.11  		Javascript を無効にすると、検索機能が正しく働かず、検索を使用できなくなります。
    5.12  	</notification>
     6.1 --- a/indra/newview/skins/default/xui/pl/notifications.xml	Wed Feb 14 21:56:53 2018 +0100
     6.2 +++ b/indra/newview/skins/default/xui/pl/notifications.xml	Wed Feb 14 22:03:39 2018 +0100
     6.3 @@ -510,9 +510,6 @@
     6.4  	<notification name="CacheWillClear">
     6.5  		Bufor danych zostanie wyczyszczony po restarcie aplikacji [APP_NAME].
     6.6  	</notification>
     6.7 -	<notification name="DisableCookiesBreaksSearch">
     6.8 -		Jeśli wyłączysz ciasteczka, to wyszukiwarka przestanie działać.
     6.9 -	</notification>
    6.10  	<notification name="DisableJavascriptBreaksSearch">
    6.11  		Jeśli wyłączysz Javascript, to wyszukiwarka przestanie działać.
    6.12  	</notification>
     7.1 --- a/indra/newview/skins/default/xui/ru/notifications.xml	Wed Feb 14 21:56:53 2018 +0100
     7.2 +++ b/indra/newview/skins/default/xui/ru/notifications.xml	Wed Feb 14 22:03:39 2018 +0100
     7.3 @@ -549,9 +549,6 @@
     7.4  	<notification name="CacheWillClear">
     7.5  		Кэш будет очищен после перезапуска [APP_NAME].
     7.6  	</notification>
     7.7 -	<notification name="DisableCookiesBreaksSearch">
     7.8 -		Если вы отключите Cookies, функции поиска не будут работать должным образом и вы не сможете его использовать.
     7.9 -	</notification>
    7.10  	<notification name="DisableJavascriptBreaksSearch">
    7.11  		Если вы отключите Javascript, функции поиска не будут работать должным образом и вы не сможете его использовать.
    7.12  	</notification>

mercurial