3 files changed, 22 insertions, 15 deletions

diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_about.xml b/linden/indra/newview/skins/default/xui/en-us/floater_about.xml
index 1ba9c40..ef02bfa 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_about.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_about.xml
@@ -8,16 +8,16 @@
   max_length="65536" mouse_opaque="true" name="credits_editor" width="458"
   word_wrap="true">
   The Imprudence Viewer was rocked hard by:
-  Jacek Antonelli, McCabe Maxsted, and Armin Weatherwax. 
+  Jacek Antonelli, McCabe Maxsted, Armin Weatherwax, Elektra Hesse, and CodeBastard Redgrave. 
   http://imprudenceviewer.org
   
   Imprudence is so awesome thanks to contributions from many generous people:
   
-  For their patches and code contributions, we thank Aimee Trescothick, Aleric Inglewood, Alissa Sabre, Angus Boyd, Asuka Neely, Balp Allen, Carjay McGinnis, Dale Glass, Felix Duesenburg, Geneko Nemeth, Henri Beauchamp, Kitty Barnett, Latif Khalifa, Lilly Zenovka, Mana Janus, Matthew Dowd, Michelle2 Zenovka, Nicholaz Beresford, Paul Churchill, Peter Lameth, Robin Cornelius, Stephen Zenith, Thomas Shikami, Vadim Bigbear, Zi Ree, and Zwagoth Klaar.
+  For their patches and code contributions, we thank Admiral Admiral, Aimee Trescothick, Aleric Inglewood, Alissa Sabre, Archimedies Plutonian, Angus Boyd, Ansariel Hiller, Ardy Lay, Asuka Neely, Balp Allen, Carjay McGinnis, Chalice Yao, Dale Glass, Damian Delacrois, Danny Nolan, Felix Duesenburg, Geneko Nemeth, Henri Beauchamp, Katharine Berry, KirstenLee Cinquetti, Kitty Barnett, Latif Khalifa, Lilly Zenovka, Makomk Makosen, Mana Janus, Matthew Dowd, Michelle2 Zenovka, Mm Alder, Nemurimasu Neiro, Nicholaz Beresford, Patrick Sapinski, Paul Churchill, Peter Lameth, Robin Cornelius, Stephen Zenith, Thickbrick Sleaford, Thomas Shikami, Tom Meta, tx Oh, Vaalith Jinn, Vadim Bigbear, Vex Streeter, Zi Ree, and Zwagoth Klaar.
   
   For their WindLight presets, we thank Ana Lutetia, CodeBastard Redgrave, and Torley Linden.
   
-  Thanks also to the developer(s) of the Emerald Viewer, Hippo Viewer, Cool VL Viewer, and Meerkat Viewer for viewer enhancements we have incorporated, as well as Kitty Barnett for RLVa. Special thanks to the folks at Linden Lab for releasing the viewer source, without which this endeavor would have been impossible.
+  Thanks also to the developer(s) of the Emerald Viewer, Hippo Viewer, Cool VL Viewer, Snowglobe Viewer, Meta7 Viewer, FrozenGlobe Viewer, and Meerkat Viewer for viewer enhancements we have incorporated, as well as Kitty Barnett for RLVa. Special thanks to the folks at Linden Lab for releasing the viewer source, without which this endeavor would have been impossible.
   
   For a complete list of who did what, read the release notes!
   
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_inventory.xml b/linden/indra/newview/skins/default/xui/en-us/menu_inventory.xml
index 78fc75e..1ae7465 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_inventory.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_inventory.xml
@@ -249,13 +249,9 @@
              mouse_opaque="true" name="Detach From Yourself" width="128">
                 <on_click filter="" function="Inventory.DoToSelected" userdata="detach" />
         </menu_item_call>
-        <!-- COMMENTED OUT for DEV-32347 -->
-        <!--
-        <menu_item_call bottom_delta="-18" height="18" label="Restore to Last Position" left="0" mouse_opaque="true"
-             name="Restore to Last Position" width="128">
-                <on_click filter="" function="Inventory.DoToSelected" userdata="restoreToWorld" />
+        <menu_item_call bottom_delta="-18" height="18" label="Edit" left="0" mouse_opaque="true" name="Attachment Edit" width="128">
+                <on_click filter="" function="Inventory.DoToSelected" userdata="edit" />
         </menu_item_call>
-        -->
         <menu_item_call bottom_delta="-18" height="18" label="Wear" left="0" mouse_opaque="true"
              name="Object Wear" width="128">
                 <on_click filter="" function="Inventory.DoToSelected" userdata="attach" />
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml
index 55af056..153a111 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml
@@ -162,8 +162,8 @@
              follows="left|top" font="SansSerifSmall" height="16"
              initial_value="true" label="Custom" left="385" mouse_opaque="true"
              name="CustomSettings" radio_style="false" width="256" />
-        <view_border bevel_style="none" border_thickness="1" bottom="-375" follows="top|left"
-             height="260" left="5" name="GraphicsBorder" width="485" />
+        <view_border bevel_style="none" border_thickness="1" bottom="-415" follows="left|top"
+             height="300" left="5" name="GraphicsBorder" width="485" />
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom="-130" drop_shadow_visible="true" enabled="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="12"
@@ -235,6 +235,17 @@
              follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
              label="Avatar cloth" left_delta="0" mouse_opaque="true" name="AvatarCloth"
              radio_style="false" width="256" />
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+       bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
+       font="SansSerifSmall" h_pad="0" halign="left" height="12" left_delta="0"
+       mouse_opaque="true" name="AvatarCountText" v_pad="0" width="128">
+    Max. non-imposters:
+  </text>
+  <slider bottom_delta="-20" can_edit_text="false" control_name="RenderAvatarMaxVisible"
+       decimal_digits="0" enabled="true" follows="left|top" height="16"
+       increment="1" initial_val="35" label=""
+       label_width="0" left_delta="0" max_val="50" min_val="0" mouse_opaque="true"
+       name="AvatarMaxVisible" show_text="true" width="100" />
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom="-131" drop_shadow_visible="true" enabled="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="12"
@@ -387,13 +398,13 @@
                         High
                 </radio_item>
         </radio_group>
-        <button bottom="-400" enabled="true" font="SansSerif" halign="center" height="20"
+        <button bottom="4" enabled="true" font="SansSerif" halign="center" height="20"
              label="Recommended Settings" left="130" mouse_opaque="true"
-             name="Defaults" scale_image="true" width="170" />
-        <button bottom="-400" enabled="true" font="SansSerif" halign="center" height="20"
+             name="Defaults" scale_image="true" width="170" follows="left|bottom" />
+  <button bottom="4" enabled="true" font="SansSerif" halign="center" height="20"
              label="Hardware Options" label_selected="Hardware Options"
              left="310" mouse_opaque="true" name="GraphicsHardwareButton"
-             scale_image="true" width="170" />
+             scale_image="true" width="170" follows="left|bottom" />
         <string name="resolution_format">
                 [RES_X] x [RES_Y]
         </string>