From 2b2fd9e97526d10b0b4d34154cc0a46f957acba7 Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Fri, 7 Sep 2012 17:48:09 -0400
Subject: enhanced XML archetype dumping, added to per-avatar menus

---
 .../skins/default/xui/en/menu_attachment_other.xml       |  8 ++++++++
 .../skins/default/xui/en/menu_attachment_self.xml        |  8 ++++++++
 indra/newview/skins/default/xui/en/menu_avatar_other.xml |  8 ++++++++
 indra/newview/skins/default/xui/en/menu_avatar_self.xml  | 16 ++++++++++++++++
 .../skins/default/xui/en/menu_inspect_avatar_gear.xml    |  8 ++++++++
 .../skins/default/xui/en/menu_inspect_self_gear.xml      |  8 ++++++++
 6 files changed, 56 insertions(+)
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/menu_attachment_other.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/menu_attachment_self.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/menu_avatar_other.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/menu_avatar_self.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/menu_inspect_self_gear.xml

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/menu_attachment_other.xml b/indra/newview/skins/default/xui/en/menu_attachment_other.xml
old mode 100644
new mode 100755
index b46b62ec4d..6f92273097
--- a/indra/newview/skins/default/xui/en/menu_attachment_other.xml
+++ b/indra/newview/skins/default/xui/en/menu_attachment_other.xml
@@ -79,6 +79,14 @@
             <menu_item_call.on_visible
              function="IsGodCustomerService"/>
         </menu_item_call>
+    <menu_item_call
+		 label="Dump XML"
+         name="Dump XML">
+            <menu_item_call.on_click
+             function="Advanced.AppearanceToXML" />
+            <menu_item_call.on_visible
+             function="IsGodCustomerService"/>
+    </menu_item_call>
 	    <menu_item_call
          label="Zoom In"
           name="Zoom In">
diff --git a/indra/newview/skins/default/xui/en/menu_attachment_self.xml b/indra/newview/skins/default/xui/en/menu_attachment_self.xml
old mode 100644
new mode 100755
index b8128da358..84e26268bd
--- a/indra/newview/skins/default/xui/en/menu_attachment_self.xml
+++ b/indra/newview/skins/default/xui/en/menu_attachment_self.xml
@@ -123,6 +123,14 @@ name="Edit Outfit">
     <menu_item_call.on_visible
      function="IsGodCustomerService"/>
   </menu_item_call>
+    <menu_item_call
+		 label="Dump XML"
+         name="Dump XML">
+            <menu_item_call.on_click
+             function="Advanced.AppearanceToXML" />
+            <menu_item_call.on_visible
+             function="IsGodCustomerService"/>
+    </menu_item_call>
   <menu_item_separator
   layout="topleft" />
   <menu_item_call
diff --git a/indra/newview/skins/default/xui/en/menu_avatar_other.xml b/indra/newview/skins/default/xui/en/menu_avatar_other.xml
old mode 100644
new mode 100755
index 276b5f106f..1c39984625
--- a/indra/newview/skins/default/xui/en/menu_avatar_other.xml
+++ b/indra/newview/skins/default/xui/en/menu_avatar_other.xml
@@ -79,6 +79,14 @@
             <menu_item_call.on_visible
              function="IsGodCustomerService"/>
         </menu_item_call>
+    <menu_item_call
+		 label="Dump XML"
+         name="Dump XML">
+            <menu_item_call.on_click
+             function="Advanced.AppearanceToXML" />
+            <menu_item_call.on_visible
+             function="IsGodCustomerService"/>
+    </menu_item_call>
 	    <menu_item_call
          label="Zoom In"
           name="Zoom In">
diff --git a/indra/newview/skins/default/xui/en/menu_avatar_self.xml b/indra/newview/skins/default/xui/en/menu_avatar_self.xml
old mode 100644
new mode 100755
index d9bdfece38..0e79b0fee3
--- a/indra/newview/skins/default/xui/en/menu_avatar_self.xml
+++ b/indra/newview/skins/default/xui/en/menu_avatar_self.xml
@@ -261,4 +261,20 @@
             <menu_item_call.on_visible
              function="IsGodCustomerService"/>
     </menu_item_call>
