merge

25 files changed, 1068 insertions, 261 deletions

diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml
index cdbeed111e..b6995d2122 100644
--- a/indra/newview/skins/default/colors.xml
+++ b/indra/newview/skins/default/colors.xml
@@ -67,7 +67,7 @@
 	 value="0 0 1 1" />
 	<color
 	 name="Yellow"
-	 value="1 1 0 1" />
+	 value="0.114 0.65 0.1" />
 	<color
 	 name="Unused?"
 	 value="1 0.5 0 1" />
@@ -513,7 +513,7 @@
      reference="White" />
     <color
      name="ObjectChatColor"
-     reference="0.7 0.8 0.9 1" />
+     reference="EmphasisColor" />
     <color
      name="OverdrivenColor"
      value="1 0 0 1" />
diff --git a/indra/newview/skins/default/textures/bottomtray/Notices_Unread.png b/indra/newview/skins/default/textures/bottomtray/Notices_Unread.png
index aa3898ca99..0ac5b72b8f 100644
--- a/indra/newview/skins/default/textures/bottomtray/Notices_Unread.png
+++ b/indra/newview/skins/default/textures/bottomtray/Notices_Unread.png
diff --git a/indra/newview/skins/default/textures/bottomtray/Unread_IM.png b/indra/newview/skins/default/textures/bottomtray/Unread_IM.png
index 598342ea80..5c0c85b864 100644
--- a/indra/newview/skins/default/textures/bottomtray/Unread_IM.png
+++ b/indra/newview/skins/default/textures/bottomtray/Unread_IM.png
diff --git a/indra/newview/skins/default/textures/bottomtray/WellButton_Lit.png b/indra/newview/skins/default/textures/bottomtray/WellButton_Lit.png
index 60676b43fd..dd9133bcc4 100644
--- a/indra/newview/skins/default/textures/bottomtray/WellButton_Lit.png
+++ b/indra/newview/skins/default/textures/bottomtray/WellButton_Lit.png
diff --git a/indra/newview/skins/default/textures/bottomtray/WellButton_Lit_Selected.png b/indra/newview/skins/default/textures/bottomtray/WellButton_Lit_Selected.png
index 98cde96aff..0080e71f41 100644
--- a/indra/newview/skins/default/textures/bottomtray/WellButton_Lit_Selected.png
+++ b/indra/newview/skins/default/textures/bottomtray/WellButton_Lit_Selected.png
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 24d3512bcb..0317d55768 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -143,6 +143,7 @@ with the same filename but different name
   <texture name="DropDown_Over" file_name="widgets/DropDown_Over.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" />
   <texture name="DropDown_Press" file_name="widgets/DropDown_Press.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" />
   <texture name="DropDown_Selected" file_name="widgets/DropDown_Selected.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" />
+  <texture name="DropDown_On" file_name="widgets/DropDown_On.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" />
   <texture name="DropDown_Off" file_name="widgets/DropDown_Off.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" />
 
   <texture name="DropTarget" file_name="widgets/DropTarget.png" preload="false" />
@@ -592,9 +593,9 @@ with the same filename but different name
 
   <texture name="Unread_IM" file_name="bottomtray/Unread_IM.png" preload="false" />
   <texture name="Unread_Msg" file_name="bottomtray/Unread_Msg.png" preload="false" />
-  
-  <texture name="WellButton_Lit" file_name="bottomtray/WellButton_Lit.png" />
-  <texture name="WellButton_Lit_Selected" file_name="bottomtray/WellButton_Lit_Selected.png" />
+
+  <texture name="WellButton_Lit" file_name="bottomtray/WellButton_Lit.png"  preload="true" scale.left="4" scale.top="19" scale.right="28" scale.bottom="4" />
+  <texture name="WellButton_Lit_Selected" file_name="bottomtray/WellButton_Lit_Selected.png" preload="true" scale.left="4" scale.top="19" scale.right="28" scale.bottom="4" />
 
   <texture name="VoicePTT_Lvl1" file_name="bottomtray/VoicePTT_Lvl1.png" preload="false" />
   <texture name="VoicePTT_Lvl2" file_name="bottomtray/VoicePTT_Lvl2.png" preload="false" />
diff --git a/indra/newview/skins/default/xui/en/floater_media_settings.xml b/indra/newview/skins/default/xui/en/floater_media_settings.xml
index 8122386fae..681731b0da 100644
--- a/indra/newview/skins/default/xui/en/floater_media_settings.xml
+++ b/indra/newview/skins/default/xui/en/floater_media_settings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
  legacy_header_height="18"
- bottom="666" 
  can_close="true" 
  can_drag_on_left="false" 
  can_minimize="true"
diff --git a/indra/newview/skins/default/xui/en/floater_preview_texture.xml b/indra/newview/skins/default/xui/en/floater_preview_texture.xml
index 602a18ea56..abc30c335c 100644
--- a/indra/newview/skins/default/xui/en/floater_preview_texture.xml
+++ b/indra/newview/skins/default/xui/en/floater_preview_texture.xml
@@ -3,15 +3,15 @@
  legacy_header_height="18"
  auto_tile="true"
  can_resize="true"
- follows="left|bottom"
- height="331"
+ follows="left|top"
+ height="313"
  layout="topleft"
  min_height="120"
- min_width="300"
+ min_width="320"
  name="preview_texture"
  help_topic="preview_texture"
- width="300">
-    <floater.string
+ width="320">
+   <floater.string
      name="Title">
         Texture: [NAME]
     </floater.string>
@@ -43,72 +43,38 @@
      max_length="127"
      name="desc"
      width="190" />
-    <button
-     follows="left|bottom"
-     height="22"
-     label="OK"
-     layout="topleft"
-     left="80"
-     name="Keep"
-     top="302"
-     width="100" />
-    <button
-     follows="left|bottom"
-     height="22"
-     label="Cancel"
-     layout="topleft"
-     left_pad="5"
-     name="Discard"
-     top_delta="0"
-     width="100" />
-    <button
-     follows="left|bottom"
-     height="22"
-     label="Save As"
-     layout="topleft"
-     left_pad="5"
-     name="save_tex_btn"
-     top_delta="0"
-     width="100" />
     <text
      type="string"
+     halign="right"
      length="1"
-     follows="left|bottom"
+     follows="right|bottom"
      height="16"
      layout="topleft"
-     left="13"
+     left="110"
      name="dimensions"
-     top="309"
-     width="303">
+     top="255"
+     width="200">
         [WIDTH]px x [HEIGHT]px
     </text>
     <text
      type="string"
+     halign="right"
      length="1"
-     bg_visible="false"
-     border_drop_shadow_visible="false"
-     border_visible="false"
-     top="309"
-     drop_shadow_visible="true"
-     enabled="true"
      follows="right|bottom"
-     font="SansSerifSmall"
-     h_pad="0"
-     halign="right"
-     height="14"
-     left="54"
-     mouse_opaque="true"
-     name="aspect_ratio"
-     v_pad="0"
-     width="110">
-    	Preview Aspect Ratio
+     height="16"
+     layout="topleft"
+     left_delta="-110"
+     name="dimensions"
+     top_pad="5"
+     width="200">
+        Preview aspect ratio
     </text>
     <combo_box
      allow_text_entry="true" 
-     top="306" 
+     top_delta="-3" 
      follows="right|bottom" 
-     height="20"
-     left="176"
+     height="23"
+     left_pad="10"
      max_chars="20"
      mouse_opaque="true"
      enabled="true"
@@ -140,4 +106,31 @@
 		2:1
 	</combo_item>
 	</combo_box>
