Merge with SVN viewer-2.0.0-3 branch

13 files changed, 568 insertions, 515 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_test_inspectors.xml b/indra/newview/skins/default/xui/en/floater_test_inspectors.xml
new file mode 100644
index 0000000000..b23bf49435
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_test_inspectors.xml
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ can_resize="true"
+ height="400"
+ layout="topleft"
+ name="floater_test_inspectors"
+ title="Test Inspectors" 
+ width="400">
+  <text
+   height="20"
+   left="10"
+   name="test_inspectors"
+   top="30"
+   width="300">
+    Click to spawn an inspector:
+  </text>
+  <!-- James Tester, 4 years old -->
+  <button
+    name="avatar_2d_btn1"
+    label="Avatar 2D"
+    top="50"
+    left="10"
+    height="20"
+    width="100"
+	commit_callback.function="ShowAvatarInspector"
+	commit_callback.parameter="22df1dcb-810a-4975-aab9-0159958fe155" />
+	<!-- DonkeyPuncher 2008-10-1 -->
+  <button
+    name="avatar_2d_btn5"
+    label="Avatar 2D"
+    top_pad="10"
+    left="10"
+    height="20"
+    width="100"
+	commit_callback.function="ShowAvatarInspector"
+	commit_callback.parameter="d5330e4e-391a-4f00-9352-b797ed2f9a97" />
+	<!-- DonkeyPuncher 2009-01-15 -->
+  <button
+    name="avatar_2d_btn2"
+    label="Avatar 2D"
+    top_pad="10"
+    left="10"
+    height="20"
+    width="100"
+	commit_callback.function="ShowAvatarInspector"
+	commit_callback.parameter="05511655-a58a-48b6-b645-966f69fc17a7" />
+	<!-- 2009-06-14 -->
+  <button
+    name="avatar_2d_btn3"
+    label="Avatar 2D"
+    top_pad="10"
+    left="10"
+    height="20"
+    width="100"
+	commit_callback.function="ShowAvatarInspector"
+	commit_callback.parameter="6a164b3d-7c2c-43eb-880a-0ebc0687b3ec" />
+	<!-- jarvtest Bombastic 2009-10-3 -->
+  <button
+    name="avatar_2d_btn4"
+    label="Avatar 2D"
+    top_pad="10"
+    left="10"
+    height="20"
+    width="100"
+	commit_callback.function="ShowAvatarInspector"
+	commit_callback.parameter="e7dc3c83-1e11-4fa7-beeb-4b18adfb4efa" />
+  <button
+    name="avatar_3d_btn"
+    label="Avatar 3D"
+    top="50"
+    left="150"
+    height="20"
+    width="100"/>
+  <button
+    name="object_2d_btn"
+    label="Object 2D"
+    top_pad="10"
+    left_delta="0"
+    height="20"
+    width="100"/>
+  <button
+    name="object_3d_btn"
+    label="Object 3D"
+    top_pad="10"
+    left_delta="0"
+    height="20"
+    width="100"/>
+  <button
+    name="group_btn"
+    label="Group"
+    top_pad="10"
+    left_delta="0"
+    height="20"
+    width="100"/>
+  <button
+    name="place_btn"
+    label="Place"
+    top_pad="10"
+    left_delta="0"
+    height="20"
+    width="100"/>
+  <button
+    name="event_btn"
+    label="Event"
+    top_pad="10"
+    left_delta="0"
+    height="20"
+    width="100"/>
+
+</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index a126a932df..b53f4fb99c 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
  follows="left|top|right"
- height="615"
+ height="570"
  layout="topleft"
  name="toolbox floater"
  save_rect="true"
@@ -27,7 +27,7 @@
     </floater.string>
     <floater.string
      name="status_camera">
-        Click and drag to change view
+        Click and drag to move camera
     </floater.string>
     <floater.string
      name="status_grab">
@@ -224,35 +224,27 @@
       left="10"
      follows="left|top"
       control_name="EditLinkedParts"
-     label="Edit linked prims"
+     label="Edit linked"
      layout="topleft"
      name="checkbox edit linked parts" />
-    <text
-      left="10"
-      type="string"
-      length="1"
-      follows="left|top"
-      layout="topleft"
-      name="text ruler mode">
-        Ruler:
-    </text>
     <combo_box
      height="19"
-      left="30"
+     left="10"
      layout="topleft"
      follows="left|top"
+     top_pad="0"
      name="combobox grid mode"
-     width="90">
+     width="120">
         <combo_box.item
-         label="World"
+         label="World ruler"
          name="World"
          value="World" />
         <combo_box.item
-         label="Local"
+         label="Local ruler"
          name="Local"
          value="Local" />
         <combo_box.item
-         label="Reference"
+         label="Reference ruler"
          name="Reference"
          value="Reference" />
     </combo_box>
@@ -263,7 +255,7 @@
      layout="topleft"
      left="143"
      name="checkbox uniform"
-      top="54"
+      top="50"
      width="134" />
     <check_box
      control_name="ScaleStretchTextures"
@@ -272,28 +264,27 @@
      label="Stretch Textures"
      layout="topleft"
      name="checkbox stretch textures"
-     top_pad="1"
+     top_pad="0"
      width="134" />
     <check_box
      control_name="SnapEnabled"
      height="19"
      initial_value="true"
-     label="Use Grid"
+     label="Snap to Grid"
      layout="topleft"
      name="checkbox snap to grid"
-     top_pad="1"
+     top_pad="0"
      width="134" />
     <button
-     follows="left|top"
-     font="SansSerifSmall"
-     height="19"
-     left_delta="40"
-     top_delta="20"
-     label="Options..."
-     label_selected="Options..."
+     left="163"
+     top_pad="0"
+     image_overlay="Arrow_Right_Off"
+     picture_style="true"
+     label_selected="Options"
      layout="topleft"
      name="Options..."
-     width="78" /> 
+     width="26"
+     height="22" />
     <button
      follows="left|top"
      height="24"
@@ -605,7 +596,7 @@
          top_delta="15"
          width="114" />
     </radio_group>
-    
+
     <text
      type="string"
      length="1"
@@ -680,7 +671,7 @@
      type="string"
      text_color="LabelSelectedDisabledColor"
      length="1"
-     top_pad="7"
+     top_pad="4"
      height="12"
      follows="left|top"
      halign="right"
@@ -722,7 +713,7 @@
          top="16">
             <panel.string
              name="text deed continued">
