Merge

1 files changed, 334 insertions, 323 deletions

diff --git a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
index 8121fbdc48..4b6d4b023b 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
+     follows="all"
 	 height="570"
 	 layout="topleft"
 	 name="item properties"
@@ -45,7 +46,7 @@
 	     top="8"
 	     width="18" />
     <button
-     follows="top|right"
+     follows="top|left"
      height="24"
      image_hover_unselected="BackButton_Over"
      image_pressed="BackButton_Press"
@@ -69,343 +70,353 @@
      value="Item Profile"
      width="275" />
     	    <text
-     follows="top|left"
+     follows="top|left|right"
      height="13"
      layout="topleft"
      left="45"
      name="origin"
      text_color="LtGray_50"
+     use_ellipses="true"
      value="(Inventory)"
-     width="150" />
-	<panel
-         follows="all"
-         height="493"
-         help_topic=""
-         label=""
-         layout="topleft"
-         left="9"
-         name="item_profile"
-         top="45"
-         width="313"
-   background_visible="true"
-   bg_alpha_color="DkGray2">
-	    <text
-		     type="string"
-		     length="1"
-		     follows="left|top"
-		     height="10"
-		     layout="topleft"
-		     left="5"
-		     name="LabelItemNameTitle"
-		     top="10"
-		     width="78">
-	        Name:
-	    </text>
-    	<line_editor
-		     border_style="line"
-		     border_thickness="1"
-	    	 follows="left|top|right"
-		     height="20"
-		     layout="topleft"
-	    	 left_delta="78"
-		     max_length="63"
-		     name="LabelItemName"
-	    	 top_delta="0"
-		     width="225" />
-	    <text
-		     type="string"
-		     length="1"
-	    	 follows="left|top"
-	    	 height="10"
-		     layout="topleft"
-    		 left="5"
-		     name="LabelItemDescTitle"
-    		 top_pad="10"
-	    	 width="78">
-	        Description:
-	    </text>
-	    <line_editor
-		     border_style="line"
-    		 border_thickness="1"
-	    	 follows="left|top|right"
-	    	 height="23"
-		     layout="topleft"
-    		 left_delta="78"
-		     max_length="127"
-    		 name="LabelItemDesc"
-	    	 top_delta="-5"
-	    	 width="225" />
-	    <text
-		     type="string"
-		     length="1"
-		     follows="left|top"
-		     height="23"
-		     layout="topleft"
-    		 left="5"
-		     name="LabelCreatorTitle"
-		  top_pad="10"
-		     width="78">
-	        Creator:
-    	</text>
-	        <avatar_icon
-     follows="top|left"
-     height="20"
-     default_icon_name="Generic_Person"
-     layout="topleft"
-     left_pad="0"
-     top_delta="-6"
-     mouse_opaque="true"
-     width="20" />
-	    <text
-		     type="string"
-     follows="left|right|top"
-     font="SansSerifSmall"
-     height="15"
+     width="275" />
+    <scroll_container
+     color="DkGray2"
+     follows="all"
      layout="topleft"
-     left_pad="5"
-		     name="LabelCreatorName"
+     left="9"
+     name="item_profile_scroll"
+     opaque="true"
+     height="493"
+     width="313"
+     top="45">
+        <panel
+             follows="left|top|right"
+             height="390"
+             help_topic=""
+             label=""
+             layout="topleft"
+             left="0"
+             name="item_profile"
+             top="0"
+             width="295">
+            <text
+                 type="string"
+                 length="1"
+                 follows="left|top"
+                 height="10"
+                 layout="topleft"
+                 left="5"
+                 name="LabelItemNameTitle"
+                 top="10"
+                 width="78">
+                Name:
+            </text>
+            <line_editor
+                 border_style="line"
+                 border_thickness="1"
+                 follows="left|top|right"
+                 height="20"
+                 layout="topleft"
+                 left_delta="78"
+                 max_length="63"
+                 name="LabelItemName"
+                 top_delta="0"
+                 width="210" />
+            <text
+                 type="string"
+                 length="1"
+                 follows="left|top"
+                 height="10"
+                 layout="topleft"
+                 left="5"
+                 name="LabelItemDescTitle"
+                 top_pad="10"
+                 width="78">
+                Description:
+            </text>
+            <line_editor
+                 border_style="line"
+                 border_thickness="1"
+                 follows="left|top|right"
+                 height="23"
+                 layout="topleft"
+                 left_delta="78"
+                 max_length="127"
+                 name="LabelItemDesc"
+                 top_delta="-5"
+                 width="210" />
+            <text
+                 type="string"
+                 length="1"
+                 follows="left|top"
+                 height="23"
+                 layout="topleft"
+                 left="5"
+                 name="LabelCreatorTitle"
+              top_pad="10"
+                 width="78">
+                Creator:
+            </text>
+                <avatar_icon
+         follows="top|left"
+         height="20"
+         default_icon_name="Generic_Person"
+         layout="topleft"
+         left_pad="0"
+         top_delta="-6"
+         mouse_opaque="true"
+         width="20" />
+            <text
+                 type="string"
+         follows="left|right|top"
+         font="SansSerifSmall"
+         height="15"
+         layout="topleft"
+         left_pad="5"
+                 name="LabelCreatorName"
        top_delta="6"
        use_ellipses="true"
        width="180">
