From e0450b604383f3a0276097496f1935e1b543ec5e Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Fri, 4 Sep 2009 18:53:30 -0700
Subject: Integrated 1.23's tool floater with link/unlink buttons

---
 .../skins/default/xui/en-us/floater_tools.xml      | 173 +++++++++++----------
 1 file changed, 88 insertions(+), 85 deletions(-)

(limited to 'linden/indra/newview/skins/default')

diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml b/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
index 18d56b4..d9b51b1 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater bottom="-359" can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="false" follows="left|top" height="550" 
+<floater bottom="-374" can_close="true" can_drag_on_left="false" can_minimize="true"
+     can_resize="false" follows="left|top" height="565" 
      left="308" min_height="100" min_width="100" mouse_opaque="true"
      name="toolbox floater" rect_control="ToolboxRect" sound_flags="0" title=""
      short_title="Build" width="272">
@@ -79,20 +79,24 @@
 	<check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"
 	     initial_value="false" label="Select Faces to Texture" left="4" mouse_opaque="true"
 	     name="radio select face" radio_style="true" width="114" />
-  <check_box bottom_delta="-22" control_name="SnapEnabled" follows="left|top"
-	     font="SansSerifSmall" height="16" initial_value="true" label="Use Grid"
-	     left_delta="0" mouse_opaque="true" name="checkbox snap to grid" width="134" />
-  <button bottom_delta="0" follows="left|top" font="SansSerifSmall" halign="center"
-	     height="16" label="Options..." label_selected="Options..." left_delta="75"
-	     mouse_opaque="true" name="Options..." scale_image="TRUE" width="80" />
+	<check_box bottom_delta="-19" control_name="EditLinkedParts" follows="left|top"
+	     font="SansSerifSmall" height="16" initial_value="false"
+	     label="Edit linked parts" left="4" mouse_opaque="true"
+	     name="checkbox edit linked parts" width="114" />
+  <button bottom_delta="-19" follows="left|top" font="SansSerifSmall"
+          halign="center" height="18" label="Link" label_selected="Link"
+          left="10" mouse_opaque="true" name="link_btn" width="68" />
+  <button bottom_delta="0" follows="left|top" font="SansSerifSmall"
+          halign="center" height="18" label="Unlink" label_selected="Unlink"
+          left_delta="75" mouse_opaque="true" name="unlink_btn" width="68" />
   <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom_delta="-20" drop_shadow_visible="true" follows="left|top"
+	     bottom_delta="-18" drop_shadow_visible="true" follows="left|top"
 	     font="SansSerifSmall" h_pad="0" halign="left" height="14" left="6"
 	     mouse_opaque="true" name="text ruler mode" v_pad="0" width="68">
-    Ruler mode:
+    Ruler:
   </text>
-  <combo_box allow_text_entry="false" bottom_delta="-4" follows="left|top" height="20"
-	     left_delta="74" max_chars="20" mouse_opaque="true"
+	<combo_box allow_text_entry="false" bottom_delta="-4" follows="left|top" height="20"
+	     left_delta="40" max_chars="20" mouse_opaque="true"
 	     name="combobox grid mode" width="86">
     <combo_item name="World" value="World">
       World
@@ -112,16 +116,13 @@
 	     font="SansSerifSmall" height="16" initial_value="true"
 	     label="Stretch Textures" left_delta="0" mouse_opaque="true"
 	     name="checkbox stretch textures" width="134" />
