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

Disable parcel WL prefs when auto env is disabled

Kadah_Coba 2011-09-26 23:14:33 -07:00
parent 124157be4b
commit 04d67e34bd
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
indra/newview/panel_prefs_firestorm.cpp
View File

@ -62,6 +62,10 @@ BOOL PanelPreferenceFirestorm::postBuild()
m_ClientTagsVisibility = getChild<LLComboBox>("ClientTagsVisibility");
refreshTagCombos();
// disable the prefs for features that are disabled by the global auto env being disabled
getChild<LLUICtrl>("UseEnvironmentFromRegionAlways")->setCommitCallback(boost::bind(&PanelPreferenceFirestorm::onUseEnvironmentFromRegionAlways, this));
// init the enable state of the related wl prefs
onUseEnvironmentFromRegionAlways();
return LLPanelPreference::postBuild();
}
@ -175,6 +179,16 @@ void PanelPreferenceFirestorm::onAutoCorrectSettings()
LGGAutoCorrectFloater::showFloater();
}
void PanelPreferenceFirestorm::onUseEnvironmentFromRegionAlways()
{
const bool auto_env = gSavedSettings.getBOOL("UseEnvironmentFromRegionAlways");
getChild<LLUICtrl>("PhoenixWLParcelEnabled")->setEnabled(auto_env);
getChild<LLUICtrl>("PhoenixWLWhitelistFriends")->setEnabled(auto_env);
getChild<LLUICtrl>("PhoenixWLWhitelistGroups")->setEnabled(auto_env);
getChild<LLUICtrl>("PhoenixWLWhitelistAll")->setEnabled(auto_env);
getChild<LLUICtrl>("PhoenixInterpolateParcelWL")->setEnabled(auto_env);
}
void PanelPreferenceFirestorm::refreshTagCombos()

2
indra/newview/panel_prefs_firestorm.h
View File

@ -20,6 +20,8 @@ public:
void onBeamDelete();
void onAutoCorrectSettings();
void onUseEnvironmentFromRegionAlways();
void refreshTagCombos();