-      </text>
-      <button
-      follows="top|right"
-      height="16"
-    image_selected="Inspector_I"
-    image_unselected="Inspector_I"
-      layout="topleft"
-      right="-5"
-      name="BtnCreator"
-      top_delta="-6"
-      width="16" />
-      <text
-      type="string"
-      length="1"
-      follows="left|top"
-      height="23"
-      layout="topleft"
-        left="5"
-      name="LabelOwnerTitle"
-        top_pad="10"
-      width="78">
-        Owner:
-      </text>
-      <avatar_icon
-        follows="top|left"
-        height="20"
-        default_icon_name="Generic_Person"
-        layout="topleft"
-        left_pad="0"
-        top_delta="-6"
-        mouse_opaque="true"
-        width="20" />
-      <text
-      type="string"
-        follows="left|right|top"
-        font="SansSerifSmall"
-        height="15"
-        layout="topleft"
-        left_pad="5"
-      name="LabelOwnerName"
-      top_delta="6"
+          </text>
+          <button
+          follows="top|right"
+          height="16"
+        image_selected="Inspector_I"
+        image_unselected="Inspector_I"
+          layout="topleft"
+          right="-5"
+          name="BtnCreator"
+          top_delta="-6"
+          width="16" />
+          <text
+          type="string"
+          length="1"
+          follows="left|top"
+          height="23"
+          layout="topleft"
+            left="5"
+          name="LabelOwnerTitle"
+            top_pad="10"
+          width="78">
+            Owner:
+          </text>
+          <avatar_icon
+            follows="top|left"
+            height="20"
+            default_icon_name="Generic_Person"
+            layout="topleft"
+            left_pad="0"
+            top_delta="-6"
+            mouse_opaque="true"
+            width="20" />
+          <text
+          type="string"
+            follows="left|right|top"
+            font="SansSerifSmall"
+            height="15"
+            layout="topleft"
+            left_pad="5"
+          name="LabelOwnerName"
+          top_delta="6"
        use_ellipses="true"
 			 width="180">
-      </text>
-	     <button
-			 follows="top|right"
-			 height="16"
-     image_selected="Inspector_I"
-     image_unselected="Inspector_I"
-			 layout="topleft"
-			 right="-5"
-			 name="BtnOwner"
-			 top_delta="-3"
-			 width="16" />
-	     <text
-			 type="string"
-			 length="1"
-			 follows="left|top"
-			 height="23"
-			 layout="topleft"
-    		 left="5"
-			 name="LabelAcquiredTitle"
-top_pad="10"
-			 width="78">
-			Acquired:
-	     </text>
-	     <text
-			 type="string"
-			 length="1"
-			 follows="left|top"
-			 height="23"
-			 layout="topleft"
-			 left_delta="78"
-			 name="LabelAcquiredDate"
-			 top_delta="0"
-			 width="222">
-      </text>
-	 <panel
-         border="false"
-         follows="left|top"
-         layout="topleft"
-         mouse_opaque="false"
-         name="perms_inv"
-         left="0"
-         top_pad="25"
-         height="155"
-         width="313">
-	  <text
-             type="string"
-             length="1"
-             left="10"
-             top_pad="13"
-             text_color="EmphasisColor"
-	     height="15"
+          </text>
+             <button
+                 follows="top|right"
+                 height="16"
+         image_selected="Inspector_I"
+         image_unselected="Inspector_I"
+                 layout="topleft"
+                 right="-5"
+                 name="BtnOwner"
+                 top_delta="-3"
+                 width="16" />
+             <text
+                 type="string"
+                 length="1"
+                 follows="left|top"
+                 height="23"
+                 layout="topleft"
+                 left="5"
+                 name="LabelAcquiredTitle"
+    top_pad="10"
+                 width="78">
+                Acquired:
+             </text>
+             <text
+                 type="string"
+                 length="1"
+                 follows="left|top|right"
+                 height="23"
+                 layout="topleft"
+                 left_delta="78"
+                 name="LabelAcquiredDate"
+                 top_delta="0"
+                 width="210">
+          </text>
+         <panel
+             border="false"
              follows="left|top|right"
              layout="topleft"