-                Deed...
+                Deed
             </panel.string>
             <panel.string
              name="text deed">
@@ -776,7 +767,7 @@
              layout="topleft"
              left="10"
              name="Name:"
-             top_pad="8"
+             top="0"
              width="90">
                 Name:
             </text>
@@ -789,7 +780,7 @@
              name="Object Name"
              select_on_focus="true"
              top_delta="0"
-             width="172" />
+             width="165" />
             <text
              type="string"
              length="1"
@@ -811,8 +802,7 @@
              name="Object Description"
              select_on_focus="true"
              top_delta="0"
-             width="172" />
-
+             width="165" />
             <text
              type="string"
              left="10"
@@ -833,21 +823,9 @@
              height="19"
              layout="topleft"
              name="Creator Name"
-             width="150">
-                Thrax Linden
+             width="175">
+                Esbee Linden
             </text>
-<!--TODO: Kill this-->
-<!--            <button
-             follows="top|right"
-             font="SansSerifSmall"
-             height="19"
-             label="Profile..."
-             label_selected="Profile..."
-             layout="topleft"
-             left_pad="6"
-             name="button creator profile"
-             tool_tip="View creator profile"
-             width="78" />-->
             <text
              type="string"
              length="1"
@@ -868,21 +846,9 @@
              layout="topleft"
              name="Owner Name"
              left_pad="0"
-             width="150">
-                Thrax Linden
+             width="175">
+                Erica Linden
             </text>
-<!--TODO: Kill this-->
-<!--<button
-             follows="top|right"
-             font="SansSerifSmall"
-             height="19"
-             label="Profile..."
-             label_selected="Profile..."
-             layout="topleft"
-             left_pad="6"
-             name="button owner profile"
-             tool_tip="View owner profile"
-             width="78" />-->
            <text
              type="string"
              length="1"
@@ -891,40 +857,39 @@
              left="10"
              height="19"
              name="Group:"
-             width="90">
+             width="70">
                 Group:
             </text>
             <name_box
-             follows="left|top|right"
+             follows="left|top"
              height="19"
              initial_value="Loading..."
              layout="topleft"
              left_pad="0"
              name="Group Name Proxy"
-             width="170" />
+             width="159" />
+             <button
+             follows="left|top"
+            left_pad="0"
+     image_overlay="Arrow_Right_Off"
+     picture_style="true"
+     layout="topleft"
+     name="button set group"
+     tool_tip="Choose a group to share this object's permissions"
+     width="26"
+     height="22" />
             <button
-             follows="top|right"
+             follows="top|left"
              font="SansSerifSmall"
              height="19"
-             label="Deed..."
-             label_selected="Deed..."
+             label="Deed"
+             label_selected="Deed"
              layout="topleft"
              name="button deed"
              top_pad="0"
-             left="102"
+             left="80"
              tool_tip="Deeding gives this item away with Next Owner permissions. Group shared objects can be deeded by a group officer."
-             width="80" />
-            <button
-            follows="left|top"
-             font="SansSerifSmall"
-             height="19"
-             label="Set..."
-             label_selected="Set..."
-             layout="topleft"
-             left_pad="7"
-             name="button set group"
-             tool_tip="Choose a group to share this object's permissions"
-             width="80" />
+             width="90" />
             <check_box
              height="19"
              follows="left|top"
@@ -932,18 +897,18 @@
              layout="topleft"
              name="checkbox share with group"
              tool_tip="Allow all members of the set group to share your modify permissions for this object. You must Deed to enable role restrictions."
-             left="100"
+             left_pad="5"
              width="93" />
             <text
              type="string"
              length="1"
              follows="left|top"
-             height="19"
+             height="16"
              layout="topleft"
-             top_pad="7"
+             top_pad="15"
              left="10"
              name="label click action"
-             width="90">
+             width="100">
                 Click to:
             </text>
             <combo_box
@@ -951,7 +916,7 @@
              height="22"
              layout="topleft"
              name="clickaction"
-             width="170"
+             width="155"
              left_pad="0">
                 <combo_box.item
                  label="Touch  (default)"
@@ -973,23 +938,15 @@
                  label="Open"
                  name="Open"
                  value="Open" />
-<!--TODO: Kill this-->
-<!--                <combo_box.item
-                 label="Play parcel media"
-                 name="Play"
-                 value="Play" />
-                <combo_box.item
-                 label="Open parcel media"
-                 name="Opemmedia"
-                 value="Open Media" />-->
             </combo_box>
             <check_box
-             height="20"
+             height="16"
+             top_pad="15"
              label="For Sale:"
              layout="topleft"
              name="checkbox for sale"
              left="10"
-             width="90" />
+             width="100" />
 <!-- NEW SALE TYPE COMBO BOX -->
       <combo_box
             left_pad="0"
@@ -997,22 +954,22 @@
             follows="left|top"
             allow_text_entry="false"
             height="22"
-            width="170"
+            width="155"
             max_chars="20"
             mouse_opaque="true"
             name="sale type"
             intial_value="2">
         <combo_item
            name="Copy"
-           label="Copy" 
+           label="Copy"
            value="2" />
         <combo_item
            name="Contents"
-           label="Contents"  
+           label="Contents"
            value="3" />
         <combo_item
            name="Original"
-           label="Original" 
+           label="Original"
            value="1" />
       </combo_box>
 <!-- NEW PRICE SPINNER -->
@@ -1020,118 +977,55 @@
         follows="left|top"
         decimal_digits="0"
         increment="1"
+        top_pad="10"
         control_name="Edit Cost"
         name="Edit Cost"
         label="Price: L$"
         label_width="60"
-        width="170"
+        width="155"
         min_val="1"
         height="19"
         max_val="999999999" />
-        <panel
+      <check_box
+             left="107"
+             height="15"
+             width="100"
+             label="Show in search"
+             layout="topleft"
+             name="search_check"
+             tool_tip="Let people see this object in search results"
+              />
+<panel
          border="false"
-         follows="left|top|right"
+         follows="left|top"
          layout="topleft"
          mouse_opaque="false"
          background_visible="true"
          bg_alpha_color="FloaterUnfocusBorderColor"
          name="perms_build"
          left="0"
-         height="140"
+         top="240"
+         height="120"
          width="280">
             <text
              type="string"
              length="1"
              left="10"
-             top_pad="6"
-             height="19"
+             top_pad="10"
+             text_color="EmphasisColor"
+             height="16"
              follows="left|top|right"
              layout="topleft"
              name="perm_modify"
