From bbe49803b67fe660702e638208b2b4c9a79036a3 Mon Sep 17 00:00:00 2001
From: Gigs Taggart
Date: Fri, 19 Sep 2008 20:59:32 -0500
Subject: VWR-2331: Terraform tool variable "strength". Contributing authors:
 Gigs Taggart, Aimee Trescothick, Which Linden.

---
 .../indra/newview/skins/default/xui/en-us/floater_tools.xml   | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

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

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 db176b3..3ae37ea 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
@@ -278,7 +278,16 @@
 			Large
 		</combo_item>
 	</combo_box>
-	<button bottom_delta="-20" follows="left|top" font="SansSerifSmall" halign="center"
+	<volume_slider bottom_delta="-19" follows="left|top" height="16" hidden="false" increment="0.1"
+         initial_val="0.00" left="155" max_val="2.0" min_val="-1.0"
+	     mouse_opaque="true" name="slider force" width="70" />	
+	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom_delta="4" drop_shadow_visible="true" enabled="true" follows="left|top"
+	     font="SansSerifSmall" h_pad="0" halign="left" height="12" hidden="false"
+	     left="118" mouse_opaque="true" name="Force:" v_pad="0" width="128">
+	          Force:
+	</text>    
+	<button bottom_delta="-22" follows="left|top" font="SansSerifSmall" halign="center"
 	     height="16" label="Apply to selection" label_selected="Apply to selection"
 	     left="118" mouse_opaque="true" name="button apply to selection"
 	     scale_image="TRUE" tool_tip="Modify Selected Land" width="134" />
-- 
cgit v1.1


From 997fb0cbf21cc6b2f2ff8c8381de488eafff4c8d Mon Sep 17 00:00:00 2001
From: Aimee Trescothick
Date: Mon, 22 Sep 2008 02:01:57 -0500
Subject: VWR-8430: Usability improvements to the land tools floater.

---
 .../newview/skins/default/xui/en-us/alerts.xml     |  13 ++
 .../skins/default/xui/en-us/floater_tools.xml      | 149 +++++++++++++--------
 2 files changed, 105 insertions(+), 57 deletions(-)

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

diff --git a/linden/indra/newview/skins/default/xui/en-us/alerts.xml b/linden/indra/newview/skins/default/xui/en-us/alerts.xml
index c7ec62f..4bf5ff1 100644
--- a/linden/indra/newview/skins/default/xui/en-us/alerts.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/alerts.xml
@@ -1996,6 +1996,19 @@ Join land?
 			Cancel
 		</option>
 	</alert>
+	<alert name="ShowOwnersHelp">
+		<message name="message">
+			If this box is checked, land parcels will be
+overlaid with a color indicating their status.
+			
+Red: Land owned by others.
+Green: Your land.
+Aqua: Land owned by a group that you are a member of.
+Yellow: For sale.
+Purple: Land in the auction system.
+Grey: Rare public land.
+		</message>
+	</alert>	
 	<alert modal="true" name="ConfirmNotecardSave">
 		<message name="message">
 			This notecard needs to be saved before the item can be copied or viewed. Save notecard?
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 3ae37ea..1817d8c 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
@@ -245,55 +245,65 @@
 
 <!-- Land panel -->
 
-	<check_box bottom="-70" follows="left|top" font="SansSerifSmall" height="16"
+	<check_box bottom="-69" follows="left|top" font="SansSerifSmall" height="16"
 	     initial_value="false" label="Select Land" left="4" mouse_opaque="true"
 	     name="radio select land" radio_style="true" width="114" />
-	<check_box bottom_delta="-14" follows="left|top" font="SansSerifSmall" height="16"
-	     initial_value="false" label="Flatten Land" left="4" mouse_opaque="true"
+	<check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"
+	     initial_value="false" label="Flatten" left="4" mouse_opaque="true"
 	     name="radio flatten" radio_style="true" width="114" />
-	<check_box bottom_delta="-14" follows="left|top" font="SansSerifSmall" height="16"
-	     initial_value="false" label="Raise Land" left="4" mouse_opaque="true"
+	<check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"
+	     initial_value="false" label="Raise" left="4" mouse_opaque="true"
 	     name="radio raise" radio_style="true" width="114" />
-	<check_box bottom_delta="-14" follows="left|top" font="SansSerifSmall" height="16"
-	     initial_value="false" label="Lower Land" left="4" mouse_opaque="true"
+	<check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"
+	     initial_value="false" label="Lower" left="4" mouse_opaque="true"
 	     name="radio lower" radio_style="true" width="114" />
-	<check_box bottom_delta="-14" follows="left|top" font="SansSerifSmall" height="16"
-	     initial_value="false" label="Smooth Land" left="4" mouse_opaque="true"
+	<check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"
+	     initial_value="false" label="Smooth" left="4" mouse_opaque="true"
 	     name="radio smooth" radio_style="true" width="114" />