-             name="perm_modify"
-             width="200">
-                You can:
+             mouse_opaque="false"
+             name="perms_inv"
+             left="0"
+             top_pad="25"
+             height="155"
+             width="313">
+          <text
+                 type="string"
+                 length="1"
+                 left="10"
+                 top_pad="13"
+                 text_color="EmphasisColor"
+             height="15"
+                 follows="left|top|right"
+                 layout="topleft"
+                 name="perm_modify"
+                 width="200">
+                    You can:
+                </text>
+            <check_box
+                 height="18"
+                 label="Modify"
+                 layout="topleft"
+                 left="20"
+                 name="CheckOwnerModify"
+                 top_pad="0"
+                 width="90" />
+            <check_box
+                 height="18"
+                 label="Copy"
+                 layout="topleft"
+                 left_pad="0"
+                 name="CheckOwnerCopy"
+                 width="90" />
+            <check_box
+                 height="18"
+                 label="Transfer"
+                 layout="topleft"
+                 left_pad="0"
+                 name="CheckOwnerTransfer"
+                 width="106" />
+            <text
+                 type="string"
+                 length="1"
+                 follows="left|top"
+                 height="16"
+                 layout="topleft"
+                 left="10"
+                 name="AnyoneLabel"
+                 top_pad="8"
+                 width="100">
+                Anyone:
             </text>
