From 5d7be3a4987c603500bbe3733870a378bd9eda92 Mon Sep 17 00:00:00 2001
From: Graham Linden <graham@lindenlab.com>
Date: Mon, 8 Jul 2013 10:46:21 -0700
Subject: NORSPEC-300 stop-gap measure of clamping offsets > 0 until
 server-side fix to store negative values can be released

---
 indra/newview/skins/default/xui/en/panel_tools_texture.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/panel_tools_texture.xml b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
index 5ac2ec2b20..426c0c4915 100644
--- a/indra/newview/skins/default/xui/en/panel_tools_texture.xml
+++ b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
@@ -663,7 +663,7 @@
              label_width="205"
              layout="topleft"
              left="10"
-             min_val="-1"
+             min_val="0"
              name="bumpyOffsetU"
              width="265" />
             <spinner
@@ -674,7 +674,7 @@
              label_width="205"
              layout="topleft"
              left="10"
-             min_val="-1"
+             min_val="0"
              name="bumpyOffsetV"
              width="265" />
             <spinner
@@ -726,7 +726,7 @@
              label_width="205"
              layout="topleft"
              left="10"
-             min_val="-1"
+             min_val="0"
              name="shinyOffsetU"
              width="265" />
             <spinner
@@ -737,7 +737,7 @@
              label_width="205"
              layout="topleft"
              left="10"
-             min_val="-1"
+             min_val="0"
              name="shinyOffsetV"
              width="265" />
             <check_box
-- 
cgit v1.2.3


From 33e70236f0226b2e4ebabccfa28cca04ff01211e Mon Sep 17 00:00:00 2001
From: simon <none@none>
Date: Tue, 17 Sep 2013 17:01:52 -0700
Subject: MAINT-3161 : Clean up avatar muting code and prototype feature

---
 .../skins/default/xui/en/menu_attachment_other.xml | 24 ++++++++++----------
 .../skins/default/xui/en/menu_avatar_other.xml     | 26 +++++++++++-----------
 2 files changed, 25 insertions(+), 25 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/menu_attachment_other.xml b/indra/newview/skins/default/xui/en/menu_attachment_other.xml
index 47fae51fac..ba91b0b5d9 100755
--- a/indra/newview/skins/default/xui/en/menu_attachment_other.xml
+++ b/indra/newview/skins/default/xui/en/menu_attachment_other.xml
@@ -117,37 +117,37 @@
     
       <menu_item_check
         name="Normal"
-        label="Normal">
+        label="Normal Rendering">
         <menu_item_check.on_check
-          function="Avatar.CheckImposterMode"
+          function="Avatar.CheckImpostorMode"
           parameter="0" />
 	    <menu_item_check.on_click
-	      function="Avatar.SetImposterMode"
+	      function="Avatar.SetImpostorMode"
 	      parameter="0" />
       </menu_item_check>
       <menu_item_check
-        name="Always use imposter"
-        label="Always use imposter">
+        name="Always use impostor"
+        label="Always use impostor">
         <menu_item_check.on_check
-          function="Avatar.CheckImposterMode"
+          function="Avatar.CheckImpostorMode"
           parameter="1" />
 	    <menu_item_check.on_click
-	      function="Avatar.SetImposterMode"
+	      function="Avatar.SetImpostorMode"
 	      parameter="1" />
       </menu_item_check>
       <menu_item_check
-        name="Never use imposter"
-        label="Never use imposter">
+        name="Never use impostor"
+        label="Never use impostor">
         <menu_item_check.on_check
-          function="Avatar.CheckImposterMode"
+          function="Avatar.CheckImpostorMode"
           parameter="2" />
 	    <menu_item_check.on_click
-	      function="Avatar.SetImposterMode"
+	      function="Avatar.SetImpostorMode"
 	      parameter="2" />
       </menu_item_check>
 
   <menu_item_separator
-       layout="topleft" />
+       layout="topleft" name="Impostor seperator"/>
 
   <menu_item_call
      enabled="false"