-             width="180">
+             width="250">
                 You can modify this object
             </text>
             <text
-             type="string"
-             text_color="LabelSelectedDisabledColor"
-             length="1"
-             top_pad="0"
-             follows="left|top"
-             layout="topleft"
-             left="17"
-             name="B:"
-             width="30">
-                B:
-            </text>
-            <text
-             type="string"
-             text_color="LabelSelectedDisabledColor"
-             length="1"
-             follows="left|top"
-             layout="topleft"
-             left_pad="0"
-             name="O:"
-             width="30">
-                O:
-            </text>
-            <text
-             type="string"
-             text_color="LabelSelectedDisabledColor"
-             length="1"
-             follows="left|top"
-             layout="topleft"
-             left_pad="0"
-             name="G:"
-             width="30">
-                G:
-            </text>
-            <text
-             type="string"
-             text_color="LabelSelectedDisabledColor"
-             length="1"
-             follows="left|top"
-             left_pad="0"
-             layout="topleft"
-             name="E:"
-             width="30">
-                E:
-            </text>
-            <text
-             type="string"
-             text_color="LabelSelectedDisabledColor"
-             length="1"
-             follows="left|top"
-             layout="topleft"
-             left_pad="0"
-             name="N:"
-             width="30">
-                N:
-            </text>
-            <text
-             type="string"
-             text_color="LabelSelectedDisabledColor"
-             length="1"
-             follows="left|top"
-             layout="topleft"
-             left_pad="0"
-             name="F:"
-             width="30">
-                F:
-            </text>
-             <check_box
-             left="15"
-             height="19"
-             label="Show in search"
-             layout="topleft"
-             name="search_check"
-             tool_tip="Let people see this object in search results"
-              />
-            <text
                type="string"
                follows="left|top"
                name="Anyone can:"
                width="250"
-               top_pad="7"
+               top_pad="5"
                left="10">
                  Anyone:
             </text>
@@ -1148,13 +1042,20 @@
              layout="topleft"
              left_pad="0"
              name="checkbox allow everyone copy"
-             width="260" />
+             width="90" />
+           <check_box
+             height="19"
+             label="Use"
+             layout="topleft"
+             left_pad="0"
+             name="allow everyone to use"
+             width="90" />
             <text
                type="string"
                follows="left|top"
                height="19"
                name="Next owner can:"
-               width="270"
+               width="250"
                left="10">
                   Next owner:
             </text>
@@ -1183,192 +1084,134 @@
              top_delta="0"
              tool_tip="Next owner can give away or resell this object"
              width="90" />
-        </panel>
-<!--TODO: KILL THIS-->
-<!--<text
+            <text
              type="string"
+             text_color="EmphasisColor_35"
              length="1"
+             top_pad="5"
              follows="left|top"
-             height="19"
              layout="topleft"
-             left_pad="12"
-             name="Cost"
-             top_delta="0"
-             width="78">
-                Price:  L$
+             left="18"
+             name="B:"
+             height="10"
+             width="30">
+                B:
             </text>
-            <line_editor
-             follows="left|top|right"
-             height="19"
+            <text
+             type="string"
+             text_color="EmphasisColor_35"
+             length="1"
+             follows="left|top"
              layout="topleft"
              left_pad="0"
-             max_length="25"
-             name="Edit Cost"
-             top_delta="0"
-             width="75" />-->
-<!--TODO: KILL THIS-->
-<!--<radio_group
-             follows="left|top|right"
-             height="19"
-             left="15"
-             layout="topleft"
-             name="sale type"
-             width="218">
-                <radio_item
-                 height="19"
-                 label="Original"
-                 layout="topleft"
-                 left="0"
-                 name="Original"
-                 top="0"
-                 width="70" />
-                <radio_item
-                 height="19"
-                 label="Copy"
-                 layout="topleft"
-                 left_delta="70"
-                 name="Copy"
-                 top_delta="0"
-                 width="70" />
-                <radio_item
-                 height="19"
-                 label="Contents"
-                 layout="topleft"
-                 left_delta="70"
-                 name="Contents"
-                 top_delta="0"
-                 width="76" />
-        </radio_group>-->
-        </panel>
-        <panel
-         border="false"
-         follows="left|top|right|bottom"
-         height="367"
-         label="Object"
-         layout="topleft"
-         left_delta="0"
-         mouse_opaque="false"
-         name="Object"
-         top_delta="0"
-         width="280">
+             name="O:"
+             height="10"
+             width="30">
+                O:
+            </text>
             <text
              type="string"
+             text_color="EmphasisColor_35"
              length="1"
              follows="left|top"
+             layout="topleft"
+             left_pad="0"
+             name="G:"
              height="10"
+             width="30">
+                G:
+            </text>
+            <text
+             type="string"
+             text_color="EmphasisColor_35"
+             length="1"
+             follows="left|top"
+             left_pad="0"
              layout="topleft"
-             left="10"
-             name="select_single"
-             top="10"
-             width="252">
-                Select only one primitive to edit parameters.
+             name="E:"
+             height="10"
+             width="30">
+                E:
             </text>
             <text
              type="string"
+             text_color="EmphasisColor_35"
              length="1"
              follows="left|top"
+             layout="topleft"
+             left_pad="0"
+             name="N:"
              height="10"
+             width="30">
+                N:
+            </text>
+            <text
+             type="string"
+             text_color="EmphasisColor_35"
+             length="1"
+             follows="left|top"
              layout="topleft"
-             left_delta="0"
-             name="edit_object"
-             top_delta="0"
-             width="252">
-                Edit object parameters:
+             left_pad="0"
+             name="F:"
+             height="10"
+             width="30">
+                F:
             </text>
+   </panel>
+      </panel>
+      <panel
+         border="false"
+         follows="left|top|right|bottom"
+         height="367"
+         label="Object"
+         layout="topleft"
+         left_delta="0"
+         mouse_opaque="false"
+         name="Object"
+         top="16"
+         width="280">
             <check_box
              height="19"
              label="Locked"
              layout="topleft"
-             left_delta="-2"
              name="checkbox locked"
              tool_tip="Prevents object from being moved or deleted. Frequently useful during building to avoid unintended edits."
-             top_pad="10"
+             top_pad="5"
+             left="10"
              width="123" />
             <check_box
              height="19"
              label="Physical"
              layout="topleft"
