reverted inspectors to viewer 2 defaults

2 files changed, 119 insertions, 18 deletions

diff --git a/indra/newview/skins/minimal/xui/en/inspect_avatar.xml b/indra/newview/skins/minimal/xui/en/inspect_avatar.xml
index 517d0e647a..853d5f8735 100644
--- a/indra/newview/skins/minimal/xui/en/inspect_avatar.xml
+++ b/indra/newview/skins/minimal/xui/en/inspect_avatar.xml
@@ -49,13 +49,13 @@
     follows="top|left"
     font="SansSerifBigLarge"
     height="21"
-     left="8"
-     name="user_name"
-     top="10"
-     text_color="White"
-     use_ellipses="true"
-     value="Grumpity ProductEngine"
-     width="190" />
+    left="8"
+    name="user_name"
+    top="10"
+    text_color="White"
+    use_ellipses="true"
+    value="Grumpity ProductEngine"
+    width="190" />
    <text
      follows="top|left"
      height="16"
@@ -127,6 +127,53 @@
 <!-- Overlapping buttons for default actions
     llinspectavatar.cpp makes visible the most likely default action 
 -->
+    <button
+     follows="top|left"
+     height="20"
+     label="Add Friend"
+     left="8"
+     top="135"
+     name="add_friend_btn"
+     width="90" />
+    <button
+     follows="top|left"
+     height="20"
+     label="IM"
+     left_delta="0"
+     top_delta="0"
+     name="im_btn"
+     width="80"
+     commit_callback.function="InspectAvatar.IM"/>
+	<button
+     follows="top|left"
+     height="20"
+     label="Profile"
+     layout="topleft"
+     name="view_profile_btn"
+     left_delta="96"
+     top_delta="0"
+     tab_stop="false"
+     width="80" />
+      <!--  gear buttons here -->
+  <menu_button
+     follows="top|left"
+     height="20"
+     layout="topleft"
+     image_overlay="OptionsMenu_Off"
+     menu_filename="menu_inspect_avatar_gear.xml"
+     name="gear_btn"
+     right="-5"
+     top_delta="0"
+     width="35" />
+	<menu_button
+     follows="top|left"
+     height="20"
+     image_overlay="OptionsMenu_Off"
+     menu_filename="menu_inspect_self_gear.xml"
+     name="gear_self_btn"
+     right="-5"
+     top_delta="0"
+     width="35" />
   <panel 
     follows="top|left" 
     top="164" 
diff --git a/indra/newview/skins/minimal/xui/en/inspect_object.xml b/indra/newview/skins/minimal/xui/en/inspect_object.xml
index 32859690b7..8d14c974b4 100644
--- a/indra/newview/skins/minimal/xui/en/inspect_object.xml
+++ b/indra/newview/skins/minimal/xui/en/inspect_object.xml
@@ -76,13 +76,24 @@ L$30,000
   </text>
   <!-- Overlapping buttons for all default actions.  Show "Buy" if
   for sale, "Sit" if can sit, etc. -->
+  <icon
+   name="secure_browsing"
+   image_name="Lock"
+   left="0"
+   visible="false"
+   width="18"
+   height="18"
+   top="103"
+   tool_tip="Secure Browsing"
+   follows="left|top" />
    <text
    follows="all"
    font="SansSerifSmall"
    height="13"
    name="object_media_url"
-   width="220"
-   top_pad="0"
+   width="207"
+   left_pad="2"
+   top_delta="0"
    max_length = "50"
    use_ellipses="true">
    http://www.superdupertest.com
@@ -90,6 +101,30 @@ L$30,000
   <button
    follows="top|left"
    height="20"
+   label="Buy"
+   left="8"
+   name="buy_btn"
+   top="121"
+   width="80" />
+  <button
+   follows="top|left"
+   height="20"
+   label="Pay"
+   left_delta="0"
+   name="pay_btn"
+   top_delta="0"
+   width="80" />
+  <button
+   follows="top|left"
+   height="20"
+   label="Take Copy"
+   left_delta="0"
+   name="take_free_copy_btn"
+   top_delta="0"
+   width="80" />
+  <button
+   follows="top|left"
+   height="20"
    label="Touch"
    left_delta="0"
    name="touch_btn"
@@ -103,14 +138,33 @@ L$30,000
    name="sit_btn"
    top_delta="0"
    width="80" />
-  <icon
-   name="secure_browsing"
-   image_name="Lock"
-   left_delta="80"
-   visible="false"
-   width="18"
-   height="18"
+  <button
+   follows="top|left"
+   height="20"
+   label="Open"
+   left_delta="0"
+   name="open_btn"
    top_delta="0"
-   tool_tip="Secure Browsing"
-   follows="left|top" />
+   width="80" />
+
+ <!--  non-overlapping buttons here -->
+     <button
+     follows="top|left"
+     height="20"
+     label="More"
+     layout="topleft"
+     name="more_info_btn"
+     left_pad="10"
+     top_delta="0"
+     tab_stop="false"
+     width="80" />
+         <menu_button
+     follows="top|left"
+     height="20"
+     image_overlay="OptionsMenu_Off"
+     menu_filename="menu_inspect_object_gear.xml"
+     name="gear_btn"
+     right="-5"
+     top_delta="0"
+     width="35" />
 </floater>