+    <button
+     follows="right|bottom"
+     height="22"
+     label="OK"
+     layout="topleft"
+     left="6"
+     name="keep"
+     top_pad="5"
+     width="100" />
+    <button
+     follows="right|bottom"
+     height="22"
+     label="Cancel"
+     layout="topleft"
+     left_pad="5"
+     name="discard"
+     top_delta="0"
+     width="100" />
+    <button
+     follows="right|bottom"
+     height="22"
+     label="Save As"
+     layout="topleft"
+     left_pad="5"
+     name="save_tex_btn"
+     top_delta="0"
+     width="100" />
 </floater>
diff --git a/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
index 113da9ea4d..695021f755 100644
--- a/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
@@ -101,7 +101,7 @@
     <filter_editor
      follows="left|top|right"
      height="23"
-     label="Filter textures"
+     label="Filter Textures"
      layout="topleft"
      left="175"
      name="inventory search editor"
diff --git a/indra/newview/skins/default/xui/en/inspect_object.xml b/indra/newview/skins/default/xui/en/inspect_object.xml
index 16f6e49092..cedf83f8b1 100644
--- a/indra/newview/skins/default/xui/en/inspect_object.xml
+++ b/indra/newview/skins/default/xui/en/inspect_object.xml
@@ -9,7 +9,7 @@
  bg_opaque_image="Inspector_Background"
  can_close="false"
  can_minimize="false"
- height="148"
+ height="150"
  layout="topleft"
  name="inspect_object"
  single_instance="true"
@@ -71,13 +71,15 @@ owner secondlife:///app/agent/0e346d8b-4433-4d66-a6b0-fd37083abc4c/about
    width="196">
 L$300,000
   </text>
-   <text
+  <text
+   clip_partial="true" 
    follows="all"
    font="SansSerifSmall"
-   height="36"
+   height="37"
    left="8"
    name="object_description"
    top_pad="0"
+   use_ellipses="true" 
    width="220"
    word_wrap="true">
 This is a really long description for an object being as how it is at least 80 characters in length and maybe more like 120 at this point. Who knows, really?
@@ -90,7 +92,7 @@ This is a really long description for an object being as how it is at least 80 c
    height="13"
    left_delta="0"
    name="object_media_url"
-   top_pad="0"
+   top_pad="-1"
    width="291"
    max_length = "50"
    use_ellipses="true">
@@ -102,7 +104,7 @@ This is a really long description for an object being as how it is at least 80 c
    label="Buy"
    left="8"
    name="buy_btn"
-   top="119"
+   top="121"
    width="80" />
   <button
    follows="top|left"