+    <menu_item_call
+		 label="Dump XML"
+         name="Dump XML">
+            <menu_item_call.on_click
+             function="Advanced.AppearanceToXML" />
+            <menu_item_call.on_visible
+             function="IsGodCustomerService"/>
+    </menu_item_call>
+    <menu_item_call
+		 label="Dump XML"
+         name="Dump XML">
+            <menu_item_call.on_click
+             function="Advanced.AppearanceToXML" />
+            <menu_item_call.on_visible
+             function="IsGodCustomerService"/>
+    </menu_item_call>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml b/indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml
old mode 100644
new mode 100755
index 76b188220d..4fdfb2281b
--- a/indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml
+++ b/indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml
@@ -112,6 +112,14 @@
     <menu_item_call.on_visible
      function="IsGodCustomerService"/>
   </menu_item_call>
+    <menu_item_call
+		 label="Dump XML"
+         name="Dump XML">
+            <menu_item_call.on_click
+             function="Advanced.AppearanceToXML" />
+            <menu_item_call.on_visible
+             function="IsGodCustomerService"/>
+    </menu_item_call>
   <menu_item_call
    label="Find On Map"
    name="find_on_map">
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
old mode 100644
new mode 100755
index 5e7b16ed4a..f935f0f312
--- a/indra/newview/skins/default/xui/en/menu_inspect_self_gear.xml
+++ b/indra/newview/skins/default/xui/en/menu_inspect_self_gear.xml
@@ -249,4 +249,12 @@
     <menu_item_call.on_visible
      function="IsGodCustomerService"/>
   </menu_item_call>
+    <menu_item_call
+		 label="Dump XML"
+         name="Dump XML">
+            <menu_item_call.on_click
+             function="Advanced.AppearanceToXML" />
+            <menu_item_call.on_visible
+             function="IsGodCustomerService"/>
+    </menu_item_call>
 </toggleable_menu>
-- 
cgit v1.2.3


From b4866775a2acc98ebcb3986d7779eea479028ff9 Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Tue, 11 Sep 2012 20:57:04 -0400
Subject: Dump XML tweaks, suppress wearable updates when bakes should dominate

---
 indra/newview/skins/default/xui/en/menu_attachment_other.xml   |  2 +-
 indra/newview/skins/default/xui/en/menu_attachment_self.xml    |  2 +-
 indra/newview/skins/default/xui/en/menu_avatar_other.xml       |  2 +-
 indra/newview/skins/default/xui/en/menu_avatar_self.xml        | 10 +---------
 .../newview/skins/default/xui/en/menu_inspect_avatar_gear.xml  |  2 +-
 indra/newview/skins/default/xui/en/menu_inspect_self_gear.xml  |  2 +-
 6 files changed, 6 insertions(+), 14 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/menu_attachment_other.xml b/indra/newview/skins/default/xui/en/menu_attachment_other.xml
index 6f92273097..46ba4bd29d 100755
--- a/indra/newview/skins/default/xui/en/menu_attachment_other.xml
+++ b/indra/newview/skins/default/xui/en/menu_attachment_other.xml
@@ -85,7 +85,7 @@
             <menu_item_call.on_click
              function="Advanced.AppearanceToXML" />
             <menu_item_call.on_visible
-             function="IsGodCustomerService"/>
+             function="Advanced.EnableAppearanceToXML"/>
     </menu_item_call>
 	    <menu_item_call
          label="Zoom In"
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 84e26268bd..28e032ce5f 100755
--- a/indra/newview/skins/default/xui/en/menu_attachment_self.xml
+++ b/indra/newview/skins/default/xui/en/menu_attachment_self.xml
@@ -129,7 +129,7 @@ name="Edit Outfit">
             <menu_item_call.on_click
              function="Advanced.AppearanceToXML" />
             <menu_item_call.on_visible
-             function="IsGodCustomerService"/>
+             function="Advanced.EnableAppearanceToXML"/>
     </menu_item_call>
   <menu_item_separator
   layout="topleft" />