-             left_delta="0"
              name="Physical Checkbox Ctrl"
              tool_tip="Allows object to be pushed and affected by gravity"
-             top_pad="2"
+             top_pad="0"
              width="123" />
             <check_box
              height="19"
              label="Temporary"
              layout="topleft"
-             left_delta="0"
              name="Temporary Checkbox Ctrl"
              tool_tip="Causes object to be deleted 1 minute after creation."
-             top_pad="2"
+             top_pad="0"
              width="123" />
             <check_box
              height="19"
              label="Phantom"
              layout="topleft"
-             left_delta="0"
              name="Phantom Checkbox Ctrl"
              tool_tip="Causes object to not collide with other objects or avatars"
-             top_pad="2"
+             top_pad="0"
              width="123" />
-            
-            <text
-             type="string"
-             length="1"
-             follows="left|top"
-             height="10"
-             layout="topleft"
-             left_delta="0"
-             name="label material"
-             top_pad="9"
-             width="121">
-                Material
-            </text>
-            <combo_box
-             height="19"
-             layout="topleft"
-             left_delta="0"
-             name="material"
-             top_pad="4"
-             width="95">
-                <combo_box.item
-                 label="Stone"
-                 name="Stone"
-                 value="Stone" />
-                <combo_box.item
-                 label="Metal"
-                 name="Metal"
-                 value="Metal" />
-                <combo_box.item
-                 label="Glass"
-                 name="Glass"
-                 value="Glass" />
-                <combo_box.item
-                 label="Wood"
-                 name="Wood"
-                 value="Wood" />
-                <combo_box.item
-                 label="Flesh"
-                 name="Flesh"
-                 value="Flesh" />
-                <combo_box.item
-                 label="Plastic"
-                 name="Plastic"
-                 value="Plastic" />
-                <combo_box.item
-                 label="Rubber"
-                 name="Rubber"
-                 value="Rubber" />
-            </combo_box>
+
             <text
              type="string"
              length="1"
              follows="left|top"
              height="10"
              layout="topleft"
-             left_delta="2"
              name="label position"
-             top_pad="8"
+             top_pad="10"
              width="121">
                 Position (meters)
             </text>
@@ -1384,7 +1227,7 @@
              max_val="512"
              min_val="-256"
              name="Pos X"
-             text_enabled_color="0.43 0.06 0.06 1"
+             text_enabled_color="1 0 0.3 .7"
              top_pad="5"
              width="87" />
             <spinner
@@ -1399,7 +1242,7 @@
              max_val="512"
              min_val="-256"
              name="Pos Y"
-             text_enabled_color="0 0.39 0.15 1"
+             text_enabled_color="EmphasisColor"
              top_pad="3"
              width="87" />
             <spinner
@@ -1413,7 +1256,7 @@
              left_delta="0"
              max_val="4096"
              name="Pos Z"
-             text_enabled_color="0 0.26 0.51 1"
+             text_enabled_color="0 0.8 1 .65"
              top_pad="3"
              width="87" />
             <text
@@ -1533,8 +1376,8 @@
              text_enabled_color="1 1 1 1"
              top_pad="3"
              width="87" />
-            
-            <text
+
+ <!--           <text
              type="string"
              length="1"
              follows="left|top"
@@ -1542,16 +1385,16 @@
              layout="topleft"
              left="125"
              name="label basetype"
-             top="26"
+             top="5"
              width="150">
-                Building Block Type
-            </text>
+                Prim Type
+            </text>-->
             <combo_box
              height="19"
              layout="topleft"
-             left_delta="0"
              name="comboBaseType"
-             top_pad="4"
+             top="5"
+             left="125"
              width="150">
                 <combo_box.item
                  label="Box"
@@ -1586,6 +1429,41 @@
                  name="Sculpted"
                  value="Sculpted" />
             </combo_box>
+            <combo_box
+             height="19"
+             layout="topleft"
+             name="material"
+             top_pad="0"
+             width="150">
+                <combo_box.item
+                 label="Stone"
+                 name="Stone"
+                 value="Stone" />
+                <combo_box.item
+                 label="Metal"
+                 name="Metal"
+                 value="Metal" />
+                <combo_box.item
+                 label="Glass"
+                 name="Glass"
+                 value="Glass" />
+                <combo_box.item
+                 label="Wood"
+                 name="Wood"
+                 value="Wood" />
+                <combo_box.item
+                 label="Flesh"
+                 name="Flesh"
+                 value="Flesh" />
+                <combo_box.item
+                 label="Plastic"
+                 name="Plastic"
+                 value="Plastic" />
+                <combo_box.item
+                 label="Rubber"
+                 name="Rubber"
+                 value="Rubber" />
+            </combo_box>
             <text
              type="string"
              length="1"
@@ -1596,11 +1474,11 @@
              name="text cut"
              top_pad="6"
              width="150">
-                Path Cut Begin and End
+                Path Cut (begin/end)
             </text>
             <spinner
              follows="left|top"
-             height="19"
+             height="16"
              increment="0.025"
              initial_value="0"
              label="B"
@@ -1613,7 +1491,7 @@
              width="68" />
             <spinner
              follows="left|top"
-             height="19"
+             height="16"
              increment="0.025"
              initial_value="1"
              label="E"
@@ -1632,7 +1510,7 @@
              layout="topleft"
              left="125"
              name="text hollow"
-             top_pad="6"
+             top_pad="5"
              width="68">
                 Hollow
             </text>
@@ -1644,7 +1522,6 @@
              layout="topleft"
              left_pad="10"
              name="text skew"
-             top_delta="0"
              width="63">
                 Skew
             </text>
@@ -1681,7 +1558,7 @@
              layout="topleft"
              left="125"
              name="Hollow Shape"
-             top_pad="6"
+             top_pad="0"
              width="150">
                 Hollow Shape
             </text>
@@ -1717,9 +1594,9 @@
              layout="topleft"
              left_delta="0"
              name="text twist"
-             top_pad="4"
+             top_pad="8"
              width="150">
-                Twist Begin and End
+                Twist (begin/end)
             </text>
             <spinner
              decimal_digits="0"
@@ -1811,7 +1688,7 @@
              layout="topleft"
              left="125"
              name="text topshear"
-             top_pad="6"
+             top_pad="3"
              width="141">
                 Top Shear
             </text>
@@ -1853,9 +1730,9 @@
              layout="topleft"
              left="125"
              name="advanced_cut"