diff --git a/indra/newview/skins/default/xui/en/menu_attachment_other.xml b/indra/newview/skins/default/xui/en/menu_attachment_other.xml
new file mode 100644
index 0000000000..5b94645b60
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_attachment_other.xml
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<!-- *NOTE: See also menu_avatar_other.xml -->
+<context_menu
+ layout="topleft"
+ name="Avatar Pie">
+    <menu_item_call
+     label="View Profile"
+     name="Profile...">
+        <menu_item_call.on_click
+         function="ShowAgentProfile"
+         parameter="hit object" />
+    </menu_item_call>
+   <menu_item_call
+     enabled="false"
+     label="Add Friend"
+     name="Add Friend">
+        <menu_item_call.on_click
+         function="Avatar.AddFriend" />
+        <menu_item_call.on_enable
+         function="Avatar.EnableAddFriend" />
+    </menu_item_call>
+    <menu_item_call
+     label="IM"
+     name="Send IM...">
+        <menu_item_call.on_click
+         function="Avatar.SendIM" />
+    </menu_item_call>
+    <menu_item_call
+     label="Call"
+     name="Call">
+        <menu_item_call.on_click
+         function="Avatar.Call" />
+    </menu_item_call>
+      <menu_item_call
+         label="Invite to Group"
+         name="Invite...">
+      <menu_item_call.on_click
+         function="Avatar.InviteToGroup" />
+      </menu_item_call>
+   <menu_item_separator />
+    <menu_item_call
+     enabled="false"
+     label="Block"
+     name="Avatar Mute">
+        <menu_item_call.on_click
+         function="Avatar.Mute" />
+        <menu_item_call.on_enable
+         function="Avatar.EnableMute" />
+    </menu_item_call>
+    <menu_item_call
+     label="Report"
+     name="abuse">
+        <menu_item_call.on_click
+         function="Avatar.ReportAbuse" />
+    </menu_item_call>
+        <menu_item_call
+         label="Freeze"
+         name="Freeze...">
+            <menu_item_call.on_click
+             function="Avatar.Freeze" />
+            <menu_item_call.on_visible
+             function="Avatar.EnableFreezeEject"/>
+        </menu_item_call>
+        <menu_item_call
+         label="Eject"
+         name="Eject...">
+            <menu_item_call.on_click
+             function="Avatar.Eject" />
+            <menu_item_call.on_visible
+             function="Avatar.EnableFreezeEject"/>
+        </menu_item_call>
+        <menu_item_call
+         label="Debug"
+         name="Debug...">
+            <menu_item_call.on_click
+             function="Avatar.Debug" />
+            <menu_item_call.on_visible
+             function="IsGodCustomerService"/>
+        </menu_item_call>
+	    <menu_item_call
+         label="Zoom In"
+          name="Zoom In">
+        <menu_item_call.on_click
+           function="Tools.LookAtSelection"
+           parameter="zoom" />
+    </menu_item_call>
+   <menu_item_call
+     enabled="false"
+     label="Pay"
+     name="Pay...">
+        <menu_item_call.on_click
+         function="PayObject" />
+        <menu_item_call.on_enable
+         function="EnablePayAvatar" />
+    </menu_item_call>
+   <menu_item_separator />
+   <menu_item_call
+       label="Object Profile"
+       name="Object Inspect">
+         <menu_item_call.on_click
+          function="Object.Inspect" />
+         <menu_item_call.on_enable
+          function="Object.EnableInspect" />
+   </menu_item_call>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_attachment_self.xml b/indra/newview/skins/default/xui/en/menu_attachment_self.xml
new file mode 100644
index 0000000000..c85dbbb1bc
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_attachment_self.xml
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<context_menu
+ layout="topleft"
+ name="Attachment Pie">
+    <menu_item_call
+     enabled="false"
+     label="Touch"
+     layout="topleft"
+     name="Attachment Object Touch">
+        <menu_item_call.on_click
+         function="Object.Touch" />
+        <menu_item_call.on_enable
+         function="Object.EnableTouch"
+         name="EnableTouch"
+         parameter="Touch" />
+    </menu_item_call>
+    <!--menu_item_call
+     label="Stand Up"
+     layout="topleft"
+     name="Stand Up">
+        <menu_item_call.on_click
+         function="Self.StandUp"
+         parameter="" />
+        <menu_item_call.on_enable
+         function="Self.EnableStandUp" />
+    </menu_item_call-->
+        <menu_item_call
+     enabled="false"
+     label="Edit"
+     layout="topleft"
+     name="Edit...">
+        <menu_item_call.on_click
+         function="Object.Edit" />
+        <menu_item_call.on_enable
+         function="EnableEdit" />
+    </menu_item_call>
+    <menu_item_call
+     enabled="false"
+     label="Detach"
+     layout="topleft"
+     name="Detach">
+        <menu_item_call.on_click
+         function="Attachment.Detach" />
+        <menu_item_call.on_enable
+         function="Attachment.EnableDetach" />
+    </menu_item_call>
+      <menu_item_call
+     enabled="false"
+     label="Drop"
+     layout="topleft"
+     name="Drop">
+        <menu_item_call.on_click
+         function="Attachment.Drop" />
+        <menu_item_call.on_enable
+         function="Attachment.EnableDrop" />
+    </menu_item_call>
+    <!--menu_item_call
+     label="My Profile"
+     layout="topleft"
+     name="Profile...">
+        <menu_item_call.on_click
+         function="ShowAgentProfile"
+         parameter="agent" />
+    </menu_item_call>
+    <menu_item_call
+     label="My Appearance"
+     layout="topleft"
+     name="Appearance...">
+        <menu_item_call.on_click
+         function="ShowFloater"
+         parameter="appearance" />
+        <menu_item_call.on_enable
+         function="Edit.EnableCustomizeAvatar" />
+
+    </menu_item_call-->
+    <menu_item_separator
+      layout="topleft" />
+    
+       <menu_item_call
+     label="Stand Up"
+     layout="topleft"
+     name="Stand Up">
+        <menu_item_call.on_click
+         function="Self.StandUp"
+         parameter="" />
+        <menu_item_call.on_enable
+         function="Self.EnableStandUp" />
+    </menu_item_call>
+     <menu_item_call
+     label="My Appearance"
+     layout="topleft"
+     name="Appearance...">
+        <menu_item_call.on_click
+         function="ShowFloater"
+         parameter="appearance" />
+        <menu_item_call.on_enable
+         function="Edit.EnableCustomizeAvatar" />
+    </menu_item_call>
+   <menu_item_call
+     label="My Friends"
+     layout="topleft"
+     name="Friends...">
+        <menu_item_call.on_click
+         function="SideTray.PanelPeopleTab"
+         parameter="friends_panel" />
+    </menu_item_call>
+    <menu_item_call
+     label="My Groups"
+     layout="topleft"
+     name="Groups...">
+        <menu_item_call.on_click
+         function="SideTray.PanelPeopleTab"
+         parameter="groups_panel" />
+    </menu_item_call>
+   <menu_item_call
+     label="My Profile"
+     layout="topleft"
+     name="Profile...">
+        <menu_item_call.on_click
+         function="ShowAgentProfile"
+         parameter="agent" />
+    </menu_item_call>
+    
+</context_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_avatar_other.xml b/indra/newview/skins/default/xui/en/menu_avatar_other.xml
new file mode 100644
index 0000000000..0ad41546d2
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_avatar_other.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<!-- *NOTE: See also menu_attachment_other.xml -->
+<context_menu
+ layout="topleft"
+ name="Avatar Pie">
+    <menu_item_call
+     label="View Profile"
+     name="Profile...">
+        <menu_item_call.on_click
+         function="ShowAgentProfile"
+         parameter="hit object" />
+    </menu_item_call>
+   <menu_item_call
+     enabled="false"
+     label="Add Friend"
+     name="Add Friend">
+        <menu_item_call.on_click
+         function="Avatar.AddFriend" />
+        <menu_item_call.on_enable
+         function="Avatar.EnableAddFriend" />
+    </menu_item_call>
+    <menu_item_call
+     label="IM"
+     name="Send IM...">
+        <menu_item_call.on_click
+         function="Avatar.SendIM" />
+    </menu_item_call>
+    <menu_item_call
+     label="Call"
+     name="Call">
+        <menu_item_call.on_click
+         function="Avatar.Call" />
+    </menu_item_call>
+      <menu_item_call
+         label="Invite to Group"
+         name="Invite...">
+      <menu_item_call.on_click
+         function="Avatar.InviteToGroup" />
+      </menu_item_call>
+   <menu_item_separator />
+    <menu_item_call
+     enabled="false"
+     label="Block"
+     name="Avatar Mute">
+        <menu_item_call.on_click
+         function="Avatar.Mute" />
+        <menu_item_call.on_enable
+         function="Avatar.EnableMute" />
+    </menu_item_call>
+    <menu_item_call
+     label="Report"
+     name="abuse">
+        <menu_item_call.on_click
+         function="Avatar.ReportAbuse" />
+    </menu_item_call>
+        <menu_item_call
+         label="Freeze"
+         name="Freeze...">
+            <menu_item_call.on_click
+             function="Avatar.Freeze" />
+            <menu_item_call.on_visible
+             function="Avatar.EnableFreezeEject"/>
+        </menu_item_call>
+        <menu_item_call
+         label="Eject"
+         name="Eject...">
+            <menu_item_call.on_click
+             function="Avatar.Eject" />
+            <menu_item_call.on_visible
+             function="Avatar.EnableFreezeEject"/>
+        </menu_item_call>
+        <menu_item_call
+         label="Debug"
+         name="Debug...">
+            <menu_item_call.on_click
+             function="Avatar.Debug" />
+            <menu_item_call.on_visible
+             function="IsGodCustomerService"/>
+        </menu_item_call>
+	    <menu_item_call
+         label="Zoom In"
+          name="Zoom In">
+        <menu_item_call.on_click
+           function="Tools.LookAtSelection"
+           parameter="zoom" />
+    </menu_item_call>
+   <menu_item_call
+     enabled="false"
+     label="Pay"
+     name="Pay...">
+        <menu_item_call.on_click
+         function="PayObject" />
+        <menu_item_call.on_enable
+         function="EnablePayAvatar" />
+    </menu_item_call>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_avatar_self.xml b/indra/newview/skins/default/xui/en/menu_avatar_self.xml
new file mode 100644
index 0000000000..c6ce612a76
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_avatar_self.xml
@@ -0,0 +1,227 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<context_menu
+ layout="topleft"
+ name="Self Pie">
+       <menu_item_call
+     label="Stand Up"
+     layout="topleft"
+     name="Stand Up">
+        <menu_item_call.on_click
+         function="Self.StandUp"
+         parameter="" />
+        <menu_item_call.on_enable
+         function="Self.EnableStandUp" />
+    </menu_item_call>
+    <context_menu
+     label="Take Off &gt;"
+     layout="topleft"
+     name="Take Off &gt;">
+        <context_menu
+         label="Clothes &gt;"
+         layout="topleft"
+         name="Clothes &gt;">
+            <menu_item_call
+             enabled="false"
+             label="Shirt"
+             layout="topleft"
+             name="Shirt">
+                <menu_item_call.on_click
+                 function="Edit.TakeOff"
+                 parameter="shirt" />
+                <menu_item_call.on_enable
+                 function="Edit.EnableTakeOff"
+                 parameter="shirt" />
+            </menu_item_call>
+            <menu_item_call
+             enabled="false"
+             label="Pants"
+             layout="topleft"
+             name="Pants">
+                <menu_item_call.on_click
+                 function="Edit.TakeOff"
+                 parameter="pants" />
+                <menu_item_call.on_enable
+                 function="Edit.EnableTakeOff"
+                 parameter="pants" />
+            </menu_item_call>
+            <menu_item_call
+             enabled="false"
+             label="Skirt"
+             layout="topleft"
+             name="Skirt">
+                <menu_item_call.on_click
+                 function="Edit.TakeOff"
+                 parameter="skirt" />
+                <menu_item_call.on_enable
+                 function="Edit.EnableTakeOff"
+                 parameter="skirt" />
+            </menu_item_call>
+            <menu_item_call
+             enabled="false"
+             label="Shoes"
+             layout="topleft"
+             name="Shoes">
+                <menu_item_call.on_click
+                 function="Edit.TakeOff"
+                 parameter="shoes" />
+                <menu_item_call.on_enable
+                 function="Edit.EnableTakeOff"
+                 parameter="shoes" />
+            </menu_item_call>
+            <menu_item_call
+             enabled="false"
+             label="Socks"
+             layout="topleft"
+             name="Socks">
+                <menu_item_call.on_click
+                 function="Edit.TakeOff"
+                 parameter="socks" />
+                <menu_item_call.on_enable
+                 function="Edit.EnableTakeOff"
+                 parameter="socks" />
+            </menu_item_call>
+            <menu_item_call
+             enabled="false"
+             label="Jacket"
+             layout="topleft"
+             name="Jacket">
+                <menu_item_call.on_click
+                 function="Edit.TakeOff"
+                 parameter="jacket" />
+                <menu_item_call.on_enable
+                 function="Edit.EnableTakeOff"
+                 parameter="jacket" />
+            </menu_item_call>
+            <menu_item_call
+             enabled="false"
+             label="Gloves"
+             layout="topleft"
+             name="Gloves">
+                <menu_item_call.on_click
+                 function="Edit.TakeOff"
+                 parameter="gloves" />
+                <menu_item_call.on_enable
+                 function="Edit.EnableTakeOff"
+                 parameter="gloves" />
+            </menu_item_call>
+           <menu_item_call
+                 enabled="false"
+                 label="Undershirt"
+                 layout="topleft"
+                 name="Self Undershirt">
+                    <menu_item_call.on_click
+                     function="Edit.TakeOff"
+                     parameter="undershirt" />
+                    <menu_item_call.on_enable
+                     function="Edit.EnableTakeOff"
+                     parameter="undershirt" />
+                </menu_item_call>
+               <menu_item_call
+                 enabled="false"
+                 label="Underpants"
+                 layout="topleft"
+                 name="Self Underpants">
+                    <menu_item_call.on_click
+                     function="Edit.TakeOff"
+                     parameter="underpants" />
+                    <menu_item_call.on_enable
+                     function="Edit.EnableTakeOff"
+                     parameter="underpants" />
+                </menu_item_call>
+               <menu_item_call
+                 enabled="false"
+                 label="Tattoo"
+                 layout="topleft"
+                 name="Self Tattoo">
+                    <menu_item_call.on_click
+                     function="Edit.TakeOff"
+                     parameter="tattoo" />
+                    <menu_item_call.on_enable
+                     function="Edit.EnableTakeOff"
+                     parameter="tattoo" />
+                </menu_item_call>
+               <menu_item_call
+                 enabled="false"
+                 label="Alpha"
+                 layout="topleft"
+                 name="Self Alpha">
+                    <menu_item_call.on_click
+                     function="Edit.TakeOff"
+                     parameter="alpha" />
+                    <menu_item_call.on_enable
+                     function="Edit.EnableTakeOff"
+                     parameter="alpha" />
+                </menu_item_call>				
+                <menu_item_separator
+                 layout="topleft" />
+                <menu_item_call
+                 label="All Clothes"
+                 layout="topleft"
+                 name="All Clothes">
+                    <menu_item_call.on_click
+                     function="Edit.TakeOff"
+                     parameter="all" />
+                </menu_item_call>
+        </context_menu>
+        <context_menu
+         label="HUD &gt;"
+         layout="topleft"
+         name="Object Detach HUD" />
+        <context_menu
+         label="Detach &gt;"
+         layout="topleft"
+         name="Object Detach" />
+        <menu_item_call
+         label="Detach All"
+         layout="topleft"
+         name="Detach All">
+            <menu_item_call.on_click
+             function="Self.RemoveAllAttachments"
+             parameter="" />
+            <menu_item_call.on_enable
+             function="Self.EnableRemoveAllAttachments" />
+        </menu_item_call>
+    </context_menu>
+     <menu_item_call
+     label="My Appearance"
+     layout="topleft"
+     name="Appearance...">
+        <menu_item_call.on_click
+         function="ShowFloater"
+         parameter="appearance" />
+        <menu_item_call.on_enable
+         function="Edit.EnableCustomizeAvatar" />
+    </menu_item_call>
+   <menu_item_call
+     label="My Friends"
+     layout="topleft"
+     name="Friends...">
+        <menu_item_call.on_click
+         function="SideTray.PanelPeopleTab"
+         parameter="friends_panel" />
+    </menu_item_call>
+   <!--menu_item_call
+     label="My Gestures"
+     layout="topleft"
+     name="Gestures...">
+        <menu_item_call.on_click
+         function="ShowFloater"
+         parameter="gestures" />
+    </menu_item_call-->
+    <menu_item_call
+     label="My Groups"
+     layout="topleft"
+     name="Groups...">
+        <menu_item_call.on_click
+         function="SideTray.PanelPeopleTab"
+         parameter="groups_panel" />
+    </menu_item_call>
+   <menu_item_call
+     label="My Profile"
+     layout="topleft"
+     name="Profile...">
+        <menu_item_call.on_click
+         function="ShowAgentProfile"
+         parameter="agent" />
+    </menu_item_call>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_land.xml b/indra/newview/skins/default/xui/en/menu_land.xml
new file mode 100644
index 0000000000..d88a2f8d25
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_land.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<context_menu
+ layout="topleft"
+ name="Land Pie">
+    <menu_item_call
+     label="About Land"
+     name="Place Information...">
+        <menu_item_call.on_click
+         function="ShowFloater"
+         parameter="about_land" />
+    </menu_item_call>
+ <!--   <menu_item_call
+     label="Go Here"
+     name="Go Here">
+        <menu_item_call.on_click
+         function="GoToObject" />
+    </menu_item_call>-->
+    <menu_item_call
+     label="Sit Here"
+     name="Sit Here">
+        <menu_item_call.on_click
+         function="Land.Sit" />
+    </menu_item_call>
+    <menu_item_separator
+     layout="topleft" />
+        <menu_item_call
+     enabled="false"
+     label="Buy This Land"
+     name="Land Buy">
+        <menu_item_call.on_click
+         function="ShowFloater"
+         parameter="buy land" />
+        <menu_item_call.on_enable
+         function="World.EnableBuyLand" />
+    </menu_item_call>
+   <menu_item_call
+     enabled="false"
+     label="Buy Pass"
+     name="Land Buy Pass">
+        <menu_item_call.on_click
+         function="Land.BuyPass" />
+        <menu_item_call.on_enable
+         function="Land.EnableBuyPass" />
+    </menu_item_call>
+            <menu_item_separator
+     layout="topleft" />
+   <menu_item_call
+     enabled="false"
+     label="Build"
+     name="Create">
+        <menu_item_call.on_click
+         function="Land.Build" />
+        <menu_item_call.on_enable
+         function="EnableEdit" />
+    </menu_item_call>
+    <menu_item_call
+     enabled="false"
+     label="Edit Terrain"
+     name="Edit Terrain">
+        <menu_item_call.on_click
+         function="Land.Edit" />
+        <menu_item_call.on_enable
+         function="EnableEdit" />
+    </menu_item_call>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_object.xml b/indra/newview/skins/default/xui/en/menu_object.xml
new file mode 100644
index 0000000000..62500c5116
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_object.xml
@@ -0,0 +1,158 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<context_menu
+ layout="topleft"
+ name="Object Pie">
+   <menu_item_call
+     enabled="false"
+     label="Touch"
+     name="Object Touch">
+        <menu_item_call.on_click
+         function="Object.Touch" />
+        <menu_item_call.on_enable
+         function="Object.EnableTouch"
+         name="EnableTouch"
+         parameter="Touch" />
+   </menu_item_call>
+   <menu_item_call
+     label="Edit"
+     name="Edit...">
+        <menu_item_call.on_click
+         function="Object.Edit" />
+        <menu_item_call.on_visible
+         function="EnableEdit"/>
+    </menu_item_call>
+    <menu_item_call
+      label="Build"
+      name="Build">
+      <menu_item_call.on_click
+       function="Object.Edit" />
+      <menu_item_call.on_visible
+       function="VisibleBuild"/>
+    </menu_item_call>
+   <menu_item_call
+     enabled="false"
+     label="Open"
+     name="Open">
+        <menu_item_call.on_click
+         function="Object.Open" />
+        <menu_item_call.on_enable
+         function="Object.EnableOpen" />
+   </menu_item_call>
+   <menu_item_call
+     enabled="false"
+     label="Sit Here"
+     name="Object Sit">
+        <menu_item_call.on_click
+         function="Object.SitOrStand" />
+        <menu_item_call.on_enable
+         function="Object.EnableSitOrStand"
+         name="EnableSitOrStand"
+         parameter="Sit Here,Stand Up" />
+    </menu_item_call>
+   <menu_item_call
+       label="Object Profile"
+       name="Object Inspect">
+         <menu_item_call.on_click
+          function="Object.Inspect" />
+         <menu_item_call.on_enable
+          function="Object.EnableInspect" />
+   </menu_item_call>
+<menu_item_separator layout="topleft" />
+   <context_menu
+         label="Put On &gt;"
+         name="Put On" >
+   <menu_item_call
+      enabled="false"
+      label="Wear"
+      name="Wear">
+            <menu_item_call.on_click
+             function="Object.AttachToAvatar" />
+            <menu_item_call.on_enable
+             function="Object.EnableWear" />
+   </menu_item_call>
+   <context_menu
+         label="Attach &gt;"
+         name="Object Attach" />
+   <context_menu
+         label="Attach HUD &gt;"
+         name="Object Attach HUD" />
+   </context_menu>
+   <context_menu
+         label="Remove &gt;"
+         name="Remove">
+   <menu_item_call
+     enabled="false"
+     label="Take"
+     name="Pie Object Take">
+        <menu_item_call.on_click
+         function="Tools.BuyOrTake" />
+        <menu_item_call.on_enable
+         function="Tools.EnableBuyOrTake"
+         parameter="Buy,Take" />
+    </menu_item_call>
+   <menu_item_call
+         enabled="false"
+         label="Report Abuse"
+         name="Report Abuse...">
+            <menu_item_call.on_click
+             function="Object.ReportAbuse" />
+            <menu_item_call.on_enable
+             function="Object.EnableReportAbuse" />
+   </menu_item_call>
+   <menu_item_call
+          enabled="false"
+          label="Block"
+          name="Object Mute">
+             <menu_item_call.on_click
+              function="Object.Mute" />
+             <menu_item_call.on_enable
+              function="Object.EnableMute" />
+   </menu_item_call>
+   <menu_item_call
+      enabled="false"
+      label="Return"
+      name="Return...">
+         <menu_item_call.on_click
+          function="Object.Return" />
+         <menu_item_call.on_enable
+          function="Object.EnableReturn" />
+     </menu_item_call>
+     <menu_item_call
+   enabled="false"
+   label="Delete"
+   name="Delete">
+      <menu_item_call.on_click
+       function="Object.Delete" />
+      <menu_item_call.on_enable
+       function="Object.EnableDelete" />
+    </menu_item_call>
+    </context_menu>
+   <menu_item_separator layout="topleft" />
+   <menu_item_call
+   enabled="false"
+   label="Take Copy"
+   name="Take Copy">
+      <menu_item_call.on_click
+       function="Tools.TakeCopy" />
+      <menu_item_call.on_enable
+       function="Tools.EnableTakeCopy" />
+  </menu_item_call>
+   <menu_item_call
+   enabled="false"
+   label="Pay"
+   name="Pay...">
+  <menu_item_call.on_click
+   function="PayObject" />
+  <menu_item_call.on_enable
+   function="EnablePayObject" />
+</menu_item_call>
+  <menu_item_call
+   enabled="false"
+   label="Buy"
+   name="Buy...">
+      <menu_item_call.on_click
+       function="Object.Buy" />
+      <menu_item_call.on_enable
+       function="Object.EnableBuy" />
+   </menu_item_call>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
index a41d492624..034f685ee9 100644
--- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml
+++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
@@ -114,7 +114,7 @@
           width="82"
           tool_tip="Shows/hides gestures">
              <gesture_combo_box.drop_down_button
