diff options
| author | Jonathan Yap <jhwelch@gmail.com> | 2014-12-01 13:54:32 -0500 |
|---|---|---|
| committer | Jonathan Yap <jhwelch@gmail.com> | 2014-12-01 13:54:32 -0500 |
| commit | e510c786d9b5eea96b9331596c77a79b239de809 (patch) | |
| tree | 7a2387bc8ead1123b4b6171f1d3e2cdedda6bccb | |
| parent | 9ee9ee5028d3d88cd9b96e391801b60c8533ede2 (diff) | |
STORM-2082 Disable preset controls unless logged in
| -rwxr-xr-x | indra/newview/llfloaterpreference.cpp | 10 | ||||
| -rwxr-xr-x | indra/newview/skins/default/xui/en/notifications.xml | 8 | ||||
| -rwxr-xr-x | indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml | 2 |
3 files changed, 15 insertions, 5 deletions
diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp index 2e1e1ba318..521cc59dda 100755 --- a/indra/newview/llfloaterpreference.cpp +++ b/indra/newview/llfloaterpreference.cpp @@ -753,6 +753,16 @@ void LLFloaterPreference::onOpen(const LLSD& key) // when changing languages. LLPresetsManager::getInstance()->savePreset(PRESETS_GRAPHIC, "Default"); } + + bool started = (LLStartUp::getStartupState() == STATE_STARTED); + + LLComboBox* combo = getChild<LLComboBox>("graphic_preset_combo"); + LLButton* save_btn = findChild<LLButton>("PrefSaveButton"); + LLButton* delete_btn = findChild<LLButton>("PrefDeleteButton"); + + combo->setEnabled(started); + save_btn->setEnabled(started); + delete_btn->setEnabled(started); } void LLFloaterPreference::onVertexShaderEnable() diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index e1d2f012d3..1618ea0ec7 100755 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -7658,16 +7658,16 @@ Attachment has been saved. </notification> <notification - icon="alertmodal.tga" + icon="notifytip.tga" name="PresetSaved" - type="alertmodal"> + type="notifytip"> Preset [NAME] has been saved. </notification> <notification - icon="alertmodal.tga" + icon="notifytip.tga" name="PresetDeleted" - type="alertmodal"> + type="notifytip"> Preset [NAME] has been deleted. </notification> diff --git a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml index 2a7560fd2c..32de123895 100755 --- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml @@ -17,7 +17,7 @@ height="16" layout="topleft" left="5" - name="label" + name="presets_text" top="10" width="60"> Presets: |