diff --git a/indra/newview/skins/default/xui/en/menu_avatar_other.xml b/indra/newview/skins/default/xui/en/menu_avatar_other.xml
index 1c39984625..e7c2b80da2 100755
--- a/indra/newview/skins/default/xui/en/menu_avatar_other.xml
+++ b/indra/newview/skins/default/xui/en/menu_avatar_other.xml
@@ -85,7 +85,7 @@
             <menu_item_call.on_click
              function="Advanced.AppearanceToXML" />
             <menu_item_call.on_visible
-             function="IsGodCustomerService"/>
+             function="Advanced.EnableAppearanceToXML"/>
     </menu_item_call>
 	    <menu_item_call
          label="Zoom In"
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 0e79b0fee3..c1ff026a74 100755
--- a/indra/newview/skins/default/xui/en/menu_avatar_self.xml
+++ b/indra/newview/skins/default/xui/en/menu_avatar_self.xml
@@ -267,14 +267,6 @@
             <menu_item_call.on_click
              function="Advanced.AppearanceToXML" />
             <menu_item_call.on_visible
-             function="IsGodCustomerService"/>
-    </menu_item_call>
-    <menu_item_call
-		 label="Dump XML"
-         name="Dump XML">
-            <menu_item_call.on_click
-             function="Advanced.AppearanceToXML" />
-            <menu_item_call.on_visible
-             function="IsGodCustomerService"/>
+             function="Advanced.EnableAppearanceToXML"/>
     </menu_item_call>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml b/indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml
index 4fdfb2281b..354ddc3109 100755
--- a/indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml
+++ b/indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml
@@ -118,7 +118,7 @@
             <menu_item_call.on_click
              function="Advanced.AppearanceToXML" />
             <menu_item_call.on_visible
-             function="IsGodCustomerService"/>
+             function="Advanced.EnableAppearanceToXML"/>
     </menu_item_call>
   <menu_item_call
    label="Find On Map"
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 f935f0f312..84815caca9 100755
--- a/indra/newview/skins/default/xui/en/menu_inspect_self_gear.xml
+++ b/indra/newview/skins/default/xui/en/menu_inspect_self_gear.xml
@@ -255,6 +255,6 @@
             <menu_item_call.on_click
              function="Advanced.AppearanceToXML" />
             <menu_item_call.on_visible
-             function="IsGodCustomerService"/>
+             function="Advanced.EnableAppearanceToXML"/>
     </menu_item_call>
 </toggleable_menu>
-- 
cgit v1.2.3


From 46fce35fdcae3dfc72e22c8c4f2637f59487ed62 Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Thu, 8 Nov 2012 11:25:41 -0500
Subject: removed references to two nonexistent textures in textures.xml

---
 indra/newview/skins/default/textures/textures.xml | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 06f8f8c670..03aedae0a9 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -712,9 +712,6 @@ with the same filename but different name
   <texture name="icon_for_sale.tga" file_name="icons/Icon_For_Sale.png" />
   <texture name="icon_top_pick.tga" />
 
-  <texture name="inv_folder_mesh.tga"/>
-  <texture name="inv_item_mesh.tga"/>
-
   <texture name="lag_status_critical.tga" />
   <texture name="lag_status_good.tga" />
   <texture name="lag_status_warning.tga" />
-- 
cgit v1.2.3


From d1c144519306cae7eff7f781417482c85068988c Mon Sep 17 00:00:00 2001
From: Nyx Linden <nyx@lindenlab.com>
Date: Thu, 28 Feb 2013 17:25:37 -0500
Subject: SH-3909 Support avatar height offset

Adding a new visual param that allows users to manually adjust an offset for
how far off the ground (+ or -) their avatar's root bone is.

Supports the +-2m range people are used to adjusting in their viewers, but
new implementation should support server-generated appearances.
---
 indra/newview/skins/default/xui/en/strings.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 4383b98592..883a06d5e1 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2991,6 +2991,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 <string name="Higher">Higher</string>
 <string name="Hip Length">Hip Length</string>
 <string name="Hip Width">Hip Width</string>
+<string name="Hover">Hover</string>
 <string name="In">In</string>
 <string name="In Shdw Color">Inner Shadow Color</string>
 <string name="In Shdw Opacity">Inner Shadow Opacity</string>
-- 
cgit v1.2.3