-              pad_right="10" 
+              pad_right="10"
               use_ellipses="true" />
          </gesture_combo_box>
         </layout_panel>
@@ -126,7 +126,7 @@
          image_name="spacer24.tga"
          layout="topleft"
          left="0"
-         min_width="4" 
+         min_width="4"
          name="DUMMY"
          top="0"
          width="4"/>
@@ -168,7 +168,7 @@
          image_name="spacer24.tga"
          layout="topleft"
          left="0"
-         min_width="4" 
+         min_width="4"
          name="DUMMY"
          top="0"
          width="4"/>
@@ -211,7 +211,7 @@
          image_name="spacer24.tga"
          layout="topleft"
          left="0"
-         min_width="4" 
+         min_width="4"
          name="DUMMY"
          top="0"
          width="4"/>
@@ -243,7 +243,7 @@
         <layout_panel
          mouse_opaque="false"
          follows="left|right"
-         height="28"
+         height="29"
          layout="topleft"
          top="0"
          name="chiclet_list_panel"
@@ -251,24 +251,24 @@
          min_width="180"
          user_resize="false"
          auto_resize="true">
-<!--*NOTE: min_width of the chiclet_panel (chiclet_list) must be the same 
+<!--*NOTE: min_width of the chiclet_panel (chiclet_list) must be the same
 as for parent layout_panel (chiclet_list_panel) to resize bottom tray properly. EXT-991-->
             <chiclet_panel
 	    mouse_opaque="false"
              follows="left|right"
              height="23"
              layout="topleft"
