merged in recent changes

7 files changed, 189 insertions, 19 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 0a8beec7de..ba91b0b5d9 100755
--- a/indra/newview/skins/default/xui/en/menu_attachment_other.xml
+++ b/indra/newview/skins/default/xui/en/menu_attachment_other.xml
@@ -112,8 +112,43 @@
          <menu_item_call.on_enable
           function="Object.EnableInspect" />
    </menu_item_call>
+
+   <menu_item_separator />
+    
+      <menu_item_check
+        name="Normal"
+        label="Normal Rendering">
+        <menu_item_check.on_check
+          function="Avatar.CheckImpostorMode"
+          parameter="0" />
+	    <menu_item_check.on_click
+	      function="Avatar.SetImpostorMode"
+	      parameter="0" />
+      </menu_item_check>
+      <menu_item_check
+        name="Always use impostor"
+        label="Always use impostor">
+        <menu_item_check.on_check
+          function="Avatar.CheckImpostorMode"
+          parameter="1" />
+	    <menu_item_check.on_click
+	      function="Avatar.SetImpostorMode"
+	      parameter="1" />
+      </menu_item_check>
+      <menu_item_check
+        name="Never use impostor"
+        label="Never use impostor">
+        <menu_item_check.on_check
+          function="Avatar.CheckImpostorMode"
+          parameter="2" />
+	    <menu_item_check.on_click
+	      function="Avatar.SetImpostorMode"
+	      parameter="2" />
+      </menu_item_check>
+
   <menu_item_separator
-       layout="topleft" />
+       layout="topleft" name="Impostor seperator"/>
+
   <menu_item_call
      enabled="false"
      label="Block Particle Owner"
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 8be2683680..8bd013f14b 100755
--- a/indra/newview/skins/default/xui/en/menu_avatar_other.xml
+++ b/indra/newview/skins/default/xui/en/menu_avatar_other.xml
@@ -39,8 +39,10 @@
       <menu_item_call.on_click
          function="Avatar.InviteToGroup" />
       </menu_item_call>
+    
    <menu_item_separator />
-    <menu_item_call
+   
+     <menu_item_call
      enabled="false"
      label="Block"
      name="Avatar Mute">
@@ -103,8 +105,43 @@
         <menu_item_call.on_enable
          function="EnablePayAvatar" />
     </menu_item_call>
-  <menu_item_separator
-       layout="topleft" />
+
+   <menu_item_separator />
+    
+      <menu_item_check
+        name="Normal"
+        label="Normal Rendering">
+        <menu_item_check.on_check
+          function="Avatar.CheckImpostorMode"
+          parameter="0" />
+	    <menu_item_check.on_click
+	      function="Avatar.SetImpostorMode"
+	      parameter="0" />
+      </menu_item_check>
+      <menu_item_check
+        name="Always use impostor"
+        label="Always use impostor">
+        <menu_item_check.on_check
+          function="Avatar.CheckImpostorMode"
+          parameter="1" />
+	    <menu_item_check.on_click
+	      function="Avatar.SetImpostorMode"
+	      parameter="1" />
+      </menu_item_check>
+      <menu_item_check
+        name="Never use impostor"
+        label="Never use impostor">
+        <menu_item_check.on_check
+          function="Avatar.CheckImpostorMode"
+          parameter="2" />
+	    <menu_item_check.on_click
+	      function="Avatar.SetImpostorMode"
+	      parameter="2" />
+      </menu_item_check>
+
+  <menu_item_separator 
+    layout="topleft"  name="Impostor seperator"/>
+
   <menu_item_call
      enabled="false"
      label="Block Particle Owner"
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index f253ed3e06..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="Home">
+         shortcut="HOME">
           <menu_item_check.on_check
            function="Agent.getFlying" />
           <menu_item_check.on_click
@@ -101,6 +101,15 @@
           <menu_item_check.on_enable
            function="Agent.enableFlying" />
         </menu_item_check>
+        <menu_item_call
+         label="Stop flying"
+         name="Stop flying"
+         shortcut="HOME">
+          <menu_item_call.on_click
+           function="Agent.toggleFlying" />
+          <menu_item_call.on_enable
+           function="Agent.getFlying" />
+        </menu_item_call>	
         <menu_item_check
          label="Always Run"
          name="Always Run"
@@ -2206,6 +2215,16 @@
                  function="ToggleControl"
                  parameter="DebugShowRenderInfo" />
             </menu_item_check>
+            <menu_item_check
+             label="Show Avatar Render Info"
+             name="Show Avatar Render Info">
+                <menu_item_check.on_check
+                 function="CheckControl"
+                 parameter="DebugShowAvatarRenderInfo" />
+                <menu_item_check.on_click
+                 function="ToggleControl"
+                 parameter="DebugShowAvatarRenderInfo" />
+            </menu_item_check>
 			  <menu_item_check
              label="Show Texture Info"
              name="Show Texture Info">
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index ebd2799ebf..69b7fe5a75 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -10109,7 +10109,7 @@ An internal error prevented us from properly updating your viewer.  The L$ balan
    <tag>fail</tag>
 Cannot create large prims that intersect other players.  Please re-try when other players have moved.
   </notification>
-
+  
   <notification
    icon="alertmodal.tga"
    name="PreferenceChatClearLog"
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 3c4d288037..6c485c0595 100755
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -177,10 +177,86 @@
      width="80">
         Ultra
     </text>