-  <check_box bottom_delta="-15" control_name="EditLinkedParts" follows="left|top"
-	     font="SansSerifSmall" height="16" initial_value="false"
-	     label="Edit linked parts" left="143" mouse_opaque="true"
-	     name="checkbox edit linked parts" width="114" />
-  <button bottom_delta="-18" follows="left|top" font="SansSerifSmall"
-          halign="center" height="18" label="Link" label_selected="Link"
-          right="-5" mouse_opaque="true" name="link_btn" width="78" />
-  <button bottom_delta="-20" follows="left|top" font="SansSerifSmall"
-          halign="center" height="18" label="Unlink" label_selected="Unlink"
-          right="-5" mouse_opaque="true" name="unlink_btn" width="78" />
+  <check_box bottom_delta="-19" control_name="SnapEnabled" follows="left|top"
+	     font="SansSerifSmall" height="16" initial_value="true" label="Use Grid"
+	     left_delta="0" mouse_opaque="true" name="checkbox snap to grid" width="134" />
+	<button bottom_delta="-19" follows="left|top" font="SansSerifSmall"
+       halign="center" valign="center"
+	     height="20" label="Options..." label_selected="Options..." left_delta="20"
+	     mouse_opaque="true" name="Options..." scale_image="TRUE" width="80" />
 
 <!-- Help text -->
 
@@ -289,18 +290,18 @@
 	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false"
 	     border_visible="false" bottom_delta="-16" drop_shadow_visible="true" enabled="true"
 	     follows="left|top" font="SansSerifSmall" h_pad="0" halign="left" height="12" left="118"
-	     hidden="false" mouse_opaque="true" name="Brush:" v_pad="0" width="100">
-	          Brush:
+	     hidden="false" mouse_opaque="true" name="Bulldozer:" v_pad="0" width="100">
+	          Bulldozer:
 	</text>
 
 	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false"
 	     border_visible="false" bottom_delta="-18" drop_shadow_visible="true" enabled="true"
 	     follows="left|top" font="SansSerifSmall" h_pad="0" halign="left" height="12" left="132"
-	     hidden="false" mouse_opaque="true" name="Brush Size:" v_pad="0" width="100">
+	     hidden="false" mouse_opaque="true" name="Dozer Size:" v_pad="0" width="100">
 	          Size
 	</text>
 	<volume_slider bottom_delta="-4" follows="left|top" height="16" hidden="false"
-	     increment="1.0" initial_val="0.0" left="178" max_val="2.0" min_val="0.0"
+         increment="0.1" initial_val="2.0" left="178" max_val="11.0" min_val="1.0"
 	     mouse_opaque="true" name="slider brush size" width="80" />	
 
 
@@ -312,21 +313,23 @@
 	</text>
 	<volume_slider bottom_delta="-4" follows="left|top" height="16" hidden="false"
 	     increment="0.1" initial_val="0.00" left="178" max_val="2.0" min_val="-1.0"
-	     mouse_opaque="true" name="slider force" width="80" />	
-
-
-	<button bottom="-163" follows="left|top" font="SansSerifSmall" halign="center"
-	     height="20" label="More &gt;&gt;" left="186" mouse_opaque="true"
-	     name="button more" scale_image="TRUE" tool_tip="Advanced Options"
-	     width="80" />
-	<button bottom_delta="0" follows="left|top" font="SansSerifSmall" halign="center"
-	     height="20" label="&lt;&lt; Less" left_delta="0" mouse_opaque="true"
-	     name="button less" scale_image="TRUE" tool_tip="Advanced Options"
-	     width="80" />
+	     mouse_opaque="true" name="slider force" width="80" />
+  <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+         bottom="-168" left="118" drop_shadow_visible="true" follows="left|top"
+         font="SansSerifSmall" h_pad="0" halign="right" height="16"
+         mouse_opaque="true" name="obj_count" v_pad="0" width="143">
+    Selected objects: [COUNT]
+  </text>
+  <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+       bottom="-181" left="118" drop_shadow_visible="true" follows="left|top"
+       font="SansSerifSmall" h_pad="0" halign="right" height="16"
+       mouse_opaque="true" name="prim_count" v_pad="0" width="143">
+    primitives: [COUNT]
+  </text>
 
 <!-- Sub-tabs -->
 