-             left="0"
+             left="1"
              min_width="180"
              name="chiclet_list"
-             top="4"
+             top="6"
              chiclet_padding="4"
              scrolling_offset="40"
              width="189">
                 <button
                  auto_resize="true"
                  follows="right"
-                 height="23"
+                 height="29"
                  image_selected="SegmentedBtn_Left_Off"
                  image_unselected="SegmentedBtn_Left_Off"
 		 image_hover_selected="SegmentedBtn_Left_Over"
@@ -278,14 +278,16 @@ as for parent layout_panel (chiclet_list_panel) to resize bottom tray properly.
 		 image_overlay="Arrow_Small_Left"
                  layout="topleft"
                  name="chicklet_left_scroll_button"
+        scale_image="true"
                  tab_stop="false"
-                 top="0"
+                 top="-2"
+                 right_pad="2"
                  visible="false"
-                 width="20" />
+                 width="7" />
                 <button
                  auto_resize="true"
                  follows="right"
-                 height="23"
+                 height="29"
                  image_selected="SegmentedBtn_Right_Off"
                  image_unselected="SegmentedBtn_Right_Off"
 		 image_hover_selected="SegmentedBtn_Right_Over"
@@ -295,10 +297,11 @@ as for parent layout_panel (chiclet_list_panel) to resize bottom tray properly.
 		 image_overlay="Arrow_Small_Right"
                  layout="topleft"
                  name="chicklet_right_scroll_button"
+        scale_image="true"
                  tab_stop="false"
-                 top="0"
+                 top="-2"
                  visible="false"
-                 width="20" />
+                 width="7" />
             </chiclet_panel>
         </layout_panel>
         <icon