-	    <check_box
-			 height="18"
-			 label="Modify"
-			 layout="topleft"
-			 left="20"
-			 name="CheckOwnerModify"
-			 top_pad="0"
-			 width="90" />
-	    <check_box
-			 height="18"
-			 label="Copy"
-			 layout="topleft"
-			 left_pad="0"
-			 name="CheckOwnerCopy"
-			 width="90" />
-	    <check_box
-			 height="18"
-			 label="Transfer"
-			 layout="topleft"
-			 left_pad="0"
-			 name="CheckOwnerTransfer"
-			 width="106" />
-	    <text
-			 type="string"
-			 length="1"
-			 follows="left|top"
-			 height="16"
-			 layout="topleft"
-			 left="10"
-			 name="AnyoneLabel"
-			 top_pad="8"
-			 width="100">
-			Anyone:
-	    </text>
-	    <check_box
-			 height="18"
-			 label="Copy"
-			 layout="topleft"
-			 left_pad="0"
-			 name="CheckEveryoneCopy"
-			 top_delta="-2"
-			 width="150" />
-    	<text
-			 type="string"
-			 length="1"
-			 follows="left|top"
-			 height="16"
-			 layout="topleft"
-			 left="10"
-			 name="GroupLabel"
-			 top_pad="8"
-			 width="100">
-			Group:
-    	</text>
-	    <check_box
-			 height="18"
-			 label="Share"
-			 layout="topleft"
-			 left_pad="0"
-			 top_delta="-2"
-			 name="CheckShareWithGroup"
-			 tool_tip="Allow all members of the set group to share your modify permissions for this object. You must Deed to enable role restrictions."
-			 width="150" />
-	    <text
-			 type="string"
-			 length="1"
-			 follows="left|top"
-			 height="16"
-			 layout="topleft"
-			 left="10"
-			 name="NextOwnerLabel"
-			 top_pad="8"
-			 width="200"
-			 word_wrap="true">
-			Next owner:
-	    </text>
-	    <check_box
-			 height="18"
-			 label="Modify"
-			 layout="topleft"
-			 left="20"
-			 top_pad="0"
-			 name="CheckNextOwnerModify"
-			 width="90" />
-	    <check_box
-			 height="18"
-			 label="Copy"
-			 layout="topleft"
-			 left_pad="0"
-			 name="CheckNextOwnerCopy"
-			 width="90" />
-	    <check_box
-			 height="18"
-			 label="Transfer"
-			 layout="topleft"
-			 left_pad="0"
-			 name="CheckNextOwnerTransfer"
-			 tool_tip="Next owner can give away or resell this object"
-			 width="106" />
-	    </panel>
-	<check_box
-			 height="18"
-			 label="For Sale"
-			 layout="topleft"
-			 left="20"
-			 name="CheckPurchase"
-			 top_pad="20"
-			 width="100" />
-		<combo_box
-			 height="23"
-			 left_pad="0"
-			 layout="topleft"
-			 follows="left|top"
-			 name="combobox sale copy"
-			 width="170">
-			<combo_box.item
-			     label="Copy"
-			     name="Copy"
-			     value="Copy" />
-			<combo_box.item
-			     label="Original"
-			     name="Original"
-			     value="Original" />
-	    </combo_box>
-	    <spinner
-			    follows="left|top"
-			    decimal_digits="0"
-			    increment="1"
-			    control_name="Edit Cost"
-			    name="Edit Cost"
-			    label="Price: L$"
-			    label_width="75"
-			    left="120"
-			    width="170"
-			    min_val="0"
-			    height="23"
-			    max_val="999999999"
-			    top_pad="10"/>
-   </panel>
+            <check_box
+                 height="18"
+                 label="Copy"
+                 layout="topleft"
+                 left_pad="0"
+                 name="CheckEveryoneCopy"
+                 top_delta="-2"
+                 width="150" />
+            <text
+                 type="string"
+                 length="1"
+                 follows="left|top"
+                 height="16"
+                 layout="topleft"
+                 left="10"
+                 name="GroupLabel"
+                 top_pad="8"
+                 width="100">
+                Group:
+            </text>
+            <check_box
+                 height="18"
+                 label="Share"
+                 layout="topleft"
+                 left_pad="0"
+                 top_delta="-2"
+                 name="CheckShareWithGroup"
+                 tool_tip="Allow all members of the set group to share your modify permissions for this object. You must Deed to enable role restrictions."
+                 width="150" />
+            <text
+                 type="string"
+                 length="1"
+                 follows="left|top"
+                 height="16"
+                 layout="topleft"
+                 left="10"
+                 name="NextOwnerLabel"
+                 top_pad="8"
+                 width="200"
+                 word_wrap="true">
+                Next owner:
+            </text>
+            <check_box
+                 height="18"
+                 label="Modify"
+                 layout="topleft"
+                 left="20"
+                 top_pad="0"
+                 name="CheckNextOwnerModify"
+                 width="90" />
+            <check_box
+                 height="18"
+                 label="Copy"
+                 layout="topleft"
+                 left_pad="0"
+                 name="CheckNextOwnerCopy"
+                 width="90" />
+            <check_box
+                 height="18"
+                 label="Transfer"
+                 layout="topleft"
+                 left_pad="0"
+                 name="CheckNextOwnerTransfer"
+                 tool_tip="Next owner can give away or resell this object"
+                 width="106" />
+            </panel>
+        <check_box
+                 height="18"
+                 label="For Sale"
+                 layout="topleft"
+                 left="20"
+                 name="CheckPurchase"
+                 top_pad="20"
+                 width="100" />
+            <combo_box
+                 height="23"
+                 left_pad="0"
+                 layout="topleft"
+                 follows="left|top"
+                 name="combobox sale copy"
+                 width="170">
+                <combo_box.item
+                     label="Copy"
+                     name="Copy"
+                     value="Copy" />
+                <combo_box.item
+                     label="Original"
+                     name="Original"
+                     value="Original" />
+            </combo_box>
+            <spinner
+                    follows="left|top"
+                    decimal_digits="0"
+                    increment="1"
+                    control_name="Edit Cost"
+                    name="Edit Cost"
+                    label="Price: L$"
+                    label_width="75"
+                    left="120"
+                    width="170"
+                    min_val="0"
+                    height="23"
+                    max_val="999999999"
+                    top_pad="10"/>
+        </panel>
+    </scroll_container>
     <panel
 		 height="30"
 		 layout="topleft"