-	<tab_container bottom="-550" follows="left|top" height="384" left="0" mouse_opaque="false"
+	<tab_container bottom="-565" follows="left|top" height="384" left="0" mouse_opaque="false"
 	     name="Object Info Tabs" tab_max_width="52" tab_min_width="40"
 	     tab_position="top" width="272">
 		<panel border="true" bottom="-383" follows="left|top|right|bottom" height="367"
@@ -364,7 +367,7 @@
 				Thrax Linden
 			</text>
 			<button bottom="-66" follows="top|right" font="SansSerifSmall" halign="center"
-			     height="16" label="Profile..." label_selected="Profile..." left_delta="94"
+			     height="20" label="Profile..." label_selected="Profile..." left_delta="94"
 			     mouse_opaque="true" name="button creator profile" scale_image="TRUE"
 			     width="78" />
 			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
@@ -380,7 +383,7 @@
 				Thrax Linden
 			</text>
 			<button bottom="-86" follows="top|right" font="SansSerifSmall" halign="center"
-			     height="16" label="Profile..." label_selected="Profile..." left_delta="94"
+			     height="20" label="Profile..." label_selected="Profile..." left_delta="94"
 			     mouse_opaque="true" name="button owner profile" scale_image="TRUE"
 			     width="78" />
 			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
@@ -397,15 +400,9 @@
 				The Lindens
 			</text>
 			<button bottom="-106" follows="top|right" font="SansSerifSmall" halign="center"
-			     height="16" label="Set..." label_selected="Set..." left_delta="94"
+			     height="20" label="Set..." label_selected="Set..." left_delta="94"
 			     mouse_opaque="true" name="button set group" scale_image="TRUE" width="78" />
 			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-126" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
-			     mouse_opaque="true" name="prim info" v_pad="0" width="166">
-				1 Object, 1 Primitive
-			</text>
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom_delta="-20" drop_shadow_visible="true" follows="left|top"
 			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
 			     mouse_opaque="true" name="Permissions:" v_pad="0" width="85">
@@ -420,7 +417,7 @@
 			<check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
 			     initial_value="false" label="Share with group" left="10"
 			     mouse_opaque="true" name="checkbox share with group"
-			     tool_tip="Allow group members to move, modify, copy and delete."
+			     tool_tip="Allow all members of the set group to share and use your permissions for this object. You must Deed to enable role restrictions."
 			     width="166" />
 			<string name="text deed continued">
 				Deed...
@@ -429,7 +426,7 @@
 				Deed
 			</string>
 			<button bottom="-186" follows="top|right" font="SansSerifSmall" halign="center"
-			     height="16" label="Deed..." label_selected="Deed..." left_delta="172"
+			     height="20" label="Deed..." label_selected="Deed..." left_delta="172"
 			     mouse_opaque="true" name="button deed" scale_image="TRUE"
 			     tool_tip="Group shared objects can be deeded by a group officer."
 			     width="78" />
@@ -517,37 +514,37 @@
 				</combo_item>
 			</combo_box>
 			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-135" drop_shadow_visible="true" follows="left|top"
+			     bottom="-115" drop_shadow_visible="true" follows="left|top"
 			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="88"
 			     mouse_opaque="true" name="B:" v_pad="0" width="174">
 				B:
 			</text>
 			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-135" drop_shadow_visible="true" follows="left|top"
+			     bottom="-115" drop_shadow_visible="true" follows="left|top"
 			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="50"
 			     mouse_opaque="true" name="O:" v_pad="0" width="124">
 				O;
 			</text>
 			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-135" drop_shadow_visible="true" follows="left|top"
+			     bottom="-115" drop_shadow_visible="true" follows="left|top"
 			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="50"
 			     mouse_opaque="true" name="G:" v_pad="0" width="74">
 				G:
 			</text>
 			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-147" drop_shadow_visible="true" follows="left|top"
+			     bottom="-127" drop_shadow_visible="true" follows="left|top"
 			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="88"
 			     mouse_opaque="true" name="E:" v_pad="0" width="174">
 				E:
 			</text>
 			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-147" drop_shadow_visible="true" follows="left|top"