-             top_pad="6"
+             top_pad="3"
              width="150">
-                Profile Cut Begin and End
+                Profile Cut (begin/end)
             </text>
             <text
              type="string"
@@ -1867,7 +1744,7 @@
              name="advanced_dimple"
              top_delta="0"
              width="150">
-                Dimple Begin and End
+                Dimple (begin/end)
             </text>
             <text
              type="string"
@@ -1879,7 +1756,7 @@
              name="advanced_slice"
              top_delta="0"
              width="150">
-                Slice Begin and End
+                Slice (begin/end)
             </text>
             <spinner
              follows="left|top"
@@ -1892,7 +1769,7 @@
              left_delta="0"
              max_val="0.95"
              name="Path Limit Begin"
-             top_pad="4"
+             top_pad="3"
              width="68" />
             <spinner
              follows="left|top"
@@ -1915,7 +1792,7 @@
              layout="topleft"
              left="125"
              name="text taper2"
-             top_pad="6"
+             top_pad="3"
              width="150">
                 Taper
             </text>
@@ -1931,7 +1808,7 @@
              left_delta="0"
              min_val="-1"
              name="Taper X"
-             top_pad="4"
+             top_pad="3"
              width="68" />
             <spinner
              decimal_digits="2"
@@ -1955,7 +1832,7 @@
              layout="topleft"
              left="125"
              name="text radius delta"
-             top_pad="6"
+             top_pad="0"
              width="78">
                 Radius
             </text>
@@ -1967,7 +1844,6 @@
              layout="topleft"
              left_delta="78"
              name="text revolutions"
-             top_delta="0"
              width="68">
                 Revolutions
             </text>
@@ -2090,7 +1966,7 @@
              layout="topleft"
              left="10"
              name="select_single"
-             top="10"
+             top="5"
              width="252">
                 Select only one primitive to edit features.
             </text>
@@ -2100,9 +1976,9 @@
              follows="left|top"
              height="10"
              layout="topleft"
-             left_delta="0"
+             left="10"
              name="edit_object"
-             top_delta="0"
+             top="5"
              width="252">
                 Edit object features:
             </text>
@@ -2110,7 +1986,7 @@
              height="19"
              label="Flexible Path"
              layout="topleft"
-             left_delta="0"
+             left="10"
              name="Flexible1D Checkbox Ctrl"
              tool_tip="Allows object to flex about the Z axis. (Client-side only)"
              top_pad="10"
@@ -2224,60 +2100,50 @@
              top_pad="4"
              width="128" />
             <check_box
-             height="19"
+             height="16"
              label="Light"
              layout="topleft"
-             left_delta="0"
+             left="10"
              name="Light Checkbox Ctrl"
              tool_tip="Causes object to emit light"
-             top_pad="14"
-             width="121" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top"
-             height="10"
-             layout="topleft"
-             left_delta="0"
-             name="label color"
              top_pad="15"
-             width="58">
-                Color
-            </text>
+             width="60" />
             <color_swatch
-             border_color="0.45098 0.517647 0.607843 1"
              can_apply_immediately="true"
+	     bevel_style="none"
+	     border_style="line"
              color="0.5 0.5 0.5 1"
+	     border.border_thickness="0"
              follows="left|top"
-             height="48"
+             height="50"
              layout="topleft"
-             left_delta="67"
+             left_pad="10"
+             top_pad="-17"
              name="colorswatch"
              tool_tip="Click to open Color Picker"
-             top_delta="-10"
-             width="32" />
+             width="40" />
             <spinner
              follows="left|top"
              height="19"
              initial_value="0.5"
              label="Intensity"
-             label_width="65"
+             label_width="70"
              layout="topleft"
-             left="10"
+             left_pad="15"
              name="Light Intensity"
-             top_pad="4"
+             top_pad="-50"
              width="128" />
             <spinner
              follows="left|top"
              height="19"
              initial_value="5"
              label="Radius"
-             label_width="65"
+             label_width="70"
              layout="topleft"
              left_delta="0"
              max_val="20"
              name="Light Radius"
-             top_pad="0"
+             top_pad="3"
              width="128" />
             <spinner
              follows="left|top"
@@ -2285,12 +2151,12 @@
              increment="0.25"
              initial_value="1"
              label="Falloff"
-             label_width="65"
+             label_width="70"
              layout="topleft"
              left_delta="0"
              max_val="2"
              name="Light Falloff"
-             top_pad="0"
+             top_pad="3"
              width="128" />
         </panel>
         <panel
@@ -2399,16 +2265,16 @@
              left="10"
              name="tex gen"
              top_pad="10"
-             width="90">
+             width="87">
                 Mapping
             </text>
             <combo_box
-             height="19"
+             height="22"
              layout="topleft"
              left_delta="0"
              name="combobox texgen"
              top_pad="4"
-             width="80">
+             width="87">
                 <combo_box.item
                  label="Default"
                  name="Default"
@@ -2424,19 +2290,19 @@
              follows="left|top"
              height="10"
              layout="topleft"
-             left="100"
              name="label shininess"
-             top_pad="-33"
-             width="70">
+             left_pad="5"
+             top_pad="-36"
+             width="80">
                 Shininess
             </text>
             <combo_box
-             height="19"
+             height="22"
              layout="topleft"
              left_delta="0"
              name="combobox shininess"
              top_pad="4"
-             width="70">
+             width="80">
                 <combo_box.item
                  label="None"
                  name="None"
@@ -2460,19 +2326,19 @@
              follows="left|top"
              height="10"
              layout="topleft"
-             left="180"
+             left_pad="5"
              name="label bumpiness"
-             top_pad="-33"
-             width="80">
+             top_pad="-36"
+             width="87">
                 Bumpiness
             </text>
             <combo_box
-             height="19"
+             height="22"
              layout="topleft"
              left_delta="0"
              name="combobox bumpiness"
              top_pad="4"
-             width="80">
+             width="87">
                 <combo_box.item
                  label="None"
                  name="None"
@@ -2555,7 +2421,7 @@
              left="10"
              name="tex scale"
              top_pad="15"
-             width="160">
+             width="200">
                 Repeats per Face
             </text>
             <spinner
@@ -2650,13 +2516,12 @@
             <button
              follows="left|top"
              font="SansSerifSmall"
-             height="19"
+             height="22"
              label="Apply"
              label_selected="Apply"
              layout="topleft"
              left_pad="10"
              name="button apply"