@@ -309,7 +312,7 @@ as for parent layout_panel (chiclet_list_panel) to resize bottom tray properly.
          image_name="spacer24.tga"
          layout="topleft"
          left="0"
-         min_width="4" 
+         min_width="4"
          top="0"
          width="5"/>
         <layout_panel
@@ -320,18 +323,18 @@ as for parent layout_panel (chiclet_list_panel) to resize bottom tray properly.
          min_height="28"
          top="0"
          name="im_well_panel"
-         width="34"
-         min_width="34"
+         width="35"
+         min_width="35"
          user_resize="false">
             <chiclet_im_well
-             flash_period="0.3" 
+             flash_period="0.3"
              follows="right"
              height="23"
              layout="topleft"
              left="0"
              name="im_well"
              top="4"
-             width="34">
+             width="35">
              <!--
 Emulate 4 states of button by background images, see detains in EXT-3147. The same should be for notification_well button
 xml attribute           Description
@@ -342,21 +345,22 @@ image_pressed_selected  "Lit" + "Selected" - there are new messages and the Well
              -->
                 <button
                  auto_resize="true"
-                 flash_color="EmphasisColor"
+                 flash_color="Yellow"
                  follows="right"
                  halign="center"
                  height="23"
-                 image_overlay="Notices_Unread"
-                 image_overlay_alignment="center" 
-                 image_pressed="WellButton_Lit"
-                 image_pressed_selected="WellButton_Lit_Selected"
-                 image_selected="PushButton_Selected_Press"
+                 image_overlay="Unread_IM"
+                 image_overlay_alignment="center"
+                 image_pressed="WellButton_Lit_Selected"
+                 image_pressed_selected="WellButton_Lit"
+                 image_selected="WellButton_Lit"
+                 label_color="Black"
                  left="0"
                  max_displayed_count="99"
                  name="Unread IM messages"
                  pad_left="0"
                  pad_right="0"
-                 width="34" >
+                 width="35" >
                     <button.init_callback
                      function="Button.SetDockableFloaterToggle"
                      parameter="im_well_window" />
@@ -370,9 +374,10 @@ image_pressed_selected  "Lit" + "Selected" - there are new messages and the Well
          layout="topleft"
          min_height="28"
          top="0"
+         left_pad="4"
          name="notification_well_panel"
-         width="34"
-         min_width="34"
+         width="35"
+         min_width="35"
          user_resize="false">
             <chiclet_notification
              flash_period="0.25"
@@ -383,23 +388,24 @@ image_pressed_selected  "Lit" + "Selected" - there are new messages and the Well
              max_displayed_count="99"
              name="notification_well"
              top="4"
-             width="34">
+             width="35">
               <button
-                 image_selected="PushButton_Selected_Press"
-                 image_pressed="WellButton_Lit"
-                 image_pressed_selected="WellButton_Lit_Selected"
+                 bottom_pad="3"
+                 image_selected="WellButton_Lit"
+                 image_pressed="WellButton_Lit_Selected"
+                 image_pressed_selected="WellButton_Lit "
               auto_resize="true"
                halign="center"
                height="23"
                follows="right"
-               flash_color="EmphasisColor"
-               left="0"
+               flash_color="Yellow"
+                label_color="Black"
+               left="5"
                name="Unread"
                image_overlay="Notices_Unread"
-               image_overlay_alignment="center" 
-               pad_right="0"
-               pad_left="0"
-               width="34" >
+               image_overlay_alignment="center"
+               pad_right="5"
+               width="35" >
                   <button.init_callback
                    function="Button.SetDockableFloaterToggle"
                    parameter="notification_well_window" />
@@ -413,7 +419,7 @@ image_pressed_selected  "Lit" + "Selected" - there are new messages and the Well
          height="10"
          image_name="spacer24.tga"
          layout="topleft"
-         min_width="4" 
+         min_width="4"
          right="-1"
          top="0"
          width="4"/>
diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml
index c9db75b5d8..6187b8f1e2 100644
--- a/indra/newview/skins/default/xui/en/panel_login.xml
+++ b/indra/newview/skins/default/xui/en/panel_login.xml
@@ -33,21 +33,31 @@ name="login_html"
 start_url=""
 top="0"
 height="600"
-     width="996" />
-<panel
+     width="980" />
+<layout_stack
 follows="left|bottom|right"
 name="login_widgets"
 layout="topleft"
+orientation="horizontal"
 top="519"
 width="996"
-     height="80">
+height="80">
+<layout_panel
+auto_resize="false"
+follows="left|bottom"
+name="login"
+layout="topleft"
+width="695"
+min_width="695"
+user_resize="false"
+height="80">
 <text
 follows="left|bottom"
 font="SansSerifSmall"
 height="16"
-left="20"
 name="first_name_text"
 top="20"
+left="20"
 width="150">
 First name:
 </text>
@@ -145,7 +155,7 @@ name="Typeregionname"   value="" />
 <combo_box
 allow_text_entry="true"
 font="SansSerifSmall"
-   follows="left|bottom"
+   follows="left|right|bottom"
    height="23"
 layout="topleft"
 top_pad="2"
@@ -164,14 +174,20 @@ width="135"
   name="connect_btn"
   top="35"
   width="90" />
- <text
+</layout_panel>
+<layout_panel
+follows="right|bottom"
+name="links"
+width="200"
+min_width="200"
+user_resize="false"
+height="80">
+   <text
 follows="right|bottom"
 font="SansSerifSmall"
-text_color="EmphasisColor"
 halign="right"
 height="16"
 top="12"
-left_pad="5"
 right="-10"
 name="create_new_account_text"
   width="180">
@@ -183,7 +199,9 @@ font="SansSerifSmall"
 text_color="EmphasisColor"
 halign="right"
 height="16"
-name="forgot_password_text"    top_pad="12"
+name="forgot_password_text"
+top_pad="12"
+right="-10"
   width="180">
        Forgot your name or password?
 </text>
@@ -195,6 +213,7 @@ halign="right"
 height="16"
 name="login_help"
 top_pad="2"
+right="-10"
     width="180">
        Need help logging in?   </text>
 <!--  <text
@@ -208,5 +227,6 @@ top_pad="2"
     word_wrap="true">
        [VERSION]
    </text>-->
-</panel>
+   </layout_panel>
+</layout_stack>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_main_inventory.xml b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
index 9990215dfd..4353b306cd 100644
--- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
@@ -17,7 +17,7 @@
      text_pad_left="14"
      follows="left|top|right"
 	height="23"
-     label="Filter"
+     label="Filter Inventory"
      layout="topleft"
      left="15"
 max_length="300"
diff --git a/indra/newview/skins/default/xui/en/panel_places.xml b/indra/newview/skins/default/xui/en/panel_places.xml
index 88df529ec1..c24f47750b 100644
--- a/indra/newview/skins/default/xui/en/panel_places.xml
+++ b/indra/newview/skins/default/xui/en/panel_places.xml
@@ -22,7 +22,7 @@ background_visible="true"
      height="23"
      layout="topleft"
      left="15"
-     label="Filter"
+     label="Filter Places"
      max_length="300"
      name="Filter"
      top="3"
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 5332007baf..d8e3f4ccfb 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
@@ -348,23 +348,24 @@
    label="Input/Output devices"
    layout="topleft"
    left="30"
-   top="270"
+   top="262"
    name="device_settings_btn"
    width="190">
   </button>
     <panel
-     background_visible="true"
+     background_visible="false"
      bg_alpha_color="DkGray"
      visiblity_control="ShowDeviceSettings"
      border="false"
      follows="top|left"
