Second Life viewer sources 1.19.0.0

52 files changed, 919 insertions, 867 deletions

diff --git a/linden/indra/newview/skins/xui/en-us/alerts.xml b/linden/indra/newview/skins/xui/en-us/alerts.xml
index 0bd618b..67f7df5 100644
--- a/linden/indra/newview/skins/xui/en-us/alerts.xml
+++ b/linden/indra/newview/skins/xui/en-us/alerts.xml
@@ -147,6 +147,20 @@ Do you want to grant modify rights for [FIRST_NAME] [LAST_NAME]?
                         No
                 </option>
         </alert>
+        <alert modal="true" name="GrantModifyRightsMultiple">
+                <message name="message">
+                        Granting modify rights to another resident allows them to change 
+ANY objects you may have in-world. Be VERY careful when handing 
+out this permission.
+Do you want to grant modify rights for the selected Residents?
+                </message>
+                <option name="Yes">
+                        Yes
+                </option>
+                <option name="No">
+                        No
+                </option>
+        </alert>
         <alert modal="true" name="RevokeModifyRights">
                 <message name="message">
                         Do you want to revoke modify rights for [FIRST_NAME] [LAST_NAME]?
@@ -158,6 +172,17 @@ Do you want to grant modify rights for [FIRST_NAME] [LAST_NAME]?
                         No
                 </option>
         </alert>
+        <alert modal="true" name="RevokeModifyRightsMultiple">
+                <message name="message">
+                        Do you want to revoke modify rights for the selected Residents?
+                </message>
+                <option name="Yes">
+                        Yes
+                </option>
+                <option name="No">
+                        No
+                </option>
+        </alert>
         <alert modal="true" name="RemoveFriend">
                 <message name="message">
                         Do you want to remove [FIRST] [LAST] from your list of friends?