+			     bottom="-127" drop_shadow_visible="true" follows="left|top"
 			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="50"
 			     mouse_opaque="true" name="N:" v_pad="0" width="124">
 				N:
 			</text>
 			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-147" drop_shadow_visible="true" follows="left|top"
+			     bottom="-127" drop_shadow_visible="true" follows="left|top"
 			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="50"
 			     mouse_opaque="true" name="F:" v_pad="0" width="74">
 				F:
@@ -764,12 +761,12 @@
 				Skew
 			</text>
 			<spinner bottom_delta="-20" decimal_digits="1" follows="left|top" height="16"
-			     increment="5" initial_val="0" left="121" max_val="95" min_val="0" 
-			     mouse_opaque="true" name="Scale 1" width="68" label=" " label_width="10"/>
-      <spinner bottom_delta="0" decimal_digits="2" follows="left|top" height="16"
-			     increment="0.05" initial_val="0" left_delta="73" max_val="0.95" label_width="10"
-			     min_val="-0.95" mouse_opaque="true" name="Skew" width="68" label=" " />
-      <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     increment="5" initial_val="0" left="121" max_val="95" min_val="0"
+			     mouse_opaque="true" name="Scale 1" width="68" />
+			<spinner bottom_delta="0" decimal_digits="2" follows="left|top" height="16"
+			     increment="0.05" initial_val="0" left_delta="73" max_val="0.95"
+			     min_val="-0.95" mouse_opaque="true" name="Skew" width="68" />
+			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom_delta="-15" drop_shadow_visible="true" follows="left|top"
 			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="121"
 			     mouse_opaque="true" name="Hollow Shape" v_pad="0" width="141">
@@ -888,10 +885,10 @@
 			</text>
 			<spinner bottom_delta="-19" decimal_digits="3" follows="left|top" height="16"
 			     increment="0.05" initial_val="0" left="121" max_val="1" min_val="-1"
-			     mouse_opaque="true" name="Radius Offset" width="68" label=" " label_width="10" />
-      <spinner bottom_delta="0" decimal_digits="2" follows="left|top" height="16"
+			     mouse_opaque="true" name="Radius Offset" width="68" />
+			<spinner bottom_delta="0" decimal_digits="2" follows="left|top" height="16"
 			     increment="0.1" initial_val="1" left_delta="73" max_val="4" min_val="1"
-			     mouse_opaque="true" name="Revolutions" width="68" label=" " label_width="10" />
+			     mouse_opaque="true" name="Revolutions" width="68" />
 			<texture_picker allow_no_texture="false" bottom="-211" can_apply_immediately="true"
 			     default_image_name="Default" follows="left|top" height="141"
 			     label="Sculpt Texture" left="121" mouse_opaque="true"
@@ -1192,7 +1189,7 @@
 			     initial_val="1" left="112" max_val="10" min_val="0.1" mouse_opaque="true"
 			     name="rptctrl" width="68" />
 			<button bottom="-256" follows="left|top" font="SansSerifSmall" halign="center"
-			     height="16" label="Apply" label_selected="Apply" left_delta="78"
+			     height="20" label="Apply" label_selected="Apply" left_delta="78"
 			     mouse_opaque="true" name="button apply" scale_image="TRUE" width="75" />
 			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-288" drop_shadow_visible="true" follows="left|top"
@@ -1223,10 +1220,13 @@
 		</panel>
 		<panel border="true" bottom="-383" follows="left|top|right|bottom" height="367"
 		     label="Content" left="1" mouse_opaque="false" name="Contents" width="270">
-			<button bottom="-30" follows="left|top" font="SansSerif" halign="center" height="20"
-			      label="New Script..." label_selected="New Script..."
+      <button bottom="-30" follows="left|top" font="SansSerif" halign="center" height="20"
+			      label="New Script" label_selected="New Script..."
 			     left="10" mouse_opaque="true" name="button new script" scale_image="TRUE"