-             top_delta="-4"
              width="75" />
             <text
              type="string"
@@ -2667,8 +2532,8 @@
              left="10"
              name="tex offset"
              top_pad="20"
-             width="160">
-                Offset
+             width="200">
+                Texture Offset
             </text>
             <spinner
              follows="left|top"
@@ -2720,10 +2585,9 @@
              top="340"
              width="68" />-->
         </panel>
-        <panel
+       <panel
          border="false"
          follows="left|top|right|bottom"
-         height="367"
          label="Content"
          layout="topleft"
          left_delta="0"
@@ -2733,34 +2597,33 @@
          width="280">
             <button
              follows="left|top"
-             height="19"
+             height="22"
              label="New Script"
-             label_selected="New Script..."
+             label_selected="New Script"
              layout="topleft"
              left="10"
              name="button new script"
              top="10"
-             width="100" />
+             width="120" />
             <button
              follows="left|top"
-             height="19"
-             label="Permissions..."
+             height="22"
+             label="Permissions"
              layout="topleft"
-             left_pad="10"
+             left_pad="8"
              name="button permissions"
-             top_delta="0"
-             width="100" />
+             width="130" />
             <panel_inventory
              follows="left|top"
-             height="300"
+             height="310"
              layout="topleft"
              left="10"
              name="contents_inventory"
-             top="35"
+             top="50"
              width="260" />
         </panel>
-    </tab_container>
-    <panel
+        </tab_container>
+ <panel
       follows="left|top"
      height="384"
      layout="topleft"
@@ -2768,7 +2631,7 @@
      name="land info panel"
      top_delta="0"
      width="280">
-        <text
+    <text
          type="string"
          length="1"
          font="SansSerifBig"
@@ -2807,9 +2670,9 @@
         </text>
         <button
          follows="left|top"
-         height="19"
-         label="About Land..."
-         label_selected="About Land..."
+         height="22"
+         label="Land profile"
+         label_selected="Land profile"
          layout="topleft"
          left_delta="0"
          name="button about land"
@@ -2822,19 +2685,16 @@
          layout="topleft"
          left_delta="0"
          name="checkbox show owners"
-         tool_tip="Colour parcels according to their ownership"
+         tool_tip="Color parcels by owner"
          top_pad="8"
-         width="140" />
-        <button
-         follows="left|top"
-         height="19"
-         label="?"
-         label_selected="?"
-         layout="topleft"
+         width="205" />
+            <button
+     image_overlay="Arrow_Right_Off"
+     picture_style="true"
          left_pad="5"
          name="button show owners help"
-         top_delta="-2"
-         width="18" />
+     width="26"
+     height="22" />
         <text
          type="string"
          length="1"
@@ -2850,9 +2710,9 @@
         </text>
         <button
          follows="left|top"
-         height="19"
-         label="Subdivide..."
-         label_selected="Subdivide..."
+         height="22"
+         label="Subdivide"
+         label_selected="Subdivide"
          layout="topleft"
          left="30"
          name="button subdivide land"
@@ -2860,9 +2720,9 @@
          width="112" />
         <button
          follows="left|top"
-         height="19"
-         label="Join..."
-         label_selected="Join..."
+         height="22"
+         label="Join"
+         label_selected="Join"
          layout="topleft"
          left_delta="0"
          name="button join land"
@@ -2883,9 +2743,9 @@
         </text>
         <button
          follows="left|top"
-         height="19"
-         label="Buy Land..."
-         label_selected="Buy Land..."
+         height="22"
+         label="Buy Land"
+         label_selected="Buy Land"
          layout="topleft"
          left="30"
          name="button buy land"
@@ -2894,8 +2754,8 @@
         <button
          follows="left|top"
          height="19"
-         label="Abandon Land..."
-         label_selected="Abandon Land..."
+         label="Abandon Land"
+         label_selected="Abandon Land"
          layout="topleft"
          left_delta="0"
          name="button abandon land"
diff --git a/indra/newview/skins/default/xui/en/inspect_avatar.xml b/indra/newview/skins/default/xui/en/inspect_avatar.xml
index cee789d435..f908e9d610 100644
--- a/indra/newview/skins/default/xui/en/inspect_avatar.xml
+++ b/indra/newview/skins/default/xui/en/inspect_avatar.xml
@@ -1,14 +1,20 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <!-- All our XML is utf-8 encoded. -->
 
-<!-- No title to avoid window chrome -->
+<!--
+  Not can_close / no title to avoid window chrome
+  Single instance - only have one at a time, recycle it each spawn
+-->
 <floater
   background_opaque="false"
   background_visible="true"
   bevel_style="in"
-  bg_alpha_color="black"
+  bg_alpha_color="PanelDefaultBackgroundColor"
+  can_close="false" 
   can_minimize="false" 
 	name="inspect_avatar"
+  single_instance="true" 
+  sound_flags="0" 
 	title=""
   visible="true"
 	width="300"
@@ -16,28 +22,39 @@
   left="0"
   top="200"
   >
+  <!-- Allowed fields include:
+	[BORN_ON] ("12/3/2008")
+	[SL_PROFILE] (Second Life profile),
+    [RW_PROFILE] (real world profile),
+	[ACCTTYPE] ("Resident"),
+	[PAYMENTINFO] ("Payment Info on File"),
+	[AGE] ("1 year 2 months") -->
+  <string name="Subtitle">
+[AGE]
+  </string>
+  <string name="Details">
+[ACCTTYPE], [PAYMENTINFO]
+Profile: [SL_PROFILE]
+  </string>
   <text
-      top="180" left="10" width="220" height="70" follows="left|top|right|bottom"
+      top="180" left="10" width="280" height="70" follows="left|top|right|bottom"
       use_ellipses="true"  word_wrap="true"
       font="SansSerifHugeBold" text_color="white"
       mouse_opaque="true" name="user_name" >
-    Codex Linden
+    Test Name
   </text>
+  <!-- General purpose subtitle area, not sure yet what goes here -->
   <text
     top="155" left="10" width="150" height="20" follows="left|top|right|bottom"
-    font="SansSerifBig" font.style="UNDERLINE"
+    font="SansSerifBig"
     text_color="white"
     mouse_opaque="true"
-    name="active_group" >
-    The Guild
-  </text>
+    name="user_subtitle" />
+  <!-- Leave text fields blank so it doesn't flash when data arrives off the network -->
   <text
