diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index ba5c912e8e..98f2e33932 100755 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -10025,12 +10025,6 @@ class LLWorldEnvSettings : public view_listener_t { LLEnvManagerNew::instance().setUseSkyPreset("Midnight"); } -// [RLVa:KB] - Checked: 2011-09-03 (RLVa-1.4.1a) | Added: RLVa-1.4.1a - else if ("default" == tod) - { - LLEnvManagerNew::instance().setUseRegionSettings(true); - } -// [/RLVa:KB] else { LLEnvManagerNew &envmgr = LLEnvManagerNew::instance(); diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index 6f041cecb4..58791d488e 100755 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -957,13 +957,13 @@ label="Sunrise" name="Sunrise" shortcut="control|shift|U"> - - @@ -977,7 +977,7 @@ - @@ -991,7 +991,7 @@ - @@ -999,13 +999,13 @@ label="Midnight" name="Midnight" shortcut="control|shift|X"> - - @@ -1015,11 +1015,11 @@ name="Revert to Region Default"> + parameter="region" /> -