livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIRE-1971: Quick warning that disabling cookies/javacript break search, Selo Jacobus

meow-7.2.2
Arrehn 2011-08-25 09:03:24 -04:00
parent d4953e0073
commit 7a288277d7
4 changed files with 40 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
indra/newview/llfloaterpreference.cpp
View File

@ -322,6 +322,8 @@ LLFloaterPreference::LLFloaterPreference(const LLSD& key)
mCommitCallbackRegistrar.add("Pref.BrowseLogPath", boost::bind(&LLFloaterPreference::onClickBrowseChatLogDir, this));
mCommitCallbackRegistrar.add("Pref.ResetCache", boost::bind(&LLFloaterPreference::onClickResetCache, this));
mCommitCallbackRegistrar.add("Pref.ClearCache", boost::bind(&LLFloaterPreference::onClickClearCache, this));
mCommitCallbackRegistrar.add("Pref.Cookies", boost::bind(&LLFloaterPreference::onClickCookies, this));
mCommitCallbackRegistrar.add("Pref.Javascript", boost::bind(&LLFloaterPreference::onClickJavascript, this));
// mCommitCallbackRegistrar.add("Pref.ClickSkin", boost::bind(&LLFloaterPreference::onClickSkin, this,_1, _2));
// mCommitCallbackRegistrar.add("Pref.SelectSkin", boost::bind(&LLFloaterPreference::onSelectSkin, this));
mCommitCallbackRegistrar.add("Pref.VoiceSetKey", boost::bind(&LLFloaterPreference::onClickSetKey, this));
@ -1026,6 +1028,18 @@ void LLFloaterPreference::onClickClearSettings()
LLNotificationsUtil::add("FirestormClearSettingsPrompt",LLSD(), LLSD(), callback_clear_settings);
}
//[FIX JIRA-1971 : SJ] Show an notify when Cookies setting change
void LLFloaterPreference::onClickCookies()
{
LLNotificationsUtil::add("DisableCookiesBreaksSearch");
}
//[FIX JIRA-1971 : SJ] Show an notify when Javascript setting change
void LLFloaterPreference::onClickJavascript()
{
LLNotificationsUtil::add("DisableJavascriptBreaksSearch");
}
/*
void LLFloaterPreference::onClickSkin(LLUICtrl* ctrl, const LLSD& userdata)
{

2
indra/newview/llfloaterpreference.h
View File

@ -133,6 +133,8 @@ public:
void onClickBrowseChatLogDir();
void onClickResetCache();
void onClickClearCache();
void onClickCookies();
void onClickJavascript();
void onClickBrowseSettingsDir();
void onClickSkin(LLUICtrl* ctrl,const LLSD& userdata);
void onSelectSkin();

14
indra/newview/skins/default/xui/en/notifications.xml
View File

@ -972,6 +972,20 @@ Would you like to disable all popups which can be skipped?
Cache will be cleared after restarting [APP_NAME].
</notification>
<notification
icon="alertmodal.tga"
name="DisableCookiesBreaksSearch"
type="alertmodal">
The search function relies on Cookies, disabling Cookies will break Search.
</notification>
<notification
icon="alertmodal.tga"
name="DisableJavascriptBreaksSearch"
type="alertmodal">
The Search function relies on Javascript, disabling Javascript will break Search.
</notification>
<notification
icon="alertmodal.tga"
name="CacheWillBeMoved"

13
indra/newview/skins/default/xui/en/panel_preferences_setup.xml
View File

@ -401,11 +401,14 @@
control_name="CookiesEnabled"
label="Accept cookies"
left_delta="0"
mouse_opaque="true"
mouse_opaque="true"
name="cookies_enabled"
radio_style="false"
width="200"
top_pad="2"/>
top_pad="2">
<check_box.commit_callback
function="Pref.Cookies" />
</check_box>
<check_box
enabled="true"
@ -419,7 +422,11 @@
name="browser_javascript_enabled"
radio_style="false"
width="200"
top_pad="2"/>
top_pad="2">
<check_box.commit_callback
function="Pref.Javascript" />
</check_box>
<check_box
enabled="true"
follows="left|top"