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

STORM-2082 Clicking on Ok/Cancel in Advanced floater only closes it now

master
Jonathan Yap 2015-02-23 19:09:56 -05:00
parent 72f832ba8d
commit b011afaa81
3 changed files with 30 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
indra/newview/llfloaterpreference.cpp
View File

@ -333,8 +333,8 @@ LLFloaterPreference::LLFloaterPreference(const LLSD& key)
registered_dialog = true;
}
mCommitCallbackRegistrar.add("Pref.Cancel", boost::bind(&LLFloaterPreference::onBtnCancel, this));
mCommitCallbackRegistrar.add("Pref.OK", boost::bind(&LLFloaterPreference::onBtnOK, this));
mCommitCallbackRegistrar.add("Pref.Cancel", boost::bind(&LLFloaterPreference::onBtnCancel, this, _2));
mCommitCallbackRegistrar.add("Pref.OK", boost::bind(&LLFloaterPreference::onBtnOK, this, _2));
mCommitCallbackRegistrar.add("Pref.ClearCache", boost::bind(&LLFloaterPreference::onClickClearCache, this));
mCommitCallbackRegistrar.add("Pref.WebClearCache", boost::bind(&LLFloaterPreference::onClickBrowserClearCache, this));
@ -877,7 +877,7 @@ void LLFloaterPreference::onClose(bool app_quitting)
}
// static
void LLFloaterPreference::onBtnOK()
void LLFloaterPreference::onBtnOK(const LLSD& userdata)
{
// commit any outstanding text entry
if (hasFocus())
@ -893,7 +893,15 @@ void LLFloaterPreference::onBtnOK()
{
saveSettings();
apply();
closeFloater(false);
if (userdata.asString() == "closeadvanced")
{
LLFloaterReg::hideInstance("prefs_graphics_advanced");
}
else
{
closeFloater(false);
}
//Conversation transcript and log path changed so reload conversations based on new location
if(mPriorInstantMessageLogPath.length())
@ -938,7 +946,7 @@ void LLFloaterPreference::onBtnOK()
}
// static
void LLFloaterPreference::onBtnCancel()
void LLFloaterPreference::onBtnCancel(const LLSD& userdata)
{
if (hasFocus())
{
@ -950,7 +958,15 @@ void LLFloaterPreference::onBtnCancel()
refresh();
}
cancel();
closeFloater();
if (userdata.asString() == "closeadvanced")
{
LLFloaterReg::hideInstance("prefs_graphics_advanced");
}
else
{
closeFloater();
}
}
// static
@ -1545,8 +1561,8 @@ void LLFloaterPreferenceGraphicsAdvanced::refresh()
updateSliderText(getChild<LLSliderCtrl>("SkyMeshDetail", true), getChild<LLTextBox>("SkyMeshDetailText", true));
updateSliderText(getChild<LLSliderCtrl>("TerrainDetail", true), getChild<LLTextBox>("TerrainDetailText", true));
setIndirectControls();
setMaxNonImpostorsText(gSavedSettings.getU32("RenderAvatarMaxNonImpostors"),getChild<LLTextBox>("IndirectMaxNonImpostorsText", true));
setMaxComplexityText(gSavedSettings.getU32("RenderAvatarMaxComplexity"),getChild<LLTextBox>("IndirectMaxComplexityText", true));
setMaxNonImpostorsText(gSavedSettings.getU32("RenderAvatarMaxNonImpostors"),getChild<LLTextBox>("IndirectMaxNonImpostorsText", true));
setMaxComplexityText(gSavedSettings.getU32("RenderAvatarMaxComplexity"),getChild<LLTextBox>("IndirectMaxComplexityText", true));
refreshEnabledState();
}

4
indra/newview/llfloaterpreference.h
View File

@ -95,8 +95,8 @@ public:
void getControlNames(std::vector<std::string>& names);
protected:
void onBtnOK();
void onBtnCancel();
void onBtnOK(const LLSD& userdata);
void onBtnCancel(const LLSD& userdata);
void onClickClearCache(); // Clear viewer texture cache, vfs, and VO cache on next startup
void onClickBrowserClearCache(); // Clear web history and caches as well as viewer caches above

6
indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
View File

@ -870,7 +870,8 @@
top_delta="0"
width="80">
<button.commit_callback
function="Pref.OK" />
function="Pref.OK"
parameter="closeadvanced" />
</button>
<button
@ -884,7 +885,8 @@
top_delta="0"
width="80" >
<button.commit_callback
function="Pref.Cancel" />
function="Pref.Cancel"
parameter="closeadvanced" />
</button>
</floater>