-     height="145"
+     height="120"
      label="Device Settings"
      layout="topleft"
      left="0"
      name="device_settings_panel"
      class="panel_voice_device_settings"
-     width="501">
+     width="501"
+     top="285">
       <panel.string
         name="default_text">
         Default
@@ -397,8 +398,33 @@
      left="165"
      max_chars="128"
      name="voice_input_device"
-     top_pad="0"
+     top_pad="-2"
      width="200" />
+   <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="16"
+     layout="topleft"
+     left="165"
+     name="My volume label"
+     top_pad="5"
+     width="200">
+        My volume:
+    </text>
+      <slider_bar
+        control_name="AudioLevelMic"
+     follows="left|top"
+     height="17"
+     increment="0.05"
+     initial_value="1.0"
+     layout="topleft"
+     left="160"
+     max_val="2"
+     name="mic_volume_slider"
+     tool_tip="Change the volume using this slider"
+     top_pad="-2"
+     width="220" />
     <text
      type="string"
      text_color="EmphasisColor"
@@ -408,7 +434,7 @@
      layout="topleft"
      left_pad="5"
      name="wait_text"
-     top_delta="5"
+     top_delta="0"
      width="110">
         Please wait
     </text>
@@ -417,7 +443,7 @@
      layout="topleft"
      left_delta="0"
      name="bar0"
-     top_delta="-5"
+     top_delta="0"
      width="20" />
     <locate
      height="20"
@@ -453,7 +479,7 @@
              left="80"
              name="speaker_icon"
              mouse_opaque="false"
-             top_pad="4"
+             top_pad="-8"
              visible="true"
              width="22" />
     <text
@@ -475,7 +501,7 @@
      left="165"
      max_chars="128"
      name="voice_output_device"
-     top_pad="0"
+     top_pad="-2"
      width="200" />
     </panel>
     </panel>
diff --git a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
index 3cddbed2d4..e04af2bad6 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
@@ -6,7 +6,7 @@
 	 name="item properties"
 	 help_topic="item_properties"
 	 save_rect="true"
-	 title="Object Profile"
+	 title="Inventory Item Properties"
 	 width="333">
 	<panel.string
 		 name="unknown">
@@ -50,15 +50,15 @@
      width="23" />
     <text
      follows="top|left|right"
-     font="SansSerifHuge"
+     font="SansSerifHugeBold"
      height="26"
      layout="topleft"
      left_pad="10"
      name="title"
-     text_color="LtGray"
+     text_color="white"
      top="0"
      use_ellipses="true"
-     value="Object Profile"
+     value="Item Properties"
      width="275" />
 	<panel
          follows="all"
@@ -71,7 +71,7 @@
          width="313"
    background_visible="true"
    bg_alpha_color="DkGray2">
-	    <text
+	    <text	 	 	 
 		     type="string"
 		     length="1"
 		     follows="left|top"
@@ -79,7 +79,7 @@
 		     layout="topleft"
 		     left="5"
 		     name="LabelItemNameTitle"
-		     top="10"
+		     top="5"
 		     width="78">
 	        Name:
 	    </text>
@@ -87,7 +87,7 @@
 		     border_style="line"
 		     border_thickness="1"
 	    	 follows="left|top|right"
-		     height="20"
+		     height="16"
 		     layout="topleft"
 	    	 left_delta="78"
 		     max_length="63"
@@ -102,7 +102,7 @@
 		     layout="topleft"
     		 left="5"
 		     name="LabelItemDescTitle"
-    		 top_pad="10"
+    		 top_delta="20"
 	    	 width="78">
 	        Description:
 	    </text>
@@ -115,7 +115,7 @@
     		 left_delta="78"
 		     max_length="127"
     		 name="LabelItemDesc"
-	    	 top_delta="-5"
+	    	 top_delta="0"
 	    	 width="225" />
 	    <text
 		     type="string"
@@ -123,41 +123,32 @@
 		     follows="left|top"
 		     height="23"
 		     layout="topleft"
-    		 left="5"
+		     left="10"
 		     name="LabelCreatorTitle"
-top_pad="10"
+		     top="65"
 		     width="78">
 	        Creator:
     	</text>
-	        <avatar_icon
-     follows="top|left"
-     height="20"
-     default_icon_name="Generic_Person"
-     layout="topleft"
-     left_pad="0"
-		     top_delta="-6"
-     mouse_opaque="true"
-     width="20" />
 	    <text
 		     type="string"
-     follows="left|right"
-     font="SansSerifSmall"
-     height="15"
-     layout="topleft"
-     left_pad="5"
+		     length="1"
+		     follows="left|top"
+		     height="23"
+		     layout="topleft"
+		     left_delta="78"
 		     name="LabelCreatorName"
-		     top_delta="6"
+		     top_delta="0"
 		     width="140">
 	        Nicole Linden
 	     </text>
 	     <button
 			 follows="top|right"
 			 height="23"
-			 label="Profile"
+			 label="Profile..."
 			 layout="topleft"
-			 right="-1"
+			 left_delta="144"
 			 name="BtnCreator"
-			 top_delta="-6"
+			 top_delta="0"
 			 width="78" />
 	     <text
 			 type="string"
@@ -165,41 +156,32 @@ top_pad="10"
 			 follows="left|top"
 			 height="23"
 			 layout="topleft"
-    		 left="5"
+			 left="10"
 			 name="LabelOwnerTitle"
-top_pad="5"
+			 top="85"
 			 width="78">
 			    Owner:
 	     </text>
-	     <avatar_icon
-     follows="top|left"
-     height="20"
-     default_icon_name="Generic_Person"
-     layout="topleft"
-     left_pad="0"
-		     top_delta="-6"
-     mouse_opaque="true"
-     width="20" />
 	     <text
 			 type="string"
-     follows="left|right"
-     font="SansSerifSmall"
-     height="15"
-     layout="topleft"
-     left_pad="5"
+			 length="1"
+			 follows="left|top"
+			 height="23"
+			 layout="topleft"
+			 left_delta="78"
 			 name="LabelOwnerName"
-			 top_delta="6"
+			 top_delta="0"
 			 width="140">
 			    Thrax Linden
 	     </text>
 	     <button
 			 follows="top|right"
 			 height="23"
-			 label="Profile"
+			 label="Profile..."
 			 layout="topleft"
-			 right="-1"
+			 left_delta="144"
 			 name="BtnOwner"
-			 top_delta="-3"
+			 top_delta="0"
 			 width="78" />
 	     <text
 			 type="string"
@@ -207,9 +189,9 @@ top_pad="5"
 			 follows="left|top"
 			 height="23"
 			 layout="topleft"
-    		 left="5"
+			 left="10"
 			 name="LabelAcquiredTitle"
-top_pad="10"
+			 top="105"
 			 width="78">
 			Acquired:
 	     </text>
@@ -225,146 +207,134 @@ top_pad="10"
 			 width="222">
 			Wed May 24 12:50:46 2006
 	    </text>
-	 <panel
-         border="false"
-         follows="left|top"
-         layout="topleft"
-         mouse_opaque="false"
-         background_visible="true"
-         bg_alpha_color="DkGray"
-         name="perms_inv"
-         left="0"
-         top_pad="25"
-         height="155"
-         width="313">
-	  <text
-             type="string"
-             length="1"
-             left="10"
-             top_pad="13"
-             text_color="EmphasisColor"
-	     height="15"
-             follows="left|top|right"
-             layout="topleft"
-             name="perm_modify"
-             width="200">
-                You can:
-            </text>
+	    <text
+			 type="string"
+			 length="1"
+			 follows="left|top"
+			 height="23"
+			 layout="topleft"
+			 left="10"
+			 name="OwnerLabel"
+			 top="125"
+			 width="78">
+			You:
+	    </text>
 	    <check_box