-      top="110" left="10" width="290" height="50" follows="left|top|right|bottom"
+      top="115" left="10" width="290" height="50" follows="left|top|right|bottom"
       font="SansSerifSmall" text_color="white" word_wrap="true"
-      mouse_opaque="true" name="user_detail" >
-3 year-old account, Payment info on file
-Languages: English, Spanish; +5 Sexterity Vest
-  </text>  
+      mouse_opaque="true" name="user_details" />
   <avatar_icon
       top="185" left="230" width="60" height="60" follows="left|top|right|bottom"
       color="1 1 1 1" enabled="true" mouse_opaque="true" name="avatar_icon"
diff --git a/indra/newview/skins/default/xui/en/menu_login.xml b/indra/newview/skins/default/xui/en/menu_login.xml
index 1e911c2664..8a2955654e 100644
--- a/indra/newview/skins/default/xui/en/menu_login.xml
+++ b/indra/newview/skins/default/xui/en/menu_login.xml
@@ -97,18 +97,20 @@
          layout="topleft"
          name="Widget Test"
          shortcut="control|shift|T">
-            <menu_item_call.on_click
-             function="ShowFloater"
-             parameter="test_widgets" />
-        </menu_item_call>
-        <menu_item_call
-         label="Avatar Inspector"
-         name="Avatar Inspector"
-         shortcut="control|shift|I">
-            <menu_item_call.on_click
-             function="ShowFloater"
-             parameter="inspect_avatar" />
-        </menu_item_call>
+        <menu_item_call.on_click
+         function="ShowFloater"
+         parameter="test_widgets" />
+      </menu_item_call>
+      <menu_item_call
+         label="Inspectors Test"
+         name="inspectors_test"
+         shortcut="control|shift|I"
+         >
+        <menu_item_call.on_click
+         function="ShowFloater"
+         parameter="test_inspectors" />
+      </menu_item_call>
+      <menu_item_separator />
         <menu_item_call
          label="Show TOS"
          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 6bc12368b7..9ad9a87f95 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -2751,14 +2751,13 @@
             <menu_item_call.on_click
              function="Advanced.SendTestIMs" />
           </menu_item_call>
-          <!-- *HACK: Hard code James Tester's UUID -->
           <menu_item_call
-           label="Avatar Inspector"
-           name="Avatar Inspector"
+           label="Test Inspectors"
+           name="Test Inspectors"
            shortcut="control|shift|I">
             <menu_item_call.on_click
-             function="Advanced.AvatarInspector"
-             parameter="22df1dcb-810a-4975-aab9-0159958fe155" />
+             function="Floater.Show"
+             parameter="test_inspectors" />
           </menu_item_call>
         </menu>
         <menu
diff --git a/indra/newview/skins/default/xui/en/panel_activeim_row.xml b/indra/newview/skins/default/xui/en/panel_activeim_row.xml
index f5af8e7b30..4dc4a9ff46 100644
--- a/indra/newview/skins/default/xui/en/panel_activeim_row.xml
+++ b/indra/newview/skins/default/xui/en/panel_activeim_row.xml
@@ -11,7 +11,7 @@
 	bevel_style="in"
 	bg_alpha_color="0 0 0 0">
   <chiclet_im_p2p
-		name="chiclet"
+		name="p2p_chiclet"
 		layout="topleft"
 		follows="left"
 		top="5"
@@ -19,6 +19,15 @@
 		height="25"
 		width="45">
   </chiclet_im_p2p>
+  <chiclet_im_group
+		name="group_chiclet"
+		layout="topleft"
+		follows="left"
+		top="5"
+		left="5"
+		height="25"
+		width="45">
+  </chiclet_im_group>
 	<text
 		type="string"
 		name="contact_name"
diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
index 79ca839f28..df91920721 100644
--- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml
+++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
@@ -33,12 +33,13 @@
          top="0"
          width="5"/>
         <layout_panel
+         auto_resize="false"
          follows="left|right"
          height="28"
          layout="topleft"
          left="5"
          min_height="28"
-         width="500"
+         width="600"
          top="0"
          min_width="305"
          name="chat_bar"
diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml
index 794b69d7ed..d943b2ea23 100644
--- a/indra/newview/skins/default/xui/en/panel_login.xml
+++ b/indra/newview/skins/default/xui/en/panel_login.xml
@@ -55,6 +55,7 @@
      max_length="31"
      name="first_name_edit"
      select_on_focus="true"
+     tool_tip="Enter first name here" 
      top_pad="4"
      width="120" />
     <text
@@ -111,6 +112,25 @@
      select_on_focus="true"
      top_pad="4"
      width="120" />
+     <button
+     follows="left|bottom"
+     height="24"
+     label="Log In"
+     label_selected="Log In"
+     layout="topleft"
+     left="435"
+     name="connect_btn"
+     top="548"
+     width="120" />
+    <combo_box
+     allow_text_entry="true"
+     follows="left|bottom"
+     height="18"
+     layout="topleft"
+     left_pad="15"
+     name="server_combo"
+     top_delta="2"
+     width="120" />
     <text
      type="string"
      length="1"
@@ -158,25 +178,7 @@
      name="remember_check"
      top_delta="3"
      width="138" />
-    <button
-     follows="left|bottom"
-     height="24"
-     label="Log In"
-     label_selected="Log In"
-     layout="topleft"
-     left="435"
-     name="connect_btn"
-     top="548"
-     width="120" />
-    <combo_box
-     allow_text_entry="true"
-     follows="left|bottom"
-     height="18"
-     layout="topleft"
-     left_pad="15"
-     name="server_combo"
-     top_delta="2"
-     width="120" />
+ 
     <text
      type="string"
      length="1"
diff --git a/indra/newview/skins/default/xui/en/panel_profile.xml b/indra/newview/skins/default/xui/en/panel_profile.xml
index 135dcb167b..41de34fbed 100644
--- a/indra/newview/skins/default/xui/en/panel_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile.xml
@@ -14,33 +14,6 @@
         [ACCTTYPE] [PAYMENTINFO] [AGEVERIFICATION]
     </string>
     <string