+  <slider
+   control_name="RenderAvatarLODFactor"
+   invisiblity_control="ShowAdvancedGraphicsSettings"
+   follows="left|top"
+   height="16"
+   increment="0.125"
+   initial_value="160"
+   label="Avatar detail:"
+   label_width="90"
+   layout="topleft"
+   left="30"
+   name="AvatarMeshDetail2"
+   show_text="false"
+   top="72"
+   width="300">
+    <slider.commit_callback
+     function="Pref.UpdateSliderText"
+     parameter="AvatarMeshDetailText2" />
+  </slider>
+  <text
+   type="string"
+   invisiblity_control="ShowAdvancedGraphicsSettings"
+   length="1"
+   follows="left|top"
+   height="12"
+   layout="topleft"
+   name="AvatarMeshDetailText2"
+   top_delta="0"
+   left_delta="304"
+   width="128">
+    Low
+  </text>
+  <slider
+   control_name="RenderFarClip"
+   invisiblity_control="ShowAdvancedGraphicsSettings"
+   decimal_digits="0"
+   follows="left|top"
+   height="16"
+   increment="8"
+   initial_value="160"
+   label="Draw distance:"
+   label_width="90"
+   layout="topleft"
+   left="30"
+   max_val="512"
+   min_val="64"
+   name="DrawDistance"
+   top="110"
+   width="330" />
+  <text
+   type="string"
+   invisiblity_control="ShowAdvancedGraphicsSettings"
+   length="1"
+   follows="left|top"
+   height="12"
+   layout="topleft"
+   left_delta="330"
+   name="DrawDistanceMeterText2"
+   top_delta="0"
+   width="128">
+    m
+  </text>
+  <check_box
+		 control_name="RenderDeferred"
+     invisiblity_control="ShowAdvancedGraphicsSettings"
+		 height="16"
+		 initial_value="true"
+		 label="Advanced Lighting Model"
+		 layout="topleft"
+		 left="30"
+		 name="UseLightShaders2"
+		 top="148"
+		 width="256">
+    <check_box.commit_callback
+      function="Pref.VertexShaderEnable" />
+  </check_box>
     <panel
-	 visiblity_control="ShowAdvancedGraphicsSettings"
+	   visiblity_control="ShowAdvancedGraphicsSettings"
      border="false"
-	 follows="top|left"
+	   follows="top|left"
      height="300"
      label="CustomGraphics"
      layout="topleft"
@@ -224,13 +300,13 @@
         function="Pref.VertexShaderEnable" />
       </check_box>
     <check_box
-		control_name="RenderLocalLights"
-		height="16"
-		initial_value="true"
-		label="Local Lights"
-		layout="topleft"
-		left_delta="0"
-		name="LocalLights"
+		 control_name="RenderLocalLights"
+		 height="16"
+		 initial_value="true"
+		 label="Local Lights"
+		 layout="topleft"
+		 left_delta="0"
+		 name="LocalLights"
 		 top_pad="1"
 		 width="256" />
 		  <check_box
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 73601ecb9f..1c46cec479 100755
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -410,10 +410,13 @@ Please try logging in again in a minute.</string>
 	<string name="AddAndRemoveJoints">Add and remove joints with other objects</string>
 	<string name="ChangePermissions">Change its permissions</string>
 	<string name="TrackYourCamera">Track your camera</string>
-  <string name="ControlYourCamera">Control your camera</string>
+	<string name="ControlYourCamera">Control your camera</string>
+	<string name="TeleportYourAgent">Teleport you</string>
+	<string name="ManageEstateSilently">Manage your estates silently</string>
+	<string name="ChangeYourDefaultAnimations">Change your default animations</string>
+	
 	<string name="NotConnected">Not Connected</string>
 	<string name="AgentNameSubst">(You)</string> <!-- Substitution for agent name -->
-  <string name="TeleportYourAgent">Teleport you</string>
 	<string name="JoinAnExperience">Join an experience</string> <!-- not used -->
 	<string name="SilentlyManageEstateAccess">Suppress alerts when managing estate access lists</string>
 	<string name="OverrideYourAnimations">Replace your default animations</string>
@@ -644,11 +647,11 @@ Returns the wind velocity at the object position + offset
 	</string>
 	<string name="LSLTipText_llSetStatus" translate="false">
 llSetStatus(integer status, integer value)
-Sets status (STATUS_PHYSICS, STATUS_PHANTOM, STATUS_BLOCK_GRAB, STATUS_ROTATE_X, STATUS_ROTATE_Y, and/or STATUS_ROTATE_Z) to value
+Sets status (STATUS_PHYSICS, STATUS_PHANTOM, STATUS_BLOCK_GRAB, STATUS_BLOCK_GRAB_OBJECT, STATUS_ROTATE_X, STATUS_ROTATE_Y, and/or STATUS_ROTATE_Z) to value
 	</string>
 	<string name="LSLTipText_llGetStatus" translate="false">
 integer llGetStatus(integer status)
-Returns value of status (STATUS_PHYSICS, STATUS_PHANTOM, STATUS_BLOCK_GRAB, STATUS_ROTATE_X, STATUS_ROTATE_Y, and/or STATUS_ROTATE_Z)
+Returns the boolean value of status (STATUS_PHYSICS, STATUS_PHANTOM, STATUS_BLOCK_GRAB, STATUS_BLOCK_GRAB_OBJECT, STATUS_ROTATE_X, STATUS_ROTATE_Y, or STATUS_ROTATE_Z)
 	</string>
 	<string name="LSLTipText_llSetScale" translate="false">
 llSetScale(vector scale)
diff --git a/indra/newview/skins/default/xui/en/widgets/conversation_view_participant.xml b/indra/newview/skins/default/xui/en/widgets/conversation_view_participant.xml
index b83d9122f7..b83d9122f7 100755..100644
--- a/indra/newview/skins/default/xui/en/widgets/conversation_view_participant.xml
+++ b/indra/newview/skins/default/xui/en/widgets/conversation_view_participant.xml