From 36c25f06e38e357716ecd31df58d70b92a3d8e0e Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Thu, 21 Oct 2010 22:13:28 -0500
Subject: Prim alignment tool by Qarl, backported by Jacek.

Qarl has given permission to use this code under the terms
of the GPL v2 + FLOSS exception and/or the LGPL v2.1.
---
 linden/indra/newview/skins/default/xui/en-us/floater_tools.xml | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'linden/indra/newview/skins/default/xui/en-us/floater_tools.xml')

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 3e0a5fa..7438329 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
@@ -79,6 +79,9 @@
 	<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="-15" follows="left|top" font="SansSerifSmall" height="16"
+	     initial_value="false" label="Align" left="4" mouse_opaque="true"
+	     name="radio align" radio_style="true" width="114" />
 	<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"
-- 
cgit v1.1


From 6f81d6f3e0c128480a90b0baa509834c4a88b28e Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Sat, 23 Oct 2010 19:26:37 -0700
Subject: Updated the Align tool's label with info about Pack

---
 linden/indra/newview/skins/default/xui/en-us/floater_tools.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'linden/indra/newview/skins/default/xui/en-us/floater_tools.xml')

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 7438329..d7a2013 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
@@ -80,8 +80,9 @@
 	     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="-15" follows="left|top" font="SansSerifSmall" height="16"
-	     initial_value="false" label="Align" left="4" mouse_opaque="true"
-	     name="radio align" radio_style="true" width="114" />
+	     initial_value="false" label="Align (Shift to Pack)" left="4" mouse_opaque="true"
+	     name="radio align" radio_style="true" width="114"
+       tool_tip="Align aligns all selected prims' edges along an axis, Pack moves all selected prims' edges so they're touching" />
 	<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"
-- 
cgit v1.1