From b2b670d787eaa1789b87a62178c970dfb20c02d2 Mon Sep 17 00:00:00 2001
From: Thickbrick Sleaford <thickbrick.sleaford@gmail.com>
Date: Sat, 21 Aug 2010 01:41:27 +0300
Subject: VWR-20752 (SNOW-586) Align planar-mapped textures across different
 faces. Port of svn changset 3458 from Snowglobe, with minor tweaks.

---
 .../newview/skins/default/xui/en/floater_tools.xml | 26 ++++++++++++++++------
 1 file changed, 19 insertions(+), 7 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index a96dbe3553..86fc1c004f 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -2404,7 +2404,7 @@ even though the user gets a free copy.
              layout="topleft"
              name="label shininess"
              left_pad="4"
-             top_pad="-36"
+             top_pad="-37"
              width="90">
                 Shininess
             </text>
@@ -2440,7 +2440,7 @@ even though the user gets a free copy.
              layout="topleft"
              left_pad="4"
              name="label bumpiness"
-             top_pad="-36"
+             top_pad="-37"
              width="90">
                 Bumpiness
             </text>
@@ -2558,6 +2558,17 @@ even though the user gets a free copy.
              top_delta="-4"
              width="120" />
 -->
+            <check_box
+             follows="top|left"
+             height="16"
+             initial_value="false"
+             label="Align planar faces"
+             layout="topleft"
+             left="17"
+             name="checkbox planar align"
+             tool_tip="Align textures on all selected faces with the last selected face. Requires Planar texture mapping."
+             top_delta="26"
+             width="140" />
             <text
              type="string"
              length="1"
@@ -2566,8 +2577,8 @@ even though the user gets a free copy.
              layout="topleft"
              left="10"
              name="tex scale"
-             top_pad="4"
-             width="200">
+             top_pad="2"
+             width="140">
                 Repeats / Face
             </text>
             <spinner
@@ -2580,7 +2591,7 @@ even though the user gets a free copy.
              left="20"
              max_val="100"
              name="TexScaleU"
-             top_pad="6"
+             top_pad="5"
              width="185" />
             <check_box
              height="19"
@@ -2689,7 +2700,7 @@ even though the user gets a free copy.
          bg_alpha_color="DkGray"
          name="Add_Media"
          left="0"
-         height="63"
+         height="47"
          width="290">
             <text
              type="string"
@@ -2775,8 +2786,9 @@ even though the user gets a free copy.
 			 label="Align"
 			 label_selected="Align Media"
 			 layout="topleft"
-			 right="-10"
+			 right="-16"
 			 name="button align"
+			 top_delta="-4"
 			 tool_tip="Align media texture (must load first)"
 			 width="80" />
 		</panel>
-- 
cgit v1.2.3


From 5361e6826f186783c95e01804cec97be37910bec Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Wed, 25 Aug 2010 10:58:49 -0700
Subject: VWR-20710 : Sit anywhere, port of SG2.x SNOW-610 patch

---
 indra/newview/skins/default/xui/en/menu_attachment_self.xml | 13 ++++++++++++-
 indra/newview/skins/default/xui/en/menu_avatar_self.xml     | 12 +++++++++++-
 .../newview/skins/default/xui/en/menu_inspect_self_gear.xml | 10 ++++++++++
 3 files changed, 33 insertions(+), 2 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/menu_attachment_self.xml b/indra/newview/skins/default/xui/en/menu_attachment_self.xml
index e2348375d5..84e81397be 100644
--- a/indra/newview/skins/default/xui/en/menu_attachment_self.xml
+++ b/indra/newview/skins/default/xui/en/menu_attachment_self.xml
@@ -23,7 +23,7 @@
         <menu_item_call.on_enable
          function="Self.EnableStandUp" />
     </menu_item_call-->
-        <menu_item_call
+    <menu_item_call
      enabled="false"
      label="Edit"
      layout="topleft"
@@ -46,6 +46,17 @@
   <menu_item_separator
     layout="topleft" />
 
+    <menu_item_call
+     label="Sit Down"
+     layout="topleft"
+     name="Sit Down Here">
+        <menu_item_call.on_click
+         function="Self.SitDown"
+         parameter="" />
+        <menu_item_call.on_enable
+         function="Self.EnableSitDown" />
+    </menu_item_call>
+
   <menu_item_call
 label="Stand Up"
 layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/menu_avatar_self.xml b/indra/newview/skins/default/xui/en/menu_avatar_self.xml
index d5b993152a..9059745f46 100644
--- a/indra/newview/skins/default/xui/en/menu_avatar_self.xml
+++ b/indra/newview/skins/default/xui/en/menu_avatar_self.xml
@@ -2,7 +2,17 @@
 <context_menu
  layout="topleft"
  name="Self Pie">
-       <menu_item_call
+    <menu_item_call
+     label="Sit Down"
+     layout="topleft"
+     name="Sit Down Here">
+        <menu_item_call.on_click
+         function="Self.SitDown"
+         parameter="" />
+        <menu_item_call.on_enable
+         function="Self.EnableSitDown" />
+    </menu_item_call>
+    <menu_item_call
      label="Stand Up"
      layout="topleft"
      name="Stand Up">
diff --git a/indra/newview/skins/default/xui/en/menu_inspect_self_gear.xml b/indra/newview/skins/default/xui/en/menu_inspect_self_gear.xml
index ea18e02ca1..30c2cde552 100644
--- a/indra/newview/skins/default/xui/en/menu_inspect_self_gear.xml
+++ b/indra/newview/skins/default/xui/en/menu_inspect_self_gear.xml
@@ -5,6 +5,16 @@
          mouse_opaque="false"
          visible="false"
          name="Gear Menu">
+  <menu_item_call
+   label="Sit Down"
+   enabled="true"
+   name="sit_down_here">
+    <menu_item_call.on_click
+     function="Self.SitDown"
+     parameter="" />
+    <menu_item_call.on_visible
+     function="Self.EnableSitDown" />
+  </menu_item_call>
   <menu_item_call
    label="Stand Up"
    enabled="true"
-- 
cgit v1.2.3