merged jelly-doll viewer-release into bento

12 files changed, 81 insertions, 10 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_preferences.xml b/indra/newview/skins/default/xui/en/floater_preferences.xml
index 638a4e2da8..9a9101e0da 100644
--- a/indra/newview/skins/default/xui/en/floater_preferences.xml
+++ b/indra/newview/skins/default/xui/en/floater_preferences.xml
@@ -3,7 +3,7 @@
  legacy_header_height="18"
  positioning="centered"
  default_tab_group="1"
- height="460"
+ height="512"
  layout="topleft"
  name="Preferences"
  help_topic="preferences"
@@ -19,7 +19,7 @@
      layout="topleft"
      right="-105"
      name="OK"
-     top="433"
+     top="473"
      width="90">
         <button.commit_callback
          function="Pref.OK" />
@@ -40,7 +40,7 @@
     <tab_container
      follows="all"
      halign="left"
-     height="410"
+     height="440"
      layout="topleft"
      left="0"
      name="pref core"
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 9e520b2d31..8771660bcf 100644
--- a/indra/newview/skins/default/xui/en/menu_attachment_other.xml
+++ b/indra/newview/skins/default/xui/en/menu_attachment_other.xml
@@ -40,6 +40,15 @@
          function="Avatar.InviteToGroup" />
       </menu_item_call>
    <menu_item_separator />
+
+     <menu_item_call label="Reset Skeleton"
+       layout="topleft"
+       name="Reset Skeleton">
+       <menu_item_call.on_click
+        function="Avatar.ResetSkeleton" />
+     </menu_item_call>
+
+   <menu_item_separator />
     <menu_item_call
      enabled="false"
      label="Block"
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 c6ae844d67..ced0dd37b1 100644
--- a/indra/newview/skins/default/xui/en/menu_attachment_self.xml
+++ b/indra/newview/skins/default/xui/en/menu_attachment_self.xml
@@ -99,6 +99,13 @@ name="Edit Outfit">
      <menu_item_call.on_enable
       function="Edit.EnableHoverHeight" />
   </menu_item_call>
+  <menu_item_call label="Reset Skeleton"
+       layout="topleft"
+       name="Reset Skeleton">
+       <menu_item_call.on_click
+        function="Avatar.ResetSkeleton" />
+  </menu_item_call>
+
   <menu_item_call
     label="My Friends"
     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 fadacbf3cb..f89c0eadf8 100644
--- a/indra/newview/skins/default/xui/en/menu_avatar_other.xml
+++ b/indra/newview/skins/default/xui/en/menu_avatar_other.xml
@@ -41,6 +41,15 @@
       </menu_item_call>
     
    <menu_item_separator />
+
+     <menu_item_call label="Reset Skeleton"
+       layout="topleft"
+       name="Reset Skeleton">
+       <menu_item_call.on_click
+        function="Avatar.ResetSkeleton" />
+     </menu_item_call>
+
+   <menu_item_separator />
    
      <menu_item_call
      enabled="false"
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 d3b0b07f70..924e8b8454 100644
--- a/indra/newview/skins/default/xui/en/menu_avatar_self.xml
+++ b/indra/newview/skins/default/xui/en/menu_avatar_self.xml
@@ -237,6 +237,12 @@
      <menu_item_call.on_enable
       function="Edit.EnableHoverHeight" />
    </menu_item_call>
+   <menu_item_call label="Reset Skeleton"
+     layout="topleft"
+     name="Reset Skeleton">
+     <menu_item_call.on_click
+      function="Avatar.ResetSkeleton" />
+   </menu_item_call>
    <menu_item_call
      label="My Friends"
      layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 0a492fb37b..ad7aca641b 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -3528,6 +3528,16 @@
                  parameter="collision skeleton" />
             </menu_item_check>
             <menu_item_check
+             label="Show Bones"
+             name="Show Bones">
+                <menu_item_check.on_check
+                 function="Advanced.CheckInfoDisplay"
+                 parameter="joints" />
+                <menu_item_check.on_click
+                 function="Advanced.ToggleInfoDisplay"
+                 parameter="joints" />
+            </menu_item_check>
+            <menu_item_check
              label="Display Agent Target"
              name="Display Agent Target">
                 <menu_item_check.on_check
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 492d963653..4daff340ac 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -1416,6 +1416,13 @@ Port settings take effect after you restart [APP_NAME].
 
   <notification
    icon="alertmodal.tga"