-     name="AcctTypeResident"
-     value="Resident" />
-    <string
-     name="AcctTypeTrial"
-     value="Trial" />
-    <string
-     name="AcctTypeCharterMember"
-     value="Charter Member" />
-    <string
-     name="AcctTypeEmployee"
-     value="Linden Lab Employee" />
-    <string
-     name="PaymentInfoUsed"
-     value="Payment Info Used" />
-    <string
-     name="PaymentInfoOnFile"
-     value="Payment Info On File" />
-    <string
-     name="NoPaymentInfoOnFile"
-     value="No Payment Info On File" />
-    <string
-     name="AgeVerified"
-     value="Age-verified" />
-    <string
-     name="NotAgeVerified"
-     value="Not Age-verified" />
-    <string
      name="payment_update_link_url">
         http://www.secondlife.com/account/billing.php?lang=en
     </string>
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index b8152a4956..faed615bdd 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -46,7 +46,7 @@
 	<string name="AgentLostConnection">This region may be experiencing trouble.  Please check your connection to the Internet.</string>
 	
 	
-	<!-- Tooltip, llhoverview.cpp -->
+	<!-- Tooltip, lltooltipview.cpp -->
 	<string name="TooltipPerson">Person</string><!-- Object under mouse pointer is an avatar -->
 	<string name="TooltipNoName">(no name)</string> <!-- No name on an object -->
 	<string name="TooltipOwner">Owner:</string> <!-- Owner name follows -->
@@ -1913,8 +1913,35 @@ this texture in your inventory
 	<string name="Stomach">Stomach</string>
 	<string name="Left Pec">Left Pec</string>
 	<string name="Right Pec">Right Pec</string>	
-	
-	<!-- HUD Position --> 
+
+  <!-- Avatar age computation, see LLAvatarPropertiesProcessor::ageFromDate -->
+  <string name="YearsMonthsOld">[AGEYEARS][AGEMONTHS]old</string>
+  <string name="WeeksOld">[AGEWEEKS]old</string>
+  <string name="DaysOld">[AGEDAYS]old</string>
+  <string name="TodayOld">Joined today</string>
+  
+  <!-- Use value="" because of trailing spaces -->
+  <string name="AgeYears"  value="[YEARS] years " />
+  <string name="Age1Year"  value="1 year "/>
+  <string name="AgeMonths" value="[MONTHS] months "/>
+  <string name="Age1Month" value="1 month "/>
+  <string name="AgeWeeks"  value="[WEEKS] weeks "/>
+  <string name="Age1Week"  value="1 week "/>
+  <string name="AgeDays"   value="[DAYS] days "/>
+  <string name="Age1Day"   value="1 day "/>
+
+  <!-- Account types, see LLAvatarPropertiesProcessor -->
+  <string name="AcctTypeResident">Resident</string>
+  <string name="AcctTypeTrial">Trial</string>
+  <string name="AcctTypeCharterMember">Charter Member</string>
+  <string name="AcctTypeEmployee">Linden Lab Employee</string>
+  <string name="PaymentInfoUsed">Payment Info Used</string>
+  <string name="PaymentInfoOnFile">Payment Info On File</string>
+  <string name="NoPaymentInfoOnFile">No Payment Info On File</string>
+  <string name="AgeVerified">Age-verified</string>
+  <string name="NotAgeVerified">Not Age-verified</string>
+  
+  <!-- HUD Position --> 
 	<string name="Center 2">Center 2</string>	
 	<string name="Top Right">Top Right</string>	
 	<string name="Top">Top</string>	
@@ -2425,4 +2452,48 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 	<string name="UpdaterFailStartTitle">
 	  Failed to start viewer
 	</string>
+
+  <!-- IM system messages -->
+  <string name="only_user_message">
+    You are the only user in this session.
+  </string>
+  <string name="offline_message">
+    [FIRST] [LAST] is offline.
+  </string>
+  <string name="invite_message">
+    Click the [BUTTON NAME] button to accept/connect to this voice chat.
+  </string>
+  <string name="muted_message">
+    You have blocked this resident. Sending a message will automatically unblock them.
+  </string>
+  <string name="generic_request_error">
+    Error making request, please try again later.
+  </string>
+  <string name="insufficient_perms_error">
+    You do not have sufficient permissions.
+  </string>
+  <string name="session_does_not_exist_error">
+    The session no longer exists
+  </string>
+  <string name="no_ability_error">
+    You do not have that ability.
+  </string>
+  <string name="not_a_mod_error">
+    You are not a session moderator.
+  </string>
+  <string name="muted_error">
+    A group moderator disabled your text chat.
+  </string>
+  <string name="add_session_event">
+    Unable to add users to chat session with [RECIPIENT].
+  </string>
+  <string name="message_session_event">
+    Unable to send your message to the chat session with [RECIPIENT].
+  </string>
+  <string name="removed_from_group">
+    You have been removed from the group.
+  </string>
+  <string name="close_on_no_ability">
+    You no longer have the ability to be in the chat session.
+  </string>
 </strings>
diff --git a/indra/newview/skins/default/xui/en/widgets/floater.xml b/indra/newview/skins/default/xui/en/widgets/floater.xml
new file mode 100644
index 0000000000..4a866c2eb2
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/widgets/floater.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="floater"
+         bg_opaque_color="FloaterFocusBackgroundColor"
+         bg_alpha_color="FloaterDefaultBackgroundColor"
+         background_visible="true"
+         background_opaque="false"/>
diff --git a/indra/newview/skins/default/xui/en/widgets/location_input.xml b/indra/newview/skins/default/xui/en/widgets/location_input.xml
index 297a3762f6..a37ed76c51 100644
--- a/indra/newview/skins/default/xui/en/widgets/location_input.xml
+++ b/indra/newview/skins/default/xui/en/widgets/location_input.xml
@@ -17,6 +17,7 @@
       	        show_text_as_tentative="false"
                 max_chars="20"
                 follows="left|top"
+                allow_new_values="true"
                 >
   <info_button name="Place Information"
                           label=""
diff --git a/indra/newview/skins/default/xui/en/widgets/search_combo_box.xml b/indra/newview/skins/default/xui/en/widgets/search_combo_box.xml
index 1d43b25f1d..6e73e997e0 100644
--- a/indra/newview/skins/default/xui/en/widgets/search_combo_box.xml
+++ b/indra/newview/skins/default/xui/en/widgets/search_combo_box.xml
@@ -4,6 +4,8 @@
  list_position="BELOW"
  show_text_as_tentative="false"
  dropdown_button_visible="false"
+ max_chars="256"
+ allow_new_values="true"
  background_image="TextField_Search_Off"
  background_image_disabled="TextField_Search_Disabled"
  background_image_focused="TextField_Search_Active">