@@ -480,6 +505,21 @@ Your selling price will be L$[SALE_PRICE] and will be authorized for sale to [NA
                 <option default="true" name="Cancel">
                         Cancel
                 </option>
+        </alert>        
+        <alert modal="true" caution="true" name="ConfirmLandSaleToAnyoneChange">
+                <message name="message">
+ATTENTION: Clicking 'sell to anyone' makes your land available to the entire Second Life community, even those not in this region.
+
+The selected [LAND_SIZE] m2 land is being set for sale.
+Your selling price will be L$[SALE_PRICE] and will be authorized for sale to [NAME].
+ 
+                </message>
+                <option name="Continue">
+                        OK
+                </option>
+                <option default="true" name="Cancel">
+                        Cancel
+                </option>
         </alert>
         <alert modal="true" name="ReturnObjectsDeededToGroup">
                 <message name="message">
@@ -1143,21 +1183,6 @@ Could not resolve domain name: [DOMAIN]
 Please check your network connection.
                 </message>
         </alert>
-        <alert modal="true" name="CannotConnectLoginPacket">
-                <message name="message">
-                        Unable to connect.  Login packet never received by
-login server.
- 
-Please try again in a few minutes, or click Help
-for advice and a link to the system status web page.
-                </message>
-                <option name="OK">
-                        OK
-                </option>
-                <option name="Help">
-                        Help
-                </option>
-        </alert>
         <alert modal="true" name="WelcomeToSecondLife">
                 <message name="message">
                         Welcome to [SECOND_LIFE]! 
@@ -1301,7 +1326,7 @@ If an object is not owned by you and you take it,
 next owner permissions will be applied to it and
 possibly restrict your ability to modify or copy it.
 
-Are you sure you want to take these itmes?
+Are you sure you want to take these items?
                 </message>
                 <option name="Yes">
                         OK
@@ -2446,11 +2471,9 @@ Please check your network connection.
         </alert>
         <alert modal="true" name="LoginPacketNeverReceived">
                 <message name="message">
-                        Unable to connect.  Login packet never received by
-login server.
+We're having trouble connecting. There may be a problem with your internet connection or the Second Life servers.
 
-Please try again in a few minutes, or click Help
-for advice and a link to the system status web page.
+You can either check your internet connection and try again in a few minutes, click Help to connect to our support site, or click Teleport to attempt to teleport home.
                 </message>
                 <option name="OK">
                         OK
@@ -2458,6 +2481,9 @@ for advice and a link to the system status web page.
                 <option name="Help">
                         Help
                 </option>
+                <option name="Teleport">
+                        Teleport
+                </option>
         </alert>
         <alert modal="true" name="WelcomeNoClothes">
                 <message name="message">
@@ -3016,21 +3042,6 @@ Leave Group?
                         OK
                 </option>
         </alert>
-        <alert modal="true" name="MuteByName" title="Mute object by name">
-                <message name="message">
-                        Mute by name only affects object chat and IM, not sounds. 
-You must type the object&apos;s name exactly.
-                </message>
-                <editline>
-                        Object name
-                </editline>
-                <option name="OK">
-                        OK
-                </option>
-                <option name="Cancel">
-                        Cancel
-                </option>
-        </alert>
         <alert modal="true" name="MuteByNameFailed" title="Mute object by name failed">
                 <message name="message">
                         You already have muted this name.
@@ -3088,7 +3099,8 @@ object. Do you want to delete that item?
                         Busy mode set.
 Chat and instant messages will be hidden. Instant
 messages will get your Busy mode response. All teleportation
-and inventory offers will be declined.
+offers will be declined. All inventory offers will go to your
+Trash.
                 </message>
                 <ignore name="ignore">
                         When setting busy mode
@@ -3545,7 +3557,7 @@ regardless of the per-parcel &apos;Fly&apos; setting.
 Default: off
                 </message>
         </alert>
-        <alert modal="true" name="HelpRegionAllowDamage" title="Allow Damange">
+        <alert modal="true" name="HelpRegionAllowDamage" title="Allow Damage">
                 <message name="message">
                         If this box is checked, the health system across all parcels
 regardless of individual parcel settings. If this box is left
@@ -3690,7 +3702,7 @@ need to do this in order to travel to the location of a noted
 &apos;top collider&apos;. Once you have arrived at the location, investigate the 
 object - is it constantly colliding with other objects? You may want to 
 contact the owner of the object or delete or return the object. 
-Uncheck the Disable Collisions box and then Applyto reactivate 
+Uncheck the Disable Collisions box and then Apply to reactivate 
 collisions in the region.
  
 Default: off
@@ -4190,8 +4202,7 @@ http://secondlife.com/corporate/tos.php
 http://secondlife.com/corporate/cs.php
 
 All reported abuses of the Terms of Service and Community Standards 
-are investigated and resolved. You will receive an email informing you
-of the resolution when it occurs. You can also view the incident 
+are investigated and resolved. You can view the incident 
 resolution on the Police Blotter at:
 
 http://secondlife.com/community/blotter.php
@@ -4399,11 +4410,11 @@ the contents of your Lost And Found folder?
         </alert>
         <alert modal="true" name="CopySLURL">
                 <message name="message">
-                        The following SLURL has been copied to your clipboard:
-                         [SLURL] 
+The following SLURL has been copied to your clipboard:
+ [SLURL] 
 
-                        Put it in a web page to give others easy access to this location or
-                        try it out yourself by pasting it into the address bar of your web browser.
+Put it in a web page to give others easy access to this location or
+try it out yourself by pasting it into the address bar of your web browser.
                 </message>
                 <ignore name="ignore">
                         When copying a SLURL to your clipboard
@@ -4412,7 +4423,7 @@ the contents of your Lost And Found folder?
         <alert modal="true" name="ChatterBoxSessionStartError">
             <message name="message">
                     Error starting a new chat session with [RECIPIENT].
-                        [REASON]
+[REASON]
                 </message>
                 <option default="true" name="OK">
                     OK
@@ -4421,7 +4432,7 @@ the contents of your Lost And Found folder?
         <alert modal="true" name="ChatterBoxSessionStartNotVerified">
             <message name="message">
                     Error starting a new chat session with [RECIPIENT].
-                        [REASON]
+[REASON]
                 </message>
                 <option default="true" name="OK">
                     OK
@@ -4430,16 +4441,16 @@ the contents of your Lost And Found folder?
         <alert modal="true" name="ChatterBoxSessionEventError">
             <message name="message">
                     Error [EVENT] [RECIPIENT].
-                        [REASON]
+[REASON]
                 </message>
                 <option default="true" name="OK">
                     OK
                 </option>
         </alert>
         <alert modal="true" name="ForceCloseChatterBoxSession">
-            <message name="messsage">
+            <message name="message">
                     Your chat session with [NAME] must close.
-            [REASON]
+[REASON]
                 </message>
                 <option default="true" name="OK">
                     OK
@@ -4523,3 +4534,4 @@ Would you like to visit the Second Life website to set this up?
                 <url option="0">https://secondlife.com/account/</url>
         </alert>
 </alerts>
+
diff --git a/linden/indra/newview/skins/xui/en-us/floater_about_land.xml b/linden/indra/newview/skins/xui/en-us/floater_about_land.xml
index 03c07b9..85ac175 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_about_land.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_about_land.xml
@@ -458,24 +458,18 @@
                              halign="center" height="16" hidden="false" label="Return objects..."
                              label_selected="Return objects..." left="220" mouse_opaque="true"
                              name="Return objects..." width="164" />
-                        <button bottom="-228" enabled="true" follows="left|top" font="SansSerif"
-                             halign="center" height="20" hidden="false" label="" label_selected=""
-                             left="4" mouse_opaque="true" name="Type" tool_tip="Sort by Type" width="24" />
-                        <button bottom="-228" enabled="true" follows="left|top" font="SansSerif"
-                             halign="center" height="20" hidden="false" label="Name"
-                             label_selected="Name" left="28" mouse_opaque="true" name="Name"
-                             tool_tip="Sort by Name" width="220" />
-                        <button bottom="-228" enabled="true" follows="left|top" font="SansSerif"
-                             halign="center" height="20" hidden="false" label="Count"
-                             label_selected="Count" left="248" mouse_opaque="true" name="Count"
-                             tool_tip="Sort by Count" width="64" />
-                        <name_list allow_calling_card_drop="false" background_visible="false" bottom="-329"
-                             column_padding="0" draw_border="true" draw_heading="false"
+      <name_list allow_calling_card_drop="false" background_visible="false" bottom="-329" draw_heading="true"
+                             column_padding="0" draw_border="true"
                              draw_stripes="true" enabled="true" fg_disable_color="1 1 1 1"
                              fg_selected_color="1 1 1 1" fg_unselected_color="1 1 1 1"
-                             follows="left|top|right|bottom" height="97" hidden="false" left="4"
+                             follows="left|top|right|bottom" height="117" hidden="false" left="4"
                              mouse_opaque="true" multi_select="false" name="owner list"
-                             name_column_index="2" width="450" />
+                             name_column_index="2" width="450">
+        <column width="24" label="Type" sort="online_status"/>
+        <column width="-1" name="online_status"/>
+        <column dynamicwidth="true" label="Name"/>
+        <column width="70" label="Count"/>
+      </name_list>/>
                 </panel>
                 <panel border="false" bottom="-349" enabled="true" follows="left|top|right|bottom"
                      height="333" hidden="false" label="Options" left="1" mouse_opaque="true"
diff --git a/linden/indra/newview/skins/xui/en-us/floater_active_speakers.xml b/linden/indra/newview/skins/xui/en-us/floater_active_speakers.xml
index bf7734e..933baad 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_active_speakers.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_active_speakers.xml
@@ -9,7 +9,7 @@
         can_minimize="true"

         can_close="true"

         can_drag_on_left="false"

-        min_width="220"

+        min_width="180"

         min_height="200"

         >

         <panel name="active_speakers_panel" left="0" bottom="0" right="250" top="300" follows="left|top|right|bottom" mouse_opaque="false">

@@ -18,7 +18,7 @@
                         left="10"

                         right="-10"

                         top="-20"

-                        bottom="60"

+                        bottom="35"

                         column_padding="0"

                         can_resize="true"

                         follows="left|top|bottom|right"

@@ -35,9 +35,9 @@
                         name="volume_container"

                         left="10"

                         right="-10"     

-                        height="30"

-                        bottom="20"     

-                        border="true"

+                        height="20"

+                        bottom="5"      

+                        border="false"

                         mouse_opaque="true"

                         bevel_style="in"

                         background_visible="false"

@@ -59,14 +59,11 @@
                                 increment="0.05"

                                 initial_val="0.5"

                         />

-                        <button

-                                name="mute_btn"

-                                left_delta="115"

-                                bottom_delta="-2"

-                                width="70"

-                                height="25"

-                                label="Mute"

-                                />

+                        <button bottom_delta="0" height="20"

+                                image_selected="icn_speaker-muted_dark.tga"

+                                image_unselected="icn_speaker_dark.tga" label="" left_delta="115"

+                                name="mute_btn" toggle="true" width="25" tool_tip="Mute voice for this resident"/>

+

                 </panel>                

         </panel>

 </floater>

diff --git a/linden/indra/newview/skins/xui/en-us/floater_audio_volume.xml b/linden/indra/newview/skins/xui/en-us/floater_audio_volume.xml
index dc31951..ab0c0ad 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_audio_volume.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_audio_volume.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater bottom="40" left="40" height="225" width="180" 
+<floater bottom="40" left="40" height="200" width="180" 
          rect_control="FloaterAudioVolumeRect"
-         can_resize="false" can_close="true" can_drag_on_left="false" can_minimize="true"
+         can_resize="false" can_close="true" can_drag_on_left="false" can_minimize="false"
          name="Volume" title="Volume">
         <panel border="true" bottom="-210" enabled="true" follows="left|top|right|bottom"
-               hidden="false" label="Volume" left="10" height="180" width="205"
+               hidden="false" label="Volume" left="5" height="180" width="175"
                mouse_opaque="true" name="Volume Panel"
                filename="panel_audio.xml">
         </panel>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_chat_history.xml b/linden/indra/newview/skins/xui/en-us/floater_chat_history.xml
index 2c738ec..ce87e38 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_chat_history.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_chat_history.xml
@@ -3,11 +3,13 @@
      can_resize="true" can_tear_off="true" enabled="true" height="270"
      hidden="false" left="15" min_height="150" min_width="425"
      mouse_opaque="true" name="chat floater" rect_control="FloaterChatRect"
-     title="Residents Near Me (Chat History)" short_title="Near Me" width="435">
+     title="Local Chat" width="435">
 
         <string name="ringing">Connecting to in-world Voice Chat...</string>
         <string name="connected">Connected</string>
+        <string name="unavailable">Voice not available at your current location</string>
         <string name="hang_up">Disconnected from in-world Voice Chat</string>
+        <string name="voice_icon">icn_voice-localchat.tga</string>
      
     <layout_stack border="false" left="2" bottom="2" width="430" height="250" follows="left|top|right|bottom" orientation="horizontal">
         <layout_panel border="false" name="im_contents_panel" min_width="275" left="0" bottom="0" width="305" height="130" default_tab_group="1">
@@ -45,68 +47,21 @@
                                 <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="0"
                                         enabled="true" follows="left|right|bottom" font="SansSerif"
                                         handle_edit_keys_directly="false" height="20" hidden="false"
-                                        label="Click here to chat." left="0" right="-120" max_length="254"
+                                        label="Click here to chat." left="0" right="-90" max_length="254"
                                         mouse_opaque="true" name="Chat Editor" select_all_on_focus_received="false"
                                         select_on_focus="false" tab_group="1"/>
-                                <button bottom="0" follows="bottom|right" font="SansSerif"
-                                        halign="center" height="20" label="Say" left="-115"
-                                        mouse_opaque="true" name="Say" scale_image="true" width="50" />
-                                <button bottom="0" follows="bottom|right" font="SansSerif"
-                                        halign="center" height="20" label="Shout" left="-60"
-                                        mouse_opaque="true" name="Shout" scale_image="true" width="50" />
+                                <flyout_button bottom="0" follows="right|bottom" height="20" label="Say" left="-80"
+                                        mouse_opaque="true" name="Say" tool_tip="(Enter)" width="70" list_position="above">
+                                        <flyout_button_item value="shout">Shout</flyout_button_item>
+                                        <flyout_button_item value="say">Say</flyout_button_item>
+                                </flyout_button>
                         </panel>
                 
         </layout_panel>
 
-                <layout_panel name="active_speakers_panel" auto_resize="false" left="0" bottom="0" right="140" height="120" min_width="140" visible="false">
-                        <scroll_list name="speakers_list" left="0" right="140" top="120" bottom="78" column_padding="0" follows="left|top|bottom|right" draw_heading="true" draw_stripes="false" multi_select="false" search_column="1">
-                                <column name="icon_speaking_status" width="20" sort="speaking_status"/> 
-                                <column name="speaker_name" label="Name" dynamicwidth="true"/>
-                                <column name="speaking_status" label="" width="0"/>
-                        </scroll_list>
-                        <panel name="volume_container" left="0" right="140" bottom="0" border="true" mouse_opaque="true" bevel_style="in" can_resize="false" height="77" follows="left|bottom|right">
-                                <button left="0" right="30" bottom="-28" height="24" name="profile_btn" follows="left|top" label="" image_overlay="icon_avatar_offline.tga" enabled="false"/>
-                                <text left_delta="34" bottom_delta="9" name="resident_name" valign="center" follows="left|top|bottom|right" width="100" font="SansSerif">Rumplstiltskin Califragilistic</text>
-                                <volume_slider
-                                        name="speaker_volume"
-                                        left="5"
-                                        width="85"
-                                        bottom_delta="-29"
-                                        height="15"
-                                        follows="left|top"
-                                        min_val="0.0"
-                                        max_val="1.0"
-                                        increment="0.05"
-                                        initial_val="0.5"
-                                />
-                                <text type="string" width="45" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                                        drop_shadow_visible="true" enabled="true" follows="left|top"
-                                        font="SansSerifSmall" height="16" hidden="false"
-                                        left="4" mouse_opaque="true" bottom_delta="-25" name="Mute:" v_pad="0">
-                                        Mute:
-                                </text>
-                                <check_box
-                                        name="mute_text_btn"
-                                        width="50"
-                                        bottom_delta="0"
-                                        left_delta="32"
-                                        follows="left|top"
-                                        height="25"
-                                        enabled="false"
-                                        label="Text"
-                                />
-                                <check_box
-                                        name="mute_btn"
-                                        follows="left|top"
-                                        width="50"
-                                        bottom_delta="0"
-                                        left_delta="45"
-                                        height="25"
-                                        enabled="false"
-                                        label="Voice"
-                                />
-                        </panel>
-                </layout_panel>
+                <layout_panel filename="panel_speaker_controls.xml" auto_resize="false" bottom="0" can_resize="true" height="120" left="0"
+                     min_width="140" name="active_speakers_panel" top_delta="0" visible="false"
+                     width="140"/>
         </layout_stack>
 
 </floater>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_device_settings.xml b/linden/indra/newview/skins/xui/en-us/floater_device_settings.xml
index 3c95030..c620e8b 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_device_settings.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_device_settings.xml
@@ -1,4 +1,4 @@
-<floater bottom="0" can_resize="false" can_minimize="true" height="260" left="0" name="floater_device_settings"

+<floater bottom="0" can_resize="false" can_minimize="true" height="260" left="0" name="floater_device_settings" can_drag_on_left="false"

      title="Voice Chat Device Settings" width="405">

         <panel bottom="0" name="device_settings" filename="panel_audio_device.xml" left="2" top="-20" right="-5"/>

 </floater>

diff --git a/linden/indra/newview/skins/xui/en-us/floater_directory.xml b/linden/indra/newview/skins/xui/en-us/floater_directory.xml
index af865f4..321b585 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_directory.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_directory.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="true" height="570" min_height="570" min_width="780"
+     can_resize="false" height="570" min_height="570" min_width="780"
      name="directory" rect_control="FloaterFindRect2"
      title="Search Second Life" width="780">
         <tab_container bottom="-570" follows="left|top|right|bottom" height="550" left="0"
@@ -10,6 +10,8 @@
                      label="All" left="1" mouse_opaque="false"
                      name="find_all_panel"
                      width="778">
+      <string name="searching_text">Searching...</string>
+      <string name="not_found_text">None Found.</string>
                         <button bottom="-30" follows="top|left" font="SansSerifSmall" height="20" 
                                 label="Back"
                                 left="10" 
@@ -99,7 +101,9 @@
                                                 <button bottom="-533" follows="left|bottom" font="SansSerif" halign="center"
                              height="20" label="Next &gt;" label_selected="Next &gt;" right="344"
                              mouse_opaque="true" name="Next &gt;" width="80" />
-                        <button bottom_delta="0" follows="left|bottom" font="SansSerif" halign="center"
+      <string name="searching_text">Searching...</string>
+      <string name="not_found_text">None Found.</string>
+      <button bottom_delta="0" follows="left|bottom" font="SansSerif" halign="center"
                              height="20" label="&lt; Prev" label_selected="&lt; Prev" right="258"
                              mouse_opaque="true" name="&lt; Prev" width="80" />
                         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
@@ -179,7 +183,9 @@
                 <panel border="true" bottom="-549" default_tab_group="1"
                      follows="left|top|right|bottom" height="533" label="Events" left="1"
                      mouse_opaque="false" name="events_panel" width="778">
-                        <radio_group bottom="-40" draw_border="false" follows="left|top" height="40" left="4"
+      <string name="searching_text">Searching...</string>
+      <string name="not_found_text">None Found.</string>
+      <radio_group bottom="-40" draw_border="false" follows="left|top" height="40" left="4"
                              mouse_opaque="true" name="date_mode" width="300">
                                 <radio_item bottom="-20" follows="left|top" height="20" left="0" mouse_opaque="true"
                                      name="current" width="174">
@@ -309,7 +315,9 @@
                 <panel border="true" bottom="-549" follows="left|top|right|bottom" height="533"
                      label="Popular Places" left="1" mouse_opaque="false" name="popular_panel"
                      width="778">
-                                                <button bottom="-533" follows="left|bottom" font="SansSerif" halign="center"
+      <string name="searching_text">Searching...</string>
+      <string name="not_found_text">None Found.</string>
+      <button bottom="-533" follows="left|bottom" font="SansSerif" halign="center"
                              height="20" label="Next &gt;" label_selected="Next &gt;" right="344"
                              mouse_opaque="true" name="Next &gt;" width="80" />
                         <button bottom_delta="0" follows="left|bottom" font="SansSerif" halign="center"
@@ -350,7 +358,9 @@ the amount of time people spend there.
                 <panel border="true" bottom="-549" follows="left|top|right|bottom" height="533"
                      label="Land Sales" left="1" mouse_opaque="false" name="land_sales_panel"
                      width="778">
-                                                <button bottom="-533" follows="left|bottom" font="SansSerif" halign="center"
+      <string name="searching_text">Searching...</string>
+      <string name="not_found_text">None Found.</string>
+      <button bottom="-533" follows="left|bottom" font="SansSerif" halign="center"
                              height="20" label="Next &gt;" label_selected="Next &gt;" right="390"
                              mouse_opaque="true" name="Next &gt;" width="80" />
                         <button bottom_delta="0" follows="left|bottom" font="SansSerif" halign="center"
@@ -427,7 +437,9 @@ To buy direct, visit the land and click on the place name in the title bar.
                 <panel border="true" bottom="-549" follows="left|top|right|bottom" height="533"
                      label="Places" left="1" mouse_opaque="false" name="places_panel"
                      width="778">
-                                                <button bottom="-533" follows="left|bottom" font="SansSerif" halign="center"
+      <string name="searching_text">Searching...</string>
+      <string name="not_found_text">None Found.</string>
+      <button bottom="-533" follows="left|bottom" font="SansSerif" halign="center"
                              height="20" label="Next &gt;" label_selected="Next &gt;" right="344"
                              mouse_opaque="true" name="Next &gt;" width="80" />
                         <button bottom_delta="0" follows="left|bottom" font="SansSerif" halign="center"
@@ -521,7 +533,9 @@ To buy direct, visit the land and click on the place name in the title bar.
                 <panel border="true" bottom="-549" follows="left|top|right|bottom" height="533"
                      label="People" left="1" mouse_opaque="false" name="people_panel"
                      width="778">
-                                                <button bottom="-533" follows="left|bottom" font="SansSerif" halign="center"
+      <string name="searching_text">Searching...</string>
+      <string name="not_found_text">None Found.</string>
+      <button bottom="-533" follows="left|bottom" font="SansSerif" halign="center"
                              height="20" label="Next &gt;" label_selected="Next &gt;" right="330"
                              mouse_opaque="true" name="Next &gt;" width="80" />
                         <button bottom_delta="0" follows="left|bottom" font="SansSerif" halign="center"
@@ -556,7 +570,9 @@ To buy direct, visit the land and click on the place name in the title bar.
                 <panel border="true" bottom="-549" follows="left|top|right|bottom" height="533"
                      label="Groups" left="1" mouse_opaque="false" name="groups_panel"
                      width="778">
-                                                <button bottom="-533" follows="left|bottom" font="SansSerif" halign="center"
+      <string name="searching_text">Searching...</string>
+      <string name="not_found_text">None Found.</string>
+      <button bottom="-533" follows="left|bottom" font="SansSerif" halign="center"
                              height="20" label="Next &gt;" label_selected="Next &gt;" right="344"
                              mouse_opaque="true" name="Next &gt;" width="80" />
                         <button bottom_delta="0" follows="left|bottom" font="SansSerif" halign="center"
@@ -598,7 +614,9 @@ To buy direct, visit the land and click on the place name in the title bar.
                 <panel border="true" bottom="-549" follows="left|top|right|bottom" height="533"
                      label="All (old)" left="1" mouse_opaque="false"
                      name="find_all_old_panel" width="778">
-                        <button bottom="-533" follows="left|bottom" font="SansSerif" halign="center"
+      <string name="searching_text">Searching...</string>
+      <string name="not_found_text">None Found.</string>
+      <button bottom="-533" follows="left|bottom" font="SansSerif" halign="center"
                              height="20" label="&lt; Prev" label_selected="&lt; Prev" left="80"
                              mouse_opaque="true" name="&lt; Prev" width="60" />
                         <button bottom="-533" follows="left|bottom" font="SansSerif" halign="center"
diff --git a/linden/indra/newview/skins/xui/en-us/floater_groups.xml b/linden/indra/newview/skins/xui/en-us/floater_groups.xml
index 1e08fb2..a3c43ad 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_groups.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_groups.xml
@@ -24,22 +24,22 @@
                 You belong to [COUNT] groups (of [MAX] maximum).
         </text>
         <pad bottom="-17" height="0" left="-90" width="1" />
-        <button border_height="16" border_width="16" bottom_delta="-25" follows="top|right"
+        <button bottom_delta="-25" follows="top|right"
              font="SansSerif" height="22" hidden="false" label="Info" name="Info"
              width="80" />
         <button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"
              label="IM/Call" left_delta="0" name="IM"
              tool_tip="Open Instant Message session" width="80" />
-        <button border_height="16" border_width="16" bottom_delta="-25" follows="top|right"
+        <button bottom_delta="-25" follows="top|right"
              font="SansSerif" height="22" hidden="false" label="Activate"
              name="Activate" width="80" />
-        <button border_height="16" border_width="16" bottom_delta="-25" follows="top|right"
+        <button bottom_delta="-25" follows="top|right"
              font="SansSerif" height="22" hidden="false" label="Leave" name="Leave"
              width="80" />
-        <button border_height="16" border_width="16" bottom_delta="-35" follows="top|right"
+        <button bottom_delta="-35" follows="top|right"
              font="SansSerif" height="22" hidden="false" label="Create..." name="Create"
              width="80" />
-        <button border_height="16" border_width="16" bottom_delta="-25" follows="top|right"
+        <button bottom_delta="-25" follows="top|right"
              font="SansSerif" height="22" hidden="false" label="Search..."
              name="Search..." width="80" />
 </floater>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_html.xml b/linden/indra/newview/skins/xui/en-us/floater_html.xml
index 2e4171a..2c55711 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_html.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_html.xml
@@ -8,21 +8,21 @@
              name="html_floater_browser" right="-15" top="-56" />
         <button bottom="-45" follows="top|left" font="SansSerifSmall" height="20" label="Back"
              left="15" name="back_btn" width="80" />
-        <button bottom_delta="0" follows="top|left" font="SansSerifSmall" height="20"
-             label="Home" left_delta="83" name="home_btn" width="80" />
+<!--    <button bottom_delta="0" follows="top|left" font="SansSerifSmall" height="20" -->
+<!--         label="Home" left_delta="75" name="home_btn" width="70" /> -->
         <button bottom_delta="0" follows="top|left" font="SansSerifSmall" height="20"
              label="Forward" left_delta="83" name="forward_btn" width="80" />
              
         <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="0"
-             follows="top|left|right" font="SansSerifSmall" height="20" hidden="false" left_delta="90" max_length="256" mouse_opaque="true"
-             name="url_edit" select_all_on_focus_received="true" width="345" />
+             follows="top|left|right" font="SansSerifSmall" height="20" hidden="false" left_delta="75" max_length="256" mouse_opaque="true"
+             name="url_edit" select_all_on_focus_received="true" width="435" />
         <button bottom_delta="0" follows="top|right" font="SansSerifSmall" height="20"
-             label="Go" left_delta="350" name="go_btn" width="70" />
+             label="Go" left_delta="450" name="go_btn" width="70" />
              
         <!-- web_browser bottom="20" follows="top|left|bottom|right" font="SansSerifSmall" left="15"
              name="html_floater_browser" right="-15" top="-56" / -->
 
-        <text hidden="true" name="home_page_url">http://www.google.com</text>
+        <text hidden="true" name="home_page_url">http://www.secondlife.com</text>
         
         <text hidden="true" name="in-world_help_title">In-World Help</text>
         <text hidden="true" name="in-world_help_url">
diff --git a/linden/indra/newview/skins/xui/en-us/floater_html_help.xml b/linden/indra/newview/skins/xui/en-us/floater_html_help.xml
deleted file mode 100644
index 91c0873..0000000
--- a/linden/indra/newview/skins/xui/en-us/floater_html_help.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater can_close="true" can_drag_on_left="false" can_minimize="true" can_resize="true"
-     height="500" min_height="300" min_width="300" name="htmlhelp"
-     title="Second Life Help" width="700">
-        <button bottom="-45" follows="top|left" font="SansSerifSmall" height="20" label="Back"
-             left="15" name="back_btn" width="70" />
-        <button bottom_delta="0" follows="top|left" font="SansSerifSmall" height="20"
-             label="Forward" left_delta="75" name="forward_btn" width="70" />
-        <button bottom_delta="0" follows="top|left" font="SansSerifSmall" height="20"
-             label="Home" left_delta="75" name="home_btn" width="70" />
-        <text bottom_delta="5"
-                follows="top|left|right"
-                left_delta="100"
-                name="status_text"
-                right="-5"
-                height="16">
-                Ready
-        </text>
-        <web_browser name="html_help_browser"
-                bottom="10"
-                follows="top|left|bottom|right"
-                font="SansSerifSmall"
-                left="15"
-            right="-15" top="-55" start_url="http://secondlife.com/app/help/" />
-</floater>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_im.xml b/linden/indra/newview/skins/xui/en-us/floater_im.xml
index fee153a..ae14c00 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_im.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_im.xml
@@ -13,14 +13,27 @@
         <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="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="user_no_help">
-            The requested user is no longer in the help session.
+        <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">
+            You have been muted.
         </string>
         <string name="add_session_event">
             adding agents to chat session with
@@ -28,13 +41,13 @@
         <string name="message_session_event">
             messaging chat session with
         </string>
-        <string name="teleport_session_event">
-            teleporting to creator of
+        <string name="mute_agent_event">
+            muting agent in
         </string>
         <string name="removed_from_group">
             You have been removed from the group.
         </string>
-        <string name="invite_message">
-                Click the [BUTTON NAME] button to accept/connect to this voice chat.
+        <string name="close_on_no_ability">
+            You no longer have the ability to be in the chat session
         </string>
 </multi_floater>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_instant_message.xml b/linden/indra/newview/skins/xui/en-us/floater_instant_message.xml
index 637c8ba..b6a7932 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_instant_message.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_instant_message.xml
@@ -1,71 +1,64 @@
-<!-- This is the _embedded_ instant message panel, not the floater that
-     contains all the instant messages.  See floater_im.xml.  JC -->
-<floater border="true"
-     bottom="-298"
-     can_close="true"
-     can_drag_on_left="false"
-     can_minimize="true"
-     can_resize="true"
-     enabled="true"
-     follows="left|top|right|bottom"
-     height="297"
-     hidden="false"
-     label="(unknown)"
-     left="1"
-     min_height="155"
-     min_width="345"
-     mouse_opaque="true"
-     name="im_floater"
-     rect_control=""
-     title="(unknown)"
-     width="501"
-     default_tab_group="1">
-        <string name="ringing">Calling...</string>
-        <string name="connected">Connected, click End Call to hang up</string>
-        <string name="hang_up">Call ended</string>
-     
-    <button left="4" bottom="-40" height="20" width="70" label="Profile..." follows="left|top" name="profile_callee_btn"/>
-    <button left_delta="75" bottom="-40" height="20" width="70" label="Call" follows="left|top" name="start_call_btn"/>
-    <button left_delta="0" bottom="-40" height="20" width="70" label="End Call" follows="left|top" name="end_call_btn" visible="false"/>
-    <panel left_delta="72" bottom="-40" height="20" width="344" border="false" name="speaker_controls" follows="left|top|right">
-                <volume_slider
-                                name="speaker_volume"
-                                enabled="false"
-                                left="0"
-                                width="80"
-                                bottom="0"
-                                height="15"
-                                follows="left|bottom"
-                                min_val="0.0"
-                                max_val="1.0"
-                                increment="0.05"
-                                initial_val="0.5"
-                        />
-                <check_box
-                        name="mute_btn"
-                        enabled="false"
-                        left_delta="85"
-                        bottom_delta="0"
-                        width="70"
-                        height="25"
-                        label="Mute voice chat"
-                        />
-    </panel>
+<floater border="true" bottom="-298" can_close="true" can_drag_on_left="false"
+     can_minimize="true" can_resize="true" default_tab_group="1"
+     follows="left|top|right|bottom" height="297" label="(unknown)" left="1"
+     min_height="155" min_width="345" mouse_opaque="true" name="im_floater"
+     rect_control="" title="(unknown)" width="501">
+        <string name="ringing">
+                Calling...
+        </string>
+        <string name="answering">
+                Connecting...
+        </string>
+        <string name="connected">
+                Connected, click End Call to hang up
+        </string>
+        <string name="hang_up">
+                Call ended
+        </string>
+        <string name="voice_icon">
+                icn_voice-pvtfocus.tga
+        </string>
+        <string name="title_string">
+                Instant Message with [NAME]
+        </string>
+        <string name="typing_start_string">
+                [NAME] is typing...
+        </string>
+        <string name="session_start_string">
+                Starting session with [NAME] please wait.
+        </string>
+        <button bottom="-40" follows="left|top" height="20" label="Profile..." left="4"
+             name="profile_callee_btn" width="80" />
+        <button bottom="-40" follows="left|top" halign="center" height="20"
+             image_overlay="icn_voice-call-start.tga" image_overlay_alignment="left"
+             label="Call" left_delta="85" name="start_call_btn" width="80" />
+        <button bottom="-40" follows="left|top" halign="right" height="20"
+             image_overlay="icn_voice-call-end.tga" image_overlay_alignment="left"
+             label="End Call" left_delta="0" name="end_call_btn" visible="false" width="80"
+             pad_right="10"/>
+        <panel border="false" bottom="-40" follows="left|top|right" height="20"
+             left_delta="77" name="speaker_controls" width="344">
+                <volume_slider bottom="0" follows="left|bottom" height="15" increment="0.05"
+                     initial_val="0.5" left="0" max_val="1.0" min_val="0.0"
+                     name="speaker_volume" width="80" />
+        <button bottom_delta="0" height="20"
+             image_selected="icn_speaker-muted_dark.tga"
+             image_unselected="icn_speaker_dark.tga" label="" left_delta="85"
+             name="mute_btn" width="25" tool_tip="Mute voice"/>
+        </panel>
         <text_editor type="string" length="1" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor"
              bottom="28" embedded_items="false" enabled="false"
-             follows="left|top|right|bottom" font="SansSerif" height="225"
-             hidden="false" left="4" max_length="2147483647" mouse_opaque="true"
-             name="im_history" text_color="ChatHistoryTextColor"
+             follows="left|top|right|bottom" font="SansSerif" height="225" left="4"
+             max_length="2147483647" mouse_opaque="true" name="im_history"
+             text_color="ChatHistoryTextColor"
              text_readonly_color="ChatHistoryTextColor" width="490" word_wrap="true" />
         <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="5"
-             enabled="true" follows="left|right|bottom" font="SansSerif"
-             handle_edit_keys_directly="false" height="20" hidden="false" left="6"
-             max_length="1022" mouse_opaque="true" name="chat_editor"
-             select_all_on_focus_received="false" select_on_focus="false" tab_group="1"
-             width="421" label="Click here to instant message" />
-        <button bottom="4" enabled="true" follows="right|bottom" font="SansSerif"
-             halign="center" height="20" hidden="false" label="Send"
-             left="432" mouse_opaque="true" name="send_btn"
+             follows="left|right|bottom" font="SansSerif" height="20"
+             label="Click here to instant message" left="6" max_length="1022"
+             mouse_opaque="true" name="chat_editor" select_all_on_focus_received="false"
+             select_on_focus="false" tab_group="1" width="421" />
+        <button bottom="4" follows="right|bottom" font="SansSerif" halign="center" height="20"
+             label="Send" left="432" mouse_opaque="true" name="send_btn"
              scale_image="true" width="60" />
         <text hidden="true" name="live_help_dialog" wordwrap="false">
                 *** Welcome to Help Request *** 
@@ -73,13 +66,4 @@ Please first check our SL Help Pages by pressing F1, or by accessing the Knowled
 If your answer is not there, please enter your question to begin, then allow a few moments for available helpers to respond.
 -=-=- Response times will vary, especially during peak times -=-=-
         </text>
-        <text hidden="true" name="title_string">
-                Instant Message with [NAME]
-        </text>
-        <text hidden="true" name="typing_start_string">
-                [NAME] is typing...
-        </text>
-        <text hidden="true" name="session_start_string">
-            Starting session with [NAME] please wait.
-        </text>
 </floater>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_instant_message_ad_hoc.xml b/linden/indra/newview/skins/xui/en-us/floater_instant_message_ad_hoc.xml
index f58273e..eba2603 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_instant_message_ad_hoc.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_instant_message_ad_hoc.xml
@@ -24,12 +24,21 @@
         <string name="ringing">Joining Voice Chat...</string>

         <string name="connected">Connected, click End Call to hang up</string>

         <string name="hang_up">Left Voice Chat</string>

-

+        <string name="voice_icon">icn_voice-groupfocus.tga</string>

+        <string name="title_string">

+                Instant Message with [NAME]

+        </string>

+        <string name="typing_start_string">

+                [NAME] is typing...

+        </string>

+        <string name="session_start_string">

+            Starting session with [NAME] please wait.

+        </string>

         <layout_stack border="false" left="2" bottom="1" width="495" height="277" follows="left|top|right|bottom" orientation="horizontal" tab_group="1">

         <layout_panel border="false" name="im_contents_panel" min_width="115" left="0" bottom="0" width="495" height="295" follows="left|top|bottom|right" default_tab_group="1">

-                        <button left="4" bottom="-24" height="20" width="70" label="Call" enabled="false" follows="left|top" name="start_call_btn"/>

-                        <button left_delta="0" bottom_delta="0" height="20" width="70" label="End Call" follows="left|top" name="end_call_btn" visible="false"/>

-                <button left="460" right="493" bottom_delta="0" height="20" width="70" label="&lt; &lt;" label_selected="&gt; &gt;" follows="right|top" name="toggle_active_speakers_btn" visible="true" tool_tip="Click here to show list of active partipants in this IM session."/>

+                        <button left="4" bottom="-24" height="20" width="80" label="Call" enabled="false" follows="left|top" name="start_call_btn" image_overlay="icn_voice-call-start.tga" image_overlay_alignment="left" halign="center"/>

+                        <button left_delta="0" bottom_delta="0" height="20" width="80" label="End Call" halign="right" follows="left|top" name="end_call_btn" visible="false" image_overlay="icn_voice-call-end.tga" image_overlay_alignment="left" />

+                <button left="460" right="493" bottom_delta="0" height="20" width="80" label="&lt; &lt;" label_selected="&gt; &gt;" follows="right|top" name="toggle_active_speakers_btn" visible="true" tool_tip="Click here to toggle list of active partipants in this IM session."/>

                         

                         <text_editor type="string" length="1" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor"

                                 bottom="-268" embedded_items="false" enabled="false"

@@ -49,57 +58,9 @@
                                 scale_image="true" width="60" />

                 </layout_panel>

                              

-             

-        <layout_panel auto_resize="false" can_resize="true" min_width="145" name="active_speakers_panel" top_delta="0" left="0" bottom="0" width="145" height="120" visible="false">

-                        <scroll_list name="speakers_list" left="0" right="145" top="120" bottom="78" column_padding="0" can_resize="false" follows="left|top|bottom|right" draw_heading="true" draw_stripes="false" multi_select="false" search_column="1">

-                                <column name="icon_speaking_status" width="20" sort="speaking_status"/> 

-                                <column name="speaker_name" label="Name" dynamicwidth="true"/>

-                                <column name="speaking_status" label="" width="0"/>

-                        </scroll_list>

-                        <panel name="volume_container" follows="left|bottom|right" left="0" right="145" bottom="0" border="true" mouse_opaque="true" bevel_style="in" can_resize="false" height="77">

-                                <button left="0" right="30" bottom="-28" height="24" name="profile_btn" follows="left|top" label="" image_overlay="icon_avatar_offline.tga" enabled="false"/>

-                                <text left_delta="34" bottom_delta="9" name="resident_name" valign="center" follows="left|top|right" width="110" font="SansSerif">Rumplstiltskin Califragilistic</text>

-                                <volume_slider

-                                        name="speaker_volume"

-                                        left="5"

-                                        width="85"

-                                        bottom_delta="-29"

-                                        height="15"

-                                        follows="left|top"

-                                        min_val="0.0"

-                                        max_val="1.0"

-                                        increment="0.05"

-                                        initial_val="0.5"

-                                />

-                                <text type="string" width="45" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

-                                        drop_shadow_visible="true" enabled="true" follows="left|top"

-                                        font="SansSerifSmall" height="16" hidden="false"

-                                        left="4" mouse_opaque="true" bottom_delta="-25" name="Mute:" v_pad="0">

-                                        Mute:

-                                </text>

-                                <check_box

-                                        name="mute_text_btn"

-                                        width="50"

-                                        bottom_delta="0"

-                                        left_delta="32"

-                                        follows="left|top"

-                                        height="25"

-                                        enabled="false"

-                                        label="Text"

-                                />

-                                <check_box

-                                        name="mute_btn"

-                                        follows="left|top"

-                                        width="50"

-                                        bottom_delta="0"

-                                        left_delta="45"

-                                        height="25"

-                                        enabled="false"

-                                        label="Voice"

-                                />

-                                

-                        </panel>                

-                </layout_panel>

+                <layout_panel filename="panel_speaker_controls.xml" auto_resize="false" bottom="0" can_resize="true" height="120" left="0"

+                     min_width="140" name="active_speakers_panel" top_delta="0" visible="false"

+                     width="140"/>

         </layout_stack>

         <text hidden="true" name="live_help_dialog" wordwrap="false">

                 *** Welcome to Help Request *** 

@@ -107,13 +68,5 @@ Please first check our SL Help Pages by pressing F1, or by accessing the Knowled
 If your answer is not there, please enter your question to begin, then allow a few moments for available helpers to respond.

 -=-=- Response times will vary, especially during peak times -=-=-

         </text>

-        <text hidden="true" name="title_string">

-                Instant Message with [NAME]

-        </text>

-        <text hidden="true" name="typing_start_string">

-                [NAME] is typing...

-        </text>

-        <text hidden="true" name="session_start_string">

-            Starting session with [NAME] please wait.

-        </text>

+

 </floater>

diff --git a/linden/indra/newview/skins/xui/en-us/floater_instant_message_group.xml b/linden/indra/newview/skins/xui/en-us/floater_instant_message_group.xml
index 1b7dd4e..0c9fe38 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_instant_message_group.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_instant_message_group.xml
@@ -1,160 +1,82 @@
-<!-- This is the _embedded_ instant message panel, not the floater that

-     contains all the instant messages.  See floater_im.xml.  JC -->

-<floater border="true"

-                 bottom="-297" 

-                 can_close="true" 

-                 can_drag_on_left="false" 

-                 can_minimize="false" 

-                 can_resize="true" 

-                 enabled="true" 

-                 follows="left|top|right|bottom" 

-                 height="296" 

-                 hidden="false" 

-                 label="(unknown)" 

-                 left="1" 

-                 min_height="200"

-                 min_width="340"

-                 mouse_opaque="true"

-                 name="im_floater"

-                 rect_control="" 

-                 title="(unknown)" 

-                 width="501" 

-                 default_tab_group="1">

-

-        <string name="ringing">Joining Voice Chat...</string>

-        <string name="connected">Connected, click End Call to hang up</string>

-        <string name="hang_up">Left Voice Chat</string>

-        

-    <layout_stack border="false" left="2" bottom="1" width="495" height="276" follows="left|top|right|bottom" orientation="horizontal" tab_group="1">

-        <layout_panel border="false" name="im_contents_panel" min_width="185" left="0" bottom="0" width="175" height="130" follows="left|top|bottom|right" default_tab_group="1">

-                 

-                <button left="4"

-                                height="20" 

-                                width="70"

-                                tab_group="0"

-                                label="Group Info..." 

-                                follows="left|top" 

-                                name="group_info_btn"/>

-                

-                <button left_delta="75"

-                                bottom_delta="0"

-                                height="20" 

-                                width="70" 

-                                label="Join Call" 

-                                enabled="false" 

-                                follows="left|top" 

-                                name="start_call_btn"/>

-                

-                <button bottom_delta="0" height="20" left_delta="0" width="70" label="End Call" follows="left|top" name="end_call_btn" visible="false"/>

-                <button left="140" right="173" bottom_delta="0" height="20" width="70" label="&lt; &lt;" label_selected="&gt; &gt;" follows="right|top" name="toggle_active_speakers_btn" visible="true" tool_tip="Click here to show list of active partipants in this IM session."/>

-                

-                <text_editor type="string"

-                                         length="1" 

-                                         bg_readonly_color="ChatHistoryBgColor" 

-                                         bg_writeable_color="ChatHistoryBgColor" 

-                                         bottom="27"

-                                         top="102"

-                                         embedded_items="false" 

-                                         enabled="false" 

-                                         follows="left|top|right|bottom" 

-                                         font="SansSerif" 

-                                         hidden="false" 

-                                         left="4" 

-                                         max_length="2147483647" 

-                                         mouse_opaque="true" 

-                                         name="im_history" 

-                                         text_color="ChatHistoryTextColor" 

-                                         text_readonly_color="ChatHistoryTextColor" 

-                                         width="170" 

-                                         word_wrap="true"/>

-                

-                <line_editor bevel_style="in" 

-                                         border_style="line" 

-                                         border_thickness="1" 

-                                         bottom="4" enabled="true"

-                                         follows="left|right|bottom" 

-                                         font="SansSerif" 

-                                         handle_edit_keys_directly="false" 

-                                         height="20" 

-                                         hidden="false" 

-                                         left="4" 

-                                         max_length="1022" 

-                                         mouse_opaque="true" 

-                                         name="chat_editor"

-                                         select_all_on_focus_received="false" 

-                                         select_on_focus="false" 

-                                         tab_group="1" 

-                                         width="105"

-                                         label="Click here to instant message"/>

-                

-                <button bottom="3" enabled="true" follows="right|bottom" font="SansSerif" halign="center" height="20" hidden="false" label="Send" left="113" mouse_opaque="true" name="send_btn" scale_image="true" width="60"/>

-                <text hidden="true" name="live_help_dialog" wordwrap="false">

-                        *** Welcome to Help Request *** 

-                        Please first check our SL Help Pages by pressing F1, or by accessing the Knowledge Base http://secondlife.com/knowledgebase/ 

-                        If your answer is not there, please enter your question to begin, then allow a few moments for available helpers to respond.

-                        -=-=- Response times will vary, especially during peak times -=-=-

-                </text>

-                <text hidden="true" name="title_string">

-                        Instant Message with [NAME]

-                </text>

-                <text hidden="true" name="typing_start_string">

-                        [NAME] is typing...

-                </text>

-                <text hidden="true" name="session_start_string">

-                        Starting session with [NAME] please wait.

-                </text>

-        </layout_panel>

-        

-        <layout_panel auto_resize="false" can_resize="true" min_width="145" name="active_speakers_panel" top_delta="0" left="0" bottom="0" width="145" height="120" visible="false">

-                        <scroll_list name="speakers_list" left="0" right="145" top="120" bottom="78" column_padding="0" can_resize="false" follows="left|top|bottom|right" draw_heading="true" draw_stripes="false" multi_select="false" search_column="1">

-                                <column name="icon_speaking_status" width="20" sort="speaking_status"/> 

-                                <column name="speaker_name" label="Name" dynamicwidth="true"/>

-                                <column name="speaking_status" label="" width="0"/>

-                        </scroll_list>

-                        <panel name="volume_container" follows="left|bottom|right" auto_resize="false" left="0" right="145" bottom="0" border="true" mouse_opaque="true" bevel_style="in" can_resize="false" height="77">

-                                <button left="0" right="30" bottom="-28" height="24" name="profile_btn" follows="left|top" label="" image_overlay="icon_avatar_offline.tga" enabled="false"/>

-                                <text left_delta="34" bottom_delta="9" name="resident_name" valign="center" follows="left|top|right" width="110" font="SansSerif">Rumplstiltskin Califragilistic</text>

-                                <volume_slider

-                                        name="speaker_volume"

-                                        left="5"

-                                        width="85"

-                                        bottom_delta="-29"

-                                        height="15"

-                                        follows="left|top"

-                                        min_val="0.0"

-                                        max_val="1.0"

-                                        increment="0.05"

-                                        initial_val="0.5"

-                                />

-                                <text type="string" width="45" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

-                                        drop_shadow_visible="true" enabled="true" follows="left|top"

-                                        font="SansSerifSmall" height="16" hidden="false"

-                                        left="4" mouse_opaque="true" bottom_delta="-25" name="Mute:" v_pad="0">

-                                        Mute:

-                                </text>

-                                <check_box

-                                        name="mute_text_btn"

-                                        width="50"

-                                        bottom_delta="0"

-                                        left_delta="32"

-                                        follows="left|top"

-                                        height="25"

-                                        enabled="false"

-                                        label="Text"

-                                />

-                                <check_box

-                                        name="mute_btn"

-                                        follows="left|top"

-                                        width="50"

-                                        bottom_delta="0"

-                                        left_delta="45"

-                                        height="25"

-                                        enabled="false"

-                                        label="Voice"

-                                />

-                                

-                        </panel>                

+<floater border="true" bottom="-297" can_close="true" can_drag_on_left="false"

+     can_minimize="false" can_resize="true" default_tab_group="1" enabled="true"

+     follows="left|top|right|bottom" height="296" hidden="false"

+     label="(unknown)" left="1" min_height="200" min_width="360"

+     mouse_opaque="true" name="im_floater" rect_control="" title="(unknown)"

+     width="501">

+        <string name="ringing">

+                Joining Voice Chat...

+        </string>

+        <string name="connected">

+                Connected, click End Call to hang up

+        </string>

+        <string name="hang_up">

+                Left Voice Chat

+        </string>

+        <string name="voice_icon">

+                icn_voice-groupfocus.tga

+        </string>

+        <string name="live_help_dialog" wordwrap="false">

+                *** Welcome to Help Request *** 

+        Please first check our SL Help Pages by pressing F1, or by accessing the Knowledge Base http://secondlife.com/knowledgebase/ 

+        If your answer is not there, please enter your question to begin, then allow a few moments for available helpers to respond.

+        -=-=- Response times will vary, especially during peak times -=-=-

+        </string>

+        <string name="title_string">

+                Instant Message with [NAME]

+        </string>

+        <string name="typing_start_string">

+                [NAME] is typing...

+        </string>

+        <string name="session_start_string">

+                Starting session with [NAME] please wait.

+        </string>

+        <string name="moderated_chat_label">

+                (Moderated)

+        </string>

+        <string name="default_text_label">

+                Click here to instant message.

+        </string>

+        <string name="muted_text_label">

+                Text chat has been disabled by a Group Moderator.

+        </string>

+        <layout_stack border="false" bottom="1" follows="left|top|right|bottom" height="276" left="2"

+             orientation="horizontal" tab_group="1" width="495">

+                <layout_panel border="false" bottom="0" default_tab_group="1" follows="left|top|bottom|right"

+                     height="130" left="0" min_width="210" name="im_contents_panel" width="175">

+                        <button follows="left|top" height="20" label="Group Info" left="4"

+                             name="group_info_btn" tab_group="0" width="80" />

+                        <button bottom_delta="0" enabled="false" follows="left|top" halign="right" height="20"

+                             image_overlay="icn_voice-call-start.tga" image_overlay_alignment="left"

+                             label="Join Call" left_delta="85" name="start_call_btn" width="80" pad_right="12"/>

+                        <button bottom_delta="0" follows="left|top" height="20" halign="right"

+                             image_overlay="icn_voice-call-end.tga" image_overlay_alignment="left"

+                             label="End Call" left_delta="0" name="end_call_btn" visible="false" pad_right="12"

+                             width="80" />

+                        <button bottom_delta="0" follows="right|top" height="20" label="&lt; &lt;"

+                             label_selected="&gt; &gt;" left="140" name="toggle_active_speakers_btn"

+                             right="173"

+                             tool_tip="Click here to toggle list of active partipants in this IM session."

+                             visible="true" width="70" />

+                        <text_editor type="string" length="1" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor"

+                             bottom="27" embedded_items="false" enabled="false"

+                             follows="left|top|right|bottom" font="SansSerif" hidden="false" left="4"

+                             max_length="2147483647" mouse_opaque="true" name="im_history"

+                             text_color="ChatHistoryTextColor"

+                             text_readonly_color="ChatHistoryTextColor" top="102" width="170"

+                             word_wrap="true" />

+                        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="4"

+                             enabled="true" follows="left|right|bottom" font="SansSerif"

+                             height="20" hidden="false"

+                             left="4" max_length="1022"

+                             mouse_opaque="true" name="chat_editor" select_all_on_focus_received="false"

+                             select_on_focus="false" tab_group="1" width="105" />

+                        <button bottom="3" enabled="true" follows="right|bottom" font="SansSerif"

+                             halign="center" height="20" hidden="false" label="Send" left="113"

+                             mouse_opaque="true" name="send_btn" scale_image="true" width="60" />

                 </layout_panel>

-                

+                <layout_panel filename="panel_speaker_controls.xml" auto_resize="false" bottom="0" can_resize="true" height="120" left="0"

+                     min_width="140" name="active_speakers_panel" top_delta="0" visible="false"

+                     width="140"/>

         </layout_stack>

 </floater>

diff --git a/linden/indra/newview/skins/xui/en-us/floater_inventory_item_properties.xml b/linden/indra/newview/skins/xui/en-us/floater_inventory_item_properties.xml
index 1790162..b834821 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_inventory_item_properties.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_inventory_item_properties.xml
@@ -4,7 +4,7 @@
      name="item properties" rect_control="PropertiesRect"
      title="Inventory Item Properties" width="350">
         <icon bottom="-21" follows="top|right" height="16" left="294" mouse_opaque="true"
-             name="IconLocked" width="16" />
+             name="IconLocked" image_name="icon_lock.tga" width="16" />
         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom="-35" drop_shadow_visible="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
diff --git a/linden/indra/newview/skins/xui/en-us/floater_mute.xml b/linden/indra/newview/skins/xui/en-us/floater_mute.xml
index c8d730a..8ff118f 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_mute.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_mute.xml
@@ -3,7 +3,7 @@
      can_resize="true" can_tear_off="true" enabled="true" height="300"
      hidden="false" left="45" min_height="140" min_width="220"
      mouse_opaque="true" name="mute floater" rect_control="FloaterMuteRect3"
-     title="Muted Residents &amp; Objects" width="300">
+     title="Muted Residents &amp; Objects" short_title="Mute List" width="300">
         <scroll_list background_visible="false" bottom="-220" column_padding="5" draw_border="true"
              draw_heading="false" draw_stripes="true" enabled="true"
              fg_disable_color="1 1 1 1" fg_selected_color="1 1 1 1"
diff --git a/linden/indra/newview/skins/xui/en-us/floater_mute_object.xml b/linden/indra/newview/skins/xui/en-us/floater_mute_object.xml
new file mode 100644
index 0000000..db064dc
--- /dev/null
+++ b/linden/indra/newview/skins/xui/en-us/floater_mute_object.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater can_close="true" can_drag_on_left="false" can_minimize="false"
+     can_resize="false" height="140" min_height="140" min_width="375"
+     name="mute by name" title="Mute object by name" width="375">
+        <text left_delta="25" bottom_delta="-50" font="SansSerif" follows="top|left" height="16" left="20"
+             name="message" right="380" text_color="white">
+Mute by name only affects object chat and IM, not sounds.
+You must type the object&apos;s name exactly.
+        </text>
+        <line_editor bottom_delta="-40" follows="top|right" height="18" left_delta="0"
+             name="object_name" width="320" font="SansSerif">
+                Object name
+        </line_editor>
+        <button bottom_delta="-30" follows="bottom|left" height="20" label="Ok" left="108"
+             name="OK" width="75" />
+        <button bottom_delta="0" follows="bottom|right" height="20" label="Cancel" left="190"
+             name="Cancel" width="75" />
+</floater>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_my_friends.xml b/linden/indra/newview/skins/xui/en-us/floater_my_friends.xml
index 50c69c6..264286d 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_my_friends.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_my_friends.xml
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>

-<floater can_close="false" can_minimize="true" can_drag_on_left="false" can_tear_off="false" can_resize="true" height="390" min_height="240" min_width="365" name="floater_my_friends"

-     title="Contacts" 

-     width="395">

-        <tab_container bottom="10" height="360" tab_width="80" follows="left|right|top|bottom" left="0" name="friends_and_groups" tab_position="left" width="388">

-                <panel label="Friends" filename="panel_friends.xml" bottom="0" left="0" width="370" name="friends_panel"/>

-                <panel label="Groups" filename="panel_groups.xml" bottom="0" left="0" width="370" name="groups_panel"/>

+<floater can_close="false" can_drag_on_left="false" can_minimize="true"

+     can_resize="true" can_tear_off="true" height="390" min_height="240"

+     rect_control="FloaterContactsRect"

+     min_width="365" name="floater_my_friends" title="Contacts" width="395">

+        <tab_container bottom="10" follows="left|right|top|bottom" height="360" left="0"

+             name="friends_and_groups" tab_position="top" tab_width="80" width="388">

+                <panel bottom="0" filename="panel_friends.xml" label="Friends" left="0"

+                     name="friends_panel" width="370" />

+                <panel bottom="0" filename="panel_groups.xml" label="Groups" left="0"

+                     name="groups_panel" width="370" />

         </tab_container>

 </floater>

diff --git a/linden/indra/newview/skins/xui/en-us/floater_preview_url.xml b/linden/indra/newview/skins/xui/en-us/floater_preview_url.xml
index fcc04c5..a59bc73 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_preview_url.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_preview_url.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater bottom="-311" can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="false" enabled="true" height="495" hidden="false" left="242"
+<floater can_close="true" can_drag_on_left="false" can_minimize="true"
+     can_resize="false" enabled="true" height="495" hidden="false"
      mouse_opaque="true"
      name="url_preview" width="440" title="Place Information" rect_control="PreviewURLRect">
   <panel follows="bottom|left" bottom="0" height="475" left="0" name="place_details_panel" width="440" />
diff --git a/linden/indra/newview/skins/xui/en-us/floater_region_info.xml b/linden/indra/newview/skins/xui/en-us/floater_region_info.xml
new file mode 100644
index 0000000..36f0989
--- /dev/null
+++ b/linden/indra/newview/skins/xui/en-us/floater_region_info.xml
@@ -0,0 +1,5 @@
+<floater can_close="true" can_minimize="true" can_resize="false" name="regioninfo" can_drag_on_left="false"

+     rect_control="FloaterRegionInfo" title="Region/Estate">

+        <tab_container border="false" bottom="0" follows="left|right|top|bottom" left="1"

+             name="region_panels" right="-1" tab_position="top" top="-20" />

+</floater>

diff --git a/linden/indra/newview/skins/xui/en-us/floater_report_abuse.xml b/linden/indra/newview/skins/xui/en-us/floater_report_abuse.xml
index d4a0034..6600349 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_report_abuse.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_report_abuse.xml
@@ -130,9 +130,9 @@
         </text>
         <line_editor bevel_style="in" bg_readonly_color="0, 0, 0, 0" border_style="line"
              border_thickness="1" bottom_delta="-18" follows="left|top"
-             font="SansSerifSmall" height="16" left="16" max_length="32"
+             font="SansSerifSmall" height="16" left="16" max_length="256"
              mouse_opaque="true" name="abuse_location_edit"
-             text_readonly_color="1, 1, 1, 1" width="180" />
+             text_readonly_color="1, 1, 1, 1" width="356" />
         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom_delta="-24" drop_shadow_visible="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="16" left="16"
diff --git a/linden/indra/newview/skins/xui/en-us/floater_sound_preview.xml b/linden/indra/newview/skins/xui/en-us/floater_sound_preview.xml
index d4c4add..6f47e2a 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_sound_preview.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_sound_preview.xml
@@ -32,29 +32,4 @@
         <button bottom="-170" follows="left|bottom" font="SansSerif" halign="center"
              height="20" label="Upload (L$10)" label_selected="Upload (L$10)"
              left_delta="0" mouse_opaque="true" name="ok_btn" width="130" /-->
-        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-120" drop_shadow_visible="true" follows="left|top"
-             font="SansSerif" h_pad="0" halign="left" height="19" left="13"
-             mouse_opaque="true" name="text" v_pad="0" width="87">
-                Bitrate (kbps):
-        </text>
-        <radio_group bottom_delta="-22" follows="left|top" height="22" left="13" mouse_opaque="true"
-             name="bitrate" width="274">
-                <radio_item bottom="-21" follows="left|top" height="19" left="20" mouse_opaque="true"
-                     name="32" width="60">
-                        32
-                </radio_item>
-                <radio_item bottom="-21" follows="left|top" height="19" left="80" mouse_opaque="true"
-                     name="64" width="60">
-                        64
-                </radio_item>
-                <radio_item bottom="-21" follows="left|top" height="19" left="140" mouse_opaque="true"
-                     name="96" width="60">
-                        96
-                </radio_item>
-                <radio_item bottom="-21" follows="left|top" height="19" left="200" mouse_opaque="true"
-                     name="128" width="60">
-                        128
-                </radio_item>
-        </radio_group>
 </floater>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_world_map.xml b/linden/indra/newview/skins/xui/en-us/floater_world_map.xml
index 26a9aa4..b32091c 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_world_map.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_world_map.xml
@@ -169,7 +169,7 @@
              name="location_icon" width="16" />
         <line_editor bottom_delta="0" follows="top|right" height="20" label="Search by Region Name"
              left_delta="20" name="location" select_on_focus="true"
-             tool_tip="Type the name of a region" width="140" />
+             tool_tip="Type the name of a region" width="140"/>
         <button bottom_delta="0" follows="top|right" font="SansSerif" halign="center"
              height="20" label="Search" left_delta="145" mouse_opaque="true"
              name="DoSearch" tool_tip="Search for region" width="60" />
diff --git a/linden/indra/newview/skins/xui/en-us/menu_inventory.xml b/linden/indra/newview/skins/xui/en-us/menu_inventory.xml
index 3dfe14a..c1b72d4 100644
--- a/linden/indra/newview/skins/xui/en-us/menu_inventory.xml
+++ b/linden/indra/newview/skins/xui/en-us/menu_inventory.xml
@@ -197,6 +197,7 @@
              mouse_opaque="true" name="Animation Audition" width="128">
                 <on_click filter="" function="Inventory.DoToSelected" userdata="playlocal" />
         </menu_item_call>
+        <menu_item_separator name="Send Instant Message Separator" />
         <menu_item_call bottom_delta="-18" height="18" hidden="false" label="Send Instant Message"
              left="0" mouse_opaque="true" name="Send Instant Message" width="128">
                 <on_click filter="" function="Inventory.DoToSelected" userdata="begin_im" />
@@ -219,6 +220,9 @@
              mouse_opaque="true" name="Deactivate" width="128">
                 <on_click filter="" function="Inventory.DoToSelected" userdata="deactivate" />
         </menu_item_call>
+
+<!-- from this line down the attach session is read in reverse order -->        
+
         <menu_item_separator name="Attach Separator" />
         <menu_item_call bottom_delta="-18" height="18" hidden="false" label="Detach From Yourself"
              left="0" mouse_opaque="true" name="Detach From Yourself" width="128">
@@ -234,7 +238,9 @@
         <menu bottom_delta="-18" height="18" hidden="false" label="Attach To HUD" left="0"
              mouse_opaque="true" name="Attach To HUD" opaque="true" tear_off="false"
              width="128" />
-        <menu_item_separator name="Wearable Separator" />
+                 
+<!-- from this line down the wearable session is read in reverse order -->              
+         
         <menu_item_call bottom_delta="-18" height="18" hidden="false" label="Edit" left="0"
              mouse_opaque="true" name="Wearable Edit" width="128">
                 <on_click filter="" function="Inventory.DoToSelected" userdata="edit" />
@@ -249,4 +255,5 @@
         </menu_item_call>
         <menu_item_call bottom_delta="-18" height="18" hidden="false" label="--no options--" left="0"
              mouse_opaque="true" name="--no options--" width="128" />
+        <menu_item_separator name="Wearable Separator" />        
 </menu>
diff --git a/linden/indra/newview/skins/xui/en-us/menu_viewer.xml b/linden/indra/newview/skins/xui/en-us/menu_viewer.xml
index 8643c7e..1fa57da 100644
--- a/linden/indra/newview/skins/xui/en-us/menu_viewer.xml
+++ b/linden/indra/newview/skins/xui/en-us/menu_viewer.xml
@@ -848,7 +848,7 @@
                         left="0" mouse_opaque="true" name="separator7" width="250" />
                         <menu_item_call bottom="-240" enabled="true" height="19" hidden="false" label="Report Bug..."
                     left="0" mouse_opaque="true" name="Report Bug..." width="166">
-                        <on_click function="ShowFloater" userdata="bug reporter" />
+                        <on_click function="PromptShowURL" userdata="WebLaunchPublicIssue,http://jira.secondlife.com" />
                         </menu_item_call>
                 </menu>
         </menu>
diff --git a/linden/indra/newview/skins/xui/en-us/notify.xml b/linden/indra/newview/skins/xui/en-us/notify.xml
index cbd2789..d1964e0 100644
--- a/linden/indra/newview/skins/xui/en-us/notify.xml
+++ b/linden/indra/newview/skins/xui/en-us/notify.xml
@@ -79,12 +79,12 @@
         </notify>
         <notify name="GestureMissing" tip="true">
                 <message name="message">
-                        Gesture is missing from database.
+                        Gesture [NAME] is missing from database.
                 </message>
         </notify>
         <notify name="UnableToLoadGesture" tip="true">
                 <message name="message">
-                        Unable to load gesture.
+                        Unable to load gesture [NAME].
 Please try again.
                 </message>
         </notify>
@@ -378,9 +378,9 @@ You cannot fly here.
 You cannot push others here unless you own the land.
                 </message>
         </notify>
-        <notify name="VoiceAvailablity" tip="false" unique="true">
+        <notify name="NoVoice" tip="false" unique="true">
                 <message name="message">
-                        This land has voice enabled.
+                        This land has voice disabled.
                 </message>
         </notify>
         <notify name="NoBuild" tip="false" unique="true">
@@ -720,6 +720,9 @@ Is this OK?
                 <option name="No">
                         No
                 </option>
+                <option name="Mute">
+                        Mute
+                </option>
         </notify>
   <!-- the special chat messages to log when caution permissions have been granted or denied -->
   <notify name="ScriptQuestionCautionChatGranted" tip="false">
@@ -917,8 +920,23 @@ Click Accept to join the call or Decline to decline the invitation. Click Mute t
         </notify>
         <notify name="VoiceInviteAdHoc" tip="false" unique="true">
                 <message name="message">
-                        [NAME] is inviting you to a Voice Chat conference call. 
-Click Accept to join the call or Decline to decline the invitation. Click Mute to mute this caller.
+                        [NAME] has joined a Voice Chat call with a conference chat.. 
+Click Accept to join the call or Decline to decline the invitation. Click Mute to mute this user.
+                </message>
+                <option name="Accept">
+                        Accept
+                </option>
+                <option name="Decline">
+                        Decline
+                </option>
+                <option name="Mute">
+                        Mute
+                </option>
+        </notify>
+        <notify name="InviteAdHoc" tip="false" unique="true">
+                <message name="message">
+                        [NAME] is inviting you to a conference chat. 
+Click Accept to join the chat or Decline to decline the invitation. Click Mute to mute this user.
                 </message>
                 <option name="Accept">
                         Accept
@@ -960,6 +978,7 @@ Click Accept to join the call or Decline to decline the invitation. Click Mute t
                         [VOICE_CHANNEL_NAME] is not available to take your call.  You will now be reconnected to spatial voice chat.
                 </message>
         </notify>
+
         <notify name="VoiceChannelJoinFailed" tip="true" unique="true">
                 <message name="message">
                         Failed to connect to [VOICE_CHANNEL_NAME], please try again later.  You will now be reconnected to spatial voice chat.
@@ -970,11 +989,6 @@ Click Accept to join the call or Decline to decline the invitation. Click Mute t
                         We are creating a voice channel for you. This may take up to one minute.
                 </message>
         </notify>
-        <notify name="VoiceLoginRetry" tip="true" unique="true" duration="10">
-                <message name="message">
-                        We are creating a voice channel for you. This may take up to one minute.
-                </message>
-        </notify>
         <notify name="Cannot enter parcel: not a group member" tip="true">
                 <message name="message">
                         Cannot enter parcel, you are not a member of the appropriate group.
@@ -990,4 +1004,19 @@ Click Accept to join the call or Decline to decline the invitation. Click Mute t
                         Cannot enter parcel, you are not on the access list.
                 </message>
         </notify>
+        <notify name="VoiceNotAllowed" tip="true" unique="true">
+          <message name="message">
+            You do not have permission to connect to voice chat for [VOICE_CHANNEL_NAME].
+          </message>
+        </notify>
+        <notify name="VoiceCallGenericError" tip="true" unique="true">
+          <message name="message">
+            An error has occurred while trying to connect to voice chat for [VOICE_CHANNEL_NAME].  Please try again later.
+          </message>
+        </notify>
+        <notify name="ServerVersionChanged" tip="true" caution="true" duration="10">
+                <message name="message">
+                  "The region you have entered is running a different simulator version. Click this message for details."
+                </message>
+        </notify>
 </notifications>
diff --git a/linden/indra/newview/skins/xui/en-us/panel_audio.xml b/linden/indra/newview/skins/xui/en-us/panel_audio.xml
index e237f99..ead0846 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_audio.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_audio.xml
@@ -1,39 +1,60 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel border="true" enabled="true" follows="left|top|right|bottom"
-     height="180" hidden="false" label="Audio &amp; Video"
-     mouse_opaque="true" name="Media panel" width="160">
-        <check_box bottom="-25" control_name="MuteAudio" enabled="true" follows="left|top"
-             font="SansSerifSmall" height="16" hidden="false" initial_value="false"
-             label="Mute" left="10" mouse_opaque="true" name="disable audio"
-             radio_style="false" width="134" />
-
-        <slider bottom_delta="-20" control_name="AudioLevelMaster" enabled="true" follows="left|top"
-             height="15" hidden="false" increment="0.05" initial_val="0.5" left="10"
-             max_val="1" min_val="0" mouse_opaque="true" name="System Volume" width="120"
-             label="Master" show_text="false" label_width="55" volume="true" />
-        <slider bottom_delta="-20" control_name="AudioLevelMusic" enabled="true" follows="left|top"
-             height="15" hidden="false" increment="0.05" initial_val="0.5" left="10"
-             max_val="1" min_val="0" mouse_opaque="true" name="Music Volume" width="120"
-             label="Music" show_text="false" label_width="55" volume="true" />
-        <slider bottom_delta="-20" control_name="AudioLevelMedia" enabled="true" follows="left|top"
-             height="15" hidden="false" increment="0.05" initial_val="0.5" left="10"
-             max_val="1" min_val="0" mouse_opaque="true" name="Media Volume" width="120"
-             label="Media" show_text="false" label_width="55" volume="true" />
-        <slider bottom_delta="-20" control_name="AudioLevelVoice" enabled="true" follows="left|top"
-             height="15" hidden="false" increment="0.05" initial_val="0.5" left="10"
-             max_val="1" min_val="0" mouse_opaque="true" name="Voice Volume" width="120"
-             label="Voice" show_text="false" label_width="55" volume="true" />
-
-        <slider bottom_delta="-20" control_name="AudioLevelSFX" enabled="true" follows="left|top"
-             height="15" hidden="false" increment="0.05" initial_val="0.5" left="10"
-             max_val="1" min_val="0" mouse_opaque="true" name="SFX Volume" width="120"
-             label="Sounds" show_text="false" label_width="55" volume="true" />
-        <slider bottom_delta="-20" control_name="AudioLevelAmbient" enabled="true" follows="left|top"
-             height="15" hidden="false" increment="0.05" initial_val="0.5" left="10"
-             max_val="1" min_val="0" mouse_opaque="true" name="Wind Volume" width="120"
-             label="Ambient" show_text="false" label_width="55" volume="true" />
-        <slider bottom_delta="-20" control_name="AudioLevelUI" enabled="true" follows="left|top"
-             height="15" hidden="false" increment="0.05" initial_val="0.5" left="10"
-             max_val="1" min_val="0" mouse_opaque="true" name="UI Volume" width="120"
-             label="UI" show_text="false" label_width="55" volume="true" />
+<panel border="false" follows="left|top|right|bottom" height="160"
+     label="Audio &amp; Video" name="Media panel" width="175">
+        <slider bottom_delta="-20" control_name="AudioLevelMaster" follows="left|top|right"
+             height="15" increment="0.05" initial_val="0.5" label="Master"
+             label_width="55" left="10" max_val="1" min_val="0" mouse_opaque="true"
+             name="System Volume" show_text="false" volume="true" width="140" />
+        <button bottom_delta="0" control_name="MuteAudio" follows="top|right" height="16"
+             image_selected="icn_speaker-muted_dark.tga"
+             image_unselected="icn_speaker_dark.tga" label="" label_width="55"
+             left="150" name="mute_music" tab_stop="false" toggle="true" width="25" />
+        <slider bottom_delta="-30" control_name="AudioLevelMusic" follows="left|top|right"
+             height="15" increment="0.05" initial_val="0.5" label="Music"
+             label_width="55" left="10" max_val="1" min_val="0" name="Music Volume"
+             show_text="false" volume="true" width="140" />
+        <button bottom_delta="0" control_name="MuteMusic" follows="top|right" height="16"
+             image_selected="icn_speaker-muted_dark.tga"
+             image_unselected="icn_speaker_dark.tga" label="" label_width="55"
+             left="150" name="mute_music" tab_stop="false" toggle="true" width="25" />
+        <slider bottom_delta="-20" control_name="AudioLevelMedia" follows="left|top|right"
+             height="15" increment="0.05" initial_val="0.5" label="Media"
+             label_width="55" left="10" max_val="1" min_val="0" name="Media Volume"
+             show_text="false" volume="true" width="140" />
+        <button bottom_delta="0" control_name="MuteMedia" follows="top|right" height="16"
+             image_selected="icn_speaker-muted_dark.tga"
+             image_unselected="icn_speaker_dark.tga" label="" label_width="55"
+             left="150" name="mute_media" tab_stop="false" toggle="true" width="25" />
+        <slider bottom_delta="-20" control_name="AudioLevelVoice" follows="left|top|right"
+             height="15" increment="0.05" initial_val="0.5" label="Voice"
+             label_width="55" left="10" max_val="1" min_val="0" name="Voice Volume"
+             show_text="false" volume="true" width="140" />
+        <button bottom_delta="0" control_name="MuteVoice" follows="top|right" height="16"
+             image_selected="icn_speaker-muted_dark.tga"
+             image_unselected="icn_speaker_dark.tga" label="" label_width="55"
+             left="150" name="mute_voice" tab_stop="false" toggle="true" width="25" />
+        <slider bottom_delta="-20" control_name="AudioLevelSFX" follows="left|top|right"
+             height="15" increment="0.05" initial_val="0.5" label="Sounds"
+             label_width="55" left="10" max_val="1" min_val="0" name="SFX Volume"
+             show_text="false" volume="true" width="140" />
+        <button bottom_delta="0" control_name="MuteSounds" follows="top|right" height="16"
+             image_selected="icn_speaker-muted_dark.tga"
+             image_unselected="icn_speaker_dark.tga" label="" label_width="55"
+             left="150" name="mute_sfx" tab_stop="false" toggle="true" width="25" />
+        <slider bottom_delta="-20" control_name="AudioLevelAmbient" follows="left|top|right"
+             height="15" increment="0.05" initial_val="0.5" label="Ambient"
+             label_width="55" left="10" max_val="1" min_val="0" name="Wind Volume"
+             show_text="false" volume="true" width="140" />
+        <button bottom_delta="0" control_name="MuteAmbient" follows="top|right" height="16"
+             image_selected="icn_speaker-muted_dark.tga"
+             image_unselected="icn_speaker_dark.tga" label="" label_width="55"
+             left="150" name="mute_wind" tab_stop="false" toggle="true" width="25" />
+        <slider bottom_delta="-20" control_name="AudioLevelUI" follows="left|top|right"
+             height="15" increment="0.05" initial_val="0.5" label="UI" label_width="55"
+             left="10" max_val="1" min_val="0" name="UI Volume" show_text="false"
+             volume="true" width="140" />
+        <button bottom_delta="0" control_name="MuteUI" follows="top|right" height="16"
+             image_selected="icn_speaker-muted_dark.tga"
+             image_unselected="icn_speaker_dark.tga" label="" label_width="55"
+             left="150" name="mute_ui" tab_stop="false" toggle="true" width="25" />
 </panel>
diff --git a/linden/indra/newview/skins/xui/en-us/panel_audio_device.xml b/linden/indra/newview/skins/xui/en-us/panel_audio_device.xml
index d40e562..08d1cf4 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_audio_device.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_audio_device.xml
@@ -65,12 +65,17 @@
 

         <volume_slider bottom_delta="-18" enabled="true" follows="left|top" height="17" hidden="false"

              increment="0.05" initial_val="0.5" left_delta="5" max_val="1" min_val="0"

-             mouse_opaque="true" name="mic_volume_slider" width="60"

+             mouse_opaque="true" name="mic_volume_slider" width="90"

              tool_tip="Change the volume using this slider" />

 

-        <text name="wait_text" left_delta="70" bottom_delta="-4" width="200" height="20" follows="left|top">

+        <text name="wait_text" left_delta="95" bottom_delta="-4" width="200" height="20" follows="left|top">

                 Please wait

         </text>

+        <locate name="bar0" left_delta="0" width="20" bottom_delta="-5" height="20"/>

+        <locate name="bar1" left_delta="22" width="20" bottom_delta="0" height="20"/>

+        <locate name="bar2" left_delta="22" width="20" bottom_delta="0" height="20"/>

+        <locate name="bar3" left_delta="22" width="20" bottom_delta="0" height="20"/>

+        <locate name="bar4" left_delta="22" width="20" bottom_delta="0" height="20"/>

         <!--<icon name="voice_volume" left_delta="70" bottom_delta="1" width="16" height="16" image_name="icn_voice_ptt-off.tga"  follows="left|top"/>-->

 

         <text hidden="true" name="default_text">"Default"</text>

diff --git a/linden/indra/newview/skins/xui/en-us/panel_avatar.xml b/linden/indra/newview/skins/xui/en-us/panel_avatar.xml
index a51b8e7..1aa8899 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_avatar.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_avatar.xml
@@ -84,8 +84,11 @@
                              v_pad="0" width="130">
                                 Partner:
                         </text>
+                        <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
+                             height="18" label="i" label_selected="i" left_delta="44"
+                             mouse_opaque="true" name="partner_info" tool_tip="Click to open partner's profile" width="18" />
                         <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
-                             height="18" label="?" label_selected="?" left_delta="53"
+                             height="18" label="?" label_selected="?" left_delta="24"
                              mouse_opaque="true" name="partner_help" width="18" />
                         <line_editor bevel_style="in" bg_readonly_color="0, 0, 0, 0" border_style="line"
                              border_thickness="1" bottom_delta="-16" enabled="true" follows="left|top"
diff --git a/linden/indra/newview/skins/xui/en-us/panel_bars.xml b/linden/indra/newview/skins/xui/en-us/panel_bars.xml
new file mode 100644
index 0000000..8896cd6
--- /dev/null
+++ b/linden/indra/newview/skins/xui/en-us/panel_bars.xml
@@ -0,0 +1,11 @@
+<panel enabled="true" follows="left|right|top|bottom" mouse_opaque="false" height="768" left="0"

+     name="bottom_panel" width="1024">

+        <panel name="status" left="0" bottom="040" height="728" width="1024" background_visible="false" auto_resize="true" user_resize="false" mouse_opaque="false" follows="left|right|top|bottom"/>

+     <layout_stack name="bar_stack" left="0" bottom="0" height="768" width="1024" 

+                        follows="left|right|bottom|top" mouse_opaque="false" orientation="vertical" border_size="0" use_bounding_rect="true">

+                <layout_panel name="spacer" left="0" bottom="0" height="768" width="1024" background_visible="false" auto_resize="true" user_resize="false" mouse_opaque="false" follows="left|right|top|bottom"/>

+                <layout_panel name="overlay" width="1024" auto_resize="false" user_resize="false" use_bounding_rect="true"/>

+                <layout_panel name="toolbar" filename="panel_toolbar.xml" width="1024" auto_resize="false" user_resize="false" use_bounding_rect="true"/>

+     </layout_stack>

+        <panel name="hud" left="0" bottom="50" height="728" width="1024" background_visible="false" auto_resize="true" user_resize="false" mouse_opaque="false" follows="left|right|top|bottom"/>

+</panel>

diff --git a/linden/indra/newview/skins/xui/en-us/panel_bg_tab.xml b/linden/indra/newview/skins/xui/en-us/panel_bg_tab.xml
new file mode 100644
index 0000000..797fb9e
--- /dev/null
+++ b/linden/indra/newview/skins/xui/en-us/panel_bg_tab.xml
@@ -0,0 +1,12 @@
+<panel bottom="0" default_tab_group="1" follows="left|bottom|right|top" height="20" use_bounding_rect="true"

+     left="0" name="bg_tab" width="100">

+        <icon bottom="-36" color="DefaultShadowDark"

+             follows="left|right|top|bottom" height="38" image_name="rounded_square.tga"

+             left="1" width="100" />

+        <icon bottom="-36" color="DefaultHighlightLight"

+             follows="left|right|top|bottom" height="38" image_name="rounded_square.tga"

+             left="0" width="98" />

+        <icon bottom="-36" color="FocusBackgroundColor"

+             follows="left|right|top|bottom" height="37" image_name="rounded_square.tga"

+             left="1" width="99" />

+</panel>

diff --git a/linden/indra/newview/skins/xui/en-us/panel_chat_bar.xml b/linden/indra/newview/skins/xui/en-us/panel_chat_bar.xml
index 8fd971e..fd252d4 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_chat_bar.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_chat_bar.xml
@@ -1,28 +1,23 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel bottom="24" enabled="true" follows="left|right|bottom" height="29"
-     hidden="false" left="-1" mouse_opaque="true" name="chat" width="256" 
-     default_tab_group="1">
-        <button bottom="-28" enabled="true" follows="left|bottom" font="SansSerif"
-             halign="center" height="24" hidden="false" label="History"
-             label_selected="History" left="0" mouse_opaque="true" name="History"
+<panel bottom="0" default_tab_group="1" follows="left|bottom|right" height="23"
+     left="0" name="chat_bar" width="395">
+        <panel left="-397" bottom="0" width="397" height="23" follows="left|right|bottom" use_bounding_rect="true">
+                <panel left="0" bottom="0" width="397" height="23" filename="panel_bg_tab.xml"/>
+        </panel>
+        <button bottom="-23" follows="left|bottom" font="SansSerif" halign="center" height="22"
+             label="Local Chat" left="1" name="History"
              tool_tip="Click here to see what has been said" width="100" />
-        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-26"
-             enabled="true" follows="left|right|bottom" font="SansSerif"
-             handle_edit_keys_directly="false" height="24" hidden="false"
-             label="Click here to chat." left="107" max_length="254"
-             mouse_opaque="true" name="Chat Editor" select_all_on_focus_received="false"
-             select_on_focus="false" tab_group="1"
-             tool_tip="Press Enter to say, Ctrl-Enter to shout." width="100" />
-        <button bottom="-28" enabled="true" follows="left|bottom" font="SansSerif"
-             halign="center" height="24" hidden="false" label="Say" label_selected="Say"
-             left="748" mouse_opaque="true" name="Say" tool_tip="(Enter)" width="100" />
-        <button bottom="-28" enabled="true" follows="left|bottom" font="SansSerif"
-             halign="center" height="24" hidden="false" label="Shout"
-             label_selected="Shout" left="855" mouse_opaque="true" name="Shout"
-             tool_tip="(Ctrl-Enter)" width="100" />
-        <combo_box allow_text_entry="false" bottom="-26" enabled="true" follows="left|bottom"
-             height="20" hidden="false" label="Gestures" left="962" max_chars="20"
-             mouse_opaque="true" name="Gesture" width="150">
+        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-22"
+             follows="left|right|bottom" handle_edit_keys_directly="false" height="19" font="SansSerif"
+             label="Click here to chat." left="107" max_length="254" name="Chat Editor"
+             select_all_on_focus_received="false" select_on_focus="false" tab_group="1"
+             tool_tip="Press Enter to say, Ctrl-Enter to shout." width="105" />
+        <flyout_button bottom="-23" follows="right|bottom" height="22" label="Say" left_delta="110"
+             mouse_opaque="true" name="Say" tool_tip="(Enter)" width="80" list_position="above">
+                <flyout_button_item value="say">Say</flyout_button_item>
+                <flyout_button_item value="shout">Shout</flyout_button_item>
+        </flyout_button>
+        <combo_box allow_text_entry="false" bottom="-22" follows="right|bottom" height="19"
+             label="Gestures" left_delta="85" max_chars="20" name="Gesture" width="80">
                 <combo_item name="Gestures">
                         Gestures
                 </combo_item>
diff --git a/linden/indra/newview/skins/xui/en-us/panel_friends.xml b/linden/indra/newview/skins/xui/en-us/panel_friends.xml
index 67c830b..97779d9 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_friends.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_friends.xml
@@ -1,45 +1,17 @@
 <panel name="friends" border="true">

-        <scroll_list bottom="90" can_resize="true" column_padding="0" draw_heading="true"

+        <scroll_list bottom="10" can_resize="true" column_padding="0" draw_heading="true"

              follows="left|top|bottom|right" left="10" multi_select="true"

              name="friend_list" right="-100" search_column="1"

              tool_tip="Hold shift or control while clicking to select multiple friends"

              top="-10">

-                <column image="ff_online_status_button.tga" name="icon_online_status" width="20" />

-                <column dynamicwidth="true" label="Name" name="friend_name" />

-                <column image="ff_visible_online_button.tga" name="icon_visible_online" width="20" />

-                <column image="ff_visible_map_button.tga" name="icon_visible_map" width="20" />

-                <column image="ff_edit_mine_button.tga" name="icon_edit_mine" width="20" />

-                <column image="ff_edit_theirs_button.tga" name="icon_edit_theirs" width="20" />

+                <column image="ff_online_status_button.tga" name="icon_online_status" width="20" tool_tip="Online status"/>

+                <column dynamicwidth="true" label="Name" name="friend_name" tool_tip="Name"/>

+                <column image="ff_visible_online_button.tga" name="icon_visible_online" width="20" tool_tip="Friend can see when you're online"/>

+                <column image="ff_visible_map_button.tga" name="icon_visible_map" width="20" tool_tip="Friend can locate you on the map"/>

+                <column image="ff_edit_mine_button.tga" name="icon_edit_mine" width="20" tool_tip="Friend can edit your objects"/>

+                <column image="ff_edit_theirs_button.tga" name="icon_edit_theirs" width="20" tool_tip="You can edit this friend's objects"/>

+                <column name="friend_last_update_generation" width="0"/>

         </scroll_list>

-        <panel background_opaque="true" background_visible="true" bevel_style="in"

-             bg_alpha_color="blue" bg_opaque_color="0,0,0,0.3" border="true" bottom="10"

-             can_resize="false" follows="left|right|bottom" height="70" left="10"

-             mouse_opaque="true" name="rights_container" right="-100">

-                <text bottom_delta="-11" follows="top|left" font="SansSerifSmall" left="10"

-                     name="friend_name_label" width="200">

-                        Select friend(s) to change rights...

-                </text>

-                <check_box bottom_delta="-21" enabled="false" follows="bottom|left" font="SansSerifSmall"

-                     height="16" hidden="false" initial_value="false"

-                     label="Can see my online status" left="10" mouse_opaque="true"

-                     name="online_status_cb" radio_style="false"

-                     tool_tip="Set whether this friend see my online status in their friends list or calling cards"

-                     width="200" />

-                <check_box bottom_delta="-18" enabled="false" follows="bottom|left" font="SansSerifSmall"

-                     height="16" hidden="false" initial_value="false"

-                     label="Can find me on the world map" left="25" mouse_opaque="true"

-                     name="map_status_cb" radio_style="false"

-                     tool_tip="Set whether this friend see my location on their map" width="200" />

-                <check_box bottom_delta="-18" enabled="false" follows="bottom|left" font="SansSerifSmall"

-                     height="16" hidden="false" initial_value="false"

-                     label="Can modify my objects" left="10" mouse_opaque="true"

-                     name="modify_status_cb" radio_style="false"

-                     tool_tip="Set whether this friend can modify my objects" width="200" />

-                <text bottom_delta="25" follows="top|left" font="SansSerif" left="10"

-                     name="process_rights_label">

-                        Processing rights change...

-                </text>

-        </panel>

         <pad bottom="-7" height="0" left="-90" width="1" />

         <button bottom_delta="-25" follows="top|right" height="22"

              label="IM/Call" left_delta="0" name="im_btn"

diff --git a/linden/indra/newview/skins/xui/en-us/panel_group_roles.xml b/linden/indra/newview/skins/xui/en-us/panel_group_roles.xml
index ca43c27..c79db97 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_group_roles.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_group_roles.xml
@@ -154,7 +154,7 @@ including the Everyone and Owner Roles.
                              fg_unselected_color="black" follows="left|top" height="134" left="6"
                              mouse_opaque="true" multi_select="true" name="action_list"
                              search_column="1"
-                             tool_tip="Select an Ability to view more details." width="392">
+                             tool_tip="Select an Ability to view more details." width="392" draw_stripes="false">
                                 <column label="" name="icon" width="18" />
                                 <column label="" name="action" width="356" />
                         </scroll_list>
@@ -177,14 +177,14 @@ things in this group. There&apos;s a broad variety of Abilities.
                 </text>
                 <scroll_list bottom_delta="-199" draw_border="true" draw_heading="false" enabled="false"
                      height="198" left="0" multi_select="false" name="member_assigned_roles"
-                     width="145">
+                     width="145" draw_stripes="false">
                         <column label="" name="checkbox" width="18" />
                         <column label="" name="role" width="109" />
                 </scroll_list>
                 <scroll_list bottom_delta="0" draw_border="true" draw_heading="false" enabled="false"
                      height="198" left="150" multi_select="false" name="member_allowed_actions"
                      tool_tip="For Details of each Allowed Ability see the Abilities tab."
-                     width="254">
+                     width="254" draw_stripes="false">
                         <column label="" name="icon" width="14" />
                         <column label="" name="action" width="224" />
                 </scroll_list>
@@ -240,7 +240,7 @@ things in this group. There&apos;s a broad variety of Abilities.
                         Allowed Abilities
                 </text>
                 <scroll_list bottom_delta="-105" draw_border="true" enabled="false" height="105" left="0"
-                     multi_select="false" name="role_assigned_members" width="145" />
+                     multi_select="false" name="role_assigned_members" width="145" draw_stripes="false"/>
                 <check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
                      initial_value="false" label="Members are visible" left="0"
                      mouse_opaque="true" name="role_visible_in_list" radio_style="false"
@@ -249,7 +249,7 @@ things in this group. There&apos;s a broad variety of Abilities.
                 <scroll_list bottom_delta="0" draw_border="true" draw_heading="false" height="125"
                      left="150" multi_select="false" name="role_allowed_actions"
                      tool_tip="For Details of each Allowed Ability see the Abilities tab."
-                     search_column="2"
+                     search_column="2" draw_stripes="false"
                      width="254">
                         <column label="" name="icon" width="2" />
                         <column label="" name="checkbox" width="16" />
diff --git a/linden/indra/newview/skins/xui/en-us/panel_group_voting.xml b/linden/indra/newview/skins/xui/en-us/panel_group_voting.xml
index 582e17d..8059fd1 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_group_voting.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_group_voting.xml
@@ -226,4 +226,10 @@ Submitting Abstain to proposal...
         <text name="proposals_submit_new_txt" hidden="true">
 Submitting new proposal...
         </text>
+        <text name="vote_recorded" hidden="true">
+Your vote was received.
+        </text>
+        <text name="vote_previously_recorded" hidden="true">
+You have previously voted.  You are only allowed to vote once during an election.
+        </text>
 </panel>
diff --git a/linden/indra/newview/skins/xui/en-us/panel_groups.xml b/linden/indra/newview/skins/xui/en-us/panel_groups.xml
index 9dd0461..0c36027 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_groups.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_groups.xml
@@ -25,19 +25,19 @@
         <button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"

              label="IM/Call" left_delta="0" name="IM"

              tool_tip="Open Instant Message session" width="80" />

-        <button border_height="16" border_width="16" bottom_delta="-25" follows="top|right"

+        <button bottom_delta="-25" follows="top|right"

              font="SansSerif" height="22" hidden="false" label="Info" name="Info"

              width="80" />

-        <button border_height="16" border_width="16" bottom_delta="-25" follows="top|right"

+        <button bottom_delta="-25" follows="top|right"

              font="SansSerif" height="22" hidden="false" label="Activate"

              name="Activate" width="80" />

-        <button border_height="16" border_width="16" bottom_delta="-25" follows="top|right"

+        <button bottom_delta="-25" follows="top|right"

              font="SansSerif" height="22" hidden="false" label="Leave" name="Leave"

              width="80" />

-        <button border_height="16" border_width="16" bottom_delta="-35" follows="top|right"

+        <button bottom_delta="-35" follows="top|right"

              font="SansSerif" height="22" hidden="false" label="Create..." name="Create"

              width="80" />

-        <button border_height="16" border_width="16" bottom_delta="-25" follows="top|right"

+        <button bottom_delta="-25" follows="top|right"

              font="SansSerif" height="22" hidden="false" label="Search..."

              name="Search..." width="80" />

 </panel>

diff --git a/linden/indra/newview/skins/xui/en-us/panel_login.xml b/linden/indra/newview/skins/xui/en-us/panel_login.xml
index 18a60af..acb016d 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_login.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_login.xml
@@ -1,11 +1,98 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel bottom="0" follows="left|top|right|bottom" height="600" hidden="false" left="0"
      mouse_opaque="true" name="panel_login" width="800">
-        <web_browser border_visible="false" bottom="0" caret_color="1 1 1 1" follows="top|left|bottom|right" left="0"
+        <web_browser border_visible="false" bottom="0" follows="top|left|bottom|right" left="0"
              name="login_html" right="-1"
              start_url="data:text/html,%3Chtml%3E%3Chead%3E%3C/head%3E%3Cbody bgcolor=%22#000000%22 text=%22ffffff%22%3E%3Ch1%3E%3Ctt%3Eloading...%3C/tt%3E%3C/h1%3E %3C/body%3E %3C/html%3E"
              top="-1" />
         <text hidden="true" name="real_url">
-             https://secondlife.com/app/login/?show_login_form=True
+                http://secondlife.com/app/login/
+        </text>
+        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             bottom="54" drop_shadow_visible="true" follows="left|bottom"
+             font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
+             left="32" mouse_opaque="true" name="first_name_text" v_pad="0" width="120">
+                First Name:
+        </text>
+        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-24"
+             follows="left|bottom" font="SansSerif" handle_edit_keys_directly="true"
+             height="20" hidden="false" left="32" max_length="31" mouse_opaque="true"
+             name="first_name_edit" select_all_on_focus_received="true" width="120" />
+        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             bottom="54" drop_shadow_visible="true" follows="left|bottom"
+             font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
+             left="164" mouse_opaque="true" name="last_name_text" v_pad="0" width="120">
+                Last Name:
+        </text>
+        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-24"
+             follows="left|bottom" font="SansSerif" handle_edit_keys_directly="true"
+             height="20" hidden="false" left="164" max_length="31" mouse_opaque="true"
+             name="last_name_edit" select_all_on_focus_received="true" width="120" />
+        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             bottom="54" drop_shadow_visible="true" follows="left|bottom"
+             font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
+             left="296" mouse_opaque="true" name="password_text" v_pad="0" width="120">
+                Password:
+        </text>
+        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-24"
+             follows="left|bottom" font="SansSerif" handle_edit_keys_directly="true"
+             height="20" hidden="false" left="296" max_length="16" mouse_opaque="true"
+             name="password_edit" select_all_on_focus_received="true" width="120" />
+        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             bottom="10" drop_shadow_visible="true" follows="left|bottom"
+             font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
+             left="32" mouse_opaque="true" name="start_location_text" v_pad="0"
+             width="85">
+                Start Location:
+        </text>
+        <combo_box allow_text_entry="true" bottom="8" follows="left|bottom" height="18"
+             hidden="false" left_delta="97" max_chars="128" mouse_opaque="true"
+             name="start_location_combo" width="140">
+                <combo_item name="MyHome" value="My Home">
+                        My Home
+                </combo_item>
+                <combo_item name="MyLastLocation" value="My Last Location">
+                        My Last Location
+                </combo_item>
+                <combo_item name="Typeregionname" value="&lt;Type region name&gt;">
+                        &lt;Type region name&gt;
+                </combo_item>
+        </combo_box>
+        <check_box bottom="10" follows="left|bottom" font="SansSerifSmall" height="16"
+             hidden="false" initial_value="false" label="Remember password"
+             left_delta="167" mouse_opaque="true" name="remember_check" width="138" />
+        <button bottom="28" follows="left|bottom" font="SansSerif" halign="center"
+             height="24" hidden="false" label="Connect" label_selected="Connect"
+             left="440" mouse_opaque="true" name="connect_btn" scale_image="TRUE"
+             width="120" />
+        <button bottom="28" follows="left|bottom" font="SansSerif" halign="center"
+             height="24" hidden="false" label="Quit" label_selected="Quit" left="572"
+             mouse_opaque="true" name="quit_btn" scale_image="TRUE" width="120" />
+        <combo_box allow_text_entry="true" bottom="32" follows="left|bottom" height="18"
+             hidden="false" left_delta="135" max_chars="20" mouse_opaque="true"
+             name="server_combo" width="120" />
+        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             bottom="30" drop_shadow_visible="true" follows="right|bottom"
+             font="SansSerifSmall" h_pad="0" halign="right" height="12" hidden="false"
+             left="-202" mouse_opaque="true" name="channel_text" v_pad="0" width="200"
+             hover="true">
+                [Viewer Channel Name]
+        </text>
+        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             bottom="18" drop_shadow_visible="true" follows="right|bottom"
+             font="SansSerifSmall" h_pad="0" halign="right" height="12" hidden="false"
+             left="-102" mouse_opaque="true" name="version_text" v_pad="0" width="100"
+             hover="true">
+                1.23.4 (5)
+        </text>
+        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             bottom="2" drop_shadow_visible="true" follows="right|bottom"
+             font="SansSerifSmall" h_pad="0" halign="right" height="12" hidden="false"
+             left="-172" mouse_opaque="true" name="forgot_password_text" v_pad="0" width="170"
+             hover="true">
+                Forgot your password?
+        </text>
+        <text hidden="true" name="forgot_password_url">
+                http://secondlife.com/account/request.php
         </text>
 </panel>
diff --git a/linden/indra/newview/skins/xui/en-us/panel_master_volume.xml b/linden/indra/newview/skins/xui/en-us/panel_master_volume.xml
index ac1a46f..eb0a6d7 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_master_volume.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_master_volume.xml
@@ -1,13 +1,15 @@
 <panel bg_visible="false" border="false" border_visible="false" bottom="-34"
-     enabled="true" follows="left|top" hidden="false"
-     mouse_opaque="true" name="music_remote">
-<!--    <button bottom="-22" height="22" label="Volume" left="2" name="volume" -->
-<!--         tool_tip="Master Volume Control, click for volume settings" width="55" /> -->
-        <button bottom="-22" height="22" label="" image_overlay="volume_icon.tga" left="2" name="volume"
+     name="master_volume">
+        <button bottom="-22" height="22" image_overlay="icn-overlay_volume-panel.tga" label=""
+             left="2" name="volume" toggle="true"
              tool_tip="Master Volume Control, click for volume settings" width="28" />
-        <volume_slider control_name="AudioLevelMaster"
-             bottom="-20" enabled="true" follows="left|top" height="17" hidden="false"
-             increment="0.05" initial_val="0.5" left_delta="25" max_val="1" min_val="0"
-             mouse_opaque="true" name="volume_slider" width="40"
-             tool_tip="Change the volume using this slider" />
+        <volume_slider bottom="-20" control_name="AudioLevelMaster" height="17" increment="0.05"
+             initial_val="0.5" left_delta="22" max_val="1" min_val="0"
+             mouse_opaque="true" name="volume_slider"
+             tool_tip="Change the volume using this slider" width="50" />
+        <button bottom="-20" control_name="MuteAudio" height="20"
+             image_selected="icn_speaker-muted_dark.tga"
+             toggle="true"
+             image_unselected="icn_speaker_dark.tga" label="" left_delta="52"
+             name="mute_master" width="25" />
 </panel>
diff --git a/linden/indra/newview/skins/xui/en-us/panel_media_controls.xml b/linden/indra/newview/skins/xui/en-us/panel_media_controls.xml
new file mode 100644
index 0000000..66886b7
--- /dev/null
+++ b/linden/indra/newview/skins/xui/en-us/panel_media_controls.xml
@@ -0,0 +1,23 @@
+<panel bg_visible="false" border="false" border_visible="false" bottom="2"

+     enabled="true" follows="right|bottom" height="20" hidden="false" left="0"

+     name="media_controls" width="185">

+        <button bottom="-22" enabled="true" follows="left|top" height="22" hidden="false"

+             image_overlay="icn_music-play.tga" label="" left_delta="2"

+             mouse_opaque="true" name="music_play" scale_image="true" toggle="true"

+             tool_tip="Play/pause streaming music" width="40" />

+        <button bottom="-22" enabled="true" follows="left|top" height="22" hidden="false"

+             image_overlay="icn_media-play.tga" label="" left_delta="40"

+             mouse_opaque="true" name="media_play" scale_image="true" toggle="true"

+             tool_tip="Play/pause streaming movies" width="40" />

+        <volume_slider bottom="-20" control_name="AudioLevelMaster" height="17" increment="0.05"

+             initial_val="0.5" left_delta="34" max_val="1" min_val="0"

+             mouse_opaque="true" name="volume_slider"

+             tool_tip="Master Volume" width="60" />

+        <button bottom="-20" control_name="MuteAudio" height="20"

+             image_selected="icn_speaker-muted_dark.tga"

+             image_unselected="icn_speaker_dark.tga" label="" left_delta="60"

+             name="mute_master" toggle="true" width="25" tool_tip="Master Mute"/>

+        <button bottom="-22" control_name="ShowVolumeSettingsPopup" height="22" label=""

+                left_delta="25" name="expand" scale_image="true" toggle="true"

+                tool_tip="Adjust individual volume levels" width="22" />

+</panel>

diff --git a/linden/indra/newview/skins/xui/en-us/panel_media_remote.xml b/linden/indra/newview/skins/xui/en-us/panel_media_remote.xml
index f14ec61..cd0b985 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_media_remote.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_media_remote.xml
@@ -1,30 +1,6 @@
-<panel bg_visible="false" border="false" border_visible="false" bottom="-34"
-     enabled="true" follows="left|top" hidden="false" left="571"
-     mouse_opaque="true" name="music_remote" >
-<!--    <text type="string" length="6" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" -->
-<!--         bottom="-15" drop_shadow_visible="true" enabled="true" follows="left|top" -->
-<!--         font="SansSerifSmall" h_pad="0" halign="left" height="12" hidden="false" -->
-<!--         left="2" mouse_opaque="true" name="text" v_pad="0" width="77"> -->
-<!--            Movies -->
-<!--    </text> -->
-        <icon name="media_icon" left="5" bottom="-19" width="16" height="16" image_name="media_icon.tga"/>
-        <button bottom="-20" enabled="false" follows="left|top" font="SansSerif"
-             halign="center" height="17" hidden="false"
-             image_selected="button_anim_stop_selected.tga"
-             image_unselected="button_anim_stop.tga" label="" label_selected=""
-             left_delta="25" mouse_opaque="true" name="media_stop" scale_image="true"
-             tool_tip="Stop media" width="17" />
-        <button bottom="-20" enabled="true" follows="left|top" font="SansSerif" halign="center"
-             height="17" hidden="false" image_selected="button_anim_play_selected.tga"
-             image_unselected="button_anim_play.tga" label="" label_selected=""
-             left_delta="15" mouse_opaque="true" name="media_play" scale_image="true"
-             tool_tip="Play media stream" width="17" />
-        <button bottom="-20" enabled="false" follows="left|top" font="SansSerif"
-             halign="center" height="17" hidden="false"
-             image_disabled="button_disabled_32x128.tga"
-             image_disabled_selected="button_disabled_32x128.tga"
-             image_selected="button_anim_pause_selected.tga"
-             image_unselected="button_anim_pause.tga" label="" label_selected=""
-             left_delta="0" mouse_opaque="true" name="media_pause" scale_image="true"
-             tool_tip="Pause media stream" width="17" />
+<panel bg_visible="false" border="false" border_visible="false" bottom="1"
+     enabled="true" follows="right|bottom" height="20" hidden="false" left="0" use_bounding_rect="true"
+     name="media_remote" width="185">
+        <panel filename="panel_bg_tab.xml" left="0" bottom="0" width="185" height="22"/>
+        <panel filename="panel_media_controls.xml" left="0" bottom="0" width="185" height="20"/>
 </panel>
diff --git a/linden/indra/newview/skins/xui/en-us/panel_media_remote_expanded.xml b/linden/indra/newview/skins/xui/en-us/panel_media_remote_expanded.xml
new file mode 100644
index 0000000..6c9d3a5
--- /dev/null
+++ b/linden/indra/newview/skins/xui/en-us/panel_media_remote_expanded.xml
@@ -0,0 +1,8 @@
+<panel bg_visible="false" border="false" border_visible="false" bottom="1"

+     height="185" hidden="false" follows="right|bottom" left="0" use_bounding_rect="true"

+     name="media_remote" width="185">

+        <panel filename="panel_bg_tab.xml" left="0" bottom="0" width="185" height="187"/>

+        <panel border="false" bottom="20" filename="panel_audio.xml" height="160"

+             label="Audio &amp; Video" name="Volume Panel" width="185" />

+        <panel bottom_delta="-10" left="0" filename="panel_media_controls.xml"/>

+</panel>

diff --git a/linden/indra/newview/skins/xui/en-us/panel_overlaybar.xml b/linden/indra/newview/skins/xui/en-us/panel_overlaybar.xml
index acb453b..774b70a 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_overlaybar.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_overlaybar.xml
@@ -1,43 +1,52 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel bottom="51" enabled="true" follows="left|right|bottom" height="42"
-     hidden="false" left="-1" mouse_opaque="false" name="overlay" width="800">
-        <button bottom="-41" enabled="true" follows="left|top" font="SansSerif" halign="center"
-             height="20" hidden="false" label="IM Received" label_selected="IM Received"
-             left="0" mouse_opaque="true" name="IM Received" scale_image="true"
-             tool_tip="You have an instant message pending. Click to show IMs."
-             width="102" />
-        <button bottom="-41" enabled="true" follows="left|top" font="SansSerif" halign="center"
-             height="20" hidden="false" label="Set Not Busy"
-             label_selected="Set Not Busy" left="114" mouse_opaque="true"
-             name="Set Not Busy" scale_image="true"
-             tool_tip="Chat and IM is hidden for you. Click here to set yourself not busy."
-             width="102" />
-        <button bottom="-41" enabled="true" follows="left|top" font="SansSerif" halign="center"
-             height="20" hidden="false" label="Release Keys"
-             label_selected="Release Keys" left="229" mouse_opaque="true"
-             name="Release Keys" scale_image="true"
-             tool_tip="A script has taken control of your keys. Click here to release them."
-             width="102" />
-        <button bottom="-41" enabled="true" follows="left|top" font="SansSerif" halign="center"
-             height="20" hidden="false" label="Mouselook" label_selected="Mouselook"
-             left="343" mouse_opaque="true" name="Mouselook" scale_image="true"
-             tool_tip="Use mouse to steer your view. If you have a gun, clicking will shoot."
-             width="102" />
-        <button bottom="-41" enabled="true" follows="left|top" font="SansSerif" halign="center"
-             height="20" hidden="false" label="Stand Up" label_selected="Stand Up"
-             left="457" mouse_opaque="true" name="Stand Up" scale_image="true"
-             tool_tip="Click here to stand up." width="102" />
-        <panel background_visible="false" border="false" bottom="-41" enabled="true"
-             follows="right|top" height="20" hidden="false" left="400"
-             mouse_opaque="true" name="media_remote" width="75" />
-        <panel background_visible="false" border="false" bottom="-41" enabled="true"
-             follows="right|top" height="20" hidden="false" left="500"
-             mouse_opaque="true" name="music_remote" width="75" />
-        <panel background_visible="false" border="false" bottom="-41" enabled="true"
-             follows="right|top" height="20" hidden="false" left="600"
-             mouse_opaque="true" name="voice_remote" width="108" />
-        <panel background_visible="false" border="false" bottom="-41" enabled="true"
-             follows="right|top" height="20" hidden="false" left="700"
-             mouse_opaque="true" name="master_volume" width="75" />
-
+<panel follows="left|right|bottom|top" height="200" left="-1"
+     mouse_opaque="false" name="overlay" width="728" use_bounding_rect="true">
+        <layout_stack bottom="0" follows="left|right|bottom" height="200" left="1" mouse_opaque="false"
+             orientation="horizontal" right="-1" name="overlay_layout_panel" use_bounding_rect="true">
+                <layout_panel auto_resize="true" bottom="0" left="0" min_width="420" user_resize="false" mouse_opaque="false"
+                     width="420" use_bounding_rect="true">
+      <layout_stack name="chatbar_and_buttons" bottom="0" follows="left|right|bottom|top" height="50" left="1" mouse_opaque="false" orientation="vertical" right="420" use_bounding_rect="true">
+        <layout_panel auto_resize="true" bottom="0" left="0" min_width="100" user_resize="false"
+                                        width="420" height="0" min_height="20" name="padding" follows="left|bottom|right|top"  mouse_opaque="false" use_bounding_rect="true"/>
+        <layout_panel auto_resize="false" bottom="0" left="0" min_width="100" user_resize="false"
+                                        width="420" height="20" min_height="20" name="state_buttons" follows="left|bottom|right|top"  mouse_opaque="false" use_bounding_rect="true">
+                                        <button bottom="1" follows="left|bottom" font="SansSerif" halign="center" height="20"
+                                                label="IM Received" label_selected="IM Received" left="0"
+                                                name="IM Received" scale_image="true"
+                                                tool_tip="You have an instant message pending. Click to show IMs."
+                                                width="102" />
+                                        <button bottom="1" follows="left|bottom" font="SansSerif" halign="center" height="20"
+                                                label="Set Not Busy" label_selected="Set Not Busy" left="114"
+                                                name="Set Not Busy" scale_image="true"
+                                                tool_tip="Chat and IM is hidden for you. Click here to set yourself not busy."
+                                                width="102" />
+                                        <button bottom="1" follows="left|bottom" font="SansSerif" halign="center" height="20"
+                                                label="Release Keys" label_selected="Release Keys" left="229"
+                                                name="Release Keys" scale_image="true"
+                                                tool_tip="A script has taken control of your keys. Click here to release them."
+                                                width="102" />
+                                        <button bottom="1" follows="left|bottom" font="SansSerif" halign="center" height="20"
+                                                label="Mouselook" label_selected="Mouselook" left="343" name="Mouselook"
+                                                scale_image="true"
+                                                tool_tip="Use mouse to steer your view. If you have a gun, clicking will shoot."
+                                                width="102" />
+                                        <button bottom="1" follows="left|bottom" font="SansSerif" halign="center" height="20"
+                                                label="Stand Up" label_selected="Stand Up" left="457" name="Stand Up"
+                                                scale_image="true" tool_tip="Click here to stand up." width="102" />
+                                </layout_panel>
+                                <layout_panel auto_resize="false" background_visible="false" border="false" bottom="0"
+                                        filename="panel_chat_bar.xml" follows="left|right|bottom" left="0" mouse_opaque="false"
+                                        name="chat_bar" min_height="23" width="395" use_bounding_rect="true"/>
+                        </layout_stack>
+                </layout_panel>
+                <layout_panel auto_resize="false" bottom="0" left="0" min_width="185" user_resize="false"
+                     width="185" use_bounding_rect="true" name="media_remote_container" mouse_opaque="false">
+                        <panel background_visible="false" border="false" bottom="1"
+                             name="media_remote" /> 
+                </layout_panel>
+                <layout_panel auto_resize="false" bottom="0" left="0" min_width="128" user_resize="false"
+                     width="128" name="voice_remote_container" use_bounding_rect="true" mouse_opaque="false">
+                        <panel background_visible="false" border="false" bottom="1"
+                             name="voice_remote" />
+                </layout_panel>
+        </layout_stack>
 </panel>
diff --git a/linden/indra/newview/skins/xui/en-us/panel_preferences_audio.xml b/linden/indra/newview/skins/xui/en-us/panel_preferences_audio.xml
index cb65ba9..7ef1b6f 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_preferences_audio.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_preferences_audio.xml
@@ -22,13 +22,6 @@
              width="128">
                 Audio Preferences:
         </text>
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-385" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="12" hidden="false"
-             left="10" mouse_opaque="true" name="default_upload_bitrate_text" v_pad="0"
-             width="150">
-                Default Upload Bitrate:
-        </text>
 
         <panel border="true" bottom="-195" enabled="true" follows="left|top|right|bottom"
                hidden="false" label="Volume" left="148" height="180" width="205"
@@ -81,24 +74,4 @@
              left="148" max_val="10000" min_val="0" mouse_opaque="true"
              name="Health Change Threshold" width="192" />
 
-        <radio_group bottom_delta="-25" control_name="AudioDefaultBitrate" draw_border="true"
-             enabled="true" follows="left|top" height="18" hidden="false" left="148"
-             mouse_opaque="true" name="bitrate" width="320">
-                <radio_item type="string" length="1" bottom="-17" enabled="true" follows="left|top" height="16" hidden="false"
-                     left="5" mouse_opaque="true" name="32kbps" width="80">
-                        32 kbps
-                </radio_item>
-                <radio_item type="string" length="1" bottom="-17" enabled="true" follows="left|top" height="16" hidden="false"
-                     left="85" mouse_opaque="true" name="64kbps" width="80">
-                        64 kbps
-                </radio_item>
-                <radio_item type="string" length="1" bottom="-17" enabled="true" follows="left|top" height="16" hidden="false"
-                     left="165" mouse_opaque="true" name="96kbps" width="80">
-                        96 kbps
-                </radio_item>
-                <radio_item type="string" length="1" bottom="-17" enabled="true" follows="left|top" height="16" hidden="false"
-                     left="245" mouse_opaque="true" name="128kbps" width="80">
-                        128 kbps
-                </radio_item>
-        </radio_group>
 </panel>
diff --git a/linden/indra/newview/skins/xui/en-us/panel_preferences_voice.xml b/linden/indra/newview/skins/xui/en-us/panel_preferences_voice.xml
index c728e23..fcf3147 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_preferences_voice.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_preferences_voice.xml
@@ -4,35 +4,24 @@
         <text_editor type="string" length="1" allow_html="false" bg_readonly_color="0 0 0 0" bottom_delta="-26"
              embedded_items="false" enabled="false" follows="left|top"
              font="SansSerifSmall" height="20" hidden="false" hide_border="true"
-             hide_scrollbar="true" left_delta="8" max_length="65535"
-             mouse_opaque="true" name="voice_unavailable" width="450" tab_stop="false"
-             word_wrap="true">
-                Voice Chat Is Not Available
+             hide_scrollbar="true" left_delta="8" max_length="65535" mouse_opaque="true"
+             name="voice_unavailable" tab_stop="false" width="450" word_wrap="true">
+                Voice Chat Is Not Available
         </text_editor>
         <check_box bottom_delta="0" control_name="EnableVoiceChat" enabled="true"
              follows="left|top" font="SansSerifSmall" height="16" hidden="false"
              initial_value="false" label="Enable voice chat" left="8"
              mouse_opaque="true" name="enable_voice_check" radio_style="false"
              width="200" />
-        <radio_group bottom_delta="-40" draw_border="false"
-
-             follows="left|top" height="40" left_delta="20" name="ear_location" width="364">
-
+        <radio_group bottom_delta="-40" draw_border="false" follows="left|top" height="40"
+             left_delta="20" name="ear_location" width="364">
                 <radio_item type="string" length="1" bottom="-19" follows="left|top" height="16" left="3" name="0" width="315">
-
                         Hear Voice Chat from camera position.
-
                 </radio_item>
-
                 <radio_item type="string" length="1" bottom="-35" follows="left|top" height="16" left="3" name="1" width="315">
-
                         Hear Voice Chat from avatar position.
-
                 </radio_item>
-
         </radio_group>
-
-
         <text type="string" length="1" allow_html="false" bg_readonly_color="0 0 0 0" bottom_delta="-20"
              embedded_items="false" enabled="true" follows="left|top"
              font="SansSerifSmall" height="16" hidden="false" hide_border="true"
@@ -44,18 +33,20 @@
              embedded_items="false" enabled="false" follows="left|top"
              font="SansSerifSmall" height="65" hidden="false" hide_border="true"
              hide_scrollbar="true" left_delta="20" max_length="65535"
-             mouse_opaque="true" name="voice_chat_description" width="450" tab_stop="false"
-             word_wrap="true">Push-to-Talk mode lets you control when your voice is transmitted. When in toggle mode, press and release the push-to-talk trigger to switch your microphone on and off. When not in toggle mode, the microphone is active only when the trigger is held down.</text_editor>
+             mouse_opaque="true" name="voice_chat_description" tab_stop="false"
+             width="450" word_wrap="true">
+                Push-to-Talk mode lets you control when your voice is transmitted. When in toggle mode, press and release the push-to-talk trigger to switch your microphone on and off. When not in toggle mode, the microphone is active only when the trigger is held down.
+        </text_editor>
         <check_box bottom_delta="-20" control_name="EnablePushToTalk" enabled="true"
              follows="left|top" font="SansSerifSmall" height="16" hidden="false"
-             initial_value="false" label="Start Viewer in Push-to-Talk mode" left_delta="0"
-             mouse_opaque="true" name="push_to_talk_check" radio_style="false"
-             width="200" />
+             initial_value="false" label="Start Viewer in Push-to-Talk mode"
+             left_delta="0" mouse_opaque="true" name="push_to_talk_check"
+             radio_style="false" width="200" />
         <check_box bottom_delta="-20" control_name="PushToTalkToggle" enabled="true"
              follows="left|top" font="SansSerifSmall" height="16" hidden="false"
-             initial_value="false" label="Use Push-to-Talk in toggle mode" left_delta="0"
-             mouse_opaque="true" name="push_to_talk_toggle_check" radio_style="false"
-             width="200" />
+             initial_value="false" label="Use Push-to-Talk in toggle mode"
+             left_delta="0" mouse_opaque="true" name="push_to_talk_toggle_check"
+             radio_style="false" width="200" />
         <text type="string" length="1" allow_html="false" bg_readonly_color="0 0 0 0" bottom_delta="-20"
              embedded_items="false" enabled="true" follows="left|top"
              font="SansSerifSmall" height="16" hidden="false" hide_border="true"
@@ -63,36 +54,40 @@
              name="push_to_talk_label" width="445" word_wrap="true">
                 Push-to-Talk trigger:
         </text>
-
         <line_editor border_drop_shadow_visible="false" border_visible="false" bottom_delta="-20"
-             drop_shadow_visible="true" enabled="false" follows="top|left"
-             font="SansSerifSmall" halign="right" height="19" left_delta="0"
-             max_length="254" mouse_opaque="false" name="modifier_combo" control_name="PushToTalkButton" width="280" />
-
+             control_name="PushToTalkButton" drop_shadow_visible="true" enabled="false"
+             follows="top|left" font="SansSerifSmall" halign="right" height="19"
+             left_delta="0" max_length="254" mouse_opaque="false" name="modifier_combo"
+             width="280" />
         <button bottom_delta="-25" follows="left|top" font="SansSerif" halign="center"
-             height="20" label="Set Key" left_delta="0"
-             mouse_opaque="true" name="set_voice_hotkey_button" width="115" />
-        <button bottom_delta="0" follows="left" font="SansSerif" halign="center"
-             height="20" label="Middle Mouse Button" left_delta="120"
-             mouse_opaque="true" name="set_voice_middlemouse_button" width="160" />
-
+             height="20" label="Set Key" left_delta="0" mouse_opaque="true"
+             name="set_voice_hotkey_button" width="115" />
+        <button bottom_delta="0" follows="left" font="SansSerif" halign="center" height="20"
+             label="Middle Mouse Button" left_delta="120" mouse_opaque="true"
+             name="set_voice_middlemouse_button" width="160" />
         <text allow_html="false" bg_readonly_color="0 0 0 0" bottom_delta="-25"
-             embedded_items="false" enabled="true" follows="left|top"
-             height="16" hidden="false"
-             left_delta="-120" 
-             name="privacy_heading" width="445">
+             embedded_items="false" enabled="true" follows="left|top" height="16"
+             hidden="false" left_delta="-120" name="privacy_heading" width="445">
                 Privacy Options
         </text>
-        <check_box bottom_delta="-20" enabled="true" control_name="VoiceCallsFriendsOnly"
+        <check_box bottom_delta="-20" control_name="VoiceCallsFriendsOnly" enabled="true"
              follows="left|top" font="SansSerifSmall" height="16" hidden="false"
-             initial_value="false" label="Only accept voice calls from people on My Friends list" left_delta="20"
-             mouse_opaque="true" name="voice_call_friends_only_check" radio_style="false"
-             width="200" />
-
-        <button bottom_delta="-30" follows="left|top" font="SansSerif"
-             height="20" label="Device Settings..." left_delta="-20"
-             mouse_opaque="true" name="device_settings_btn" width="150" />
-        <button bottom_delta="-30" follows="left|top" font="SansSerif"
-             height="20" label="Run Voice Setup Wizard..." left_delta="0"
-             mouse_opaque="true" name="launch_voice_wizard_button" width="225" />
+             initial_value="false"
+             label="Only accept voice calls from people on My Friends list"
+             left_delta="20" mouse_opaque="true" name="voice_call_friends_only_check"
+             radio_style="false" width="200" />
+        <text_editor type="string" length="1" allow_html="false" bg_readonly_color="0 0 0 0" bottom_delta="-40"
+             embedded_items="false" enabled="false" follows="left|top"
+             font="SansSerifSmall" height="35" hidden="false" hide_border="true"
+             hide_scrollbar="true" left_delta="-20" max_length="65535"
+             mouse_opaque="true" name="voice_chat_description" tab_stop="false"
+             width="450" word_wrap="true">
+                NOTE: Running the Device Settings or Voice Chat Setup will temporarily disconnect you from Voice Chat.
+        </text_editor>
+        <button bottom_delta="-30" follows="left|top" font="SansSerif" height="20"
+             label="Device Settings" left_delta="0" mouse_opaque="true"
+             name="device_settings_btn" width="150" />
+        <button bottom_delta="-30" follows="left|top" font="SansSerif" height="20"
+             label="Voice Chat Setup" left_delta="0" mouse_opaque="true"
+             name="launch_voice_wizard_button" width="140" />
 </panel>
diff --git a/linden/indra/newview/skins/xui/en-us/panel_preferences_web.xml b/linden/indra/newview/skins/xui/en-us/panel_preferences_web.xml
index 1b7f73e..160bace 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_preferences_web.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_preferences_web.xml
@@ -43,7 +43,7 @@
                 Address:
         </text>
         <line_editor bottom="-156" enabled="true" follows="left|top" font="SansSerif"
-             height="20" left="178" name="web_proxy_editor"     tool_tip="The name or IP address of the proxy you would like to use"
+             height="20" left="216" name="web_proxy_editor"     tool_tip="The name or IP address of the proxy you would like to use"
              width="140" />                   
         <spinner bottom="-180" control_name="BrowserProxyPort" decimal_digits="0"
              enabled="true" follows="left|top" height="16" hidden="false"
diff --git a/linden/indra/newview/skins/xui/en-us/panel_speaker_controls.xml b/linden/indra/newview/skins/xui/en-us/panel_speaker_controls.xml
new file mode 100644
index 0000000..5d51eed
--- /dev/null
+++ b/linden/indra/newview/skins/xui/en-us/panel_speaker_controls.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

+<panel name="active_speakers_panel" left="0" bottom="0" width="140" border="true" bevel_style="in" height="120" follows="left|bottom|right">

+        <string name="moderator_label">(Moderator)</string>

+        <layout_stack border="false" bottom="0" follows="left|top|right|bottom" height="120" left="0"

+             orientation="vertical" tab_group="1" width="140">

+                <layout_panel auto_resize="false" bottom="0" can_resize="false" height="25" left="0"

+                     min_height="25" name="moderation_mode_panel" top_delta="0" visible="false"

+                     width="140" user_resize="false">

+                     <combo_box follows="left|top|right|bottom" left="5" width="130" bottom="0" height="20" name="moderation_mode">

+                                <combo_item value="unmoderated">Open Voice (default)</combo_item>

+                                <combo_item value="moderated">Moderated Voice</combo_item>

+                     </combo_box>

+                </layout_panel>

+

+                <layout_panel auto_resize="true" user_resize="false" bottom="0" can_resize="false" height="120" left="0"

+                     min_height="100" name="moderate_chat_panel" top_delta="0" visible="true"

+                     width="140">

+                        <scroll_list bottom="78" can_resize="false" column_padding="0" draw_heading="true"

+                                        draw_stripes="false" follows="left|top|bottom|right" left="0"

+                                        multi_select="false" name="speakers_list" right="140" search_column="1"

+                                        top="120">

+                                <column name="icon_speaking_status" sort="speaking_status" width="20" />

+                                <column dynamicwidth="true" label="Name" name="speaker_name" />

+                                <column label="" name="speaking_status" width="0" />

+                        </scroll_list>

+

+                        <panel name="speaker_controls" left="0" bottom="0" width="140" border="false" mouse_opaque="true" can_resize="false" height="77" follows="left|bottom|right">

+                                <button left="0" right="30" bottom="-28" height="24" name="profile_btn" follows="left|top" label="" image_overlay="icon_avatar_offline.tga" enabled="false"/>

+                                <text left_delta="34" bottom_delta="9" name="resident_name" valign="center" follows="left|top|right" width="140" font="SansSerif">Rumplstiltskin Califragilistic</text>

+                                <volume_slider

+                                        name="speaker_volume"

+                                        left="5"

+                                        width="110"

+                                        bottom_delta="-29"

+                                        height="15"

+                                        follows="left|top"

+                                        min_val="0.0"

+                                        max_val="1.0"

+                                        increment="0.05"

+                                        initial_val="0.5"

+                                />

+                                <button bottom_delta="0" height="20"

+                                        image_selected="icn_speaker-muted_dark.tga"

+                                        image_unselected="icn_speaker_dark.tga" label="" left_delta="110"

+                                        name="mute_btn" width="25" tool_tip="Mute voice for this resident"/>

+                                <check_box

+                                        name="mute_text_btn"

+                                        width="50"

+                                        bottom_delta="-25"

+                                        left="4"

+                                        follows="left|top"

+                                        height="25"

+                                        enabled="false"

+                                        label="Mute Text"

+                                />

+                        </panel>

+                </layout_panel>

+                <layout_panel auto_resize="false" bottom="0" can_resize="false" height="60" left="0"

+                     name="moderator_controls" top_delta="0" visible="false"

+                     width="140" user_resize="false">

+                     <text left="5" bottom="-20" right="-5" height="20" follows="left|right|top|bottom" name="moderator_controls_label">Moderator Controls:</text>

+                     <check_box name="moderator_allow_voice" left_delta="0" bottom_delta="-16" height="20" right="-5" follows="left|right|top|bottom">Allow voice chat</check_box>

+                     <check_box name="moderator_allow_text" left_delta="0" bottom_delta="-20" height="20" right="-5" follows="left|right|top|bottom">Allow text chat</check_box>

+                </layout_panel>

+

+        </layout_stack>

+</panel>

diff --git a/linden/indra/newview/skins/xui/en-us/panel_status_bar.xml b/linden/indra/newview/skins/xui/en-us/panel_status_bar.xml
index 30bb347..f4ec6e1 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_status_bar.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_status_bar.xml
@@ -9,7 +9,7 @@
              height="18" hidden="false" left="561" mouse_opaque="true"
              name="ParcelNameText"
              tool_tip="Name of land parcel on which you are standing. Click for About Land."
-             v_pad="2" width="1039">
+             v_pad="2" width="1039" hover="true">
                 parcel name goes here
         </text>
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
@@ -22,8 +22,6 @@
         </text>
         <button bottom="-18" enabled="true" follows="right|bottom" font="SansSerif"
              halign="center" height="16" hidden="false"
-             image_disabled="status_buy_currency.tga"
-             image_disabled_selected="status_buy_currency_pressed.tga"
              image_selected="status_buy_currency_pressed.tga"
              image_unselected="status_buy_currency.tga" label="" label_selected=""
              left="-210" mouse_opaque="true" name="buycurrency" scale_image="true"
@@ -38,72 +36,59 @@
                 12:00 AM
         </text>
         
-        <text hidden="true" name="StatBarDaysOfWeek">
+        <string name="StatBarDaysOfWeek">
                 Sunday:Monday:Tuesday:Wednesday:Thursday:Friday:Saturday
-        </text>
-        <text hidden="true" name="StatBarMonthsOfYear">
+        </string>
+        <string name="StatBarMonthsOfYear">
                 January:February:March:April:May:June:July:August:September:October:November:December
-        </text>
+        </string>
 
         <button bottom="-18" enabled="true" follows="right|bottom" font="SansSerif"
-             halign="center" height="16" hidden="false"
-             image_disabled="status_script_debug.tga"
-             image_disabled_selected="status_script_debug.tga"
+             halign="center" height="16" visible="false"
              image_selected="status_script_debug.tga"
              image_unselected="status_script_debug.tga" label="" label_selected=""
              left="378" mouse_opaque="true" name="scriptout" scale_image="false"
              tool_tip="Script Warnings and Errors" width="16" />
         <button bottom="-22" enabled="true" follows="right|bottom" font="SansSerif"
-             halign="center" height="24" hidden="false"
-             image_disabled="status_health.tga"
-             image_disabled_selected="status_health.tga"
+             halign="center" height="18" visible="false"
              image_selected="status_health.tga" image_unselected="status_health.tga"
              label="" label_selected="" left="394" mouse_opaque="true" name="health"
              scale_image="false" tool_tip="Health" width="24" />
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom="-18" disabled_color="1 1 1 1" drop_shadow_visible="true"
-             enabled="true" follows="right|bottom" font="SansSerifSmall" h_pad="0"
-             halign="left" height="18" hidden="false" left="418" mouse_opaque="true"
+             enabled="true" follows="rsight|bottom" font="SansSerifSmall" h_pad="0"
+             halign="left" height="18" visible="false" left="418" mouse_opaque="true"
              name="HealthText" text_color="1 1 1 1" tool_tip="Health" v_pad="2"
              width="31">
                 100%
         </text>
         <button bottom="-22" enabled="true" follows="right|bottom" font="SansSerif"
-             halign="center" height="24" hidden="false" image_disabled="status_fly.tga"
-             image_disabled_selected="status_fly.tga" image_selected="status_fly.tga"
-             image_unselected="status_fly.tga" label="" label_selected="" left="449"
-             mouse_opaque="true" name="fly" scale_image="false" tool_tip="No Fly"
+             halign="center" height="18" visible="false" image_selected="status_no_fly.tga"
+             image_unselected="status_no_fly.tga" label="" label_selected="" left="449"
+             mouse_opaque="true" name="no_fly" scale_image="false" tool_tip="Flying not allowed"
              width="24" />
         <button bottom="-22" enabled="true" follows="right|bottom" font="SansSerif"
-             halign="center" height="24" hidden="false"
-             image_disabled="status_build.tga"
-             image_disabled_selected="status_build.tga"
-             image_selected="status_build.tga" image_unselected="status_build.tga"
-             label="" label_selected="" left="473" mouse_opaque="true" name="build"
-             scale_image="false" tool_tip="No Build" width="24" />
+             halign="center" height="18" visible="false"
+             image_selected="status_no_build.tga" image_unselected="status_no_build.tga"
+             label="" label_selected="" left="473" name="no_build"
+             scale_image="false" tool_tip="Building/Rezzing not allowed" width="24" />
         <button bottom="-22" enabled="true" follows="right|bottom" font="SansSerif"
-             halign="center" height="24" hidden="false"
-             image_disabled="status_scripts.tga"
-             image_disabled_selected="status_scripts.tga"
-             image_selected="status_scripts.tga" image_unselected="status_scripts.tga"
-             label="" label_selected="" left="497" mouse_opaque="true" name="scripts"
-             scale_image="false" tool_tip="No Scripts" width="24" />
+             halign="center" height="18" visible="false"
+             image_selected="status_no_scripts.tga" image_unselected="status_no_scripts.tga"
+             label="" label_selected="" left="497" mouse_opaque="true" name="no_scripts"
+             scale_image="false" tool_tip="Scripts not allowed" width="24" />
         <button bottom="-22" enabled="true" follows="right|bottom" font="SansSerif"
-             halign="center" height="24" hidden="false" image_disabled="status_push.tga"
-             image_disabled_selected="status_push.tga" image_selected="status_push.tga"
-             image_unselected="status_push.tga" label="" label_selected="" left="521"
+             halign="center" height="18" visible="false" image_selected="status_no_push.tga"
+             image_unselected="status_no_push.tga" label="" label_selected="" left="521"
              mouse_opaque="true" name="restrictpush" scale_image="false"
-             tool_tip="Restrict llPushObject" width="24" />
+             tool_tip="llPushObject restricted" width="24" />
         <button bottom="-22" enabled="true" follows="right|bottom" font="SansSerif"
-             halign="center" height="24" hidden="false" image_disabled="status_voice.tga"
-             image_disabled_selected="status_voice.tga" image_selected="status_voice.tga"
-             image_unselected="status_voice.tga" label="" label_selected="" left="545"
-             mouse_opaque="true" name="status_voice" scale_image="false"
-             tool_tip="Voice Enabled" width="24" />
+             halign="center" height="18" visible="false" image_selected="status_no_voice.tga"
+             image_unselected="status_no_voice.tga" label="" label_selected="" left="545"
+             mouse_opaque="true" name="status_no_voice" scale_image="false"
+             tool_tip="Voice not available here" width="24" />
         <button bottom="-18" enabled="true" follows="right|bottom" font="SansSerif"
-             halign="center" height="16" hidden="false"
-             image_disabled="status_buy_land.tga"
-             image_disabled_selected="status_buy_land_pressed.tga"
+             halign="center" height="16" visible="false"
              image_selected="status_buy_land_pressed.tga"
              image_unselected="status_buy_land.tga" label="" label_selected=""
              left="569" mouse_opaque="true" name="buyland" scale_image="true"
@@ -153,4 +138,10 @@
           tool_tip="Search Second Life"
           width="20" />
           
+        <string name="packet_loss_tooltip">
+                Packet Loss
+        </string>
+        <string name="bandwidth_tooltip">
+                Bandwidth
+        </string>
 </panel>
diff --git a/linden/indra/newview/skins/xui/en-us/panel_toolbar.xml b/linden/indra/newview/skins/xui/en-us/panel_toolbar.xml
index 2a2affe..1e53f89 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_toolbar.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_toolbar.xml
@@ -1,11 +1,16 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel background_opaque="true" background_visible="true" can_close="true"
      can_minimize="false" can_resize="false" follows="left|right|bottom"
-     height="26" name="panel_toolbar" width="1024">
-        <button bottom="0" font="SansSerif" height="24" label="Communicate" left="0" name="communicate_btn"
-             tool_tip="Communicate with your Friends and Groups." width="50" />
-        <button bottom="0" font="SansSerif" height="24" label="Chat" left="0" name="chat_btn"
-             tool_tip="Talk to people nearby. (Enter)" width="50" />
+     height="26" name="toolbar" width="1024" bottom="0">
+        <string name="Redock Windows">Redock Windows</string>
+        <button bottom="0" font="SansSerif" height="24"
+             image_selected="btn_chatbar_selected.tga" scale_image="true"
+             image_unselected="btn_chatbar.tga" label="" left="0" name="chat_btn"
+             image_overlay="icn_chatbar.tga" tool_tip="Show Chat Bar. (Enter)"
+             width="50" />
+        <flyout_button bottom="0" font="SansSerif" height="24" label="Communicate" left="0"
+             name="communicate_btn" tool_tip="Communicate with your Friends and Groups."
+             list_position="above"
+             width="50"/>
         <button bottom="0" font="SansSerif" height="24" label="Fly"
              label_selected="Stop Flying" left="0" name="fly_btn"
              tool_tip="Start flying. Use E/C or PgUp/PgDn to fly up and down."
diff --git a/linden/indra/newview/skins/xui/en-us/panel_voice_controls.xml b/linden/indra/newview/skins/xui/en-us/panel_voice_controls.xml
new file mode 100644
index 0000000..7b70066
--- /dev/null
+++ b/linden/indra/newview/skins/xui/en-us/panel_voice_controls.xml
@@ -0,0 +1,18 @@
+<panel bg_visible="false" border="false" border_visible="false" bottom="2"

+     enabled="true" follows="right|bottom" height="20" hidden="false" left="0"

+     mouse_opaque="true" name="voice_controls" width="128">

+        <button bottom="-22" height="22" image_overlay="active_speakers.tga" label="" left="2"

+             name="speakers_btn"

+             tool_tip="Show list of residents using voice chat around you" width="38" />

+        <button bottom="-22" height="22" label="Talk" left_delta="40" name="push_to_talk"

+             tab_stop="false" tool_tip="Hold the button to talk" width="64" />

+        <button bottom="-19" height="16" image_selected="ptt_lock_on.tga"

+             image_unselected="ptt_lock_off.tga" label="" left_delta="4" name="ptt_lock"

+             scale_image="true" toggle="true"

+             tool_tip="Click lock to switch to talk mode" width="16" />

+        <icon bottom="-19" height="16" image_name="icn_voice_ptt-off.tga" left_delta="40"

+             name="voice_volume" width="16" />

+        <button bottom="-22" control_name="ShowVoiceChannelPopup" height="22" label=""

+             left_delta="20" name="show_channel" scale_image="true" toggle="true"

+             tool_tip="Click to show current voice channel" width="22" />

+</panel>

diff --git a/linden/indra/newview/skins/xui/en-us/panel_voice_enable.xml b/linden/indra/newview/skins/xui/en-us/panel_voice_enable.xml
index 3a25ccc..45d2541 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_voice_enable.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_voice_enable.xml
@@ -16,7 +16,7 @@
                         font="SansSerifSmall" 

                         left_delta="0" 

                         width="400" 

-                        height="65" 

+                        height="85" 

                         length="1" 

                         max_length="65535"

                         hide_border="true"

@@ -25,7 +25,7 @@
                         allow_html="false" 

                         mouse_opaque="true" 

                         tab_stop="false"

-                        word_wrap="true">Welcome to Second Life Voice Chat! Voice Chat enables you to speak with other Residents. This wizard will guide you through the steps necessary to set up Voice Chat. Note that Voice Chat requires a stereo headset with a microphone; click the Help button for more information. </text_editor>

+                        word_wrap="true">Welcome to Second Life Voice Chat! Voice Chat enables you to speak with other Residents. This wizard will guide you through the steps necessary to set up Voice Chat. Using Voice Chat requires audio speakers and, if you wish to speak with others, a microphone or stereo headset with microphone.</text_editor>

 

                 <text_editor 

                         name="voice_intro_text2" 

diff --git a/linden/indra/newview/skins/xui/en-us/panel_voice_remote.xml b/linden/indra/newview/skins/xui/en-us/panel_voice_remote.xml
index 28cead3..3fd0dda 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_voice_remote.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_voice_remote.xml
@@ -1,12 +1,6 @@
-<panel bg_visible="false" border="false" border_visible="false" bottom="-34"

-     enabled="true" follows="left|top" hidden="false"

-     mouse_opaque="true" name="music_remote" >

-        <button bottom="-22" height="22" label="" image_overlay="active_speakers.tga" left="2" name="speakers_btn"

-             tool_tip="Show list of residents using voice chat around you" width="38" />

-        <button bottom="-22" height="22" label="Talk" left_delta="40" name="push_to_talk"

-             tab_stop="false" tool_tip="Hold the button to talk" width="64" />

-        <button bottom="-19" height="16" image_selected="ptt_lock_on.tga"

-             image_unselected="ptt_lock_off.tga" label="" left_delta="4" name="ptt_lock"

-             scale_image="true" tool_tip="Click lock to switch to talk mode" width="16" />

-        <icon name="voice_volume" left_delta="40" bottom="-19" width="16" height="16" image_name="icn_voice_ptt-off.tga"/>

+<panel bg_visible="false" border="false" border_visible="false" bottom="1"

+     enabled="true" follows="right|bottom" height="20" hidden="false" left="0" use_bounding_rect="true"

+     mouse_opaque="true" name="voice_remote" width="128">

+        <panel filename="panel_bg_tab.xml" left="0" bottom="0" width="128" height="22"/>

+        <panel filename="panel_voice_controls.xml" left="0" bottom="0" width="127" height="20"/>

 </panel>

diff --git a/linden/indra/newview/skins/xui/en-us/panel_voice_remote_expanded.xml b/linden/indra/newview/skins/xui/en-us/panel_voice_remote_expanded.xml
new file mode 100644
index 0000000..89a3196
--- /dev/null
+++ b/linden/indra/newview/skins/xui/en-us/panel_voice_remote_expanded.xml
@@ -0,0 +1,18 @@
+<panel bg_visible="false" border="false" border_visible="false" bottom="1"

+     follows="right|bottom" height="45" hidden="false" left="0" use_bounding_rect="true"

+     mouse_opaque="true" name="voice_remote" width="128">

+        <panel filename="panel_bg_tab.xml" left="0" bottom="0" width="128" height="47"/>

+        <button bottom="-23" height="22" image_overlay="icn_voice-call-end.tga" label=""

+             left="2" name="end_call_btn" tool_tip="Click to hang up" width="24" />

+        <button bottom="-23" height="23" image_unselected="icn_rounded-text-field.tga" 

+                image_selected="icn_rounded-text-field.tga" image_hover_selected="icn_rounded-text-field.tga"

+                image_hover_unselected="icn_rounded-text-field.tga" image_disabled_selected="icn_rounded-text-field.tga" 

+                image_disabled="icn_rounded-text-field.tga" label="" scale_image="true"

+             left_delta="26" name="voice_channel_bg" width="97" />

+        <icon bottom="-20" height="16" image_name="icn_voice-localchat.tga" label=""

+             left_delta="7" name="voice_channel_icon" width="16" mouse_opaque="false"/>

+        <text bottom="-21" font="SansSerifSmall" height="16" label="" left_delta="18"

+             mouse_opaque="false" name="channel_label" text_color="0 0 0" width="65" />

+        <panel bottom_delta="-14" filename="panel_voice_controls.xml" left="0" />

+</panel>

+        
\ No newline at end of file