diff options
5 files changed, 12 insertions, 10 deletions
diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp index 5938566b0a..17c93d792e 100755 --- a/indra/newview/llfloaterpreference.cpp +++ b/indra/newview/llfloaterpreference.cpp @@ -778,6 +778,8 @@ void LLFloaterPreference::setHardwareDefaults() { LLFeatureManager::getInstance()->applyRecommendedSettings(); refreshEnabledGraphics(); + gSavedSettings.setString("PresetGraphicActive", ""); + LLPresetsManager::getInstance()->triggerChangeSignal(); LLTabContainer* tabcontainer = getChild<LLTabContainer>("pref core"); child_list_t::const_iterator iter = tabcontainer->getChildList()->begin(); diff --git a/indra/newview/skins/default/xui/en/floater_delete_pref_preset.xml b/indra/newview/skins/default/xui/en/floater_delete_pref_preset.xml index bdb6481b52..cc3f9c5842 100644 --- a/indra/newview/skins/default/xui/en/floater_delete_pref_preset.xml +++ b/indra/newview/skins/default/xui/en/floater_delete_pref_preset.xml @@ -2,7 +2,7 @@ <floater legacy_header_height="18" height="130" - help_topic="floater_delete_pref" + help_topic="floater_delete_preset" layout="topleft" name="Delete Pref Preset" save_rect="true" diff --git a/indra/newview/skins/default/xui/en/floater_load_pref_preset.xml b/indra/newview/skins/default/xui/en/floater_load_pref_preset.xml index 72feeeef74..fbca7bbe37 100644 --- a/indra/newview/skins/default/xui/en/floater_load_pref_preset.xml +++ b/indra/newview/skins/default/xui/en/floater_load_pref_preset.xml @@ -2,7 +2,7 @@ <floater legacy_header_height="18" height="130" - help_topic="floater_load_pref" + help_topic="floater_load_preset" layout="topleft" name="Load Pref Preset" save_rect="true" diff --git a/indra/newview/skins/default/xui/en/floater_save_pref_preset.xml b/indra/newview/skins/default/xui/en/floater_save_pref_preset.xml index 945ed4d28d..0180d2f821 100644 --- a/indra/newview/skins/default/xui/en/floater_save_pref_preset.xml +++ b/indra/newview/skins/default/xui/en/floater_save_pref_preset.xml @@ -2,7 +2,7 @@ <floater legacy_header_height="18" height="130" - help_topic="floater_save_pref" + help_topic="floater_save_preset" layout="topleft" name="Save Pref Preset" save_rect="true" 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 ae44d03cb3..13e0593221 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" - top="10" + top="5" width="100"> Preset in use: </text> @@ -29,7 +29,7 @@ layout="topleft" left_delta="110" name="preset_text" - top="10" + top="5" width="120"> (None) </text> @@ -70,7 +70,7 @@ layout="topleft" left="10" name="QualitySpeed" - top_delta="30" + top_delta="35" width="400"> Quality & speed: </text> @@ -236,7 +236,7 @@ <tab_container follows="left|top" layout="topleft" - height="390" + height="385" halign="center" left="0" name="PreferencesGraphicsTabs" @@ -244,7 +244,7 @@ tab_min_width="40" tab_position="top" tab_height="25" - top="80" + top="85" width="517"> <!-- This block shows Basic Settings --> @@ -344,7 +344,7 @@ <scroll_container follows="top|left" - height="260" + height="255" label="CustomGraphics" layout="topleft" left="5" @@ -1218,7 +1218,7 @@ layout="topleft" left="10" name="PrefSaveButton" - top="300" + top="295" width="250"> <button.commit_callback function="Pref.PrefSave" |