Automated merge with ssh://hg.lindenlab.com/q/viewer-hotfix

1 files changed, 180 insertions, 0 deletions

diff --git a/indra/newview/skins/default/xui/en/inspect_object.xml b/indra/newview/skins/default/xui/en/inspect_object.xml
new file mode 100644
index 0000000000..00e00b9694
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/inspect_object.xml
@@ -0,0 +1,180 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<!--
+  Not can_close / no title to avoid window chrome
+  Single instance - only have one at a time, recycle it each spawn
+-->
+<floater
+ legacy_header_height="25"
+ bevel_style="in"
+ bg_opaque_image="Inspector_Background"
+ can_close="false"
+ can_minimize="false"
+ height="150"
+ layout="topleft"
+ name="inspect_object"
+ single_instance="true"
+ sound_flags="0"
+ visible="true"
+ width="228">
+  <string name="Creator">By [CREATOR]</string>
+  <string name="CreatorAndOwner">
+by [CREATOR]
+owner [OWNER]
+  </string>
+  <string name="Price">L$[AMOUNT]</string>
+  <string name="PriceFree">Free!</string>
+  <string name="Touch">Touch</string>
+  <string name="Sit">Sit</string>
+  <text
+     follows="all"
+     font="SansSerifLarge"
+     height="16"
+     left="8"
+     name="object_name"
+     text_color="White"
+     top="10"
+     use_ellipses="true"
+     value="Test Object Name That Is Really Long"
+     width="220" />
+  <text
+   follows="all"
+   height="33"
+   left="8"
+   name="object_creator"
+   top_pad="0"
+   use_ellipses="true"
+   width="220">
+    by secondlife:///app/agent/0e346d8b-4433-4d66-a6b0-fd37083abc4c/about
+owner secondlife:///app/agent/0e346d8b-4433-4d66-a6b0-fd37083abc4c/about
+  </text>
+  <!-- *TODO: Replace this icon -->
+  <icon
+  name="price_icon"
+  image_name="Icon_For_Sale"
+  right="-5"
+  width="16"
+  height="16"
+  top="56"
+  follows="left|top"
+  />
+  <text
+   follows="all"
+   font="SansSerifSmall"
+   font.style="BOLD"
+   height="16"
+   halign="right"
+   left="5"
+   name="price_text"
+   text_color="white"
+   top="58"
+   font_shadow="none"
+   width="196">
+L$300,000
+  </text>
+  <text
+   clip_partial="true" 
+   follows="all"
+   font="SansSerifSmall"
+   height="37"
+   left="8"
+   name="object_description"
+   top_pad="0"
+   use_ellipses="true" 
+   width="220"
+   word_wrap="true">
+This is a really long description for an object being as how it is at least 80 characters in length and maybe more like 120 at this point. Who knows, really?
+  </text>
+  <!-- Overlapping buttons for all default actions.  Show "Buy" if
+  for sale, "Sit" if can sit, etc. -->
+   <text
+   follows="all"
+   font="SansSerifSmall"
+   height="13"
+   left_delta="0"
+   name="object_media_url"
+   bottom_pad="2"
+   width="200"
+   max_length = "50"
+   use_ellipses="true">
+   http://www.superdupertest.com
+</text>
+  <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"
+   top_delta="0"
+   width="80" />
+  <button
+   follows="top|left"
+   height="20"
+   label="Sit"
+   left_delta="0"
+   name="sit_btn"
+   top_delta="0"
+   width="80" />
+  <button
+   follows="top|left"
+   height="20"
+   label="Open"
+   left_delta="0"
+   name="open_btn"
+   top_delta="0"
+   width="80" />
+  <icon
+   name="secure_browsing"
+   image_name="Lock"
+   left_delta="80"
+   visible="false"
+   width="18"
+   height="18"
+   top_delta="0"
+   tool_tip="Secure Browsing"
+   follows="left|top" />
+
+ <!--  non-overlapping buttons here -->
+     <button
+     follows="top|left"
+     height="20"
+     label="More"
+     layout="topleft"
+     name="more_info_btn"
+     left_delta="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>