-			     width="130" />
+			     width="100" />
+      <button bottom_delta="0" left_delta="110" width="100" height="20" follows="left|top"
+            label="Permissions..." name="button permissions" font="SansSerif" halign="center"
+            mouse_opaque="true" scale_image="TRUE" />
 			<panel bottom_delta="-330" follows="left|top" height="325"  left="10"
 			     mouse_opaque="true" name="ContentsInventory" width="252" />
 		</panel>
@@ -1236,22 +1236,10 @@
 
 	<panel bottom="-550" follows="left|top" height="384" left="0" mouse_opaque="true"
 	     name="land info panel" width="272">
+	<!-- Parcel Information -->
 		<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 		     bottom="-40" drop_shadow_visible="true" follows="left|top"
 		     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="40"
-		     mouse_opaque="true" name="label_parcel_modify" v_pad="0" width="150">
-			Modify Parcel
-		</text>
-		<button bottom_delta="-24" follows="left|top" font="SansSerif" halign="center"
-		     height="20" label="Subdivide..." label_selected="Subdivide..." left="48"
-		     mouse_opaque="true" name="button subdivide land" scale_image="TRUE"
-		     width="112" />
-		<button bottom_delta="-24" follows="left|top" font="SansSerif" halign="center"
-		     height="20" label="Join..." label_selected="Join..." left="48"
-		     mouse_opaque="true" name="button join land" scale_image="TRUE" width="112" />
-		<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-		     bottom_delta="-56" drop_shadow_visible="true" follows="left|top"
-		     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="40"
 		     mouse_opaque="true" name="label_parcel_info" v_pad="0" width="150">
 			Parcel Information
 		</text>
@@ -1271,12 +1259,27 @@
 		     height="20" label="About Land..." label_selected="About Land..." left="48"
 		     mouse_opaque="true" name="button about land" scale_image="TRUE" width="112" />
 		<check_box bottom_delta="-24" control_name="ShowParcelOwners" follows="left|top"
-		     tool_tip="Colour parcels according to their status" font="SansSerifSmall"
-		     height="16" initial_value="false" label="Show Status" left="48" 
+		     tool_tip="Colour parcels according to their ownership" font="SansSerifSmall"
+		     height="16" initial_value="false" label="Show owners" left="48" 
 		     mouse_opaque="true" name="checkbox show owners" width="100" />
 			<button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
 			     height="18" label="?" label_selected="?" left_delta="94"
 			     mouse_opaque="true" name="button show owners help" width="18" />
+	<!-- Modify Parcel -->
+		<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+		     bottom_delta="-56" drop_shadow_visible="true" follows="left|top"
+		     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="40"
+		     mouse_opaque="true" name="label_parcel_modify" v_pad="0" width="150">
+			Modify Parcel
+		</text>
+		<button bottom_delta="-24" follows="left|top" font="SansSerif" halign="center"
+		     height="20" label="Subdivide..." label_selected="Subdivide..." left="48"
+		     mouse_opaque="true" name="button subdivide land" scale_image="TRUE"
+		     width="112" />
+		<button bottom_delta="-24" follows="left|top" font="SansSerif" halign="center"
+		     height="20" label="Join..." label_selected="Join..." left="48"
+		     mouse_opaque="true" name="button join land" scale_image="TRUE" width="112" />
+	<!-- Land Transactions -->
 		<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 		     bottom_delta="-56" drop_shadow_visible="true" follows="left|top"
 		     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="40"
@@ -1307,10 +1310,10 @@
 		Click and drag to change view
 	</string>
 	<string name="status_grab">
-		Drag to move objects, Ctrl to lift, Ctrl-Shift to spin
+		Drag to move, Ctrl to lift, Ctrl-Shift to rotate
 	</string>
 	<string name="status_place">
-		Click in the world to create, shift-click to select
+		Click inworld to build
 	</string>
 	<string name="status_selectland">
 		Click and drag to select land
-- 
cgit v1.1