-	<check_box bottom_delta="-14" follows="left|top" font="SansSerifSmall" height="16"
-	     initial_value="false" label="Roughen Land" left="4" mouse_opaque="true"
+	<check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"
+	     initial_value="false" label="Roughen" left="4" mouse_opaque="true"
 	     name="radio noise" radio_style="true" width="114" />
-	<check_box bottom_delta="-14" follows="left|top" font="SansSerifSmall" height="16"
-	     initial_value="false" label="Revert Land" left="4" mouse_opaque="true"
+	<check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"
+	     initial_value="false" label="Revert" left="4" mouse_opaque="true"
 	     name="radio revert" radio_style="true" width="114" />
-	<combo_box allow_text_entry="false" bottom="-85" follows="left|top" height="18" left="118"
-	     max_chars="20" mouse_opaque="true" name="combobox brush size" width="134">
-		<combo_item name="Small" value="Small">
-			Small
-		</combo_item>
-		<combo_item name="Medium" value="Medium">
-			Medium
-		</combo_item>
-		<combo_item name="Large" value="Large">
-			Large
-		</combo_item>
-	</combo_box>
-	<volume_slider bottom_delta="-19" follows="left|top" height="16" hidden="false" increment="0.1"
-         initial_val="0.00" left="155" max_val="2.0" min_val="-1.0"
-	     mouse_opaque="true" name="slider force" width="70" />	
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom_delta="4" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="12" hidden="false"
-	     left="118" mouse_opaque="true" name="Force:" v_pad="0" width="128">
-	          Force:
-	</text>    
-	<button bottom_delta="-22" follows="left|top" font="SansSerifSmall" halign="center"
-	     height="16" label="Apply to selection" label_selected="Apply to selection"
+
+
+	<button bottom="-74" follows="left|top" font="SansSerifSmall" halign="center"
+	     height="20" label="Apply to selection" label_selected="Apply to selection"
 	     left="118" mouse_opaque="true" name="button apply to selection"
 	     scale_image="TRUE" tool_tip="Modify Selected Land" width="134" />
-	<check_box bottom_delta="-20" control_name="ShowParcelOwners" follows="left|top"
-	     font="SansSerifSmall" height="16" initial_value="false" label="Show Owners"
-	     left="118" mouse_opaque="true" name="checkbox show owners" width="134" />
+
+
+
+	<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:
+	</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">
+	          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"
+	     mouse_opaque="true" name="slider brush size" width="80" />	
+
+
+	<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="Strength:" v_pad="0" width="100">
+	          Strength
+	</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"
@@ -1179,34 +1189,59 @@
 	<panel bottom="-550" follows="left|top" height="384" left="0" mouse_opaque="true"
 	     name="land info panel" width="272">
 		<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-		     bottom="-18" drop_shadow_visible="true" follows="left|top"
-		     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
+		     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>
+		<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+		     bottom_delta="-24" drop_shadow_visible="true" follows="left|top"
+		     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="48"
 		     mouse_opaque="true" name="label_area_price" v_pad="0" width="150">
 			Price: L$[PRICE] for [AREA] sq. m.
 		</text>
 		<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 		     bottom_delta="0" drop_shadow_visible="true" follows="left|top"
-		     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
-		     mouse_opaque="true" name="label_area" v_pad="0" width="128">
+		     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="48"
+		     mouse_opaque="true" name="label_area" v_pad="0" width="150">
 			Area: [AREA] sq. m.
 		</text>
-		<button bottom_delta="-38" follows="left|top" font="SansSerif" halign="center"
-		     height="20" label="Buy Land..." label_selected="Buy Land..." left="76"
-		     mouse_opaque="true" name="button buy land" scale_image="TRUE" width="102" />
 		<button bottom_delta="-24" follows="left|top" font="SansSerif" halign="center"
-		     height="20" label="Abandon Land..." label_selected="Abandon Land..."
-		     left="76" mouse_opaque="true" name="button abandon land" scale_image="TRUE"
-		     width="102" />
+		     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" 
+		     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" />
+		<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_trans" v_pad="0" width="150">
+			Land Transactions
+		</text>
 		<button bottom_delta="-24" follows="left|top" font="SansSerif" halign="center"
-		     height="20" label="Subdivide..." label_selected="Subdivide..." left="76"
-		     mouse_opaque="true" name="button subdivide land" scale_image="TRUE"
-		     width="102" />
+		     height="20" label="Buy Land..." label_selected="Buy Land..." left="48"
+		     mouse_opaque="true" name="button buy 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="76"
-		     mouse_opaque="true" name="button join land" scale_image="TRUE" width="102" />
-		<button bottom_delta="-40" follows="left|top" font="SansSerif" halign="center"
-		     height="20" label="About Land..." label_selected="About Land..." left="76"
-		     mouse_opaque="true" name="button about land" scale_image="TRUE" width="102" />
+		     height="20" label="Abandon Land..." label_selected="Abandon Land..."
+		     left="48" mouse_opaque="true" name="button abandon land" scale_image="TRUE"
+		     width="112" />
 	</panel>
 	<string name="status_rotate">
 		Drag colored bands to rotate object
-- 
cgit v1.1