+   name="ChangeDeferredDebugSetting"
+   type="alertmodal">
+This debug setting change will take effect after you restart [APP_NAME].
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
    name="ChangeSkin"
    type="alertmodal">
 The new skin will appear after you restart [APP_NAME].
@@ -10354,6 +10361,14 @@ Not enough script resources available to attach object!
   </notification>
 
   <notification
+  icon="alertmodal.tga"
+  name="IllegalAttachment"
+  type="notify">
+   <tag>fail</tag>
+   The attachment has requested a nonexistent point on the avatar. It has been attached to the chest instead.
+  </notification>
+
+  <notification
    icon="alertmodal.tga"
    name="CantDropItemTrialUser"
    type="notify">
diff --git a/indra/newview/skins/default/xui/en/panel_notification.xml b/indra/newview/skins/default/xui/en/panel_notification.xml
index 94c468e1bb..756b8f8102 100644
--- a/indra/newview/skins/default/xui/en/panel_notification.xml
+++ b/indra/newview/skins/default/xui/en/panel_notification.xml
@@ -10,7 +10,6 @@
   left="0"
   name="notification_panel"
   chrome="true"
-  show_title="false"
   top="0"
   	height="140"
   translate="false"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
index a9b8e197bc..9e99916ca0 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -2,7 +2,7 @@
 <panel
  border="true"
  follows="left|top|right|bottom"
- height="418"
+ height="438"
  label="Graphics"
  layout="topleft"
  left="102"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
index 323da2be38..284688d4d1 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
@@ -16,7 +16,7 @@
   </panel.string>
 
   <button
-      follows="left|bottom"
+      follows="left|top"
       height="23"
       label="Clear History"
       tool_tip="Clear login image, last location, teleport history, web, and texture cache"
@@ -75,7 +75,7 @@
      top_pad="10"
      width="350" />
     <button
-     follows="left|bottom"
+     follows="left|top"
      height="23"
      label="Block list"
      layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
index 615abbaa89..53b74fa645 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
@@ -2,7 +2,7 @@
 <panel
  border="true"
  follows="all"
- height="408"
+ height="438"
  label="Sounds"
  layout="topleft"
  left="102"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index ae63546082..72a6f09f92 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2255,6 +2255,7 @@ For AI Character: Get the closest navigable point to the point provided.
 	<string name="BodyPartsLeftLeg">Left Leg</string>
 	<string name="BodyPartsTorso">Torso</string>
 	<string name="BodyPartsRightLeg">Right Leg</string>
+    <string name="BodyPartsEnhancedSkeleton">Enhanced Skeleton</string>
 
 	<!-- slider -->
 	<string name="GraphicsQualityLow">Low</string>
@@ -2476,8 +2477,23 @@ This feature is currently in Beta. Please add your name to this [http://goo.gl/f
 	<string name="Stomach">Stomach</string>
 	<string name="Left Pec">Left Pec</string>
 	<string name="Right Pec">Right Pec</string>
-        <string name="Neck">Neck</string>
-        <string name="Avatar Center">Avatar Center</string>
+    <string name="Neck">Neck</string>
+    <string name="Avatar Center">Avatar Center</string>
+    <string name="Left Ring Finger">Left Ring Finger</string>
+    <string name="Right Ring Finger">Right Ring Finger</string>
+    <string name="Tail Base">Tail Base</string>
+    <string name="Tail Tip">Tail Tip</string>
+    <string name="Left Wing">Left Wing</string>
+    <string name="Right Wing">Right Wing</string>
+    <string name="Jaw">Jaw</string>
+    <string name="Alt Left Ear">Alt Left Ear</string>
+    <string name="Alt Right Ear">Alt Right Ear</string>
+    <string name="Alt Left Eye">Alt Left Eye</string>
+    <string name="Alt Right Eye">Alt Right Eye</string>
+    <string name="Tongue">Tongue</string>
+    <string name="Groin">Groin</string>
+    <string name="Left Hind Foot">Left Hind Foot</string>
+    <string name="Right Hind Foot">Right Hind Foot</string>
 	<string name="Invalid Attachment">Invalid Attachment Point</string>
 	<string name="ATTACHMENT_MISSING_ITEM">Error: missing item</string>
 	<string name="ATTACHMENT_MISSING_BASE_ITEM">Error: missing base item</string>