From 089a9ced0dac0acccb4673432863621a4bd19338 Mon Sep 17 00:00:00 2001
From: Jonathan Yap <none@none>
Date: Thu, 3 Nov 2011 08:25:34 -0400
Subject: STORM-1679 Avatar Draw Weight number is always red

---
 doc/contributions.txt | 1 +
 1 file changed, 1 insertion(+)

(limited to 'doc')

diff --git a/doc/contributions.txt b/doc/contributions.txt
index d719f64baf..c6739dd2a1 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -582,6 +582,7 @@ Jonathan Yap
 	STORM-1639
 	STORM-910
 	STORM-1642
+	STORM-1679
 Kadah Coba
 	STORM-1060
 Jondan Lundquist
-- 
cgit v1.3


From bdb27b7e81a722162adb888370e7f429117d41e8 Mon Sep 17 00:00:00 2001
From: Ansariel Hiller <none@none>
Date: Fri, 11 Nov 2011 14:13:56 -0500
Subject: STORM-1685 Wrong named control in floater_world_map.xml Patch
 converted to hg format by Jonathan Yap.

---
 doc/contributions.txt                                    | 2 ++
 indra/newview/skins/default/xui/en/floater_world_map.xml | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'doc')

diff --git a/doc/contributions.txt b/doc/contributions.txt
index 2b39e15e2a..e491df284e 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -170,6 +170,7 @@ Ansariel Hiller
 	STORM-1101
 	VWR-25480
 	VWR-26150
+	STORM-1685
 Aralara Rajal
 Ardy Lay
 	STORM-859
@@ -586,6 +587,7 @@ Jonathan Yap
 	STORM-1222
 	STORM-1659
 	STORM-1674
+	STORM-1685
 Kadah Coba
 	STORM-1060
 Jondan Lundquist
diff --git a/indra/newview/skins/default/xui/en/floater_world_map.xml b/indra/newview/skins/default/xui/en/floater_world_map.xml
index 4314c8a9e2..56d79f62c7 100644
--- a/indra/newview/skins/default/xui/en/floater_world_map.xml
+++ b/indra/newview/skins/default/xui/en/floater_world_map.xml
@@ -468,7 +468,7 @@
      left="3"
      top_pad="7"
      mouse_opaque="true"
-     name="region_icon"
+     name="location_icon"
      width="16" />
     <search_editor
      follows="top|right"
-- 
cgit v1.3


From b901998c6f6642a3ada3193237253a29c8e637d3 Mon Sep 17 00:00:00 2001
From: Tofu Buzzard <no-email>
Date: Mon, 21 Nov 2011 09:20:09 -0500
Subject: Add "Use Region Settings" to World->Sun menu

---
 doc/contributions.txt                              | 1 +
 indra/newview/llviewermenu.cpp                     | 9 ++++++++-
 indra/newview/skins/default/xui/en/menu_viewer.xml | 8 ++++++++
 3 files changed, 17 insertions(+), 1 deletion(-)

(limited to 'doc')

diff --git a/doc/contributions.txt b/doc/contributions.txt
index 2b39e15e2a..2ebbe34073 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -1114,6 +1114,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>
 	    
    
-- 
cgit v1.3