Merge downstream code

5 files changed, 32 insertions, 32 deletions

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"
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index cea8c6f593..2ec0910aea 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
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"
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