-			 height="18"
-			 label="Modify"
+			 height="23"
+			 label="Edit"
 			 layout="topleft"
-			 left="20"
+			 left_pad="5"
 			 name="CheckOwnerModify"
-			 top_pad="0"
-			 width="90" />
+			 top_delta="0"
+			 width="78" />
 	    <check_box
-			 height="18"
+			 height="23"
 			 label="Copy"
 			 layout="topleft"
-			 left_pad="0"
+			 left_delta="0"
 			 name="CheckOwnerCopy"
-			 width="90" />
+			 top_pad="5"
+			 width="88" />
 	    <check_box
-			 height="18"
-			 label="Transfer"
+			 height="23"
+			 label="Resell"
 			 layout="topleft"
-			 left_pad="0"
+			 left_delta="0"
 			 name="CheckOwnerTransfer"
+			 top_pad="5"
 			 width="106" />
 	    <text
 			 type="string"
 			 length="1"
 			 follows="left|top"
-			 height="16"
+			 height="10"
 			 layout="topleft"
 			 left="10"
 			 name="AnyoneLabel"
-			 top_pad="8"
-			 width="100">
+			 top_pad="5"
+			 width="78">
 			Anyone:
 	    </text>
 	    <check_box
-			 height="18"
+			 height="16"
 			 label="Copy"
 			 layout="topleft"
-			 left_pad="0"
+			 left_pad="5"
 			 name="CheckEveryoneCopy"
-			 top_delta="-2"
-			 width="150" />
+			 top_delta="0"
+			 width="130" />
     	<text
 			 type="string"
 			 length="1"
 			 follows="left|top"
-			 height="16"
+			 height="10"
 			 layout="topleft"
 			 left="10"
 			 name="GroupLabel"
-			 top_pad="8"
-			 width="100">
+			 top_pad="5"
+			 width="78">
 			Group:
     	</text>
 	    <check_box
-			 height="18"
+			 height="16"
 			 label="Share"
 			 layout="topleft"
-			 left_pad="0"
-			 top_delta="-2"
+			 left_pad="5"
 			 name="CheckShareWithGroup"
-			 tool_tip="Allow all members of the set group to share your modify permissions for this object. You must Deed to enable role restrictions."
-			 width="150" />
+			 top_delta="5"
+			 width="106" />
 	    <text
 			 type="string"
 			 length="1"
 			 follows="left|top"
-			 height="16"
+			 height="25"
 			 layout="topleft"
 			 left="10"
 			 name="NextOwnerLabel"
-			 top_pad="8"
-			 width="200"
+			 top_pad="5"
+			 width="78"
 			 word_wrap="true">
 			Next owner:
 	    </text>
 	    <check_box
-			 height="18"
-			 label="Modify"
+			 height="16"
+			 label="Edit"
 			 layout="topleft"
-			 left="20"
-			 top_pad="0"
+			 left_pad="5"
 			 name="CheckNextOwnerModify"
-			 width="90" />
+			 top_delta="0"
+			 width="78" />
 	    <check_box
-			 height="18"
+			 height="16"
 			 label="Copy"
 			 layout="topleft"
-			 left_pad="0"
+			 left_delta="0"
 			 name="CheckNextOwnerCopy"
-			 width="90" />
+			 top_pad="5"
+			 width="88" />
 	    <check_box
-			 height="18"
-			 label="Transfer"
+			 height="16"
+			 label="Resell"
 			 layout="topleft"
-			 left_pad="0"
+			 left_delta="0"
 			 name="CheckNextOwnerTransfer"
-			 tool_tip="Next owner can give away or resell this object"
+			 top_pad="5"
 			 width="106" />
-	    </panel>
 	    <check_box
-			 height="18"
+			 height="16"
 			 label="For Sale"
 			 layout="topleft"
-			 left="20"
+			 left="10"
 			 name="CheckPurchase"
-			 top_pad="20"
-			 width="100" />
+			 top_pad="5"
+			 width="78" />
 		<combo_box
-			 height="23"
-			 left_pad="0"
+			 height="19"
+			 left_pad="5"
 			 layout="topleft"
 			 follows="left|top"
 			 name="combobox sale copy"
-			 width="170">
+			 width="110">
 			<combo_box.item
 			     label="Copy"
 			     name="Copy"
@@ -380,14 +350,26 @@ top_pad="10"
 			    increment="1"
 			    control_name="Edit Cost"
 			    name="Edit Cost"
-			    label="Price: L$"
-			    label_width="75"
-			    left="120"
-			    width="170"
+			    label="Price:"
+			    label_width="100"
+			    left="10"
+			    width="192"
 			    min_val="1"
-			    height="23"
+			    height="19"
 			    max_val="999999999"
-			    top_pad="10"/>
+			    top_pad="5"/>
+	    <text
+			    type="string"
+			    length="1"
+			    height="15"
+			    follows="left|top"
+			    layout="topleft"
+			    left_delta="82"
+			    name="CurrencySymbol"
+			    top_delta="1"
+			    width="18">
+			L$
+	    </text>
 	    <!--line_editor
 			 border_style="line"
 			 border_thickness="1"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 3044f10573..1f7784d9ab 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -460,7 +460,7 @@ Returns the rotation of detected object number (returns &lt;0,0,0,1&gt; if numbe
 	</string>
 	<string name="LSLTipText_llDetectedGroup" translate="false">
 integer llDetectedGroup(integer number)
-Returns an integer that is a boolean representing if the detected object or avatar is in the same group that the prim containing the script is set to
+Returns TRUE if detected object is part of same group as owner
 	</string>
 	<string name="LSLTipText_llDetectedLinkNumber" translate="false">
 integer llDetectedLinkNumber(integer number)
@@ -2112,6 +2112,10 @@ this texture in your inventory
 		Unknown file extension .%s
 Expected .wav, .tga, .bmp, .jpg, .jpeg, or .bvh
 	</string>
+  <string name="MuteObject">Block</string>
+  <string name="MuteAvatar">Block</string>
+  <string name="UnmuteObject">Unblock</string>
+  <string name="UnmuteAvatar">Unblock</string>
 	<string name="AddLandmarkNavBarMenu">Add to My Landmarks...</string>
 	<string name="EditLandmarkNavBarMenu">Edit my Landmark...</string>
 
diff --git a/indra/newview/skins/default/xui/en/widgets/button.xml b/indra/newview/skins/default/xui/en/widgets/button.xml
index 28ed560543..d7aa71a441 100644
--- a/indra/newview/skins/default/xui/en/widgets/button.xml
+++ b/indra/newview/skins/default/xui/en/widgets/button.xml
@@ -18,5 +18,6 @@
 	font="SansSerifSmall"
         hover_glow_amount="0.15"
         halign="center"
+        pad_bottom="2" 
         scale_image="true">
 </button>
diff --git a/indra/newview/skins/default/xui/en/widgets/floater.xml b/indra/newview/skins/default/xui/en/widgets/floater.xml
index 19fb520b44..85d0c633af 100644
--- a/indra/newview/skins/default/xui/en/widgets/floater.xml
+++ b/indra/newview/skins/default/xui/en/widgets/floater.xml
@@ -9,8 +9,6 @@
  background_visible="true"
  background_opaque="false"
  header_height="25"
-         top="0"
-         left="0" 
  close_image="Icon_Close_Foreground"
  restore_image="Icon_Restore_Foreground"
  minimize_image="Icon_Minimize_Foreground"