diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-11-21 09:20:49 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-11-21 09:20:49 -0500 |
| commit | e93b5b0d22f49145e92f2901aefa1132ebf9b054 (patch) | |
| tree | 81b68613c101bee4374a350a5e0b08b682b8299a | |
| parent | df3e044426e5f85c3e48115e71ac7445ef05b428 (diff) | |
| parent | b901998c6f6642a3ada3193237253a29c8e637d3 (diff) | |
merge changes for storm-1684
| -rw-r--r-- | doc/contributions.txt | 1 | ||||
| -rw-r--r-- | indra/newview/llviewermenu.cpp | 9 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/menu_viewer.xml | 8 |
3 files changed, 17 insertions, 1 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index 171b791a61..8d30c21f90 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -1117,6 +1117,7 @@ Tofu Buzzard CTS-411 STORM-546 VWR-24509 + STORM-1684 Tony Kembia Torben Trautman TouchaHoney Perhaps diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 22d95563d8..6d45e48d23 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -7701,7 +7701,14 @@ class LLWorldEnvSettings : public view_listener_t } else { - LLEnvManagerNew::instance().setUseDayCycle(LLEnvManagerNew::instance().getDayCycleName()); + LLEnvManagerNew &envmgr = LLEnvManagerNew::instance(); + // reset all environmental settings to track the region defaults, make this reset 'sticky' like the other sun settings. + bool use_fixed_sky = false; + bool use_region_settings = true; + envmgr.setUserPrefs(envmgr.getWaterPresetName(), + envmgr.getSkyPresetName(), + envmgr.getDayCycleName(), + use_fixed_sky, use_region_settings); } return true; diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index 263d961be1..575e3673c6 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -533,6 +533,14 @@ function="World.EnvSettings" parameter="midnight" /> </menu_item_call> + <menu_item_separator/> + <menu_item_call + label="Use Region Settings" + name="Use Region Settings"> + <menu_item_call.on_click + function="World.EnvSettings" + parameter="region" /> + </menu_item_call> </menu> |