diff --git a/indra/newview/skins/default/xui/en/menu_avatar_other.xml b/indra/newview/skins/default/xui/en/menu_avatar_other.xml
index 935b5b3ea0..8bd013f14b 100755
--- a/indra/newview/skins/default/xui/en/menu_avatar_other.xml
+++ b/indra/newview/skins/default/xui/en/menu_avatar_other.xml
@@ -110,37 +110,37 @@
     
       <menu_item_check
         name="Normal"
-        label="Normal">
+        label="Normal Rendering">
         <menu_item_check.on_check
-          function="Avatar.CheckImposterMode"
+          function="Avatar.CheckImpostorMode"
           parameter="0" />
 	    <menu_item_check.on_click
-	      function="Avatar.SetImposterMode"
+	      function="Avatar.SetImpostorMode"
 	      parameter="0" />
       </menu_item_check>
       <menu_item_check
-        name="Always use imposter"
-        label="Always use imposter">
+        name="Always use impostor"
+        label="Always use impostor">
         <menu_item_check.on_check
-          function="Avatar.CheckImposterMode"
+          function="Avatar.CheckImpostorMode"
           parameter="1" />
 	    <menu_item_check.on_click
-	      function="Avatar.SetImposterMode"
+	      function="Avatar.SetImpostorMode"
 	      parameter="1" />
       </menu_item_check>
       <menu_item_check
-        name="Never use imposter"
-        label="Never use imposter">
+        name="Never use impostor"
+        label="Never use impostor">
         <menu_item_check.on_check
-          function="Avatar.CheckImposterMode"
+          function="Avatar.CheckImpostorMode"
           parameter="2" />
 	    <menu_item_check.on_click
-	      function="Avatar.SetImposterMode"
+	      function="Avatar.SetImpostorMode"
 	      parameter="2" />
       </menu_item_check>
 
-  <menu_item_separator
-       layout="topleft" />
+  <menu_item_separator 
+    layout="topleft"  name="Impostor seperator"/>
 
   <menu_item_call
      enabled="false"
-- 
cgit v1.2.3


From 4c9d9e3878180599c1236dc873aa53b8a880645a Mon Sep 17 00:00:00 2001
From: dmitrykproductengine <none@none>
Date: Wed, 18 Sep 2013 11:14:12 +0300
Subject: MAINT-3152 FIXED [MAINTENANCE RC] Confusing naming of Lighting and
 Shadows/Advanced Lighting Model options in graphics preferences

---
 indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui/en')

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 3c9508bb74..6c485c0595 100755
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -244,7 +244,7 @@
      invisiblity_control="ShowAdvancedGraphicsSettings"
 		 height="16"
 		 initial_value="true"
-		 label="Lighting and Shadows"
+		 label="Advanced Lighting Model"
 		 layout="topleft"
 		 left="30"
 		 name="UseLightShaders2"
-- 
cgit v1.2.3


From 1c2bbf6ccbadfdbfaadb0b750a950e0d6add6fb8 Mon Sep 17 00:00:00 2001
From: dmitrykproductengine <none@none>
Date: Wed, 18 Sep 2013 11:34:25 +0300
Subject: MAINT-3148 FIXED PgUp Key forces fly toggle instead of jump (maint RC
 only)

---
 indra/newview/skins/default/xui/en/menu_viewer.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 60272887c9..2d65052def 100755
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -93,7 +93,7 @@
         <menu_item_check
          label="Fly"
          name="Fly"
-         shortcut="PGUP">
+         shortcut="HOME">
           <menu_item_check.on_check
            function="Agent.getFlying" />
           <menu_item_check.on_click
@@ -104,7 +104,7 @@
         <menu_item_call
          label="Stop flying"
          name="Stop flying"
-         shortcut="PGDN">
+         shortcut="HOME">
           <menu_item_call.on_click
            function="Agent.toggleFlying" />
           <menu_item_call.on_enable
-- 
cgit v1.2.3