Second Life viewer sources 1.20.2

213 files changed, 1627 insertions, 4525 deletions

diff --git a/linden/indra/newview/skins/xui/de/floater_about_land.xml b/linden/indra/newview/skins/xui/de/floater_about_land.xml
index 62664c7..7ce63ec 100644
--- a/linden/indra/newview/skins/xui/de/floater_about_land.xml
+++ b/linden/indra/newview/skins/xui/de/floater_about_land.xml
@@ -551,9 +551,12 @@ ersetzen:
                         </text>
                         <button label="Hinzufügen..." label_selected="Hinzufügen..." name="add_allowed" />
                         <button label="Entfernen" label_selected="Entfernen" name="remove_allowed" />
-                        <check_box label="Verbannen" name="AccessCheck">
+                        <check_box label="Verbannen" name="BanCheck">
                                 Verbannte Einwohner
                         </check_box>
+                        <check_box label="Zulassen" name="AccessCheck">
+                                Zulässige Einwohner
+                        </check_box>
                         <name_list name="AccessList" tool_tip="([LISTED] angezeigt, max. [MAX])">
                                 <column label="Allowed Residents" name="name" />
                         </name_list>
diff --git a/linden/indra/newview/skins/xui/de/floater_critical.xml b/linden/indra/newview/skins/xui/de/floater_critical.xml
index 0b14792..a5589e7 100644
--- a/linden/indra/newview/skins/xui/de/floater_critical.xml
+++ b/linden/indra/newview/skins/xui/de/floater_critical.xml
@@ -2,9 +2,6 @@
 <floater name="modal container" title=" ">
         <button label="Weiter" label_selected="Weiter" name="Continue" />
         <button label="Abbrechen" label_selected="Abbrechen" name="Cancel" />
-        <text name="tos_title">
-                Kritische Nachricht
-        </text>
         <text name="tos_heading">
                 Lesen Sie folgenden Text bitte sorgfältig durch.
         </text>
diff --git a/linden/indra/newview/skins/xui/de/floater_friends.xml b/linden/indra/newview/skins/xui/de/floater_friends.xml
deleted file mode 100644
index fc03e38..0000000
--- a/linden/indra/newview/skins/xui/de/floater_friends.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="friends" title="Freunde">
-        <scroll_list name="friend_list"
-             tool_tip="Hold shift or control while clicking to select multiple friends">
-                <column label="Name" name="friend_name" />
-        </scroll_list>
-        <panel name="rights_container">
-                <text name="friend_name_label">
-                        Wählen Sie den/die Freund(e) aus, dessen/deren Rechte Sie ändern möchten...
-                </text>
-                <check_box label="Kann meinen Online-Status sehen" name="online_status_cb"
-                     tool_tip="Festlegen, ob dieser Freund meinen Online-Status auf seiner Freundesliste oder Visitenkarte einsehen kann" />
-                <check_box label="Kann mich auf der Karte sehen" name="map_status_cb"
-                     tool_tip="Festlegen, ob dieser Freund auf seiner Karte meinen Standort sehen kann" />
-                <check_box label="Kann meine Objekte verändern" name="modify_status_cb"
-                     tool_tip="Festlegen, ob dieser Freund meine Objekte verändern kann" />
-                <text name="process_rights_label">
-                        Rechte werden geändert...
-                </text>
-        </panel>
-        <button label="IM/Anruf" name="im_btn" tool_tip="Beginnt eine Instant Message-Sitzung" />
-        <button label="Teleport..." name="offer_teleport_btn"
-             tool_tip="Bieten Sie diesem Freund einen Teleport an Ihre Position an" />
-        <button label="Hinzufügen..." name="add_btn"
-             tool_tip="Bieten Sie einem Einwohner die Freundschaft an" />
-        <button label="Profil" name="profile_btn"
-             tool_tip="Bilder, Gruppen und andere Informationen anzeigen" />
-        <button label="Zahlen..." name="pay_btn"
-             tool_tip="Diesem Freund Linden-Dollar (L$) geben" />
-        <button label="Entfernen..." name="remove_btn"
-             tool_tip="Diese Person von Ihrer Freundesliste entfernen" />
-        <text name="Multiple">
-                Mehrere Freunde...
-        </text>
-</floater>
diff --git a/linden/indra/newview/skins/xui/de/floater_groups.xml b/linden/indra/newview/skins/xui/de/floater_groups.xml
deleted file mode 100644
index 70c7d4f..0000000
--- a/linden/indra/newview/skins/xui/de/floater_groups.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="groups" title="Gruppen">
-        <text type="string" length="1" name="groupdesc">
-                Die derzeit aktive Gruppe ist fett hervorgehoben.
-        </text>
-        <scroll_list name="group list">
-                <column label="" name="name" />
-        </scroll_list>
-        <text type="string" length="1" name="groupcount">
-                Sie sind Mitglied bei [COUNT] Gruppen (von max. [MAX]).
-        </text>
-        <button label="IM/Anruf" name="IM" tool_tip="Beginnt eine Instant Message-Sitzung" />
-        <button label="Aktivieren" label_selected="Aktivieren" name="Activate" />
-        <button label="Info" label_selected="Info" name="Info" />
-        <button label="Verlassen" label_selected="Verlassen" name="Leave" />
-        <button label="Erstellen..." label_selected="Erstellen" name="Create" />
-        <button label="Suchen..." label_selected="Suchen..." name="Search..." />
-        <button label="Schließen" label_selected="Schließen" name="Close" />
-</floater>
diff --git a/linden/indra/newview/skins/xui/de/floater_instant_message_ad_hoc.xml b/linden/indra/newview/skins/xui/de/floater_instant_message_ad_hoc.xml
index 02ed913..4b0719c 100644
--- a/linden/indra/newview/skins/xui/de/floater_instant_message_ad_hoc.xml
+++ b/linden/indra/newview/skins/xui/de/floater_instant_message_ad_hoc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>

 <floater label="(unbekannt)" name="im_floater" title="(unbekannt)">

-        <layout_stack name="">

+        <layout_stack name="panels">

                 <layout_panel name="im_contents_panel">

                         <button label="Anrufen" name="start_call_btn" />

                         <button label="Anruf beenden" name="end_call_btn" />

diff --git a/linden/indra/newview/skins/xui/de/floater_instant_message_group.xml b/linden/indra/newview/skins/xui/de/floater_instant_message_group.xml
index 8379644..118276e 100644
--- a/linden/indra/newview/skins/xui/de/floater_instant_message_group.xml
+++ b/linden/indra/newview/skins/xui/de/floater_instant_message_group.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>

 <floater label="(unbekannt)" name="im_floater" title="(unbekannt)">

-        <layout_stack name="">

+        <layout_stack name="panels">

                 <layout_panel name="im_contents_panel">

                         <button label="Gruppeninfo..." name="group_info_btn" />

                         <button label="Gespräch beitreten" name="start_call_btn" />

diff --git a/linden/indra/newview/skins/xui/de/floater_joystick.xml b/linden/indra/newview/skins/xui/de/floater_joystick.xml
index f1404ba..8b4b7a5 100644
--- a/linden/indra/newview/skins/xui/de/floater_joystick.xml
+++ b/linden/indra/newview/skins/xui/de/floater_joystick.xml
@@ -1,54 +1,3 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>

-<floater label="Direkt-Zoom" name="build options floater" title="Flycam-Optionen">

-        <text name="x-axis">

-                X-Achse

-        </text>

-        <text name="y-axis">

-                Y-Achse

-        </text>

-        <text name="z-axis">

-                Z-Achse

-        </text>

-        <spinner label="Textur" name="FlycamAxis1" />

-        <spinner label="Textur" name="FlycamAxis2" />

-        <spinner label="Textur" name="FlycamAxis0" />

-        <spinner label="Skalieren" name="FlycamAxisScale1" />

-        <spinner label="Skalieren" name="FlycamAxisScale2" />

-        <spinner label="Skalieren" name="FlycamAxisScale0" />

-        <spinner label="Tote Zone" name="FlycamAxisDeadZone1" />

-        <spinner label="Tote Zone" name="FlycamAxisDeadZone2" />

-        <spinner label="Tote Zone" name="FlycamAxisDeadZone0" />

-        <text name="yaw">

-                Gieren

-        </text>

-        <text name="pitch">

-                Neigen

-        </text>

-        <text name="roll">

-                Rollen

-        </text>

-        <spinner label="Textur" name="FlycamAxis5" />

-        <spinner label="Textur" name="FlycamAxis4" />

-        <spinner label="Textur" name="FlycamAxis3" />

-        <spinner label="Skalieren" name="FlycamAxisScale5" />

-        <spinner label="Skalieren" name="FlycamAxisScale4" />

-        <spinner label="Skalieren" name="FlycamAxisScale3" />

-        <spinner label="Tote Zone" name="FlycamAxisDeadZone5" />

-        <spinner label="Tote Zone" name="FlycamAxisDeadZone4" />

-        <spinner label="Tote Zone" name="FlycamAxisDeadZone3" />

-        <text name="ZoomLabel">

-                Zoom

-        </text>

-        <spinner label="Textur" name="FlycamAxis6" />

-        <spinner label="Skalieren" name="FlycamAxisScale6" />

-        <spinner label="Tote Zone" name="FlycamAxisDeadZone6" />

-        <slider label="Auslaufen" name="FlycamFeathering" />

-        <check_box label="Automatisch ausrichten" name="FlycamAutoLeveling" />

-        <check_box label="3D-Cursor" name="FlycamAbsolute" />

-        <text name="JoystickMonitor">

-                Joystick-Monitor

-        </text>

-        <text name="Axis">

-                Achse [NUM]

-        </text>

+<floater name="Joystick">

 </floater>

diff --git a/linden/indra/newview/skins/xui/de/floater_preview_new_landmark.xml b/linden/indra/newview/skins/xui/de/floater_preview_new_landmark.xml
deleted file mode 100644
index 9294508..0000000
--- a/linden/indra/newview/skins/xui/de/floater_preview_new_landmark.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="landmark_preview">
-        <button label="Teleportieren" label_selected="" name="Teleport btn" />
-        <button label="Auf Karte" label_selected="" name="Show on Map btn" />
-        <button label="Verwerfen" label_selected="" name="Discard btn" />
-        <text type="string" length="1" name="desc txt">
-                Beschreibung:
-        </text>
-</floater>
diff --git a/linden/indra/newview/skins/xui/de/floater_rate.xml b/linden/indra/newview/skins/xui/de/floater_rate.xml
deleted file mode 100644
index 1e57993..0000000
--- a/linden/indra/newview/skins/xui/de/floater_rate.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="rate" title="Ihre Bewertung für Jeska Linden">
-        <radio_group name="behavior">
-                <radio_item type="string" length="1" name="Positive">
-                        Positiv
-                </radio_item>
-                <radio_item type="string" length="1" name="No Rating">
-                        Keine Einstufung
-                </radio_item>
-        </radio_group>
-        <radio_group name="appearance">
-                <radio_item type="string" length="1" name="Positive">
-                        Positiv
-                </radio_item>
-                <radio_item type="string" length="1" name="No Rating">
-                        Keine Einstufung
-                </radio_item>
-        </radio_group>
-        <radio_group name="building">
-                <radio_item type="string" length="1" name="Positive">
-                        Positiv
-                </radio_item>
-                <radio_item type="string" length="1" name="No Rating">
-                        Keine Einstufung
-                </radio_item>
-        </radio_group>
-        <button label="OK" label_selected="OK" name="OK" />
-        <button label="Abbrechen" label_selected="Abbrechen" name="Cancel" />
-        <text type="string" length="1" name="Overall behavior:">
-                Gesamtverhalten:
-        </text>
-        <text type="string" length="1" name="Skill at appearance (clothing and attachments):">
-                Fähigkeit in Aussehen (Kleider und Anhänge):
-        </text>
-        <text type="string" length="1" name="Skill at building:">
-                Fähigkeit in Bauen:
-        </text>
-        <text type="string" length="1" name="Message:">
-                Nachricht:
-        </text>
-        <text type="string" length="1" name="cost">
-                Kosten: [COST] L$ für jede Einstufung.  Summe: [TOTAL] L$.
-        </text>
-</floater>
diff --git a/linden/indra/newview/skins/xui/de/menu_viewer.xml b/linden/indra/newview/skins/xui/de/menu_viewer.xml
index 1e20642..d72e7b7 100644
--- a/linden/indra/newview/skins/xui/de/menu_viewer.xml
+++ b/linden/indra/newview/skins/xui/de/menu_viewer.xml
@@ -15,7 +15,6 @@
                 <menu_item_call label="Foto machen" name="Take Snapshot" />
                 <menu_item_call label="Foto auf Datenträger" name="Snapshot to Disk" />
                 <menu_item_separator label="-----------" name="separator4" />
-                <menu_item_call label="Film auf Datenträger starten/stoppen" name="Start/Stop Movie to Disk" />
                 <menu label="Fenstergröße einstellen" name="Set Window Size">
                         <menu_item_call label="320x240" name="320x240" />
                         <menu_item_call label="640x480" name="640x480" />
@@ -141,6 +140,7 @@
                 <menu_item_separator label="-----------" name="separator3" />
                 <menu_item_call label="Als abwesend anzeigen" name="Set Away" />
                 <menu_item_call label="Als beschäftigt anzeigen" name="Set Busy" />
+                <menu_item_call label="Alle Animationen stoppen" name="Stop All Animations" />
                 <menu_item_separator label="-----------" name="separator4" />
                 <menu_item_call label="Kontostatistik..." name="Account History..." />
                 <menu_item_call label="Mein Konto verwalten..." name="Manage My Account..." />
@@ -195,7 +195,6 @@
                 <menu_item_call label="Verknüpfung" name="Link" />
                 <menu_item_call label="Verknüpfung aufheben" name="Unlink" />
                 <menu_item_separator label="-----------" name="separator4" />
-                <menu_item_call label="Alle Animationen stoppen" name="Stop All Animations" />
                 <menu_item_separator label="-----------" name="separator5" />
                 <menu_item_call label="Fokus auf Auswahl" name="Focus on Selection" />
                 <menu_item_call label="Auf Auswahl zoomen" name="Zoom to Selection" />
@@ -253,6 +252,15 @@
                 <menu_item_call label="Rempler, Stöße und Schläge..." name="Bumps, Pushes &amp;amp; Hits..." />
                 <menu_item_call label="Lag-Anzeige" name="Lag Meter" />
                 <menu_item_separator label="-----------" name="separator5" />
+                <menu label="Fehlermeldungen" name="Bug Reporting">
+                        <menu_item_call label="Allgemeiner Probleme-Tracker..." name="Public Issue Tracker..." />
+                        <menu_item_call label="Hilfe zum Allgemeinen Probleme-Tracker..."
+                             name="Publc Issue Tracker Help..." />
+                        <menu_item_call label="Fehlermeldungs-1x1..." name="Bug Reporing 101..." />
+                        <menu_item_call label="Sicherheitsfragen..." name="Security Issues..." />
+                        <menu_item_call label="QA-Wiki..." name="QA Wiki..." />
+                        <menu_item_call label="Fehler melden..." name="Report Bug..." />
+                </menu>
                 <menu_item_call label="Versionshinweise..." name="Release Notes..." />
                 <menu_item_separator label="-----------" name="separator6" />
                 <menu_item_call label="Über Second Life..." name="About Second Life..." />
diff --git a/linden/indra/newview/skins/xui/de/panel_friends.xml b/linden/indra/newview/skins/xui/de/panel_friends.xml
index 6e55ba3..771e0cf 100644
--- a/linden/indra/newview/skins/xui/de/panel_friends.xml
+++ b/linden/indra/newview/skins/xui/de/panel_friends.xml
@@ -32,7 +32,8 @@
              tool_tip="Bilder, Gruppen und andere Informationen anzeigen" />

         <button label="Teleport" name="offer_teleport_btn"

              tool_tip="Bieten Sie diesem Freund einen Teleport an Ihre Position an" />

-        <button label="Zahlen" name="pay_btn" tool_tip="Diesem Freund Linden-Dollar (L$) geben" />

+        <button label="Zahlen" name="pay_btn"

+             tool_tip="Diesem Freund Linden-Dollar (L$) geben" />

         <button label="Entfernen" name="remove_btn"

              tool_tip="Diese Person von Ihrer Freundesliste entfernen" />

         <button label="Hinzufügen" name="add_btn"

diff --git a/linden/indra/newview/skins/xui/de/panel_music_remote.xml b/linden/indra/newview/skins/xui/de/panel_music_remote.xml
deleted file mode 100644
index 7755b83..0000000
--- a/linden/indra/newview/skins/xui/de/panel_music_remote.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel name="music_remote">
-        <text type="string" length="6" name="text">
-                Musik
-        </text>
-        <volume_slider name="volume_slider" tool_tip="Ändern Sie die Lautstärke mit dem Regler" />
-        <button label="" label_selected="" name="stop_btn" tool_tip="Medienwiedergabe anhalten" />
-        <button label="" label_selected="" name="play_btn"
-             tool_tip="Gibt den Medienstream wieder" />
-        <button label="" label_selected="" name="pause_btn"
-             tool_tip="Pausiert den Medienstream" />
-        <button name="music_stop" tool_tip="Medienwiedergabe anhalten" />
-        <button name="music_play" tool_tip="Gibt den Medienstream wieder" />
-        <button name="music_pause" tool_tip="Pausiert den Medienstream" />
-</panel>
diff --git a/linden/indra/newview/skins/xui/de/panel_overlaybar.xml b/linden/indra/newview/skins/xui/de/panel_overlaybar.xml
index a899bd1..3559f82 100644
--- a/linden/indra/newview/skins/xui/de/panel_overlaybar.xml
+++ b/linden/indra/newview/skins/xui/de/panel_overlaybar.xml
@@ -11,8 +11,8 @@
         <button label="Aufstehen" label_selected="Aufstehen" name="Stand Up"
              tool_tip="Klicken Sie hier, um aufzustehen." />
         <layout_stack name="overlay_layout_panel">
-                <layout_panel name="">
-                        <layout_stack name="">
+                <layout_panel name="main_panel">
+                        <layout_stack name="chatbar_and_buttons">
                                 <layout_panel name="state_buttons">
                                         <button label="IM erhalten" label_selected="IM erhalten" name="IM Received"
                                              tool_tip="Sie haben eine unbeantwortete Instant Message. Klicken Sie, um IMs anzuzeigen." />
diff --git a/linden/indra/newview/skins/xui/de/panel_preferences_graphics2.xml b/linden/indra/newview/skins/xui/de/panel_preferences_graphics2.xml
deleted file mode 100644
index fbe56b6..0000000
--- a/linden/indra/newview/skins/xui/de/panel_preferences_graphics2.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel label="Grafikdetails" name="Display panel 3">
-        <text type="string" length="1" name="text">
-                Shader:
-        </text>
-        <check_box label="Vertex-Shader aktivieren" name="shaders"
-             tool_tip="Deaktivieren Sie diese Option, wenn der Grafikkartentreiber Abstürze verursacht." />
-        <check_box label="Bumpmapping und Glanz aktivieren" name="bumpshiny" />
-        <check_box label="Wellen auf Wasser aktivieren" name="ripple" />
-        <check_box label="Avatar Vertexprogramm" name="avatarvp" />
-        <text type="string" length="1" name="Avatar Rendering:">
-                Avatar-Darstellung:
-        </text>
-        <radio_group name="Avatar Appearance">
-                <radio_item type="string" length="1" name="Normal">
-                        Normal
-                </radio_item>
-                <radio_item type="string" length="1" name="Bump">
-                        Mit Bumpmap
-                </radio_item>
-                <radio_item type="string" length="1" name="Cloth">
-                        Mit Bumpmap &amp; Stoff
-                </radio_item>
-        </radio_group>
-        <text type="string" length="1" name="Lighting Detail:">
-                Beleuchtungsdetails:
-        </text>
-        <radio_group name="lighting detail radio">
-                <radio_item type="string" length="1" name="SunMoon">
-                        Nur Sonne und Mond
-                </radio_item>
-                <radio_item type="string" length="1" name="LocalLights">
-                        Lokale Lichtquellen
-                </radio_item>
-        </radio_group>
-        <text type="string" length="1" name="Terrain Detail:">
-                Terraindetails:
-        </text>
-        <radio_group name="terrain detail radio">
-                <radio_item type="string" length="1" name="0">
-                        Niedrig
-                </radio_item>
-                <radio_item type="string" length="1" name="2">
-                        Hoch
-                </radio_item>
-        </radio_group>
-        <text type="string" length="1" name="Object Mesh Detail:">
-                Objekt-Gitterdetails:
-        </text>
-        <text type="string" length="1" name="Flexible Mesh Detail:">
-                Flexible-Gitterdetails:
-        </text>
-        <text type="string" length="1" name="Tree Mesh Detail:">
-                Baum-Gitterdetails:
-        </text>
-        <text type="string" length="1" name="Avatar Mesh Detail:">
-                Avatar-Gitterdetails:
-        </text>
-</panel>
diff --git a/linden/indra/newview/skins/xui/de/panel_preferences_graphics3.xml b/linden/indra/newview/skins/xui/de/panel_preferences_graphics3.xml
deleted file mode 100644
index 5e55598..0000000
--- a/linden/indra/newview/skins/xui/de/panel_preferences_graphics3.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel label="Erw. Grafikdetails" name="Display panel 2">
-        <text type="string" length="1" name="Filtering:">
-                Filtern:
-        </text>
-        <check_box label="Anisotropische Filterung (langsamer, wenn aktiviert)" name="ani" />
-        <spinner label="Gamma:" name="gamma" />
-        <text type="string" length="1" name="(brightness, lower is brighter)">
-                (Helligkeit, niedriger ist heller, 0=Standard)
-        </text>
-        <spinner label="Helligkeit bei Nacht:" name="nighttime_brightness" />
-        <text type="string" length="1" name="(higher is brighter, 1.0 is default)">
-                (höher ist heller, 1.0 = Standard)
-        </text>
-        <text type="string" length="1" name="Enable VBO:">
-                VBO aktivieren:
-        </text>
-        <check_box label="OpenGL Vertex-Buffer-Objekte aktivieren" name="vbo"
-             tool_tip="Bei einigen OpenGL-Treibern kann diese Option zum Absturz führen." />
-        <text type="string" length="1" name="Graphics Card Memory:">
-                Grafikkartenspeicher:
-        </text>
-        <radio_group name="video card memory radio">
-                <radio_item type="string" length="1" name="radio">
-                        16 MB
-                </radio_item>
-                <radio_item type="string" length="1" name="radio2">
-                        32 MB
-                </radio_item>
-                <radio_item type="string" length="1" name="radio3">
-                        64 MB
-                </radio_item>
-                <radio_item type="string" length="1" name="radio4">
-                        128 MB
-                </radio_item>
-                <radio_item type="string" length="1" name="radio5">
-                        256 MB
-                </radio_item>
-                <radio_item type="string" length="1" name="radio6">
-                        512 MB
-                </radio_item>
-        </radio_group>
-        <spinner label="Nebeldistanzverhältnis:" name="fog" />
-        <spinner label="Max. Partikelzahl:" name="particles" />
-        <spinner label="Outfit-Grenzwert:" name="comp limit"
-             tool_tip="Anzahl der kürzlich geänderten Outfits für Anzeige" />
-        <text type="string" length="1" name="(lower is faster)">
-                (niedriger ist schneller)
-        </text>
-        <spinner label="Beacon-Breite:" name="debug beacon line width" />
-        <check_box label="Grafikhardware beim nächsten Start automatisch erkennen"
-             name="probe_hardware_checkbox"
-             tool_tip="Second Life konfiguriert einige Grafikeinstellungen automatisch auf Basis Ihrer Hardware.  Wenn Sie neue Hardware installieren, sollten Sie diese von Second Life neu erkennen lassen." />
-</panel>
diff --git a/linden/indra/newview/skins/xui/de/panel_settings_chat.xml b/linden/indra/newview/skins/xui/de/panel_settings_chat.xml
deleted file mode 100644
index d8661f8..0000000
--- a/linden/indra/newview/skins/xui/de/panel_settings_chat.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel name="chat" title="Unterhaltung">
-        <text>
-                Chat-Schriftgröße:
-        </text>
-        <radio_group name="chat font size">
-                <radio_item>
-                        Klein
-                </radio_item>
-                <radio_item>
-                        Mittel
-                </radio_item>
-                <radio_item>
-                        Groß
-                </radio_item>
-        </radio_group>
-        <text>
-                Chat-Farbe:
-        </text>
-        <color_swatch label="System" name="system" />
-        <color_swatch label="Benutzer" name="users" />
-        <color_swatch label="Objekte" name="objects" />
-        <color_swatch label="Blase" name="background" />
-        <text>
-                Chat-Konsole:
-        </text>
-        <spinner label="Chat ausblenden nach" name="fade_chat_time" />
-        <text>
-                (Sekunden)
-        </text>
-        <spinner label="" name="max_chat_count" />
-        <text>
-                (# Zeilen)
-        </text>
-        <slider label="Deckkraft" name="console_opacity" />
-        <text>
-                Chat-Optionen:
-        </text>
-        <check_box label="Chat verwendet volle Bildbreite (nach Neustart)"
-             name="chat_full_width_check" />
-        <check_box label="Chat nach Drücken der Eingabetaste schließen"
-             name="close_chat_on_return_check" />
-        <check_box label="Pfeiltasten bewegen Avatar beim Chatten"
-             name="arrow_keys_move_avatar_check" />
-        <check_box label="Zeitstempel in Chat anzeigen" name="show_timestamps_check" />
-        <text>
-                Blasen-Chat:
-        </text>
-        <check_box label="Chat-Blasen anzeigen" name="bubble_text_chat" />
-        <slider label="Deckkraft" name="bubble_chat_opacity" />
-        <text>
-                Skriptfehler:
-        </text>
-        <check_box label="Skriptfehler und Warnungen als normalen Chat anzeigen"
-             name="script_errors_as_chat" />
-        <color_swatch label="Farbe" name="script_error" />
-</panel>
diff --git a/linden/indra/newview/skins/xui/de/panel_settings_im.xml b/linden/indra/newview/skins/xui/de/panel_settings_im.xml
deleted file mode 100644
index 844362f..0000000
--- a/linden/indra/newview/skins/xui/de/panel_settings_im.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel name="im" title="IM">
-        <text>
-                IM-Optionen:
-        </text>
-        <check_box label="IM an E-Mail senden" name="send_im_to_email"
-             tool_tip="Ändern Sie Ihre E-Mail-Adresse auf secondlife.com" />
-        <check_box label="IM in Chat-Verlauf einschließen" name="include_im_in_chat_history" />
-        <check_box label="Zeitstempel in IM anzeigen" name="show_timestamps_check" />
-        <text>
-                Beschäftigt-Modus-Antwort:
-        </text>
-</panel>
diff --git a/linden/indra/newview/skins/xui/de/panel_settings_msgbox.xml b/linden/indra/newview/skins/xui/de/panel_settings_msgbox.xml
deleted file mode 100644
index fe5a592..0000000
--- a/linden/indra/newview/skins/xui/de/panel_settings_msgbox.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel label="Popups" name="popups" title="Popups">
-        <text>
-                Popups nicht anzeigen:
-        </text>
-        <button label="Dieses Popup aktivieren" name="enable_popup" />
-        <text>
-                Popups anzeigen:
-        </text>
-        <button label="&apos;Nächstes Mal zeigen&apos;-Dialoge zurücksetzen..."
-             name="reset_dialogs_btn" />
-</panel>
diff --git a/linden/indra/newview/skins/xui/de/panel_settings_network.xml b/linden/indra/newview/skins/xui/de/panel_settings_network.xml
deleted file mode 100644
index bc8b335..0000000
--- a/linden/indra/newview/skins/xui/de/panel_settings_network.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel name="network" title="Netzwerk">
-        <text>
-                Maximale Bandbreite:
-        </text>
-        <slider label="" name="max_bandwidth" />
-        <text>
-                kbit/s (Kilobit pro Sekunde)
-        </text>
-        <text>
-                Größe Festplatten-Cache:
-        </text>
-        <radio_group name="disk cache">
-                <radio_item>
-                        50 MB
-                </radio_item>
-                <radio_item>
-                        200 MB
-                </radio_item>
-                <radio_item>
-                        500 MB
-                </radio_item>
-                <radio_item>
-                        1000 MB
-                </radio_item>
-        </radio_group>
-        <button label="Cache löschen/leeren" name="clear_cache" />
-        <text>
-                Proxy-Konfiguration:
-        </text>
-        <check_box label="Proxy verwenden" name="proxy_enabled" tool_tip="Proxy konfigurieren" />
-        <text>
-                Proxy:
-        </text>
-        <line_editor name="proxy_address" tool_tip="Name oder IP-Adresse des Proxys" />
-        <text>
-                Port:
-        </text>
-        <line_editor name="proxy_port" tool_tip="Die Port-Nummer des Proxys" />
-        <text>
-                Socken:
-        </text>
-        <radio_group name="socks_4_5">
-                <radio_item>
-                        Socks v4
-                </radio_item>
-                <radio_item>
-                        Socks v5
-                </radio_item>
-        </radio_group>
-        <text>
-                Kein Proxy:
-        </text>
-        <line_editor name="proxy_exclusions"
-             tool_tip="Namen oder IP-Adressen, für die kein Proxy verwendet werden soll" />
-</panel>
diff --git a/linden/indra/newview/skins/xui/de/panel_settings_web.xml b/linden/indra/newview/skins/xui/de/panel_settings_web.xml
deleted file mode 100644
index 626085b..0000000
--- a/linden/indra/newview/skins/xui/de/panel_settings_web.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel name="web" title="Web">
-        <check_box label="Externen Browser verwenden (Firefox, Safari, Internet Explorer)"
-             name="external_browser_check"
-             tool_tip="Externen Webbrowser für Hilfe, Weblinks usw. verwenden.\nIm Vollbildmodus nicht empfohlen." />
-        <text>
-                Browser-Homepage:
-        </text>
-        <line_editor name="home_page"
-             tool_tip="Die Webseite, die beim erstmaligen Öffnen des Second Life Webbrowsers geöffnet wird" />
-        <text>
-                Proxy-Konfiguration:
-        </text>
-        <check_box label="Proxy für internen Browser verwenden" name="proxy_enabled"
-             tool_tip="Proxy für internen Webbrowser konfigurieren" />
-        <text>
-                Proxy:
-        </text>
-        <line_editor name="proxy_address" tool_tip="Name oder IP-Adresse des Proxys" />
-        <text>
-                Port:
-        </text>
-        <line_editor name="proxy_port" tool_tip="Die Port-Nummer des Proxys" />
-        <text>
-                Socken:
-        </text>
-        <radio_group name="socks_4_5">
-                <radio_item>
-                        Socks v4
-                </radio_item>
-                <radio_item>
-                        Socks v5
-                </radio_item>
-        </radio_group>
-        <text>
-                Kein Proxy für:
-        </text>
-        <line_editor name="proxy_exclusions"
-             tool_tip="Namen oder IP-Adressen, für die kein Proxy verwendet werden soll" />
-        <check_box label="Webseiten auf Objekten anzeigen (im Test, erfordert Neustart)"
-             name="web_pages_on_prims_check" />
-        <text>
-                Vertrauenswürdige Sites:
-(zur Ansicht anmelden)
-        </text>
-        <button label="Hinzufügen" name="add_trusted" />
-        <line_editor name="trusted_site_entry"
-             tool_tip="Die Site, die zur Liste der vertrauenswürdigen Sites hinzugefügt werden soll" />
-        <button label="Entfernen" name="rem_trusted" />
-</panel>
diff --git a/linden/indra/newview/skins/xui/de/panel_speaker_controls.xml b/linden/indra/newview/skins/xui/de/panel_speaker_controls.xml
index 74e9286..4ab944f 100644
--- a/linden/indra/newview/skins/xui/de/panel_speaker_controls.xml
+++ b/linden/indra/newview/skins/xui/de/panel_speaker_controls.xml
@@ -3,10 +3,12 @@
         <string name="moderator_label">

                 (Moderator)

         </string>

-        <layout_stack name="">

+        <layout_stack name="panels">

                 <layout_panel name="moderation_mode_panel">

                         <combo_box name="moderation_mode">

-                                Moderiertes Voice

+                                <combo_item name="ModeratedVoice">

+                                  Moderiertes Voice

+                                </combo_item>

                         </combo_box>

                 </layout_panel>

                 <layout_panel name="moderate_chat_panel">

diff --git a/linden/indra/newview/skins/xui/de/panel_toolbar.xml b/linden/indra/newview/skins/xui/de/panel_toolbar.xml
index 37282ae..7aaaedf 100644
--- a/linden/indra/newview/skins/xui/de/panel_toolbar.xml
+++ b/linden/indra/newview/skins/xui/de/panel_toolbar.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel name="toolbar">
+        <string name="Redock Windows">Fenster andocken</string>
+        <layout_stack name="toolbar_stack">
         <button label="IM" name="im_btn" tool_tip="Instant Message an Ihre Freunde." />
-        <string name="Redock Windows">
-                Fenster andocken
-        </string>
         <button label="Unterhalten" name="communicate_btn"
              tool_tip="Unterhalten Sie sich mit Freunden und in Gruppen." />
         <button label="" name="chat_btn" tool_tip="Chat-Leiste anzeigen. (Eingabe)" />
@@ -20,4 +19,5 @@
              tool_tip="Die Umgebungskarte. (Strg-Umschalt-M)" />
         <button label="Karte" name="map_btn" tool_tip="Die Weltkarte. (Strg-M)" />
         <button label="Inventar" name="inventory_btn" tool_tip="Ihre Habseligkeiten. (Strg-I)" />
+  </layout_stack>
 </panel>
diff --git a/linden/indra/newview/skins/xui/en-us/alerts.xml b/linden/indra/newview/skins/xui/en-us/alerts.xml
index a39c213..d0ee7f0 100644
--- a/linden/indra/newview/skins/xui/en-us/alerts.xml
+++ b/linden/indra/newview/skins/xui/en-us/alerts.xml
@@ -23,11 +23,14 @@
                 <option name="OK">
                         OK
                 </option>
-        </alert>
-        <alert modal="false" name="MOTD" title="Message of the Day">
+        </alert>        
+        <alert modal="true" name="TutorialNotFound">
                 <message name="message">
-                        [MOTD]
+                        No tutorial is currently available.
                 </message>
+                <option name="OK">
+                        OK
+                </option>
         </alert>
         <alert modal="true" name="GenericAlert">
                 <message name="message">
@@ -138,9 +141,9 @@ Visit the Webpage Studio exhibit to see it.
         </alert>
         <alert modal="true" name="GrantModifyRights">
                 <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.
+                        Granting modify rights to another resident allows them to change,
+delete or take ANY objects you may have in-world. Be VERY careful
+when handing out this permission.
 Do you want to grant modify rights for [FIRST_NAME] [LAST_NAME]?
                 </message>
                 <option name="Yes">
@@ -1339,6 +1342,22 @@ chat, or interact with the world.
                         Cancel
                 </option>
         </alert>
+        <alert modal="true" name="FreezeAvatarFullname">
+                <message name="message">
+                        Freeze [AVATAR_NAME]?
+He or she will temporarily be unable to move,
+chat, or interact with the world.
+                </message>
+                <option name="Freeze">
+                        Freeze
+                </option>
+                <option name="Unfreeze">
+                        Unfreeze
+                </option>
+                <option name="Cancel">
+                        Cancel
+                </option>
+        </alert>
         <alert modal="true" name="EjectAvatar">
                 <message name="message">
                         Eject this avatar from your land?
@@ -1353,6 +1372,20 @@ chat, or interact with the world.
                         Cancel
                 </option>
         </alert>
+        <alert modal="true" name="EjectAvatarFullname">
+                <message name="message">
+                        Eject [AVATAR_NAME] from your land?
+                </message>
+                <option name="Eject">
+                        Eject
+                </option>
+                <option name="EjectandBan">
+                        Eject and Ban
+                </option>
+                <option name="Cancel">
+                        Cancel
+                </option>
+        </alert>
         <alert modal="true" name="InvalidUUID">
                 <message name="message">
                         Not a valid UUID.
@@ -1727,7 +1760,13 @@ No parcel selected.
         <alert modal="true" name="CannotBuyLandNoRegion">
                 <message name="message">
                         Unable to buy land:
-Cannot find the region this land is in.
+                        Cannot find the region this land is in.
+                </message>
+        </alert>
+        <alert modal="true" name="CannotCloseFloaterBuyLand">
+                <message name="message">
+                        You cannot close the Buy Land window until Second Life
+estimates the price of this transaction.
                 </message>
         </alert>
         <alert modal="true" name="CannotDeedLandNothingSelected">
@@ -1762,22 +1801,6 @@ Try selecting a single parcel.
                         Region Not Found
                 </message>
         </alert>
-        <alert modal="true" name="ParcelCanPlayMusic">
-                <message name="message">
-                        This location can play streaming music. 
-Music requires a fast Internet connection.
-
-Play music when available?
-(You can change this option later under 
-Preferences &gt; Audio &amp; Video.)
-                </message>
-                <option name="PlayMusic">
-                        Play Music
-                </option>
-                <option name="Disable">
-                        Disable
-                </option>
-        </alert>
         <alert modal="true" name="ParcelCanPlayMedia">
                 <message name="message">
                         This location can play streaming media. 
@@ -2615,6 +2638,18 @@ and the default for the &apos;Revert&apos; tool?
                         You can only have [MAX_AGENTS] Allowed Residents.
                 </message>
         </alert>
+        <alert modal="true" name="MaxBannedAgentsOnRegion">
+                <message name="message">
+                        You can only have [MAX_BANNED] Banned Residents.
+                </message>
+        </alert>
+        <alert modal="true" name="MaxAgentOnRegionBatch">
+                <message name="message">
+                        Failure while attempting to add [NUM_ADDED] agents:
+Exceeds the [MAX_AGENTS] [LIST_TYPE] limit by [NUM_EXCESS].
+                </message>
+        </alert>
+
         <alert modal="true" name="MaxAllowedGroupsOnRegion">
                 <message name="message">
                         You can only have [MAX_GROUPS] Allowed Groups.
@@ -2626,11 +2661,6 @@ and the default for the &apos;Revert&apos; tool?
                         Cancel
                 </option>
         </alert>
-        <alert modal="true" name="MaxBannedAgentsOnRegion">
-                <message name="message">
-                        You can only have [MAX_BANNED] Banned Residents.
-                </message>
-        </alert>
         <alert modal="true" name="MaxManagersOnRegion">
                 <message name="message">
                         You can only have [MAX_MANAGER] Estate Managers.
@@ -2763,6 +2793,20 @@ Download to your Applications folder?
                         Cancel
                 </option>
         </alert>
+        <alert modal="true" name="WebLaunchExternalTarget">
+                <message name="message">
+                        Open your system Web browser to view this content?
+                </message>
+                <ignore name="ignore">
+                        When opening your system browser to view a Web page
+                </ignore>
+                <option name="Open">
+                        OK
+                </option>
+                <option name="Cancel">
+                        Cancel
+                </option>
+        </alert>
         <alert modal="true" name="WebLaunchJoinNow">
                 <message name="message">
                         Go to www.secondlife.com to manage your account?
@@ -3444,6 +3488,11 @@ spaceserver hiccup.
                         Problems adding a new estate manager.  One or more estates may have a full manager list.
                 </message>
         </alert>
+        <alert modal="true" name="ProblemAddingEstateGeneric">
+                <message name="message">
+                        Problems adding to this estate list.  One or more estates may have a full list.
+                </message>
+        </alert>
         <alert modal="true" name="UnableToLoadNotecard">
                 <message name="message">
                         Unable to load notecard&apos;s asset at this time.
@@ -3547,8 +3596,7 @@ parcel. The range allowed is 1 to 10. Set at &apos;1&apos;, each 512m2 parcel
 is allowed 117 objects. Set at &apos;2&apos;, each 512m2 parcel is
 allowed 234, or twice as many, and so on. The max number of objects
 allowed per region remains 15,000 no matter what the
-Object Bonus is. once set, be aware that lowering the Object Bonus may cause
-objects to be returned or deleted. 
+Object Bonus is. Once set, be aware that lowering the Object Bonus may cause objects to be returned or deleted. 
  
 Default: 1.0
                 </message>
@@ -4311,7 +4359,7 @@ Linden Lab
                         There is already an object attached to this point on your body.
 Do you want to replace it with the selected object?
                 </message>
-                <ignore save_option="true">
+                <ignore name="ignore" save_option="true">
                         When replacing existing attachments
                 </ignore>
                 <option ignore="Replace Automatically" name="Yes">
@@ -4330,7 +4378,7 @@ this payment.
 Would you like to leave Busy Mode before
 completing this transaction?
                 </message>
-                <ignore save_option="true">
+                <ignore name="ignore" save_option="true">
                         When paying a person or object in busy mode
                 </ignore>
                 <option ignore="Always leave Busy Mode" name="Yes">
@@ -4357,8 +4405,7 @@ the contents of your Trash folder?
         </alert>
         <alert modal="true" name="ConfirmClearBrowserCache">
                 <message name="message">
-                        Are you sure you want to clear your
-browser cache?
+                        Are you sure you want to clear your browser cache?
                 </message>
                 <option default="true" name="Yes">
                         Yes
@@ -4890,3 +4937,4 @@ Would you like to visit the Second Life website to set this up?
                 </url>
         </alert>
 </alerts>
+
diff --git a/linden/indra/newview/skins/xui/en-us/floater_about.xml b/linden/indra/newview/skins/xui/en-us/floater_about.xml
index e9253ff..e5f963a 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_about.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_about.xml
@@ -3,41 +3,40 @@
      can_resize="false" height="440" min_height="100" min_width="100"
      name="floater_about" rect_control="FloaterAboutRect"
      title="About Second Life" width="470">
-        <text_editor bg_readonly_color="0, 0, 0, 0" bottom="-434" embedded_items="false"
+        <text_editor bottom="-434" embedded_items="false"
              follows="left|top|right|bottom" font="SansSerifSmall" height="168" left="6"
-             max_length="65536" mouse_opaque="true" name="credits_editor"
-             text_color="1, 1, 1, 1" text_readonly_color="1, 1, 1, 1" width="458"
-             word_wrap="true">
-                Second Life is brought to you by Philip, Andrew, Tessa, Cory, Frank, James, Doug, Hunter, Richard, John, Eric, Avi, AaronB, AaronY, Ian, Peter, Mark, Robin, Stephen, Tracy, Ryan, Alberto, Haney, Tanya, JimJ, Dan, Ben, Stephanie, Tim, Evan, Catherine, Colin, Chris, Reuben, Charity, Jeska, James, JonHenry, Kelly, Callum, Char, Daniel, DavidF, Don, Jeff, Lauren, Lee, Michael, Ramzi, Vektor, Steve, TomY, Tess, Kona, Brent, Clarissa, PeterP, Jesse, Annette, Cyn, Blue, Ginsu, Jonathan, Karen, Adam, Nova, Deana, Lizzie, Patsy, DavidK, Isaac, Pathfinder, Monroe, Jill, Benny, Altruima, Rheya, Jennifer, Jack, DaveP, Brad, Mick, Babbage, Elisabeth, Brian, Beth, Data, Ethan, Wendy, Nicole, Sky, Jeffrey, Zero, Coffee, Tesla, Kenny, Makiko, Nigel, Teeple, Lucy, Mia, Dee, Guy, Harry, Liana, Branka, Jimbo, Aura, Vasuda, SarahD, bethanye, Torley, Runitai, MikeS, PaulM, Milo, Hermia, JoeM, Melanie, Rejean, DSmith, SMiller, Susan, Jose, DongYun, Justin, Andrey, Syrah, Donovan, Henrik, Nora, Lexie, AC, Donna, ChrisC, Alex, Leyla, Kyle, Mathew, Devin, Joshua, DanC, Jessica, Harmony, Claudia, Tramel, Glenn, Betsy, Fritz, Jun, Adam, Cassandra, Ken, RyanW, Spike, Tofu, Varas, Andy, Luke, RobLa, Chiyo, JohnZ, Dustin, George, Del, PeterP, Migyeong, Matthew, RMullane, CChampion, JTurbin, JamesC, Viola, Lightfoot, Jacqui, Sturm, Adrian, Buttercup, Alfred, Sunil, Alfred, Noel, Irfan, Jill, Yool, Jane, Yuki, Yoz, Matthew, Arthur, Jennifer, Karl, Brian, Ben, Janine, Christopher, Madhavi, Everett, Anthony, Joon, Jake, sean, Adreanne, Stephany, KellyJo, Jeremy, Pramod, Joshua, Sean, Christopher, Amy, Ceren, Katherine, jon, Sudheendra, James, Stephan, Kari, Kartic, Todd, Thomas, Joki, Rebecca, Belinda, Bert, Roger, Bridie, Kristi, Brian, Maria, John, Aric, Nathanel, Melinda, Darrell, Jennifer, Sandy, Greg, Rob, Brad, Chris, Eric, Palmer, Asi, Katja, Lisa, Minda, Jen, Aaron, Bryan, Mark, Jonathan, Jamie, Laurel, William, Matthew, Steve, David, Remy, James, Tim, Lee, Brian, Ashlei, Sam, Mike, Ethan, Austin, Wanda, Paul, Brian, Rachel, Valentyn, Emma Williams, Autum, Steven, Laley, Charles, Jessica, Sue, Gillian, CG, Kip, Kristen, Shamiran, Blake, Brett, Erica, Kent, Joel, Plexus, Twilight, Joppa, Enus, Kraft, Naveen, Simon, Q, Ronp, Laurap, Ram, KyleJM, Marty, Kend, Daveh, Prospero, Melissa, Nat, Hamilton, Green, Seraph, Ekim, Miz, Jimmy, Kosmo, Rome, Doris, JT, Benoc, Whump, Mango, Trinity, Patch, TJ, Christy, Bao, Joohwan, Kate, Oreh, Angela, Johan, Cheah, Lan, Matias, Brandy, Cogsworth, Aleks,  Mitchell, Space, Einstein, Bambers, Colton, Malbers, Maggie, Umesh, Santosh, Rose, Stash, Rothman, Winnie, Stella, Niall and many others.
+  max_length="65536" mouse_opaque="true" name="credits_editor" width="458"
+  word_wrap="true">
+  Second Life is brought to you by Philip, Andrew, Tessa, Cory, Frank, James, Doug, Hunter, Richard, John, Eric, Avi, AaronB, AaronY, Ian, Peter, Mark, Robin, Stephen, Tracy, Ryan, Alberto, Haney, Tanya, JimJ, Dan, Ben, Stephanie, Tim, Evan, Catherine, Colin, Chris, Reuben, Charity, Jeska, James, JonHenry, Kelly, Callum, Char, Daniel, DavidF, Don, Jeff, Lauren, Lee, Michael, Ramzi, Vektor, Steve, TomY, Tess, Kona, Brent, Clarissa, PeterP, Jesse, Annette, Cyn, Blue, Ginsu, Jonathan, Karen, Adam, Nova, Deana, Lizzie, Patsy, DavidK, Isaac, Pathfinder, Monroe, Jill, Benny, Altruima, Rheya, Jennifer, Jack, DaveP, Brad, Mick, Babbage, Elisabeth, Brian, Beth, Data, Ethan, Wendy, Nicole, Sky, Jeffrey, Zero, Coffee, Tesla, Kenny, Makiko, Nigel, Teeple, Lucy, Mia, Dee, Guy, Harry, Liana, Branka, Jimbo, Aura, Vasuda, SarahD, bethanye, Torley, Runitai, MikeS, PaulM, Milo, Hermia, JoeM, Melanie, Rejean, DSmith, SMiller, Susan, Jose, DongYun, Justin, Andrey, Syrah, Donovan, Henrik, Nora, Lexie, AC, Donna, ChrisC, Alex, Leyla, Kyle, Mathew, Devin, Joshua, DanC, Jessica, Harmony, Claudia, Tramel, Glenn, Betsy, Fritz, Jun, Adam, Cassandra, Ken, RyanW, Spike, Tofu, Varas, Andy, Luke, RobLa, Chiyo, JohnZ, Dustin, George, Del, PeterP, Migyeong, Matthew, RMullane, CChampion, JTurbin, JamesC, Viola, Lightfoot, Jacqui, Sturm, Adrian, Buttercup, Alfred, Sunil, Alfred, Noel, Irfan, Jill, Yool, Jane, Yuki, Yoz, Matthew, Arthur, Jennifer, Karl, Brian, Ben, Janine, Christopher, Madhavi, Everett, Anthony, Joon, Jake, sean, Adreanne, Stephany, KellyJo, Jeremy, Pramod, Joshua, Sean, Christopher, Amy, Ceren, Katherine, jon, Sudheendra, James, Stephan, Kari, Kartic, Todd, Thomas, Joki, Rebecca, Belinda, Bert, Roger, Bridie, Kristi, Brian, Maria, John, Aric, Nathanel, Melinda, Darrell, Jennifer, Sandy, Greg, Rob, Brad, Chris, Eric, Palmer, Asi, Katja, Lisa, Minda, Jen, Aaron, Bryan, Mark, Jonathan, Jamie, Laurel, William, Matthew, Steve, David, Remy, James, Tim, Lee, Brian, Ashlei, Sam, Mike, Ethan, Austin, Wanda, Paul, Brian, Rachel, Valentyn, Emma Williams, Autum, Steven, Laley, Charles, Jessica, Sue, Gillian, CG, Kip, Kristen, Shamiran, Blake, Brett, Erica, Kent, Joel, Plexus, Twilight, Joppa, Enus, Kraft, Naveen, Simon, Q, Ronp, Laurap, Ram, KyleJM, Marty, Kend, Daveh, Prospero, Melissa, Nat, Hamilton, Green, Seraph, Ekim, Miz, Jimmy, Kosmo, Rome, Doris, JT, Benoc, Whump, Mango, Trinity, Patch, TJ, Christy, Bao, Joohwan, Kate, Oreh, Angela, Johan, Cheah, Lan, Matias, Brandy, Cogsworth, Aleks,  Mitchell, Space, Einstein, Bambers, Colton, Malbers, Maggie, Umesh, Santosh, Rose, Stash, Rothman, Winnie, Stella, Niall and many others.
 
-Thank you to the following residents for helping to ensure that this is the best version yet: aaron23 decuir, Abelv Vollmar, Abyssin Otoro, ActingIll Igaly, Adamas Carter, Addy Broome, Adelia Menges, Alexandra Rucker, Alexandrea Fride, Alissa Sabre, Alyx Jonson, Ann Otoole, Anton Fargis, Aradia Dielli, Araina jewell, Arcane Clawtooth, arcangelo vantelli, Are Sperber, Argent Stonecutter, arkady yost, Ashcroft Burnham, Ashen Arida, Auron Forcella, Azadine Umarov, Azildin Furst, Balp Allen, Balpien Hammerer, Barney Boomslang, Barrett Slade, becky pippen, Beeflin Grut, Beer Dailey, Behemoth Greenwood, bigmanu greene, bitova loon, Bonca Chikuwa, Bonnie Bechir, Brandon Catteneo, buttonpusher jones, Carina Raymaker, Ceera Murakami, Celierra Darling, ChatNoir Moonsoo, Cheetah Hammerer, chet neurocam, Cinthya Loveless, Cold Spitteler, Coral Quinnell, Crash Pointe, CrazyTB Oh, Creem Pye, Crom Chaffe, ctrl althouse, dade carver, Dael Ra, dakota schwade, Dale Innis, Damian McLeod, Danger Lytton, danielluh ashton, DanOfWA Flanagan, Davec Horsforth, Davidius Morigi, davie zinner, Day Oh, DBDigital Epsilon, Deany Fall, deBruce Munro, Decaf Coffey, Dedric Mauriac, Deeso Saeed, Dekka Raymaker, dexter eberhart, Dildo Spitz, Dizzy Banjo, djcabello klaar, Dnali Anabuki, Domchi Underwood, Doran Zemlja, Drew Dwi, Duckless Vandyke, Duncan Stenvaag, Dylan Rickenbacker, dzogchen Moody, Dzonatas Sol, Eddy Stryker, Edward Griffith, Edward Pearse, ein duesenburg, Elle Pollack, Elle74 Zaftig, Emileigh Starbrook, Emma Nowhere, ener bing, Erdrick Balbozar, eric domela, Evangeline Biedermann, Excalibur Longstaff, Fake Fitzgerald, Feldspar Millgrove, Feynt Mistral, Fluf Fredriksson, Forbid Utorid, Fortyniner Beck, Francesco Despres, Francisco Koolhoven, Franta Burt, Fury Rosewood, garde Burrel, Garmin Kawaguichi, Gavin Ichigo, Gellan Glenelg, Genie Demina, Gennifer Meredith, Gigs Taggart, Goldie Katsu, Gwyneth Llewelyn, Haravikk Mistral, Harleen Gretzky, Haruki Watanabe, Heather Manatiso, Henri Beauchamp, Honey Fairweather, Hypatia Callisto, Ice Brodie, icktoofay Kamachi, IntLibber Brautigan, Janise Dreamscape, Jay Shinobu, Jenni Ryba, Jeremy Ondricek, JetZep Zabelin, Jims Smythe, Jini Hammerer, Jopy Weber, JustOneMore Loon, Kaluura Boa, Kara Markova, Kevin Susenko, Khyra Ares, Kii Lilliehook, Kitty Barnett, Kris Kuttelwascher, Lanita Wingtips, Laura18 Streeter, Lee Ludd, Lettrius Jewell, Liberty Tesla, LilyAnna Carter, Lindal Kidd, Lisa Lowe, Lisa McConnell, Lola Machin, luca peck, Lupus Clawtooth, M1sha Dallin, Macsima Dagostino, Mana Janus, Mani Canning, Manjusri Binder, marceledward edman, march Korda, marchino villota, Marcus Llewellyn, MartinRJ Fayray, Matthew Dowd, Max Kleiber, mazzy fastback, McCabe Maxsted, Mckailen Kohnke, Meghan Dench, Melvin Starbrook, Mercia Mcmahon, Miakoda Carnell, Michelle2 Zenovka, Michi Lumin, mick parnall, Milla Michinaga, Millie Thompson, miranda Ashby, Mircea Lobo, MIssSara Beck, mouse mimistrobell, Myria Boa, Nanci Barthelmess, Nargus Asturias, Natalya Debevec, Nedrae Messmer, Nexeus Fatale, Niky Zenovka, Nimrod Szondi, Ninane Yoshikawa, Noch Tripsa, nokithecat writer, Nyko Merlin, Onyx Halberd, oryx tempel, Osprey Therian, Pac Hyun, Panagea McMillan, Patrick Ferrentino, PattehPh0x Katsu, ponk bing, Poppy Linden, Prajna Vella, Precious Rhiano, Prokofy Neva, Randall Lovenkraft, Rascal Ratelle, Raydon Writer, Rhaorth Antonelli, Rock Hayek, Ron Crimson, Ron Khondji, Ronald Richez, Rui Clary, Ruud Lathrop, Sakkano Imako, Sam Reinard, Sascha Vandyke, Scrippy Scofield, Sean18 McCarey, Sedona Mills, Sekonda Huet, Seraph Nephilim, Sergei Milos, Shadowquine Maltz, shai khalifa, sheilah flatley, Sheri Underwood, Shuggy Husky, Sierra Janus, Sigma Avro, Simil Miles, simon kline, Simon Nolan, Sindy Tsure, Sparks Keynes, Squirrel Wood, Stahi Columbia, StarSong Bright, Summer Seale, Sunn Thunders, Susan Koltai, Syler Zhora, Synack Fitzgerald, Tayra Dagostino, Tee Cramer, Teravus Ousley, Thomas Shikami, Tia Araw, Tillie Ariantho, Topher Brooks, Torley Linden, Twosteppin Jewell, tx Oh, urantia jewell, vaguegirl Petty, VeC Merlin, venus petrov, vv33d Beck, vynka dean, zann canto, zeebster colasanti, Zi Ree, Zion Tristan, Zorin Frobozz, Zyzzy Zarf
+  Thank you to the following residents for helping to ensure that this is the best version yet: aaron23 decuir, Abelv Vollmar, Abyssin Otoro, ActingIll Igaly, Adamas Carter, Addy Broome, Adelia Menges, Alexandra Rucker, Alexandrea Fride, Alissa Sabre, Alyx Jonson, Ann Otoole, Anton Fargis, Aradia Dielli, Araina jewell, Arcane Clawtooth, arcangelo vantelli, Are Sperber, Argent Stonecutter, arkady yost, Ashcroft Burnham, Ashen Arida, Auron Forcella, Azadine Umarov, Azildin Furst, Balp Allen, Balpien Hammerer, Barney Boomslang, Barrett Slade, becky pippen, Beeflin Grut, Beer Dailey, Behemoth Greenwood, bigmanu greene, bitova loon, Bonca Chikuwa, Bonnie Bechir, Brandon Catteneo, buttonpusher jones, Carina Raymaker, Ceera Murakami, Celierra Darling, ChatNoir Moonsoo, Cheetah Hammerer, chet neurocam, Cinthya Loveless, Cold Spitteler, Coral Quinnell, Crash Pointe, CrazyTB Oh, Creem Pye, Crom Chaffe, ctrl althouse, dade carver, Dael Ra, dakota schwade, Dale Innis, Damian McLeod, Danger Lytton, danielluh ashton, DanOfWA Flanagan, Davec Horsforth, Davidius Morigi, davie zinner, Day Oh, DBDigital Epsilon, Deany Fall, deBruce Munro, Decaf Coffey, Dedric Mauriac, Deeso Saeed, Dekka Raymaker, dexter eberhart, Dildo Spitz, Dizzy Banjo, djcabello klaar, Dnali Anabuki, Domchi Underwood, Doran Zemlja, Drew Dwi, Duckless Vandyke, Duncan Stenvaag, Dylan Rickenbacker, dzogchen Moody, Dzonatas Sol, Eddy Stryker, Edward Griffith, Edward Pearse, ein duesenburg, Elle Pollack, Elle74 Zaftig, Emileigh Starbrook, Emma Nowhere, ener bing, Erdrick Balbozar, eric domela, Evangeline Biedermann, Excalibur Longstaff, Fake Fitzgerald, Feldspar Millgrove, Feynt Mistral, Fluf Fredriksson, Forbid Utorid, Fortyniner Beck, Francesco Despres, Francisco Koolhoven, Franta Burt, Fury Rosewood, garde Burrel, Garmin Kawaguichi, Gavin Ichigo, Gellan Glenelg, Genie Demina, Gennifer Meredith, Gigs Taggart, Goldie Katsu, Gwyneth Llewelyn, Haravikk Mistral, Harleen Gretzky, Haruki Watanabe, Heather Manatiso, Henri Beauchamp, Honey Fairweather, Hypatia Callisto, Ice Brodie, icktoofay Kamachi, IntLibber Brautigan, Janise Dreamscape, Jay Shinobu, Jenni Ryba, Jeremy Ondricek, JetZep Zabelin, Jims Smythe, Jini Hammerer, Jopy Weber, JustOneMore Loon, Kaluura Boa, Kara Markova, Kevin Susenko, Khyra Ares, Kii Lilliehook, Kitty Barnett, Kris Kuttelwascher, Lanita Wingtips, Laura18 Streeter, Lee Ludd, Lettrius Jewell, Liberty Tesla, LilyAnna Carter, Lindal Kidd, Lisa Lowe, Lisa McConnell, Lola Machin, luca peck, Lupus Clawtooth, M1sha Dallin, Macsima Dagostino, Mana Janus, Mani Canning, Manjusri Binder, marceledward edman, march Korda, marchino villota, Marcus Llewellyn, MartinRJ Fayray, Matthew Dowd, Max Kleiber, mazzy fastback, McCabe Maxsted, Mckailen Kohnke, Meghan Dench, Melvin Starbrook, Mercia Mcmahon, Miakoda Carnell, Michelle2 Zenovka, Michi Lumin, mick parnall, Milla Michinaga, Millie Thompson, miranda Ashby, Mircea Lobo, MIssSara Beck, mouse mimistrobell, Myria Boa, Nanci Barthelmess, Nargus Asturias, Natalya Debevec, Nedrae Messmer, Nexeus Fatale, Niky Zenovka, Nimrod Szondi, Ninane Yoshikawa, Noch Tripsa, nokithecat writer, Nyko Merlin, Onyx Halberd, oryx tempel, Osprey Therian, Pac Hyun, Panagea McMillan, Patrick Ferrentino, PattehPh0x Katsu, ponk bing, Poppy Linden, Prajna Vella, Precious Rhiano, Prokofy Neva, Randall Lovenkraft, Rascal Ratelle, Raydon Writer, Rhaorth Antonelli, Rock Hayek, Ron Crimson, Ron Khondji, Ronald Richez, Rui Clary, Ruud Lathrop, Sakkano Imako, Sam Reinard, Sascha Vandyke, Scrippy Scofield, Sean18 McCarey, Sedona Mills, Sekonda Huet, Seraph Nephilim, Sergei Milos, Shadowquine Maltz, shai khalifa, sheilah flatley, Sheri Underwood, Shuggy Husky, Sierra Janus, Sigma Avro, Simil Miles, simon kline, Simon Nolan, Sindy Tsure, Sparks Keynes, Squirrel Wood, Stahi Columbia, StarSong Bright, Summer Seale, Sunn Thunders, Susan Koltai, Syler Zhora, Synack Fitzgerald, Tayra Dagostino, Tee Cramer, Teravus Ousley, Thomas Shikami, Tia Araw, Tillie Ariantho, Topher Brooks, Torley Linden, Twosteppin Jewell, tx Oh, urantia jewell, vaguegirl Petty, VeC Merlin, venus petrov, vv33d Beck, vynka dean, zann canto, zeebster colasanti, Zi Ree, Zion Tristan, Zorin Frobozz, Zyzzy Zarf
 
-APR Copyright (C) 2000-2004 The Apache Software Foundation
-cURL Copyright (C) 1996-2002, Daniel Stenberg, (daniel@haxx.se)
-expat Copyright (C) 1998, 1999, 2000 Thai Open Source Software Center Ltd.
-FreeType Copyright (C) 1996-2002, The FreeType Project (www.freetype.org).
-GL Copyright (C) 1999-2004 Brian Paul.
-Havok.com(TM) Copyright (C) 1999-2001, Telekinesys Research Limited.
-jpeg2000 Copyright (C) 2001, David Taubman, The University of New South Wales (UNSW)
-jpeglib Copyright (C) 1991-1998, Thomas G. Lane.
-ogg/vorbis Copyright (C) 2001, Xiphophorus
-OpenSSL Copyright (C) 1998-2002 The OpenSSL Project.
-SDL Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga
-SSLeay Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
-xmlrpc-epi Copyright (C) 2000 Epinions, Inc.
-zlib Copyright (C) 1995-2002 Jean-loup Gailly and Mark Adler.
+  3Dconnexion SDK Copyright (C) 1992-2007 3Dconnexion
+  APR Copyright (C) 2000-2004 The Apache Software Foundation
+  cURL Copyright (C) 1996-2002, Daniel Stenberg, (daniel@haxx.se)
+  expat Copyright (C) 1998, 1999, 2000 Thai Open Source Software Center Ltd.
+  FreeType Copyright (C) 1996-2002, The FreeType Project (www.freetype.org).
+  GL Copyright (C) 1999-2004 Brian Paul.
+  Havok.com(TM) Copyright (C) 1999-2001, Telekinesys Research Limited.
+  jpeg2000 Copyright (C) 2001, David Taubman, The University of New South Wales (UNSW)
+  jpeglib Copyright (C) 1991-1998, Thomas G. Lane.
+  ogg/vorbis Copyright (C) 2001, Xiphophorus
+  OpenSSL Copyright (C) 1998-2002 The OpenSSL Project.
+  SDL Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga
+  SSLeay Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
+  xmlrpc-epi Copyright (C) 2000 Epinions, Inc.
+  zlib Copyright (C) 1995-2002 Jean-loup Gailly and Mark Adler.
 
-All rights reserved.  See licenses.txt for details.
+  All rights reserved.  See licenses.txt for details.
 
-Voice chat Audio coding: Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C)
+  Voice chat Audio coding: Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C)
 
 
-Happiness is a warm puppy. -- Charles M. Schulz
-        </text_editor>
-        <text_editor bg_readonly_color="0, 0, 0, 0" bottom_delta="174" embedded_items="false"
+  Happiness is a warm puppy. -- Charles M. Schulz</text_editor>
+
+        <text_editor bottom_delta="174" embedded_items="false"
              follows="left|top|right|bottom" font="SansSerif" height="238" left="6"
-             max_length="65536" mouse_opaque="true" name="support_editor"
-             text_color="1, 1, 1, 1" text_readonly_color="1, 1, 1, 1" width="458"
+             max_length="65536" mouse_opaque="true" name="support_editor" width="458"
              word_wrap="true" />
         <string name="you_are_at">
                 You are at [POSITION]
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 8b21736..1d32b97 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
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater bottom="-554" can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="true" can_tear_off="true" enabled="true" height="420"
+     can_resize="false" can_tear_off="false" enabled="true" height="420"
      left="367" min_height="420" min_width="460" mouse_opaque="true"
      name="floaterland" rect_control="FloaterLandRect5" title="About Land"
      width="460">
-        <tab_container bottom="-390" enabled="true" follows="left|top|right|bottom" height="370"
-             left="0" mouse_opaque="false" name="landtab" tab_position="top" width="460">
-                <panel border="false" bottom="-349" enabled="true" follows="left|top|right|bottom"
+        <tab_container bottom="-420" enabled="true" follows="left|top|right|bottom" height="400"
+             left="1" mouse_opaque="false" name="landtab" tab_position="top" width="459">
+                <panel border="true" bottom="-349" enabled="true" follows="left|top|right|bottom"
                      height="333" label="General" left="1" mouse_opaque="true"
                      name="land_general_panel" width="458">
                         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
@@ -17,9 +17,9 @@
                         </text>
                         <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-20"
                              enabled="true" follows="left|top|right" font="SansSerifSmall"
-                             handle_edit_keys_directly="false" height="16" left="78" max_length="63"
-                             mouse_opaque="true" name="Name" select_all_on_focus_received="false"
-                             select_on_focus="false" text_readonly_color="0.576471 0.662745 0.835294 1"
+                             handle_edit_keys_directly="false" height="16" left="78"
+                             max_length="63" mouse_opaque="true" name="Name"
+                             select_all_on_focus_received="false" select_on_focus="false"
                              width="368" />
                         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom="-40" drop_shadow_visible="true" enabled="true" follows="left|top"
@@ -32,8 +32,7 @@
                              font="SansSerifSmall" handle_edit_keys_directly="false" height="52"
                              left="76" max_length="255" mouse_opaque="true" name="Description"
                              select_all_on_focus_received="false" select_on_focus="false"
-                             text_readonly_color="0.576471 0.662745 0.835294 1" width="370"
-                             word_wrap="true" />
+                             width="370" word_wrap="true" />
                         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom="-100" drop_shadow_visible="true" enabled="true" follows="left|top"
                              font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
@@ -229,8 +228,8 @@
                                 (Sale Pending)
                         </string>
                 </panel>
-                <panel border="false" bottom="-349" enabled="true" follows="left|top|right|bottom"
-                     height="333" label="Covenant" left="1" mouse_opaque="true"
+                <panel border="true" bottom="-349" enabled="true" follows="left|top|right|bottom"
+                     height="333" label="Covenant" left="0" mouse_opaque="true"
                      name="land_covenant_panel" width="458">
                         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
@@ -289,7 +288,7 @@
                         <text_editor type="string" length="1" bottom="-325" embedded_items="false" enabled="false"
                              follows="left|top|right|bottom" font="SansSerifSmall" height="200"
                              left="15" max_length="65535" mouse_opaque="true" name="covenant_editor"
-                             text_readonly_color="1 1 1 1" width="420" word_wrap="true">
+                             width="420" word_wrap="true">
                                 There is no Covenant provided for this Estate.
                         </text_editor>
                         <string name="can_resell">
@@ -305,7 +304,7 @@
                                 Purchased land in this region may not be joined or subdivided.
                         </string>
                 </panel>
-                <panel border="false" bottom="-349" enabled="true" follows="left|top|right|bottom"
+                <panel border="true" bottom="-349" enabled="true" follows="left|top|right|bottom"
                      height="333" label="Objects" left="1" mouse_opaque="true"
                      name="land_objects_panel" width="458">
                         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
@@ -457,18 +456,16 @@
                              name="Return objects..." width="164" />
                         <name_list allow_calling_card_drop="false" background_visible="false" bottom="-329"
                              column_padding="0" draw_border="true" draw_heading="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"
+                             draw_stripes="true" enabled="true" 
                              follows="left|top|right|bottom" height="117" left="4" mouse_opaque="true"
                              multi_select="false" name="owner list" name_column_index="2" width="450">
-                                <column label="Type" sort="online_status" width="24" />
+                                <column name="type" label="Type" sort="online_status" width="24" />
                                 <column name="online_status" width="-1" />
-                                <column dynamicwidth="true" label="Name" />
-                                <column label="Count" width="70" />
+                                <column name="name" dynamicwidth="true" label="Name" />
+                                <column name="count" label="Count" width="70" />
                         </name_list>
-                        /&gt;
                 </panel>
-                <panel border="false" bottom="-349" enabled="true" follows="left|top|right|bottom"
+                <panel border="true" bottom="-349" enabled="true" follows="left|top|right|bottom"
                      height="333" label="Options" left="1" mouse_opaque="true"
                      name="land_options_panel" width="458">
                         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
@@ -654,23 +651,11 @@
                                 Restrict Pushing (Region Override)
                         </string>
                 </panel>
-                <panel border="false" bottom="-349" enabled="true" follows="left|top|right|bottom"
+                <panel border="true" bottom="-349" enabled="true" follows="left|top|right|bottom"
                      height="363" label="Media" left="1" mouse_opaque="true"
                      name="land_media_panel" width="458">
-                        <text type="string" length="1" bottom="-25" follows="left|top" font="SansSerifSmall" halign="left"
-                             height="16" left="10" name="at URL:" width="65">
-                                Media URL:
-                        </text>
-                        <line_editor bottom_delta="0" follows="left|top|right" font="SansSerifSmall"
-                 height="16" left="150"
-                             name="media_url" right="-15"
-                             select_all_on_focus_received="true" select_on_focus="true"
-                             text_readonly_color="0.576471 0.662745 0.835294 1" />
-                        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" halign="center"
-                             height="16" label="Set..." label_selected="Set..." mouse_opaque="true"
-                             name="set_media_url" left="80" scale_image="true" width="60" />
-                        <text type="string" length="1" bottom_delta="-25" follows="left|top" font="SansSerifSmall" halign="left" height="16"
-                             left="10" mouse_opaque="true" name="with media:" width="67">
+                        <text type="string" length="1" bottom="-25" follows="left|top" font="SansSerifSmall" halign="left" height="16"
+                             left="10" mouse_opaque="true" name="with media:" width="65">
                                 Media Type:
                         </text>
                         <combo_box allow_text_entry="false" bottom_delta="0" follows="left|top" height="18"
@@ -680,14 +665,24 @@
                         <text bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
                              left_delta="130" name="mime_type" width="200" />
                         <text type="string" length="1" bottom_delta="-20" follows="left|top" font="SansSerifSmall" halign="left"
-                             height="16" left="10" name="Description:" width="65">
+                             height="16" left="10" name="at URL:" width="65">
+                                Media URL:
+                        </text>
+                        <line_editor bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16" left="80"
+                             max_length="255" name="media_url" right="-80"
+                             select_all_on_focus_received="true" select_on_focus="true"
+                             text_readonly_color="0.576471 0.662745 0.835294 1" />
+                        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" halign="center"
+                             height="16" label="Set..." label_selected="Set..." mouse_opaque="true"
+                             name="set_media_url" right="-12" scale_image="true" width="60" />
+                        <text type="string" length="1" bottom_delta="-20" follows="left|top" font="SansSerifSmall" halign="left"
+                             height="16" left="10" name="Description:" width="364">
                                 Description:
                         </text>
                         <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="0"
-                             follows="left|top|right" font="SansSerifSmall" height="16" left="80"
-                             max_length="255" name="url_description" right="-15"
+                             follows="left|top" font="SansSerifSmall" height="16" left="80"
+                             max_length="255" name="url_description" right="-80"
                              select_all_on_focus_received="true" select_on_focus="true"
-                             text_readonly_color="0.576471 0.662745 0.835294 1"
                              tool_tip="Text displayed next to play/load button" />
                         <text type="string" length="1" bottom_delta="-20" follows="left|top" font="SansSerifSmall" halign="left"
                              height="16" left="10" name="Media texture:" width="364">
@@ -753,11 +748,10 @@ Options:
                                 Music URL:
                         </text>
                         <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="0"
-                             enabled="true" follows="left|top|right" font="SansSerifSmall"
+                             enabled="true" follows="left|top" font="SansSerifSmall"
                              handle_edit_keys_directly="false" height="16" left="80" max_length="255"
                              mouse_opaque="true" name="music_url" right="-15"
-                             select_all_on_focus_received="true" select_on_focus="true"
-                             text_readonly_color="0.576471 0.662745 0.835294 1" />
+                             select_all_on_focus_received="true" select_on_focus="true"/>
                         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom_delta="-40" drop_shadow_visible="true" enabled="true"
                              follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
@@ -778,7 +772,7 @@ Options:
                         </text>
                         <radio_group bottom_delta="-40" draw_border="true" enabled="true" follows="left|top"
                              height="54" left="80" mouse_opaque="true" name="parcel_voice_channel"
-                             tab_stop="true" width="363">
+                             tab_stop="true" width="219">
                                 <radio_item type="string" length="1" bottom="-19" enabled="true" follows="left|top" height="16" left="3"
                                      mouse_opaque="true" name="Estate" width="463">
                                         Use the Estate spatial channel
@@ -793,7 +787,7 @@ Options:
                                 </radio_item>
                         </radio_group>
                 </panel>
-                <panel border="false" bottom="-349" enabled="true" follows="left|top|right|bottom"
+                <panel border="true" bottom="-349" enabled="true" follows="left|top|right|bottom"
                      height="333" label="Access" left="1" mouse_opaque="true"
                      name="land_access_panel" width="458">
                         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
@@ -857,35 +851,36 @@ Options:
                              mouse_opaque="true" name="AllowedText" radio_style="false" width="195">
                                 Allowed Residents
                         </text>
-                        <name_list allow_calling_card_drop="false" background_visible="true" bottom="-320"
+                        <name_list allow_calling_card_drop="false" background_visible="true" bottom="-304"
                              column_padding="0" draw_border="true" draw_heading="false" enabled="true"
-                             follows="left|top|bottom" heading_font="SansSerifSmall" heading_height="14"
-                             height="100" left="20" mouse_opaque="true" multi_select="true"
+                             follows="top|bottom" heading_font="SansSerifSmall" heading_height="14"
+                             height="80" left="20" mouse_opaque="true" multi_select="true"
                              name="AccessList" tool_tip="([LISTED] listed, [MAX] max)" width="195" />
-                        <button bottom_delta="-20" enabled="true" follows="left|bottom" font="SansSerifSmall"
+                        <button bottom_delta="-20" enabled="true" follows="bottom" font="SansSerifSmall"
                              halign="center" height="16" label="Add..." label_selected="Add..."
                              left_delta="5" mouse_opaque="true" name="add_allowed" scale_image="true"
                              width="80" />
-                        <button bottom_delta="0" enabled="true" follows="left|bottom" font="SansSerifSmall"
+                        <button bottom_delta="0" enabled="true" follows="bottom" font="SansSerifSmall"
                              halign="center" height="16" label="Remove" label_selected="Remove"
                              left_delta="100" mouse_opaque="true" name="remove_allowed"
                              scale_image="true" width="80" />
                         <text bottom="-220" enabled="true" follows="left|right|top" font="SansSerifSmall"
-                             height="16" initial_value="false" label="Ban" left="240"
-                             mouse_opaque="true" name="BannedText" radio_style="false" width="195">
-                                Banned Residents
+                             height="16" initial_value="false"
+                             label="Ban" left="240" mouse_opaque="true"
+                             name="BanCheck" radio_style="false" width="195">
+                          Banned Residents
                         </text>
-                        <name_list allow_calling_card_drop="false" background_visible="true" bottom="-320"
+                        <name_list allow_calling_card_drop="false" background_visible="true" bottom="-304"
                              column_padding="0" draw_border="true" draw_heading="false" enabled="true"
-                             follows="left|right|top|bottom" heading_font="SansSerifSmall"
-                             heading_height="14" height="100" left_delta="0" mouse_opaque="true"
+                             follows="top|bottom" heading_font="SansSerifSmall"
+                             heading_height="14" height="80" left_delta="0" mouse_opaque="true"
                              multi_select="true" name="BannedList"
                              tool_tip="([LISTED] listed, [MAX] max)" width="195" />
-                        <button bottom_delta="-20" enabled="true" follows="right|bottom" font="SansSerifSmall"
+                        <button bottom_delta="-20" enabled="true" follows="bottom" font="SansSerifSmall"
                              halign="center" height="16" label="Add..." label_selected="Add..."
                              left_delta="5" mouse_opaque="true" name="add_banned" scale_image="true"
                              width="80" />
-                        <button bottom_delta="0" enabled="false" follows="right|bottom" font="SansSerifSmall"
+                        <button bottom_delta="0" enabled="false" follows="bottom" font="SansSerifSmall"
                              halign="center" height="16" label="Remove" label_selected="Remove"
                              left_delta="100" mouse_opaque="true" name="remove_banned"
                              scale_image="true" width="80" />
diff --git a/linden/indra/newview/skins/xui/en-us/floater_avatar_textures.xml b/linden/indra/newview/skins/xui/en-us/floater_avatar_textures.xml
index 8ad36af..a404dc2 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_avatar_textures.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_avatar_textures.xml
@@ -2,10 +2,10 @@
 <floater can_close="true" can_drag_on_left="false" can_minimize="true"
      can_resize="false" height="800" name="avatar_texture_debug"
      title="Avatar Textures" width="960">
-        <text bottom="-40" height="16" left="10" name="" width="80">
+        <text bottom="-40" height="16" left="10" name="baked_label" width="80">
                 Baked Textures
         </text>
-        <text bottom="-40" height="16" left="150" name="" width="120">
+        <text bottom="-40" height="16" left="150" name="composite_label" width="120">
                 Composite Textures
         </text>
         <texture_picker bottom_delta="-150" height="143" label="Head" left="10" name="baked_head"
diff --git a/linden/indra/newview/skins/xui/en-us/floater_buy_contents.xml b/linden/indra/newview/skins/xui/en-us/floater_buy_contents.xml
index 929df7d..a9acccb 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_buy_contents.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_buy_contents.xml
@@ -8,9 +8,8 @@
              mouse_opaque="true" name="contains_text" v_pad="0" width="281">
                 [NAME] contains:
         </text>
-        <scroll_list background_visible="false" bottom_delta="-152" column_padding="5"
-             draw_border="true" fg_disable_color="1, 1, 1, 1"
-             fg_selected_color="1, 1, 1, 1" fg_unselected_color="1, 1, 1, 1"
+        <scroll_list background_visible="true" bottom_delta="-152" column_padding="5"
+             draw_border="true" 
              follows="left|top|right|bottom" height="148" left="15" mouse_opaque="true"
              multi_select="false" name="item_list" width="281">
                 <column name="icon" width="16" />
diff --git a/linden/indra/newview/skins/xui/en-us/floater_buy_currency.xml b/linden/indra/newview/skins/xui/en-us/floater_buy_currency.xml
index e2e7fc7..f592d44 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_buy_currency.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_buy_currency.xml
@@ -3,41 +3,41 @@
      can_resize="false" height="270" min_height="270" min_width="350"
      name="buy currency" title="Buy Currency" width="350">
         <text bottom_delta="-48" follows="top|left" font="SansSerifHuge" height="24"
-             left="16" name="info_buying" right="-20" text_color="white">
+             left="16" name="info_buying" right="-20" >
                 Buying Currency:
         </text>
         <text bottom_delta="0" follows="top|left" font="SansSerifHuge" height="24" left="16"
-             name="info_cannot_buy" right="-20" text_color="white">
+             name="info_cannot_buy" right="-20" >
                 Cannot buy now:
         </text>
         <text bottom_delta="0" follows="top|left" font="SansSerifHuge" height="24" left="16"
-             name="info_need_more" right="-20" text_color="white">
+             name="info_need_more" right="-20" >
                 You need more currency:
         </text>
-        <icon bottom="-112" follows="top|left" height="64" image_name="badge_note.tga"
+        <icon bottom="-112" follows="top|left" height="64" image_name="badge_note.j2c"
              left="0" name="step_error" width="64" />
         <text bottom_delta="-96" follows="top|left" height="140" left="72"
-             name="error_message" right="-20" text_color="white">
+             name="error_message" right="-20" >
                 Something ain&apos;t right.
         </text>
         <button bottom_delta="-4" follows="bottom|left" height="20" label="Go to website"
              left="72" name="error_web" width="120" />
-        <icon bottom="-112" follows="top|left" height="64" image_name="badge_note.tga"
+        <icon bottom="-112" follows="top|left" height="64" image_name="badge_note.j2c"
              left="0" name="step_1" width="64" />
         <text bottom_delta="38" follows="top|left" height="16" left="72" name="contacting"
-             right="-20" text_color="white">
+             right="-20" >
                 Contacting LindeX...
         </text>
         <text bottom_delta="0" follows="top|left" height="16" left="72"
-             name="buy_action_unknown" right="-20" text_color="white">
+             name="buy_action_unknown" right="-20" >
                 Buy L$ on the LindeX currency exchange
         </text>
         <text bottom_delta="0" follows="top|left" height="16" left="72" name="buy_action"
-             right="-20" text_color="white">
+             right="-20" >
                 [NAME] L$ [PRICE]
         </text>
         <text bottom_delta="-20" follows="top|left" height="16" left="72"
-             name="currency_action" text_color="white" width="40">
+             name="currency_action"  width="40">
                 Buy L$
         </text>
         <line_editor bottom_delta="0" follows="top|right" height="16" left_delta="45"
@@ -45,11 +45,11 @@
                 1234
         </line_editor>
         <text bottom_delta="0" follows="top|right" height="16" left_delta="85"
-             name="currency_est" text_color="white" width="180">
+             name="currency_est"  width="180">
                 for approx. US$ [USD]
         </text>
         <text bottom_delta="0" follows="top|right" height="16" left_delta="5"
-             name="getting_data" text_color="white" width="180">
+             name="getting_data" width="180">
                 Getting data...
         </text>
         <text bottom_delta="-32" follows="top|left" height="16" left="80"
@@ -77,12 +77,12 @@
                 L$ [AMT]
         </text>
         <text bottom_delta="-48" follows="top|left" height="32" left="72"
-             name="purchase_warning_repurchase" right="-20" text_color="white">
+             name="purchase_warning_repurchase" right="-20" >
                 Confirming this purchase only buys the currency.
 You&apos;ll need to try the operation again.
         </text>
         <text bottom_delta="0" follows="top|left" height="32" left="72"
-             name="purchase_warning_notenough" right="-20" text_color="white">
+             name="purchase_warning_notenough" right="-20" >
                 You aren&apos;t buying enough currency
 Increase the amount to buy.
         </text>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_buy_land.xml b/linden/indra/newview/skins/xui/en-us/floater_buy_land.xml
index cadcf31..fe76e10 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_buy_land.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_buy_land.xml
@@ -2,62 +2,62 @@
 <floater can_close="true" can_drag_on_left="false" can_minimize="false"
      can_resize="false" height="484" min_height="484" min_width="440"
      name="buy land" title="Buy Land" width="740">
-        <text bg_readonly_color="clear" bottom_delta="-35" follows="left|top"
+        <text bottom_delta="-35" follows="left|top"
              font="SansSerifSmall" height="14" left="440" name="region_name_label"
-             right="725" text_readonly_color="white" width="60" word_wrap="true">
+             right="725" width="60" word_wrap="true">
                 Region:
         </text>
-        <text bg_readonly_color="clear" bottom_delta="0" follows="left|top"
+        <text bottom_delta="0" follows="left|top"
              font="SansSerifSmall" height="14" left="550" name="region_name_text"
-             text_readonly_color="white" width="130">
+             width="130">
                 (unknown)
         </text>
-        <text bg_readonly_color="clear" follows="left|top" font="SansSerifSmall" height="14"
-             left="440" name="estate_name_label" right="725" text_readonly_color="white"
+        <text follows="left|top" font="SansSerifSmall" height="14"
+             left="440" name="estate_name_label" right="725" 
              width="60" word_wrap="true">
                 Estate:
         </text>
-        <text bg_readonly_color="clear" bottom_delta="0" follows="left|top"
+        <text bottom_delta="0" follows="left|top"
              font="SansSerifSmall" height="14" left="550" name="estate_name_text"
-             text_readonly_color="white" width="130">
+             width="130">
                 (unknown)
         </text>
-        <text bg_readonly_color="clear" follows="left|top" font="SansSerifSmall" height="20"
+        <text follows="left|top" font="SansSerifSmall" height="20"
              left="440" name="estate_owner_label" right="550"
-             text_readonly_color="white" width="100" word_wrap="true">
+             width="100" word_wrap="true">
                 Estate Owner:
         </text>
-        <text bg_readonly_color="clear" bottom_delta="0" follows="left|top"
+        <text bottom_delta="0" follows="left|top"
              font="SansSerifSmall" height="20" left="550" name="estate_owner_text"
-             text_readonly_color="white" width="130">
+             width="130">
                 (unknown)
         </text>
-        <text bg_readonly_color="clear" follows="left|top" font="SansSerif" height="16"
+        <text follows="left|top" font="SansSerif" height="16"
              left="440" name="resellable_changeable_label" right="725"
-             text_readonly_color="white" width="260" word_wrap="true">
+             width="260" word_wrap="true">
                 Purchased land in this region:
         </text>
-        <text bg_readonly_color="clear" follows="left|top" font="SansSerifSmall" height="16"
-             left="470" name="resellable_clause" right="725" text_readonly_color="white"
+        <text follows="left|top" font="SansSerifSmall" height="16"
+             left="470" name="resellable_clause" right="725" 
              width="260" word_wrap="true">
                 Purchased land in this region may or may not be resold.
         </text>
-        <text bg_readonly_color="clear" follows="left|top" font="SansSerifSmall" height="16"
-             left="470" name="changeable_clause" right="725" text_readonly_color="white"
+        <text follows="left|top" font="SansSerifSmall" height="16"
+             left="470" name="changeable_clause" right="725" 
              width="260" word_wrap="true">
                 may or may not be joined or subdivided.
         </text>
         <text follows="" height="16" left="440" name="covenant_text" right="725"
-             text_color="white" width="260">
+             width="260">
                 You must agree to the Estate Covenant:
         </text>
-        <text bg_readonly_color="clear" bottom_delta="-12" follows="left|top"
+        <text bottom_delta="-12" follows="left|top"
              font="SansSerifSmall" height="12" left="515" name="covenant_timestamp_text"
-             right="725" text_readonly_color="white" width="260" word_wrap="true" />
-        <text_editor bg_readonly_color="clear" bottom_delta="-260" enabled="false"
+             right="725" width="260" word_wrap="true" />
+        <text_editor bottom_delta="-260" enabled="false"
              follows="top|right" font="SansSerifSmall" height="255" left="440"
              max_length="65535" name="covenant_editor" right="725"
-             text_readonly_color="white" width="275" word_wrap="true">
+             width="275" word_wrap="true">
                 Loading...
         </text_editor>
         <check_box follows="left|top" height="20" label="I Agree to the Covenant Defined Above."
@@ -65,47 +65,47 @@
         <texture_picker bottom_delta="290" enabled="false" follows="top|left" height="135" left="16"
              name="info_image" width="180" />
         <text bottom_delta="119" follows="top|left" font="SansSerifSmall" left="204"
-             name="info_parcel_label" text_color="white" width="48">
+             name="info_parcel_label" width="48">
                 Parcel:
         </text>
-        <text bottom_delta="-5" follows="top|left" font="SansSerif" height="16"
-             left_delta="50" name="info_parcel" right="400" text_color="white">
+        <text bottom_delta="-5" follows="top|left" font="SansSerif" height="16" left_delta="50"
+             name="info_parcel" right="400" >
                 Scotopteryx 138,204
         </text>
         <text follows="top|left" font="SansSerifSmall" left="204" name="info_size_label"
-             text_color="white" width="48">
+             width="48">
                 Size:
         </text>
-        <text bottom_delta="-21" follows="top|left" font="SansSerif" height="32"
-             left_delta="50" name="info_size" right="400" text_color="white">
+        <text bottom_delta="-21" follows="top|left" font="SansSerif" height="32" left_delta="50"
+             name="info_size" right="400" >
                 1024 sq. m.
         </text>
         <text follows="top|left" font="SansSerifSmall" left="204" name="info_price_label"
-             text_color="white" width="48">
+             width="48">
                 Price:
         </text>
-        <text bottom_delta="-5" follows="top|left" font="SansSerif" height="16"
-             left_delta="50" name="info_price" right="400" text_color="white">
+        <text bottom_delta="-5" follows="top|left" font="SansSerif" height="16" left_delta="50"
+             name="info_price" right="400" >
                 L$ 1500, objects included
         </text>
         <text bottom="-180" follows="top|left" font="SansSerifHuge" height="24" left="16"
-             name="info_action" text_color="white" width="200">
+             name="info_action" width="200">
                 Buying this land will:
         </text>
         <pad height="10" />
-        <icon follows="top|left" height="64" image_name="badge_note.tga" left="0"
+        <icon follows="top|left" height="64" image_name="badge_note.j2c" left="0"
              name="step_error" width="64" />
         <text bottom_delta="-110" follows="top|left" height="160" left="72"
-             name="error_message" right="400" text_color="white" width="180">
+             name="error_message" right="400" width="180">
                 Something ain&apos;t right.
         </text>
         <button bottom_delta="-4" follows="bottom|left" height="20" label="Go to website"
              left="72" name="error_web" width="120" />
         <pad height="-200" />
-        <icon follows="top|left" height="64" image_name="badge_ok.tga" left="0" name="step_1"
+        <icon follows="top|left" height="64" image_name="badge_ok.j2c" left="0" name="step_1"
              width="64" />
         <text bottom_delta="38" follows="top|left" height="16" left="72"
-             name="account_action" right="400" text_color="white" width="180">
+             name="account_action" right="400" width="180" font="SansSerifBig" >
                 Upgrade you to premium membership.
         </text>
         <text follows="top|left" height="16" left="72" name="account_reason" right="400"
@@ -124,29 +124,29 @@
                 </combo_item>
         </combo_box>
         <pad height="10" />
-        <icon follows="top|left" height="64" image_name="badge_note.tga" left="0"
+        <icon follows="top|left" height="64" image_name="badge_note.j2c" left="0"
              name="step_2" width="64" />
         <text bottom_delta="38" follows="top|left" height="16" left="72"
-             name="land_use_action" right="400" text_color="white" width="180">
+             name="land_use_action" right="400" width="180" font="SansSerifBig" >
                 Increase your monthly land use fees to US$ 40/month.
         </text>
         <text follows="top|left" height="32" left="72" name="land_use_reason" right="400"
              width="180">
-                You hold 1,309 square meters of land.
+                You hold 1,309 square meters of land. 
 This parcel is 512 square meters of land.
         </text>
         <pad height="10" />
-        <icon follows="top|left" height="64" image_name="badge_note.tga" left="0"
+        <icon follows="top|left" height="64" image_name="badge_note.j2c" left="0"
              name="step_3" width="64" />
         <text bottom_delta="38" follows="top|left" height="16" left="72"
-             name="purchase_action" right="400" text_color="white">
+             name="purchase_action" right="400" font="SansSerifBig" >
                 Pay Joe Resident L$4000 for the land
         </text>
         <text follows="top|left" height="16" left="72" name="currency_reason" right="400">
                 You have L$2,100.
         </text>
         <text bottom_delta="-25" follows="top|left" height="16" left="74"
-             name="currency_action" text_color="white" width="90">
+             name="currency_action" width="90">
                 Buy additional L$
         </text>
         <pad height="0" width="8" />
@@ -156,7 +156,7 @@ This parcel is 512 square meters of land.
         </line_editor>
         <pad height="0" width="8" />
         <text bottom_delta="3" follows="top|right" height="16" left="260" name="currency_est"
-             text_color="white" width="180">
+             width="180">
                 for approx. US$ [AMOUNT2]
         </text>
         <text follows="top|left" height="16" left="72" name="currency_balance" right="400">
@@ -188,7 +188,7 @@ This parcel is 512 square meters of land.
                 No land selected.
         </string>
         <string name="multiple_parcels_selected">
-                Multiple different parcels selected.
+                Multiple different parcels selected. 
 Try selecting a smaller area.
         </string>
         <string name="no_permission">
@@ -210,15 +210,15 @@ Try selecting a smaller area.
                 The selected area has no public land.
         </string>
         <string name="not_owned_by_you">
-                Land owned by another user is selected.
+                Land owned by another user is selected. 
 Try selecting a smaller area.
         </string>
         <string name="for_first_time_group">
-                This land is reserved for first time buyers.
+                This land is reserved for first time buyers. 
 You cannot buy it for a group.
         </string>
         <string name="for_first_time">
-                This land is reserved for first time buyers.
+                This land is reserved for first time buyers. 
 You already own land.
         </string>
         <string name="processing">
diff --git a/linden/indra/newview/skins/xui/en-us/floater_buy_object.xml b/linden/indra/newview/skins/xui/en-us/floater_buy_object.xml
index 1c0f9fb..3d30171 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_buy_object.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_buy_object.xml
@@ -2,9 +2,8 @@
 <floater can_close="true" can_drag_on_left="false" can_minimize="true" can_resize="true"
      height="250" min_height="175" min_width="154" name="contents"
      rect_control="FloaterBuyRect" title="Buy Copy of Object" width="300">
-        <scroll_list background_visible="false" bottom="-60" column_padding="5" draw_border="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" height="36"
+        <scroll_list background_visible="true" bottom="-60" column_padding="5" draw_border="true"
+             follows="left|top|right" height="36"
              left="15" mouse_opaque="true" multi_select="false" name="object_list"
              width="281">
                 <column name="icon" width="16" />
@@ -16,9 +15,8 @@
              mouse_opaque="true" name="contents_text" v_pad="0" width="281">
                 and its contents:
         </text>
-        <scroll_list background_visible="false" bottom_delta="-112" column_padding="5"
-             draw_border="true" fg_disable_color="1, 1, 1, 1"
-             fg_selected_color="1, 1, 1, 1" fg_unselected_color="1, 1, 1, 1"
+        <scroll_list background_visible="true" bottom_delta="-112" column_padding="5"
+             draw_border="true" 
              follows="left|top|right|bottom" height="108" left="15" mouse_opaque="true"
              multi_select="false" name="item_list" width="281">
                 <column name="icon" width="16" />
diff --git a/linden/indra/newview/skins/xui/en-us/floater_camera.xml b/linden/indra/newview/skins/xui/en-us/floater_camera.xml
new file mode 100644
index 0000000..44e12ef
--- /dev/null
+++ b/linden/indra/newview/skins/xui/en-us/floater_camera.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater can_close="true"
+        can_drag_on_left="false"
+        can_minimize="false"
+    can_resize="false"
+        can_tear_off="true" 
+        follows="top"
+        min_height="100"
+        min_width="100"
+    mouse_opaque="true"
+        name="move floater"
+        rect_control="FloaterCameraRect3"
+    title=""
+        >
+        <!-- Icons are custom buttons in the code -->
+        <string name="rotate_tooltip">Rotate Camera Around Focus</string>
+        <string name="zoom_tooltip">Zoom Camera Towards Focus</string>
+        <string name="move_tooltip">Move Camera Up and Down, Left and Right</string>
+</floater>
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 a887c54..91f3bdb 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
@@ -18,11 +18,17 @@
         <string name="voice_icon">
                 icn_voice-localchat.tga
         </string>
+        <string name="IM_logging_string">
+                -- Instant message logging enabled --
+        </string>
+        <string name="IM_end_log_string">
+                -- End of Log --
+        </string>
         <layout_stack border="false" bottom="2" follows="left|top|right|bottom" height="250" left="2"
-             orientation="horizontal" width="430">
+             orientation="horizontal" width="430" name="panels">
                 <layout_panel border="false" bottom="0" default_tab_group="1" height="130" left="0"
                      min_width="275" name="im_contents_panel" width="305">
-                        <combo_box follows="left|top" height="20" label="Gestures" left="4" name="Gesture"
+                        <combo_box follows="left|top" height="20" label="Gestures" left="5" name="Gesture"
                              width="120">
                                 <combo_item name="Gestures">
                                         Gestures
@@ -32,29 +38,31 @@
                              height="20" initial_value="false" label="Show Muted Text" left_delta="125"
                              name="show mutes" radio_style="false" width="116" />
                         <button bottom_delta="0" follows="right|top" height="20" label="&lt; &lt;"
-                             label_selected="&gt; &gt;" left="270" name="toggle_active_speakers_btn"
-                             right="303"
+                             label_selected="&gt; &gt;" left="272" name="toggle_active_speakers_btn"
+                             right="305"
                              tool_tip="Click here to show list of active participants in this IM session."
-                             visible="true" width="70" />
-                        <text_editor type="string" length="1" bottom="28" embedded_items="false" enabled="false"
-                             follows="left|top|right|bottom" font="SansSerif" height="70" left="6"
+                             width="70" />
+                        <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="74" left="5"
                              max_length="2147483647" mouse_opaque="true" name="Chat History Editor"
-                             text_color="1 1 1 1" text_readonly_color="1 1 1 1" width="300"
-                             word_wrap="true" />
-                        <text_editor type="string" length="1" bottom="28" embedded_items="false" enabled="false"
-                             follows="left|top|right|bottom" font="SansSerif" height="70" left="6"
+                             text_color="ChatHistoryTextColor"
+                             text_readonly_color="ChatHistoryTextColor" width="299" word_wrap="true" />
+                        <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="74" left="5"
                              max_length="2147483647" mouse_opaque="true"
-                             name="Chat History Editor with mute" text_color="1 1 1 1"
-                             text_readonly_color="1 1 1 1" width="300" word_wrap="true" />
-                        <panel bottom="3" follows="left|right|bottom" left="5" name="chat_panel" right="-5"
+                             name="Chat History Editor with mute" text_color="ChatHistoryTextColor"
+                             text_readonly_color="ChatHistoryTextColor" width="300" word_wrap="true" />
+                        <panel bottom="5" follows="left|right|bottom" left="5" name="chat_panel" right="-5"
                              tab_group="1" top="25">
                                 <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" label="Click here to chat."
                                      left="0" max_length="254" mouse_opaque="true" name="Chat Editor"
-                                     right="-90" select_all_on_focus_received="false" select_on_focus="false"
+                                     right="-70" select_all_on_focus_received="false" select_on_focus="false"
                                      tab_group="1" />
-                                <flyout_button bottom="0" follows="right|bottom" height="20" label="Say" left="-80"
+                                <flyout_button bottom="0" follows="right|bottom" height="20" label="Say" left="-65"
                                      list_position="above" mouse_opaque="true" name="Say" tool_tip="(Enter)"
                                      width="70">
                                         <flyout_button_item value="shout">
diff --git a/linden/indra/newview/skins/xui/en-us/floater_chatterbox.xml b/linden/indra/newview/skins/xui/en-us/floater_chatterbox.xml
index b836893..83059f2 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_chatterbox.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_chatterbox.xml
@@ -1,7 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>

 <multi_floater can_close="true" can_drag_on_left="false" can_minimize="true" can_resize="true"

-     height="390" min_height="340" min_width="400" name="floater_chatterbox"

+     height="390" name="floater_chatterbox"

      rect_control="ChatterboxRect" title="Communicate" width="392">

-        <tab_container bottom="2" follows="left|right|top|bottom" height="370" left="0"

+<icon enabled="false" image_name="tabarea.tga"

+             bg_alpha_color="blue" color="DefaultShadowLight" border="false"

+             bottom="-389" follows="left|right|bottom" height="17" left="1" scale_image="true"

+             mouse_opaque="false" name="chatterbox_tab_container" width="391"></icon>

+    <tab_container bottom="2" follows="left|right|top|bottom" height="370" left="0"

              name="chatterbox_tabs" tab_position="bottom" tab_width="80" width="395" />

 </multi_floater>

+

diff --git a/linden/indra/newview/skins/xui/en-us/floater_critical.xml b/linden/indra/newview/skins/xui/en-us/floater_critical.xml
index 58c8c16..126a8ac 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_critical.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_critical.xml
@@ -8,22 +8,13 @@
         <button bottom="-484" font="SansSerif" halign="center" height="20" label="Cancel"
              label_selected="Cancel" left_delta="108" mouse_opaque="true" name="Cancel"
              width="100" />
-        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-31" drop_shadow_visible="true" follows="left|top" font="SansSerif"
-             h_pad="0" halign="left" height="15" left="16" mouse_opaque="true"
-             name="tos_title" v_pad="0" width="568">
-                Critical Message
-        </text>
-        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-77" drop_shadow_visible="true" follows="left|top" font="SansSerif"
-             h_pad="0" halign="left" height="30" left="32" mouse_opaque="true"
-             name="tos_heading" v_pad="0" width="552">
+  <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" bottom="-31" drop_shadow_visible="true" follows="left|top" font="SansSerif" h_pad="0" halign="left" height="15" left="16" mouse_opaque="true" name="tos_title" v_pad="0" width="568">
+    Critical Message
+  </text>
+        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" bottom="-77" drop_shadow_visible="true" follows="left|top" font="SansSerif" h_pad="0" halign="left" height="30" left="32" mouse_opaque="true" name="tos_heading" v_pad="0" width="552">
                 Please read the following message carefully.
         </text>
-        <text_editor bottom="-376" embedded_items="false" follows="left|top" font="SansSerif"
-             height="283" left="16" max_length="65536" mouse_opaque="true"
-             name="tos_text" text_readonly_color="1, 1, 1, 1" width="568"
-             word_wrap="true">
+        <text_editor bottom="-376" embedded_items="false" follows="left|top" font="SansSerif" height="283" left="16" max_length="65536" mouse_opaque="true" text_readonly_color="255,255,255,255" bg_readonly_color="0, 30, 80, 200" name="tos_text" width="568" word_wrap="true">
                 TOS_TEXT
         </text_editor>
-</floater>
+</floater>
\ No newline at end of file
diff --git a/linden/indra/newview/skins/xui/en-us/floater_customize.xml b/linden/indra/newview/skins/xui/en-us/floater_customize.xml
index 1123355..e7a7a7b 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_customize.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_customize.xml
@@ -7,7 +7,7 @@
         <tab_container bottom="-507" height="483" left="0" mouse_opaque="false"
              name="customize tab container" tab_min_width="96" tab_position="left"
              width="492">
-                <panel label="Body Parts" placeholder="true" />
+                <panel label="Body Parts" placeholder="true" name="body_parts_placeholder" />
                 <panel border="true" bottom="-482" follows="left|top|right|bottom" height="481"
                      label="Shape" left="102" mouse_opaque="true" name="Shape" width="389">
                         <icon bottom="-21" color="1 1 1 1" follows="top|right" height="16"
@@ -370,7 +370,7 @@ scratch and wear it.
                              height="20" label="Revert" label_selected="Revert" left="299"
                              mouse_opaque="true" name="Revert" scale_image="true" width="82" />
                 </panel>
-                <panel label="Clothes" placeholder="true" />
+                <panel label="Clothes" placeholder="true" name="clothes_placeholder" />
                 <panel border="true" bottom="-482" follows="left|top|right|bottom" height="481"
                      label="Shirt" left="102" mouse_opaque="true" name="Shirt" width="389">
                         <icon bottom="-21" color="1 1 1 1" follows="top|right" height="16"
diff --git a/linden/indra/newview/skins/xui/en-us/floater_day_cycle_options.xml b/linden/indra/newview/skins/xui/en-us/floater_day_cycle_options.xml
index c1a4261..84812b9 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_day_cycle_options.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_day_cycle_options.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater bottom="-150" can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="false" height="275" hidden="false" left="50" min_height="180"
+     can_resize="false" height="275" left="50" min_height="180"
      min_width="400" mouse_opaque="true" name="Day Cycle Floater"
      rect_control="FloaterDayCycleRect" title="Day Cycle Editor" width="646">
-        <tab_container bottom="-275" follows="left|top" height="255" hidden="false" left="0"
+        <tab_container bottom="-275" follows="left|top" height="255" left="0"
              mouse_opaque="false" name="Day Cycle Tabs" tab_position="top" width="644">
                 <panel border="true" bottom="-255" follows="left|top|right|bottom" height="255"
-                     hidden="false" label="Day Cycle" left="1" mouse_opaque="false"
+                     label="Day Cycle" left="1" mouse_opaque="false"
                      name="Day Cycle" width="642">
                         <button bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="15"
                              label="?" left="612" name="WLDayCycleHelp" width="18" />
@@ -24,146 +24,146 @@
                         <text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true"
                              bottom="-80" control_name="WL12am" drop_shadow_visible="true"
                              follows="left|top|right" font="SansSerifSmall" h_pad="0" halign="left"
-                             height="6" hidden="false" left="8" mouse_opaque="true" name="WL12am"
+                             height="6" left="8" mouse_opaque="true" name="WL12am"
                              v_pad="0" width="55">
                                 12am
                         </text>
                         <text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true"
                              bottom_delta="0" control_name="WL3am" drop_shadow_visible="true"
                              follows="left|top|right" font="SansSerifSmall" h_pad="0" halign="left"
-                             height="6" hidden="false" left_delta="65" mouse_opaque="true" name="WL3am"
+                             height="6" left_delta="65" mouse_opaque="true" name="WL3am"
                              v_pad="0" width="55">
                                 3am
                         </text>
                         <text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true"
                              bottom_delta="0" control_name="WL6am" drop_shadow_visible="true"
                              follows="left|top|right" font="SansSerifSmall" h_pad="0" halign="left"
-                             height="6" hidden="false" left_delta="65" mouse_opaque="true" name="WL6am"
+                             height="6" left_delta="65" mouse_opaque="true" name="WL6am"
                              v_pad="0" width="55">
                                 6am
                         </text>
                         <text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true"
                              bottom_delta="0" control_name="WL9am" drop_shadow_visible="true"
                              follows="left|top|right" font="SansSerifSmall" h_pad="0" halign="left"
-                             height="6" hidden="false" left_delta="65" mouse_opaque="true"
+                             height="6" left_delta="65" mouse_opaque="true"
                              name="WL9amHash" v_pad="0" width="55">
                                 9am
                         </text>
                         <text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true"
                              bottom_delta="0" control_name="WL12pm" drop_shadow_visible="true"
                              follows="left|top|right" font="SansSerifSmall" h_pad="0" halign="left"
-                             height="6" hidden="false" left_delta="65" mouse_opaque="true"
+                             height="6" left_delta="65" mouse_opaque="true"
                              name="WL12pmHash" v_pad="0" width="55">
                                 12pm
                         </text>
                         <text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true"
                              bottom_delta="0" control_name="WL3pm" drop_shadow_visible="true"
                              follows="left|top|right" font="SansSerifSmall" h_pad="0" halign="left"
-                             height="6" hidden="false" left_delta="65" mouse_opaque="true" name="WL3pm"
+                             height="6" left_delta="65" mouse_opaque="true" name="WL3pm"
                              v_pad="0" width="55">
                                 3pm
                         </text>
                         <text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true"
                              bottom_delta="0" control_name="WL6pm" drop_shadow_visible="true"
                              follows="left|top|right" font="SansSerifSmall" h_pad="0" halign="left"
-                             height="6" hidden="false" left_delta="65" mouse_opaque="true" name="WL6pm"
+                             height="6" left_delta="65" mouse_opaque="true" name="WL6pm"
                              v_pad="0" width="55">
                                 6pm
                         </text>
                         <text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true"
                              bottom_delta="0" control_name="WL9pm" drop_shadow_visible="true"
                              follows="left|top|right" font="SansSerifSmall" h_pad="0" halign="left"
-                             height="6" hidden="false" left_delta="65" mouse_opaque="true" name="WL9pm"
+                             height="6" left_delta="65" mouse_opaque="true" name="WL9pm"
                              v_pad="0" width="55">
                                 9pm
                         </text>
                         <text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true"
                              bottom_delta="0" control_name="WL12am2" drop_shadow_visible="true"
                              follows="left|top|right" font="SansSerifSmall" h_pad="0" halign="left"
-                             height="6" hidden="false" left_delta="65" mouse_opaque="true"
+                             height="6" left_delta="65" mouse_opaque="true"
                              name="WL12am2" v_pad="0" width="55">
                                 12am
                         </text>
                         <text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true"
                              bottom="-68" control_name="WL12amHash" drop_shadow_visible="true"
                              follows="left|top|right" font="SansSerif" h_pad="0" halign="left"
-                             height="14" hidden="false" left="20" mouse_opaque="true" name="WL12amHash"
+                             height="14" left="20" mouse_opaque="true" name="WL12amHash"
                              v_pad="0" width="4">
                                 |
                         </text>
                         <text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true"
                              bottom_delta="0" control_name="WL3amHash" drop_shadow_visible="true"
                              follows="left|top|right" font="SansSerif" h_pad="0" halign="left"
-                             height="11" hidden="false" left_delta="65" mouse_opaque="true"
+                             height="11" left_delta="65" mouse_opaque="true"
                              name="WL3amHash" v_pad="0" width="4">
                                 I
                         </text>
                         <text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true"
                              bottom_delta="0" control_name="WL6amHash" drop_shadow_visible="true"
                              follows="left|top|right" font="SansSerif" h_pad="0" halign="left"
-                             height="14" hidden="false" left_delta="65" mouse_opaque="true"
+                             height="14" left_delta="65" mouse_opaque="true"
                              name="WL6amHash" v_pad="0" width="4">
                                 |
                         </text>
                         <text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true"
                              bottom_delta="0" control_name="WL9amHash" drop_shadow_visible="true"
                              follows="left|top|right" font="SansSerif" h_pad="0" halign="left"
-                             height="11" hidden="false" left_delta="65" mouse_opaque="true"
+                             height="11" left_delta="65" mouse_opaque="true"
                              name="WL9amHash2" v_pad="0" width="4">
                                 I
                         </text>
                         <text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true"
                              bottom_delta="0" control_name="WL12pmHash" drop_shadow_visible="true"
                              follows="left|top|right" font="SansSerif" h_pad="0" halign="left"
-                             height="14" hidden="false" left_delta="65" mouse_opaque="true"
+                             height="14" left_delta="65" mouse_opaque="true"
                              name="WL12pmHash2" v_pad="0" width="4">
                                 |
                         </text>
                         <text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true"
                              bottom_delta="0" control_name="WL3pmHash" drop_shadow_visible="true"
                              follows="left|top|right" font="SansSerif" h_pad="0" halign="left"
-                             height="11" hidden="false" left_delta="65" mouse_opaque="true"
+                             height="11" left_delta="65" mouse_opaque="true"
                              name="WL3pmHash" v_pad="0" width="4">
                                 I
                         </text>
                         <text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true"
                              bottom_delta="0" control_name="WL6pmHash" drop_shadow_visible="true"
                              follows="left|top|right" font="SansSerif" h_pad="0" halign="left"
-                             height="14" hidden="false" left_delta="65" mouse_opaque="true"
+                             height="14" left_delta="65" mouse_opaque="true"
                              name="WL6pmHash" v_pad="0" width="4">
                                 |
                         </text>
                         <text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true"
                              bottom_delta="0" control_name="WL9pmHash" drop_shadow_visible="true"
                              follows="left|top|right" font="SansSerif" h_pad="0" halign="left"
-                             height="11" hidden="false" left_delta="65" mouse_opaque="true"
+                             height="11" left_delta="65" mouse_opaque="true"
                              name="WL9pmHash" v_pad="0" width="4">
                                 I
                         </text>
                         <text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true"
                              bottom_delta="0" control_name="WL12amHash2" drop_shadow_visible="true"
                              follows="left|top|right" font="SansSerif" h_pad="0" halign="left"
-                             height="14" hidden="false" left_delta="65" mouse_opaque="true"
+                             height="14" left_delta="65" mouse_opaque="true"
                              name="WL12amHash2" v_pad="0" width="4">
                                 |
                         </text>
                         <button bottom="-40" enabled="true" font="SansSerif" halign="center" height="20"
-                             hidden="false" label="Add Key" label_selected="Add Key" left="550"
+                             label="Add Key" label_selected="Add Key" left="550"
                              mouse_opaque="true" name="WLAddKey" scale_image="true" width="80" />
                         <button bottom="-65" enabled="true" font="SansSerif" halign="center" height="20"
-                             hidden="false" label="Delete Key" label_selected="Delete Key" left="550"
+                             label="Delete Key" label_selected="Delete Key" left="550"
                              mouse_opaque="true" name="WLDeleteKey" scale_image="true" width="80" />
                         <text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true"
                              bottom="-120" control_name="DayCycleText" drop_shadow_visible="true"
                              follows="left|top|right" font="SansSerif" h_pad="0" halign="left"
-                             height="16" hidden="false" left="20" mouse_opaque="true"
+                             height="16" left="20" mouse_opaque="true"
                              name="WLCurKeyFrameText" v_pad="0" width="150">
                                 Key Frame Settings:
                         </text>
                         <text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true"
                              bottom="-140" control_name="DayCycleText" drop_shadow_visible="true"
                              follows="left|top|right" font="SansSerif" h_pad="0" halign="left"
-                             height="16" hidden="false" left="30" mouse_opaque="true"
+                             height="16" left="30" mouse_opaque="true"
                              name="WLCurKeyTimeText" v_pad="0" width="100">
                                 Key Time:
                         </text>
@@ -179,7 +179,7 @@
                         <text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true"
                              bottom_delta="-25" control_name="WLCurKeyTimeText"
                              drop_shadow_visible="true" follows="left|top|right" font="SansSerif"
-                             h_pad="0" halign="left" height="16" hidden="false" left="30"
+                             h_pad="0" halign="left" height="16" left="30"
                              mouse_opaque="true" name="WLCurKeyTimeText2" v_pad="0" width="120">
                                 Key Preset:
                         </text>
@@ -191,7 +191,7 @@
                         <text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true"
                              bottom="-130" control_name="DayCycleText" drop_shadow_visible="true"
                              follows="left|top|right" font="SansSerif" h_pad="0" halign="left"
-                             height="16" hidden="false" left="220" mouse_opaque="true"
+                             height="16" left="220" mouse_opaque="true"
                              name="DayCycleText" v_pad="0" width="120">
                                 Snap:
                         </text>
@@ -201,7 +201,7 @@
                         <text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true"
                              bottom="-180" control_name="DayCycleText" drop_shadow_visible="true"
                              follows="left|top|right" font="SansSerif" h_pad="0" halign="left"
-                             height="16" hidden="false" left="220" mouse_opaque="true"
+                             height="16" left="220" mouse_opaque="true"
                              name="DayCycleText2" v_pad="0" width="120">
                                 Length of Cycle:
                         </text>
@@ -223,26 +223,26 @@
                         <text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true"
                              bottom="-130" control_name="DayCycleText" drop_shadow_visible="true"
                              follows="left|top|right" font="SansSerif" h_pad="0" halign="left"
-                             height="16" hidden="false" left="310" mouse_opaque="true"
+                             height="16" left="310" mouse_opaque="true"
                              name="DayCycleText3" v_pad="0" width="120">
                                 Preview:
                         </text>
                         <button bottom="-155" enabled="true" font="SansSerif" halign="center" height="20"
-                             hidden="false" label="Play" label_selected="Play" left="310"
+                             label="Play" label_selected="Play" left="310"
                              mouse_opaque="true" name="WLAnimSky" scale_image="true" width="50" />
                         <button bottom="-155" enabled="true" font="SansSerif" halign="center" height="20"
-                             hidden="false" label="Stop!" label_selected="Stop" left_delta="55"
+                             label="Stop!" label_selected="Stop" left_delta="55"
                              mouse_opaque="true" name="WLStopAnimSky" scale_image="true" width="50" />
                         <button bottom="-155" enabled="true" font="SansSerif" halign="center" height="20"
-                             hidden="false" label="Use Estate Time" label_selected="Go to Estate Time"
+                             label="Use Estate Time" label_selected="Go to Estate Time"
                              left_delta="55" mouse_opaque="true" name="WLUseLindenTime"
                              scale_image="true" width="140" />
                         <button bottom="-195" enabled="true" font="SansSerif" halign="center" height="20"
-                             hidden="false" label="Save Test Day" label_selected="Save Test Day"
+                             label="Save Test Day" label_selected="Save Test Day"
                              left="480" mouse_opaque="true" name="WLSaveDayCycle" scale_image="true"
                              width="150" />
                         <button bottom="-220" enabled="true" font="SansSerif" halign="center" height="20"
-                             hidden="false" label="Load Test Day" label_selected="Load Test Day"
+                             label="Load Test Day" label_selected="Load Test Day"
                              left="480" mouse_opaque="true" name="WLLoadDayCycle" scale_image="true"
                              width="150" />
                 </panel>
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 aff0db9..7714d67 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_directory.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_directory.xml
@@ -139,10 +139,7 @@
                         <button bottom="-533" follows="left|bottom" font="SansSerif" halign="center"
                              height="20" label="Delete" label_selected="Delete" left="80"
                              mouse_opaque="true" name="Delete" width="80" />
-                        <scroll_list background_visible="false" bottom="-513" column_padding="0" draw_border="true"
-                             draw_heading="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="464" left="4" mouse_opaque="true"
+                        <scroll_list background_visible="true" bottom="-513" column_padding="0" draw_border="true" draw_heading="true"                       follows="left|top|right|bottom" height="464" left="4" mouse_opaque="true"
                              multi_select="false" name="results" search_column="2" width="339">
                                 <column label="" name="icon" width="24" />
                                 <column label="" name="type" width="-1" />
@@ -180,7 +177,7 @@
                         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom="-36" drop_shadow_visible="true" follows="left|top" font="SansSerif"
                              h_pad="0" halign="center" height="14" left_delta="40" mouse_opaque="true"
-                             name="date_text" text_color="1, 1, 1, 1" v_pad="0" width="48">
+                             name="date_text" v_pad="0" width="48">
                                 6/6
                         </text>
                         <button bottom="-40" follows="left|top" font="SansSerif" halign="center" height="20"
@@ -253,9 +250,7 @@
                         <button bottom="-533" follows="left|bottom" font="SansSerif" halign="center"
                              height="20" label="Delete" label_selected="Delete" left="80"
                              mouse_opaque="true" name="Delete" width="80" />
-                        <scroll_list background_visible="false" bottom="-513" column_padding="0" draw_border="true"
-                             draw_heading="true" fg_disable_color="1, 1, 1, 1"
-                             fg_selected_color="1, 1, 1, 1" fg_unselected_color="1, 1, 1, 1"
+                        <scroll_list background_visible="true" bottom="-513" column_padding="0" draw_border="true" draw_heading="true" 
                              follows="left|top|right|bottom" height="464" left="4" mouse_opaque="true"
                              multi_select="false" name="results" search_column="2" width="339">
                                 <column label="" name="icon" width="24" />
@@ -308,9 +303,7 @@
                                 These are the most popular places in the world, as measured by traffic,
 the amount of time people spend there.
                         </text>
-                        <scroll_list background_visible="false" bottom="-513" column_padding="0" draw_border="true"
-                             draw_heading="true" fg_disable_color="1, 1, 1, 1"
-                             fg_selected_color="1, 1, 1, 1" fg_unselected_color="1, 1, 1, 1"
+                        <scroll_list background_visible="true" bottom="-513" column_padding="0" draw_border="true" draw_heading="true" 
                              follows="left|top|right|bottom" height="464" left="4" mouse_opaque="true"
                              multi_select="false" name="results" search_column="2" width="339">
                                 <column label="" name="icon" width="24" />
@@ -389,9 +382,7 @@ the amount of time people spend there.
                                 Land can be bought direct for Linden Dollars (L$) or at auction for either L$ or US$.
 To buy direct, visit the land and click on the place name in the title bar.
                         </text>
-                        <scroll_list background_visible="false" bottom="-513" column_padding="0" draw_border="true"
-                             draw_heading="true" fg_disable_color="1, 1, 1, 1"
-                             fg_selected_color="1, 1, 1, 1" fg_unselected_color="1, 1, 1, 1"
+                        <scroll_list background_visible="true" bottom="-513" column_padding="0" draw_border="true" draw_heading="true" 
                              follows="left|top|right|bottom" height="464" left="4" mouse_opaque="true"
                              multi_select="false" name="results" search_column="2" width="387">
                                 <column label="" name="icon" width="24" />
@@ -479,10 +470,8 @@ To buy direct, visit the land and click on the place name in the title bar.
                         <button bottom="-26" follows="left|top" font="SansSerif" halign="center" height="20"
                              label="Search" label_selected="Search" left_delta="136" mouse_opaque="true"
                              name="Search" width="70" />
-                        <scroll_list background_visible="false" bottom="-513" column_padding="0" draw_border="true"
-                             draw_heading="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="464" left="4" mouse_opaque="true"
+                        <scroll_list background_visible="true" bottom="-513" column_padding="0" draw_border="true"
+                             draw_heading="true" follows="left|top|right|bottom" height="464" left="4" mouse_opaque="true"
                              multi_select="false" name="results" search_column="2" width="339">
                                 <column label="" name="icon" width="24" />
                                 <column label="" name="type" width="-1" />
@@ -521,9 +510,7 @@ To buy direct, visit the land and click on the place name in the title bar.
                         <button bottom="-26" follows="left|top" font="SansSerif" halign="center" height="20"
                              label="Search" label_selected="Search" left_delta="210" mouse_opaque="true"
                              name="Search" width="70" />
-                        <scroll_list background_visible="false" bottom="-513" column_padding="0" draw_border="true"
-                             draw_heading="true" fg_disable_color="1, 1, 1, 1"
-                             fg_selected_color="1, 1, 1, 1" fg_unselected_color="1, 1, 1, 1"
+                        <scroll_list background_visible="true" bottom="-513" column_padding="0" draw_border="true" draw_heading="true" 
                              follows="left|top|right|bottom" height="464" left="4" mouse_opaque="true"
                              multi_select="false" name="results" search_column="2" width="326">
                                 <column label="" name="icon" width="24" />
@@ -566,9 +553,7 @@ To buy direct, visit the land and click on the place name in the title bar.
                              font="SansSerifSmall" height="16" initial_value="false"
                              label="Include Mature groups" left="42" mouse_opaque="true"
                              name="incmature" width="204" />
-                        <scroll_list background_visible="false" bottom="-513" column_padding="0" draw_border="true"
-                             draw_heading="true" fg_disable_color="1, 1, 1, 1"
-                             fg_selected_color="1, 1, 1, 1" fg_unselected_color="1, 1, 1, 1"
+                        <scroll_list background_visible="true" bottom="-513" column_padding="0" draw_border="true" draw_heading="true" 
                              follows="left|top|right|bottom" height="464" left="4" mouse_opaque="true"
                              multi_select="false" name="results" search_column="2" width="339">
                                 <column label="" name="icon" sort="score" sort_ascending="false" width="24" />
@@ -613,9 +598,7 @@ To buy direct, visit the land and click on the place name in the title bar.
                              font="SansSerifSmall" height="16" initial_value="false"
                              label="Include Mature content" left_delta="78" mouse_opaque="true"
                              name="incmature" width="156" />
-                        <scroll_list background_visible="false" bottom="-513" column_padding="0" draw_border="true"
-                             draw_heading="false" fg_disable_color="1, 1, 1, 1"
-                             fg_selected_color="1, 1, 1, 1" fg_unselected_color="1, 1, 1, 1"
+                        <scroll_list background_visible="true" bottom="-513" column_padding="0" draw_border="true" draw_heading="false" 
                              follows="left|top|right|bottom" height="464" left="4" mouse_opaque="true"
                              multi_select="false" name="results" search_column="1" width="339">
                                 <column label="" name="icon" width="24" />
diff --git a/linden/indra/newview/skins/xui/en-us/floater_env_settings.xml b/linden/indra/newview/skins/xui/en-us/floater_env_settings.xml
index 31feeb4..e2bafbf 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_env_settings.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_env_settings.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater bottom="-130" can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="false" height="150" hidden="false" left="50" min_height="150"
+     can_resize="false" height="150" left="50" min_height="150"
      min_width="600" mouse_opaque="true" name="Environment Editor Floater"
      rect_control="FloaterEnvRect" title="Environment Editor" width="600">
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom="-48" drop_shadow_visible="true" follows="left|top|right"
-             font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
+             font="SansSerif" h_pad="0" halign="left" height="16" 
              left="10" mouse_opaque="true" name="EnvTimeText" v_pad="0" width="140">
                 Time of Day
         </text>
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom_delta="-30" drop_shadow_visible="true" follows="left|top|right"
-             font="SansSerifSmall" h_pad="0" halign="left" height="16" hidden="false"
+             font="SansSerifSmall" h_pad="0" halign="left" height="16" 
              left="15" mouse_opaque="true" name="EnvTimeText2" v_pad="0" width="140">
                 12:00 PM
         </text>
@@ -24,7 +24,7 @@
              width="200" />
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom="-102" drop_shadow_visible="true" follows="left|top|right"
-             font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
+             font="SansSerif" h_pad="0" halign="left" height="16" 
              left="10" mouse_opaque="true" name="EnvCloudText" v_pad="0" width="140">
                 Cloud Cover
         </text>
@@ -35,18 +35,18 @@
              width="210" />
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom="-55" drop_shadow_visible="true" follows="left|top|right"
-             font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
+             font="SansSerif" h_pad="0" halign="left" height="16" 
              left="310" mouse_opaque="true" name="EnvWaterColorText" v_pad="0"
              width="140">
                 Water Color
         </text>
         <color_swatch border_color="0.45098, 0.517647, 0.607843, 1" bottom="-80"
              can_apply_immediately="true" color="0.5, 0.5, 0.5, 1" follows="left|top"
-             height="50" hidden="false" label="" left="390" mouse_opaque="true"
+             height="50" label="" left="390" mouse_opaque="true"
              name="EnvWaterColor" tool_tip="Click to open Color Picker" width="40" />
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom="-102" drop_shadow_visible="true" follows="left|top|right"
-             font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
+             font="SansSerif" h_pad="0" halign="left" height="16" 
              left="310" mouse_opaque="true" name="EnvWaterFogText" v_pad="0" width="140">
                 Water Fog
         </text>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_friends.xml b/linden/indra/newview/skins/xui/en-us/floater_friends.xml
deleted file mode 100644
index 540b066..0000000
--- a/linden/indra/newview/skins/xui/en-us/floater_friends.xml
+++ /dev/null
@@ -1,65 +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"
-     min_height="300" min_width="350" name="friends"
-     rect_control="FloaterFriendsRect" title="Friends">
-        <scroll_list bottom="90" 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="-20">
-                <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" />
-        </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">
-                        Select friend(s) to change rights...
-                </text>
-                <check_box bottom_delta="-21" enabled="false" follows="bottom|left" font="SansSerifSmall"
-                     height="16" 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" initial_value="false" label="Can see me on the 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" 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="-17" height="0" left="-90" width="1" />
-        <button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"
-             label="Profile" left_delta="0" name="profile_btn"
-             tool_tip="Show picture, groups, and other information" width="80" />
-        <button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"
-             label="IM/Call" left_delta="0" name="im_btn"
-             tool_tip="Open Instant Message session" width="80" />
-        <button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"
-             label="Teleport..." left_delta="0" name="offer_teleport_btn"
-             tool_tip="Offer this friend a teleport to your current location" width="80" />
-        <button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"
-             label="Pay..." left_delta="0" name="pay_btn"
-             tool_tip="Give Linden dollars (L$) to this friend" width="80" />
-        <button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"
-             label="Remove..." left_delta="0" name="remove_btn"
-             tool_tip="Remove this person from your friends list" width="80" />
-        <button bottom_delta="-35" follows="top|right" font="SansSerif" height="22"
-             label="Add..." left_delta="0" name="add_btn"
-             tool_tip="Offer friendship to a resident" width="80" />
-        <string name="Multiple">
-                Multiple friends...
-        </string>
-</floater>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_gesture.xml b/linden/indra/newview/skins/xui/en-us/floater_gesture.xml
index 62d8dd2..b8a7174 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_gesture.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_gesture.xml
@@ -1,23 +1,25 @@
 <?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="465" min_height="200" min_width="375" name="gestures"
-     title="Active Gestures" width="375">
+     height="465" min_height="200" min_width="350" name="gestures"
+     title="Active Gestures" width="350">
         <text bottom="-30" follows="top|left" font="SansSerifSmall" left="15"
              name="help_label">
-                Click a gesture or press a key to play animations and sounds.
+                Double-click a gesture to play animations and sounds.
         </text>
-        <scroll_list bottom_delta="-380" draw_border="true" draw_heading="true"
-             follows="top|left|bottom|right" height="370" left="15" multi_select="false"
-             name="gesture_list" width="345">
+        <scroll_list bottom_delta="-390" draw_border="true" draw_heading="true"
+             follows="top|left|bottom|right" height="380" left="15" multi_select="false"
+             name="gesture_list" right="-15">
                 <column label="Trigger" name="trigger" width="70" />
                 <column label="Key" name="shortcut" width="70" />
                 <column label="" name="key" width="-1" />
                 <column label="Name" name="name" width="160" />
         </scroll_list>
-        <button bottom_delta="-30" follows="bottom|right" height="20" label="New" left="-365"
+        <button bottom_delta="-30" follows="bottom|right" height="20" label="New" left="15"
              name="new_gesture_btn" width="83" />
+        <!--
         <button bottom_delta="0" follows="bottom|right" height="20" label="Inventory"
              left_delta="89" name="inventory_btn" width="83" />
+        -->
         <button bottom_delta="0" follows="bottom|right" height="20" label="Edit"
              left_delta="89" name="edit_btn" width="83" />
         <button bottom_delta="0" follows="bottom|right" height="20" label="Play"
diff --git a/linden/indra/newview/skins/xui/en-us/floater_groups.xml b/linden/indra/newview/skins/xui/en-us/floater_groups.xml
deleted file mode 100644
index ceeefd9..0000000
--- a/linden/indra/newview/skins/xui/en-us/floater_groups.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater bottom="-371" can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="true" can_tear_off="false" enabled="true" follows="left|top"
-     height="300" left="280" min_height="250" min_width="350"
-     mouse_opaque="true" name="groups" title="Groups" width="350">
-        <scroll_list background_visible="true" bottom="45" column_padding="5" draw_border="true"
-             draw_heading="false" draw_stripes="true" enabled="true"
-             follows="left|top|right|bottom" left="10" mouse_opaque="true"
-             multi_select="false" name="group list" tab_stop="true" top="-20"
-             width="240">
-                <column label="" name="name" width="248" />
-        </scroll_list>
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="22" drop_shadow_visible="true" enabled="true" follows="left|bottom"
-             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="12"
-             mouse_opaque="false" name="groupdesc" v_pad="0" width="248">
-                Your currently active group is displayed in bold.
-        </text>
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="5" drop_shadow_visible="true" enabled="true" follows="left|bottom"
-             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="12"
-             mouse_opaque="false" name="groupcount" v_pad="0" width="248">
-                You belong to [COUNT] groups (of [MAX] maximum).
-        </text>
-        <pad bottom="-17" height="0" left="-90" width="1" />
-        <button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"
-             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 bottom_delta="-25" follows="top|right" font="SansSerif" height="22"
-             label="Activate" name="Activate" width="80" />
-        <button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"
-             label="Leave" name="Leave" width="80" />
-        <button bottom_delta="-35" follows="top|right" font="SansSerif" height="22"
-             label="Create..." name="Create" width="80" />
-        <button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"
-             label="Search..." name="Search..." width="80" />
-</floater>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_hardware_settings.xml b/linden/indra/newview/skins/xui/en-us/floater_hardware_settings.xml
index 64a3c6b..5773142 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_hardware_settings.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_hardware_settings.xml
@@ -1,53 +1,82 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater bottom="-400" can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="false" height="205" hidden="false" left="50" min_height="200"
-     min_width="600" mouse_opaque="true" name="Hardware Settings Floater"
-     title="Hardware Settings" width="500">
+<floater bottom="-400" can_close="true" can_drag_on_left="false" 
+        can_minimize="true" can_resize="false" height="224"
+        left="50" min_height="200" min_width="600" mouse_opaque="true" 
+        name="Hardware Settings Floater" title="Hardware Settings" width="500">
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom="-42" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="12" hidden="false"
+             font="SansSerifSmall" h_pad="0" halign="left" height="12"
              left="10" mouse_opaque="true" name="Filtering:" v_pad="0" width="128">
                 Filtering:
         </text>
         <check_box bottom="-46" control_name="RenderAnisotropic" enabled="true" follows="left|top"
-             font="SansSerifSmall" height="16" hidden="false" initial_value="false"
+             font="SansSerifSmall" height="16" initial_value="false"
              label="Anisotropic Filtering (slower when enabled)" left="148"
              mouse_opaque="true" name="ani" radio_style="false" width="256" />
-        <spinner bottom="-65" control_name="RenderGamma" decimal_digits="2" enabled="true"
-             follows="left|top" height="16" hidden="false" increment="0.01"
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                bottom="-61" drop_shadow_visible="true" enabled="true" follows="left|top"
+                font="SansSerifSmall" h_pad="0" halign="left" height="12"
+                left="10" mouse_opaque="true" name="Antialiasing:" v_pad="0" width="128">
+    Antialiasing:
+  </text>
+  <combo_box bottom="-65" control_name="RenderFSAASamples" enabled="true" follows="left|top"
+                font="SansSerifSmall" height="16" initial_value="false"
+                label="Antialiasing" left="148"
+                mouse_opaque="true" name="fsaa" width="64">
+    <combo_item name="FSAADisabled" value="0">
+      Disabled
+    </combo_item>
+    <combo_item name="2x" value="2">
+      2x
+    </combo_item>
+    <combo_item name="4x" value="4">
+      4x
+    </combo_item>
+    <combo_item name="8x" value="8">
+      8x
+    </combo_item>
+    <combo_item name="16x" value="16">
+      16x
+    </combo_item>
+  </combo_box>
+        <spinner bottom_delta="-21" control_name="RenderGamma" decimal_digits="2" enabled="true"
+             follows="left|top" height="16" increment="0.01"
              initial_val="1" label="Gamma:" label_width="138" left="10" max_val="2"
              min_val="0.0" mouse_opaque="true" name="gamma" width="202" />
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-61" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="12" hidden="false"
-             left="222" mouse_opaque="true" name="(brightness, lower is brighter)"
-             v_pad="0" width="315">
+                bottom_delta="2" drop_shadow_visible="true" enabled="true" follows="left|top"
+                font="SansSerifSmall" h_pad="0" halign="left" height="12"
+                left="222" mouse_opaque="true" name="(brightness, lower is brighter)"
+                v_pad="0" width="315">
                 (brightness, lower is brighter, 0=use default)
         </text>
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-104" 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="Enable VBO:" v_pad="0" width="128">
+                bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
+                font="SansSerifSmall" h_pad="0" halign="left" height="12"
+                left="10" mouse_opaque="true" name="Enable VBO:" v_pad="0"
+                width="128">
                 Enable VBO:
         </text>
-        <check_box bottom="-108" control_name="RenderVBOEnable" enabled="true" follows="left|top"
-             font="SansSerifSmall" height="16" hidden="false" initial_value="true"
-             label="Enable OpenGL Vertex Buffer Objects" left="148" mouse_opaque="true"
-             name="vbo" radio_style="false"
-             tool_tip="Enabling this on modern hardware gives a performance gain.  However, older hardware often has poor implementations of VBOs and you may get crashes when this is enabled."
-             width="315" />
-        <slider bottom="-133" can_edit_text="false" control_name="TextureMemory"
-             decimal_digits="0" enabled="true" follows="left|top" height="16"
-             hidden="false" increment="16" initial_val="32" label="Texture Memory (MB):"
-             label_width="135" left="10" max_val="4096" min_val="0" mouse_opaque="true"
-             name="GrapicsCardTextureMemory"
-             tool_tip="Amount of memory to allocate for textures. Defaults to Video Card Memory. Reducing this may improve performance but may also make textures blurry."
-             width="300" />
-        <spinner bottom="-157" control_name="RenderFogRatio" decimal_digits="1" enabled="true"
-             follows="left|top" height="16" hidden="false" increment="0.1"
+        <check_box bottom_delta="-5" control_name="RenderVBOEnable" enabled="true" follows="left|top"
+                font="SansSerifSmall" height="16" initial_value="true"
+                label="Enable OpenGL Vertex Buffer Objects" left="148"
+                mouse_opaque="true" name="vbo" radio_style="false"
+                tool_tip="Enabling this on modern hardware gives a performance gain.  However, older hardware often has poor implementations of VBOs and you may get crashes when this is enabled."
+                width="315" />
+
+        <slider bottom_delta="-21" can_edit_text="false" control_name="TextureMemory" 
+                decimal_digits="0" enabled="true"
+                follows="left|top" height="16" increment="16"
+                initial_val="32" label="Texture Memory (MB):" label_width="135" left="10"
+                max_val="4096" min_val="0" mouse_opaque="true" name="GrapicsCardTextureMemory"
+                tool_tip="Amount of memory to allocate for textures. Defaults to Video Card Memory. Reducing this may improve performance but may also make textures blurry."
+                width="300" />
+
+        <spinner bottom_delta="-24" control_name="RenderFogRatio" decimal_digits="1" enabled="true"
+             follows="left|top" height="16" increment="0.1"
              initial_val="4" label="Fog Distance Ratio:" label_width="138" left="10"
              max_val="10" min_val="0.5" mouse_opaque="true" name="fog" width="202" />
         <button bottom="10" enabled="true" follows="right|bottom" font="SansSerif"
-             halign="center" height="20" hidden="false" label="OK" label_selected="OK"
+             halign="center" height="20" label="OK" label_selected="OK"
              left="-110" mouse_opaque="true" name="OK" scale_image="true" width="90" />
 </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 6edeec2..227e41b 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_html.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_html.xml
@@ -11,12 +11,12 @@
         <button bottom_delta="0" follows="top|left" font="SansSerifSmall" height="20"
              label="Forward" left_delta="73" name="forward_btn" width="70" />
         <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="0"
-             follows="top|left|right" font="SansSerifSmall" height="20" left_delta="85"
-             max_length="256" mouse_opaque="true" name="url_edit"
+             follows="top|left|right" font="SansSerifSmall" height="20" left_delta="85" 
+             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="440" name="go_btn" width="70" />
         <string name="home_page_url">
-                http://www.secondlife.com
+                http://www.secondlife.com
         </string>
 </floater>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_hud.xml b/linden/indra/newview/skins/xui/en-us/floater_hud.xml
new file mode 100644
index 0000000..6a72920
--- /dev/null
+++ b/linden/indra/newview/skins/xui/en-us/floater_hud.xml
@@ -0,0 +1,9 @@
+<?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="272" min_height="272" width="342" min_width="342" name="floater_hud"

+     title="Tutorial">

+        <web_browser border_visible="false" left="0" bottom="0" right="-1" top="-16" caret_color="1 1 1 1" follows="top|left|bottom|right"

+             name="floater_hud_browser"

+             start_url="data:text/html,%3Chtml%3E%3Chead%3E%3C/head%3E%3Cbody bgcolor=%22#000000%22 text=%22ffffff%22%3E%3Ch1%3E%3Ctt%3E%0D%0A%0D%0ALoading...%3C/tt%3E%3C/h1%3E%3C/body%3E%3C/html%3E"

+        />

+</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 66a6768..cb27be6 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
@@ -31,36 +31,36 @@
         <string name="default_text_label">
                 Click here to instant message.
         </string>
-        <button bottom="-40" follows="left|top" height="20" label="Profile..." left="4"
+        <button bottom="-40" follows="left|top" height="20" label="Profile..." left="5"
              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="90" />
-        <button bottom="-40" follows="left|top" halign="right" height="20"
+             label="Call" left_delta="85" name="start_call_btn" width="100" />
+        <button bottom="-40" follows="left|top" halign="center" height="20"
              image_overlay="icn_voice-call-end.tga" image_overlay_alignment="left"
              label="End Call" left_delta="0" name="end_call_btn" pad_right="10"
-             visible="false" width="90" />
-        <panel border="false" bottom="-40" follows="left|top|right" height="20"
-             left_delta="77" name="speaker_controls" width="344">
+             visible="false" width="100" />
+        <panel border="false" bottom="-37" follows="left|top|right" height="20"
+             left_delta="96" name="speaker_controls" width="100">
                 <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" />
+                     left_delta="0" max_val="1.0" min_val="0.0" name="speaker_volume" width="56" />
                 <button bottom_delta="0" height="20" image_selected="icn_speaker-muted_dark.tga"
-                     image_unselected="icn_speaker_dark.tga" label="" left_delta="85"
+                     image_unselected="icn_speaker_dark.tga" label="" left_delta="56"
                      name="mute_btn" tool_tip="Mute voice" width="25" />
         </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" left="4"
+             bottom="30" embedded_items="false" enabled="false"
+             follows="left|top|right|bottom" font="SansSerif" height="221" left="5"
              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"
+             text_readonly_color="ChatHistoryTextColor" width="487" word_wrap="true" />
+        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="7"
              follows="left|right|bottom" font="SansSerif" height="20"
-             label="Click here to instant message" left="6" max_length="1022"
+             label="Click here to instant message" left="5" 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"
+             select_on_focus="false" tab_group="1" width="423" />
+        <button bottom="7" follows="right|bottom" font="SansSerif" halign="center" height="20"
+             label="Send" left="433" mouse_opaque="true" name="send_btn"
              scale_image="true" width="60" />
         <string name="live_help_dialog">
                 *** Welcome to Help Request *** 
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 6eb4f9b..b47c788 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
@@ -28,36 +28,36 @@
         <string name="default_text_label">

                 Click here to instant message.

         </string>

-        <layout_stack border="false" bottom="1" follows="left|top|right|bottom" height="277" left="2"

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

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

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

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

                      height="295" left="0" min_width="115" name="im_contents_panel" width="495">

-                        <button bottom="-24" enabled="false" follows="left|top" halign="center" height="20"

+                        <button bottom="-20" enabled="false" follows="left|top" halign="center" height="20"

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

-                             label="Call" left="4" name="start_call_btn" width="80" />

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

+                             label="Call" left="5" name="start_call_btn" width="80" />

+                        <button bottom_delta="0" follows="left|top" halign="center" 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" />

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

-                             label_selected="&gt; &gt;" left="460" name="toggle_active_speakers_btn"

-                             right="493"

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

+                             right="496"

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

                              visible="true" width="80" />

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

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

-                             follows="left|top|right|bottom" font="SansSerif" height="240" left="4"

+                             bottom="-265" embedded_items="false" enabled="false"

+                             follows="left|top|right|bottom" font="SansSerif" height="239" left="5"

                              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="4"

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

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

                              handle_edit_keys_directly="false" height="20"

-                             label="Click here to instant message" left="4" max_length="1022"

+                             label="Click here to instant message" left="5" max_length="1022"

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

-                             select_on_focus="false" tab_group="1" width="425" />

-                        <button bottom_delta="-1" enabled="true" follows="right|bottom" font="SansSerif"

-                             halign="center" height="20" label="Send" left="433" mouse_opaque="true"

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

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

+                             halign="center" height="20" label="Send" left="436" mouse_opaque="true"

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

                 </layout_panel>

                 <layout_panel auto_resize="false" bottom="0" can_resize="true"

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 131ec66..9ccfedb 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
@@ -40,11 +40,11 @@
         <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_stack border="false" bottom="0" follows="left|top|right|bottom" height="276" left="0"

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

                 <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"

+                        <button bottom="-20" follows="left|top" height="20" label="Group Info" left="5"

                              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"

@@ -55,24 +55,24 @@
                              label="End Call" left_delta="0" name="end_call_btn" pad_right="12"

                              visible="false" 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"

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

+                             right="176"

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

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

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

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

-                             bottom="27" embedded_items="false" enabled="false"

+                             bottom="30" embedded_items="false" enabled="false"

                              follows="left|top|right|bottom" font="SansSerif" left="4"

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

                              text_color="ChatHistoryTextColor"

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

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

                              word_wrap="true" />

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

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

                              enabled="true" follows="left|right|bottom" font="SansSerif" height="20"

-                             left="4" max_length="1022" mouse_opaque="true" name="chat_editor"

+                             left="5" 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" label="Send" left="113" mouse_opaque="true"

+                             width="106" />

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

+                             halign="right" height="20" label="Send" left="116" mouse_opaque="true"

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

                 </layout_panel>

                 <layout_panel auto_resize="false" bottom="0" can_resize="true"

diff --git a/linden/indra/newview/skins/xui/en-us/floater_inventory.xml b/linden/indra/newview/skins/xui/en-us/floater_inventory.xml
index 68b1e36..1cb1da0 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_inventory.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_inventory.xml
@@ -19,7 +19,7 @@
         </tab_container>
         <menu_bar bottom="-34" drop_shadow="false" follows="left|top|right" height="18" left="2"
              mouse_opaque="false" name="Inventory Menu" opaque="false" width="461">
-                <menu bottom_delta="16" color="0, 0, 0, 1" drop_shadow="true" height="101"
+                <menu bottom_delta="16" drop_shadow="true" height="101"
                      label="File" left="0" mouse_opaque="false" name="File" opaque="true"
                      tear_off="true" width="128">
                         <menu_item_call bottom_delta="-18" height="18" label="Open" left="0" mouse_opaque="true"
@@ -53,7 +53,7 @@
                                 <on_click filter="" function="Inventory.EmptyTrash" userdata="" />
                         </menu_item_call>
                 </menu>
-                <menu bottom_delta="80" color="0, 0, 0, 1" drop_shadow="true" height="121"
+                <menu bottom_delta="80" drop_shadow="true" height="121"
                      label="Create" left="0" mouse_opaque="false" name="Create" opaque="true"
                      tear_off="true" width="121">
                         <menu_item_call bottom_delta="-18" height="18" label="New Folder" left="0" mouse_opaque="true"
@@ -72,7 +72,7 @@
                              name="New Gesture" width="121">
                                 <on_click filter="" function="Inventory.DoCreate" userdata="gesture" />
                         </menu_item_call>
-                        <menu bottom_delta="-689" color="0, 0, 0, 1" drop_shadow="true" height="175" left="0"
+                        <menu bottom_delta="-689" drop_shadow="true" height="175" left="0"
                              mouse_opaque="false" name="New Clothes" opaque="true" width="125">
                                 <menu_item_call bottom_delta="-18" height="18" label="New Shirt" left="0" mouse_opaque="true"
                                      name="New Shirt" width="125">
@@ -111,7 +111,7 @@
                                         <on_click filter="" function="Inventory.DoCreate" userdata="underpants" />
                                 </menu_item_call>
                         </menu>
-                        <menu bottom_delta="-599" color="0, 0, 0, 1" drop_shadow="true" height="85" left="0"
+                        <menu bottom_delta="-599" drop_shadow="true" height="85" left="0"
                              mouse_opaque="false" name="New Body Parts" opaque="true" width="118">
                                 <menu_item_call bottom_delta="-18" height="18" label="New Shape" left="0" mouse_opaque="true"
                                      name="New Shape" width="118">
@@ -131,7 +131,7 @@
                                 </menu_item_call>
                         </menu>
                 </menu>
-                <menu bottom_delta="64" color="0, 0, 0, 1" drop_shadow="true" height="49"
+                <menu bottom_delta="64" drop_shadow="true" height="49"
                      label="Sort" left="0" mouse_opaque="false" name="Sort" opaque="true"
                      tear_off="true" width="118">
                         <menu_item_check bottom_delta="-18" control_name="Inventory.SortByName" height="18"
diff --git a/linden/indra/newview/skins/xui/en-us/floater_joystick.xml b/linden/indra/newview/skins/xui/en-us/floater_joystick.xml
index 8d94ae1..18f39dd 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_joystick.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_joystick.xml
@@ -1,106 +1,121 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater bottom="-297" can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="false" follows="right" height="580" left="298" min_height="151"
-     min_width="240" mouse_opaque="true" name="build options floater"
-     rect_control="FloaterJoystickRect" title="Flycam Options" width="400">
-        <text bottom="-40" left="14" name="x-axis">
-                X-Axis
+<floater bottom="0" can_minimize="true" can_resize="false" height="500" left="0"
+     name="Joystick" title="Joystick Configuration" width="550">
+
+        <check_box name="enable_joystick" bottom="-38" left="14" width="60" halign="left" border_drop_shadow_visible="true" control_name="JoystickEnabled">Enable Joystick:</check_box>
+        <text name="joystick_type" bottom="-32" left="120" width="380" halign="left"></text>
+
+        <spinner bottom="-48" left="20" width="140" label_width="100" control_name="JoystickAxis1" name="JoystickAxis1" label="X Axis Mapping" decimal_digits="0" increment="1" min_val="-1" max_val="5"/>
+        <spinner bottom="-48" left="190" width="140" label_width="100" control_name="JoystickAxis2" name="JoystickAxis2" label="Y Axis Mapping" decimal_digits="0" increment="1" min_val="-1" max_val="5"/>
+        <spinner bottom="-48" left="360" width="140" label_width="100" control_name="JoystickAxis0" name="JoystickAxis0" label="Z Axis Mapping" decimal_digits="0" increment="1" min_val="-1" max_val="5"/>
+
+        <spinner bottom="-68" left="20" width="140" label_width="100" control_name="JoystickAxis4" name="JoystickAxis4" label="Pitch Mapping" decimal_digits="0" increment="1" min_val="-1" max_val="5"/>
+        <spinner bottom="-68" left="190" width="140" label_width="100" control_name="JoystickAxis5" name="JoystickAxis5" label="Yaw Mapping" decimal_digits="0" increment="1" min_val="-1" max_val="5"/>
+        <spinner bottom="-68" left="360" width="140" label_width="100" control_name="JoystickAxis3" name="JoystickAxis3" label="Roll Mapping" decimal_digits="0" increment="1" min_val="-1" max_val="5"/>
+
+        <spinner bottom="-88" left="20" width="140" label_width="100" control_name="JoystickAxis6" name="JoystickAxis6" label="Zoom Mapping" decimal_digits="0" increment="1" min_val="-1" max_val="5"/>
+        <check_box bottom="-96" left="185" control_name="ZoomDirect" label="Direct Zoom" name="ZoomDirect" />
+        <check_box bottom="-96" left="310" control_name="Cursor3D" label="3D Cursor" name="Cursor3D" />
+        <check_box bottom="-96" left="420" control_name="AutoLeveling" label="Auto Level" name="AutoLeveling" />
+
+        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             bottom="-120" drop_shadow_visible="true" enabled="true" follows="left|top"
+             font="SansSerifSmall" h_pad="0" halign="right" height="10" hidden="false"
+             left="12" mouse_opaque="false" v_pad="0" width="102" name="Control Modes:">
+                Control Modes:
         </text>
-        <text bottom="-40" left="142" name="y-axis">
-                Y-Axis
-        </text>
-        <text bottom="-40" left="270" name="z-axis">
-                Z-Axis
-        </text>
-        <spinner bottom="-61" control_name="FlycamAxis1" decimal_digits="0" increment="1"
-             label="Mapping" label_width="64" left="14" max_val="7" min_val="-1"
-             name="FlycamAxis1" width="120" />
-        <spinner bottom="-61" control_name="FlycamAxis2" decimal_digits="0" increment="1"
-             label="Mapping" label_width="64" left="142" max_val="7" min_val="-1"
-             name="FlycamAxis2" width="120" />
-        <spinner bottom="-61" control_name="FlycamAxis0" decimal_digits="0" increment="1"
-             label="Mapping" label_width="64" left="270" max_val="7" min_val="-1"
-             name="FlycamAxis0" width="120" />
-        <spinner bottom="-82" control_name="FlycamAxisScale1" decimal_digits="2" increment="0.1"
-             label="Scale" label_width="64" left="14" max_val="1024" min_val="-1024"
-             name="FlycamAxisScale1" width="120" />
-        <spinner bottom="-82" control_name="FlycamAxisScale2" decimal_digits="2" increment="0.1"
-             label="Scale" label_width="64" left="142" max_val="1024" min_val="-1024"
-             name="FlycamAxisScale2" width="120" />
-        <spinner bottom="-82" control_name="FlycamAxisScale0" decimal_digits="2" increment="0.1"
-             label="Scale" label_width="64" left="270" max_val="1024" min_val="-1024"
-             name="FlycamAxisScale0" width="120" />
-        <spinner bottom="-103" control_name="FlycamAxisDeadZone1" decimal_digits="2"
-             increment="0.01" label="Dead Zone" label_width="64" left="14" max_val="1"
-             min_val="0" name="FlycamAxisDeadZone1" width="120" />
-        <spinner bottom="-103" control_name="FlycamAxisDeadZone2" decimal_digits="2"
-             increment="0.01" label="Dead Zone" label_width="64" left="142" max_val="1"
-             min_val="0" name="FlycamAxisDeadZone2" width="120" />
-        <spinner bottom="-103" control_name="FlycamAxisDeadZone0" decimal_digits="2"
-             increment="0.01" label="Dead Zone" label_width="64" left="270" max_val="1"
-             min_val="0" name="FlycamAxisDeadZone0" width="120" />
-        <text bottom="-132" left="14" name="yaw">
-                Yaw
-        </text>
-        <text bottom="-132" left="142" name="pitch">
-                Pitch
-        </text>
-        <text bottom="-132" left="270" name="roll">
-                Roll
-        </text>
-        <spinner bottom="-153" control_name="FlycamAxis5" decimal_digits="0" increment="1"
-             label="Mapping" label_width="64" left="14" max_val="7" min_val="-1"
-             name="FlycamAxis5" width="120" />
-        <spinner bottom="-153" control_name="FlycamAxis4" decimal_digits="0" increment="1"
-             label="Mapping" label_width="64" left="142" max_val="7" min_val="-1"
-             name="FlycamAxis4" width="120" />
-        <spinner bottom="-153" control_name="FlycamAxis3" decimal_digits="0" increment="1"
-             label="Mapping" label_width="64" left="270" max_val="7" min_val="-1"
-             name="FlycamAxis3" width="120" />
-        <spinner bottom="-174" control_name="FlycamAxisScale5" decimal_digits="2"
-             increment="0.1" label="Scale" label_width="64" left="14" max_val="1024"
-             min_val="-1024" name="FlycamAxisScale5" width="120" />
-        <spinner bottom="-174" control_name="FlycamAxisScale4" decimal_digits="2"
-             increment="0.1" label="Scale" label_width="64" left="142" max_val="1024"
-             min_val="-1024" name="FlycamAxisScale4" width="120" />
-        <spinner bottom="-174" control_name="FlycamAxisScale3" decimal_digits="2"
-             increment="0.1" label="Scale" label_width="64" left="270" max_val="1024"
-             min_val="-1024" name="FlycamAxisScale3" width="120" />
-        <spinner bottom="-195" control_name="FlycamAxisDeadZone5" decimal_digits="2"
-             increment="0.01" label="Dead Zone" label_width="64" left="14" max_val="1"
-             min_val="0" name="FlycamAxisDeadZone5" width="120" />
-        <spinner bottom="-195" control_name="FlycamAxisDeadZone4" decimal_digits="2"
-             increment="0.01" label="Dead Zone" label_width="64" left="142" max_val="1"
-             min_val="0" name="FlycamAxisDeadZone4" width="120" />
-        <spinner bottom="-195" control_name="FlycamAxisDeadZone3" decimal_digits="2"
-             increment="0.01" label="Dead Zone" label_width="64" left="270" max_val="1"
-             min_val="0" name="FlycamAxisDeadZone3" width="120" />
-        <text bottom="-224" left="14" name="ZoomLabel">
-                Zoom
-        </text>
-        <spinner bottom="-245" control_name="FlycamAxis6" decimal_digits="0" increment="1"
-             label="Mapping" label_width="64" left="14" max_val="7" min_val="-1"
-             name="FlycamAxis6" width="120" />
-        <spinner bottom="-266" control_name="FlycamAxisScale6" decimal_digits="2"
-             increment="0.1" label="Scale" label_width="64" left="14" max_val="1024"
-             min_val="-1024" name="FlycamAxisScale6" width="120" />
-        <spinner bottom="-287" control_name="FlycamAxisDeadZone6" decimal_digits="2"
-             increment="0.01" label="Dead Zone" label_width="64" left="14" max_val="1"
-             min_val="0" name="FlycamAxisDeadZone6" width="120" />
-        <check_box bottom_delta="-21" control_name="FlycamZoomDirect" label="Direct Zoom" />
-        <slider bottom_delta="-29" can_edit_text="false" control_name="FlycamFeathering"
-             decimal_digits="0" follows="left" height="16" increment="1"
-             initial_val="0.7" label="Feathering" left="14" max_val="32" min_val="1"
-             mouse_opaque="true" name="FlycamFeathering" show_text="false" value="0.7"
-             width="128" />
-        <check_box bottom_delta="-21" control_name="FlycamAutoLeveling" label="Auto Level"
-             name="FlycamAutoLeveling" />
-        <check_box bottom_delta="-21" control_name="FlycamAbsolute" label="3D Cursor"
-             name="FlycamAbsolute" />
-        <string name="JoystickMonitor">
-                Joystick Monitor
-        </string>
-        <string name="Axis">
-                Axis [NUM]
-        </string>
-</floater>
+
+        <check_box bottom="-127" left="125" width="60" halign="center" border_drop_shadow_visible="true" control_name="JoystickAvatarEnabled" name="JoystickAvatarEnabled">Avatar</check_box>
+        <check_box bottom="-127" left="194" width="60" halign="center" border_drop_shadow_visible="true" control_name="JoystickBuildEnabled" name="JoystickBuildEnabled">Build</check_box>
+        <check_box bottom="-127" left="262" width="60" halign="center" border_drop_shadow_visible="true" control_name="JoystickFlycamEnabled" name="JoystickFlycamEnabled">Flycam</check_box>
+
+        <text bottom="-144" left="20" width="94" halign="right" name="XScale">X Scale</text>
+        <spinner bottom="-144" left="125" width="56" label_width="0" control_name="AvatarAxisScale1" name="AvatarAxisScale1" decimal_digits="2" increment="1" min_val="-1" max_val="1"/>
+        <spinner bottom="-144" left="195" width="56" label_width="0" control_name="BuildAxisScale1" name="BuildAxisScale1" decimal_digits="2" increment="0.1" min_val="-1024" max_val="1024"/>
+        <spinner bottom="-144" left="265" width="56" label_width="0" control_name="FlycamAxisScale1" name="FlycamAxisScale1" decimal_digits="2" increment="0.1" min_val="-1024" max_val="1024"/>
+
+        <text bottom="-164" left="20" width="94" halign="right" name="YScale">Y Scale</text>
+        <spinner bottom="-164" left="125" width="56" label_width="0" control_name="AvatarAxisScale2" name="AvatarAxisScale2" decimal_digits="2" increment="1" min_val="-1" max_val="1"/>
+        <spinner bottom="-164" left="195" width="56" label_width="0" control_name="BuildAxisScale2" name="BuildAxisScale2" decimal_digits="2" increment="0.1" min_val="-1024" max_val="1024"/>
+        <spinner bottom="-164" left="265" width="56" label_width="0" control_name="FlycamAxisScale2" name="FlycamAxisScale2" decimal_digits="2" increment="0.1" min_val="-1024" max_val="1024"/>
+
+        <text bottom="-184" left="20" width="94" halign="right" name="ZScale">Z Scale</text>
+        <spinner bottom="-184" left="125" width="56" label_width="0" control_name="AvatarAxisScale0" name="AvatarAxisScale0" decimal_digits="2" increment="1" min_val="-1" max_val="1"/>
+        <spinner bottom="-184" left="195" width="56" label_width="0" control_name="BuildAxisScale0" name="BuildAxisScale0" decimal_digits="2" increment="0.1" min_val="-1024" max_val="1024"/>
+        <spinner bottom="-184" left="265" width="56" label_width="0" control_name="FlycamAxisScale0" name="FlycamAxisScale0" decimal_digits="2" increment="0.1" min_val="-1024" max_val="1024"/>
+
+        <text bottom="-204" left="20" width="94" halign="right" name="PitchScale">Pitch Scale</text>
+        <spinner bottom="-204" left="125" width="56" label_width="0" control_name="AvatarAxisScale4" name="AvatarAxisScale4" decimal_digits="2" increment="0.1" min_val="-1024" max_val="1024"/>
+        <spinner bottom="-204" left="195" width="56" label_width="0" control_name="BuildAxisScale4" name="BuildAxisScale4" decimal_digits="2" increment="0.1" min_val="-1024" max_val="1024"/>
+        <spinner bottom="-204" left="265" width="56" label_width="0" control_name="FlycamAxisScale4" name="FlycamAxisScale4" decimal_digits="2" increment="0.1" min_val="-1024" max_val="1024"/>
+
+        <text bottom="-224" left="20" width="94" halign="right" name="YawScale">Yaw Scale</text>
+        <spinner bottom="-224" left="125" width="56" label_width="0" control_name="AvatarAxisScale5" name="AvatarAxisScale5" decimal_digits="2" increment="0.1" min_val="-1024" max_val="1024"/>
+        <spinner bottom="-224" left="195" width="56" label_width="0" control_name="BuildAxisScale5" name="BuildAxisScale5" decimal_digits="2" increment="0.1" min_val="-1024" max_val="1024"/>
+        <spinner bottom="-224" left="265" width="56" label_width="0" control_name="FlycamAxisScale5" name="FlycamAxisScale5" decimal_digits="2" increment="0.1" min_val="-1024" max_val="1024"/>
+
+        <text bottom="-244" left="20" width="94" halign="right" name="RollScale">Roll Scale</text>
+        <spinner bottom="-244" left="195" width="56" label_width="0" control_name="BuildAxisScale3" name="BuildAxisScale3" decimal_digits="2" increment="0.1" min_val="-1024" max_val="1024"/>
+        <spinner bottom="-244" left="265" width="56" label_width="0" control_name="FlycamAxisScale3" name="FlycamAxisScale3" decimal_digits="2" increment="0.1" min_val="-1024" max_val="1024"/>
+
+
+        <text bottom="-274" left="20" width="94" halign="right" name="XDeadZone">X Dead Zone</text>
+        <spinner bottom="-274" left="125" width="56" label_width="0" control_name="AvatarAxisDeadZone1" name="AvatarAxisDeadZone1" decimal_digits="2" increment="0.01" min_val="0" max_val="1"/>
+        <spinner bottom="-274" left="195" width="56" label_width="0" control_name="BuildAxisDeadZone1" name="BuildAxisDeadZone1" decimal_digits="2" increment="0.01" min_val="0" max_val="1"/>
+        <spinner bottom="-274" left="265" width="56" label_width="0" control_name="FlycamAxisDeadZone1" name="FlycamAxisDeadZone1" decimal_digits="2" increment="0.01" min_val="0" max_val="1"/>
+
+        <text bottom="-294" left="20" width="94" halign="right" name="YDeadZone">Y Dead Zone</text>
+        <spinner bottom="-294" left="125" width="56" label_width="0" control_name="AvatarAxisDeadZone2" name="AvatarAxisDeadZone2" decimal_digits="2" increment="0.01" min_val="0" max_val="1"/>
+        <spinner bottom="-294" left="195" width="56" label_width="0" control_name="BuildAxisDeadZone2" name="BuildAxisDeadZone2" decimal_digits="2" increment="0.01" min_val="0" max_val="1"/>
+        <spinner bottom="-294" left="265" width="56" label_width="0" control_name="FlycamAxisDeadZone2" ame="FlycamAxisDeadZone2" decimal_digits="2" increment="0.01" min_val="0" max_val="1"/>
+
+        <text bottom="-314" left="20" width="94" halign="right" name="ZDeadZone">Z Dead Zone</text>
+        <spinner bottom="-314" left="125" width="56" label_width="0" control_name="AvatarAxisDeadZone0" name="AvatarAxisDeadZone0" decimal_digits="2" increment="0.01" min_val="0" max_val="1"/>
+        <spinner bottom="-314" left="195" width="56" label_width="0" control_name="BuildAxisDeadZone0" name="BuildAxisDeadZone0" decimal_digits="2" increment="0.01" min_val="0" max_val="1"/>
+        <spinner bottom="-314" left="265" width="56" label_width="0" control_name="FlycamAxisDeadZone0" name="FlycamAxisDeadZone0" decimal_digits="2" increment="0.01" min_val="0" max_val="1"/>
+
+        <text bottom="-334" left="20" width="94" halign="right" name="PitchDeadZone">Pitch Dead Zone</text>
+        <spinner bottom="-334" left="125" width="56" label_width="0" control_name="AvatarAxisDeadZone4" name="AvatarAxisDeadZone4" decimal_digits="2" increment="0.01" min_val="0" max_val="1"/>
+        <spinner bottom="-334" left="195" width="56" label_width="0" control_name="BuildAxisDeadZone4" name="BuildAxisDeadZone4" decimal_digits="2" increment="0.01" min_val="0" max_val="1"/>
+        <spinner bottom="-334" left="265" width="56" label_width="0" control_name="FlycamAxisDeadZone4" name="FlycamAxisDeadZone4" decimal_digits="2" increment="0.01" min_val="0" max_val="1"/>
+
+        <text bottom="-354" left="20" width="94" halign="right" name="YawDeadZone">Yaw Dead Zone</text>
+        <spinner bottom="-354" left="125" width="56" label_width="0" control_name="AvatarAxisDeadZone5" name="AvatarAxisDeadZone5" decimal_digits="2" increment="0.01" min_val="0" max_val="1"/>
+        <spinner bottom="-354" left="195" width="56" label_width="0" control_name="BuildAxisDeadZone5" name="BuildAxisDeadZone5" decimal_digits="2" increment="0.01" min_val="0" max_val="1"/>
+        <spinner bottom="-354" left="265" width="56" label_width="0" control_name="FlycamAxisDeadZone5" name="FlycamAxisDeadZone5" decimal_digits="2" increment="0.01" min_val="0" max_val="1"/>
+
+        <text bottom="-374" left="20" width="94" halign="right" name="RollDeadZone">Roll Dead Zone</text>
+        <spinner bottom="-374" left="195" width="56" label_width="0" control_name="BuildAxisDeadZone3" name="BuildAxisDeadZone3" decimal_digits="2" increment="0.01" min_val="0" max_val="1"/>
+        <spinner bottom="-374" left="265" width="56" label_width="0" control_name="FlycamAxisDeadZone3" name="FlycamAxisDeadZone3" decimal_digits="2" increment="0.01" min_val="0" max_val="1"/>
+
+        <text bottom="-402" left="20" width="94" halign="right" name="Feathering">Feathering</text>
+        <slider bottom="-408" left="116" can_edit_text="false" control_name="AvatarFeathering"
+            decimal_digits="0" follows="left|top" height="16" increment="1"
+            initial_val="0.7" label="" max_val="32" min_val="1"
+            mouse_opaque="true" name="AvatarFeathering" show_text="false" value="0.7"
+            width="73" />
+        <slider bottom="-408" left="186" can_edit_text="false" control_name="BuildFeathering"
+            decimal_digits="0" follows="left|top" height="16" increment="1"
+            initial_val="0.7" label="" max_val="32" min_val="1"
+            mouse_opaque="true" name="BuildFeathering" show_text="false" value="0.7"
+            width="73" />
+        <slider bottom="-408" left="256" can_edit_text="false" control_name="FlycamFeathering"
+            decimal_digits="0" follows="left|top" height="16" increment="1"
+            initial_val="0.7" label="" max_val="32" min_val="1"
+            mouse_opaque="true" name="FlycamFeathering" show_text="false" value="0.7"
+            width="73" />
+
+        <text bottom="-430" left="20" width="94" halign="right" name="ZoomScale2">Zoom Scale</text>
+        <spinner bottom="-430" left="265" width="56" label_width="0" control_name="FlycamAxisScale6" name="FlycamAxisScale6" label="" decimal_digits="2" increment="0.1" min_val="-1024" max_val="1024"/>
+        <text bottom="-450" left="20" width="94" halign="right" name="ZoomDeadZone">Zoom Dead Zone</text>
+        <spinner bottom="-450" left="265" width="56" label_width="0" control_name="FlycamAxisDeadZone6" name="FlycamAxisDeadZone6" label="" decimal_digits="2" increment="0.01" min_val="0" max_val="1"/>
+
+        <button bottom="-451" left="336" enabled="true" follows="left|top" font="SansSerif"
+             halign="center" height="22" hidden="false"
+             label="SpaceNavigator Defaults" mouse_opaque="true"
+             name="SpaceNavigatorDefaults" scale_image="true" width="200" />
+
+        <string name="JoystickMonitor">Joystick Monitor</string>
+        <string name="Axis">Axis [NUM]</string>
+        <string name="NoDevice">no device detected</string>
+</floater>
\ No newline at end of file
diff --git a/linden/indra/newview/skins/xui/en-us/floater_lagmeter.xml b/linden/indra/newview/skins/xui/en-us/floater_lagmeter.xml
index 905d795..4fa24dd 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_lagmeter.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_lagmeter.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>

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

      can_resize="false" height="150" name="floater_lagmeter"

-     rect_control="FloaterLagMeter" title="Lag Meter" width="370">

+     rect_control="FloaterLagMeter" title="Lag Meter" width="350">

         <button bottom="-40" enabled="true" follows="top|left" font="SansSerif" halign="center"

              height="16" image_selected="lag_status_good.tga"

              image_unselected="lag_status_good.tga" label="" label_selected="" left="8"

diff --git a/linden/indra/newview/skins/xui/en-us/floater_live_lsleditor.xml b/linden/indra/newview/skins/xui/en-us/floater_live_lsleditor.xml
index 330c3aa..62cf350 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_live_lsleditor.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_live_lsleditor.xml
@@ -9,8 +9,8 @@
         <check_box bottom="-545" enabled="false" follows="left|bottom" font="SansSerif"
              height="18" initial_value="true" label="Running" left="12"
              mouse_opaque="true" name="running" radio_style="false" width="100" />
-        <panel bottom="-527" enabled="true" follows="left|top|right|bottom" height="506"
-             left="1" name="script ed panel" width="498" />
+        <panel bottom="-524" enabled="true" follows="left|top|right|bottom" height="506"
+             left="1" name="script ed panel" width="497" />
         <string name="not_allowed">
                 You are not allowed to view this script.
         </string>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_moveview.xml b/linden/indra/newview/skins/xui/en-us/floater_moveview.xml
index e87c1e7..7add633 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_moveview.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_moveview.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater bottom="-976" can_close="true" can_drag_on_left="false" can_minimize="false"
      can_resize="false" can_tear_off="true" enabled="true" follows="bottom"
-     height="58" left="521" min_height="100" min_width="100" mouse_opaque="true"
-     name="move floater" rect_control="FloaterMoveRect" title="" width="185">
+     height="58"  left="521" min_height="100" min_width="100"
+     mouse_opaque="true" name="move floater" rect_control="FloaterMoveRect2"
+     title="" width="135">
         <button bottom="-54" enabled="true" follows="left|bottom" font="SansSerif"
              halign="center" height="25" image_disabled="UIImgBtnLeftOutUUID"
              image_disabled_selected="UIImgBtnLeftInUUID"
@@ -30,10 +31,12 @@
              image_unselected="UIImgBtnMoveDownOutUUID" label="" label_selected=""
              left="91" mouse_opaque="true" name="move down btn" scale_image="false"
              tool_tip="Crouch or Fly Down" width="25" />
+        <!--
         <button bottom="-54" control_name="FlyBtnState" enabled="true" follows="left|bottom"
              font="SansSerif" halign="center" height="20" label="Fly"
              label_selected="Fly" left="116" mouse_opaque="true" name="fly btn"
              scale_image="true" tool_tip="Start or stop flying" width="65" />
+        -->
         <joystick_slide bottom="-29" enabled="true" follows="left|bottom" halign="center" height="25"
              image_selected="UIImgBtnSlideLeftInUUID"
              image_unselected="UIImgBtnSlideLeftOutUUID" left="20" mouse_opaque="true"
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 338d391..b1ab115 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_mute.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_mute.xml
@@ -4,10 +4,9 @@
      min_height="140" min_width="220" mouse_opaque="true" name="mute floater"
      rect_control="FloaterMuteRect3" short_title="Mute List"
      title="Muted Residents &amp; Objects" width="300">
-        <scroll_list background_visible="false" bottom="-220" column_padding="5" draw_border="true"
+        <scroll_list background_visible="true" 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"
-             fg_unselected_color="1 1 1 1" follows="left|top|right|bottom" height="200"
+             follows="left|top|right|bottom" height="200"
              left="4" mouse_opaque="true" multi_select="false" name="mutes"
              tool_tip="List of currently muted residents" width="292" />
         <button bottom="-244" enabled="true" follows="left|bottom" font="SansSerif"
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
index 2c277e7..4033058 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_mute_object.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_mute_object.xml
@@ -3,7 +3,7 @@
      can_resize="false" height="140" min_height="140" min_width="375"
      name="mute by name" title="Mute object by name" width="375">
         <text bottom_delta="-50" follows="top|left" font="SansSerif" height="16" left="20"
-             left_delta="25" name="message" right="380" text_color="white">
+             left_delta="25" name="message" right="380">
                 Mute by name only affects object chat and IM, not sounds.
 You must type the object&apos;s name exactly.
         </text>
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 1d5bf90..181c7de 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
@@ -3,8 +3,8 @@
      can_resize="true" can_tear_off="true" height="390" min_height="240"

      min_width="365" name="floater_my_friends"

      rect_control="FloaterContactsRect" 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">

+        <tab_container bottom="6" follows="left|right|top|bottom" height="364" left="4"

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

                 <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"

diff --git a/linden/indra/newview/skins/xui/en-us/floater_post_process.xml b/linden/indra/newview/skins/xui/en-us/floater_post_process.xml
index 0eb8150..31691a8 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_post_process.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_post_process.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater bottom="-350" can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="false" height="400" hidden="false" left="50" min_height="400"
+     can_resize="false" height="400" left="50" min_height="400"
      min_width="300" mouse_opaque="true" name="Post-Process Floater"
      title="Post-Process Settings" width="400">
-        <tab_container bottom="-400" follows="left|top" height="400" hidden="false" left="0"
+        <tab_container bottom="-400" follows="left|top" height="400" left="0"
              mouse_opaque="false" name="Post-Process Tabs" tab_position="top"
              width="400">
                 <panel border="true" bottom="-400" follows="left|top|right|bottom" height="400"
-                     hidden="false" label="Color Filter" left="1" mouse_opaque="false"
+                     label="Color Filter" left="1" mouse_opaque="false"
                      name="wmiColorFilterPanel" width="398">
                         <check_box bottom="-20" control_name="wmiColorFilterToggle" follows="left|top"
                              font="SansSerifSmall" height="16" initial_value="false" label="Enable"
                              left="14" mouse_opaque="true" name="wmiColorFilterToggle" width="200" />
                         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom_delta="-20" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
+                             font="SansSerif" h_pad="0" halign="left" height="16" 
                              left="10" mouse_opaque="true" name="wmiColorFilterBrightnessText" v_pad="0"
                              width="355">
                                 Brightness
@@ -26,7 +26,7 @@
                              show_text="true" value="1.0" width="200" />
                         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom_delta="-20" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
+                             font="SansSerif" h_pad="0" halign="left" height="16" 
                              left="10" mouse_opaque="true" name="wmiColorFilterSaturationText" v_pad="0"
                              width="355">
                                 Saturation
@@ -38,7 +38,7 @@
                              name="wmiColorFilterSaturation" show_text="true" value="1.0" width="200" />
                         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom_delta="-20" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
+                             font="SansSerif" h_pad="0" halign="left" height="16" 
                              left="10" mouse_opaque="true" name="wmiColorFilterContrastText" v_pad="0"
                              width="355">
                                 Contrast
@@ -50,7 +50,7 @@
                              value="1.0" width="200" />
                         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom_delta="-20" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
+                             font="SansSerif" h_pad="0" halign="left" height="16" 
                              left="10" mouse_opaque="true" name="wmiColorFilterBaseText" v_pad="0"
                              width="355">
                                 Contrast Base Color
@@ -77,14 +77,14 @@
                              width="200" />
                 </panel>
                 <panel border="true" bottom="-180" follows="left|top|right|bottom" height="400"
-                     hidden="false" label="Night Vision" left="1" mouse_opaque="false"
+                     label="Night Vision" left="1" mouse_opaque="false"
                      name="wmiNightVisionPanel" width="398">
                         <check_box bottom="-20" control_name="wmiNightVisionToggle" follows="left|top"
                              font="SansSerifSmall" height="16" initial_value="false" label="Enable"
                              left="14" mouse_opaque="true" name="wmiNightVisionToggle" width="200" />
                         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom_delta="-21" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
+                             font="SansSerif" h_pad="0" halign="left" height="16" 
                              left="10" mouse_opaque="true" name="wmiNightVisionBrightMultText" v_pad="0"
                              width="355">
                                 Light Amplification Multiple
@@ -96,7 +96,7 @@
                              name="wmiNightVisionBrightMult" show_text="true" value="0.7" width="200" />
                         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom_delta="-20" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
+                             font="SansSerif" h_pad="0" halign="left" height="16" 
                              left="10" mouse_opaque="true" name="wmiNightVisionNoiseSizeText" v_pad="0"
                              width="355">
                                 Noise Size
@@ -108,7 +108,7 @@
                              value="1.0" width="200" />
                         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom_delta="-20" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
+                             font="SansSerif" h_pad="0" halign="left" height="16" 
                              left="10" mouse_opaque="true" name="wmiNightVisionNoiseStrengthText"
                              v_pad="0" width="355">
                                 Noise Strength
@@ -120,14 +120,14 @@
                              name="wmiNightVisionNoiseStrength" show_text="true" value="1.0" width="200" />
                 </panel>
                 <panel border="true" bottom="-180" follows="left|top|right|bottom" height="400"
-                     hidden="false" label="Bloom" left="1" mouse_opaque="true"
+                     label="Bloom" left="1" mouse_opaque="true"
                      name="wmiBloomPanel" width="398">
                         <check_box bottom="-20" control_name="wmiBloomToggle" follows="left|top"
                              font="SansSerifSmall" height="16" initial_value="false" label="Enable"
                              left="14" mouse_opaque="true" name="wmiBloomToggle" width="200" />
                         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom_delta="-21" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
+                             font="SansSerif" h_pad="0" halign="left" height="16" 
                              left="10" mouse_opaque="true" name="wmiBloomExtractText" v_pad="0"
                              width="355">
                                 Luminosity Extraction
@@ -139,7 +139,7 @@
                              width="200" />
                         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom_delta="-20" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
+                             font="SansSerif" h_pad="0" halign="left" height="16" 
                              left="10" mouse_opaque="true" name="wmiBloomSizeText" v_pad="0" width="355">
                                 Bloom Size
                         </text>
@@ -150,7 +150,7 @@
                              width="200" />
                         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom_delta="-20" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
+                             font="SansSerif" h_pad="0" halign="left" height="16" 
                              left="10" mouse_opaque="true" name="wmiBloomStrengthText" v_pad="0"
                              width="355">
                                 Bloom Strength
@@ -162,20 +162,20 @@
                              width="200" />
                 </panel>
                 <panel border="true" bottom="-180" follows="left|top|right|bottom" height="400"
-                     hidden="false" label="Extras" left="1" mouse_opaque="false" name="Extras"
+                     label="Extras" left="1" mouse_opaque="false" name="Extras"
                      width="398">
                         <button bottom="-33" enabled="true" font="SansSerif" halign="center" height="20"
-                             hidden="false" label="LoadEffect" label_selected="LoadEffect" left="15"
+                              label="LoadEffect" label_selected="LoadEffect" left="15"
                              mouse_opaque="true" name="PPLoadEffect" scale_image="true" width="100" />
                         <button bottom="-60" enabled="true" font="SansSerif" halign="center" height="20"
-                             hidden="false" label="SaveEffect" label_selected="SaveEffect" left="15"
+                              label="SaveEffect" label_selected="SaveEffect" left="15"
                              mouse_opaque="true" name="PPSaveEffect" scale_image="true" width="100" />
                         <combo_box allow_text_entry="false" bottom="-33" follows="left|top" height="18"
                              left_delta="120" max_chars="20" mouse_opaque="true" name="PPEffectsCombo"
                              width="150" />
                         <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-75"
                              enabled="true" follows="left|right|bottom" font="SansSerif"
-                             handle_edit_keys_directly="false" height="20" hidden="false"
+                             handle_edit_keys_directly="false" height="20"
                              label="Effect Name" left="135" max_length="40" mouse_opaque="true"
                              name="PPEffectNameEditor" select_all_on_focus_received="false"
                              select_on_focus="false" tab_group="1" width="150" />
diff --git a/linden/indra/newview/skins/xui/en-us/floater_preview_gesture.xml b/linden/indra/newview/skins/xui/en-us/floater_preview_gesture.xml
index ef4da1d..25121ff 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_preview_gesture.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_preview_gesture.xml
@@ -43,10 +43,10 @@
              name="modifier_combo" width="50" />
         <combo_box bottom_delta="0" follows="left|top" height="20" label="None" left_delta="60"
              name="key_combo" width="45" />
-        <text bottom_delta="-23" follows="top|left" font="SansSerif" left="16">
+        <text bottom_delta="-23" follows="top|left" font="SansSerif" left="16" name="library_label">
                 Library:
         </text>
-        <text bottom_delta="0" follows="top|left" font="SansSerif" left="220">
+        <text bottom_delta="0" follows="top|left" font="SansSerif" left="220" name="steps_label">
                 Steps:
         </text>
         <scroll_list bottom_delta="-120" draw_border="true" follows="top|left" height="110"
@@ -82,11 +82,11 @@ unless you add wait steps.
         <radio_group bottom_delta="-20" draw_border="false" follows="top|left" height="40"
              left="340" name="animation_trigger_type" width="80">
                 <radio_item bottom_delta="-5" follows="left|top" height="16" left="3" mouse_opaque="true"
-                     width="80">
+                     width="80" name="start">
                         Start
                 </radio_item>
                 <radio_item bottom_delta="-10" follows="left|top" height="16" left="3" mouse_opaque="true"
-                     width="80">
+                     width="80" name="stop">
                         Stop
                 </radio_item>
         </radio_group>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_preview_new_landmark.xml b/linden/indra/newview/skins/xui/en-us/floater_preview_new_landmark.xml
deleted file mode 100644
index 7b3316e..0000000
--- a/linden/indra/newview/skins/xui/en-us/floater_preview_new_landmark.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater bottom="-97" can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="false" enabled="true" height="90" left="201" min_height="370"
-     min_width="90" mouse_opaque="true" name="landmark_preview" width="370">
-        <button bottom="-77" enabled="true" font="SansSerif" halign="center" height="20"
-             label="Teleport" label_selected="" left="13" mouse_opaque="true"
-             name="Teleport btn" width="100" />
-        <button bottom="-77" enabled="true" follows="left|bottom" font="SansSerif"
-             halign="center" height="20" label="Show on Map" label_selected=""
-             left="126" mouse_opaque="true" name="Show on Map btn" width="100" />
-        <button bottom="-77" enabled="true" follows="right|bottom" font="SansSerif"
-             halign="center" height="20" label="Discard" label_selected="" left="239"
-             mouse_opaque="true" name="Discard btn" width="100" />
-        <icon bottom="-21" color="1 1 1 1" enabled="true" follows="left|top" height="16"
-             image_name="inv_item_landmark_visited.tga" left="5" mouse_opaque="true"
-             name="icon_landmark" width="16" />
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-38" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerif" h_pad="0" halign="left" height="19" left="13"
-             mouse_opaque="true" name="desc txt" v_pad="0" width="80">
-                Description:
-        </text>
-        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-38"
-             enabled="true" follows="left|top|right" font="SansSerif"
-             handle_edit_keys_directly="false" height="19" left="93" max_length="127"
-             mouse_opaque="true" name="desc" select_all_on_focus_received="false"
-             select_on_focus="false" width="264" />
-</floater>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_preview_notecard_keep_discard.xml b/linden/indra/newview/skins/xui/en-us/floater_preview_notecard_keep_discard.xml
index a26f1c2..32af593 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_preview_notecard_keep_discard.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_preview_notecard_keep_discard.xml
@@ -2,7 +2,7 @@
 <floater bottom="-484" can_close="true" can_drag_on_left="false" can_minimize="true"
      can_resize="true" enabled="true" height="400" left="138" min_height="243"
      min_width="234" mouse_opaque="true" name="preview_notecard" width="400">
-        <text_editor type="string" length="1" bg_readonly_color="0.392157 0.392157 0.392157 1" bottom="-366"
+        <text_editor type="string" length="1" bottom="-366"
              embedded_items="true" enabled="true" follows="left|top|right|bottom"
              font="SansSerif" height="320" ignore_tab="false" left="4"
              max_length="65536" mouse_opaque="true" name="Notecard Editor" width="392"
diff --git a/linden/indra/newview/skins/xui/en-us/floater_rate.xml b/linden/indra/newview/skins/xui/en-us/floater_rate.xml
deleted file mode 100644
index 8467e6d..0000000
--- a/linden/indra/newview/skins/xui/en-us/floater_rate.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater bottom="-576" can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="false" enabled="true" height="400" left="380" min_height="100"
-     min_width="100" mouse_opaque="true" name="rate"
-     title="Your Rating of Jeska Linden" width="310">
-        <radio_group bottom="-96" draw_border="false" enabled="true" follows="left|top" height="54"
-             left="32" mouse_opaque="true" name="behavior" width="110">
-                <radio_item type="string" length="1" bottom="-16" enabled="true" follows="left|top" height="16" left="0"
-                     mouse_opaque="true" name="Positive" width="100">
-                        Positive
-                </radio_item>
-                <radio_item type="string" length="1" bottom="-34" enabled="true" follows="left|top" height="16" left="0"
-                     mouse_opaque="true" name="No Rating" width="100">
-                        No Rating
-                </radio_item>
-        </radio_group>
-        <radio_group bottom="-186" draw_border="false" enabled="true" follows="left|top" height="54"
-             left="32" mouse_opaque="true" name="appearance" width="110">
-                <radio_item type="string" length="1" bottom="-16" enabled="true" follows="left|top" height="16" left="0"
-                     mouse_opaque="true" name="Positive" width="100">
-                        Positive
-                </radio_item>
-                <radio_item type="string" length="1" bottom="-34" enabled="true" follows="left|top" height="16" left="0"
-                     mouse_opaque="true" name="No Rating" width="100">
-                        No Rating
-                </radio_item>
-        </radio_group>
-        <radio_group bottom="-276" draw_border="false" enabled="true" follows="left|top" height="54"
-             left="32" mouse_opaque="true" name="building" width="110">
-                <radio_item type="string" length="1" bottom="-16" enabled="true" follows="left|top" height="16" left="0"
-                     mouse_opaque="true" name="Positive" width="100">
-                        Positive
-                </radio_item>
-                <radio_item type="string" length="1" bottom="-34" enabled="true" follows="left|top" height="16" left="0"
-                     mouse_opaque="true" name="No Rating" width="100">
-                        No Rating
-                </radio_item>
-        </radio_group>
-        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-328"
-             enabled="true" follows="left|top" font="SansSerifSmall"
-             handle_edit_keys_directly="false" height="16" left="16" max_length="254"
-             mouse_opaque="true" name="mesg editor" select_all_on_focus_received="false"
-             select_on_focus="false" width="278" />
-        <button bottom="-392" enabled="false" font="SansSerif" halign="center" height="20"
-             label="OK" label_selected="OK" left="134" mouse_opaque="true" name="OK"
-             scale_image="true" width="72" />
-        <button bottom="-392" enabled="true" font="SansSerif" halign="center" height="20"
-             label="Cancel" label_selected="Cancel" left="222" mouse_opaque="true"
-             name="Cancel" scale_image="true" width="72" />
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-40" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="16"
-             mouse_opaque="true" name="Overall behavior:" v_pad="0" width="278">
-                Overall behavior:
-        </text>
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-130" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="16"
-             mouse_opaque="true" name="Skill at appearance (clothing and attachments):"
-             v_pad="0" width="278">
-                Skill at appearance (clothing and attachments):
-        </text>
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-220" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="16"
-             mouse_opaque="true" name="Skill at building:" v_pad="0" width="278">
-                Skill at building:
-        </text>
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-310" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="16"
-             mouse_opaque="true" name="Message:" v_pad="0" width="278">
-                Message:
-        </text>
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-362" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="16"
-             mouse_opaque="true" name="cost" v_pad="0" width="278">
-                Cost: L$[COST] to change each rating.  Total charge: L$[TOTAL].
-        </text>
-</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 61aa835..5055885 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
@@ -116,11 +116,11 @@
              mouse_opaque="true" name="abuser_name_title" v_pad="0" width="180">
                 Abuser name:
         </text>
-        <line_editor bevel_style="in" bg_readonly_color="0, 0, 0, 0" border_style="line"
+        <line_editor bevel_style="in" border_style="line"
              border_thickness="1" bottom_delta="-18" follows="left|top"
              font="SansSerifSmall" height="16" left="16" max_length="32"
              mouse_opaque="true" name="abuser_name_edit"
-             text_readonly_color="1, 1, 1, 1" width="180" />
+             width="180" />
         <button bottom_delta="-2" font="SansSerif" halign="center" height="20"
              label="Choose Resident" label_selected="" left_delta="190"
              mouse_opaque="true" name="select_abuser"
@@ -131,21 +131,21 @@
              mouse_opaque="true" name="abuser_name_title2" v_pad="0" width="180">
                 Location of Abuse:
         </text>
-        <line_editor bevel_style="in" bg_readonly_color="0, 0, 0, 0" border_style="line"
+        <line_editor bevel_style="in" border_style="line"
              border_thickness="1" bottom_delta="-18" follows="left|top"
              font="SansSerifSmall" height="16" left="16" max_length="256"
              mouse_opaque="true" name="abuse_location_edit"
-             text_readonly_color="1, 1, 1, 1" width="356" />
+             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"
              mouse_opaque="true" name="sum_title" v_pad="0" width="180">
                 Summary:
         </text>
-        <line_editor bevel_style="in" bg_readonly_color="0, 0, 0, 0" border_style="line"
+        <line_editor bevel_style="in" border_style="line"
              border_thickness="1" bottom_delta="-18" follows="left|top"
              font="SansSerifSmall" height="16" left="16" max_length="64"
-             mouse_opaque="true" name="summary_edit" text_readonly_color="1, 1, 1, 1"
+             mouse_opaque="true" name="summary_edit" 
              width="356" />
         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom_delta="-24" drop_shadow_visible="true" follows="left|top"
@@ -161,10 +161,10 @@
 abuse, relevant chat/IM text, and select the object
 if possible.
         </text>
-        <text_editor bg_readonly_color="0, 0, 0, 0" bottom_delta="-152" embedded_items="false"
+        <text_editor bottom_delta="-152" embedded_items="false"
              follows="left|top" font="SansSerifSmall" height="146" left="16"
              max_length="800" mouse_opaque="false" name="details_edit"
-             text_readonly_color="1, 1, 1, 1" width="356" word_wrap="true" />
+             width="356" word_wrap="true" />
         <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_report_bug.xml b/linden/indra/newview/skins/xui/en-us/floater_report_bug.xml
index 4583137..9499690 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_report_bug.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_report_bug.xml
@@ -137,10 +137,10 @@
              mouse_opaque="true" name="sum_title" v_pad="0" width="180">
                 Summary:
         </text>
-        <line_editor bevel_style="in" bg_readonly_color="0, 0, 0, 0" border_style="line"
+        <line_editor bevel_style="in" border_style="line"
              border_thickness="1" bottom_delta="-16" follows="left|top"
              font="SansSerifSmall" height="16" left="16" max_length="64"
-             mouse_opaque="true" name="summary_edit" text_readonly_color="1, 1, 1, 1"
+             mouse_opaque="true" name="summary_edit" 
              width="356" />
         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom_delta="-20" drop_shadow_visible="true" follows="left|top"
@@ -148,10 +148,10 @@
              mouse_opaque="true" name="dscr_title" v_pad="0" width="342">
                 Details: (Please provide as much information as possible)
         </text>
-        <text_editor bg_readonly_color="0, 0, 0, 0" bottom_delta="-112" embedded_items="false"
+        <text_editor bottom_delta="-112" embedded_items="false"
              follows="left|top" font="SansSerifSmall" height="112" left="16"
              max_length="900" mouse_opaque="false" name="details_edit"
-             text_readonly_color="1, 1, 1, 1" width="356" word_wrap="true">
+             width="356" word_wrap="true">
                 Steps to reproduce the bug:
 
 Observed results:
diff --git a/linden/indra/newview/skins/xui/en-us/floater_script_ed_panel.xml b/linden/indra/newview/skins/xui/en-us/floater_script_ed_panel.xml
index 1e020eb..6bc26b9 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_script_ed_panel.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_script_ed_panel.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel bottom="-550" enabled="true" follows="left|top|right|bottom" height="508"
      left="0" mouse_opaque="true" name="script panel" width="500">
-        <text_editor type="string" length="1" bg_readonly_color="0.392157 0.392157 0.392157 1" bottom="-393"
+        <text_editor type="string" length="1" bottom="-393"
              embedded_items="false" enabled="true" follows="left|top|right|bottom"
              font="Monospace" height="376" ignore_tab="false" left="4"
              max_length="65536" mouse_opaque="true" name="Script Editor" width="492"
@@ -26,7 +26,7 @@
         <menu_bar bottom="-15" drop_shadow="false" enabled="true" follows="left|top|right"
              height="18" left="8" mouse_opaque="false" name="script_menu" opaque="false"
              tear_off="false" width="476">
-                <menu bottom="0" color="0 0 0 1" drop_shadow="true" enabled="true" height="62"
+                <menu bottom="0" drop_shadow="true" enabled="true" height="62"
                      left="0" mouse_opaque="false" name="File" opaque="true" tear_off="false"
                      width="138">
                         <menu_item_call bottom_delta="-30" height="20" label="Save" left="0" mouse_opaque="true"
@@ -36,7 +36,7 @@
                         <menu_item_call bottom_delta="-58" height="20" label="Revert All Changes" left="0"
                              mouse_opaque="true" name="Revert All Changes" width="138" />
                 </menu>
-                <menu bottom="665" color="0 0 0 1" drop_shadow="true" enabled="true" height="198"
+                <menu bottom="665" drop_shadow="true" enabled="true" height="198"
                      left="222" mouse_opaque="false" name="Edit" opaque="true" tear_off="false"
                      width="139">
                         <menu_item_call bottom_delta="-30" enabled="false" height="20" label="Undo" left="0"
@@ -62,7 +62,7 @@
                         <menu_item_call bottom_delta="-194" enabled="true" height="20" label="Search / Replace..."
                              left="0" mouse_opaque="true" name="Search / Replace..." width="139" />
                 </menu>
-                <menu bottom="-18" color="0 0 0 1" drop_shadow="true" enabled="true" height="34"
+                <menu bottom="-18" drop_shadow="true" enabled="true" height="34"
                      left="0" mouse_opaque="false" name="Help" opaque="true" tear_off="false"
                      width="112">
                         <menu_item_call bottom="-30" enabled="true" height="20" label="Help..." left="0"
diff --git a/linden/indra/newview/skins/xui/en-us/floater_script_preview.xml b/linden/indra/newview/skins/xui/en-us/floater_script_preview.xml
index 4118438..167aeb7 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_script_preview.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_script_preview.xml
@@ -5,7 +5,7 @@
      rect_control="PreviewScriptRect" title="Script: Rotation Script"
      width="500">
         <panel bottom="-550" enabled="true" follows="left|top|right|bottom" height="508"
-             left="0" mouse_opaque="true" name="script panel" width="500" />
+             left="0" mouse_opaque="true" name="script panel" width="497" />
         <icon bottom="-19" color="1 1 1 1" enabled="true" follows="top|right" height="16"
              image_name="icon_lock.tga" left="444" mouse_opaque="true" name="lock"
              width="16" />
diff --git a/linden/indra/newview/skins/xui/en-us/floater_sell_land.xml b/linden/indra/newview/skins/xui/en-us/floater_sell_land.xml
index 82ed992..c549e29 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_sell_land.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_sell_land.xml
@@ -5,29 +5,29 @@
         <texture_picker bottom_delta="-155" enabled="false" follows="top|left" height="135" left="244"
              name="info_image" right="424" width="180" />
         <text bottom_delta="119" follows="top|left" font="SansSerifSmall" left="16"
-             name="info_parcel_label" text_color="white" width="48">
+             name="info_parcel_label"  width="48">
                 Parcel:
         </text>
         <text bottom_delta="-5" follows="top|left" font="SansSerif" height="16" left="56"
-             name="info_parcel" right="-20" text_color="white">
+             name="info_parcel" right="-20" >
                 PARCEL NAME
         </text>
         <text follows="top|left" font="SansSerifSmall" left="16" name="info_size_label"
-             text_color="white" width="48">
+              width="48">
                 Size:
         </text>
         <text bottom_delta="-21" follows="top|left" font="SansSerif" height="32" left="56"
-             name="info_size" right="-20" text_color="white">
+             name="info_size" right="-20" >
                 [AREA] sq. m.
         </text>
         <text bottom_delta="-64" follows="top|left" font="SansSerifHuge" height="24"
              left="16" name="info_action" text_color="white" width="200">
                 To sell this parcel:
         </text>
-        <icon bottom_delta="-96" follows="top|left" height="64" image_name="badge_note.tga"
+        <icon bottom_delta="-96" follows="top|left" height="64" image_name="badge_note.j2c"
              left="0" name="step_price" width="64" />
         <text bottom_delta="38" follows="top|left" height="16" left="72" name="price_label"
-             right="-20" text_color="white">
+             right="-20" font="SansSerifBig" >
                 Set a price:
         </text>
         <text follows="top|left" height="16" left="72" name="price_text" right="-20">
@@ -41,10 +41,10 @@
         <text bottom_delta="0" height="16" left_delta="110" name="price_per_m" width="200">
                 (L$[PER_METER] per square meter)
         </text>
-        <icon follows="top|left" height="64" image_name="badge_note.tga" left="0"
+        <icon follows="top|left" height="64" image_name="badge_note.j2c" left="0"
              name="step_sell_to" width="64" />
         <text bottom_delta="38" follows="top|left" height="16" left="72" name="sell_to_label"
-             right="-20" text_color="white">
+             right="-20" font="SansSerifBig" >
                 Sell the land to:
         </text>
         <text follows="top|left" height="16" left="72" name="sell_to_text" right="-20">
@@ -63,13 +63,13 @@
                 </combo_item>
         </combo_box>
         <line_editor bottom_delta="-20" enabled="false" follows="top|right" height="16"
-             name="sell_to_agent" text_color="white" width="150" />
+             name="sell_to_agent"  width="150" />
         <button bottom_delta="0" height="16" label="Select..." left_delta="155"
              name="sell_to_select_agent" width="60" />
-        <icon follows="top|left" height="64" image_name="badge_note.tga" left="0"
+        <icon follows="top|left" height="64" image_name="badge_note.j2c" left="0"
              name="step_sell_objects" width="64" />
         <text bottom_delta="38" follows="top|left" height="16" left="72"
-             name="sell_objects_label" right="-20" text_color="white">
+             name="sell_objects_label" right="-20" font="SansSerifBig" >
                 Sell the objects with the land?
         </text>
         <text bottom_delta="-20" follows="top|left" height="16" left="72"
@@ -89,7 +89,7 @@
         <button bottom_delta="4" height="16" label="Show Objects" name="show_objects"
              right="414" width="110" />
         <text bottom_delta="-35" follows="top|left" height="16" left="72"
-             name="nag_message_label" right="-20" text_color="white">
+             name="nag_message_label" right="-20" font="SansSerifBig" >
                 REMEMBER: All sales are final.
         </text>
         <button bottom="-479" follows="bottom|left" height="20" label="Set Land For Sale"
diff --git a/linden/indra/newview/skins/xui/en-us/floater_settings_debug.xml b/linden/indra/newview/skins/xui/en-us/floater_settings_debug.xml
index ed31742..a8c0840 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_settings_debug.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_settings_debug.xml
@@ -4,7 +4,7 @@
      title="Debug Settings" width="350">
         <combo_box allow_text_entry="true" bottom="-50" follows="top|left" font="SansSerifSmall"
              height="20" left="15" max_chars="255" name="settings_combo" />
-        <text_editor bottom_delta="-75" enabled="false" height="60" hide_scrollbar="true"
+        <text_editor bottom_delta="-75" enabled="false" height="60" width="320" hide_scrollbar="true"
              name="comment_text" word_wrap="true" />
         <combo_box bottom_delta="-30" follows="top|left" font="SansSerifSmall" height="20"
              left="15" name="boolean_combo" visible="false">
diff --git a/linden/indra/newview/skins/xui/en-us/floater_snapshot.xml b/linden/indra/newview/skins/xui/en-us/floater_snapshot.xml
index 2199db9..3966ac6 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_snapshot.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_snapshot.xml
@@ -33,11 +33,11 @@
         <button bottom_delta="0" follows="left|top" height="20" label="Cancel" left="120"
              name="discard_btn" width="85" />
         <button bottom="-290" follows="left|top" font="SansSerifSmall" halign="center"
-             height="20" hidden="false" label="More &gt;&gt;" left="10"
+             height="20" label="More &gt;&gt;" left="10"
              mouse_opaque="true" name="more_btn" scale_image="TRUE"
              tool_tip="Advanced Options" width="80" />
         <button bottom_delta="0" follows="left|top" font="SansSerifSmall" halign="center"
-             height="20" hidden="false" label="&lt;&lt; Less" left_delta="0"
+             height="20" label="&lt;&lt; Less" left_delta="0"
              mouse_opaque="true" name="less_btn" scale_image="TRUE"
              tool_tip="Advanced Options" width="80" />
         <text bottom_delta="-20" follows="top|left" height="15" left="10" name="type_label2"
diff --git a/linden/indra/newview/skins/xui/en-us/floater_tools.xml b/linden/indra/newview/skins/xui/en-us/floater_tools.xml
index 969a89c..5531090 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_tools.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_tools.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater bottom="-359" can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="false" follows="left|top" height="550" left="308"
-     min_height="100" min_width="100" mouse_opaque="true" name="toolbox floater"
-     rect_control="ToolboxRect" sound_flags="0" title="" width="272">
+     can_resize="false" follows="left|top" height="550" 
+     left="308" min_height="100" min_width="100" mouse_opaque="true"
+     name="toolbox floater" rect_control="ToolboxRect" sound_flags="0" title=""
+     width="272">
+
+<!-- Main floater tabs -->
+
         <button bottom="-34" follows="left|top" font="SansSerif" halign="center" height="32"
              image_disabled="tool_zoom.tga"
              image_disabled_selected="tool_zoom_active.tga"
@@ -33,6 +37,9 @@
              image_selected="tool_dozer_active.tga" image_unselected="tool_dozer.tga"
              label="" label_selected="" left="148" mouse_opaque="true"
              name="button land" tool_tip="Land" width="32" />
+
+<!-- Focus panel -->
+
         <check_box bottom="-70" follows="left|top" font="SansSerifSmall" height="16"
              initial_value="false" label="Zoom" left="4" mouse_opaque="true"
              name="radio zoom" radio_style="true" width="114" />
@@ -43,8 +50,11 @@
              initial_value="false" label="Orbit (Ctrl)" left="4" mouse_opaque="true"
              name="radio orbit" radio_style="true" width="114" />
         <check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"
-             initial_value="false" label="Pan (Ctrl-Shift)" left="4" mouse_opaque="true"
-             name="radio pan" radio_style="true" width="114" />
+             initial_value="false" label="Pan (Ctrl-Shift)" left="4"
+             mouse_opaque="true" name="radio pan" radio_style="true" width="114" />
+
+<!-- Move panel -->
+
         <check_box bottom="-70" follows="left|top" font="SansSerifSmall" height="16"
              initial_value="false" label="Move" left="4" mouse_opaque="true"
              name="radio move" radio_style="true" width="114" />
@@ -54,6 +64,9 @@
         <check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"
              initial_value="false" label="Spin (Ctrl-Shift)" left="4"
              mouse_opaque="true" name="radio spin" radio_style="true" width="114" />
+
+<!-- Edit panel -->
+
         <check_box bottom="-70" follows="left|top" font="SansSerifSmall" height="16"
              initial_value="false" label="Position" left="4" mouse_opaque="true"
              name="radio position" radio_style="true" width="114" />
@@ -103,112 +116,118 @@
         <button bottom_delta="-14" follows="left|top" font="SansSerifSmall" halign="center"
              height="16" label="Options..." label_selected="Options..." left_delta="20"
              mouse_opaque="true" name="Options..." scale_image="TRUE" width="80" />
+
+<!-- Help text -->
+
         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom="-52" drop_shadow_visible="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
              mouse_opaque="true" name="text status" v_pad="0" width="264">
                 Drag to move, shift-drag to copy
         </text>
-        <button bottom="-75" follows="left|top" font="SansSerif" halign="center" height="24"
+
+<!-- Create panel -->
+
+        <button bottom="-78" follows="left|top" font="SansSerif" halign="center" height="30"
              image_disabled="object_cube.tga"
              image_disabled_selected="object_cube_active.tga"
              image_selected="object_cube_active.tga" image_unselected="object_cube.tga"
              label="" label_selected="" left="4" mouse_opaque="true" name="ToolCube"
-             scale_image="TRUE" width="24" />
+             scale_image="TRUE" width="30" tool_tip="Cube"/>
         <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
-             height="24" image_disabled="object_prism.tga"
+             height="30" image_disabled="object_prism.tga"
              image_disabled_selected="object_prism_active.tga"
              image_selected="object_prism_active.tga"
              image_unselected="object_prism.tga" label="" label_selected=""
-             left_delta="23" mouse_opaque="true" name="ToolPrism" scale_image="TRUE"
-             width="24" />
+             left_delta="28" mouse_opaque="true" name="ToolPrism" scale_image="TRUE"
+        tool_tip="Prism" width="30" />
         <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
-             height="24" image_disabled="object_pyramid.tga"
+             height="30" image_disabled="object_pyramid.tga"
              image_disabled_selected="object_pyramid_active.tga"
              image_selected="object_pyramid_active.tga"
              image_unselected="object_pyramid.tga" label="" label_selected=""
-             left_delta="23" mouse_opaque="true" name="ToolPyramid" scale_image="TRUE"
-             width="24" />
+             left_delta="28" mouse_opaque="true" name="ToolPyramid" scale_image="TRUE"
+ tool_tip="Pyramid" width="30" />
         <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
-             height="24" image_disabled="object_tetrahedron.tga"
+             height="30" image_disabled="object_tetrahedron.tga"
              image_disabled_selected="object_tetrahedron_active.tga"
              image_selected="object_tetrahedron_active.tga"
              image_unselected="object_tetrahedron.tga" label="" label_selected=""
              left_delta="23" mouse_opaque="true" name="ToolTetrahedron"
-             scale_image="TRUE" width="24" />
+             scale_image="TRUE" tool_tip="Tetrahedron" width="30" />
         <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
              height="24" image_disabled="object_cylinder.tga"
              image_disabled_selected="object_cylinder_active.tga"
              image_selected="object_cylinder_active.tga"
              image_unselected="object_cylinder.tga" label="" label_selected=""
-             left_delta="23" mouse_opaque="true" name="ToolCylinder" scale_image="TRUE"
-             width="24" />
+             left_delta="23" mouse_opaque="true" tool_tip="Cylinder" name="ToolCylinder" scale_image="TRUE"
+             width="30" />
         <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
              height="24" image_disabled="object_hemi_cylinder.tga"
              image_disabled_selected="object_hemi_cylinder_active.tga"
              image_selected="object_hemi_cylinder_active.tga"
              image_unselected="object_hemi_cylinder.tga" label="" label_selected=""
              left_delta="23" mouse_opaque="true" name="ToolHemiCylinder"
-             scale_image="TRUE" width="24" />
+             scale_image="TRUE" tool_tip="Hemicylinder" width="30" />
         <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
              height="24" image_disabled="object_cone.tga"
              image_disabled_selected="object_cone_active.tga"
              image_selected="object_cone_active.tga" image_unselected="object_cone.tga"
              label="" label_selected="" left_delta="23" mouse_opaque="true"
-             name="ToolCone" scale_image="TRUE" width="24" />
+             name="ToolCone" scale_image="TRUE" tool_tip="Cone" width="30" />
         <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
              height="24" image_disabled="object_hemi_cone.tga"
              image_disabled_selected="object_hemi_cone_active.tga"
              image_selected="object_hemi_cone_active.tga"
              image_unselected="object_hemi_cone.tga" label="" label_selected=""
              left_delta="23" mouse_opaque="true" name="ToolHemiCone" scale_image="TRUE"
-             width="24" />
+      tool_tip="Hemicone" width="30" />
         <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
              height="24" image_disabled="object_sphere.tga"
              image_disabled_selected="object_sphere_active.tga"
              image_selected="object_sphere_active.tga"
              image_unselected="object_sphere.tga" label="" label_selected=""
              left_delta="23" mouse_opaque="true" name="ToolSphere" scale_image="TRUE"
-             width="24" />
+             width="30" tool_tip="Sphere" />
         <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
              height="24" image_disabled="object_hemi_sphere.tga"
              image_disabled_selected="object_hemi_sphere_active.tga"
              image_selected="object_hemi_sphere_active.tga"
              image_unselected="object_hemi_sphere.tga" label="" label_selected=""
              left_delta="23" mouse_opaque="true" name="ToolHemiSphere"
-             scale_image="TRUE" width="24" />
+             scale_image="TRUE" tool_tip="Hemisphere" width="30" />
         <button bottom_delta="-23" follows="left|top" font="SansSerif" halign="center"
              height="24" image_disabled="object_torus.tga"
              image_disabled_selected="object_torus_active.tga"
              image_selected="object_torus_active.tga"
              image_unselected="object_torus.tga" label="" label_selected="" left="4"
-             mouse_opaque="true" name="ToolTorus" scale_image="TRUE" width="24" />
+             mouse_opaque="true" name="ToolTorus" scale_image="TRUE" tool_tip="Torus" width="30" />
         <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
              height="24" image_disabled="object_tube.tga"
              image_disabled_selected="object_tube_active.tga"
              image_selected="object_tube_active.tga" image_unselected="object_tube.tga"
              label="" label_selected="" left_delta="23" mouse_opaque="true"
-             name="ToolTube" scale_image="TRUE" width="24" />
+             name="ToolTube" scale_image="TRUE" tool_tip="Tube" width="30" />
         <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
              height="24" image_disabled="object_ring.tga"
              image_disabled_selected="object_ring_active.tga"
              image_selected="object_ring_active.tga" image_unselected="object_ring.tga"
              label="" label_selected="" left_delta="23" mouse_opaque="true"
-             name="ToolRing" scale_image="TRUE" width="24" />
+             name="ToolRing" scale_image="TRUE" tool_tip="Ring" width="30" />
         <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
              height="24" image_disabled="object_tree.tga"
              image_disabled_selected="object_tree_active.tga"
              image_selected="object_tree_active.tga" image_unselected="object_tree.tga"
              label="" label_selected="" left_delta="23" mouse_opaque="true"
-             name="ToolTree" scale_image="TRUE" width="24" />
+             name="ToolTree" scale_image="TRUE" tool_tip="Tree" width="30" />
         <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
              height="24" image_disabled="object_grass.tga"
              image_disabled_selected="object_grass_active.tga"
              image_selected="object_grass_active.tga"
              image_unselected="object_grass.tga" label="" label_selected=""
-             left_delta="23" mouse_opaque="true" name="ToolGrass" scale_image="TRUE"
-             width="24" />
-        <check_box bottom="-117" control_name="CreateToolKeepSelected" follows="left|top"
+             left_delta="28" mouse_opaque="true" name="ToolGrass" scale_image="TRUE"
+             tool_tip="Grass" width="30" />
+        <check_box bottom="-120" control_name="CreateToolKeepSelected" follows="left|top"
              font="SansSerifSmall" height="16" initial_value="false"
              label="Keep Tool Selected" left="4" mouse_opaque="true"
              name="checkbox sticky" width="128" />
@@ -223,6 +242,9 @@
         <check_box bottom_delta="-15" control_name="CreateToolCopyRotates" follows="left|top"
              font="SansSerifSmall" height="16" initial_value="false" label="Rotate Copy"
              left_delta="0" mouse_opaque="true" name="checkbox copy rotates" width="134" />
+
+<!-- Land panel -->
+
         <check_box bottom="-70" follows="left|top" font="SansSerifSmall" height="16"
              initial_value="false" label="Select Land" left="4" mouse_opaque="true"
              name="radio select land" radio_style="true" width="114" />
@@ -271,8 +293,11 @@
              height="20" label="&lt;&lt; Less" left_delta="0" mouse_opaque="true"
              name="button less" scale_image="TRUE" tool_tip="Advanced Options"
              width="80" />
+
+<!-- Sub-tabs -->
+
         <tab_container bottom="-550" follows="left|top" height="384" left="0" mouse_opaque="false"
-             name="Object Info Tabs" tab_max_width="52" tab_min_width="60"
+             name="Object Info Tabs" tab_max_width="52" tab_min_width="40"
              tab_position="top" width="272">
                 <panel border="true" bottom="-383" follows="left|top|right|bottom" height="367"
                      label="General" left="1" mouse_opaque="false" name="General" width="270">
@@ -437,6 +462,8 @@
                         </text>
                         <combo_box allow_text_entry="false" bottom_delta="-25" follows="left|top" height="18"
                              left="10" max_chars="20" mouse_opaque="true" name="clickaction" width="150">
+                             <!-- Do not reorder these items, the index numbers are
+                                        used internally. JC -->
                                 <combo_item name="Touch/grab(default)" value="Touch/grab (default)">
                                         Touch/grab (default)
                                 </combo_item>
@@ -511,6 +538,9 @@
                                 Must select entire object to set permissions.
                         </string>
                 </panel>
+
+<!-- Object sub-tab -->
+
                 <panel border="true" bottom="-383" follows="left|top|right|bottom" height="367"
                      label="Object" left="1" mouse_opaque="false" name="Object" width="270">
                         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
@@ -552,15 +582,15 @@
                         <spinner bottom_delta="-20" decimal_digits="3" follows="left|top" height="16"
                              increment="0.01" initial_val="0" label="X" label_width="10" left="10"
                              max_val="512" min_val="-256" mouse_opaque="true" name="Pos X"
-                             text_enabled_color="1, 0.25, 0, 1" width="87" />
+                             text_enabled_color="110, 15, 15, 255" width="87" />
                         <spinner bottom_delta="-18" decimal_digits="3" follows="left|top" height="16"
                              increment="0.01" initial_val="0" label="Y" label_width="10" left="10"
                              max_val="512" min_val="-256" mouse_opaque="true" name="Pos Y"
-                             text_enabled_color="0, 1, 0, 1" width="87" />
+                             text_enabled_color="0, 100, 40, 255" width="87" />
                         <spinner bottom_delta="-18" decimal_digits="3" follows="left|top" height="16"
                              increment="0.01" initial_val="0" label="Z" label_width="10" left="10"
-                             max_val="768" min_val="0" mouse_opaque="true" name="Pos Z"
-                             text_enabled_color="0, 0.5, 1, 1" width="87" />
+                             max_val="4096" min_val="0" mouse_opaque="true" name="Pos Z"
+                             text_enabled_color="0, 67, 132, 255" width="87" />
                         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom_delta="-16" drop_shadow_visible="true" follows="left|top"
                              font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
@@ -840,6 +870,9 @@
                                 </combo_item>
                         </combo_box>
                 </panel>
+
+<!-- Features sub-tab -->
+
                 <panel border="true" bottom="-383" follows="left|top|right|bottom" height="367"
                      label="Features" left="1" mouse_opaque="false" name="Features" width="270">
                         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
@@ -916,6 +949,9 @@
                              left_delta="0" max_val="2" min_val="0" mouse_opaque="true"
                              name="Light Falloff" width="128" />
                 </panel>
+
+<!-- Texture sub-tab -->
+
                 <panel border="true" bottom="-383" follows="left|top|right|bottom" height="367"
                      label="Texture" left="1" mouse_opaque="false" name="Texture" width="270">
                         <texture_picker allow_no_texture="false" bottom="-90" can_apply_immediately="true"
@@ -937,12 +973,12 @@
                              mouse_opaque="true" name="ColorTrans" width="80" />
                         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom_delta="-12" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
+                             font="SansSerifSmall" h_pad="0" halign="left" height="10"
                              left="180" mouse_opaque="true" name="glow label" v_pad="0" width="80">
                                 Glow
                         </text>
                         <spinner bottom_delta="-20" decimal_digits="2" follows="left|top" height="16"
-                             hidden="false" increment="0.1" initial_val="0" left="180" max_val="1"
+                             increment="0.1" initial_val="0" left="180" max_val="1"
                              min_val="0" mouse_opaque="true" name="glow" width="80" />
                         <check_box bottom_delta="-23" follows="left|top" font="SansSerifSmall" height="16"
                              initial_value="false" label="Full Bright" left="180" mouse_opaque="true"
@@ -1121,12 +1157,16 @@
                 <panel border="true" bottom="-383" follows="left|top|right|bottom" height="367"
                      label="Content" left="1" mouse_opaque="false" name="Contents" width="270">
                         <button bottom="-30" follows="left|top" font="SansSerif" halign="center" height="20"
-                             label="New Script..." label_selected="New Script..." left="10"
-                             mouse_opaque="true" name="button new script" scale_image="TRUE" width="130" />
-                        <panel bottom_delta="-330" follows="left|top" height="325" left="10"
+                              label="New Script..." label_selected="New Script..."
+                             left="10" mouse_opaque="true" name="button new script" scale_image="TRUE"
+                             width="130" />
+                        <panel bottom_delta="-330" follows="left|top" height="325"  left="10"
                              mouse_opaque="true" name="ContentsInventory" width="252" />
                 </panel>
         </tab_container>
+
+<!-- Land Info sub-tab -->
+
         <panel bottom="-550" follows="left|top" height="384" left="0" mouse_opaque="true"
              name="land info panel" width="272">
                 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
diff --git a/linden/indra/newview/skins/xui/en-us/floater_top_objects.xml b/linden/indra/newview/skins/xui/en-us/floater_top_objects.xml
index a46671f..2003548 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_top_objects.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_top_objects.xml
@@ -18,27 +18,27 @@
              left="10" name="id_text" width="100">
                 Object ID:
         </text>
-        <line_editor bg_readonly_color="clear" bottom_delta="3" enabled="false"
+        <line_editor bottom_delta="3" enabled="false"
              follows="left|bottom|right" font="SansSerifSmall" height="20" left="80"
-             name="id_editor" text_readonly_color="white" width="250" />
+             name="id_editor" width="250" />
         <button bottom_delta="0" follows="bottom|right" height="20" label="Show Beacon"
              name="show_beacon_btn" right="-10" width="100" />
         <text bottom_delta="-30" follows="left|bottom" font="SansSerifSmall" height="20"
              left="10" name="obj_name_text" width="100">
                 Object Name:
         </text>
-        <line_editor bg_readonly_color="clear" bottom_delta="3" enabled="true"
+        <line_editor bottom_delta="3" enabled="true"
              follows="left|bottom|right" font="SansSerifSmall" height="20" left="80"
-             name="object_name_editor" text_readonly_color="white" width="250" />
+             name="object_name_editor" width="250" />
         <button bottom_delta="0" follows="bottom|right" height="20" label="Filter"
              name="filter_object_btn" right="-10" width="100" />
         <text bottom_delta="-30" follows="left|bottom" font="SansSerifSmall" height="20"
              left="10" name="owner_name_text" width="100">
                 Owner Name:
         </text>
-        <line_editor bg_readonly_color="clear" bottom_delta="3" enabled="true"
+        <line_editor bottom_delta="3" enabled="true"
              follows="left|bottom|right" font="SansSerifSmall" height="20" left="80"
-             name="owner_name_editor" text_readonly_color="white" width="250" />
+             name="owner_name_editor" width="250" />
         <button bottom_delta="0" follows="bottom|right" height="20" label="Filter"
              name="filter_owner_btn" right="-10" width="100" />
         <button bottom="35" follows="bottom|left" height="20" label="Return Selected" left="10"
diff --git a/linden/indra/newview/skins/xui/en-us/floater_tos.xml b/linden/indra/newview/skins/xui/en-us/floater_tos.xml
index 4f0a4da..68ddae0 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_tos.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_tos.xml
@@ -34,15 +34,15 @@ you must accept the agreement.
         </text>
         <text_editor bottom="-376" embedded_items="false" follows="left|top" font="SansSerif"
              height="283" left="16" max_length="65536" mouse_opaque="true"
-             name="tos_text" text_readonly_color="1, 1, 1, 1" width="568"
+             name="tos_text" width="568"
              word_wrap="true">
                 TOS_TEXT
         </text_editor>
         <web_browser bottom="-376" embedded_items="false" follows="left|top" font="SansSerif"
              height="283" left="16" max_length="65536" mouse_opaque="true"
              name="tos_html"
-             start_url="data:text/html,%3Chtml%3E%3Chead%3E%3C/head%3E%3Cbody bgcolor=%22#ffffff%22 text=%22000000%22%3E%3Ch1%3E%3Ctt%3Eloading...%3C/tt%3E%3C/h1%3E %3C/body%3E %3C/html%3E"
-             text_readonly_color="1, 1, 1, 1" width="568" word_wrap="true" />
+             start_url="data:text/html,%3Chtml%3E%3Chead%3E%3C/head%3E%3Cbody text=%22000000%22%3E%3Ch1%3E%3Ctt%3Eloading...%3C/tt%3E%3C/h1%3E %3C/body%3E %3C/html%3E"
+             width="568" word_wrap="true" />
         <string name="real_url">
                 http://secondlife.com/app/tos/
         </string>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_water.xml b/linden/indra/newview/skins/xui/en-us/floater_water.xml
index bd63105..5b65837 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_water.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_water.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater bottom="-150" can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="false" height="240" hidden="false" left="50" min_height="200"
+     can_resize="false" height="240" left="50" min_height="200"
      min_width="400" mouse_opaque="true" name="Water Floater"
      rect_control="FloaterAdvancedWaterRect" title="Advanced Water Editor"
      width="700">
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom="-50" drop_shadow_visible="true" follows="left|top|right"
-             font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
+             font="SansSerif" h_pad="0" halign="left" height="16"
              left="10" mouse_opaque="true" name="KeyFramePresetsText" v_pad="0"
              width="110">
                 Water Presets:
@@ -15,22 +15,22 @@
              left_delta="110" max_chars="20" mouse_opaque="true"
              name="WaterPresetsCombo" width="150" />
         <button bottom="-53" enabled="true" font="SansSerif" halign="center" height="20"
-             hidden="false" label="New" label_selected="New" left_delta="170"
+             label="New" label_selected="New" left_delta="170"
              mouse_opaque="true" name="WaterNewPreset" scale_image="true" width="70" />
         <button bottom_delta="0" enabled="true" font="SansSerif" halign="center" height="20"
-             hidden="false" label="Save" label_selected="Save" left_delta="80"
+             label="Save" label_selected="Save" left_delta="80"
              mouse_opaque="true" name="WaterSavePreset" scale_image="true" width="70" />
         <button bottom_delta="0" enabled="true" font="SansSerif" halign="center" height="20"
-             hidden="false" label="Delete" label_selected="Delete" left_delta="80"
+             label="Delete" label_selected="Delete" left_delta="80"
              mouse_opaque="true" name="WaterDeletePreset" scale_image="true" width="70" />
-        <tab_container bottom="-240" follows="left|top" height="180" hidden="false" left="0"
+        <tab_container bottom="-240" follows="left|top" height="180" left="0"
              mouse_opaque="false" name="Water Tabs" tab_position="top" width="700">
                 <panel border="true" bottom="-240" follows="left|top|right|bottom" height="180"
-                     hidden="false" label="Settings" left="1" mouse_opaque="false"
+                     label="Settings" left="1" mouse_opaque="false"
                      name="Settings" width="698">
                         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom="-20" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
+                             font="SansSerif" h_pad="0" halign="left" height="16"
                              left="10" mouse_opaque="true" name="BHText" v_pad="0" width="355">
                                 Water Fog Color
                         </text>
@@ -38,11 +38,11 @@
                              left="160" name="WaterFogColorHelp" width="18" />
                         <color_swatch border_color="0.45098, 0.517647, 0.607843, 1" bottom="-80"
                              can_apply_immediately="true" color="0.5, 0.5, 0.5, 1" follows="left|top"
-                             height="50" hidden="false" label="" left="40" mouse_opaque="true"
+                             height="50" label="" left="40" mouse_opaque="true"
                              name="WaterFogColor" tool_tip="Click to open Color Picker" width="40" />
                         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom="-90" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
+                             font="SansSerif" h_pad="0" halign="left" height="16"
                              left="10" mouse_opaque="true" name="WaterFogDensText" v_pad="0" width="355">
                                 Fog Density Exponent
                         </text>
@@ -55,7 +55,7 @@
                              width="200" />
                         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom="-130" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
+                             font="SansSerif" h_pad="0" halign="left" height="16"
                              left="10" mouse_opaque="true" name="WaterUnderWaterFogModText" v_pad="0"
                              width="355">
                                 Underwater Fog Modifier
@@ -68,7 +68,7 @@
                              name="WaterUnderWaterFogMod" show_text="true" value="0.25" width="200" />
                         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom="-20" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
+                             font="SansSerif" h_pad="0" halign="left" height="16"
                              left="245" mouse_opaque="true" name="BDensText" v_pad="0" width="355">
                                 Reflection Wavelet Scale
                         </text>
@@ -76,19 +76,19 @@
                              left="395" name="WaterNormalScaleHelp" width="18" />
                         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom="-37" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerifSmall" h_pad="0" halign="center" height="16" hidden="false"
+                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
                              left="245" mouse_opaque="true" name="BHText2" v_pad="0" width="10">
                                 1
                         </text>
                         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerifSmall" h_pad="0" halign="center" height="16" hidden="false"
+                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
                              left_delta="0" mouse_opaque="true" name="BHText3" v_pad="0" width="10">
                                 2
                         </text>
                         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerifSmall" h_pad="0" halign="center" height="16" hidden="false"
+                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
                              left_delta="0" mouse_opaque="true" name="BHText4" v_pad="0" width="10">
                                 3
                         </text>
@@ -109,7 +109,7 @@
                              width="200" />
                         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom="-80" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
+                             font="SansSerif" h_pad="0" halign="left" height="16"
                              left="245" mouse_opaque="true" name="HDText" v_pad="0" width="355">
                                 Fresnel Scale
                         </text>
@@ -122,7 +122,7 @@
                              width="200" />
                         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom="-115" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
+                             font="SansSerif" h_pad="0" halign="left" height="16"
                              left="245" mouse_opaque="true" name="FresnelOffsetText" v_pad="0"
                              width="355">
                                 Fresnel Offset
@@ -136,7 +136,7 @@
                              width="200" />
                         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom="-20" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
+                             font="SansSerif" h_pad="0" halign="left" height="16"
                              left="480" mouse_opaque="true" name="DensMultText" v_pad="0" width="355">
                                 Refract Scale Above
                         </text>
@@ -149,7 +149,7 @@
                              width="200" />
                         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom="-53" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
+                             font="SansSerif" h_pad="0" halign="left" height="16"
                              left="480" mouse_opaque="true" name="WaterScaleBelowText" v_pad="0"
                              width="355">
                                 Refract Scale Below
@@ -163,7 +163,7 @@
                              width="200" />
                         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom="-87" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
+                             font="SansSerif" h_pad="0" halign="left" height="16"
                              left="480" mouse_opaque="true" name="MaxAltText" v_pad="0" width="355">
                                 Blur Multiplier
                         </text>
@@ -176,11 +176,11 @@
                              width="200" />
                 </panel>
                 <panel border="true" bottom="-240" follows="left|top|right|bottom" height="180"
-                     hidden="false" label="Image" left="1" mouse_opaque="false" name="Waves"
+                     label="Image" left="1" mouse_opaque="false" name="Waves"
                      width="698">
                         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom="-20" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
+                             font="SansSerif" h_pad="0" halign="left" height="16"
                              left="10" mouse_opaque="true" name="BHText" v_pad="0" width="355">
                                 Big Wave Direction
                         </text>
@@ -188,14 +188,14 @@
                              left="155" name="WaterWave1Help" width="18" />
                         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom="-37" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerifSmall" h_pad="0" halign="center" height="16" hidden="false"
+                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
                              left="10" mouse_opaque="true" name="WaterWave1DirXText" v_pad="0"
                              width="10">
                                 X
                         </text>
                         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerifSmall" h_pad="0" halign="center" height="16" hidden="false"
+                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
                              left_delta="0" mouse_opaque="true" name="WaterWave1DirYText" v_pad="0"
                              width="10">
                                 Y
@@ -212,7 +212,7 @@
                              width="200" />
                         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom="-70" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
+                             font="SansSerif" h_pad="0" halign="left" height="16"
                              left="10" mouse_opaque="true" name="BHText2" v_pad="0" width="355">
                                 Little Wave Direction
                         </text>
@@ -220,14 +220,14 @@
                              left="155" name="WaterWave2Help" width="18" />
                         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom="-87" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerifSmall" h_pad="0" halign="center" height="16" hidden="false"
+                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
                              left="10" mouse_opaque="true" name="WaterWave2DirXText" v_pad="0"
                              width="10">
                                 X
                         </text>
                         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerifSmall" h_pad="0" halign="center" height="16" hidden="false"
+                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
                              left_delta="0" mouse_opaque="true" name="WaterWave2DirYText" v_pad="0"
                              width="10">
                                 Y
@@ -244,7 +244,7 @@
                              width="200" />
                         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom="-20" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
+                             font="SansSerif" h_pad="0" halign="left" height="16"
                              left="240" mouse_opaque="true" name="BHText3" v_pad="0" width="355">
                                 Normal Map
                         </text>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_windlight_options.xml b/linden/indra/newview/skins/xui/en-us/floater_windlight_options.xml
index ff51de0..11859cc 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_windlight_options.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_windlight_options.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater bottom="-150" can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="false" height="220" hidden="false" left="50" min_height="180"
+     can_resize="false" height="220" left="50" min_height="180"
      min_width="400" mouse_opaque="true" name="WindLight floater"
      rect_control="FloaterAdvancedSkyRect" title="Advanced Sky Editor"
      width="700">
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom="-50" drop_shadow_visible="true" follows="left|top|right"
-             font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
+             font="SansSerif" h_pad="0" halign="left" height="16"
              left="10" mouse_opaque="true" name="KeyFramePresetsText" v_pad="0"
              width="110">
                 Sky Presets:
@@ -15,26 +15,26 @@
              left_delta="110" max_chars="20" mouse_opaque="true" name="WLPresetsCombo"
              width="150" />
         <button bottom="-53" enabled="true" font="SansSerif" halign="center" height="20"
-             hidden="false" label="New" label_selected="New" left_delta="170"
+             label="New" label_selected="New" left_delta="170"
              mouse_opaque="true" name="WLNewPreset" scale_image="true" width="70" />
         <button bottom_delta="0" enabled="true" font="SansSerif" halign="center" height="20"
-             hidden="false" label="Save" label_selected="Save" left_delta="80"
+             label="Save" label_selected="Save" left_delta="80"
              mouse_opaque="true" name="WLSavePreset" scale_image="true" width="70" />
         <button bottom_delta="0" enabled="true" font="SansSerif" halign="center" height="20"
-             hidden="false" label="Delete" label_selected="Delete" left_delta="80"
+             label="Delete" label_selected="Delete" left_delta="80"
              mouse_opaque="true" name="WLDeletePreset" scale_image="true" width="70" />
         <button bottom_delta="0" enabled="true" font="SansSerif" halign="center" height="20"
-             hidden="false" label="Day Cycle Editor" label_selected="Day Cycle Editor"
+             label="Day Cycle Editor" label_selected="Day Cycle Editor"
              left_delta="120" mouse_opaque="true" name="WLDayCycleMenuButton"
              scale_image="true" width="120" />
-        <tab_container bottom="-220" follows="left|top" height="160" hidden="false" left="0"
+        <tab_container bottom="-220" follows="left|top" height="160" left="0"
              mouse_opaque="false" name="WindLight Tabs" tab_position="top" width="700">
                 <panel border="true" bottom="-220" follows="left|top|right|bottom" height="160"
-                     hidden="false" label="Atmosphere" left="1" mouse_opaque="false"
+                     label="Atmosphere" left="1" mouse_opaque="false"
                      name="Atmosphere" width="698">
                         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom="-20" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
+                             font="SansSerif" h_pad="0" halign="left" height="16"
                              left="10" mouse_opaque="true" name="BHText" v_pad="0" width="355">
                                 Blue Horizon
                         </text>
@@ -42,25 +42,25 @@
                              left="160" name="WLBlueHorizonHelp" width="18" />
                         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom="-37" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerifSmall" h_pad="0" halign="center" height="16" hidden="false"
+                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
                              left="10" mouse_opaque="true" name="BHText2" v_pad="0" width="10">
                                 R
                         </text>
                         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerifSmall" h_pad="0" halign="center" height="16" hidden="false"
+                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
                              left_delta="0" mouse_opaque="true" name="BHText3" v_pad="0" width="10">
                                 G
                         </text>
                         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerifSmall" h_pad="0" halign="center" height="16" hidden="false"
+                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
                              left_delta="0" mouse_opaque="true" name="BHText4" v_pad="0" width="10">
                                 B
                         </text>
                         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerifSmall" h_pad="0" halign="center" height="16" hidden="false"
+                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
                              left_delta="0" mouse_opaque="true" name="BHText5" v_pad="0" width="10">
                                 I
                         </text>
@@ -86,7 +86,7 @@
                              width="200" />
                         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom="-87" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
+                             font="SansSerif" h_pad="0" halign="left" height="16"
                              left="10" mouse_opaque="true" name="BDensText" v_pad="0" width="355">
                                 Haze Horizon
                         </text>
@@ -99,7 +99,7 @@
                              width="200" />
                         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom="-20" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
+                             font="SansSerif" h_pad="0" halign="left" height="16"
                              left="245" mouse_opaque="true" name="BDensText2" v_pad="0" width="355">
                                 Blue Density
                         </text>
@@ -107,25 +107,25 @@
                              left="395" name="WLBlueDensityHelp" width="18" />
                         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom="-37" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerifSmall" h_pad="0" halign="center" height="16" hidden="false"
+                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
                              left="245" mouse_opaque="true" name="BHText6" v_pad="0" width="10">
                                 R
                         </text>
                         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerifSmall" h_pad="0" halign="center" height="16" hidden="false"
+                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
                              left_delta="0" mouse_opaque="true" name="BHText7" v_pad="0" width="10">
                                 G
                         </text>
                         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerifSmall" h_pad="0" halign="center" height="16" hidden="false"
+                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
                              left_delta="0" mouse_opaque="true" name="BHText8" v_pad="0" width="10">
                                 B
                         </text>
                         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerifSmall" h_pad="0" halign="center" height="16" hidden="false"
+                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
                              left_delta="0" mouse_opaque="true" name="BHText9" v_pad="0" width="10">
                                 I
                         </text>
@@ -151,7 +151,7 @@
                              width="200" />
                         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom="-87" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
+                             font="SansSerif" h_pad="0" halign="left" height="16"
                              left="245" mouse_opaque="true" name="HDText" v_pad="0" width="355">
                                 Haze Density
                         </text>
@@ -164,7 +164,7 @@
                              width="200" />
                         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom="-20" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
+                             font="SansSerif" h_pad="0" halign="left" height="16"
                              left="480" mouse_opaque="true" name="DensMultText" v_pad="0" width="355">
                                 Density Multiplier
                         </text>
@@ -177,7 +177,7 @@
                              width="200" />
                         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom="-53" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
+                             font="SansSerif" h_pad="0" halign="left" height="16"
                              left="480" mouse_opaque="true" name="WLDistanceMultText" v_pad="0"
                              width="355">
                                 Distance Multiplier
@@ -191,7 +191,7 @@
                              width="207" />
                         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom="-87" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
+                             font="SansSerif" h_pad="0" halign="left" height="16"
                              left="480" mouse_opaque="true" name="MaxAltText" v_pad="0" width="355">
                                 Max Altitude
                         </text>
@@ -204,11 +204,11 @@
                              width="205" />
                 </panel>
                 <panel border="true" bottom="-180" follows="left|top|right|bottom" height="160"
-                     hidden="false" label="Lighting" left="1" mouse_opaque="true"
+                     label="Lighting" left="1" mouse_opaque="true"
                      name="Lighting" width="698">
                         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom="-20" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
+                             font="SansSerif" h_pad="0" halign="left" height="16"
                              left="10" mouse_opaque="true" name="SLCText" v_pad="0" width="355">
                                 Sun/Moon Color
                         </text>
@@ -216,25 +216,25 @@
                              left="160" name="WLSunlightColorHelp" width="18" />
                         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom="-37" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerifSmall" h_pad="0" halign="center" height="16" hidden="false"
+                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
                              left="10" mouse_opaque="true" name="BHText" v_pad="0" width="10">
                                 R
                         </text>
                         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerifSmall" h_pad="0" halign="center" height="16" hidden="false"
+                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
                              left_delta="0" mouse_opaque="true" name="BHText2" v_pad="0" width="10">
                                 G
                         </text>
                         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerifSmall" h_pad="0" halign="center" height="16" hidden="false"
+                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
                              left_delta="0" mouse_opaque="true" name="BHText3" v_pad="0" width="10">
                                 B
                         </text>
                         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerifSmall" h_pad="0" halign="center" height="16" hidden="false"
+                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
                              left_delta="0" mouse_opaque="true" name="BHText4" v_pad="0" width="10">
                                 I
                         </text>
@@ -260,7 +260,7 @@
                              width="200" />
                         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom="-87" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
+                             font="SansSerif" h_pad="0" halign="left" height="16"
                              left="10" mouse_opaque="true" name="TODText" v_pad="0" width="355">
                                 Sun/Moon Position
                         </text>
@@ -275,7 +275,7 @@
                              width="204" />
                         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom="-20" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
+                             font="SansSerif" h_pad="0" halign="left" height="16"
                              left="245" mouse_opaque="true" name="WLAmbientText" v_pad="0" width="355">
                                 Ambient
                         </text>
@@ -283,25 +283,25 @@
                              left="395" name="WLAmbientHelp" width="18" />
                         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom="-37" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerifSmall" h_pad="0" halign="center" height="16" hidden="false"
+                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
                              left="245" mouse_opaque="true" name="BHText5" v_pad="0" width="10">
                                 R
                         </text>
                         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerifSmall" h_pad="0" halign="center" height="16" hidden="false"
+                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
                              left_delta="0" mouse_opaque="true" name="BHText6" v_pad="0" width="10">
                                 G
                         </text>
                         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerifSmall" h_pad="0" halign="center" height="16" hidden="false"
+                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
                              left_delta="0" mouse_opaque="true" name="BHText7" v_pad="0" width="10">
                                 B
                         </text>
                         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerifSmall" h_pad="0" halign="center" height="16" hidden="false"
+                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
                              left_delta="0" mouse_opaque="true" name="BHText8" v_pad="0" width="10">
                                 I
                         </text>
@@ -326,7 +326,7 @@
                              width="200" />
                         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom="-87" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
+                             font="SansSerif" h_pad="0" halign="left" height="16"
                              left="245" mouse_opaque="true" name="WLEastAngleText" v_pad="0" width="355">
                                 East Angle
                         </text>
@@ -339,7 +339,7 @@
                              width="200" />
                         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom="-20" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
+                             font="SansSerif" h_pad="0" halign="left" height="16"
                              left="480" mouse_opaque="true" name="SunGlowText" v_pad="0" width="355">
                                 Sun Glow
                         </text>
@@ -355,7 +355,7 @@
                              mouse_opaque="true" name="WLGlowR" show_text="true" value="1.0" width="200" />
                         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom="-67" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
+                             font="SansSerif" h_pad="0" halign="left" height="16"
                              left="480" mouse_opaque="true" name="SceneGammaText" v_pad="0" width="200">
                                 Scene Gamma
                         </text>
@@ -367,7 +367,7 @@
                              mouse_opaque="true" name="WLGamma" show_text="true" value="2.0" width="207" />
                         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom="-102" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
+                             font="SansSerif" h_pad="0" halign="left" height="16"
                              left="480" mouse_opaque="true" name="WLStarText" v_pad="0" width="355">
                                 Star Brightness
                         </text>
@@ -380,11 +380,11 @@
                              width="200" />
                 </panel>
                 <panel border="true" bottom="-180" follows="left|top|right|bottom" height="160"
-                     hidden="false" label="Clouds" left="1" mouse_opaque="false" name="Clouds"
+                     label="Clouds" left="1" mouse_opaque="false" name="Clouds"
                      width="698">
                         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom="-20" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
+                             font="SansSerif" h_pad="0" halign="left" height="16"
                              left="10" mouse_opaque="true" name="WLCloudColorText" v_pad="0" width="355">
                                 Cloud Color
                         </text>
@@ -392,25 +392,25 @@
                              left="160" name="WLCloudColorHelp" width="18" />
                         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom="-37" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerifSmall" h_pad="0" halign="center" height="16" hidden="false"
+                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
                              left="10" mouse_opaque="true" name="BHText" v_pad="0" width="10">
                                 R
                         </text>
                         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerifSmall" h_pad="0" halign="center" height="16" hidden="false"
+                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
                              left_delta="0" mouse_opaque="true" name="BHText2" v_pad="0" width="10">
                                 G
                         </text>
                         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerifSmall" h_pad="0" halign="center" height="16" hidden="false"
+                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
                              left_delta="0" mouse_opaque="true" name="BHText3" v_pad="0" width="10">
                                 B
                         </text>
                         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerifSmall" h_pad="0" halign="center" height="16" hidden="false"
+                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
                              left_delta="0" mouse_opaque="true" name="BHText4" v_pad="0" width="10">
                                 I
                         </text>
@@ -436,7 +436,7 @@
                              width="200" />
                         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom="-87" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
+                             font="SansSerif" h_pad="0" halign="left" height="16"
                              left="10" mouse_opaque="true" name="WLCloudColorText2" v_pad="0"
                              width="355">
                                 Cloud XY/Density
@@ -445,19 +445,19 @@
                              left="160" name="WLCloudDensityHelp" width="18" />
                         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom="-103" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerifSmall" h_pad="0" halign="center" height="16" hidden="false"
+                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
                              left="10" mouse_opaque="true" name="BHText5" v_pad="0" width="10">
                                 X
                         </text>
                         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerifSmall" h_pad="0" halign="center" height="16" hidden="false"
+                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
                              left_delta="0" mouse_opaque="true" name="BHText6" v_pad="0" width="10">
                                 Y
                         </text>
                         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerifSmall" h_pad="0" halign="center" height="16" hidden="false"
+                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
                              left_delta="0" mouse_opaque="true" name="BHText7" v_pad="0" width="10">
                                 D
                         </text>
@@ -477,7 +477,7 @@
                              width="200" />
                         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom="-20" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
+                             font="SansSerif" h_pad="0" halign="left" height="16"
                              left="245" mouse_opaque="true" name="WLCloudCoverageText" v_pad="0"
                              width="355">
                                 Cloud Coverage
@@ -491,7 +491,7 @@
                              width="200" />
                         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom="-55" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
+                             font="SansSerif" h_pad="0" halign="left" height="16"
                              left="245" mouse_opaque="true" name="WLCloudScaleText" v_pad="0"
                              width="355">
                                 Cloud Scale
@@ -505,7 +505,7 @@
                              width="200" />
                         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom="-87" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
+                             font="SansSerif" h_pad="0" halign="left" height="16"
                              left="245" mouse_opaque="true" name="WLCloudDetailText" v_pad="0"
                              width="355">
                                 Cloud Detail (XY/Density)
@@ -514,19 +514,19 @@
                              left="395" name="WLCloudDetailHelp" width="18" />
                         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom="-103" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerifSmall" h_pad="0" halign="center" height="16" hidden="false"
+                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
                              left="245" mouse_opaque="true" name="BHText8" v_pad="0" width="10">
                                 X
                         </text>
                         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerifSmall" h_pad="0" halign="center" height="16" hidden="false"
+                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
                              left_delta="0" mouse_opaque="true" name="BHText9" v_pad="0" width="10">
                                 Y
                         </text>
                         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerifSmall" h_pad="0" halign="center" height="16" hidden="false"
+                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
                              left_delta="0" mouse_opaque="true" name="BHText10" v_pad="0" width="10">
                                 D
                         </text>
@@ -547,7 +547,7 @@
                              value="1.0" width="200" />
                         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom="-20" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
+                             font="SansSerif" h_pad="0" halign="left" height="16"
                              left="480" mouse_opaque="true" name="WLCloudScrollXText" v_pad="0"
                              width="355">
                                 Cloud Scroll X
@@ -564,7 +564,7 @@
                              width="200" />
                         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom="-60" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
+                             font="SansSerif" h_pad="0" halign="left" height="16"
                              left="480" mouse_opaque="true" name="WLCloudScrollYText" v_pad="0"
                              width="355">
                                 Cloud Scroll Y
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 bd74b05..b8341f2 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
@@ -180,9 +180,8 @@
              mouse_opaque="true" name="search_label" v_pad="0" width="222">
                 Search Results:
         </text>
-        <scroll_list background_visible="false" bottom_delta="-306" draw_border="true"
-             draw_stripes="false" fg_disable_color="1, 1, 1, 1"
-             fg_selected_color="1, 1, 1, 1" fg_unselected_color="1, 1, 1, 1"
+        <scroll_list background_visible="true" bottom_delta="-306" draw_border="true"
+             draw_stripes="false" 
              follows="top|right|bottom" height="300" left="1013" multi_select="false"
              name="search_results" width="222">
                 <column label="" name="icon" width="16" />
@@ -203,7 +202,7 @@
              mouse_opaque="true" name="spin y"
              tool_tip="Y coordinate of location to show on map" width="66" />
         <spinner bottom_delta="0" decimal_digits="0" follows="bottom|right" height="16"
-             increment="1" initial_val="0" left_delta="68" max_val="768" min_val="0"
+             increment="1" initial_val="0" left_delta="68" max_val="4096" min_val="0"
              mouse_opaque="true" name="spin z"
              tool_tip="Z coordinate of location to show on map" width="66" />
         <button bottom="-625" follows="right|bottom" font="SansSerif" halign="center"
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 925c2a4..31288ac 100644
--- a/linden/indra/newview/skins/xui/en-us/menu_inventory.xml
+++ b/linden/indra/newview/skins/xui/en-us/menu_inventory.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<menu bottom="100" color="0, 0, 0, 1" drop_shadow="true" height="101" left="100"
+<menu bottom="100" color="MenuDefaultBgColor" drop_shadow="true" height="101" left="100"
      mouse_opaque="false" name="Popup" opaque="true" width="128">
         <menu_item_call bottom_delta="-18" height="18" label="Buy" left="0" mouse_opaque="true"
              name="Task Buy" width="128">
@@ -49,7 +49,7 @@
              name="New Gesture" width="128">
                 <on_click filter="" function="Inventory.DoCreate" userdata="gesture" />
         </menu_item_call>
-        <menu bottom_delta="0" color="0, 0, 0, 1" drop_shadow="true" height="175" left="0"
+        <menu bottom_delta="0" color="MenuDefaultBgColor" drop_shadow="true" height="175" left="0"
              mouse_opaque="false" name="New Clothes" opaque="true" tear_off="false"
              width="125">
                 <menu_item_call bottom_delta="-18" height="18" label="New Shirt" left="0" mouse_opaque="true"
@@ -89,7 +89,7 @@
                         <on_click filter="" function="Inventory.DoCreate" userdata="underpants" />
                 </menu_item_call>
         </menu>
-        <menu bottom_delta="0" color="0, 0, 0, 1" drop_shadow="true" height="175" left="0"
+        <menu bottom_delta="0" color="MenuDefaultBgColor" drop_shadow="true" height="175" left="0"
              mouse_opaque="false" name="New Body Parts" opaque="true" tear_off="false"
              width="125">
                 <menu_item_call bottom_delta="-18" height="18" label="New Shape" left="0" mouse_opaque="true"
diff --git a/linden/indra/newview/skins/xui/en-us/menu_login.xml b/linden/indra/newview/skins/xui/en-us/menu_login.xml
index 92170ae..d7ff80b 100644
--- a/linden/indra/newview/skins/xui/en-us/menu_login.xml
+++ b/linden/indra/newview/skins/xui/en-us/menu_login.xml
@@ -20,7 +20,7 @@
         </menu>

         <menu bottom="219" create_jump_keys="true" drop_shadow="true" enabled="true"

              height="317" label="Help" left="80" mouse_opaque="false" name="Help"

-             opaque="true" tear_off="falsoe" width="166">

+             opaque="true" tear_off="false" width="166">

                 <menu_item_call bottom="-29" enabled="true" height="19" label="Second Life Help" left="0"

                      mouse_opaque="true" name="Second Life Help" shortcut="F1" width="166">

                         <on_click function="ShowFloater" userdata="help f1" />

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 2d07c98..cdba314 100644
--- a/linden/indra/newview/skins/xui/en-us/menu_viewer.xml
+++ b/linden/indra/newview/skins/xui/en-us/menu_viewer.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <menu_bar bottom="-18" drop_shadow="false" enabled="true" follows="left|top|right"
-     height="18" left="0" mouse_opaque="true" name="Main Menu" opaque="true"
+     height="18" left="0" mouse_opaque="true" name="Main Menu" opaque="false"
      tear_off="false" width="802">
         <menu bottom="273" create_jump_keys="true" drop_shadow="true" enabled="true"
              height="263" label="File" left="0" mouse_opaque="false" name="File"
@@ -62,11 +62,6 @@
                 </menu_item_call>
                 <menu_item_separator bottom="-194" enabled="true" height="8" label="-----------" left="0"
                      mouse_opaque="true" name="separator4" width="243" />
-                <menu_item_call bottom="-213" enabled="true" height="19" label="Start/Stop Movie to Disk"
-                     left="0" mouse_opaque="true" name="Start/Stop Movie to Disk"
-                     shortcut="control|shift|A" width="243">
-                        <on_click function="File.SaveMovie" userdata="" />
-                </menu_item_call>
                 <menu bottom="-554" create_jump_keys="true" drop_shadow="true" enabled="true"
                      height="117" label="Set Window Size" left="0" mouse_opaque="false"
                      name="Set Window Size" opaque="true" tear_off="true" width="125">
@@ -270,6 +265,12 @@
                         <on_click function="View.BuildMode" userdata="" />
                         <on_check function="View.CheckBuildMode" />
                 </menu_item_check>
+                <menu_item_check bottom="-48" enabled="true" height="19" label="Joystick Flycam" left="0"
+                     mouse_opaque="true" name="Joystick Flycam" shortcut="alt|shift|F"
+                     width="211">
+                        <on_click function="View.JoystickFlycam" userdata="" />
+                        <on_check function="View.CheckJoystickFlycam" />
+                </menu_item_check>
                 <menu_item_call bottom="-67" enabled="true" height="19" label="Reset View" left="0"
                      mouse_opaque="true" name="Reset View" shortcut="Esc" width="211">
                         <on_click function="View.ResetView" userdata="" />
@@ -437,26 +438,26 @@
                                 <on_click function="View.ToggleRenderType" userdata="hideparticles" />
                                 <on_check function="View.CheckRenderType" userdata="hideparticles" />
                         </menu_item_check>
-                        <menu_item_separator bottom="-186" enabled="true" height="8" hidden="false" label="-----------"
-                             left="0" mouse_opaque="true" name="separator3" width="129" />
+                        <menu_item_separator bottom="-186" enabled="true" height="8" label="-----------" left="0"
+                             mouse_opaque="true" name="separator3" width="129" />
                         <menu bottom="-205" color="0 0 0 1" create_jump_keys="true" drop_shadow="true"
-                             enabled="true" height="117" hidden="false" label="Beacon Width" left="0"
+                             enabled="true" height="117" label="Beacon Width" left="0"
                              mouse_opaque="false" name="Beacon Width" opaque="true" tear_off="true"
                              width="129">
-                                <menu_item_call bottom="-19" enabled="true" height="19" hidden="false" label="1" left="0"
-                                     mouse_opaque="true" name="Beacon Width 1" width="188">
+                                <menu_item_call bottom="-19" enabled="true" height="19" label="1" left="0" mouse_opaque="true"
+                                     name="Beacon Width 1" width="188">
                                         <on_click function="View.BeaconWidth" userdata="1" />
                                 </menu_item_call>
-                                <menu_item_call bottom="-19" enabled="true" height="19" hidden="false" label="4" left="0"
-                                     mouse_opaque="true" name="Beacon Width 4" width="188">
+                                <menu_item_call bottom="-19" enabled="true" height="19" label="4" left="0" mouse_opaque="true"
+                                     name="Beacon Width 4" width="188">
                                         <on_click function="View.BeaconWidth" userdata="4" />
                                 </menu_item_call>
-                                <menu_item_call bottom="-19" enabled="true" height="19" hidden="false" label="16" left="0"
-                                     mouse_opaque="true" name="Beacon Width 16" width="188">
+                                <menu_item_call bottom="-19" enabled="true" height="19" label="16" left="0" mouse_opaque="true"
+                                     name="Beacon Width 16" width="188">
                                         <on_click function="View.BeaconWidth" userdata="16" />
                                 </menu_item_call>
-                                <menu_item_call bottom="-19" enabled="true" height="19" hidden="false" label="32" left="0"
-                                     mouse_opaque="true" name="Beacon Width 32" width="188">
+                                <menu_item_call bottom="-19" enabled="true" height="19" label="32" left="0" mouse_opaque="true"
+                                     name="Beacon Width 32" width="188">
                                         <on_click function="View.BeaconWidth" userdata="32" />
                                 </menu_item_call>
                         </menu>
@@ -500,10 +501,6 @@
                      mouse_opaque="true" name="Chat" shortcut="" width="185">
                         <on_click function="World.Chat" userdata="" />
                 </menu_item_call>
-                <menu_item_call bottom="-48" enabled="true" height="19" label="Start Gesture" left="0"
-                     mouse_opaque="true" name="Start Gesture" shortcut="/" width="185">
-                        <on_click function="World.StartGesture" userdata="" />
-                </menu_item_call>
                 <menu_item_check bottom="-67" enabled="true" height="19" label="Always Run" left="0"
                      mouse_opaque="true" name="Always Run" shortcut="control|R" width="185">
                         <on_click function="World.AlwaysRun" userdata="" />
@@ -544,6 +541,10 @@
                      mouse_opaque="true" name="Set Busy" width="185">
                         <on_click function="World.SetBusy" userdata="" />
                 </menu_item_call>
+                <menu_item_call bottom="-281" enabled="false" height="19" label="Stop All Animations" left="0"
+                     mouse_opaque="true" name="Stop All Animations" width="250">
+                        <on_click function="Tools.StopAllAnimations" userdata="" />
+                </menu_item_call>
                 <menu_item_separator bottom="-213" enabled="true" height="8" label="-----------" left="0"
                      mouse_opaque="true" name="separator4" width="185" />
                 <menu_item_call bottom="-232" enabled="true" height="19" label="Account History..." left="0"
@@ -604,18 +605,17 @@
                              left="0" mouse_opaque="true" name="Revert to Region Default" width="169">
                                 <on_click function="World.EnvSettings" userdata="default" />
                         </menu_item_call>
-                        <menu_item_separator bottom="-113" enabled="true" height="8" hidden="false" label="-----------"
-                             left="0" mouse_opaque="true" name="separator" width="169" />
-                        <menu_item_call bottom="-132" enabled="false" height="19" hidden="false"
-                             label="Environment Editor" left="0" mouse_opaque="true"
-                             name="Environment Editor" width="169">
+                        <menu_item_separator bottom="-113" enabled="true" height="8" label="-----------" left="0"
+                             mouse_opaque="true" name="separator" width="169" />
+                        <menu_item_call bottom="-132" enabled="false" height="19" label="Environment Editor" left="0"
+                             mouse_opaque="true" name="Environment Editor" width="169">
                                 <on_click function="World.EnvSettings" userdata="editor" />
                         </menu_item_call>
                 </menu>
         </menu>
         <menu bottom="-18" create_jump_keys="true" drop_shadow="true" enabled="true"
              height="510" label="Tools" left="0" mouse_opaque="false" name="Tools"
-             opaque="true" tear_off="true" width="250">
+             opaque="true" tear_off="true" visible="false" width="250">
                 <menu bottom="-554" create_jump_keys="true" drop_shadow="true" enabled="true"
                      height="109" label="Select Tool" left="0" mouse_opaque="false"
                      name="Select Tool" opaque="true" tear_off="true" width="118">
@@ -720,12 +720,6 @@
                 </menu_item_call>
                 <menu_item_separator bottom="-289" enabled="true" height="8" label="-----------" left="0"
                      mouse_opaque="true" name="separator4" width="250" />
-                <menu_item_call bottom="-281" enabled="false" height="19" label="Stop All Animations" left="0"
-                     mouse_opaque="true" name="Stop All Animations" width="250">
-                        <on_click function="Tools.StopAllAnimations" userdata="" />
-                </menu_item_call>
-                <menu_item_separator bottom="-289" enabled="true" height="8" label="-----------" left="0"
-                     mouse_opaque="true" name="separator5" width="250" />
                 <menu_item_call bottom="-308" enabled="false" height="19" label="Focus on Selection" left="0"
                      mouse_opaque="true" name="Focus on Selection" shortcut="H" width="250">
                         <on_click function="Tools.LookAtSelection" userdata="focus" />
@@ -789,46 +783,6 @@
                         <on_click function="Tools.SelectedScriptAction" userdata="stop" />
                         <on_enable function="EditableSelected" />
                 </menu_item_call>
-                <menu_item_separator bottom="-411" enabled="true" height="8" label="-----------" left="0"
-                     mouse_opaque="true" name="separator7" width="250" />
-                <menu bottom="-554" create_jump_keys="true" drop_shadow="true" enabled="true"
-                     height="109" label="Bug Reporting" left="0" mouse_opaque="false"
-                     name="Bug Reporting" opaque="true" tear_off="true" width="118">
-                        <menu_item_call bottom="-94" enabled="true" height="19" label="Public Issue Tracker..."
-                             left="0" mouse_opaque="true" name="Public Issue Tracker..." width="166">
-                                <on_click function="PromptShowURL"
-                                     userdata="WebLaunchPublicIssue,http://jira.secondlife.com" />
-                        </menu_item_call>
-                        <menu_item_call bottom="-94" enabled="true" height="19" label="Public Issue Tracker Help..."
-                             left="0" mouse_opaque="true" name="Publc Issue Tracker Help..." width="166">
-                                <on_click function="PromptShowURL"
-                                     userdata="WebLaunchPublicIssueHelp,http://wiki.secondlife.com/wiki/Issue_tracker" />
-                        </menu_item_call>
-                        <menu_item_separator bottom="-411" enabled="true" height="8" label="-----------" left="0"
-                             mouse_opaque="true" name="separator7" width="250" />
-                        <menu_item_call bottom="-94" enabled="true" height="19" label="Bug Reporting 101..." left="0"
-                             mouse_opaque="true" name="Bug Reporing 101..." width="166">
-                                <on_click function="PromptShowURL"
-                                     userdata="WebLaunchBugReport101,http://wiki.secondlife.com/wiki/Bug_Reporting_101" />
-                        </menu_item_call>
-                        <menu_item_call bottom="-94" enabled="true" height="19" label="Security Issues..." left="0"
-                             mouse_opaque="true" name="Security Issues..." width="166">
-                                <on_click function="PromptShowURL"
-                                     userdata="WebLaunchSecurityIssues,http://wiki.secondlife.com/wiki/Security_issues" />
-                        </menu_item_call>
-                        <menu_item_call bottom="-94" enabled="true" height="19" label="QA Wiki..." left="0"
-                             mouse_opaque="true" name="QA Wiki..." width="166">
-                                <on_click function="PromptShowURL"
-                                     userdata="WebLaunchQAWiki,http://wiki.secondlife.com/wiki/QA_Portal" />
-                        </menu_item_call>
-                        <menu_item_separator bottom="-411" enabled="true" height="8" label="-----------" left="0"
-                             mouse_opaque="true" name="separator72" width="250" />
-                        <menu_item_call bottom="-240" enabled="true" height="19" label="Report Bug..." left="0"
-                             mouse_opaque="true" name="Report Bug..." width="166">
-                                <on_click function="PromptShowURL"
-                                     userdata="WebLaunchPublicIssue,http://jira.secondlife.com" />
-                        </menu_item_call>
-                </menu>
         </menu>
         <menu bottom="219" create_jump_keys="true" drop_shadow="true" enabled="true"
              height="317" label="Help" left="227" mouse_opaque="false" name="Help"
@@ -837,6 +791,10 @@
                      mouse_opaque="true" name="Second Life Help" shortcut="F1" width="166">
                         <on_click function="ShowFloater" userdata="help f1" />
                 </menu_item_call>
+                <menu_item_call bottom="-48" enabled="true" height="19" label="Tutorial" left="0"
+                     mouse_opaque="true" name="Tutorial" width="166">
+                        <on_click function="ShowFloater" userdata="help tutorial" />
+                </menu_item_call>
                 <menu_item_separator bottom="-75" enabled="true" height="8" label="-----------" left="0"
                      mouse_opaque="true" name="separator" width="166" />
                 <menu_item_call bottom="-94" enabled="true" height="19" label="Official Linden Blog..."
@@ -857,12 +815,6 @@
                 </menu_item_call>
                 <menu_item_separator bottom="-148" enabled="true" height="8" label="-----------" left="0"
                      mouse_opaque="true" name="separator3" width="166" />
-                <menu_item_call bottom="-167" enabled="true" height="19" label="Message of the Day..." left="0"
-                     mouse_opaque="true" name="Message of the Day..." width="166">
-                        <on_click function="Help.MOTD" userdata="" />
-                </menu_item_call>
-                <menu_item_separator bottom="-175" enabled="true" height="8" label="-----------" left="0"
-                     mouse_opaque="true" name="separator4" width="166" />
                 <menu_item_call bottom="-194" enabled="true" height="19" label="Report Abuse..." left="0"
                      mouse_opaque="true" name="Report Abuse..." width="166">
                         <on_click function="ShowFloater" userdata="complaint reporter" />
@@ -875,6 +827,46 @@
                 <menu_item_call label="Lag Meter" name="Lag Meter">
                         <on_click function="ShowFloater" userdata="lag meter" />
                 </menu_item_call>
+                <menu_item_separator bottom="-411" enabled="true" height="8" label="-----------" left="0"
+                     mouse_opaque="true" name="separator7" width="250" />
+                <menu bottom="-554" create_jump_keys="true" drop_shadow="true" enabled="true"
+                     height="109" label="Bug Reporting" left="0" mouse_opaque="false"
+                     name="Bug Reporting" opaque="true" tear_off="true" width="118">
+                        <menu_item_call bottom="-94" enabled="true" height="19" label="Public Issue Tracker..."
+                             left="0" mouse_opaque="true" name="Public Issue Tracker..." width="166">
+                                <on_click function="PromptShowURL"
+                                     userdata="WebLaunchPublicIssue,http://jira.secondlife.com" />
+                        </menu_item_call>
+                        <menu_item_call bottom="-94" enabled="true" height="19" label="Public Issue Tracker Help..."
+                             left="0" mouse_opaque="true" name="Publc Issue Tracker Help..." width="166">
+                                <on_click function="PromptShowURL"
+                                     userdata="WebLaunchPublicIssueHelp,http://wiki.secondlife.com/wiki/Issue_tracker" />
+                        </menu_item_call>
+                        <menu_item_separator bottom="-411" enabled="true" height="8" label="-----------" left="0"
+                             mouse_opaque="true" name="separator7" width="250" />
+                        <menu_item_call bottom="-94" enabled="true" height="19" label="Bug Reporting 101..." left="0"
+                             mouse_opaque="true" name="Bug Reporing 101..." width="166">
+                                <on_click function="PromptShowURL"
+                                     userdata="WebLaunchBugReport101,http://wiki.secondlife.com/wiki/Bug_Reporting_101" />
+                        </menu_item_call>
+                        <menu_item_call bottom="-94" enabled="true" height="19" label="Security Issues..." left="0"
+                             mouse_opaque="true" name="Security Issues..." width="166">
+                                <on_click function="PromptShowURL"
+                                     userdata="WebLaunchSecurityIssues,http://wiki.secondlife.com/wiki/Security_issues" />
+                        </menu_item_call>
+                        <menu_item_call bottom="-94" enabled="true" height="19" label="QA Wiki..." left="0"
+                             mouse_opaque="true" name="QA Wiki..." width="166">
+                                <on_click function="PromptShowURL"
+                                     userdata="WebLaunchQAWiki,http://wiki.secondlife.com/wiki/QA_Portal" />
+                        </menu_item_call>
+                        <menu_item_separator bottom="-411" enabled="true" height="8" label="-----------" left="0"
+                             mouse_opaque="true" name="separator9" width="250" />
+                        <menu_item_call bottom="-240" enabled="true" height="19" label="Report Bug..." left="0"
+                             mouse_opaque="true" name="Report Bug..." width="166">
+                                <on_click function="PromptShowURL"
+                                     userdata="WebLaunchPublicIssue,http://jira.secondlife.com" />
+                        </menu_item_call>
+                </menu>
                 <menu_item_separator bottom="-221" enabled="true" height="8" label="-----------" left="0"
                      mouse_opaque="true" name="separator5" width="166" />
                 <menu_item_call bottom="-121" enabled="true" height="19" label="Release Notes..." left="0"
diff --git a/linden/indra/newview/skins/xui/en-us/mime_types.xml b/linden/indra/newview/skins/xui/en-us/mime_types.xml
index 0427727..a0ac9d8 100644
--- a/linden/indra/newview/skins/xui/en-us/mime_types.xml
+++ b/linden/indra/newview/skins/xui/en-us/mime_types.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<mimetypes>
+<mimetypes name="default">
         <defaultlabel>
                 (Unknown)
         </defaultlabel>
@@ -40,7 +40,7 @@
                         video/*
                 </default_type>
                 <icon>
-                        icn_media.tga
+                        icn_media_movie.tga
                 </icon>
                 <tooltip>
                         There is a movie to play here
@@ -130,7 +130,7 @@
                         movie
                 </widgettype>
         </scheme>
-        <mimetype name="">
+        <mimetype name="blank">
                 <label>
                         - None -
                 </label>
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 13200e8..b9877c8 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_audio.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_audio.xml
@@ -4,7 +4,7 @@
         <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="200" />
+             name="System Volume" show_text="false" volume="true" width="180" />
         <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"
@@ -12,7 +12,7 @@
         <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="200" />
+             show_text="false" volume="true" width="180" />
         <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"
@@ -20,7 +20,7 @@
         <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="200" />
+             show_text="false" volume="true" width="180" />
         <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"
@@ -28,7 +28,7 @@
         <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="200" />
+             show_text="false" volume="true" width="180" />
         <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"
@@ -36,7 +36,7 @@
         <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="200" />
+             show_text="false" volume="true" width="180" />
         <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"
@@ -44,7 +44,7 @@
         <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="200" />
+             show_text="false" volume="true" width="180" />
         <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"
@@ -52,7 +52,7 @@
         <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="200" />
+             volume="true" width="180" />
         <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"
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 53d25c0..78884cd 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_avatar.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_avatar.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel bottom="-550" height="486" left="350" name="Panel Avatar" width="430">
         <tab_container bottom="-486" height="486" left="0" mouse_opaque="false" name="tab"
-             tab_min_width="50" tab_position="top" width="420">
+             tab_min_width="50" tab_position="top" width="419">
                 <panel border="true" bottom="-482" follows="left|top|right|bottom" height="466"
                      label="2nd Life" left="1" mouse_opaque="true" name="2nd Life" width="418">
                         <string name="CaptionTextAcctInfo">
@@ -42,11 +42,11 @@
                              mouse_opaque="true" name="Name:" v_pad="0" width="70">
                                 Name:
                         </text>
-                        <name_editor bevel_style="in" bg_readonly_color="0, 0, 0, 0" border_style="line"
+                        <name_editor bevel_style="in" border_style="line"
                              border_thickness="1" bottom="-24" enabled="false" follows="left|top"
                              font="SansSerifSmall" height="16" is_unicode="false" left_delta="75"
                              max_length="254" mouse_opaque="false" name="name"
-                             text_readonly_color="1, 1, 1, 1" width="180" />
+                             width="180" />
                         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom="-24" drop_shadow_visible="true" follows="left|top"
                              font="SansSerifsmall" h_pad="0" halign="left" height="16" left="279"
@@ -59,11 +59,11 @@
                              mouse_opaque="true" name="label" v_pad="0" width="121">
                                 Born:
                         </text>
-                        <line_editor bevel_style="in" bg_readonly_color="0, 0, 0, 0" border_style="line"
+                        <line_editor bevel_style="in" border_style="line"
                              border_thickness="1" bottom_delta="-16" enabled="true" follows="left|top"
                              font="SansSerifSmall" height="16" is_unicode="false" left="279"
                              max_length="254" mouse_opaque="false" name="born"
-                             text_readonly_color="1, 1, 1, 1" width="121" />
+                             width="121" />
                         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom_delta="-20" drop_shadow_visible="true" follows="left|top"
                              font="SansSerifSmall" h_pad="0" halign="left" height="16" left="279"
@@ -72,10 +72,10 @@
                         </text>
                         <view_border bevel_style="in" bottom_delta="-48" follows="left|top" height="48" left="279"
                              mouse_opaque="false" name="acct_border" width="121" />
-                        <text bg_color="0, 0, 0, 0" bg_visible="false" border_drop_shadow_visible="false"
+                        <text bg_visible="false" border_drop_shadow_visible="false"
                              border_visible="true" bottom_delta="0" drop_shadow_visible="true"
                              follows="left|top" font="SansSerifSmall" height="48" left="279"
-                             mouse_opaque="false" name="acct" text_color="1, 1, 1, 1" width="121" />
+                             mouse_opaque="false" name="acct" width="121" />
                         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom_delta="-20" drop_shadow_visible="true" follows="left|top"
                              font="SansSerifSmall" h_pad="0" halign="left" height="16" left="279"
@@ -84,18 +84,17 @@
                              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"
+                        <button bottom_delta="2" follows="left|top" font="SansSerif" halign="center"
+                             height="16" label="i" label_selected="i" left_delta="44"
                              mouse_opaque="true" name="partner_info"
                              tool_tip="Click to open partner&apos;s profile" width="18" />
                         <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
-                             height="18" label="?" label_selected="?" left_delta="24"
+                             height="16" 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"
+                        <line_editor bevel_style="in" border_style="line"
                              border_thickness="1" bottom_delta="-16" enabled="true" follows="left|top"
                              font="SansSerifSmall" height="16" is_unicode="false" left="279"
                              max_length="254" mouse_opaque="false" name="partner_edit"
-                             text_readonly_color="1, 1, 1, 1"
                              tool_tip="Second Life partner. For more info on how to set, see www.secondlife.com/partner"
                              width="121">
                                 [FIRST] [LAST]
@@ -116,8 +115,7 @@
                              mouse_opaque="true" name="Groups:" v_pad="0" width="70">
                                 Groups:
                         </text>
-                        <scroll_list background_visible="false" bottom="-258" column_padding="5" draw_border="true"
-                             fg_disable_color="1, 1, 1, 1" fg_unselected_color="1, 1, 1, 1"
+                        <scroll_list background_visible="true" bottom="-258" column_padding="5" draw_border="true"
                              follows="left|top" height="90" left="79" mouse_opaque="false"
                              multi_select="false" name="groups" width="321" />
                         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
@@ -132,10 +130,10 @@
                              mouse_opaque="true" name="(500 chars)" v_pad="0" width="70">
                                 (500 chars)
                         </text>
-                        <text_editor bg_readonly_color="0, 0, 0, 0" bottom="-375" embedded_items="false"
+                        <text_editor bottom="-375" embedded_items="false"
                              enabled="true" follows="left|top" font="SansSerifSmall" height="110"
                              is_unicode="false" left="79" max_length="511" mouse_opaque="true"
-                             name="about" text_readonly_color="1, 1, 1, 1" width="321" word_wrap="true" />
+                             name="about" width="321" word_wrap="true" />
                         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom="-403" drop_shadow_visible="true" follows="left|top"
                              font="SansSerifSmall" h_pad="0" halign="right" height="16" left="0"
@@ -189,7 +187,7 @@
                              height="18" label="Home" label_selected="Home" left="10"
                              mouse_opaque="true" name="home" width="55" />
                         <button bottom_delta="0" follows="left|top" font="SansSerifSmall" halign="center"
-                             height="18" label="Load" label_selected="Load" left_delta="0"
+                             height="18" label="Load" label_selected="Load" left_delta="60"
                              mouse_opaque="true" name="load"
                              tool_tip="Load this profile page with embedded web browser." width="60" />
                         <button bottom_delta="0" follows="left|top" font="SansSerifSmall" halign="center"
@@ -202,14 +200,14 @@
                              mouse_opaque="true" name="web_profile_help" width="18" />
                         <check_box bottom_delta="0" follows="right|top" font="SansSerifSmall" height="16"
                              initial_value="false" label="Automatically load web profiles"
-                             left_delta="90" mouse_opaque="true" name="auto_load"
+                             left_delta="30" mouse_opaque="true" name="auto_load"
                              tool_tip="Automatically load ALL profile webpages without asking first."
                              width="127" />
-                        <line_editor bevel_style="in" bg_readonly_color="0, 0, 0, 0" border_style="line"
+                        <line_editor bevel_style="in" border_style="line"
                              border_thickness="1" bottom_delta="-18" enabled="false" follows="left|top"
                              font="SansSerifSmall" height="16" is_unicode="false" left="10"
                              max_length="254" mouse_opaque="true" name="url_edit"
-                             text_readonly_color="1, 1, 1, 1" width="400" />
+                             width="400" />
                         <web_browser border_visible="false" bottom="-444" follows="top|left|right" height="400"
                              ignore_ui_scale="false" left="10" name="profile_html" start_url=""
                              width="400" />
@@ -248,11 +246,11 @@
                         <check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
                              initial_value="false" label="Hire" left_delta="170" mouse_opaque="true"
                              name="chk7" width="92" />
-                        <line_editor bevel_style="in" bg_readonly_color="0, 0, 0, 0" border_style="line"
+                        <line_editor bevel_style="in" border_style="line"
                              border_thickness="1" bottom_delta="-20" enabled="true" follows="left|top"
                              font="SansSerifSmall" height="16" is_unicode="false" left="74"
                              max_length="254" mouse_opaque="true" name="want_to_edit"
-                             text_readonly_color="1, 1, 1, 1" width="330" />
+                             width="330" />
                         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom_delta="-26" drop_shadow_visible="true" follows="left|top"
                              font="SansSerifSmall" h_pad="0" halign="right" height="16" left="4"
@@ -277,22 +275,22 @@
                         <check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
                              initial_value="false" label="Custom Characters" left_delta="170"
                              mouse_opaque="true" name="schk5" width="127" />
-                        <line_editor bevel_style="in" bg_readonly_color="0, 0, 0, 0" border_style="line"
+                        <line_editor bevel_style="in" border_style="line"
                              border_thickness="1" bottom_delta="-20" enabled="true" follows="left|top"
                              font="SansSerifSmall" height="16" is_unicode="false" left="74"
                              max_length="254" mouse_opaque="true" name="skills_edit"
-                             text_readonly_color="1, 1, 1, 1" width="330" />
+                             width="330" />
                         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom_delta="-30" drop_shadow_visible="true" follows="left|top"
                              font="SansSerifSmall" h_pad="0" halign="right" height="16" left="4"
                              mouse_opaque="true" name="Languages:" v_pad="0" width="70">
                                 Languages:
                         </text>
-                        <line_editor bevel_style="in" bg_readonly_color="0, 0, 0, 0" border_style="line"
+                        <line_editor bevel_style="in" border_style="line"
                              border_thickness="1" bottom_delta="0" enabled="true" follows="left|top"
                              font="SansSerifSmall" height="16" is_unicode="false" left="74"
                              max_length="254" mouse_opaque="true" name="languages_edit"
-                             text_readonly_color="1, 1, 1, 1" width="330" />
+                             width="330" />
                 </panel>
                 <panel border="true" bottom="-482" follows="left|top|right|bottom" height="466"
                      label="Picks" left="1" mouse_opaque="true" name="Picks" width="418">
@@ -369,10 +367,10 @@
                              mouse_opaque="true" name="(250 chars)" v_pad="0" width="65">
                                 (250 chars)
                         </text>
-                        <text_editor bg_readonly_color="0, 0, 0, 0" bottom="-347" embedded_items="false"
+                        <text_editor bottom="-347" embedded_items="false"
                              enabled="true" follows="left|top" font="SansSerifSmall" height="160"
                              is_unicode="false" left="70" max_length="254" mouse_opaque="false"
-                             name="about" text_readonly_color="1, 1, 1, 1" width="330" word_wrap="true" />
+                             name="about" width="330" word_wrap="true" />
                 </panel>
                 <panel border="true" bottom="-482" follows="left|top|right|bottom" height="466"
                      label="My Notes" left="1" mouse_opaque="true" name="My Notes" width="418">
@@ -393,12 +391,12 @@ notes.  This person cannot see them, nor can other people.
                              word_wrap="false" />
                 </panel>
         </tab_container>
-        <button bottom="-482" font="SansSerif" halign="center" height="20" label="OK"
-             label_selected="OK" left="34" mouse_opaque="true" name="OK" width="100" />
+        <button bottom="-483" font="SansSerif" halign="center" height="20" label="OK"
+             label_selected="OK" left="208" mouse_opaque="true" name="OK" width="100" />
         <button bottom_delta="0" font="SansSerif" halign="center" height="20" label="Cancel"
-             label_selected="Cancel" left_delta="264" mouse_opaque="true" name="Cancel"
+             label_selected="Cancel" left_delta="105" mouse_opaque="true" name="Cancel"
              width="100" />
-        <button bottom_delta="135" font="SansSerif" halign="center" height="20" label="Kick"
+        <button bottom_delta="132" font="SansSerif" halign="center" height="20" label="Kick"
              label_selected="Kick" left="4" mouse_opaque="true" name="Kick" width="72" />
         <button bottom_delta="-24" font="SansSerif" halign="center" height="20" label="Freeze"
              label_selected="Freeze" left="4" mouse_opaque="true" name="Freeze"
diff --git a/linden/indra/newview/skins/xui/en-us/panel_avatar_classified.xml b/linden/indra/newview/skins/xui/en-us/panel_avatar_classified.xml
index 7cc1a60..001d6d6 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_avatar_classified.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_avatar_classified.xml
@@ -3,17 +3,15 @@
      name="Classified" title="Classified" width="350">
         <texture_picker bottom="-165" follows="left|top" height="155" left="10" name="snapshot_ctrl"
              width="207" />
-        <line_editor bg_readonly_color="clear" bottom_delta="-8" enabled="false" follows="left|top"
+        <line_editor bottom_delta="-8" enabled="false" follows="left|top"
              font="SansSerif" height="20" left="10" name="given_name_editor"
-             text_readonly_color="white"
              tool_tip="Name must begin with a letter or number, not punctuation."
              width="280" />
-        <text_editor bg_readonly_color="clear" enabled="false" follows="left|top"
+        <text_editor enabled="false" follows="left|top"
              font="SansSerifSmall" height="70" left="10" max_length="1023"
-             name="desc_editor" text_readonly_color="white" width="280" word_wrap="true" />
-        <line_editor bg_readonly_color="clear" enabled="false" follows="left|top"
+             name="desc_editor" width="280" word_wrap="true" />
+        <line_editor enabled="false" follows="left|top"
              font="SansSerifSmall" height="20" left="10" name="location_editor"
-             text_readonly_color="white"
              tool_tip="Set the location for this classified to your current position."
              width="280" />
         <button bottom_delta="-27" follows="left|top" height="20" label="Set Location"
@@ -26,16 +24,14 @@
              name="classified_category_combo" right="150" />
         <check_box bottom_delta="-1" follows="left|top" height="20" label="Mature" left="160"
              name="classified_mature_check" width="80" />
-        <text bg_readonly_color="clear" bottom_delta="-25" follows="left|top"
+        <text bottom_delta="-25" follows="left|top"
              font="SansSerifSmall" height="18" left="10" name="classified_info_text"
-             text_readonly_color="white"
              tool_tip="The more you choose to pay for your ad, the higher in the list it appears."
              width="300">
                 Ad placed: Not yet published
         </text>
-        <text bg_readonly_color="clear" bottom_delta="-18" follows="left|top"
+        <text bottom_delta="-18" follows="left|top"
              font="SansSerifSmall" height="18" left="10" name="click_through_text"
-             text_readonly_color="white"
              tool_tip="Total number of clicks on each button since this classified was placed."
              width="300">
                 Clicks:
diff --git a/linden/indra/newview/skins/xui/en-us/panel_avatar_pick.xml b/linden/indra/newview/skins/xui/en-us/panel_avatar_pick.xml
index 3f8a9e4..af8b58c 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_avatar_pick.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_avatar_pick.xml
@@ -3,15 +3,15 @@
      title="Pick" width="350">
         <texture_picker bottom="-190" follows="left|top" height="180" left="10" name="snapshot_ctrl"
              width="290" />
-        <line_editor bg_readonly_color="clear" bottom_delta="-8" enabled="false" follows="left|top"
+        <line_editor bottom_delta="-8" enabled="false" follows="left|top"
              font="SansSerif" height="20" left="10" name="given_name_editor"
-             text_readonly_color="white" width="290" />
-        <text_editor bg_readonly_color="clear" enabled="false" follows="left|top"
+             width="290" />
+        <text_editor enabled="false" follows="left|top"
              font="SansSerifSmall" height="100" left="10" max_length="1023"
-             name="desc_editor" text_readonly_color="white" width="290" word_wrap="true" />
-        <line_editor bg_readonly_color="clear" enabled="false" follows="left|top"
+             name="desc_editor" width="290" word_wrap="true" />
+        <line_editor enabled="false" follows="left|top"
              font="SansSerifSmall" height="20" left="10" name="location_editor"
-             text_readonly_color="white" width="290" />
+             width="290" />
         <button bottom_delta="-27" follows="left|top" height="20" label="Set Location"
              left="180" name="set_location_btn" width="120" />
         <button bottom_delta="0" follows="left|top" height="20" label="Teleport" left="10"
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
index def7a87..4da6be0 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_bg_tab.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_bg_tab.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>

-<panel bottom="0" default_tab_group="1" follows="left|bottom|right|top" height="20"

+<panel bottom="0" default_tab_group="1" follows="left|bottom|right|top" height="21"

      left="0" name="bg_tab" use_bounding_rect="true" 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" />

+  <icon bottom="-24" color="255,255,255,245" scale_image="true"

+         follows="left|right|top|bottom" height="26" image_name="toolbar_tab.tga"

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

 </panel>

diff --git a/linden/indra/newview/skins/xui/en-us/panel_bg_toolbar.xml b/linden/indra/newview/skins/xui/en-us/panel_bg_toolbar.xml
new file mode 100644
index 0000000..af91e4e
--- /dev/null
+++ b/linden/indra/newview/skins/xui/en-us/panel_bg_toolbar.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

+<panel bottom="0" default_tab_group="1" follows="left|bottom|right|top" height="21"

+     left="0" name="bg_toolbar" use_bounding_rect="true" width="100">

+  <icon bottom="-24" color="255,255,255,255" scale_image="true"

+         follows="left|right|top|bottom" height="26" image_name="toolbar_bg.tga"

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

+</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 c4c6c12..20a63db 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,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel bottom="0" default_tab_group="1" follows="left|bottom|right" height="23"
+<panel bottom="-1" default_tab_group="1" follows="left|bottom|right" height="25"
      left="0" name="chat_bar" width="395">
-        <panel bottom="0" follows="left|right|bottom" height="23" left="-397"
-             use_bounding_rect="true" width="397">
-                <panel bottom="0" filename="panel_bg_tab.xml" height="23" left="0" width="397" />
+        <panel bottom="1" follows="left|right|bottom" height="23" left="0"
+             use_bounding_rect="true" width="397" bg_visible="false" border="false" border_visible="false">
+                <panel bottom="0" filename="panel_bg_tab.xml" height="22" left="-398" width="396" />
         </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="-22"
+        <button bottom="-23" follows="left|bottom" font="SansSerif" halign="center" height="20"
+             label="Local Chat" left="7" name="History"
+             tool_tip="Click here to see what has been said" width="93" />
+        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-23"
              follows="left|right|bottom" font="SansSerif"
-             handle_edit_keys_directly="false" height="19" label="Click here to chat."
+             handle_edit_keys_directly="false" height="20" 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"
+        <flyout_button bottom="-23" follows="right|bottom" height="20" label="Say" left_delta="110"
              list_position="above" mouse_opaque="true" name="Say" tool_tip="(Enter)"
              width="80">
                 <flyout_button_item value="say">
@@ -24,8 +24,8 @@
                         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_box allow_text_entry="false" bottom="-23" follows="right|bottom" height="20"
+             label="Gestures" left_delta="85" max_chars="20" name="Gesture" width="90">
                 <combo_item name="Gestures">
                         Gestures
                 </combo_item>
diff --git a/linden/indra/newview/skins/xui/en-us/panel_classified.xml b/linden/indra/newview/skins/xui/en-us/panel_classified.xml
index 5ff802a..bc7a4d1 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_classified.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_classified.xml
@@ -3,16 +3,15 @@
      name="Classified" title="Classified" width="450">
         <texture_picker bottom="-315" follows="left|top" height="300" left="20" name="snapshot_ctrl"
              width="400" />
-        <line_editor bg_readonly_color="clear" bottom_delta="-8" enabled="false" follows="left|top"
+        <line_editor bottom_delta="-8" enabled="false" follows="left|top"
              font="SansSerif" height="20" left="20" name="given_name_editor"
-             text_readonly_color="white"
              tool_tip="Name must begin with a letter or number, not punctuation."
              width="400" />
-        <text_editor bg_readonly_color="clear" enabled="false" follows="left|top"
+        <text_editor enabled="false" follows="left|top"
              font="SansSerifSmall" height="90" left="20" max_length="1023"
-             name="desc_editor" text_readonly_color="white" width="400" word_wrap="true" />
-        <line_editor bg_readonly_color="clear" enabled="false" follows="left|top" font="SansSerif"
-             height="20" left="20" name="location_editor" text_readonly_color="white"
+             name="desc_editor"  width="400" word_wrap="true" />
+        <line_editor enabled="false" follows="left|top" font="SansSerif"
+             height="20" left="20" name="location_editor" 
              tool_tip="Set the location for this classified to your current position."
              width="400" />
         <button bottom_delta="0" follows="left|top" height="20" label="Set" left="380"
@@ -24,10 +23,9 @@
         <button bottom_delta="0" follows="left|top" height="20" label="Profile" left="230"
              name="classified_profile_btn" width="100" />
         <check_box bottom="422" follows="left|top" height="20" label="Mature" left="30"
-             name="classified_mature_check" text_readonly_color="white" width="80" />
-        <combo_box bg_readonly_color="grey" bottom="445" follows="left|top" height="18" label=""
-             left="20" name="classified_category_combo" right="150"
-             text_readonly_color="white" />
+             name="classified_mature_check"  width="80" />
+        <combo_box bottom="445" follows="left|top" height="18" label=""
+             left="20" name="classified_category_combo" right="150" />
         <button bottom="400" follows="left|top" height="20" label="Update" left="30"
              name="classified_update_btn" width="70" />
         <string name="ad_placed_paid">
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 7bb08d2..f6eacb1 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_friends.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_friends.xml
@@ -16,7 +16,7 @@
                 <column image="ff_visible_map_button.tga" name="icon_visible_map"

                      tool_tip="Friend can locate you on the map" width="20" />

                 <column image="ff_edit_mine_button.tga" name="icon_edit_mine"

-                     tool_tip="Friend can edit your objects" width="20" />

+                     tool_tip="Friend can edit, delete or take objects" width="20" />

                 <column image="ff_edit_theirs_button.tga" name="icon_edit_theirs"

                      tool_tip="You can edit this friend&apos;s objects" width="20" />

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

diff --git a/linden/indra/newview/skins/xui/en-us/panel_group.xml b/linden/indra/newview/skins/xui/en-us/panel_group.xml
index 67cdbb8..775c7b9 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_group.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_group.xml
@@ -9,7 +9,7 @@
                 Do you want to apply these changes?
         </string>
         <tab_container border="false" bottom="27" follows="all" height="483" left="0"
-             name="group_tab_container" tab_position="top" width="420">
+             name="group_tab_container" tab_position="top" width="419">
                 <panel filename="panel_group_general.xml" name="general_tab" />
                 <panel filename="panel_group_roles.xml" name="roles_tab" />
                 <panel filename="panel_group_notices.xml" name="notices_tab" />
diff --git a/linden/indra/newview/skins/xui/en-us/panel_group_general.xml b/linden/indra/newview/skins/xui/en-us/panel_group_general.xml
index 9825cb1..7332cdf 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_group_general.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_group_general.xml
@@ -39,14 +39,14 @@ Hover your mouse over the options for more help.
                 Group Charter
         </text>
         <texture_picker bottom_delta="-129" follows="left|top" height="144"
-             image_name="icon_groupnotice.tga" label="Group Insignia" left="7"
+              label="Group Insignia" left="7"
              mouse_opaque="true" name="insignia" tool_tip="Click to choose a picture"
              width="128" />
         <text_editor bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom_delta="-30" drop_shadow_visible="false" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="160"
              hide_scrollbar="true" max_length="511" mouse_opaque="true" name="charter"
-             right="410" text_readonly_color="0.57647, 0.66275, 0.83529" v_pad="0"
+             right="410" v_pad="0"
              width="265" word_wrap="true">
                 Group Charter
         </text_editor>
@@ -75,31 +75,28 @@ Hover your mouse over the options for more help.
         <text bottom_delta="-18" font="SansSerif" name="text_group_preferences">
                 Group Preferences
         </text>
-        <panel background_opaque="true" background_visible="true" bevel_style="in"
-             bg_alpha_color="blue" bg_opaque_color="0,0,0,0.3" border="true"
+        <panel background_opaque="true" background_visible="false" bevel_style="in"
+             border="true"
              bottom_delta="-104" follows="left|top" height="96" left_delta="0"
              mouse_opaque="true" name="preferences_container" width="404">
                 <check_box bottom="-20" follows="left|top" font="SansSerifSmall" height="16"
                      initial_value="true" label="Show in search" left="4" mouse_opaque="true"
                      name="show_in_group_list" radio_style="false"
-                     text_disabled_color="0.67647, 0.76275, 0.93529, 0.45"
                      tool_tip="Let people see this group in search results." width="95" />
                 <check_box bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16"
                      initial_value="false" label="Mature group" left_delta="0"
                      mouse_opaque="true" name="mature" radio_style="false"
-                     text_disabled_color="0.67647, 0.76275, 0.93529, 0.45"
                      tool_tip="Sets whether your group information is considered mature."
                      visible="true" width="95" />
                 <check_box bottom_delta="-18" follows="right|top" font="SansSerifSmall" height="16"
                      initial_value="false" label="Open enrollment" left="4" mouse_opaque="true"
                      name="open_enrollement" radio_style="false"
-                     text_disabled_color="0.67647, 0.76275, 0.93529, 0.45"
                      tool_tip="Sets whether this group allows new members to join   without being invited."
                      width="95" />
                 <check_box bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16"
                      initial_value="false" label="Enrollment fee: L$" left_delta="16"
                      max_length="5" mouse_opaque="true" name="check_enrollment_fee"
-                     radio_style="false" text_disabled_color="0.67647, 0.76275, 0.93529, 0.45"
+                     radio_style="false" 
                      tool_tip="Sets whether to require an enrollment fee to join the group."
                      width="95" />
                 <spinner bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
@@ -107,7 +104,6 @@ Hover your mouse over the options for more help.
                      follows="left|top" font="SansSerif" h_pad="0" halign="left" height="16"
                      increment="1" label_width="10" left_delta="116" max_val="99999" min_val="0"
                      mouse_opaque="true" name="spin_enrollment_fee" right_delta="170"
-                     text_disabled_color="0.67647, 0.76275, 0.93529, 0.45"
                      tool_tip="New members must pay this fee to join the group when   Enrollment Fee is checked."
                      v_pad="0" width="65" />
                 <panel background_opaque="false" border="false" bottom="-31" height="32" left="225"
diff --git a/linden/indra/newview/skins/xui/en-us/panel_group_invite.xml b/linden/indra/newview/skins/xui/en-us/panel_group_invite.xml
index e11c6f6..8c5cbb5 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_group_invite.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_group_invite.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel border="false" bottom="0" height="380" label="Invite a Member" left="0"
      name="invite_panel" select="false" width="210">
-        <text bottom_delta="-78" height="54" left="7" width="200">
+        <text bottom_delta="-78" height="54" left="7" width="200" name="help_text">
                 You can select multiple residents to 
 invite to your group. Click &apos;Open 
 Person Chooser&apos; to start.
@@ -10,27 +10,31 @@ Person Chooser&apos; to start.
              label="Open Person Chooser" left="5" name="add_button" tool_tip=""
              width="200" />
         <name_list allow_calling_card_drop="true" background_visible="true" bottom_delta="-178"
-             column_padding="0" draw_border="true" fg_disable_color="grey"
-             fg_selected_color="black" fg_unselected_color="black" height="174" left="5"
+             column_padding="0" draw_border="true" height="174" left="5"
              multi_select="true" name="invitee_list"
-             tool_tip="Hold the Ctrl key and click resident names  to multi-select."
+             tool_tip="Hold the Ctrl key and click resident names to multi-select."
              width="200" />
         <button bottom_delta="-24" font="SansSerifSmall" halign="center" height="20"
              label="Remove Selected from List" left_delta="0" name="remove_button"
              tool_tip="Removes residents selected above from the invite list."
              width="200" />
-        <text bottom_delta="-21" height="16" left="9" width="200">
+        <text bottom_delta="-21" height="16" left="9" width="200" name="role_text">
                 Choose what Role to assign them to:
         </text>
         <combo_box bottom_delta="-16" follows="left|top" height="16" left_delta="0"
              name="role_name"
-             tool_tip="Choose from the list of Roles you  are allowed to assign members to."
+             tool_tip="Choose from the list of Roles you are allowed to assign members to."
              width="196" />
         <button bottom="4" font="SansSerifSmall" halign="center" height="20"
              label="Send Invitations" left="4" name="ok_button" width="130" />
         <button bottom_delta="0" font="SansSerifSmall" halign="center" height="20"
              label="Cancel" left_delta="132" name="cancel_button" width="70" />
-        <string name="loading">
-                (loading...)
+        <string name="confirm_invite_owner_str">
+                Are you sure you want to invite new owner(s)? This action is permanent!
         </string>
+        <!--button bottom="25" font="SansSerifSmall" halign="center" height="20"
+             label="Send Invitations" left="65" name="ok_button" width="140" />
+        <button bottom_delta="-22" font="SansSerifSmall" halign="center" height="20"
+             label="Cancel" left_delta="0" name="cancel_button" width="140" /-->
+        <string name="loading">(loading...)</string>
 </panel>
diff --git a/linden/indra/newview/skins/xui/en-us/panel_group_land_money.xml b/linden/indra/newview/skins/xui/en-us/panel_group_land_money.xml
index f93e9ad..f6b8838 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_group_land_money.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_group_land_money.xml
@@ -26,7 +26,7 @@ provide information about the group&apos;s finances.
              mouse_opaque="true" name="group_land_heading" v_pad="0" width="150">
                 Group Owned Land
         </text>
-        <scroll_list background_visible="true" bottom_delta="-124" column_padding="5"
+        <scroll_list background_visible="true" bottom_delta="-126" column_padding="5"
              draw_border="true" draw_heading="true" follows="top" font="SansSerifSmall"
              heading_font="SansSerifSmall" heading_height="14" height="120" left="7"
              mouse_opaque="true" multi_select="false" name="group_parcel_list"
@@ -99,10 +99,10 @@ provide information about the group&apos;s finances.
                 sq. meters ([AMOUNT] max)
         </text>
         <icon bottom_delta="-27" height="16" image_name="smicon_warn.tga" left="9"
-             name="group_over_limit_icon" width="16" />
+             name="group_over_limit_icon" width="16" visible="false"/>
         <text border_drop_shadow_visible="false" border_visible="false" bottom_delta="-1"
              drop_shadow_visible="false" h_pad="0" height="16" left_delta="21"
-             name="group_over_limit_text" text_color="1.00000, 0.81961, 0.00000"
+             name="group_over_limit_text" text_color="GroupOverTierColor"
              v_pad="0" width="400">
                 Group members must contribute more land credits to support land in use.
         </text>
@@ -117,9 +117,7 @@ provide information about the group&apos;s finances.
                 <panel border="true" bottom_delta="-260" follows="left|top|right|bottom" height="255"
                      label="Planning" left="1" mouse_opaque="true"
                      name="group_money_planning_tab" width="398">
-                        <icon bottom="1" height="161" image_name="darkgray.tga" left="1" name="sub_tab_bg"
-                             width="402" />
-                        <text_editor bg_readonly_color="0.784314, 0.819608, 0.8, 1" bottom_delta="7"
+                        <text_editor bg_readonly_color="0.784314, 0.819608, 0.8, 1" bottom="8" 
                              embedded_items="false" follows="left|top|right|bottom" font="Monospace"
                              height="239" is_unicode="false" left="8" max_length="4096"
                              mouse_opaque="true" name="group_money_planning_text" width="382"
@@ -130,8 +128,6 @@ provide information about the group&apos;s finances.
                 <panel border="true" bottom_delta="-250" follows="left|top|right|bottom" height="250"
                      label="Details" left="1" mouse_opaque="true" name="group_money_details_tab"
                      width="398">
-                        <icon bottom="1" height="161" image_name="darkgray.tga" left="1" name="sub_tab_bg"
-                             width="402" />
                         <text_editor bg_readonly_color="0.784314, 0.819608, 0.8, 1" bottom="26"
                              embedded_items="false" follows="left|top|right|bottom" font="Monospace"
                              height="216" is_unicode="false" left="8" max_length="4096"
@@ -151,9 +147,7 @@ provide information about the group&apos;s finances.
                 <panel border="true" bottom_delta="-250" follows="left|top|right|bottom" height="250"
                      label="Sales" left="1" mouse_opaque="true" name="group_money_sales_tab"
                      width="398">
-                        <icon bottom="1" height="161" image_name="darkgray.tga" left="1" name="sub_tab_bg"
-                             width="402" />
-                        <text_editor bg_readonly_color="0.784314, 0.819608, 0.8, 1" bottom_delta="25"
+                        <text_editor bg_readonly_color="0.784314, 0.819608, 0.8, 1" bottom="26"
                              embedded_items="false" follows="left|top|right|bottom" font="Monospace"
                              height="216" is_unicode="false" left="8" max_length="4096"
                              mouse_opaque="true" name="group_money_sales_text" width="382"
diff --git a/linden/indra/newview/skins/xui/en-us/panel_group_notices.xml b/linden/indra/newview/skins/xui/en-us/panel_group_notices.xml
index 4e00c66..7f0c0f7 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_group_notices.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_group_notices.xml
@@ -27,9 +27,9 @@ the General tab.
                 Notices are kept for 30 days. Click the notice below you wish to view.
 Click the &apos;Refresh&apos; button to check if new notices have been received.
         </text>
-        <scroll_list background_visible="false" bottom_delta="-137" column_padding="0"
+        <scroll_list background_visible="true" bottom_delta="-137" column_padding="0"
              draw_border="true" draw_heading="true" enabled="true"
-             fg_unselected_color="200,200,200,255" heading_font="SansSerifSmall"
+             heading_font="SansSerifSmall"
              heading_height="14" height="109" left="7" mouse_opaque="true"
              multi_select="false" name="notice_list" width="404">
                 <column label="" name="icon" width="16" />
@@ -70,7 +70,7 @@ and you can&apos;t send a folder.
                      name="lbl3" v_pad="0" width="55">
                         Subject:
                 </text>
-                <line_editor bevel_style="in" bg_readonly_color="0, 0, 0, 0" border_style="line"
+                <line_editor bevel_style="in" border_style="line"
                      border_thickness="1" bottom_delta="0" font="SansSerifSmall" height="16"
                      is_unicode="false" left_delta="58" max_length="63" mouse_opaque="true"
                      name="create_subject" prevalidate="printable_not_pipe" width="264" />
@@ -80,7 +80,7 @@ and you can&apos;t send a folder.
                      name="lbl4" v_pad="0" width="55">
                         Message:
                 </text>
-                <text_editor bg_readonly_color="0, 0, 0, 0" bottom_delta="-106" embedded_items="false"
+                <text_editor bottom_delta="-106" embedded_items="false"
                      font="SansSerifSmall" height="120" hide_scrollbar="true" is_unicode="false"
                      left_delta="58" max_length="511" mouse_opaque="true" name="create_message"
                      width="346" word_wrap="true" />
@@ -93,7 +93,7 @@ and you can&apos;t send a folder.
                 <line_editor bg_visible="false" border_visible="false" bottom_delta="-2" enabled="false"
                      font="SansSerifSmall" height="16" is_unicode="false" left_delta="59"
                      max_length="63" mouse_opaque="false" name="create_inventory_name"
-                     text_readonly_color="0.784, 0.819, 0.8, 1" width="211" />
+                     width="211" />
                 <icon bottom_delta="0" height="16" left_delta="0" mouse_opaque="false"
                      name="create_inv_icon" width="16" />
                 <button bottom_delta="0" font="SansSerif" halign="center" height="20"
@@ -130,21 +130,21 @@ and you can&apos;t send a folder.
                      name="lbl3" v_pad="0" visible="false" width="55">
                         Subject:
                 </text>
-                <line_editor bevel_style="in" bg_readonly_color="0, 0, 0, 0" border_style="line"
+                <line_editor bevel_style="in" border_style="line"
                      border_thickness="1" bottom_delta="0" enabled="false" font="SansSerifSmall"
                      height="16" is_unicode="false" left_delta="58" max_length="63"
                      mouse_opaque="true" name="view_subject"
-                     text_readonly_color="200,200,200, 255" visible="false" width="346" />
+                     visible="false" width="346" />
                 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                      bottom_delta="-18" drop_shadow_visible="true" font="SansSerifSmall"
                      h_pad="0" halign="right" height="16" left="7" mouse_opaque="true"
                      name="lbl4" v_pad="0" visible="false" width="55">
                         Message:
                 </text>
-                <text_editor bg_readonly_color="0, 0, 0, 0" bottom_delta="-148" embedded_items="false"
+                <text_editor bottom_delta="-148" embedded_items="false"
                      enabled="false" font="SansSerifSmall" height="206" hide_scrollbar="true"
                      is_unicode="false" left_delta="0" max_length="511" mouse_opaque="true"
-                     name="view_message" text_readonly_color="200,200,200, 255" width="404"
+                     name="view_message" width="404"
                      word_wrap="true" />
                 <button bottom_delta="-24" font="SansSerif" halign="center" height="20"
                      label="Open Attachment" label_selected="Open Attachment" left="7"
@@ -152,7 +152,7 @@ and you can&apos;t send a folder.
                 <line_editor bg_visible="false" border_visible="false" bottom_delta="3" enabled="false"
                      font="SansSerifSmall" height="16" is_unicode="false" left="120"
                      max_length="63" mouse_opaque="false" name="view_inventory_name"
-                     text_readonly_color="0.784, 0.819, 0.8, 1" width="264" />
+                     width="264" />
                 <icon bottom_delta="0" height="16" left_delta="0" mouse_opaque="false"
                      name="view_inv_icon" width="16" />
         </panel>
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 925d224..bea5dc4 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
@@ -61,9 +61,7 @@ execute the Ability.
              name="roles_tab_container" tab_position="top" width="406">
                 <panel border="true" bottom="0" height="164" label="Members" left="1"
                      name="members_sub_tab" select="true" tool_tip="Members" width="406">
-                        <icon bottom="1" height="162" image_name="darkgray.tga" left="1" name="sub_tab_bg"
-                             width="402" />
-                        <line_editor bevel_style="in" bg_readonly_color="0, 0, 0, 0" border_style="line"
+                        <line_editor bevel_style="in" border_style="line"
                              border_thickness="1" bottom="143" follows="left|top" font="SansSerifSmall"
                              height="16" is_unicode="false" left="4" max_length="63" mouse_opaque="true"
                              name="search_text" width="100" />
@@ -74,8 +72,7 @@ execute the Ability.
                              width="80" />
                         <name_list allow_calling_card_drop="false" background_visible="true" bottom_delta="-121"
                              column_padding="0" draw_border="true" draw_heading="true"
-                             fg_disable_color="grey" fg_selected_color="black"
-                             fg_unselected_color="black" heading_font="SansSerifSmall"
+                             heading_font="SansSerifSmall"
                              heading_height="14" height="120" left="4" multi_select="true"
                              name="member_list" width="396">
                                 <column label="Member Name" name="name" width="136" />
@@ -91,13 +88,11 @@ execute the Ability.
 Select multiple Members by holding the Ctrl key and
 clicking on their names.
                         </string>
-                        <icon image_name="inv_folder_plain_closed.tga" name="power_folder_icon" />
+                        <icon image_name="inv_folder_plain_closed.tga" name="power_folder_icon" width="16" height="16" visible="false"/> <!-- Hiding this until we can figure out why it's not showing up in the right place. -BG -->
                 </panel>
                 <panel background_visible="true" border="true" bottom="0" height="164" label="Roles"
                      left="1" name="roles_sub_tab" width="398">
-                        <icon bottom="1" height="162" image_name="darkgray.tga" left="1" name="sub_tab_bg"
-                             width="402" />
-                        <line_editor bevel_style="in" bg_readonly_color="0, 0, 0, 0" border_style="line"
+                        <line_editor bevel_style="in" border_style="line"
                              border_thickness="1" bottom="143" follows="left|top" font="SansSerifSmall"
                              height="16" is_unicode="false" left="4" max_length="63" mouse_opaque="true"
                              name="search_text" width="100" />
@@ -108,8 +103,7 @@ clicking on their names.
                              width="80" />
                         <scroll_list allow_calling_card_drop="false" background_visible="true" bottom_delta="-120"
                              column_padding="0" draw_border="true" draw_heading="true" enabled="true"
-                             fg_disable_color="grey" fg_selected_color="black"
-                             fg_unselected_color="black" follows="left|top"
+                             follows="left|top"
                              heading_font="SansSerifSmall" heading_height="14" height="120" left="4"
                              mouse_opaque="true" multi_select="false" name="role_list" width="396">
                                 <column label="Role Name" name="name" width="126" />
@@ -129,18 +123,16 @@ including the Everyone and Owner Roles.
                         <string name="cant_delete_role">
                                 The &apos;Everyone&apos; and &apos;Owners&apos; Roles are special and cannot be deleted.
                         </string>
-                        <icon height="0" image_name="inv_folder_plain_closed.tga" name="power_folder_icon"
-                             width="0" />
-                        <icon height="0" image_name="checkbox_enabled_true.tga" name="power_all_have_icon"
-                             width="0" />
-                        <icon height="0" image_name="checkbox_enabled_false.tga" name="power_partial_icon"
-                             width="0" />
+                        <icon height="16" image_name="inv_folder_plain_closed.tga" name="power_folder_icon"
+                             width="16" visible="false"/> <!-- Hiding this until we can figure out why it's not showing up in the right place. -BG -->
+                        <icon height="16" image_name="checkbox_enabled_true.tga" name="power_all_have_icon"
+                             width="16" visible="false"/> <!-- Hiding this until we can figure out why it's not showing up in the right place. -BG -->
+                        <icon height="16" image_name="checkbox_enabled_false.tga" name="power_partial_icon"
+                             width="16" visible="false"/> <!-- Hiding this until we can figure out why it's not showing up in the right place. -BG -->
                 </panel>
                 <panel background_visible="true" bg_alpha_color="red" border="true" bottom="0"
                      height="164" label="Abilities" left="1" name="actions_sub_tab" width="398">
-                        <icon bottom="1" height="162" image_name="darkgray.tga" left="1" name="sub_tab_bg"
-                             width="402" />
-                        <line_editor bevel_style="in" bg_readonly_color="0, 0, 0, 0" border_style="line"
+                        <line_editor bevel_style="in" border_style="line"
                              border_thickness="1" bottom="143" follows="left|top" font="SansSerifSmall"
                              height="16" is_unicode="false" left="6" max_length="63" mouse_opaque="true"
                              name="search_text" width="100" />
@@ -151,8 +143,8 @@ including the Everyone and Owner Roles.
                              width="80" />
                         <scroll_list allow_calling_card_drop="false" background_visible="true" bottom_delta="-134"
                              column_padding="0" draw_border="true" draw_heading="false"
-                             draw_stripes="false" fg_disable_color="grey" fg_selected_color="black"
-                             fg_unselected_color="black" follows="left|top" height="134" left="6"
+                             draw_stripes="false"
+                             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">
@@ -163,7 +155,7 @@ including the Everyone and Owner Roles.
                                 Abilities allow Members in Roles to do specific
 things in this group. There&apos;s a broad variety of Abilities.
                         </string>
-                        <icon image_name="inv_folder_plain_closed.tga" name="power_folder_icon" />
+                        <icon image_name="inv_folder_plain_closed.tga" name="power_folder_icon" width="16" height="16" visible="false"/> <!-- Hiding this until we can figure out why it's not showing up in the right place. -BG -->
                 </panel>
         </tab_container>
         <panel border="false" bottom_delta="-235" height="215" left="7" name="members_footer"
@@ -200,15 +192,15 @@ things in this group. There&apos;s a broad variety of Abilities.
                 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                      bottom_delta="0" drop_shadow_visible="false" font="SansSerif" halign="left"
                      height="16" left="150" name="static2"
-                     text_readonly_color="0.57647, 0.66275, 0.83529" width="100">
+                     width="100">
                         Description
                 </text>
-                <line_editor bevel_style="in" bg_readonly_color="0, 0, 0, 0" bg_visible="false"
+                <line_editor bevel_style="in" bg_visible="false"
                      border_drop_shadow_visible="false" border_style="line" border_thickness="1"
                      border_visible="false" bottom_delta="-16" drop_shadow_visible="false"
                      follows="left|top" font="SansSerifSmall" height="16" is_unicode="false"
                      left="0" max_length="20" mouse_opaque="true" name="role_name"
-                     text_readonly_color="0.57647, 0.66275, 0.83529" width="145">
+                     width="145">
                         Employees
                 </line_editor>
                 <text bottom_delta="-16" font="SansSerif" halign="left" height="16" left="0"
@@ -220,14 +212,14 @@ things in this group. There&apos;s a broad variety of Abilities.
                      bottom_delta="-16" drop_shadow_visible="false" follows="left|top"
                      font="SansSerifSmall" height="16" is_unicode="false" left="0"
                      max_length="20" mouse_opaque="true" name="role_title"
-                     text_readonly_color="0.57647, 0.66275, 0.83529" width="145">
+                     width="145">
                         (waiting)
                 </line_editor>
                 <text_editor bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                      bottom_delta="0" drop_shadow_visible="false" font="SansSerifSmall"
                      h_pad="0" halign="left" height="48" hide_scrollbar="true" left="150"
                      max_length="254" name="role_description"
-                     text_readonly_color="0.57647, 0.66275, 0.83529" v_pad="0" width="254"
+                     v_pad="0" width="254"
                      word_wrap="true">
                         (waiting)
                 </text_editor>
@@ -265,10 +257,10 @@ things in this group. There&apos;s a broad variety of Abilities.
                      name="static" width="100">
                         Description
                 </text>
-                <text_editor bevel_style="in" bg_readonly_color="0,0,0,0.3" bottom_delta="-48"
+                <text_editor bevel_style="in" bottom_delta="-48"
                      enabled="false" font="SansSerifSmall" h_pad="0" halign="left" height="48"
                      hide_scrollbar="true" left="0" max_length="512" name="action_description"
-                     text_readonly_color="white" v_pad="0" width="404" word_wrap="true">
+                     v_pad="0" width="404" word_wrap="true">
                         This Ability is &apos;Eject Members from this Group&apos;. Only an Owner can eject another Owner.
                 </text_editor>
                 <text bottom_delta="-26" font="SansSerif" halign="left" height="16" left="0"
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 1ab0ca9..e044f34 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
@@ -9,11 +9,11 @@ the proper powers, you can create proposals,
 vote on open proposals, and view old proposals.
         </string>
         <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_delta="-210" follows="left|top" height="170" left="7"
+             bg_alpha_color="blue" border="true"
+             bottom_delta="-225" follows="left|top" height="170" left="7"
              mouse_opaque="false" name="open_proposals_container" width="404" />
         <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="7"
+             bg_alpha_color="blue" border="true" bottom="7"
              follows="left|top" height="175" left="7" mouse_opaque="false"
              name="voting_history_container" width="404" />
         <button bottom="-24" font="SansSerif" halign="center" height="16" label="?" left="391"
@@ -57,8 +57,7 @@ vote on open proposals, and view old proposals.
              border_visible="false" bottom="300" drop_shadow_visible="false"
              embedded_items="false" follows="left|top" font="SansSerif" height="90"
              is_unicode="false" left="11" max_length="254" mouse_opaque="true"
-             name="proposal_text" text_readonly_color="0.57647, 0.66275, 0.83529"
-             width="289" word_wrap="true" />
+             name="proposal_text" width="289" word_wrap="true" />
         <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
              height="20" label="View List" label_selected="View List" left="304"
              mouse_opaque="true" name="btn_view_proposal_list" width="101" />
@@ -180,7 +179,7 @@ vote on open proposals, and view old proposals.
              follows="left|top" font="SansSerif" h_pad="0" height="126"
              hide_scrollbar="true" is_unicode="false" left="10" max_length="1024"
              mouse_opaque="true" name="vote_text"
-             text_readonly_color="0.57647, 0.66275, 0.83529" text_wrap="true" v_pad="0"
+             text_wrap="true" v_pad="0"
              width="396" word_wrap="false" />
         <button bottom_delta="-25" follows="top" font="SansSerif" halign="center" height="20"
              label="View List" label_selected="View List" left="287" mouse_opaque="true"
diff --git a/linden/indra/newview/skins/xui/en-us/panel_land_covenant.xml b/linden/indra/newview/skins/xui/en-us/panel_land_covenant.xml
index f2e36d3..3d5ee66 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_land_covenant.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_land_covenant.xml
@@ -1,49 +1,49 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel border="true" bottom="0" follows="top|left" height="220" left="0"
      name="Covenant" title="Covenant" width="480">
-        <text bg_readonly_color="clear" bottom_delta="-5" follows="left|top"
+        <text bottom_delta="-5" follows="left|top"
              font="SansSerifSmall" height="20" left="180" name="covenant_timestamp_text"
-             text_readonly_color="white" width="250" />
+             width="250" />
         <text bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="20"
              left="10" name="region_name_lbl" width="100">
                 Region:
         </text>
-        <text bg_readonly_color="clear" bottom_delta="0" follows="left|top"
+        <text bottom_delta="0" follows="left|top"
              font="SansSerifSmall" height="20" left="120" name="region_name_text"
-             text_readonly_color="white" width="150">
+             width="150">
                 (unknown)
         </text>
         <text bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="20"
              left="10" name="estate_name_lbl" width="100">
                 Estate:
         </text>
-        <text bg_readonly_color="clear" bottom_delta="0" follows="left|top"
+        <text bottom_delta="0" follows="left|top"
              font="SansSerifSmall" height="20" left="120" name="estate_name_text"
-             text_readonly_color="white" width="150">
+             width="150">
                 (unknown)
         </text>
         <text bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="20"
              left="10" name="estate_owner_lbl" width="100">
                 Estate Owner:
         </text>
-        <text bg_readonly_color="clear" bottom_delta="0" follows="left|top"
+        <text bottom_delta="0" follows="left|top"
              font="SansSerifSmall" height="20" left="120" name="estate_owner_text"
-             text_readonly_color="white" width="150">
+             width="150">
                 (unknown)
         </text>
-        <text bg_readonly_color="clear" bottom_delta="-20" follows="left|top"
+        <text bottom_delta="-20" follows="left|top"
              font="SansSerif" height="20" left="60" name="resellable_clause"
-             text_readonly_color="white" width="300">
+             width="300">
                 Purchased land in this region may or may not be resold.
         </text>
-        <text bg_readonly_color="clear" bottom_delta="-20" follows="left|top"
+        <text bottom_delta="-20" follows="left|top"
              font="SansSerif" height="20" left="60" name="changeable_clause"
-             text_readonly_color="white" width="375">
+             width="375">
                 Purchased land in this region may or may not be joined or subdivided.
         </text>
-        <text_editor bg_readonly_color="clear" bottom_delta="-200" enabled="false"
+        <text_editor bottom_delta="-200" enabled="false"
              follows="left|top" font="SansSerifSmall" height="200" left="15"
-             max_length="65535" name="covenant_editor" text_readonly_color="white"
+             max_length="65535" name="covenant_editor" 
              width="425" word_wrap="true" />
         <string name="can_resell">
                 string land in this region may be resold.
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 8d2a658..b5f276d 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_login.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_login.xml
@@ -13,43 +13,43 @@
         </string>
         <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"
+             font="SansSerif" h_pad="0" halign="left" height="16"
              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"
+             height="20" 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"
+             font="SansSerif" h_pad="0" halign="left" height="16"
              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"
+             height="20" 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"
+             font="SansSerif" h_pad="0" halign="left" height="16"
              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"
+             height="20" 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"
+             font="SansSerif" h_pad="0" halign="left" height="16"
              left="32" mouse_opaque="true" name="start_location_text" v_pad="0"
              width="95">
                 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"
+             left_delta="97" max_chars="128" mouse_opaque="true"
              name="start_location_combo" width="155">
                 <combo_item name="MyHome" value="My Home">
                         My Home
@@ -62,36 +62,37 @@
                 </combo_item>
         </combo_box>
         <check_box bottom="10" follows="left|bottom" font="SansSerifSmall" height="16"
-             hidden="false" initial_value="false" label="Remember password"
+             initial_value="false" label="Remember password"
              left_delta="165" 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"
+        <button bottom="28" follows="left|bottom" font="SansSerif" halign="center"
+             height="24" 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" 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"
+             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"
-             hover="true" left="-202" mouse_opaque="true" name="channel_text" v_pad="0"
-             width="200">
+             bottom="42" drop_shadow_visible="true" follows="right|bottom"
+             font="SansSerifSmall" h_pad="0" halign="right" height="12"
+             left="-210" 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"
-             hover="true" left="-102" mouse_opaque="true" name="version_text" v_pad="0"
-             width="100">
+             bottom="30" drop_shadow_visible="true" follows="right|bottom"
+             font="SansSerifSmall" h_pad="0" halign="right" height="12"
+             left="-110" 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"
-             hover="true" left="-172" mouse_opaque="true" name="forgot_password_text"
-             v_pad="0" width="170">
+             bottom="10" drop_shadow_visible="true" follows="right|bottom"
+             font="SansSerifSmall" h_pad="0" halign="right" height="12"
+             left="-180" mouse_opaque="true" name="forgot_password_text" v_pad="0" width="170"
+             hover="true">
                 Forgot your password?
         </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 80ef984..27bace7 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,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel bg_visible="false" border="false" border_visible="false" bottom="-34"
      name="master_volume">
-        <button bottom="-22" height="22" image_overlay="icn-overlay_volume-panel.tga" label=""
+        <button bottom="-22" height="22" label=""
              left="2" name="volume" toggle="true"
              tool_tip="Master Volume Control, click for volume settings" width="28" />
         <volume_slider bottom="-20" control_name="AudioLevelMaster" height="17" increment="0.05"
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
index 9a39f0e..fe392a6 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_media_controls.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_media_controls.xml
@@ -1,62 +1,76 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>

-<panel bg_visible="false" border="false" border_visible="false" bottom="2"

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

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

-     name="media_controls" width="250">

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

-             image_name="icn_music.tga" label="" left_delta="2" mouse_opaque="true"

+     name="media_controls" width="220">

+        <icon bottom="-18" enabled="true" follows="left|top" height="14"

+             image_name="icn_label_music.tga" label="" left_delta="6" mouse_opaque="true"

              name="music_icon" scale_image="true" tool_tip="Play/pause streaming music"

-             width="20" />

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

-             image_disabled="icn_media-play_disabled.tga"

-             image_selected="icn_media-play_active.tga"

-             image_unselected="icn_media-play_enabled.tga" label="" left_delta="22"

+             width="14" />

+        <button bottom="-21" enabled="true" follows="left|top" height="20"

+          image_overlay="icn_play.tga"

+          image_unselected="flyout_btn_left.tga"

+             image_selected="flyout_btn_left_selected.tga"

+             image_disabled="flyout_btn_left_disabled.tga"

+              label="" left_delta="16"

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

              tool_tip="Play/pause streaming music" width="20" />

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

-             image_disabled="icn_media-pause_disabled.tga"

-             image_selected="icn_media-pause_active.tga"

-             image_unselected="icn_media-pause_enabled.tga" label="" left_delta="0"

+  <button bottom="-21" enabled="false" follows="left|top" height="20"

+             image_overlay="icn_pause.tga"

+             image_unselected="flyout_btn_left.tga"

+             image_selected="flyout_btn_left_selected.tga"

+             image_disabled="flyout_btn_left_disabled.tga"

+             label="" left_delta="0"

              mouse_opaque="true" name="music_pause" scale_image="true" toggle="false"

              tool_tip="Pause streaming music" width="20" />

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

-             image_disabled="icn_media-stop_disabled.tga"

-             image_selected="icn_media-stop_active.tga"

-             image_unselected="icn_media-stop_enabled.tga" label="" left_delta="20"

+  <button bottom="-21" enabled="true" follows="left|top" height="20"

+             image_overlay="icn_stop.tga"

+             image_unselected="flyout_btn_right.tga"

+             image_selected="flyout_btn_right_selected.tga"

+             image_disabled="flyout_btn_right_disabled.tga"

+             label="" left_delta="20"

              mouse_opaque="true" name="music_stop" scale_image="true" toggle="false"

              tool_tip="Stop streaming music" width="20" />

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

-             image_name="icn_media.tga" label="" left_delta="22" mouse_opaque="true"

+  <icon bottom="-18" enabled="true" follows="left|top" height="14"

+             image_name="icn_label_media.tga"

+             label="" left_delta="22" mouse_opaque="true"

              name="media_icon" scale_image="true" tool_tip="Play/pause streaming music"

-             width="20" />

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

-             image_disabled="icn_media-play_disabled.tga"

-             image_selected="icn_media-play_active.tga"

-             image_unselected="icn_media-play_enabled.tga" label="" left_delta="22"

+             width="17" />

+  <button bottom="-21" enabled="true" follows="left|top" height="20"

+             image_overlay="icn_play.tga"

+             image_unselected="flyout_btn_left.tga"

+             image_selected="flyout_btn_left_selected.tga"

+             image_disabled="flyout_btn_left_disabled.tga"

+             label="" left_delta="19"

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

              tool_tip="Play/pause streaming music" width="20" />

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

-             image_disabled="icn_media-pause_disabled.tga"

-             image_selected="icn_media-pause_active.tga"

-             image_unselected="icn_media-pause_enabled.tga" label="" left_delta="0"

+  <button bottom="-21" enabled="false" follows="left|top" height="20"

+             image_overlay="icn_pause.tga"

+                          image_unselected="flyout_btn_left.tga"

+             image_selected="flyout_btn_left_selected.tga"

+             image_disabled="flyout_btn_left_disabled.tga"

+             label="" left_delta="0"

              mouse_opaque="true" name="media_pause" scale_image="true" toggle="false"

              tool_tip="Pause streaming media" width="20" />

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

-             image_disabled="icn_media-stop_disabled.tga"

-             image_selected="icn_media-stop_active.tga"

-             image_unselected="icn_media-stop_enabled.tga" label="" left_delta="20"

+        <button bottom="-21" enabled="true" follows="left|top" height="20"

+             image_overlay="icn_stop.tga"

+                          image_unselected="flyout_btn_right.tga"

+             image_selected="flyout_btn_right_selected.tga"

+             image_disabled="flyout_btn_right_disabled.tga"

+             label="" left_delta="20"

              mouse_opaque="true" name="media_stop" scale_image="true" toggle="false"

              tool_tip="Stop streaming media" width="20" />

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

+        <volume_slider bottom="-23" control_name="AudioLevelMaster" height="22" increment="0.05"

              initial_val="0.5" left_delta="20" 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"

+             width="56" />

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

              image_selected="icn_speaker-muted_dark.tga"

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

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

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

-        <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" />

+        <button bottom="-21" control_name="ShowVolumeSettingsPopup" height="20" label=""

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

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

+        

         <string name="play_label">

                 Play

         </string>

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 8f37b89..86c977d 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,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel bg_visible="false" border="false" border_visible="false" bottom="1"
+<panel bg_visible="false" border="false" border_visible="false" bottom="0"
      enabled="true" follows="right|bottom" height="20" left="0"
-     name="media_remote" use_bounding_rect="true" width="250">
-        <panel bottom="0" filename="panel_bg_tab.xml" height="22" left="0" width="250" />
-        <panel bottom="0" filename="panel_media_controls.xml" height="20" left="0" width="250" />
+     name="media_remote" use_bounding_rect="true" width="220">
+        <panel bottom="1" filename="panel_bg_tab.xml" height="22" left="0" width="220" />
+        <panel bottom="3" filename="panel_media_controls.xml" height="20" left="0" width="220" />
 </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
index 147497c..3c3f8b1 100644
--- 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
@@ -1,9 +1,33 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>

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

      follows="right|bottom" height="185" left="0" name="media_remote"

-     use_bounding_rect="true" width="250">

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

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

-             label="Audio &amp; Video" name="Volume Panel" width="250" />

+     use_bounding_rect="true" width="220">

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

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

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

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

+                <string name="play_label">

+                Play

+        </string>

+        <string name="stop_label">

+                Stop

+        </string>

+        <string name="pause_label">

+                Pause

+        </string>

+        <string name="default_tooltip_label">

+                No Media Specified

+        </string>

+        <string name="media_hidden_label">

+                (URL hidden by parcel owner)

+        </string>

+        <string name="media_icon_tooltip_web">

+                This location displays content from the World Wide Web. Click the Play button to display Web content.

+        </string>

+        <string name="media_icon_tooltip_movie">

+                This location displays Video content. Click the Play button to play the video.

+        </string>

+        <string name="media_play_tooltip">

+                Display Web content at this location.

+        </string>

 </panel>

diff --git a/linden/indra/newview/skins/xui/en-us/panel_music_remote.xml b/linden/indra/newview/skins/xui/en-us/panel_music_remote.xml
deleted file mode 100644
index 6f8f3db..0000000
--- a/linden/indra/newview/skins/xui/en-us/panel_music_remote.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel bg_visible="false" border="false" border_visible="false" bottom="-34"
-     enabled="true" follows="left|top" mouse_opaque="true" name="music_remote">
-        <icon bottom="-19" height="16" image_name="music_icon.tga" left="5" name="music_icon"
-             width="16" />
-        <button bottom="-20" enabled="false" follows="left|top" font="SansSerif"
-             halign="center" height="17" image_selected="button_anim_stop_selected.tga"
-             image_unselected="button_anim_stop.tga" label="" label_selected=""
-             left_delta="25" mouse_opaque="true" name="music_stop" scale_image="true"
-             tool_tip="Stop media" width="17" />
-        <button bottom="-20" enabled="true" follows="left|top" font="SansSerif" halign="center"
-             height="17" image_selected="button_anim_play_selected.tga"
-             image_unselected="button_anim_play.tga" label="" label_selected=""
-             left_delta="17" mouse_opaque="true" name="music_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" 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="music_pause" scale_image="true"
-             tool_tip="Pause media stream" width="17" />
-</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 defefde..bcd7bbc 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_overlaybar.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_overlaybar.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel follows="left|right|bottom|top" height="200" left="-1" mouse_opaque="false"
      name="overlay" use_bounding_rect="true" width="728">
-        <layout_stack bottom="0" follows="left|right|bottom" height="200" left="1"
+        <layout_stack bottom="0" follows="left|right|bottom" height="200" left="0"
              mouse_opaque="false" name="overlay_layout_panel" orientation="horizontal"
              right="-1" use_bounding_rect="true">
                 <layout_panel auto_resize="true" bottom="0" left="0" min_width="420" mouse_opaque="false"
-                     use_bounding_rect="true" user_resize="false" width="420">
-                        <layout_stack bottom="0" follows="left|right|bottom|top" height="50" left="1"
+                     use_bounding_rect="true" user_resize="false" width="420" name="main_panel">
+                        <layout_stack bottom="0" follows="left|right|bottom|top" height="50" left="0"
                              mouse_opaque="false" name="chatbar_and_buttons" orientation="vertical"
                              right="420" use_bounding_rect="true">
                                 <layout_panel auto_resize="true" bottom="0" follows="left|bottom|right|top" height="0"
@@ -42,19 +42,19 @@
                                 </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"
-                                     min_height="23" mouse_opaque="false" name="chat_bar"
+                                     min_height="24" mouse_opaque="false" name="chat_bar"
                                      use_bounding_rect="true" width="395" />
                         </layout_stack>
                 </layout_panel>
-                <layout_panel auto_resize="false" bottom="0" left="0" min_width="250" mouse_opaque="false"
+                <layout_panel auto_resize="false" bottom="0" left="0" min_width="220" mouse_opaque="false"
                      name="media_remote_container" use_bounding_rect="true" user_resize="false"
-                     width="250">
-                        <panel background_visible="false" border="false" bottom="1" name="media_remote" />
+                     width="220">
+                        <panel background_visible="false" border="false" bottom="0" name="media_remote" />
                 </layout_panel>
-                <layout_panel auto_resize="false" bottom="0" left="0" min_width="128" mouse_opaque="false"
+                <layout_panel auto_resize="false" bottom="0" left="0" min_width="130" mouse_opaque="false"
                      name="voice_remote_container" use_bounding_rect="true" user_resize="false"
                      width="128">
-                        <panel background_visible="false" border="false" bottom="1" name="voice_remote" />
+                        <panel background_visible="false" border="false" bottom="0" name="voice_remote" />
                 </layout_panel>
         </layout_stack>
 </panel>
diff --git a/linden/indra/newview/skins/xui/en-us/panel_place.xml b/linden/indra/newview/skins/xui/en-us/panel_place.xml
index 5d3e40b..d960a1a 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_place.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_place.xml
@@ -4,27 +4,27 @@
      name="Place" title="Place" width="450">
         <texture_picker bottom="95" follows="left|top" height="300" left="20" name="snapshot_ctrl"
              width="400" />
-        <text bottom_delta="-10" follows="left|top" font="SansSerif" height="20" left="20">
+        <text bottom_delta="-10" follows="left|top" font="SansSerif" height="20" left="20" name="name_label">
                 Name:
         </text>
         <text bottom_delta="0" follows="left|top" font="SansSerif" height="20" left="60"
-             name="name_editor" text_color="white" width="361" />
-        <text bottom_delta="-20" follows="left|top" font="SansSerif" height="20" left="20">
+             name="name_editor" width="361" />
+        <text bottom_delta="-20" follows="left|top" font="SansSerif" height="20" left="20" name="description_label">
                 Description:
         </text>
-        <text_editor bg_readonly_color="clear" bottom_delta="-68" enabled="false" follows="left|top"
+        <text_editor bottom_delta="-68" enabled="false" follows="left|top"
              font="SansSerif" height="70" left="20" max_length="1023" name="desc_editor"
-             text_readonly_color="white" width="400" word_wrap="true" />
-        <text bottom_delta="-25" follows="left|top" font="SansSerif" height="20" left="20">
+             width="400" word_wrap="true" />
+        <text bottom_delta="-25" follows="left|top" font="SansSerif" height="20" left="20" name="information_label">
                 Information:
         </text>
         <text bottom_delta="0" follows="left|top" font="SansSerif" height="20" left="95"
-             name="info_editor" text_color="white" width="328" />
-        <text bottom_delta="-20" follows="left|top" font="SansSerif" height="20" left="20">
+             name="info_editor" width="328" />
+        <text bottom_delta="-20" follows="left|top" font="SansSerif" height="20" left="20" name="location_label">
                 Location:
         </text>
         <text bottom_delta="0" follows="left|top" font="SansSerif" height="20" left="95"
-             name="location_editor" text_color="white" width="342" />
+             name="location_editor" width="342" />
         <button bottom_delta="-20" follows="left|top" height="20" label="Teleport" left="20"
              name="teleport_btn" width="100" />
         <button bottom_delta="0" follows="left|top" height="20" label="Show on Map" left="130"
diff --git a/linden/indra/newview/skins/xui/en-us/panel_place_small.xml b/linden/indra/newview/skins/xui/en-us/panel_place_small.xml
index e237bb9..1020a0a 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_place_small.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_place_small.xml
@@ -4,27 +4,27 @@
      name="Place" title="Place" width="450">
         <texture_picker bottom="-274" follows="left|top" height="270" left="20" name="snapshot_ctrl"
              width="360" />
-        <text bottom_delta="-12" follows="left|top" font="SansSerif" height="20" left="20">
+        <text bottom_delta="-12" follows="left|top" font="SansSerif" height="20" left="20" name="name_label">
                 Name:
         </text>
         <text bottom_delta="0" follows="left|top" font="SansSerif" height="20" left="60"
-             name="name_editor" text_color="white" width="320" />
-        <text bottom_delta="-24" follows="left|top" font="SansSerif" height="20" left="20">
+             name="name_editor" width="320" />
+        <text bottom_delta="-24" follows="left|top" font="SansSerif" height="20" left="20" name="description_label">
                 Description:
         </text>
         <text_editor bg_readonly_color="clear" bottom_delta="-68" enabled="false" follows="left|top"
              font="SansSerif" height="70" left="20" max_length="1023" name="desc_editor"
-             text_readonly_color="white" width="360" word_wrap="true" />
-        <text bottom_delta="-30" follows="left|top" font="SansSerif" height="20" left="20">
+             width="360" word_wrap="true" />
+        <text bottom_delta="-30" follows="left|top" font="SansSerif" height="20" left="20" name="information_label">
                 Information:
         </text>
         <text bottom_delta="0" follows="left|top" font="SansSerif" height="20" left="95"
-             name="info_editor" text_color="white" width="328" />
-        <text bottom_delta="-30" follows="left|top" font="SansSerif" height="20" left="20">
+             name="info_editor" width="328" />
+        <text bottom_delta="-30" follows="left|top" font="SansSerif" height="20" left="20" name="location_label">
                 Location:
         </text>
         <text bottom_delta="0" follows="left|top" font="SansSerif" height="20" left="95"
-             name="location_editor" text_color="white" width="342" />
+             name="location_editor" width="342" />
         <button bottom_delta="-25" follows="left|top" height="20" label="Teleport" left="20"
              name="teleport_btn" width="100" />
         <button bottom_delta="0" follows="left|top" height="20" label="Show on Map" left="130"
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 377e9a4..92978ab 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
@@ -34,7 +34,7 @@
              left="142" mouse_opaque="true" name="streaming_video" radio_style="false"
              width="338" />
         <check_box bottom_delta="-20" control_name="ParcelMediaAutoPlayEnable" enabled="true"
-             follows="left|top" font="SansSerifSmall" height="16" hidden="false"
+             follows="left|top" font="SansSerifSmall" height="16"
              initial_value="true" label="Automatically play media" left="162"
              mouse_opaque="true" name="auto_streaming_video" radio_style="false"
              width="338" />
diff --git a/linden/indra/newview/skins/xui/en-us/panel_preferences_chat.xml b/linden/indra/newview/skins/xui/en-us/panel_preferences_chat.xml
index 4ac9ddd..27ec29a 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_preferences_chat.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_preferences_chat.xml
@@ -31,33 +31,37 @@
                 Chat Color:
         </text>
         <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-140"
+             can_apply_immediately="true" color="1 1 1 1" control_name="AgentChatColor"
+             enabled="true" follows="left|top" height="56" label="Chat" left="148"
+             mouse_opaque="true" name="users" width="44" />
+        <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-140"
+             can_apply_immediately="true" color="0.6 0.6 1 1" control_name="IMChatColor"
+             enabled="true" follows="left|top" height="56" label="IM" left_delta="48"
+             mouse_opaque="true" name="im" width="44" />
+        <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-140"
              can_apply_immediately="true" color="0.8 1 1 1"
              control_name="SystemChatColor" enabled="true" follows="left|top"
-             height="56" label="System" left="148" mouse_opaque="true" name="system"
-             width="48" />
-        <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-140"
-             can_apply_immediately="true" color="1 1 1 1" control_name="AgentChatColor"
-             enabled="true" follows="left|top" height="56" label="Users" left_delta="54"
-             mouse_opaque="true" name="users" width="48" />
+             height="56" label="System" left_delta="48" mouse_opaque="true"
+             name="system" width="44" />
         <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-140"
              can_apply_immediately="true" color="0.7 0.9 0.7 1"
              control_name="ObjectChatColor" enabled="true" follows="left|top"
-             height="56" label="Objects" left_delta="54" mouse_opaque="true"
-             name="objects" width="48" />
+             height="56" label="Objects" left_delta="48" mouse_opaque="true"
+             name="objects" width="44" />
         <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-140"
              can_apply_immediately="true" color="0.7 0.9 0.7 1"
              control_name="llOwnerSayChatColor" enabled="true" follows="left|top"
-             height="56" label="Owner" left_delta="54" mouse_opaque="true" name="owner"
-             width="48" />
+             height="56" label="Owner" left_delta="48" mouse_opaque="true" name="owner"
+             width="44" />
         <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-140"
              can_apply_immediately="true" color="0 0 0 1"
              control_name="BackgroundChatColor" enabled="true" follows="left|top"
-             height="56" label="Bubble" left_delta="54" mouse_opaque="true"
-             name="background" width="48" />
+             height="56" label="Bubble" left_delta="48" mouse_opaque="true"
+             name="background" width="44" />
         <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-140"
              can_apply_immediately="true" color="0.6 0.6 1 1"
              control_name="HTMLLinkColor" enabled="true" follows="left|top" height="56"
-             label="URLs" left_delta="54" mouse_opaque="true" name="links" width="48" />
+             label="URLs" left_delta="48" mouse_opaque="true" name="links" width="44" />
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom="-160" drop_shadow_visible="true" enabled="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12"
diff --git a/linden/indra/newview/skins/xui/en-us/panel_preferences_general.xml b/linden/indra/newview/skins/xui/en-us/panel_preferences_general.xml
index bca8cf9..e679537 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_preferences_general.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_preferences_general.xml
@@ -16,57 +16,62 @@
              font="SansSerifSmall" height="16" initial_value="true"
              label="Show Start Location on Login Screen" left="151" mouse_opaque="true"
              name="show_location_checkbox" radio_style="false" width="256" />
-        <radio_group bottom="-108" control_name="RenderName" draw_border="true" enabled="true"
-             follows="left|top" height="54" left="155" mouse_opaque="true"
-             name="fade_out_radio" width="128">
-                <radio_item type="string" length="1" bottom="-19" enabled="true" follows="left|top" height="16" left="6"
-                     mouse_opaque="true" name="Never" width="463">
+        <combo_box bottom_delta="-25" follows="left|top" height="18" left="155"
+             mouse_opaque="true" name="fade_out_combobox" width="146">
+                <combo_item name="Never" value="Never">
                         Never
-                </radio_item>
-                <radio_item type="string" length="1" bottom="-35" enabled="true" follows="left|top" height="16" left="6"
-                     mouse_opaque="true" name="Temporarily" width="463">
+                </combo_item>
+                <combo_item name="Show Temporarily" value="Show Temporarily">
                         Show Temporarily
-                </radio_item>
-                <radio_item type="string" length="1" bottom="-51" enabled="true" follows="left|top" height="16" left="6"
-                     mouse_opaque="true" name="Always" width="463">
+                </combo_item>
+                <combo_item name="Always" value="Always">
                         Always
-                </radio_item>
-        </radio_group>
-        <check_box bottom="-134" control_name="RenderNameHideSelf" enabled="true"
-             follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-             label="Hide My Name On My Screen" left="151" mouse_opaque="true"
-             name="show_my_name_checkbox" radio_style="false" width="256" />
-        <check_box bottom="-152" control_name="RenderHideGroupTitle" enabled="true"
-             follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-             label="Hide My Group Title" left="151" mouse_opaque="true"
-             name="show_my_title_checkbox" radio_style="false" width="256" />
-        <check_box bottom="-170" control_name="SmallAvatarNames" enabled="true" follows="left|top"
+                </combo_item>
+        </combo_box>
+        <check_box bottom_delta="-25" control_name="SmallAvatarNames" follows="left|top"
              font="SansSerifSmall" height="16" initial_value="true"
-             label="Small Avatar Names" left="151" mouse_opaque="true"
-             name="small_avatar_names_checkbox" radio_style="false" width="256" />
-        <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-214"
+             label="Small Avatar Names" left="151" name="small_avatar_names_checkbox"
+             width="200" />
+        <check_box bottom_delta="-18" control_name="RenderNameHideSelf" follows="left|top"
+             font="SansSerifSmall" height="16" initial_value="false"
+             label="Hide My Name On My Screen" left="151" name="show_my_name_checkbox"
+             width="200" />
+        <text type="string" length="1" bottom_delta="-24" follows="left|top" font="SansSerifSmall" h_pad="0"
+             halign="left" height="16" left="10" name="group_titles_textbox" v_pad="0"
+             width="394">
+                Group Titles:
+        </text>
+        <check_box bottom_delta="0" control_name="RenderHideGroupTitleAll" follows="left|top"
+             font="SansSerifSmall" height="16" initial_value="false"
+             label="Hide All Group Titles" left="151" mouse_opaque="true"
+             name="show_all_title_checkbox" radio_style="false" width="256" />
+        <check_box bottom_delta="-18" control_name="RenderHideGroupTitle" follows="left|top"
+             font="SansSerifSmall" height="16" initial_value="false"
+             label="Hide My Group Title" left="151" name="show_my_title_checkbox"
+             radio_style="false" width="256" />
+        <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-210"
              can_apply_immediately="false" color="1 1 1 1" control_name="EffectColor"
-             enabled="true" follows="left|top" height="36" label="" left="153"
+             enabled="true" follows="left|top" height="48" label="" left="153"
              mouse_opaque="true" name="effect_color_swatch"
-             tool_tip="Click to open Color Picker" width="20" />
+             tool_tip="Click to open Color Picker" width="32" />
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom="-215" 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="UI Size:" v_pad="0" width="128">
+             font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10"
+             mouse_opaque="true" name="UI Size:" v_pad="0" width="128">
                 UI Size:
         </text>
         <slider bottom="-217" can_edit_text="true" control_name="UIScaleFactor"
-             decimal_digits="3" enabled="true" height="16" hidden="false"
-             increment="0.025" initial_val="1" left="148" max_val="1.4" min_val="0.75"
-             mouse_opaque="true" name="UI Scale" show_text="true" value="1" width="256" />
+             decimal_digits="3" enabled="true" height="16" increment="0.025"
+             initial_val="1" left="148" max_val="1.4" min_val="0.75" mouse_opaque="true"
+             name="UI Scale" show_text="true" value="1" width="256" />
         <check_box bottom="-236" control_name="UIAutoScale" enabled="true" follows="left|top"
-             font="SansSerifSmall" height="16" hidden="false" initial_value="false"
-             label="Use resolution independent scale" left="148" mouse_opaque="true"
+             font="SansSerifSmall" height="16" initial_value="false"
+             label="Use resolution independent scale" left="151" mouse_opaque="true"
              name="ui_auto_scale" radio_style="false" width="256" />
-        <spinner bottom="-260" control_name="AFKTimeout" enabled="true" follows="left|top"
-             height="16" increment="1" initial_val="300" label="Away Timeout:"
-             label_width="141" left="10" max_val="600" min_val="30" mouse_opaque="true"
-             name="afk_timeout_spinner" width="202" />
+        <spinner bottom="-260" control_name="AFKTimeout" decimal_digits="0" enabled="true"
+             follows="left|top" height="16" increment="1" initial_val="300"
+             label="Away Timeout:" label_width="141" left="10" max_val="600"
+             min_val="30" mouse_opaque="true" name="afk_timeout_spinner" width="202" />
         <check_box bottom="-286" control_name="ChatOnlineNotification" enabled="true"
              follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
              label="Show Online Friend Notifications" left="151" mouse_opaque="true"
@@ -87,7 +92,7 @@
              tool_tip="Use the default system color picker instead of the one built into Second Life."
              width="256" />
         <check_box bottom="-358" control_name="ShowSearchBar" enabled="true" follows="left|top"
-             font="SansSerifSmall" height="16" hidden="false" initial_value="false"
+             font="SansSerifSmall" height="16" initial_value="false"
              label="Show search panel in overlay bar" left="151" mouse_opaque="true"
              name="show_search_panel" radio_style="false"
              tool_tip="Display the embedded search panel." width="256" />
@@ -104,7 +109,7 @@
                 Show Names:
         </text>
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-190" drop_shadow_visible="true" enabled="true" follows="left|top"
+             bottom="-184" drop_shadow_visible="true" enabled="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
              mouse_opaque="true" name="effects_color_textbox" v_pad="0" width="394">
                 Color For My Effects:
@@ -150,7 +155,7 @@
                         Never send
                 </combo_item>
         </combo_box>
-        <combo_box allow_text_entry="true" bottom="-402" control_name="Language" enabled="true"
+        <combo_box allow_text_entry="true" bottom="-400" control_name="Language" enabled="true"
              follows="left|bottom" height="16" left="153" max_chars="135"
              mouse_opaque="true" name="language_combobox" width="146">
                 <combo_item type="string" length="1" enabled="true" name="System Default Language" value="default">
diff --git a/linden/indra/newview/skins/xui/en-us/panel_preferences_graphics1.xml b/linden/indra/newview/skins/xui/en-us/panel_preferences_graphics1.xml
index 71ba4bf..fbcb773 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_preferences_graphics1.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_preferences_graphics1.xml
@@ -5,12 +5,12 @@
         <button bottom="-22" follows="left|top" font="SansSerif" height="18" label="?"
              left="470" name="GraphicsPreferencesHelpButton" width="22" />
         <check_box bottom="-23" enabled="true" follows="left|top" font="SansSerifSmall"
-             height="16" hidden="false" initial_value="false"
+             height="16" initial_value="false"
              label="Run Second Life in a window" left="10" mouse_opaque="true"
              name="windowed mode" radio_style="false" width="100" />
         <text_editor type="string" length="1" allow_html="false" bg_readonly_color="0 0 0 0" bottom="-43"
              embedded_items="false" enabled="false" follows="left|top"
-             font="SansSerifSmall" height="20" hidden="false" hide_border="true"
+             font="SansSerifSmall" height="20" hide_border="true"
              hide_scrollbar="true" left="10" max_length="65535" mouse_opaque="true"
              name="FullScreenInfo" tab_stop="false" width="350" word_wrap="true">
                 If unchecked, viewer will display full-screen when logged in.
@@ -26,7 +26,7 @@
              name="fullscreen combo" width="150" />
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom="-62" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="12" hidden="false"
+             font="SansSerifSmall" h_pad="0" halign="left" height="12"
              left="10" mouse_opaque="true" name="AspectRatioLabel1"
              tool_tip="width / height" v_pad="0" width="160">
                 Aspect Ratio:
@@ -53,60 +53,60 @@
              name="aspect_auto_detect" radio_style="false" width="256" />
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom="-85" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="12" hidden="false"
+             font="SansSerifSmall" h_pad="0" halign="left" height="12"
              left="10" mouse_opaque="true" name="HigherText" v_pad="0" width="80">
                 Quality and
         </text>
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom_delta="-14" drop_shadow_visible="true" enabled="true"
              follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
-             height="12" hidden="false" left_delta="0" mouse_opaque="true"
+             height="12" left_delta="0" mouse_opaque="true"
              name="QualityText" v_pad="0" width="95">
                 Performance:
         </text>
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom="-86" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="12" hidden="false"
+             font="SansSerifSmall" h_pad="0" halign="left" height="12"
              left="115" mouse_opaque="true" name="FasterText" v_pad="0" width="80">
                 Faster
         </text>
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom="-105" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="12" hidden="false"
+             font="SansSerifSmall" h_pad="0" halign="left" height="12"
              left="158" mouse_opaque="true" name="ShadersPrefText" v_pad="0" width="40">
                 Low
         </text>
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom_delta="0" drop_shadow_visible="true" enabled="true"
              follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
-             height="12" hidden="false" left_delta="47" mouse_opaque="true"
+             height="12" left_delta="47" mouse_opaque="true"
              name="ShadersPrefText2" v_pad="0" width="40">
                 Mid
         </text>
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom_delta="0" drop_shadow_visible="true" enabled="true"
              follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
-             height="12" hidden="false" left_delta="47" mouse_opaque="true"
+             height="12" left_delta="47" mouse_opaque="true"
              name="ShadersPrefText3" v_pad="0" width="40">
                 High
         </text>
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom_delta="0" drop_shadow_visible="true" enabled="true"
              follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
-             height="12" hidden="false" left_delta="47" mouse_opaque="true"
+             height="12" left_delta="47" mouse_opaque="true"
              name="ShadersPrefText4" v_pad="0" width="40">
                 Ultra
         </text>
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom="-80" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="12" hidden="false"
+             font="SansSerifSmall" h_pad="0" halign="left" height="12"
              left="334" mouse_opaque="true" name="HigherText2" v_pad="0" width="80">
                 Higher
         </text>
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom_delta="-14" drop_shadow_visible="true" enabled="true"
              follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
-             height="12" hidden="false" left_delta="0" mouse_opaque="true"
+             height="12" left_delta="0" mouse_opaque="true"
              name="QualityText2" v_pad="0" width="95">
                 Quality
         </text>
@@ -124,64 +124,64 @@
              width="2" />
         <slider bottom="-90" can_edit_text="false" control_name="RenderQualityPerformance"
              decimal_digits="0" enabled="true" follows="left|top" height="16"
-             hidden="false" increment="1" initial_val="0" label="" label_width="0"
+             increment="1" initial_val="0" label="" label_width="0"
              left="165" max_val="3" min_val="0" mouse_opaque="true"
              name="QualityPerformanceSelection" show_text="false" width="150" />
         <check_box bottom="-91" control_name="RenderCustomSettings" enabled="true"
-             follows="left|top" font="SansSerifSmall" height="16" hidden="false"
+             follows="left|top" font="SansSerifSmall" height="16"
              initial_value="true" label="Custom" left="385" mouse_opaque="true"
              name="CustomSettings" radio_style="false" width="256" />
         <view_border bevel_style="none" border_thickness="1" bottom="-375" follows="top|left"
              height="260" left="5" name="GraphicsBorder" width="485" />
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom="-130" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="12" hidden="false"
+             font="SansSerifSmall" h_pad="0" halign="left" height="12"
              left="10" mouse_opaque="true" name="ShadersText" v_pad="0" width="128">
                 Shaders:
         </text>
         <check_box bottom="-153" control_name="RenderObjectBump" enabled="true" follows="left|top"
-             font="SansSerifSmall" height="16" hidden="false" initial_value="true"
+             font="SansSerifSmall" height="16" initial_value="true"
              label="Bump Mapping and Shiny" left="10" mouse_opaque="true"
              name="BumpShiny" radio_style="false" width="256" />
         <check_box bottom_delta="-17" control_name="VertexShaderEnable" enabled="true"
-             follows="left|top" font="SansSerifSmall" height="16" hidden="false"
+             follows="left|top" font="SansSerifSmall" height="16"
              initial_value="true" label="Basic Shaders" left_delta="0"
              mouse_opaque="true" name="BasicShaders" radio_style="false"
              tool_tip="Disabling this option may prevent some graphics card drivers from crashing."
              width="315" />
         <check_box bottom_delta="-17" control_name="WindLightUseAtmosShaders" enabled="true"
-             follows="left|top" font="SansSerifSmall" height="16" hidden="false"
+             follows="left|top" font="SansSerifSmall" height="16"
              initial_value="true" label="Atmospheric Shaders" left_delta="0"
              mouse_opaque="true" name="WindLightUseAtmosShaders" radio_style="false"
              width="256" />
         <check_box bottom_delta="-17" control_name="RenderWaterReflections" enabled="true"
-             follows="left|top" font="SansSerifSmall" height="16" hidden="false"
+             follows="left|top" font="SansSerifSmall" height="16"
              initial_value="true" label="Water Reflections" left_delta="0"
              mouse_opaque="true" name="Reflections" radio_style="false" width="256" />
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom="-223" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="12" hidden="false"
+             font="SansSerifSmall" h_pad="0" halign="left" height="12"
              left="10" mouse_opaque="true" name="ReflectionDetailText" v_pad="0"
              width="128">
                 Reflection Detail:
         </text>
         <radio_group bottom_delta="-73" control_name="RenderReflectionDetail" draw_border="false"
-             enabled="true" follows="left|top" height="70" hidden="false"
+             enabled="true" follows="left|top" height="70"
              left_delta="-2" mouse_opaque="true" name="ReflectionDetailRadio"
              width="321">
-                <radio_item type="string" length="1" bottom="-19" enabled="true" follows="left|top" height="16" hidden="false"
+                <radio_item type="string" length="1" bottom="-19" enabled="true" follows="left|top" height="16"
                      left="3" mouse_opaque="true" name="0" width="315">
                         Terrain and Trees
                 </radio_item>
-                <radio_item type="string" length="1" bottom="-35" enabled="true" follows="left|top" height="16" hidden="false"
+                <radio_item type="string" length="1" bottom="-35" enabled="true" follows="left|top" height="16"
                      left="3" mouse_opaque="true" name="1" width="315">
                         All Static Objects
                 </radio_item>
-                <radio_item type="string" length="1" bottom="-51" enabled="true" follows="left|top" height="16" hidden="false"
+                <radio_item type="string" length="1" bottom="-51" enabled="true" follows="left|top" height="16"
                      left="3" mouse_opaque="true" name="2" width="315">
                         All Avatars and Objects
                 </radio_item>
-                <radio_item type="string" length="1" bottom="-67" enabled="true" follows="left|top" height="16" hidden="false"
+                <radio_item type="string" length="1" bottom="-67" enabled="true" follows="left|top" height="16"
                      left="3" mouse_opaque="true" name="3" width="315">
                         Everything
                 </radio_item>
@@ -206,32 +206,32 @@
              radio_style="false" width="256" />
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom="-131" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="12" hidden="false"
+             font="SansSerifSmall" h_pad="0" halign="left" height="12"
              left="457" mouse_opaque="true" name="DrawDistanceMeterText1" v_pad="0"
              width="128">
                 m
         </text>
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom="-131" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="12" hidden="false"
+             font="SansSerifSmall" h_pad="0" halign="left" height="12"
              left="463" mouse_opaque="true" name="DrawDistanceMeterText2" v_pad="0"
              width="128">
                 m
         </text>
         <slider bottom="-135" can_edit_text="false" control_name="RenderFarClip"
              decimal_digits="0" enabled="true" follows="left|top" height="16"
-             hidden="false" increment="8" initial_val="160" label="Draw Distance:"
+             increment="8" initial_val="160" label="Draw Distance:"
              label_width="140" left="215" max_val="512" min_val="64" mouse_opaque="true"
              name="DrawDistance" show_text="true" width="255" />
         <slider bottom_delta="-20" can_edit_text="false" control_name="RenderMaxPartCount"
              decimal_digits="0" enabled="true" follows="left|top" height="16"
-             hidden="false" increment="256" initial_val="4096"
+             increment="256" initial_val="4096"
              label="Max. Particle Count:" label_width="140" left_delta="0"
              max_val="8192" min_val="0" mouse_opaque="true" name="MaxParticleCount"
              show_text="true" width="262" />
         <slider bottom_delta="-20" can_edit_text="false" control_name="RenderGlowResolutionPow"
              decimal_digits="0" enabled="true" follows="left|top" height="16"
-             hidden="false" increment="1" initial_val="8" label="Post Process Quality:"
+             increment="1" initial_val="8" label="Post Process Quality:"
              label_width="140" left_delta="0" max_val="9" min_val="8"
              mouse_opaque="true" name="RenderPostProcess" show_text="false" width="223" />
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
@@ -243,43 +243,43 @@
         </text>
         <slider bottom_delta="-22" can_edit_text="false" control_name="RenderVolumeLODFactor"
              decimal_digits="3" enabled="true" follows="left|top" height="16"
-             hidden="false" increment="0.125" initial_val="160" label="  Objects:"
+             increment="0.125" initial_val="160" label="  Objects:"
              label_width="140" left_delta="0" max_val="2" min_val="0"
              mouse_opaque="true" name="ObjectMeshDetail" show_text="false" width="223" />
         <slider bottom_delta="-20" can_edit_text="false" control_name="RenderFlexTimeFactor"
              decimal_digits="3" enabled="true" follows="left|top" height="16"
-             hidden="false" increment="0.1" initial_val="160" label="  Flexiprims:"
+             increment="0.1" initial_val="160" label="  Flexiprims:"
              label_width="140" left_delta="0" max_val="1" min_val="0"
              mouse_opaque="true" name="FlexibleMeshDetail" show_text="false" width="223" />
         <slider bottom_delta="-20" can_edit_text="false" control_name="RenderTreeLODFactor"
              decimal_digits="3" enabled="true" follows="left|top" height="16"
-             hidden="false" increment="0.125" initial_val="160" label="  Trees:"
+             increment="0.125" initial_val="160" label="  Trees:"
              label_width="140" left_delta="0" max_val="1" min_val="0"
              mouse_opaque="true" name="TreeMeshDetail" show_text="false" width="223" />
         <slider bottom_delta="-20" can_edit_text="false" control_name="RenderAvatarLODFactor"
              decimal_digits="3" enabled="true" follows="left|top" height="16"
-             hidden="false" increment="0.125" initial_val="160" label="  Avatars:"
+             increment="0.125" initial_val="160" label="  Avatars:"
              label_width="140" left_delta="0" max_val="1" min_val="0"
              mouse_opaque="true" name="AvatarMeshDetail" show_text="false" width="223" />
         <slider bottom_delta="-20" can_edit_text="false" control_name="RenderTerrainLODFactor"
              decimal_digits="3" enabled="true" follows="left|top" height="16"
-             hidden="false" increment="0.125" initial_val="160" label="  Terrain:"
+             increment="0.125" initial_val="160" label="  Terrain:"
              label_width="140" left_delta="0" max_val="2" min_val="1"
              mouse_opaque="true" name="TerrainMeshDetail" show_text="false" width="223" />
         <slider bottom_delta="-20" can_edit_text="false" control_name="WLSkyDetail"
              decimal_digits="0" enabled="true" follows="left|top" height="16"
-             hidden="false" increment="8" initial_val="160" label="  Sky:"
+             increment="8" initial_val="160" label="  Sky:"
              label_width="140" left_delta="0" max_val="128" min_val="16"
              mouse_opaque="true" name="SkyMeshDetail" show_text="false" width="223" />
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom="-172" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="12" hidden="false"
+             font="SansSerifSmall" h_pad="0" halign="left" height="12"
              left="444" mouse_opaque="true" name="PostProcessText" v_pad="0" width="128">
                 Low
         </text>
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom="-210" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="12" hidden="false"
+             font="SansSerifSmall" h_pad="0" halign="left" height="12"
              left="444" mouse_opaque="true" name="ObjectMeshDetailText" v_pad="0"
              width="128">
                 Low
@@ -287,53 +287,53 @@
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom_delta="-20" drop_shadow_visible="true" enabled="true"
              follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
-             height="12" hidden="false" left_delta="0" mouse_opaque="true"
+             height="12" left_delta="0" mouse_opaque="true"
              name="FlexibleMeshDetailText" v_pad="0" width="128">
                 Low
         </text>
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom_delta="-20" drop_shadow_visible="true" enabled="true"
              follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
-             height="12" hidden="false" left_delta="0" mouse_opaque="true"
+             height="12" left_delta="0" mouse_opaque="true"
              name="TreeMeshDetailText" v_pad="0" width="128">
                 Low
         </text>
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom_delta="-20" drop_shadow_visible="true" enabled="true"
              follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
-             height="12" hidden="false" left_delta="0" mouse_opaque="true"
+             height="12" left_delta="0" mouse_opaque="true"
              name="AvatarMeshDetailText" v_pad="0" width="128">
                 Low
         </text>
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom_delta="-20" drop_shadow_visible="true" enabled="true"
              follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
-             height="12" hidden="false" left_delta="0" mouse_opaque="true"
+             height="12" left_delta="0" mouse_opaque="true"
              name="TerrainMeshDetailText" v_pad="0" width="128">
                 Low
         </text>
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom_delta="-20" drop_shadow_visible="true" enabled="true"
              follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
-             height="12" hidden="false" left_delta="0" mouse_opaque="true"
+             height="12" left_delta="0" mouse_opaque="true"
              name="SkyMeshDetailText" v_pad="0" width="128">
                 Low
         </text>
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom="-331" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="12" hidden="false"
+             font="SansSerifSmall" h_pad="0" halign="left" height="12"
              left="210" mouse_opaque="true" name="LightingDetailText" v_pad="0"
              width="128">
                 Lighting Detail:
         </text>
         <radio_group bottom_delta="-43" control_name="RenderLightingDetail" draw_border="false"
-             enabled="true" follows="left|top" height="38" hidden="false" left_delta="0"
+             enabled="true" follows="left|top" height="38" left_delta="0"
              mouse_opaque="true" name="LightingDetailRadio" width="321">
-                <radio_item type="string" length="1" bottom="-19" enabled="true" follows="left|top" height="16" hidden="false"
+                <radio_item type="string" length="1" bottom="-19" enabled="true" follows="left|top" height="16"
                      left="3" mouse_opaque="true" name="SunMoon" width="156">
                         Sun and moon only
                 </radio_item>
-                <radio_item type="string" length="1" bottom="-35" enabled="true" follows="left|top" height="16" hidden="false"
+                <radio_item type="string" length="1" bottom="-35" enabled="true" follows="left|top" height="16"
                      left="3" mouse_opaque="true" name="LocalLights" width="156">
                         Nearby local lights
                 </radio_item>
@@ -345,22 +345,22 @@
                 Terrain Detail:
         </text>
         <radio_group bottom_delta="-43" control_name="RenderTerrainDetail" draw_border="false"
-             enabled="true" follows="left|top" height="38" hidden="false" left_delta="0"
+             enabled="true" follows="left|top" height="38" left_delta="0"
              mouse_opaque="true" name="TerrainDetailRadio" width="321">
-                <radio_item type="string" length="1" bottom="-19" enabled="true" follows="left|top" height="16" hidden="false"
+                <radio_item type="string" length="1" bottom="-19" enabled="true" follows="left|top" height="16"
                      left="3" mouse_opaque="true" name="0" width="315">
                         Low
                 </radio_item>
-                <radio_item type="string" length="1" bottom="-35" enabled="true" follows="left|top" height="16" hidden="false"
+                <radio_item type="string" length="1" bottom="-35" enabled="true" follows="left|top" height="16"
                      left="3" mouse_opaque="true" name="2" width="315">
                         High
                 </radio_item>
         </radio_group>
         <button bottom="-400" enabled="true" font="SansSerif" halign="center" height="20"
-             hidden="false" label="Recommended Settings" left="130" mouse_opaque="true"
+             label="Recommended Settings" left="130" mouse_opaque="true"
              name="Defaults" scale_image="true" width="170" />
         <button bottom="-400" enabled="true" font="SansSerif" halign="center" height="20"
-             hidden="false" label="Hardware Options" label_selected="Hardware Options"
+             label="Hardware Options" label_selected="Hardware Options"
              left="310" mouse_opaque="true" name="GraphicsHardwareButton"
              scale_image="true" width="170" />
         <string name="resolution_format">
diff --git a/linden/indra/newview/skins/xui/en-us/panel_preferences_input.xml b/linden/indra/newview/skins/xui/en-us/panel_preferences_input.xml
index 982775b..85aab95 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_preferences_input.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_preferences_input.xml
@@ -39,33 +39,57 @@
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom="-110" drop_shadow_visible="true" enabled="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="10" left="148"
-             mouse_opaque="true" name="Camera Springiness:" v_pad="0" width="128">
-                Camera Springiness:
+             mouse_opaque="true" name="Camera Follow Distance:" v_pad="0" width="128">
+                Camera Follow Distance:
         </text>
         <slider bottom="-116" can_edit_text="true" control_name="DynamicCameraStrength"
              decimal_digits="0" enabled="true" follows="left|top" height="16"
              increment="1" initial_val="2" left="276" max_val="10" min_val="0"
-             mouse_opaque="true" name="dynamic camera" show_text="true" value="2"
+             mouse_opaque="true" name="DynamicCameraStrength" show_text="true" value="2"
              width="128" />
-        <check_box bottom="-134" control_name="EditCameraMovement" enabled="true"
+        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             bottom="-134" drop_shadow_visible="true" enabled="true" follows="left|top"
+             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="148"
+             mouse_opaque="true" name="Camera Transition Time:" v_pad="0" width="128">
+                Camera Transition Time:
+        </text>
+        <slider bottom="-140" can_edit_text="true" control_name="ZoomTime" decimal_digits="1"
+             enabled="true" follows="left|top" height="16" increment="0.1"
+             initial_val="0.4" left="276" max_val="4" min_val="0" mouse_opaque="true"
+             name="ZoomTime" show_text="true" value="2" width="128" />
+        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             bottom="-158" drop_shadow_visible="true" enabled="true" follows="left|top"
+             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="148"
+             mouse_opaque="true" name="Camera Smoothing:" v_pad="0" width="128">
+                Camera Smoothing:
+        </text>
+        <slider bottom="-164" can_edit_text="true" control_name="CameraPositionSmoothing"
+             decimal_digits="1" enabled="true" follows="left|top" height="16"
+             increment="0.1" initial_val="1" left="276" max_val="9" min_val="0"
+             mouse_opaque="true" name="CameraPositionSmoothing" show_text="true" value="2"
+             width="128" />
+        <check_box bottom="-188" control_name="EditCameraMovement" enabled="true"
              follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
              label="Automatic Edit Camera Movement" left="148" mouse_opaque="true"
              name="edit camera movement" radio_style="false"
              tool_tip="Use automatic camera positioning when entering and exiting edit mode"
              width="201" />
-        <check_box bottom="-152" control_name="AppearanceCameraMovement" enabled="true"
+        <check_box bottom="-206" control_name="AppearanceCameraMovement" enabled="true"
              follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
              label="Automatic Appearance Camera Movement" left="148" mouse_opaque="true"
              name="appearance camera movement" radio_style="false"
              tool_tip="Use automatic camera positioning while in edit mode" width="242" />
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-186" 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="text2" v_pad="0" width="128">
+             bottom="-228" drop_shadow_visible="true" enabled="true" follows="left|top"
+             font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10"
+             mouse_opaque="true" name="text2" v_pad="0" width="128">
                 Avatar Display Options:
         </text>
-        <check_box bottom="-190" control_name="FirstPersonAvatarVisible" enabled="true"
-             follows="left|top" font="SansSerifSmall" height="16" hidden="false"
-             initial_value="false" label="Show Avatar in Mouselook" left="148"
-             mouse_opaque="true" name="avfp" radio_style="false" width="256" />
+        <check_box bottom="-232" control_name="FirstPersonAvatarVisible" enabled="true"
+             follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+             label="Show Avatar in Mouselook" left="148" mouse_opaque="true" name="avfp"
+             radio_style="false" width="256" />
+        <button bottom_delta="-30" follows="left|top" font="SansSerif" height="20"
+             label="Joystick Setup" left_delta="0" mouse_opaque="true"
+             name="joystic_setup_button" width="155" />
 </panel>
diff --git a/linden/indra/newview/skins/xui/en-us/panel_preferences_popups.xml b/linden/indra/newview/skins/xui/en-us/panel_preferences_popups.xml
index 8563ad0..5e8f871 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_preferences_popups.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_preferences_popups.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel border="true" bottom="0" height="500" label="Popups" left="0" name="popups"
      title="Popups" width="400">
-        <text bottom="-20" follows="top|left" left="15" width="300">
+        <text bottom="-20" follows="top|left" left="15" width="300" name="dont_show_label">
                 Do not show popups:
         </text>
         <scroll_list follows="top|left" height="88" left="15" name="disabled_popups" width="480" />
         <button follows="top|left" height="20" label="Enable this popup" left="15"
              name="enable_popup" width="150" />
-        <text follows="top|left" left="15" width="128">
+        <text follows="top|left" left="15" width="128" name="show_label">
                 Show popups:
         </text>
         <scroll_list follows="top|left" height="88" left="15" name="enabled_popups" width="480" />
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 1314971..62fb7b7 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
@@ -78,12 +78,9 @@
              font="SansSerifSmall" height="35" hide_border="true" hide_scrollbar="true"

              left_delta="-20" max_length="65535" mouse_opaque="true"

              name="device_settings_text" tab_stop="false" width="450" word_wrap="true">

-                NOTE: Running the Device Settings or Voice Chat Setup will temporarily disconnect you from Voice Chat.

+                NOTE: Running the Device Settings 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="155" />

-        <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="155" />

 </panel>

diff --git a/linden/indra/newview/skins/xui/en-us/panel_region_covenant.xml b/linden/indra/newview/skins/xui/en-us/panel_region_covenant.xml
index 1c49932..9bb7d90 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_region_covenant.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_region_covenant.xml
@@ -9,46 +9,46 @@
              left="10" name="region_name_lbl" width="75">
                 Region:
         </text>
-        <text bg_readonly_color="clear" bottom_delta="-14" follows="left|top"
+        <text bottom_delta="-14" follows="left|top"
              font="SansSerifSmall" height="20" left_delta="0" name="region_name_text"
-             text_readonly_color="white" width="130">
+             width="130">
                 (unknown)
         </text>
         <text bottom_delta="-22" follows="left|top" font="SansSerifSmall" height="20"
              left="10" name="estate_name_lbl" width="75">
                 Estate:
         </text>
-        <text bg_readonly_color="clear" bottom_delta="-14" follows="left|top"
+        <text bottom_delta="-14" follows="left|top"
              font="SansSerifSmall" height="20" left_delta="0" name="estate_name_text"
-             text_readonly_color="white" width="130">
+             width="130">
                 (unknown)
         </text>
         <text bottom_delta="-22" follows="left|top" font="SansSerifSmall" height="20"
              left="10" name="estate_owner_lbl" width="300">
                 Estate Owner:
         </text>
-        <text bg_readonly_color="clear" bottom_delta="-14" follows="left|top"
+        <text bottom_delta="-14" follows="left|top"
              font="SansSerifSmall" height="20" left_delta="0" name="estate_owner_text"
-             text_readonly_color="white" width="120">
+             width="120">
                 (unknown)
         </text>
-        <text bg_readonly_color="clear" bottom_delta="-28" follows="left|top"
+        <text bottom_delta="-28" follows="left|top"
              font="SansSerif" height="20" left_delta="0" name="resellable_clause"
-             text_readonly_color="white" width="465">
+             width="465">
                 Purchased land in this region may or may not be resold.
         </text>
-        <text bg_readonly_color="clear" bottom_delta="-18" follows="left|top"
+        <text bottom_delta="-18" follows="left|top"
              font="SansSerif" height="20" left_delta="0" name="changeable_clause"
-             text_readonly_color="white" width="465">
+             width="465">
                 Purchased land in this region may or may not be joined or subdivided.
         </text>
         <text bottom_delta="-22" follows="left|top" font="SansSerifSmall" height="16"
              left_delta="0" name="covenent_instructions" width="465">
                 Drag and drop a notecard to change the Covenant for this Estate.
         </text>
-        <text_editor bg_readonly_color="clear" bottom_delta="-242" enabled="false"
+        <text_editor bottom_delta="-242" enabled="false"
              follows="left|top" font="SansSerifSmall" height="238" left_delta="0"
-             max_length="65535" name="covenant_editor" text_readonly_color="white"
+             max_length="65535" name="covenant_editor" 
              width="460" word_wrap="true">
                 Loading...
         </text_editor>
diff --git a/linden/indra/newview/skins/xui/en-us/panel_region_debug.xml b/linden/indra/newview/skins/xui/en-us/panel_region_debug.xml
index 4392888..b1c2bb7 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_region_debug.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_region_debug.xml
@@ -30,17 +30,17 @@
              left="10" name="choose_avatar_btn" width="150" />
         <text bottom_delta="0" follows="left|top" height="20" left="170"
              name="target_avatar_name" width="150" />
-        <button bottom_delta="-20" follows="left|top" height="20"
+        <button bottom_delta="-23" follows="left|top" height="20"
              label="Return avatar&apos;s scripted objects on other people&apos;s land"
              left="50" name="return_scripted_other_land_btn" width="350" />
-        <button bottom_delta="-20" follows="left|top" height="20"
+        <button bottom_delta="-23" follows="left|top" height="20"
              label="Return ALL of avatar&apos;s scripted objects" left="50"
              name="return_scripted_all_btn" width="350" />
         <button bottom_delta="-50" follows="left|top" height="20" label="Get Top Colliders..."
              left="10" name="top_colliders_btn"
              tool_tip="List of objects experiencing the most potential collisions"
              width="150" />
-        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+        <button bottom_delta="-3" follows="left|top" font="SansSerifSmall" height="18" label="?"
              left="170" name="top_colliders_help" width="18" />
         <button bottom_delta="-20" follows="left|top" height="20" label="Get Top Scripts..."
              left="10" name="top_scripts_btn"
@@ -51,7 +51,7 @@
         <button bottom_delta="-50" follows="left|top" height="20" label="Restart Region"
              left="10" name="restart_btn"
              tool_tip="Give 2 minute countdown and restart region" width="130" />
-        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+        <button bottom_delta="-3" follows="left|top" font="SansSerifSmall" height="18" label="?"
              left="150" name="restart_help" width="18" />
         <button bottom_delta="-20" follows="left|top" height="20" label="Delay Restart"
              left="10" name="cancel_restart_btn"
diff --git a/linden/indra/newview/skins/xui/en-us/panel_region_estate.xml b/linden/indra/newview/skins/xui/en-us/panel_region_estate.xml
index 6132489..393ce42 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_region_estate.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_region_estate.xml
@@ -10,18 +10,18 @@ regions in the estate.
              name="estate_text" width="80">
                 Estate:
         </text>
-        <text bg_readonly_color="clear" bottom_delta="-16" follows="left|top"
+        <text bottom_delta="-16" follows="left|top"
              font="SansSerif" height="20" left_delta="0" name="estate_name"
-             text_readonly_color="white" width="150">
+             width="150">
                 (unknown)
         </text>
         <text bottom_delta="-22" follows="left|top" font="SansSerif" height="20" left="10"
              name="owner_text" width="80">
                 Owner:
         </text>
-        <text bg_readonly_color="clear" bottom_delta="-16" follows="left|top"
+        <text bottom_delta="-16" follows="left|top"
              font="SansSerif" height="20" left_delta="0" name="estate_owner"
-             text_readonly_color="white" width="150">
+             width="150">
                 (unknown)
         </text>
         <view_border bevel_style="in" border="true" border_thickness="1" bottom_delta="-295"
@@ -93,7 +93,7 @@ regions in the estate.
              name="estate_manager_help" right="470" width="18" />
         <view_border bevel_style="none" border_thickness="1" bottom_delta="-60" follows="top|left"
              right="470" width="200" />
-        <name_list bottom_delta="0" follows="left|top" height="60" left_delta="0"
+        <name_list bottom_delta="0" follows="left|top" height="60" left_delta="0" multi_select="true"
              name="estate_manager_name_list" width="200" />
         <button bottom_delta="-26" enabled="true" follows="left|top" height="20"
              label="Remove..." name="remove_estate_manager_btn" right="470" width="90" />
@@ -107,7 +107,7 @@ regions in the estate.
              name="allow_resident_help" right="470" width="18" />
         <view_border bevel_style="none" border_thickness="1" bottom_delta="-60" follows="top|left"
              height="60" right="470" width="200" />
-        <name_list bottom_delta="0" follows="left|top" height="60" left_delta="0"
+        <name_list bottom_delta="0" follows="left|top" height="60" left_delta="0" multi_select="true"
              name="allowed_avatar_name_list" width="200" />
         <button bottom_delta="-26" enabled="true" follows="left|top" height="20"
              label="Remove..." name="remove_allowed_avatar_btn" right="470" width="90" />
@@ -121,7 +121,7 @@ regions in the estate.
              name="allow_group_help" right="470" width="18" />
         <view_border bevel_style="none" border_thickness="1" bottom_delta="-60" follows="top|left"
              height="60" right="470" width="200" />
-        <name_list bottom_delta="0" follows="left|top" height="60" left_delta="0"
+        <name_list bottom_delta="0" follows="left|top" height="60" left_delta="0" multi_select="true"
              name="allowed_group_name_list" width="200" />
         <button bottom_delta="-26" enabled="true" follows="left|top" height="20"
              label="Remove..." name="remove_allowed_group_btn" right="470" width="90" />
@@ -135,7 +135,7 @@ regions in the estate.
              name="ban_resident_help" right="470" width="18" />
         <view_border bevel_style="none" border_thickness="1" bottom_delta="-60" follows="top|left"
              height="60" right="470" width="200" />
-        <name_list bottom_delta="0" follows="left|top" height="60" left_delta="0"
+        <name_list bottom_delta="0" follows="left|top" height="60" left_delta="0" multi_select="true" 
              name="banned_avatar_name_list" width="200" />
         <button bottom_delta="-26" enabled="true" follows="left|top" height="20"
              label="Remove..." name="remove_banned_avatar_btn" right="470" width="90" />
diff --git a/linden/indra/newview/skins/xui/en-us/panel_region_general.xml b/linden/indra/newview/skins/xui/en-us/panel_region_general.xml
index f3074b8..fa12fca 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_region_general.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_region_general.xml
@@ -42,7 +42,7 @@
         <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
              left="205" name="parcel_search_help" width="18" />
         <spinner bottom_delta="-40" follows="left|top" height="20" increment="1"
-             label="Agent Limit" label_width="97" left="10" max_val="100" min_val="0"
+             label="Agent Limit" label_width="97" left="10" max_val="100" min_val="1"
              name="agent_limit_spin" width="170" />
         <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
              left="205" name="agent_limit_help" width="18" />
@@ -57,10 +57,10 @@
         </text>
         <combo_box bottom_delta="0" follows="left|top" height="20" label="Mature" left="110"
              name="access_combo" width="85">
-                <combo_item name="PG">
+                <combo_item name="PG" value="PG">
                         PG
                 </combo_item>
-                <combo_item name="Mature">
+                <combo_item name="Mature" value="Mature">
                         Mature
                 </combo_item>
         </combo_box>
@@ -70,9 +70,8 @@
              left="108" name="apply_btn" width="100" />
         <button bottom_delta="-80" follows="left|top" height="20"
              label="Teleport Home One User..." left="10" name="kick_btn" width="250" />
-        <button bottom_delta="-20" follows="left|top" height="20"
-             label="Teleport Home All Users..." left="10" name="kick_all_btn"
-             width="250" />
+        <button bottom_delta="-23" follows="left|top" height="20"
+             label="Teleport Home All Users..." left="10" name="kick_all_btn" width="250" />
         <button bottom_delta="-40" follows="left|top" height="20"
              label="Send Message To Region..." left="10" name="im_btn" width="200" />
         <button bottom="-50" follows="left|top" height="20" label="Manage Telehub..."
diff --git a/linden/indra/newview/skins/xui/en-us/panel_region_terrain.xml b/linden/indra/newview/skins/xui/en-us/panel_region_terrain.xml
index 30f5f6b..e93e87c 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_region_terrain.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_region_terrain.xml
@@ -46,7 +46,7 @@
              tool_tip="Available only to estate owners, not managers" width="170" />
         <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
              left="190" name="download_raw_help" width="18" />
-        <button bottom_delta="-20" follows="left|top" height="20" label="Upload RAW terrain..."
+        <button bottom_delta="-23" follows="left|top" height="20" label="Upload RAW terrain..."
              left="10" name="upload_raw_btn"
              tool_tip="Available only to estate owners, not managers" width="170" />
         <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
diff --git a/linden/indra/newview/skins/xui/en-us/panel_settings_chat.xml b/linden/indra/newview/skins/xui/en-us/panel_settings_chat.xml
deleted file mode 100644
index 1c7aff7..0000000
--- a/linden/indra/newview/skins/xui/en-us/panel_settings_chat.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel border="true" bottom="0" height="500" left="0" name="chat" title="Conversation"
-     width="400">
-        <text bottom="-20" follows="top|left" left="12" width="128">
-                Chat Font Size:
-        </text>
-        <radio_group bottom="-72" follows="top|left" height="60" left="148" name="chat font size"
-             width="128">
-                <radio_item>
-                        Small
-                </radio_item>
-                <radio_item>
-                        Medium
-                </radio_item>
-                <radio_item>
-                        Large
-                </radio_item>
-        </radio_group>
-        <text bottom="-95" follows="top|left" left="12" width="128">
-                Chat Color:
-        </text>
-        <color_swatch bottom="-140" follows="top|left" height="56" label="System" left="148"
-             name="system" width="40" />
-        <color_swatch bottom="-140" follows="top|left" height="56" label="Users" left="210"
-             name="users" width="40" />
-        <color_swatch bottom="-140" follows="top|left" height="56" label="Objects" left="272"
-             name="objects" width="40" />
-        <color_swatch bottom="-140" follows="top|left" height="56" label="Bubble" left="334"
-             name="background" width="40" />
-        <text bottom="-167" follows="top|left" left="12" width="128">
-                Chat Console:
-        </text>
-        <spinner bottom="-173" decimal_digits="0" follows="top|left" increment="1"
-             initial_val="10" label="Fade chat after" label_width="80" left="148"
-             max_val="60" min_val="2" name="fade_chat_time" width="130" />
-        <text bottom="-167" follows="top|left" left="282" width="80">
-                (seconds)
-        </text>
-        <spinner bottom="-170" decimal_digits="0" follows="top|left" increment="1"
-             initial_val="10" label="" label_width="0" left="340" max_val="50"
-             min_val="1" name="max_chat_count" width="60" />
-        <text bottom="-167" follows="top|left" left="405" width="60">
-                (# lines)
-        </text>
-        <slider bottom="-192" follows="top|left" height="12" increment="0.05" initial_val="1"
-             label="Opacity" left="148" name="console_opacity" width="200" />
-        <text bottom_delta="-20" follows="top|left" left="12" width="128">
-                Chat Options:
-        </text>
-        <check_box bottom_delta="-7" follows="top|left"
-             label="Chat uses full screen width (after restart)" left="148"
-             name="chat_full_width_check" />
-        <check_box bottom_delta="-20" follows="top|left" label="Close chat after hitting return"
-             left="148" name="close_chat_on_return_check" />
-        <check_box bottom_delta="-20" follows="top|left"
-             label="Arrow keys move avatar when chatting" left="148"
-             name="arrow_keys_move_avatar_check" />
-        <check_box bottom_delta="-20" follows="top|left" label="Show timestamps in chat"
-             left="148" name="show_timestamps_check" />
-        <text bottom_delta="-20" follows="top|left" left="12" width="128">
-                Bubble Chat:
-        </text>
-        <check_box bottom_delta="-7" follows="top|left" label="Show chat bubbles" left="148"
-             name="bubble_text_chat" />
-        <slider bottom_delta="-20" follows="top|left" height="12" increment="0.05"
-             initial_val="1" label="Opacity" left="148" name="bubble_chat_opacity"
-             width="200" />
-        <text bottom_delta="-20" follows="top|left" left="12" width="128">
-                Script Errors:
-        </text>
-        <check_box bottom_delta="-7" follows="top|left"
-             label="Show script errors and warnings as regular chat" left="148"
-             name="script_errors_as_chat" />
-        <color_swatch bottom_delta="-60" follows="top|left" height="56" label="Color" left="148"
-             name="script_error" width="40" />
-</panel>
diff --git a/linden/indra/newview/skins/xui/en-us/panel_settings_im.xml b/linden/indra/newview/skins/xui/en-us/panel_settings_im.xml
deleted file mode 100644
index 3a497fa..0000000
--- a/linden/indra/newview/skins/xui/en-us/panel_settings_im.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel border="true" bottom="0" height="500" left="0" name="im" title="IM" width="400">
-        <text bottom="-20" left="12" width="128">
-                IM Options:
-        </text>
-        <check_box bottom_delta="-5" follows="top|left" label="Send IM to e-mail" left="148"
-             name="send_im_to_email"
-             tool_tip="Change your email address at secondlife.com" />
-        <check_box bottom_delta="-20" follows="top|left" label="Include IM in Chat History"
-             left="148" name="include_im_in_chat_history" />
-        <check_box bottom_delta="-20" follows="top|left" label="Show timestamps in IM" left="148"
-             name="show_timestamps_check" />
-        <text bottom_delta="-20" follows="top|left" left="12" width="128">
-                Busy Mode Response:
-        </text>
-        <text_editor bottom_delta="-60" follows="top|left" font="SansSerifSmall" height="70"
-             left="148" name="busy_response" width="330" word_wrap="true" />
-</panel>
diff --git a/linden/indra/newview/skins/xui/en-us/panel_settings_network.xml b/linden/indra/newview/skins/xui/en-us/panel_settings_network.xml
deleted file mode 100644
index 866634c..0000000
--- a/linden/indra/newview/skins/xui/en-us/panel_settings_network.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel border="true" bottom="0" height="500" left="0" name="network" title="Network"
-     width="400">
-        <text bottom="-20" follows="top|left" left="12" width="128">
-                Maximum Bandwidth:
-        </text>
-        <slider bottom_delta="-5" can_edit_text="true" decimal_digits="0" follows="top|left"
-             height="15" increment="10" initial_val="50" label="" left="148"
-             max_val="1000" min_val="50" name="max_bandwidth" width="200" />
-        <text bottom="-20" follows="top|left" left="350" width="140">
-                kbps (kilobits per second)
-        </text>
-        <text bottom_delta="-25" follows="top|left" left="12" width="128">
-                Disk Cache Size:
-        </text>
-        <radio_group bottom_delta="-70" follows="top|left" height="80" left="148" name="disk cache"
-             width="128">
-                <radio_item>
-                        50 MB
-                </radio_item>
-                <radio_item>
-                        200 MB
-                </radio_item>
-                <radio_item>
-                        500 MB
-                </radio_item>
-                <radio_item>
-                        1000 MB
-                </radio_item>
-        </radio_group>
-        <button bottom_delta="-120" follows="left|bottom" height="20" label="Clear Cache"
-             left="148" name="clear_cache" width="128" />
-        <text bottom="-180" follows="top|left" left="12" width="128">
-                Proxy configuration:
-        </text>
-        <check_box bottom_delta="-5" follows="top|left" label="Use proxy" left="148"
-             name="proxy_enabled" tool_tip="Specify the proxy configuration" />
-        <text bottom_delta="-22" follows="top|left" left="148" width="140">
-                Proxy:
-        </text>
-        <line_editor bottom_delta="-8" follows="top|left" font="SansSerifSmall" height="20"
-             left="205" name="proxy_address"
-             tool_tip="The name or IP address of the proxy you would like to use"
-             width="205" word_wrap="false" />
-        <text bottom="-300" follows="left" left="428" width="75">
-                Port:
-        </text>
-        <line_editor bottom_delta="-7" follows="left" font="SansSerifSmall" height="20" left="460"
-             name="proxy_port"
-             tool_tip="The port number of the proxy you would like to use" width="35"
-             word_wrap="false" />
-        <text bottom="-330" follows="left" left="148" width="75">
-                Socks:
-        </text>
-        <radio_group bottom="-265" follows="top|left" height="40" left="205" name="socks_4_5"
-             width="205">
-                <radio_item>
-                        Socks v4
-                </radio_item>
-                <radio_item>
-                        Socks v5
-                </radio_item>
-        </radio_group>
-        <text bottom_delta="-23" follows="top|left" left="148" width="140">
-                No proxy:
-        </text>
-        <line_editor bottom_delta="-5" follows="top|left" font="SansSerifSmall" height="20"
-             left="205" name="proxy_exclusions"
-             tool_tip="The names or IP addresses you don&apos;t want to use the proxy for"
-             width="205" word_wrap="false" />
-</panel>
diff --git a/linden/indra/newview/skins/xui/en-us/panel_settings_web.xml b/linden/indra/newview/skins/xui/en-us/panel_settings_web.xml
deleted file mode 100644
index 2df660f..0000000
--- a/linden/indra/newview/skins/xui/en-us/panel_settings_web.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel border="true" bottom="0" height="500" left="0" name="web" title="Web"
-     width="400">
-        <check_box follows="top|left"
-             label="Use external web browser (Firefox, Safari, Internet Explorer)"
-             left="150" name="external_browser_check"
-             tool_tip="Use outside web browser for help, web links, etc.\nNot recommended if running full screen."
-             width="480" />
-        <text bottom="-65" follows="top|left" left="15" width="128">
-                Browser home page:
-        </text>
-        <line_editor bottom_delta="-5" follows="top|left" font="SansSerifSmall" height="20"
-             left="150" name="home_page"
-             tool_tip="Web page to visit the first time you use the open the Second Life browser"
-             width="345" word_wrap="false" />
-        <text bottom="-95" follows="top|left" left="15" width="128">
-                Proxy configuration:
-        </text>
-        <check_box bottom_delta="-5" follows="top|left" label="Use proxy for internal Web browser"
-             left="148" name="proxy_enabled"
-             tool_tip="Specify the proxy configuration for the internal Web Browser" />
-        <text bottom_delta="-22" follows="top|left" left="180" width="140">
-                Proxy:
-        </text>
-        <line_editor bottom_delta="-5" follows="top|left" font="SansSerifSmall" height="20"
-             left="260" name="proxy_address"
-             tool_tip="The name or IP address of the proxy you would like to use"
-             width="165" word_wrap="false" />
-        <text bottom="285" follows="left" left="432" width="75">
-                Port:
-        </text>
-        <line_editor bottom="280" follows="left" font="SansSerifSmall" height="20" left="460"
-             name="proxy_port"
-             tool_tip="The port number of the proxy you would like to use" width="35"
-             word_wrap="false" />
-        <text bottom_delta="-15" follows="left" left="180" width="75">
-                Socks:
-        </text>
-        <radio_group bottom="325" follows="top|left" height="40" left="260" name="socks_4_5"
-             width="235">
-                <radio_item>
-                        Socks v4
-                </radio_item>
-                <radio_item>
-                        Socks v5
-                </radio_item>
-        </radio_group>
-        <text bottom_delta="-23" follows="top|left" left="180" width="140">
-                No proxy for:
-        </text>
-        <line_editor bottom_delta="-5" follows="top|left" font="SansSerifSmall" height="20"
-             left="260" name="proxy_exclusions"
-             tool_tip="The names or IP addresses you don&apos;t want to use the proxy for"
-             width="235" word_wrap="false" />
-        <check_box bottom_delta="-30" follows="top|left"
-             label="Show web pages on objects (experimental, requires restart)"
-             left="150" name="web_pages_on_prims_check" width="480" />
-        <text bottom_delta="-16" follows="top|left" left="15" width="140">
-                Trusted sites:
-(log in to view)
-        </text>
-        <scroll_list bottom_delta="-95" follows="top|left" height="100" left="155"
-             name="trusted_sites_list" width="340" />
-        <button bottom_delta="-25" follows="top|left" height="20" label="Add" left="150"
-             name="add_trusted" width="100" />
-        <line_editor bottom_delta="-1" follows="top|left" font="SansSerifSmall" height="20"
-             left="260" name="trusted_site_entry"
-             tool_tip="The site to add to the trusted list" width="235"
-             word_wrap="false" />
-        <button bottom_delta="-25" follows="top|left" height="20" label="Remove" left="150"
-             name="rem_trusted" width="100" />
-</panel>
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
index ec55c55..1a9b6a8 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_speaker_controls.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_speaker_controls.xml
@@ -4,8 +4,8 @@
         <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_stack border="false" bottom="0" follows="left|top|right|bottom" height="123" left="0"

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

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

                      min_height="25" name="moderation_mode_panel" top_delta="0"

                      user_resize="false" visible="false" width="140">

@@ -33,21 +33,21 @@
                         <panel border="false" bottom="0" can_resize="false" follows="left|bottom|right"

                              height="77" left="0" mouse_opaque="true" name="speaker_controls"

                              width="140">

-                                <button bottom="-28" enabled="false" follows="left|top" height="24"

-                                     image_overlay="icon_avatar_offline.tga" label="" left="0"

-                                     name="profile_btn" right="30" />

+                                <button bottom="-28" enabled="false" follows="left|top" height="20"

+                                     image_overlay="icon_avatar_offline.tga" label="" left="4"

+                                     name="profile_btn" right="34" scale_image="true"/>

                                 <text bottom_delta="9" follows="left|top|right" font="SansSerif" left_delta="34"

                                      name="resident_name" valign="center" width="140">

                                         Rumplstiltskin Califragilistic

                                 </text>

                                 <volume_slider bottom_delta="-29" follows="left|top" height="15" increment="0.05"

-                                     initial_val="0.5" left="5" max_val="1.0" min_val="0.0"

+                                     initial_val="0.5" left="0" max_val="1.0" min_val="0.0"

                                      name="speaker_volume" width="110" />

                                 <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" tool_tip="Mute voice for this resident" width="25" />

                                 <check_box bottom_delta="-25" enabled="false" follows="left|top" height="25"

-                                     label="Mute Text" left="4" name="mute_text_btn" width="50" />

+                                     label="Mute Text" left="3" name="mute_text_btn" width="50" />

                         </panel>

                 </layout_panel>

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

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 9f39fd6..1def3fb 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
@@ -7,30 +7,30 @@
              bottom="-22" drop_shadow_visible="true" enabled="true"
              follows="left|right|bottom" font="SansSerifSmall" h_pad="0" halign="left"
              height="18" hover="true" left="561" mouse_opaque="true"
-             name="ParcelNameText"
+             name="ParcelNameText" text_color="ParcelTextColor" hover_color="ParcelHoverColor"
              tool_tip="Name of land parcel on which you are standing. Click for About Land."
              v_pad="2" width="1039">
                 parcel name goes here
         </text>
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-20" disabled_color="0 1 0 1" drop_shadow_visible="true"
+             bottom="-20" disabled_color="BalanceTextColor" drop_shadow_visible="true"
              enabled="true" follows="right|bottom" font="SansSerifSmall" h_pad="0"
              halign="right" height="18" left="-210" mouse_opaque="true"
-             name="BalanceText" text_color="0 1 0 1" tool_tip="Account Balance"
+             name="BalanceText" text_color="BalanceTextColor" tool_tip="Account Balance"
              v_pad="2" width="76">
                 Loading...
         </text>
-        <button bottom="-18" enabled="true" follows="right|bottom" font="SansSerif"
+        <button bottom="-17" enabled="true" follows="right|bottom" font="SansSerif"
              halign="center" height="16"
              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"
              tool_tip="Buy currency" width="16" />
         <text type="string" length="12" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-20" disabled_color="1 1 1 1" drop_shadow_visible="true"
+             bottom="-20" disabled_color="TimeTextColor" drop_shadow_visible="true"
              enabled="true" follows="right|bottom" font="SansSerifSmall" h_pad="0"
              halign="right" height="18" left="-300" mouse_opaque="true" name="TimeText"
-             text_color="1 1 1 1" tool_tip="Current Time (Pacific)" v_pad="2" width="80">
+             text_color="TimeTextColor" tool_tip="Current Time (Pacific)" v_pad="2" width="80">
                 12:00 AM
         </text>
         <string name="StatBarDaysOfWeek">
@@ -50,10 +50,10 @@
              mouse_opaque="true" name="health" scale_image="false" tool_tip="Health"
              visible="false" 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"
+             bottom="-18" disabled_color="HealthTextColor" drop_shadow_visible="true"
              enabled="true" follows="rsight|bottom" font="SansSerifSmall" h_pad="0"
              halign="left" height="18" left="418" mouse_opaque="true" name="HealthText"
-             text_color="1 1 1 1" tool_tip="Health" v_pad="2" visible="false" width="31">
+             text_color="HealthTextColor" tool_tip="Health" v_pad="2" visible="false" width="31">
                 100%
         </text>
         <button bottom="-22" enabled="true" follows="right|bottom" font="SansSerif"
@@ -81,27 +81,38 @@
              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" visible="false" width="24" />
-        <button bottom="-18" enabled="true" follows="right|bottom" font="SansSerif"
+        <button bottom="-17" enabled="true" follows="right|bottom" font="SansSerif"
              halign="center" height="16" 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"
+             left="576" mouse_opaque="true" name="buyland" scale_image="true"
              tool_tip="Buy this parcel" visible="false" width="16" />
-        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-18"
+
+  <!-- Totally unsexy button hack to get a sexy bevel for sexy search bevel -brent -->
+  <button bottom="-17" height="16" left="-97" width="96" 
+          image_unselected="sm_rounded_corners_simple.tga"
+          image_selected="sm_rounded_corners_simple.tga"
+          image_hover_selected="sm_rounded_corners_simple.tga"
+          image_hover_unselected="sm_rounded_corners_simple.tga"
+          image_disabled_selected="sm_rounded_corners_simple.tga"
+          image_disabled="sm_rounded_corners_simple.tga"
+          label="" scale_image="true" enabled="true" mouse_opaque="false" name="menubar_search_bevel_bg" />
+
+  <line_editor bevel_style="none" border_style="line" border_thickness="0" bottom="-16"
              commit_on_focus_lost="false" enabled="true" follows="right|bottom"
-             font="SansSerif" handle_edit_keys_directly="false" height="20"
-             label="Search" left="-125" max_length="254" mouse_opaque="true"
+             font="SansSerifSmall" handle_edit_keys_directly="false" height="13"
+             label="Search" left="-95" max_length="254" mouse_opaque="true"
              name="search_editor" select_all_on_focus_received="false"
              select_on_focus="false" tab_group="1" tool_tip="Search Second Life"
-             width="104" />
-        <button bottom="-17" enabled="true" follows="right|bottom" font="SansSerifSmall"
-             halign="center" height="20" image_disabled="status_search.tga"
+             width="80" />
+        <button bottom="-16" enabled="true" follows="right|bottom" font="SansSerifSmall"
+             halign="center" height="12" image_disabled="status_search.tga"
              image_disabled_selected="status_search.tga"
              image_selected="status_search.tga" image_unselected="status_search.tga"
-             label="" label_selected="" left="-20" mouse_opaque="true" name="search_btn"
-             tool_tip="Search Second Life" width="20" />
+             label="" label_selected="" left="-16" mouse_opaque="true" name="search_btn"
+             tool_tip="Search Second Life" width="12" scale_image="true"/>
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-17" enabled="false" follows="right|bottom" font="SansSerifSmall"
-             halign="center" height="20" hidden="false" left="-20" mouse_opaque="true"
+             bottom="-16" enabled="false" follows="right|bottom" font="SansSerifSmall"
+             halign="center" height="12" left="-20" mouse_opaque="true"
              name="stat_btn" width="20" />
         <string name="packet_loss_tooltip">
                 Packet Loss
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 da06c58..1009b3d 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_toolbar.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_toolbar.xml
@@ -1,34 +1,77 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel background_opaque="true" background_visible="true" bottom="0" can_close="true"
+<panel background_opaque="false" background_visible="false" bottom="0" can_close="true"
      can_minimize="false" can_resize="false" follows="left|right|bottom"
-     height="26" name="toolbar" width="1024">
-        <string name="Redock Windows">
-                Redock Windows
-        </string>
-        <button bottom="0" font="SansSerif" height="24" image_overlay="icn_chatbar.tga"
-             image_selected="btn_chatbar_selected.tga"
-             image_unselected="btn_chatbar.tga" label="" left="0" name="chat_btn"
-             scale_image="true" tool_tip="Show Chat Bar. (Enter)" width="50" />
-        <flyout_button bottom="0" font="SansSerif" height="24" label="Communicate" left="0"
-             list_position="above" name="communicate_btn"
-             tool_tip="Communicate with your Friends and Groups." 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."
-             width="50" />
-        <button bottom="0" font="SansSerif" height="24" label="Snapshot" left="0"
-             name="snapshot_btn" tool_tip="Save a screen shot to disk or inventory."
-             width="50" />
-        <button bottom="0" font="SansSerif" height="24" label="Search" left="0"
-             name="directory_btn"
-             tool_tip="Search for places, events, people, and more." width="50" />
-        <button bottom="0" font="SansSerif" height="24" label="Build" left="0" name="build_btn"
-             tool_tip="Create new objects." width="50" />
-        <button bottom="0" font="SansSerif" height="24" label="Mini-Map" left="0"
-             name="radar_btn" tool_tip="Map of the area around you. (Ctrl-Shift-M)"
-             width="50" />
-        <button bottom="0" font="SansSerif" height="24" label="Map" left="0" name="map_btn"
-             tool_tip="Map of the world. (Ctrl-M)" width="50" />
-        <button bottom="0" font="SansSerif" height="24" label="Inventory" left="0"
-             name="inventory_btn" tool_tip="Your items. (Ctrl-I)" width="50" />
+     height="28" name="toolbar" width="1024">
+    
+  <string name="Redock Windows">Redock Windows</string>
+  <panel bottom="0" filename="panel_bg_toolbar.xml" height="28" left="0" width="1024" />
+  <layout_stack name="toolbar_stack" follows="left|right|bottom|top" bottom="2" left="1" width="1022" height="26" min_width="200" min_height="26"  orientation="horizontal" border_size="0">
+    <icon image_name="spacer24.tga" width="2" height="2" follows="left|right" auto_resize="false" color="0,0,0,0" left="0" />
+    <button bottom="0" font="SansSerif" height="24"
+               image_selected="btn_chatbar_selected.tga" scale_image="true"
+               image_unselected="btn_chatbar.tga" label="" left="2" name="chat_btn"
+               image_overlay="icn_chatbar.tga" tool_tip="Show Chat Bar. (Enter)"
+               width="50" auto_resize="false" follows="left|right" user_resize="false"/>
+    <icon image_name="spacer24.tga" left_delta="2" width="2" height="2" follows="left|right" auto_resize="false" color="0,0,0,0"/>
+     <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" follows="left|right" user_resize="false"/>
+    <icon image_name="spacer24.tga" width="2" height="2" follows="left|right" auto_resize="false" color="0,0,0,0"/>
+    <button bottom="0" font="SansSerif" height="24" label="Fly"
+        image_overlay="icn_toolbar_fly.tga" image_overlay_alignment="left"
+                        image_selected="toolbar_btn_selected.tga"
+             image_unselected="toolbar_btn_enabled.tga"
+             image_disabled="toolbar_btn_disabled.tga" scale_image="true"
+               label_selected="Stop Flying" left="0" name="fly_btn"
+               tool_tip="Start flying. Use E/C or PgUp/PgDn to fly up and down."
+               width="50" follows="left|right" user_resize="false"/>
+    <icon image_name="spacer24.tga" width="2" height="2" follows="left|right" auto_resize="false" color="0,0,0,0" />
+    <button bottom="0" font="SansSerif" height="24" label="Snapshot" left="0"
+             image_overlay="icn_toolbar_snapshot.tga" image_overlay_alignment="left"
+                        image_selected="toolbar_btn_selected.tga"
+             image_unselected="toolbar_btn_enabled.tga"
+             image_disabled="toolbar_btn_disabled.tga" scale_image="true"
+               name="snapshot_btn" tool_tip="Save a screen shot to disk or inventory."
+               width="50" follows="left|right" user_resize="false"/>
+    <icon image_name="spacer24.tga" width="2" height="2" follows="left|right" auto_resize="false" color="0,0,0,0" />
+    <button bottom="0" font="SansSerif" height="24" label="Search" left="0"
+             image_overlay="icn_toolbar_search.tga" image_overlay_alignment="left"
+             image_selected="toolbar_btn_selected.tga"
+             image_unselected="toolbar_btn_enabled.tga"
+             image_disabled="toolbar_btn_disabled.tga" scale_image="true"
+               name="directory_btn"
+               tool_tip="Search for places, events, people, and more." width="50" follows="left|right" user_resize="false"/>
+    <icon image_name="spacer24.tga" width="2" height="2" follows="left|right" auto_resize="false" color="0,0,0,0" />
+    <button bottom="0" font="SansSerif" height="24" label="Build" left="0" name="build_btn"
+                         image_overlay="icn_toolbar_build.tga" image_overlay_alignment="left"
+                        image_selected="toolbar_btn_selected.tga"
+             image_unselected="toolbar_btn_enabled.tga"
+             image_disabled="toolbar_btn_disabled.tga" scale_image="true"
+               tool_tip="Create new objects." width="50" follows="left|right" user_resize="false"/>
+    <icon image_name="spacer24.tga" width="2" height="2" follows="left|right" auto_resize="false" color="0,0,0,0" />
+    <button bottom="0" font="SansSerif" height="24" label="Map" left="0" name="map_btn"
+                         image_overlay="icn_toolbar_map.tga" image_overlay_alignment="left"
+                        image_selected="toolbar_btn_selected.tga"
+             image_unselected="toolbar_btn_enabled.tga"
+             image_disabled="toolbar_btn_disabled.tga" scale_image="true"
+               tool_tip="Map of the world. (Ctrl-M)" width="50" follows="left|right" user_resize="false"/>
+    <icon image_name="spacer24.tga" width="2" height="2" follows="left|right" auto_resize="false" color="0,0,0,0" />
+    <button bottom="0" font="SansSerif" height="24" label="Mini-Map" left="0"
+                         image_overlay="icn_toolbar_minimap.tga" image_overlay_alignment="left"
+                        image_selected="toolbar_btn_selected.tga"
+             image_unselected="toolbar_btn_enabled.tga"
+             image_disabled="toolbar_btn_disabled.tga" scale_image="true"
+               name="radar_btn" tool_tip="Map of the area around you. (Ctrl-Shift-M)"
+               width="50" follows="left|right" user_resize="false"/>
+    <icon image_name="spacer24.tga" width="2" height="2" follows="left|right" auto_resize="false" color="0,0,0,0" />
+    <button bottom="0" font="SansSerif" height="24" label="Inventory" left="0"
+                         image_overlay="icn_toolbar_inventory.tga" image_overlay_alignment="left"
+                        image_selected="toolbar_btn_selected.tga"
+             image_unselected="toolbar_btn_enabled.tga"
+             image_disabled="toolbar_btn_disabled.tga" scale_image="true"
+               name="inventory_btn" tool_tip="Your items. (Ctrl-I)" width="50" follows="left|right" user_resize="false"/>
+    <icon image_name="spacer24.tga" width="2" height="2" follows="left|right" auto_resize="false" color="0,0,0,0" />
+  </layout_stack>
+
 </panel>
diff --git a/linden/indra/newview/skins/xui/en-us/panel_top_pick.xml b/linden/indra/newview/skins/xui/en-us/panel_top_pick.xml
index 58e4c43..03d0919 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_top_pick.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_top_pick.xml
@@ -3,14 +3,14 @@
      name="Pick" title="Pick" width="450">
         <texture_picker bottom="-315" follows="left|top" height="300" left="20" name="snapshot_ctrl"
              width="400" />
-        <line_editor bg_readonly_color="clear" bottom_delta="-8" enabled="false" follows="left|top"
+        <line_editor bottom_delta="-8" enabled="false" follows="left|top"
              font="SansSerif" height="20" left="20" name="given_name_editor"
-             text_readonly_color="white" width="400" />
-        <text_editor bg_readonly_color="clear" enabled="false" follows="left|top" font="SansSerif"
+             width="400" />
+        <text_editor enabled="false" follows="left|top" font="SansSerif"
              height="90" left="20" max_length="1023" name="desc_editor"
-             text_readonly_color="white" width="400" word_wrap="true" />
-        <line_editor bg_readonly_color="clear" enabled="false" follows="left|top" font="SansSerif"
-             height="20" left="20" name="location_editor" text_readonly_color="white"
+             width="400" word_wrap="true" />
+        <line_editor enabled="false" follows="left|top" font="SansSerif"
+             height="20" left="20" name="location_editor" 
              width="400" />
         <button bottom_delta="0" follows="left|top" height="20" label="Set" left="380"
              name="set_location_btn" width="60" />
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
index fa41dd4..ee476f2 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_voice_controls.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_voice_controls.xml
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>

 <panel bg_visible="false" border="false" border_visible="false" bottom="2"

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

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

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

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

+        <button bottom="-21" height="20" image_overlay="active_speakers.tga" label="" left="3"

              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" />

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

+        <button bottom="-21" height="20" label="Talk" left_delta="38" name="push_to_talk"

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

         <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"

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

+             scale_image="false" 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"

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

              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" />

+        <button bottom="-21" control_name="ShowVoiceChannelPopup" height="20" label=""

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

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

 </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 78447c5..fdec2f4 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
@@ -34,4 +34,4 @@
              name="voice_intro_text4" tab_stop="false" width="400" word_wrap="true">

                 Click the Next button to configure Voice Chat preferences or click Finish to continue using Second Life.

         </text_editor>

-</panel>

+</panel>
\ No newline at end of file
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 4569db0..c785e72 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,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>

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

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

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

      mouse_opaque="true" name="voice_remote" use_bounding_rect="true"

-     width="128">

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

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

+     width="130">

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

+        <panel bottom="3" filename="panel_voice_controls.xml" height="20" left="1" width="130" />

 </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
index 27199d5..7464467 100644
--- 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
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>

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

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

      follows="right|bottom" height="45" left="0" mouse_opaque="true"

-     name="voice_remote" use_bounding_rect="true" width="128">

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

-        <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_disabled="icn_rounded-text-field.tga"

+     name="voice_remote" use_bounding_rect="true" width="130">

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

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

+             left="4" name="end_call_btn" tool_tip="Click to hang up" width="20" />

+        <button bottom="-21" height="22" image_disabled="icn_rounded-text-field.tga"

              image_disabled_selected="icn_rounded-text-field.tga"

              image_hover_selected="icn_rounded-text-field.tga"

              image_hover_unselected="icn_rounded-text-field.tga"

              image_selected="icn_rounded-text-field.tga"

-             image_unselected="icn_rounded-text-field.tga" label="" left_delta="26"

-             name="voice_channel_bg" scale_image="true" width="97" />

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

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

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

+             image_unselected="icn_rounded-text-field.tga" label="" left_delta="23"

+             name="voice_channel_bg" scale_image="true" width="102" />

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

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

+        <text bottom="-19" 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 bottom="13" filename="panel_voice_controls.xml" left="1" />

 </panel>

diff --git a/linden/indra/newview/skins/xui/es/floater_critical.xml b/linden/indra/newview/skins/xui/es/floater_critical.xml
index 4bfefe3..92c996d 100644
--- a/linden/indra/newview/skins/xui/es/floater_critical.xml
+++ b/linden/indra/newview/skins/xui/es/floater_critical.xml
@@ -2,9 +2,6 @@
 <floater name="modal container" title=" ">

         <button label="Continuar" label_selected="Continuar" name="Continue" />

         <button label="Cancelar" label_selected="Cancelar" name="Cancel" />

-        <text name="tos_title">

-                Mensaje crítico

-        </text>

         <text name="tos_heading">

                 Por favor, lea los mensajes siguientes con cuidado

         </text>

diff --git a/linden/indra/newview/skins/xui/es/floater_friends.xml b/linden/indra/newview/skins/xui/es/floater_friends.xml
deleted file mode 100644
index e5f9a2a..0000000
--- a/linden/indra/newview/skins/xui/es/floater_friends.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

-<floater name="friends" title="Amigos">

-        <scroll_list name="friend_list"

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

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

-        </scroll_list>

-        <panel name="rights_container">

-                <check_box label="Can see my online status" name="online_status_cb"

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

-                <check_box label="Can see me on the map" name="map_status_cb"

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

-                <check_box label="Can modify my objects" name="modify_status_cb"

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

-                <text name="process_rights_label">

-                        Processing rights change...

-                </text>

-        </panel>

-        <button label="MI" name="im_btn" tool_tip="Abrir sesión de mensaje instantáneo" />

-        <button label="Teleport..." name="offer_teleport_btn"

-             tool_tip="Ofrecer a este amigo un teletransporte para su posición actual" />

-        <button label="Adicionar..." name="add_btn" tool_tip="Ofrecer amistad a este residente" />

-        <button label="Perfil" name="profile_btn"

-             tool_tip="Mostrar figura, grupos y otras informaciones" />

-        <button label="Pagar..." name="pay_btn"

-             tool_tip="Dar (L$) Linden dólares a este amigo" />

-        <button label="Remover..." name="remove_btn"

-             tool_tip="Remover esta persona de su lista de amigos" />

-</floater>

diff --git a/linden/indra/newview/skins/xui/es/floater_groups.xml b/linden/indra/newview/skins/xui/es/floater_groups.xml
deleted file mode 100644
index d5908fc..0000000
--- a/linden/indra/newview/skins/xui/es/floater_groups.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

-<floater name="groups" title="Grupos">

-        <text name="groupdesc">

-                Su grupo activo actualmente es exhibido en negrito.

-        </text>

-        <text name="groupcount">

-                Usted pertenece a [COUNT] grupos (de un máximo de [MAX]).

-        </text>

-        <button label="Activar" label_selected="Activar" name="Activate" />

-        <button label="Información" label_selected="Información" name="Info" />

-        <button label="Dejar" label_selected="Dejar" name="Leave" />

-        <button label="Crear" label_selected="Crear" name="Create" />

-        <button label="Buscar..." label_selected="Buscar..." name="Search..." />

-        <button label="Cerrar" label_selected="Cerrar" name="Close" />

-</floater>

diff --git a/linden/indra/newview/skins/xui/es/floater_preview_new_landmark.xml b/linden/indra/newview/skins/xui/es/floater_preview_new_landmark.xml
deleted file mode 100644
index c5766ab..0000000
--- a/linden/indra/newview/skins/xui/es/floater_preview_new_landmark.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

-<floater name="landmark_preview">

-        <button label="Teletransportar" label_selected="" name="Teleport btn" />

-        <button label="Mostrar en el mapa" label_selected="" name="Show on Map btn" />

-        <button label="Descartar" label_selected="" name="Discard btn" />

-        <text type="string" length="1" name="desc txt">

-                Descripción:

-        </text>

-</floater>

diff --git a/linden/indra/newview/skins/xui/es/floater_rate.xml b/linden/indra/newview/skins/xui/es/floater_rate.xml
deleted file mode 100644
index 3a344f5..0000000
--- a/linden/indra/newview/skins/xui/es/floater_rate.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

-<floater name="rate" title="Su valoración de Jeska Linden">

-        <radio_group name="behavior">

-                <radio_item type="string" length="1" name="Positive">

-                        Positivo

-                </radio_item>

-                <radio_item type="string" length="1" name="No Rating">

-                        No Valorado

-                </radio_item>

-        </radio_group>

-        <radio_group name="appearance">

-                <radio_item type="string" length="1" name="Positive">

-                        Positivo

-                </radio_item>

-                <radio_item type="string" length="1" name="No Rating">

-                        No Valorado

-                </radio_item>

-        </radio_group>

-        <radio_group name="building">

-                <radio_item type="string" length="1" name="Positive">

-                        Positivo

-                </radio_item>

-                <radio_item type="string" length="1" name="No Rating">

-                        No Valorado

-                </radio_item>

-        </radio_group>

-        <button label="OK" label_selected="OK" name="OK" />

-        <button label="Cancelar" label_selected="Cancelar" name="Cancel" />

-        <text type="string" length="1" name="Overall behavior:">

-                Comportamiento general:

-        </text>

-        <text type="string" length="1" name="Skill at appearance (clothing and attachments):">

-                Habilidad en la apariencia (ropa y anexos):

-        </text>

-        <text type="string" length="1" name="Skill at building:">

-                Habilidad en la construcción:

-        </text>

-        <text type="string" length="1" name="Message:">

-                Mensaje:

-        </text>

-        <text type="string" length="1" name="cost">

-                Coste: L$[COST] para cambiar cada valoración.  Total: L$[TOTAL].

-        </text>

-</floater>

diff --git a/linden/indra/newview/skins/xui/es/menu_viewer.xml b/linden/indra/newview/skins/xui/es/menu_viewer.xml
index 635a7ff..bb67d7c 100644
--- a/linden/indra/newview/skins/xui/es/menu_viewer.xml
+++ b/linden/indra/newview/skins/xui/es/menu_viewer.xml
@@ -14,7 +14,6 @@
                 <menu_item_call label="Tirar foto instatánea" name="Take Snapshot" />

                 <menu_item_call label="Foto instatánea para el disco" name="Snapshot to Disk" />

                 <menu_item_separator label="-----------" name="separator4" />

-                <menu_item_call label="Empezar/Parar vídeo para el disco" name="Start/Stop Movie to Disk" />

                 <menu label="Definir tamaño de la ventana" name="Set Window Size">

                         <menu_item_call label="320x240" name="320x240" />

                         <menu_item_call label="640x480" name="640x480" />

@@ -127,6 +126,7 @@
                 <menu_item_separator label="-----------" name="separator3" />

                 <menu_item_call label="Definir como ausente" name="Set Away" />

                 <menu_item_call label="Definir como ocupado" name="Set Busy" />

+                <menu_item_call label="Parar todas las animaciones" name="Stop All Animations" />

                 <menu_item_separator label="-----------" name="separator4" />

                 <menu_item_call label="Historial de cuenta..." name="Account History..." />

                 <menu_item_call label="Administrar mi cuenta..." name="Manage My Account..." />

@@ -171,7 +171,6 @@
                 <menu_item_call label="Unir" name="Link" />

                 <menu_item_call label="Separar" name="Unlink" />

                 <menu_item_separator label="-----------" name="separator4" />

-                <menu_item_call label="Parar todas las animaciones" name="Stop All Animations" />

                 <menu_item_separator label="-----------" name="separator5" />

                 <menu_item_call label="Foco en la selección" name="Focus on Selection" />

                 <menu_item_call label="Acercar en la selección" name="Zoom to Selection" />

diff --git a/linden/indra/newview/skins/xui/es/panel_music_remote.xml b/linden/indra/newview/skins/xui/es/panel_music_remote.xml
deleted file mode 100644
index 2d3a88d..0000000
--- a/linden/indra/newview/skins/xui/es/panel_music_remote.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

-<panel name="music_remote">

-        <text type="string" length="6" name="text">

-                Music

-        </text>

-        <volume_slider name="volume_slider"

-             tool_tip="Cambie el volumen usando este control deslizante" />

-        <button label="" label_selected="" name="stop_btn" tool_tip="Parar multimedia" />

-        <button label="" label_selected="" name="play_btn"

-             tool_tip="Reproducir streaming de multimedia" />

-        <button label="" label_selected="" name="pause_btn"

-             tool_tip="Pausar streaming de multimedia" />

-</panel>

diff --git a/linden/indra/newview/skins/xui/es/panel_preferences_graphics2.xml b/linden/indra/newview/skins/xui/es/panel_preferences_graphics2.xml
deleted file mode 100644
index a2a74ff..0000000
--- a/linden/indra/newview/skins/xui/es/panel_preferences_graphics2.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

-<panel label="Detalles gráficos" name="Display panel 3">

-        <text type="string" length="1" name="text">

-                Sombra:

-        </text>

-        <check_box label="Activar Bumpmapping y brillo" name="bumpshiny" />

-        <check_box label="Activar ondas en la água" name="ripple" />

-        <check_box label="Programa de vertex del avatar" name="avatarvp" />

-        <text type="string" length="1" name="Avatar Rendering:">

-                Reconstrucción de avatar:

-        </text>

-        <radio_group name="Avatar Appearance">

-                <radio_item type="string" length="1" name="Normal">

-                        Normal

-                </radio_item>

-                <radio_item type="string" length="1" name="Bump">

-                        Bump Mapeado

-                </radio_item>

-                <radio_item type="string" length="1" name="Cloth">

-                        Bump Mapeado &amp; Cloth

-                </radio_item>

-        </radio_group>

-        <text type="string" length="1" name="Lighting Detail:">

-                Detalle de iluminación:

-        </text>

-        <radio_group name="lighting detail radio">

-                <radio_item type="string" length="1" name="SunMoon">

-                        Sol y luna solamente

-                </radio_item>

-                <radio_item type="string" length="1" name="LocalLights">

-                        Próximo local visible

-                </radio_item>

-        </radio_group>

-        <text type="string" length="1" name="Terrain Detail:">

-                Detalles de terreno:

-        </text>

-        <radio_group name="terrain detail radio">

-                <radio_item type="string" length="1" name="0">

-                        Bajo

-                </radio_item>

-                <radio_item type="string" length="1" name="2">

-                        Alto

-                </radio_item>

-        </radio_group>

-        <text type="string" length="1" name="Object Mesh Detail:">

-                Detalle del objeto de red:

-        </text>

-        <text type="string" length="1" name="Flexible Mesh Detail:">

-                Detalles de red flexible:

-        </text>

-        <text type="string" length="1" name="Tree Mesh Detail:">

-                Detalle del árbol de red:

-        </text>

-        <text type="string" length="1" name="Avatar Mesh Detail:">

-                Detalle del avatar:

-        </text>

-</panel>

diff --git a/linden/indra/newview/skins/xui/es/panel_preferences_graphics3.xml b/linden/indra/newview/skins/xui/es/panel_preferences_graphics3.xml
deleted file mode 100644
index 108a993..0000000
--- a/linden/indra/newview/skins/xui/es/panel_preferences_graphics3.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

-<panel label="Adv. Gráficos" name="Display panel 2">

-        <text type="string" length="1" name="Filtering:">

-                Filtración:

-        </text>

-        <check_box label="Filtración anisotrópica (más lento cuando activado)" name="ani" />

-        <spinner label="Gama:" name="gamma" />

-        <text type="string" length="1" name="(brightness, lower is brighter)">

-                (brillo, bajo es brillante, 0=usar patrón)

-        </text>

-        <spinner label="Brillo nocturno:" name="nighttime_brightness" />

-        <text type="string" length="1" name="(higher is brighter, 1.0 is default)">

-                (Más alto es brillante, 1.0 es patrón)

-        </text>

-        <text type="string" length="1" name="AGP Graphics Card:">

-                Placa de vídeo AGP:

-        </text>

-        <check_box label="Activar AGP (más rápido si usar placa de vídeo AGP)" name="agp"

-             tool_tip="Activar podrá reducir el desempeño y usar más memoria si está usando una placa de vídeo PCI patrón." />

-        <text type="string" length="1" name="Graphics Card Memory:">

-                Memoria de la placa de vídeo:

-        </text>

-        <radio_group name="video card memory radio">

-                <radio_item type="string" length="1" name="radio">

-                        16MB

-                </radio_item>

-                <radio_item type="string" length="1" name="radio2">

-                        32MB

-                </radio_item>

-                <radio_item type="string" length="1" name="radio3">

-                        64MB

-                </radio_item>

-                <radio_item type="string" length="1" name="radio4">

-                        128MB

-                </radio_item>

-                <radio_item type="string" length="1" name="radio5">

-                        256MB

-                </radio_item>

-                <radio_item type="string" length="1" name="radio6">

-                        512MB

-                </radio_item>

-        </radio_group>

-        <spinner label="Tasa de distancia de la neblina:" name="fog" />

-        <spinner label="Max. de Recuento de partícula:" name="particles" />

-        <spinner label="Límite de la composición del vestuario:" name="comp limit"

-             tool_tip="Número de vestuarios cambiados recientemente" />

-        <text type="string" length="1" name="(lower is faster)">

-                (bajo es más rápido)

-        </text>

-</panel>

diff --git a/linden/indra/newview/skins/xui/es/panel_settings_chat.xml b/linden/indra/newview/skins/xui/es/panel_settings_chat.xml
deleted file mode 100644
index d89277e..0000000
--- a/linden/indra/newview/skins/xui/es/panel_settings_chat.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

-<panel name="chat" title="Conversación">

-        <text>

-                Tamaño de la fuente del chat:

-        </text>

-        <radio_group name="chat font size">

-                <radio_item>

-                        Pequeño

-                </radio_item>

-                <radio_item>

-                        Medio

-                </radio_item>

-                <radio_item>

-                        Grande

-                </radio_item>

-        </radio_group>

-        <text>

-                Color del chat:

-        </text>

-        <color_swatch label="Sistema" name="system" />

-        <color_swatch label="Usuarios" name="users" />

-        <color_swatch label="Objetos" name="objects" />

-        <color_swatch label="Burbuja" name="background" />

-        <text>

-                Consola del chat:

-        </text>

-        <spinner label="Desaparecer chat después de" name="fade_chat_time" />

-        <text>

-                (segundos)

-        </text>

-        <spinner label="" name="max_chat_count" />

-        <text>

-                (# líneas)

-        </text>

-        <slider label="Opacidad" name="console_opacity" />

-        <text>

-                Opciones del chat:

-        </text>

-        <check_box label="Chat usa anchura de pantalla completa (después de reinicio)"

-             name="chat_full_width_check" />

-        <check_box label="Cerrar chat después de pulsar Enter" name="close_chat_on_return_check" />

-        <check_box label="Flechas de dirección mueven avatar durante charla"

-             name="arrow_keys_move_avatar_check" />

-        <check_box label="Mostrar fecha/hora en el chat" name="show_timestamps_check" />

-        <text>

-                Burbuja de chat:

-        </text>

-        <check_box label="Mostrar burbujas de chat" name="bubble_text_chat" />

-        <slider label="Opacidad" name="bubble_chat_opacity" />

-        <text>

-                Errores de script:

-        </text>

-        <check_box label="Mostrar errores de script y avisos como chat convencional"

-             name="script_errors_as_chat" />

-        <color_swatch label="Color" name="script_error" />

-</panel>

diff --git a/linden/indra/newview/skins/xui/es/panel_settings_im.xml b/linden/indra/newview/skins/xui/es/panel_settings_im.xml
deleted file mode 100644
index ea8068a..0000000
--- a/linden/indra/newview/skins/xui/es/panel_settings_im.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

-<panel name="im" title="MI">

-        <text>

-                Opciones de MI:

-        </text>

-        <check_box label="Enviar MI para email" name="send_im_to_email"

-             tool_tip="Cambie su dirección de email en secondlife.com" />

-        <check_box label="Incluir MI en el historial de chat" name="include_im_in_chat_history" />

-        <check_box label="Mostrar fecha/hora en la MI" name="show_timestamps_check" />

-        <text>

-                Respuesta del modo ocupado:

-        </text>

-</panel>

diff --git a/linden/indra/newview/skins/xui/es/panel_settings_msgbox.xml b/linden/indra/newview/skins/xui/es/panel_settings_msgbox.xml
deleted file mode 100644
index 379731a..0000000
--- a/linden/indra/newview/skins/xui/es/panel_settings_msgbox.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

-<panel label="Popups" name="popups" title="Popups">

-        <text>

-                No exhibir popups:

-        </text>

-        <button label="Activar esta popup" name="enable_popup" />

-        <text>

-                Mostrar popups:

-        </text>

-        <button label="Restaurar cajas de diálogo &apos;Mostrar en la próxima vez&apos;..."

-             name="reset_dialogs_btn" />

-</panel>

diff --git a/linden/indra/newview/skins/xui/es/panel_settings_network.xml b/linden/indra/newview/skins/xui/es/panel_settings_network.xml
deleted file mode 100644
index da0acd7..0000000
--- a/linden/indra/newview/skins/xui/es/panel_settings_network.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

-<panel name="network" title="Red">

-        <text>

-                Amplitud de banda máxima:

-        </text>

-        <slider label="" name="max_bandwidth" />

-        <text>

-                kbps (kilobits por segundo)

-        </text>

-        <text>

-                Tamaño del cache de disco:

-        </text>

-        <radio_group name="disk cache">

-                <radio_item>

-                        50 MB

-                </radio_item>

-                <radio_item>

-                        200 MB

-                </radio_item>

-                <radio_item>

-                        500 MB

-                </radio_item>

-                <radio_item>

-                        1000 MB

-                </radio_item>

-        </radio_group>

-        <button label="Limpiar cache" name="clear_cache" />

-        <text>

-                Configuración del proxy:

-        </text>

-        <check_box label="Usar proxy" name="proxy_enabled"

-             tool_tip="Especifiar configuración del proxy" />

-        <text>

-                Proxy:

-        </text>

-        <line_editor name="proxy_address"

-             tool_tip="El nombre o dirección de IP del proxy que le gustaría usar" />

-        <text>

-                Puerta:

-        </text>

-        <line_editor name="proxy_port"

-             tool_tip="El número de la puerta del proxy que le gustaría usar" />

-        <text>

-                Calcetines:

-        </text>

-        <radio_group name="socks_4_5">

-                <radio_item>

-                        Socks v4

-                </radio_item>

-                <radio_item>

-                        Socks v5

-                </radio_item>

-        </radio_group>

-        <text>

-                Sin proxy:

-        </text>

-        <line_editor name="proxy_exclusions"

-             tool_tip="Los nombres o direcciones de IP que no&apos; le gustaría usar como proxy" />

-</panel>

diff --git a/linden/indra/newview/skins/xui/es/panel_settings_web.xml b/linden/indra/newview/skins/xui/es/panel_settings_web.xml
deleted file mode 100644
index 672515e..0000000
--- a/linden/indra/newview/skins/xui/es/panel_settings_web.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

-<panel name="web" title="Web">

-        <check_box label="Usar navegador de internet externo (Firefox, Safari, Internet Explorer)"

-             name="external_browser_check"

-             tool_tip="Usar navegador externo para ayuda, links de internet, etc.\nNo recomendable si funciona en pantalla completa." />

-        <text>

-                Explorar página inicial:

-        </text>

-        <line_editor name="home_page"

-             tool_tip="Página de la internet a visitar primero cuando abra el navegador de Second Life" />

-        <text>

-                Configuración del proxy:

-        </text>

-        <check_box label="Usar proxy para navegador de internet interno" name="proxy_enabled"

-             tool_tip="Especificar la configuración del proxy para el navegador interno de internet" />

-        <text>

-                Proxy:

-        </text>

-        <line_editor name="proxy_address"

-             tool_tip="El nombre o dirección de IP del proxy que le gustaría usar" />

-        <text>

-                Puerta:

-        </text>

-        <line_editor name="proxy_port"

-             tool_tip="El número de la puerta del proxy que le gustaría usar" />

-        <text>

-                Calcetines:

-        </text>

-        <radio_group name="socks_4_5">

-                <radio_item>

-                        Socks v4

-                </radio_item>

-                <radio_item>

-                        Socks v5

-                </radio_item>

-        </radio_group>

-        <text>

-                Sin proxy para:

-        </text>

-        <line_editor name="proxy_exclusions"

-             tool_tip="Los nombres o direcciones de IP que no&apos; le gustaría usar como proxy" />

-        <check_box

-             label="Mostrar páginas de internet en los objetos (experimental, requiere reinicio)"

-             name="web_pages_on_prims_check" />

-        <text>

-                Sitios confiables:

-(regístrese para ver)

-        </text>

-        <button label="Adicionar" name="add_trusted" />

-        <line_editor name="trusted_site_entry"

-             tool_tip="El sitio a adicionar en la lista de confiables" />

-        <button label="Remover" name="rem_trusted" />

-</panel>

diff --git a/linden/indra/newview/skins/xui/es/panel_toolbar.xml b/linden/indra/newview/skins/xui/es/panel_toolbar.xml
index bd20679..b804f95 100644
--- a/linden/indra/newview/skins/xui/es/panel_toolbar.xml
+++ b/linden/indra/newview/skins/xui/es/panel_toolbar.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>

 <panel name="toolbar">

+        <layout_stack name="toolbar_stack">

         <button label="MI" name="im_btn"

              tool_tip="Enviar mensaje instantáneo para sus amigos." />

         <button label="Chat" name="chat_btn" tool_tip="Talk to people nearby. (Enter)" />

@@ -16,4 +17,5 @@
              tool_tip="Mapa de la área a su rededor. (Ctrl-Shift-M)" />

         <button label="Mapa" name="map_btn" tool_tip="Mapa del mundo. (Ctrl-M)" />

         <button label="Inventario" name="inventory_btn" tool_tip="Sus ítems. (Ctrl-I)" />

+  </layout_stack>

 </panel>

diff --git a/linden/indra/newview/skins/xui/fr/floater_critical.xml b/linden/indra/newview/skins/xui/fr/floater_critical.xml
index 46a14ba..f7b55c8 100644
--- a/linden/indra/newview/skins/xui/fr/floater_critical.xml
+++ b/linden/indra/newview/skins/xui/fr/floater_critical.xml
@@ -2,9 +2,6 @@
 <floater name="modal container" title=" ">

         <button label="Continuer" label_selected="Continuer" name="Continue" />

         <button label="Annuler" label_selected="Annuler" name="Cancel" />

-        <text name="tos_title">

-                Message critique

-        </text>

         <text name="tos_heading">

                 Veuillez lire attentivement le message suivant.

         </text>

diff --git a/linden/indra/newview/skins/xui/fr/floater_friends.xml b/linden/indra/newview/skins/xui/fr/floater_friends.xml
deleted file mode 100644
index 51456a3..0000000
--- a/linden/indra/newview/skins/xui/fr/floater_friends.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

-<floater name="friends" title="Amis">

-        <button label="Profil..." name="profile_btn"

-             tool_tip="Afficher photo, groupes et autres informations" />

-        <button label="Proposer Téléportation" name="offer_teleport_btn"

-             tool_tip="Proposer à cet ami de le téléporter vers votre position actuelle" />

-        <button label="Ajouter..." name="add_btn"

-             tool_tip="Proposer à un résident de devenir votre ami(e)" />

-        <button label="Payer..." name="pay_btn"

-             tool_tip="Offrir des Linden dollars (L$) à cet ami" />

-        <button label="Supprimer..." name="remove_btn"

-             tool_tip="Retirez cette personne de votre liste d&apos;amis" />

-        <button label="IM…" name="im_btn"

-             tool_tip="Démarrer une session de messagerie instantanée" />

-        <button label="Autoriser à modifier…" name="grant_btn"

-             tool_tip="Autoriser cet utilisateur à modifier vos objets" />

-        <button label="Déchoir de ses droits de modification…" name="revoke_btn"

-             tool_tip="Autoriser cet utilisateur à modifier vos objets" />

-</floater>

diff --git a/linden/indra/newview/skins/xui/fr/floater_groups.xml b/linden/indra/newview/skins/xui/fr/floater_groups.xml
deleted file mode 100644
index ca38228..0000000
--- a/linden/indra/newview/skins/xui/fr/floater_groups.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

-<floater name="groups" title="Groupes">

-        <text name="groupdesc">

-                Votre groupe actif apparaît en gras.

-        </text>

-        <text name="groupcount">

-                Vous appartenez à [COUNT] groupes (sur [MAX] maximum).

-        </text>

-        <button label="Activer" label_selected="Activer" name="Activate" />

-        <button label="Info" label_selected="Info" name="Info" />

-        <button label="Partir" label_selected="Partir" name="Leave" />

-        <button label="Créer" label_selected="Créer" name="Create" />

-        <button label="Rechercher..." label_selected="Rechercher..." name="Search..." />

-        <button label="Fermer" label_selected="Fermer" name="Close" />

-</floater>

diff --git a/linden/indra/newview/skins/xui/fr/floater_preview_new_landmark.xml b/linden/indra/newview/skins/xui/fr/floater_preview_new_landmark.xml
deleted file mode 100644
index c017b1e..0000000
--- a/linden/indra/newview/skins/xui/fr/floater_preview_new_landmark.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

-<floater name="Linden Land, Da Boom (155, 136, 35)"

-     title="  Linden Land, Da Boom (155, 136, 35)">

-        <button label="Téléportation" label_selected="" name="Teleport btn" />

-        <button label="Localiser" label_selected="" name="Show on Map btn" />

-        <button label="Annuler" label_selected="" name="Discard btn" />

-        <text type="string" length="1" name="desc txt">

-                Description :

-        </text>

-</floater>

diff --git a/linden/indra/newview/skins/xui/fr/floater_rate.xml b/linden/indra/newview/skins/xui/fr/floater_rate.xml
deleted file mode 100644
index 3ea6624..0000000
--- a/linden/indra/newview/skins/xui/fr/floater_rate.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

-<floater name="rate" title="Votre appréciation de Jeska Linden">

-        <radio_group name="behavior">

-                <radio_item type="string" length="1" name="Positive">

-                        Positives

-                </radio_item>

-                <radio_item type="string" length="1" name="No Rating">

-                        Pas d&apos;appréciation

-                </radio_item>

-        </radio_group>

-        <radio_group name="appearance">

-                <radio_item type="string" length="1" name="Positive">

-                        Positives

-                </radio_item>

-                <radio_item type="string" length="1" name="No Rating">

-                        Pas d&apos;appréciation

-                </radio_item>

-        </radio_group>

-        <radio_group name="building">

-                <radio_item type="string" length="1" name="Positive">

-                        Positives

-                </radio_item>

-                <radio_item type="string" length="1" name="No Rating">

-                        Pas d&apos;appréciation

-                </radio_item>

-        </radio_group>

-        <button label="OK" label_selected="OK" name="OK" />

-        <button label="Annuler" label_selected="Annuler" name="Cancel" />

-        <text type="string" length="1" name="Overall behavior:">

-                Comportement général :

-        </text>

-        <text type="string" length="1" name="Skill at appearance (clothing and attachments):">

-                Compétences d&apos;apparence (vêtements et attachements) :

-        </text>

-        <text type="string" length="1" name="Skill at building:">

-                Compétences de construction :

-        </text>

-        <text type="string" length="1" name="Message:">

-                Message :

-        </text>

-        <text type="string" length="1" name="cost">

-                Coût : L$[COST] pour modifier chaque appréciation.  Coût total : L$[TOTAL].

-        </text>

-</floater>

diff --git a/linden/indra/newview/skins/xui/fr/menu_viewer.xml b/linden/indra/newview/skins/xui/fr/menu_viewer.xml
index eb2ef81..0f6d7a2 100644
--- a/linden/indra/newview/skins/xui/fr/menu_viewer.xml
+++ b/linden/indra/newview/skins/xui/fr/menu_viewer.xml
@@ -14,7 +14,6 @@
                 <menu_item_call label="Prendre un instantané" name="Take Snapshot" />

                 <menu_item_call label="Enregistrer instantané sur disque dur" name="Snapshot to Disk" />

                 <menu_item_separator label="-----------" name="separator4" />

-                <menu_item_call label="Démarrer/arrêter capture vidéo" name="Start/Stop Movie to Disk" />

                 <menu label="Définir taille de la fenêtre" name="Set Window Size">

                         <tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~" />

                         <menu_item_call label="320x240" name="320x240" />

@@ -136,6 +135,7 @@
                 <menu_item_separator label="-----------" name="separator3" />

                 <menu_item_call label="Définir comme : absent" name="Set Away" />

                 <menu_item_call label="Définir comme : occupé" name="Set Busy" />

+                <menu_item_call label="Arrêter toutes les animations" name="Stop All Animations" />

                 <menu_item_separator label="-----------" name="separator4" />

                 <menu_item_call label="Historique du compte..." name="Account History..." />

                 <menu_item_call label="Gérer mon compte..." name="Manage My Account..." />

@@ -185,7 +185,6 @@
                 <menu_item_call label="Lier" name="Link" />

                 <menu_item_call label="Délier" name="Unlink" />

                 <menu_item_separator label="-----------" name="separator4" />

-                <menu_item_call label="Arrêter toutes les animations" name="Stop All Animations" />

                 <menu_item_separator label="-----------" name="separator5" />

                 <menu_item_call label="Faire le point sur la sélection" name="Focus on Selection" />

                 <menu_item_call label="Zoom sur sélection" name="Zoom to Selection" />

diff --git a/linden/indra/newview/skins/xui/fr/panel_music_remote.xml b/linden/indra/newview/skins/xui/fr/panel_music_remote.xml
deleted file mode 100644
index 6839746..0000000
--- a/linden/indra/newview/skins/xui/fr/panel_music_remote.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

-<panel name="music_remote">

-        <text type="string" length="1" name="text">

-                Audio

-        </text>

-        <button label="" label_selected="" name="stop_btn" tool_tip="Arrêter le media" />

-        <button label="" label_selected="" name="play_btn" tool_tip="Lire le flux" />

-        <button label="" label_selected="" name="pause_btn" tool_tip="Suspendre le flux" />

-        <volume_slider name="volume_slider" tool_tip="Réglez le volume à l&apos;aide du curseur" />

-</panel>

diff --git a/linden/indra/newview/skins/xui/fr/panel_preferences_graphics2.xml b/linden/indra/newview/skins/xui/fr/panel_preferences_graphics2.xml
deleted file mode 100644
index dfcedfa..0000000
--- a/linden/indra/newview/skins/xui/fr/panel_preferences_graphics2.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

-<panel label="Détails graphiques" name="Display panel 3">

-        <text type="string" length="1" name="text">

-                Shaders :

-        </text>

-        <check_box label="Activer Bumpmapping et Shiny" name="bumpshiny" />

-        <check_box label="Activer ondulation de l&apos;eau" name="ripple" />

-        <check_box label="Avatar Vertex Program" name="avatarvp" />

-        <text type="string" length="1" name="Avatar Rendering:">

-                Rendu de l&apos;avatar :

-        </text>

-        <radio_group name="Avatar Appearance">

-                <radio_item type="string" length="1" name="Normal">

-                        Normal

-                </radio_item>

-                <radio_item type="string" length="1" name="Bump">

-                        Bump Mapped

-                </radio_item>

-                <radio_item type="string" length="1" name="Cloth">

-                        Bump Mapped &amp; Cloth

-                </radio_item>

-        </radio_group>

-        <text type="string" length="1" name="Lighting Detail:">

-                Détail de luminosité :

-        </text>

-        <radio_group name="lighting detail radio">

-                <radio_item type="string" length="1" name="SunMoon">

-                        Soleil et lune uniquement

-                </radio_item>

-                <radio_item type="string" length="1" name="LocalLights">

-                        Eclairage de proximité

-                </radio_item>

-        </radio_group>

-        <text type="string" length="1" name="Terrain Detail:">

-                Détails du terrain :

-        </text>

-        <radio_group name="terrain detail radio">

-                <radio_item type="string" length="1" name="0">

-                        Bas

-                </radio_item>

-                <radio_item type="string" length="1" name="2">

-                        Elevés

-                </radio_item>

-        </radio_group>

-        <text type="string" length="1" name="Object Mesh Detail:">

-                Object Mesh Detail:

-        </text>

-        <text type="string" length="1" name="Flexible Mesh Detail:">

-                Flexible Mesh Detail:

-        </text>

-        <text type="string" length="1" name="Tree Mesh Detail:">

-                Tree Mesh Detail:

-        </text>

-        <text type="string" length="1" name="Avatar Mesh Detail:">

-                Avatar Mesh Detail:

-        </text>

-</panel>

diff --git a/linden/indra/newview/skins/xui/fr/panel_preferences_graphics3.xml b/linden/indra/newview/skins/xui/fr/panel_preferences_graphics3.xml
deleted file mode 100644
index ff62b1f..0000000
--- a/linden/indra/newview/skins/xui/fr/panel_preferences_graphics3.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

-<panel label="Graphisme (avancé)" name="Display panel 2">

-        <text type="string" length="1" name="Filtering:">

-                Filtrage :

-        </text>

-        <check_box label="Filtrage anisotrope (ralentit la performance)" name="ani" />

-        <spinner label="Gamma :" name="gamma" />

-        <text type="string" length="1" name="(brightness, lower is brighter)">

-                (luminosité, moins = plus lumineux, 0=défaut)

-        </text>

-        <spinner label="Luminosité nocturne :" name="nighttime_brightness" />

-        <text type="string" length="1" name="(higher is brighter, 1.0 is default)">

-                (plus = plus lumineux, 1.0 valeur par défaut)

-        </text>

-        <text type="string" length="1" name="AGP Graphics Card:">

-                Carte graphique AGP :

-        </text>

-        <check_box label="Activer AGP (plus rapide si carte AGP installée)" name="agp"

-             tool_tip="Peut ralentir la performance et consommer plus de mémoire si vous utilisez une carte graphique PCI classique." />

-        <text type="string" length="1" name="Graphics Card Memory:">

-                Mémoire carte graphique :

-        </text>

-        <radio_group name="video card memory radio">

-                <radio_item type="string" length="1" name="radio">

-                        16MB

-                </radio_item>

-                <radio_item type="string" length="1" name="radio2">

-                        32MB

-                </radio_item>

-                <radio_item type="string" length="1" name="radio3">

-                        64MB

-                </radio_item>

-                <radio_item type="string" length="1" name="radio4">

-                        128MB

-                </radio_item>

-                <radio_item type="string" length="1" name="radio5">

-                        256MB

-                </radio_item>

-                <radio_item type="string" length="1" name="radio6">

-                        512MB

-                </radio_item>

-        </radio_group>

-        <spinner label="Coeff. distance du brouillard :" name="fog" />

-        <spinner label="Particules max. :" name="particles" />

-        <spinner label="Outfit Composite Limit:" name="comp limit"

-             tool_tip="Nombre de tenues récemment portées à afficher" />

-        <text type="string" length="1" name="(lower is faster)">

-                (moins = plus rapide)

-        </text>

-</panel>

diff --git a/linden/indra/newview/skins/xui/fr/panel_settings_chat.xml b/linden/indra/newview/skins/xui/fr/panel_settings_chat.xml
deleted file mode 100644
index 73351a1..0000000
--- a/linden/indra/newview/skins/xui/fr/panel_settings_chat.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

-<panel name="chat" title="Conversation">

-        <text>

-                Taille de police du chat :

-        </text>

-        <radio_group name="chat font size">

-                <radio_item>

-                        Petit

-                </radio_item>

-                <radio_item>

-                        Moyen(ne)

-                </radio_item>

-                <radio_item>

-                        Grand

-                </radio_item>

-        </radio_group>

-        <text>

-                Couleur du chat :

-        </text>

-        <color_swatch label="Système" name="system" />

-        <color_swatch label="Avatars" name="users" />

-        <color_swatch label="Objets" name="objects" />

-        <color_swatch label="Bulle" name="background" />

-        <text>

-                Console de chat :

-        </text>

-        <spinner label="Estomper après" name="fade_chat_time" />

-        <text>

-                (secondes)

-        </text>

-        <spinner label="" name="max_chat_count" />

-        <text>

-                (nb de lignes)

-        </text>

-        <slider label="Opacité" name="console_opacity" />

-        <text>

-                Options de Chat :

-        </text>

-        <check_box label="Chat en plein écran (au prochain redémarrage)"

-             name="chat_full_width_check" />

-        <check_box label="Refermer le chat à l&apos;aide de la touche &apos;envoi&apos;"

-             name="close_chat_on_return_check" />

-        <check_box label="Les touches directionnelles déplacent l&apos;avatar pendant le chat"

-             name="arrow_keys_move_avatar_check" />

-        <check_box label="Afficher l&apos;heure d&apos;envoi dans le chat"

-             name="show_timestamps_check" />

-        <text>

-                Bulles de Chat :

-        </text>

-        <check_box label="Afficher les bulles de chat" name="bubble_text_chat" />

-        <slider label="Opacité" name="bubble_chat_opacity" />

-        <text>

-                Erreurs :

-        </text>

-        <check_box label="Afficher les erreurs et alertes de scripts dans le chat"

-             name="script_errors_as_chat" />

-        <color_swatch label="Couleur" name="script_error" />

-</panel>

diff --git a/linden/indra/newview/skins/xui/fr/panel_settings_im.xml b/linden/indra/newview/skins/xui/fr/panel_settings_im.xml
deleted file mode 100644
index 47fb58f..0000000
--- a/linden/indra/newview/skins/xui/fr/panel_settings_im.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

-<panel name="im" title="IM">

-        <text>

-                Options IM :

-        </text>

-        <check_box label="Envoyer IM vers adresse mail" name="send_im_to_email"

-             tool_tip="Modifiez votre email sur secondlife.com" />

-        <check_box label="Inclure les IM dans l&apos;historique du chat"

-             name="include_im_in_chat_history" />

-        <check_box label="Afficher l&apos;heure d&apos;envoi dans les IM"

-             name="show_timestamps_check" />

-        <text>

-                Répondeur en mode Occupé :

-        </text>

-</panel>

diff --git a/linden/indra/newview/skins/xui/fr/panel_settings_msgbox.xml b/linden/indra/newview/skins/xui/fr/panel_settings_msgbox.xml
deleted file mode 100644
index 903eb80..0000000
--- a/linden/indra/newview/skins/xui/fr/panel_settings_msgbox.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

-<panel label="Pop-ups" name="popups" title="Pop-ups">

-        <text>

-                Ne pas afficher les pop-ups :

-        </text>

-        <button label="Autoriser cette pop-up" name="enable_popup" />

-        <text>

-                Afficher les pop-ups :

-        </text>

-        <button label="Réinitialiser les dialogues &apos;Afficher la prochaine fois&apos;..."

-             name="reset_dialogs_btn" />

-</panel>

diff --git a/linden/indra/newview/skins/xui/fr/panel_settings_network.xml b/linden/indra/newview/skins/xui/fr/panel_settings_network.xml
deleted file mode 100644
index a722e43..0000000
--- a/linden/indra/newview/skins/xui/fr/panel_settings_network.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

-<panel name="network" title="Réseau">

-        <text>

-                Bande passante maximum :

-        </text>

-        <slider label="" name="max_bandwidth" />

-        <text>

-                kbps (kilobits/seconde)

-        </text>

-        <text>

-                Taille du cache :

-        </text>

-        <radio_group name="disk cache">

-                <radio_item>

-                        50 MB

-                </radio_item>

-                <radio_item>

-                        200 MB

-                </radio_item>

-                <radio_item>

-                        500 MB

-                </radio_item>

-                <radio_item>

-                        1000 MB

-                </radio_item>

-        </radio_group>

-        <button label="Vider le cache" name="clear_cache" />

-        <text>

-                Configuration :

-        </text>

-        <check_box label="Utiliser un proxy" name="proxy_enabled"

-             tool_tip="Précisez la configuration du proxy" />

-        <text>

-                Proxy :

-        </text>

-        <line_editor name="proxy_address"

-             tool_tip="Nom ou adresse IP du proxy que vous souhaitez utilser" />

-        <text>

-                Port :

-        </text>

-        <line_editor name="proxy_port"

-             tool_tip="Numéro de port du proxy que vous souhaitez utiliser" />

-        <text>

-                Socks :

-        </text>

-        <radio_group name="socks_4_5">

-                <radio_item>

-                        Socks v4

-                </radio_item>

-                <radio_item>

-                        Socks v5

-                </radio_item>

-        </radio_group>

-        <text>

-                Pas de proxy :

-        </text>

-        <line_editor name="proxy_exclusions"

-             tool_tip="Noms ou adresses IP à ne pas utiliser pour le proxy" />

-</panel>

diff --git a/linden/indra/newview/skins/xui/fr/panel_settings_web.xml b/linden/indra/newview/skins/xui/fr/panel_settings_web.xml
deleted file mode 100644
index 70b6384..0000000
--- a/linden/indra/newview/skins/xui/fr/panel_settings_web.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

-<panel name="web" title="Web">

-        <check_box label="Utiliser un navigateur externe (Firefox, Safari, Internet Explorer)"

-             name="external_browser_check"

-             tool_tip="Utiliser un navigateur externe pour l&apos;aide, les liens web, etc.\ Déconseillé en mode plein écran." />

-        <text>

-                Page d&apos;accueil du navigateur :

-        </text>

-        <line_editor name="home_page"

-             tool_tip="Page de démarrage à l&apos;ouverture du navigateur de Second Life" />

-        <text>

-                Configuration :

-        </text>

-        <check_box label="Utiliser un proxy pour le navigateur interne" name="proxy_enabled"

-             tool_tip="Précisez la configuration du proxy pour le navigateur interne." />

-        <text>

-                Proxy :

-        </text>

-        <line_editor name="proxy_address"

-             tool_tip="Nom ou adresse IP du proxy que vous souhaitez utilser" />

-        <text>

-                Port :

-        </text>

-        <line_editor name="proxy_port"

-             tool_tip="Numéro de port du proxy que vous souhaitez utiliser" />

-        <text>

-                Socks :

-        </text>

-        <radio_group name="socks_4_5">

-                <radio_item>

-                        Socks v4

-                </radio_item>

-                <radio_item>

-                        Socks v5

-                </radio_item>

-        </radio_group>

-        <text>

-                Pas de proxy pour :

-        </text>

-        <line_editor name="proxy_exclusions"

-             tool_tip="Noms ou adresses IP à ne pas utiliser pour le proxy" />

-        <check_box

-             label="Afficher des pages web sur les objets (expérimental, nécessite un redémarrage)"

-             name="web_pages_on_prims_check" />

-        <text>

-                Sites de confiance :

-(identifiez-vous pour afficher)

-        </text>

-        <button label="Ajouter" name="add_trusted" />

-        <line_editor name="trusted_site_entry" tool_tip="Site à rajouter à la liste de confiance" />

-        <button label="Retirer" name="rem_trusted" />

-</panel>

diff --git a/linden/indra/newview/skins/xui/fr/panel_toolbar.xml b/linden/indra/newview/skins/xui/fr/panel_toolbar.xml
index c0a821d..87e32b2 100644
--- a/linden/indra/newview/skins/xui/fr/panel_toolbar.xml
+++ b/linden/indra/newview/skins/xui/fr/panel_toolbar.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>

 <panel name="toolbar">

+        <layout_stack name="toolbar_stack">

         <button label="IM" name="im_btn"

              tool_tip="Envoyez des messages instantanés à vos amis." />

         <button label="Chat" name="chat_btn"

@@ -17,4 +18,5 @@
              tool_tip="Carte de la zone dans laquelle vous vous trouvez. (Ctrl-Shift-M)" />

         <button label="Carte" name="map_btn" tool_tip="Carte du monde. (Ctrl-M)" />

         <button label="Inventaire" name="inventory_btn" tool_tip="Vos éléments. (Ctrl-I)" />

+  </layout_stack>

 </panel>

diff --git a/linden/indra/newview/skins/xui/ja/floater_about_land.xml b/linden/indra/newview/skins/xui/ja/floater_about_land.xml
index 15ac0cf..69b15b6 100644
--- a/linden/indra/newview/skins/xui/ja/floater_about_land.xml
+++ b/linden/indra/newview/skins/xui/ja/floater_about_land.xml
@@ -470,9 +470,12 @@
                         </text>
                         <button label="追加..." label_selected="追加..." name="add_allowed" />
                         <button label="削除" label_selected="削除" name="remove_allowed" />
-                        <check_box label="禁止" name="AccessCheck">
+                        <check_box label="禁止" name="BanCheck">
                                 禁止された住人
                         </check_box>
+                        <check_box label="ｳ｣､ﾋﾔSｿﾉ" name="AccessCheck">
+                                許可された住人
+                        </check_box>
                         <name_list name="AccessList" tool_tip="([LISTED]リスト入り、[MAX]最大)">
                                 <column label="許可された住人" name="name" />
                         </name_list>
diff --git a/linden/indra/newview/skins/xui/ja/floater_critical.xml b/linden/indra/newview/skins/xui/ja/floater_critical.xml
index 39f6ee8..0fc142c 100644
--- a/linden/indra/newview/skins/xui/ja/floater_critical.xml
+++ b/linden/indra/newview/skins/xui/ja/floater_critical.xml
@@ -2,9 +2,6 @@
 <floater name="modal container" title=" ">
         <button label="続行" label_selected="続行" name="Continue" />
         <button label="取り消し" label_selected="取り消し" name="Cancel" />
-        <text name="tos_title">
-                クリティカル・メッセージ
-        </text>
         <text name="tos_heading">
                 次のメッセージを注意深くお読みください。
         </text>
diff --git a/linden/indra/newview/skins/xui/ja/floater_friends.xml b/linden/indra/newview/skins/xui/ja/floater_friends.xml
deleted file mode 100644
index dc24d74..0000000
--- a/linden/indra/newview/skins/xui/ja/floater_friends.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="friends" title="フレンド">
-        <scroll_list name="friend_list"
-             tool_tip="Shiftキーまたは Control　キーを押しながら複数のフレンドをクリックして選択する">
-                <column label="名前" name="friend_name" />
-        </scroll_list>
-        <panel name="rights_container">
-                <text name="friend_name_label">
-                        フレンドを選択して権利を変更...
-                </text>
-                <check_box label="オンライン・ステータスの確認を許可する"
-                     name="online_status_cb"
-                     tool_tip="あなたのオンライン・ステータスをこのフレンドがコーリング・カードまたはフレンド・リストで確認できるようにするかどうかを指定" />
-                <check_box label="自分を地図の上に示す" name="map_status_cb"
-                     tool_tip="あなたのロケーションをこのフレンドが地図上で確認できるようにするかどうかを指定" />
-                <check_box label="オブジェクトの修正を許可する" name="modify_status_cb"
-                     tool_tip="このフレンドにオブジェクトの修正を許可するかどうかを指定" />
-                <text name="process_rights_label">
-                        権利変更を処理中...
-                </text>
-        </panel>
-        <button label="IM/コール" name="im_btn"
-             tool_tip="インスタント・メッセージを開始" />
-        <button label="ﾃﾚﾎﾟｰﾄ" name="offer_teleport_btn"
-             tool_tip="このフレンドに、あなたの現在のロケーションへのテレポートを贈ります。" />
-        <button label="追加..." name="add_btn"
-             tool_tip="住人にフレンドシップを贈ります。" />
-        <button label="ﾌﾟﾛﾌｨｰﾙ" name="profile_btn"
-             tool_tip="写真、グループ、およびその他の情報を表示" />
-        <button label="支払い..." name="pay_btn"
-             tool_tip="リンデン・ドル（L$）をフレンドに贈る" />
-        <button label="削除..." name="remove_btn"
-             tool_tip="この人物をフレンド・リストから削除" />
-        <text name="Multiple">
-                複数のフレンド...
-        </text>
-</floater>
diff --git a/linden/indra/newview/skins/xui/ja/floater_groups.xml b/linden/indra/newview/skins/xui/ja/floater_groups.xml
deleted file mode 100644
index 4fb56ed..0000000
--- a/linden/indra/newview/skins/xui/ja/floater_groups.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="groups" title="グループ">
-        <text name="groupdesc">
-                現在のアクティブ・グループを太字表示。
-        </text>
-        <text name="groupcount">
-                あなたの所属グループ数： [COUNT] (上限数 [MAX])
-        </text>
-        <button label="IM/コール" name="IM"
-             tool_tip="インスタントメッセージ・セッションを開く" />
-        <button label="アクティブ" label_selected="アクティブ" name="Activate" />
-        <button label="情報" label_selected="情報" name="Info" />
-        <button label="立ち去る" label_selected="立ち去る" name="Leave" />
-        <button label="作成..." label_selected="作成" name="Create" />
-        <button label="検索..." label_selected="検索..." name="Search..." />
-        <button label="閉じる" label_selected="閉じる" name="Close" />
-</floater>
diff --git a/linden/indra/newview/skins/xui/ja/floater_instant_message_ad_hoc.xml b/linden/indra/newview/skins/xui/ja/floater_instant_message_ad_hoc.xml
index e21c057..d1cf8af 100644
--- a/linden/indra/newview/skins/xui/ja/floater_instant_message_ad_hoc.xml
+++ b/linden/indra/newview/skins/xui/ja/floater_instant_message_ad_hoc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>

 <floater label="(不明）" name="im_floater" title="(不明）">

-        <layout_stack name="">

+        <layout_stack name="panels">

                 <layout_panel name="im_contents_panel">

                         <button label="コール" name="start_call_btn" />

                         <button label="コールの終了" name="end_call_btn" />

diff --git a/linden/indra/newview/skins/xui/ja/floater_instant_message_group.xml b/linden/indra/newview/skins/xui/ja/floater_instant_message_group.xml
index adf0df0..ceacef6 100644
--- a/linden/indra/newview/skins/xui/ja/floater_instant_message_group.xml
+++ b/linden/indra/newview/skins/xui/ja/floater_instant_message_group.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>

 <floater label="(不明）" name="im_floater" title="(不明）">

-        <layout_stack name="">

+        <layout_stack name="panels">

                 <layout_panel name="im_contents_panel">

                         <button label="グループインフォ：" name="group_info_btn" />

                         <button label="コールに参加" name="start_call_btn" />

diff --git a/linden/indra/newview/skins/xui/ja/floater_joystick.xml b/linden/indra/newview/skins/xui/ja/floater_joystick.xml
index e75fe31..6207687 100644
--- a/linden/indra/newview/skins/xui/ja/floater_joystick.xml
+++ b/linden/indra/newview/skins/xui/ja/floater_joystick.xml
@@ -1,54 +1,3 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>

-<floater name="build options floater" title="飛行カメラオプション">

-        <text name="x-axis">

-                X軸

-        </text>

-        <text name="y-axis">

-                Y軸

-        </text>

-        <text name="z-axis">

-                Z軸

-        </text>

-        <spinner label="マッピング" name="FlycamAxis1" />

-        <spinner label="マッピング" name="FlycamAxis2" />

-        <spinner label="マッピング" name="FlycamAxis0" />

-        <spinner label="スケール" name="FlycamAxisScale1" />

-        <spinner label="スケール" name="FlycamAxisScale2" />

-        <spinner label="スケール" name="FlycamAxisScale0" />

-        <spinner label="デッドゾーン" name="FlycamAxisDeadZone1" />

-        <spinner label="デッドゾーン" name="FlycamAxisDeadZone2" />

-        <spinner label="デッドゾーン" name="FlycamAxisDeadZone0" />

-        <text name="yaw">

-                ヨー

-        </text>

-        <text name="pitch">

-                ピッチ

-        </text>

-        <text name="roll">

-                ロール

-        </text>

-        <spinner label="マッピング" name="FlycamAxis5" />

-        <spinner label="マッピング" name="FlycamAxis4" />

-        <spinner label="マッピング" name="FlycamAxis3" />

-        <spinner label="スケール" name="FlycamAxisScale5" />

-        <spinner label="スケール" name="FlycamAxisScale4" />

-        <spinner label="スケール" name="FlycamAxisScale3" />

-        <spinner label="デッドゾーン" name="FlycamAxisDeadZone5" />

-        <spinner label="デッドゾーン" name="FlycamAxisDeadZone4" />

-        <spinner label="デッドゾーン" name="FlycamAxisDeadZone3" />

-        <text name="ZoomLabel">

-                ズーム

-        </text>

-        <spinner label="マッピング" name="FlycamAxis6" />

-        <spinner label="スケール" name="FlycamAxisScale6" />

-        <spinner label="デッドゾーン" name="FlycamAxisDeadZone6" />

-        <slider label="フェザリング" name="FlycamFeathering" />

-        <check_box label="自動レベル" name="FlycamAutoLeveling" />

-        <check_box label="3Dカーソル" name="FlycamAbsolute" />

-        <text name="JoystickMonitor">

-                ジョイスティックモニター

-        </text>

-        <text name="Axis">

-                軸 [NUM]

-        </text>

-</floater>

+<floater name="Joystick">

+</floater>
\ No newline at end of file
diff --git a/linden/indra/newview/skins/xui/ja/floater_preview_new_landmark.xml b/linden/indra/newview/skins/xui/ja/floater_preview_new_landmark.xml
deleted file mode 100644
index 152f3b0..0000000
--- a/linden/indra/newview/skins/xui/ja/floater_preview_new_landmark.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="landmark_preview">
-        <button label="テレポート" label_selected="" name="Teleport btn" />
-        <button label="地図上に表示" label_selected="" name="Show on Map btn" />
-        <button label="破棄" label_selected="" name="Discard btn" />
-        <text type="string" length="1" name="desc txt">
-                説明：
-        </text>
-</floater>
diff --git a/linden/indra/newview/skins/xui/ja/floater_rate.xml b/linden/indra/newview/skins/xui/ja/floater_rate.xml
deleted file mode 100644
index 7d26296..0000000
--- a/linden/indra/newview/skins/xui/ja/floater_rate.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="rate" title="Jeska Lindenに対するあなたの評価">
-        <radio_group name="behavior">
-                <radio_item type="string" length="1" name="Positive">
-                        ポジティブ
-                </radio_item>
-                <radio_item type="string" length="1" name="No Rating">
-                        評価なし
-                </radio_item>
-        </radio_group>
-        <radio_group name="appearance">
-                <radio_item type="string" length="1" name="Positive">
-                        ポジティブ
-                </radio_item>
-                <radio_item type="string" length="1" name="No Rating">
-                        評価なし
-                </radio_item>
-        </radio_group>
-        <radio_group name="building">
-                <radio_item type="string" length="1" name="Positive">
-                        ポジティブ
-                </radio_item>
-                <radio_item type="string" length="1" name="No Rating">
-                        評価なし
-                </radio_item>
-        </radio_group>
-        <button label="OK" label_selected="OK" name="OK" />
-        <button label="取り消し" label_selected="取り消し" name="Cancel" />
-        <text type="string" length="1" name="Overall behavior:">
-                全体的な行動：
-        </text>
-        <text type="string" length="1" name="Skill at appearance (clothing and attachments):">
-                容姿のスキル（服と装飾品）：
-        </text>
-        <text type="string" length="1" name="Skill at building:">
-                建造物のスキル：
-        </text>
-        <text type="string" length="1" name="Message:">
-                メッセージ：
-        </text>
-        <text type="string" length="1" name="cost">
-                費用：各評価を変更するにはL＄[TOTAL] 全体費用：L＄[COST].
-        </text>
-</floater>
diff --git a/linden/indra/newview/skins/xui/ja/menu_viewer.xml b/linden/indra/newview/skins/xui/ja/menu_viewer.xml
index 610c109..eb8b62d 100644
--- a/linden/indra/newview/skins/xui/ja/menu_viewer.xml
+++ b/linden/indra/newview/skins/xui/ja/menu_viewer.xml
@@ -18,8 +18,6 @@
                 <menu_item_call label="スナップショットをディスクに保存"
                      name="Snapshot to Disk" />
                 <menu_item_separator label="-----------" name="separator4" />
-                <menu_item_call label="ディスクへの録画を開始/停止"
-                     name="Start/Stop Movie to Disk" />
                 <menu label="ウィンドウ・サイズを設定" name="Set Window Size">
                         <menu_item_call label="320x240" name="320x240" />
                         <menu_item_call label="640x480" name="640x480" />
@@ -146,6 +144,7 @@
                 <menu_item_separator label="-----------" name="separator3" />
                 <menu_item_call label="退席中に設定" name="Set Away" />
                 <menu_item_call label="ビジーに設定" name="Set Busy" />
+                <menu_item_call label="アニメーションをすべて停止" name="Stop All Animations" />
                 <menu_item_separator label="-----------" name="separator4" />
                 <menu_item_call label="口座履歴..." name="Account History..." />
                 <menu_item_call label="自分の口座の管理..." name="Manage My Account..." />
@@ -202,7 +201,6 @@
                 <menu_item_call label="リンク" name="Link" />
                 <menu_item_call label="リンクしない" name="Unlink" />
                 <menu_item_separator label="-----------" name="separator4" />
-                <menu_item_call label="アニメーションをすべて停止" name="Stop All Animations" />
                 <menu_item_separator label="-----------" name="separator5" />
                 <menu_item_call label="選択をフォーカス" name="Focus on Selection" />
                 <menu_item_call label="選択範囲にズームイン" name="Zoom to Selection" />
@@ -224,7 +222,6 @@
                      name="Set Scripts to Running in Selection" />
                 <menu_item_call label="選択したスクリプトを起動しない"
                      name="Set Scripts to Not Running in Selection" />
-                <menu_item_separator label="-----------" name="separator6" />
                 <menu_item_call label="バグの報告..." name="Report Bug..." />
                 <menu label="バグの報告" name="Bug Reporting">
                         <menu_item_call label="パブリック問題トラッカー..." name="Public Issue Tracker..." />
@@ -254,6 +251,17 @@
                 <menu_item_call label="ぶつかる、押す、および当たる..."
                      name="Bumps, Pushes &amp;amp; Hits..." />
                 <menu_item_call label="ラグ メーター" name="Lag Meter" />
+                <menu label="バグの報告" name="Bug Reporting">
+                        <menu_item_call label="パブリック問題トラッカー..." name="Public Issue Tracker..." />
+                        <menu_item_call label="パブリック問題トラッカー ヘルプ..."
+                             name="Publc Issue Tracker Help..." />
+                        <menu_item_call label="バグの報告 101..." name="Bug Reporing 101..." />
+                        <menu_item_call label="セキュリティ問題..." name="Security Issues..." />
+                        <menu_item_call label="QA Wiki..." name="QA Wiki..." />
+                        <menu_item_separator label="-----------" name="separator7" />
+                        <menu_item_call label="バグの報告..." name="Report Bug..." />
+                </menu>
+
                 <menu_item_separator label="-----------" name="separator5" />
                 <menu_item_call label="リリースノート..." name="Release Notes..." />
                 <menu_item_separator label="-----------" name="separator6" />
diff --git a/linden/indra/newview/skins/xui/ja/panel_music_remote.xml b/linden/indra/newview/skins/xui/ja/panel_music_remote.xml
deleted file mode 100644
index 35b4c70..0000000
--- a/linden/indra/newview/skins/xui/ja/panel_music_remote.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel name="music_remote">
-        <text type="string" length="6" name="text">
-                ミュージック
-        </text>
-        <volume_slider name="volume_slider"
-             tool_tip="このスライダーでボリュームを調整" />
-        <button label="" label_selected="" name="stop_btn" tool_tip="メディアを停止" />
-        <button label="" label_selected="" name="play_btn"
-             tool_tip="メディア･ストリームを再生" />
-        <button label="" label_selected="" name="pause_btn"
-             tool_tip="メデイア・ストリームを一時停止" />
-        <button name="music_stop" tool_tip="メディアを停止します。" />
-        <button name="music_play"
-             tool_tip="メディア･ストリームを再生します。" />
-        <button name="music_pause"
-             tool_tip="メデイア・ストリームを一時停止します。" />
-</panel>
diff --git a/linden/indra/newview/skins/xui/ja/panel_overlaybar.xml b/linden/indra/newview/skins/xui/ja/panel_overlaybar.xml
index d201c8c..f37d351 100644
--- a/linden/indra/newview/skins/xui/ja/panel_overlaybar.xml
+++ b/linden/indra/newview/skins/xui/ja/panel_overlaybar.xml
@@ -12,8 +12,8 @@
         <button label="立ち上がる" label_selected="立ち上がる" name="Stand Up"
              tool_tip="立ち上がるには、ここをクリックします。" />
         <layout_stack name="overlay_layout_panel">
-                <layout_panel name="">
-                        <layout_stack name="">
+                <layout_panel name="main_panel">
+                        <layout_stack name="chatbar_and_buttons">
                                 <layout_panel name="state_buttons">
                                         <button label="受信済みIM" label_selected="受信済みIM" name="IM Received"
                                              tool_tip="インスタント・メッセージが保留になっています。ここをクリックして、IMを見てください。" />
diff --git a/linden/indra/newview/skins/xui/ja/panel_preferences_graphics2.xml b/linden/indra/newview/skins/xui/ja/panel_preferences_graphics2.xml
deleted file mode 100644
index 9bcb946..0000000
--- a/linden/indra/newview/skins/xui/ja/panel_preferences_graphics2.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel label="グラフィック１" name="Display panel 3">
-        <text type="string" length="1" name="text">
-                シェーダー：
-        </text>
-        <check_box label="Vertex Shaderを有効にする" name="shaders"
-             tool_tip="このオプションを無効にするとグラフィックカードドライバーの種類によってはクラッシュ防止になります。" />
-        <check_box label="バンプマップと輝きを有効にする" name="bumpshiny" />
-        <check_box label="水の波紋を有効化" name="ripple" />
-        <check_box label="アバターVertexプログラム" name="avatarvp" />
-        <text type="string" length="1" name="Avatar Rendering:">
-                アバターの描画：
-        </text>
-        <radio_group name="Avatar Appearance">
-                <radio_item type="string" length="1" name="Normal">
-                        ノーマル
-                </radio_item>
-                <radio_item type="string" length="1" name="Bump">
-                        バンプマップ
-                </radio_item>
-                <radio_item type="string" length="1" name="Cloth">
-                        バンプマップと服
-                </radio_item>
-        </radio_group>
-        <text type="string" length="1" name="Lighting Detail:">
-                ライティング詳細：
-        </text>
-        <radio_group name="lighting detail radio">
-                <radio_item type="string" length="1" name="SunMoon">
-                        太陽と月のみ
-                </radio_item>
-                <radio_item type="string" length="1" name="LocalLights">
-                        近隣のローカル・ライト
-                </radio_item>
-        </radio_group>
-        <text type="string" length="1" name="Terrain Detail:">
-                地形詳細:
-        </text>
-        <radio_group name="terrain detail radio">
-                <radio_item type="string" length="1" name="0">
-                        低
-                </radio_item>
-                <radio_item type="string" length="1" name="2">
-                        高
-                </radio_item>
-        </radio_group>
-        <text type="string" length="1" name="Object Mesh Detail:">
-                オブジェクトメッシュ：
-        </text>
-        <text type="string" length="1" name="Flexible Mesh Detail:">
-                フレキシブルメッシュ：
-        </text>
-        <text type="string" length="1" name="Tree Mesh Detail:">
-                樹木メッシュ:
-        </text>
-        <text type="string" length="1" name="Avatar Mesh Detail:">
-                アバターメッシュ：
-        </text>
-</panel>
diff --git a/linden/indra/newview/skins/xui/ja/panel_preferences_graphics3.xml b/linden/indra/newview/skins/xui/ja/panel_preferences_graphics3.xml
deleted file mode 100644
index 7a373e3..0000000
--- a/linden/indra/newview/skins/xui/ja/panel_preferences_graphics3.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel label="グラフィック２" name="Display panel 2">
-        <text type="string" length="1" name="Filtering:">
-                フィルタリング：
-        </text>
-        <check_box
-             label="異方的フィルタリング（有効にすると速度が低下します）"
-             name="ani" left="160" />
-        <spinner label="ガンマ：" name="gamma" label_width="148" width="208"/>
-        <text type="string" length="1" name="(brightness, lower is brighter)" left="223">
-                ０＝デフォルト値（最も明るい）
-        </text>
-        <spinner label="夜の明るさ：" name="nighttime_brightness" label_width="148" width="208"/>
-        <text type="string" length="1" name="(higher is brighter, 1.0 is default)" left="223">
-                （高いほど明るい、1.0がデフォルト）
-        </text>
-        <text type="string" length="1" name="Enable VBO:">
-                VBOを有効化：
-        </text>
-        <check_box label="OpenGL Vertex Buffer オブジェクトを有効化" name="vbo"
-             tool_tip="一部のOpenGLドライバは、これを有効化するとクラッシュすることがあります。" left="160"/>
-        <text type="string" length="1" name="Graphics Card Memory:">
-                グラフィックメモリ：
-        </text>
-        <radio_group name="video card memory radio" left="160">
-                <radio_item type="string" length="1" name="radio" left="15">
-                        16MB
-                </radio_item>
-                <radio_item type="string" length="1" name="radio2" left="15">
-                        32MB
-                </radio_item>
-                <radio_item type="string" length="1" name="radio3" left="15">
-                        64MB
-                </radio_item>
-                <radio_item type="string" length="1" name="radio4" left="15">
-                        128MB
-                </radio_item>
-                <radio_item type="string" length="1" name="radio5" left="15">
-                        256MB
-                </radio_item>
-                <radio_item type="string" length="1" name="radio6" left="15">
-                        512MB
-                </radio_item>
-        </radio_group>
-        <spinner label="霧／視界率：" name="fog" label_width="148" width="208"/>
-        <spinner label="最大パーティクル数：" name="particles" label_width="148" width="208"/>
-        <spinner label="服装合成限度：" name="comp limit"
-             tool_tip="服装の変更を過去何回まで表示するか" label_width="148" width="208"/>
-        <text type="string" length="1" name="(lower is faster)" left="223" >
-                （低いほど速い）
-        </text>
-        <spinner label="デバッグ用標識線の幅：" name="debug beacon line width" label_width="148" width="208"/>
-        <check_box
-             label="次回起動時にグラフィック・ハードウェアを自動検出"
-             name="probe_hardware_checkbox" left="160"
-             tool_tip="Second Lifeは、あなたのハードウェアに基づき、いくつかのグラフィック設定を自動的に構成します。新しいハードウェアをインストールした場合は、Second Lifeに再度検知させるようにしてください。" />
-</panel>
diff --git a/linden/indra/newview/skins/xui/ja/panel_settings_chat.xml b/linden/indra/newview/skins/xui/ja/panel_settings_chat.xml
deleted file mode 100644
index 34a1a0d..0000000
--- a/linden/indra/newview/skins/xui/ja/panel_settings_chat.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel name="chat" title="会話">
-        <text>
-                チャットのフォント：
-        </text>
-        <radio_group name="chat font size">
-                <radio_item>
-                        小
-                </radio_item>
-                <radio_item>
-                        中
-                </radio_item>
-                <radio_item>
-                        大
-                </radio_item>
-        </radio_group>
-        <text>
-                チャット・カラー：
-        </text>
-        <color_swatch label="システム" name="system" />
-        <color_swatch label="ユーザー" name="users" />
-        <color_swatch label="オブジェクト" name="objects" />
-        <color_swatch label="吹き出し" name="background" />
-        <text>
-                チャット・コンソール：
-        </text>
-        <spinner label="フェード" name="fade_chat_time" />
-        <text>
-                （秒後）
-        </text>
-        <spinner label="" name="max_chat_count" />
-        <text>
-                （行数）
-        </text>
-        <slider label="不透明度" name="console_opacity" />
-        <text>
-                チャット・オプション
-        </text>
-        <check_box label="チャットに全画面幅を使用（再起動後）"
-             name="chat_full_width_check" />
-        <check_box label="Enterキーを押した後チャットを閉じる"
-             name="close_chat_on_return_check" />
-        <check_box label="チャット中は、矢印キーでアバターを移動可能"
-             name="arrow_keys_move_avatar_check" />
-        <check_box label="チャットにタイムスタンプを表示"
-             name="show_timestamps_check" />
-        <text>
-                チャットの吹き出し：
-        </text>
-        <check_box label="チャットの吹き出しを表示" name="bubble_text_chat" />
-        <slider label="不透明度" name="bubble_chat_opacity" />
-        <text>
-                スクリプト・エラー：
-        </text>
-        <check_box label="スクリプト・エラーと警告をチャット同様に表示"
-             name="script_errors_as_chat" />
-        <color_swatch label="色" name="script_error" />
-</panel>
diff --git a/linden/indra/newview/skins/xui/ja/panel_settings_im.xml b/linden/indra/newview/skins/xui/ja/panel_settings_im.xml
deleted file mode 100644
index 39b9b5e..0000000
--- a/linden/indra/newview/skins/xui/ja/panel_settings_im.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel name="im" title="IM">
-        <text>
-                IMオプション：
-        </text>
-        <check_box label="IMを電子メールへ送信" name="send_im_to_email"
-             tool_tip="secondlife.com上の電子メール・アドレスを変更" />
-        <check_box label="チャット履歴にIMを含める" name="include_im_in_chat_history" />
-        <check_box label="IMにタイムスタンプを表示" name="show_timestamps_check" />
-        <text>
-                ビジー・モード応答：
-        </text>
-</panel>
diff --git a/linden/indra/newview/skins/xui/ja/panel_settings_msgbox.xml b/linden/indra/newview/skins/xui/ja/panel_settings_msgbox.xml
deleted file mode 100644
index b4c481d..0000000
--- a/linden/indra/newview/skins/xui/ja/panel_settings_msgbox.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel label="ポップアップ" name="popups" title="ポップアップ">
-        <text>
-                ポップアップを表示しない：
-        </text>
-        <button label="これは表示する" name="enable_popup" />
-        <text>
-                ポップアップを表示：
-        </text>
-        <button label="「次回表示」ダイアログリセット..."
-             name="reset_dialogs_btn" />
-</panel>
diff --git a/linden/indra/newview/skins/xui/ja/panel_settings_network.xml b/linden/indra/newview/skins/xui/ja/panel_settings_network.xml
deleted file mode 100644
index 65fe03d..0000000
--- a/linden/indra/newview/skins/xui/ja/panel_settings_network.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel name="network" title="ネットワーク">
-        <text>
-                最大帯域幅：
-        </text>
-        <slider label="" name="max_bandwidth" />
-        <text>
-                Kbps
-        </text>
-        <text>
-                ディスク・キャッシュのサイズ：
-        </text>
-        <radio_group name="disk cache">
-                <radio_item>
-                        50MB
-                </radio_item>
-                <radio_item>
-                        200MB
-                </radio_item>
-                <radio_item>
-                        500MB
-                </radio_item>
-                <radio_item>
-                        100MB
-                </radio_item>
-        </radio_group>
-        <button label="クリア" name="clear_cache" />
-        <text>
-                プロキシー構成：
-        </text>
-        <check_box label="プロキシを使用" name="proxy_enabled"
-             tool_tip="プロキシーの構成を指定" />
-        <text>
-                プロキシー：
-        </text>
-        <line_editor name="proxy_address"
-             tool_tip="使用するプロキシの名前またはIPアドレス" />
-        <text>
-                ポート：
-        </text>
-        <line_editor name="proxy_port" tool_tip="使用するプロキシのポート番号" />
-        <text>
-                靴下：
-        </text>
-        <radio_group name="socks_4_5">
-                <radio_item>
-                        靴下v4
-                </radio_item>
-                <radio_item>
-                        靴下v5
-                </radio_item>
-        </radio_group>
-        <text>
-                プロキシーがありません：
-        </text>
-        <line_editor name="proxy_exclusions"
-             tool_tip="プロキシを使用しない名前またはIPアドレス" />
-</panel>
diff --git a/linden/indra/newview/skins/xui/ja/panel_settings_web.xml b/linden/indra/newview/skins/xui/ja/panel_settings_web.xml
deleted file mode 100644
index 35ea206..0000000
--- a/linden/indra/newview/skins/xui/ja/panel_settings_web.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel name="web" title="ウェブ">
-        <check_box
-             label="外部のウェブ・ブラウザー(Firefox, Safari, Internet Explorer)を使用"
-             name="external_browser_check"
-             tool_tip="ヘルプ、ウェブリンクなどに、外部のウェブ・ブラウザーを使用。\nフルスクリーン起動時には推奨されない。" />
-        <text>
-                ブラウザーのホーム・ページ：
-        </text>
-        <line_editor name="home_page"
-             tool_tip="初めてSecond Lifeブラウザーを開くために訪れるウェブ・ページ" />
-        <text>
-                プロキシー構成：
-        </text>
-        <check_box label="内部ウェブ・ブラウザーにプロキシを使用"
-             name="proxy_enabled"
-             tool_tip="内蔵ブラウザー用のプロキシー構成を指定" />
-        <text>
-                プロキシー：
-        </text>
-        <line_editor name="proxy_address"
-             tool_tip="使用するプロキシの名前またはIPアドレス" />
-        <text>
-                ポート：
-        </text>
-        <line_editor name="proxy_port" tool_tip="使用するプロキシのポート番号" />
-        <text>
-                靴下：
-        </text>
-        <radio_group name="socks_4_5">
-                <radio_item>
-                        靴下v4
-                </radio_item>
-                <radio_item>
-                        靴下v5
-                </radio_item>
-        </radio_group>
-        <text>
-                次に対応するプロキシーがありません：
-        </text>
-        <line_editor name="proxy_exclusions"
-             tool_tip="プロキシを使用しない名前またはIPアドレス" />
-        <check_box
-             label="オブジェクトに関するウェブ・ページを表示（実験中、再起動要）"
-             name="web_pages_on_prims_check" />
-        <text>
-                信用できるサイト:
-(ログインして表示する)
-        </text>
-        <button label="追加" name="add_trusted" />
-        <line_editor name="trusted_site_entry"
-             tool_tip="このサイトを信頼できるサイトのリストに追加する。" />
-        <button label="削除" name="rem_trusted" />
-</panel>
diff --git a/linden/indra/newview/skins/xui/ja/panel_speaker_controls.xml b/linden/indra/newview/skins/xui/ja/panel_speaker_controls.xml
index 4e26137..fa646a7 100644
--- a/linden/indra/newview/skins/xui/ja/panel_speaker_controls.xml
+++ b/linden/indra/newview/skins/xui/ja/panel_speaker_controls.xml
@@ -3,10 +3,12 @@
         <string name="moderator_label">

                 (モデレータ)

         </string>

-        <layout_stack name="">

+        <layout_stack name="panels">

                 <layout_panel name="moderation_mode_panel">

                         <combo_box name="moderation_mode">

-                                モデレート済みボイス

+                                <combo_item name="ModeratedVoice" value="moderated">

+                                  モデレート済みボイス

+                                </combo_item>

                         </combo_box>

                 </layout_panel>

                 <layout_panel name="moderate_chat_panel">

diff --git a/linden/indra/newview/skins/xui/ja/panel_toolbar.xml b/linden/indra/newview/skins/xui/ja/panel_toolbar.xml
index 9f21fa1..276ec62 100644
--- a/linden/indra/newview/skins/xui/ja/panel_toolbar.xml
+++ b/linden/indra/newview/skins/xui/ja/panel_toolbar.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel name="toolbar">
+        <string name="Redock Windows">ウィンドウを再置する</string>
+        <layout_stack name="toolbar_stack">
         <button label="IM" name="im_btn"
              tool_tip="フレンドとインスタント・メッセージ" />
-        <string name="Redock Windows">
-                ウィンドウを再置する
-        </string>
         <button label="コミュニケート" name="communicate_btn"
              tool_tip="フレンドやグループとコミュケート。" />
         <button label="" name="chat_btn"
@@ -23,4 +22,5 @@
         <button label="地図" name="map_btn" tool_tip="世界地図。 （Ctrl＋M）" />
         <button label="持ち物" name="inventory_btn"
              tool_tip="あなたのアイテム。 (Ctrl-I)" />
+  </layout_stack>
 </panel>
diff --git a/linden/indra/newview/skins/xui/ko/floater_about_land.xml b/linden/indra/newview/skins/xui/ko/floater_about_land.xml
index 772b2eb..095ad9d 100644
--- a/linden/indra/newview/skins/xui/ko/floater_about_land.xml
+++ b/linden/indra/newview/skins/xui/ko/floater_about_land.xml
@@ -468,9 +468,12 @@
                         </text>
                         <button label="추가" label_selected="추가" name="add_allowed" />
                         <button label="제거" label_selected="제거" name="remove_allowed" />
-                        <check_box label="차단" name="AccessCheck">
+                        <check_box label="차단" name="BanCheck">
                                 출입금지된 주민
                         </check_box>
+                        <check_box label="항상 허용" name="AccessCheck">
+                                허용된 주민
+                        </check_box>
                         <name_list name="AccessList" tool_tip="([LISTED] 목록에 있음, [MAX] 최대)">
                                 <column label="허용된 주민" name="name" />
                         </name_list>
diff --git a/linden/indra/newview/skins/xui/ko/floater_critical.xml b/linden/indra/newview/skins/xui/ko/floater_critical.xml
index e5ce706..95a8157 100644
--- a/linden/indra/newview/skins/xui/ko/floater_critical.xml
+++ b/linden/indra/newview/skins/xui/ko/floater_critical.xml
@@ -2,9 +2,6 @@
 <floater name="modal container" title=" ">
         <button label="계속" label_selected="계속" name="Continue" />
         <button label="취소" label_selected="취소" name="Cancel" />
-        <text name="tos_title">
-                중요 메시지
-        </text>
         <text name="tos_heading">
                 다음 메시지를 잘 읽으세요.
         </text>
diff --git a/linden/indra/newview/skins/xui/ko/floater_friends.xml b/linden/indra/newview/skins/xui/ko/floater_friends.xml
deleted file mode 100644
index b1fd36c..0000000
--- a/linden/indra/newview/skins/xui/ko/floater_friends.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="friends" title="친구">
-        <scroll_list name="friend_list"
-             tool_tip="다수의 친구를 선택하려면 선택하는 동안 shift나 Ctrl를 누르십시오.">
-                <column label="이름" name="friend_name" />
-        </scroll_list>
-        <panel name="rights_container">
-                <text name="friend_name_label">
-                        친구를 선택하여 권한 변경
-                </text>
-                <check_box label="내 온라인 상태를 확인할 수 있습니다."
-                     name="online_status_cb"
-                     tool_tip="친구가 친구 목록이나 통화 카드에서 내 온라인 상태를 확인 가능한지 여부를 설정합니다." />
-                <check_box label="지도에서 내 위치를 확인할 수 있습니다."
-                     name="map_status_cb"
-                     tool_tip="친구가 지도에서 내 위치를 확인 가능한지 여부를 설정합니다." />
-                <check_box label="내 오브젝트를 수정할 수 있습니다." name="modify_status_cb"
-                     tool_tip="친구가 내 오브젝트를 수정할 수 있는지 여부를 설정합니다." />
-                <text name="process_rights_label">
-                        권한 변경 중?
-                </text>
-        </panel>
-        <button label="메신저/전화걸기" name="im_btn" tool_tip="메신저 세션 열기" />
-        <button label="텔레포트..." name="offer_teleport_btn"
-             tool_tip="친구에게 내 현재 위치로 텔레포트를 제공함" />
-        <button label="추가..." name="add_btn" tool_tip="주민에게 우정 제공" />
-        <button label="프로필" name="profile_btn"
-             tool_tip="그림, 그룹 및 기타 정보 표시" />
-        <button label="지불…" name="pay_btn"
-             tool_tip="친구에게 린든 달러(L$) 주기" />
-        <button label="제거…" name="remove_btn"
-             tool_tip="이 사람을 내 친구 목록에서 삭제" />
-        <text name="Multiple">
-                친구들...
-        </text>
-</floater>
diff --git a/linden/indra/newview/skins/xui/ko/floater_groups.xml b/linden/indra/newview/skins/xui/ko/floater_groups.xml
deleted file mode 100644
index a1e3fee..0000000
--- a/linden/indra/newview/skins/xui/ko/floater_groups.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="groups" title="그룹">
-        <text name="groupdesc">
-                현재 활동중인 그룹은 굵은 글씨로 표시됩니다.
-        </text>
-        <text name="groupcount">
-                [COUNT]개의 그룹(최대 [MAX])에 속해 있습니다.
-        </text>
-        <button label="메신저/전화걸기" name="IM" tool_tip="메신저 세션 열기" />
-        <button label="활성화" label_selected="활성화" name="Activate" />
-        <button label="정보" label_selected="정보" name="Info" />
-        <button label="탈퇴" label_selected="탈퇴" name="Leave" />
-        <button label="만들기" label_selected="만들기" name="Create" />
-        <button label="검색…" label_selected="검색…" name="Search..." />
-        <button label="닫기" label_selected="닫기" name="Close" />
-</floater>
diff --git a/linden/indra/newview/skins/xui/ko/floater_instant_message_ad_hoc.xml b/linden/indra/newview/skins/xui/ko/floater_instant_message_ad_hoc.xml
index 5a13aea..dc7f5af 100644
--- a/linden/indra/newview/skins/xui/ko/floater_instant_message_ad_hoc.xml
+++ b/linden/indra/newview/skins/xui/ko/floater_instant_message_ad_hoc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>

 <floater label="(알 수 없음)" name="im_floater" title="(알 수 없음)">

-        <layout_stack name="">

+        <layout_stack name="panels">

                 <layout_panel name="im_contents_panel">

                         <button label="전화" name="start_call_btn" />

                         <button label="전화 종료" name="end_call_btn" />

diff --git a/linden/indra/newview/skins/xui/ko/floater_instant_message_group.xml b/linden/indra/newview/skins/xui/ko/floater_instant_message_group.xml
index a06c626..891613c 100644
--- a/linden/indra/newview/skins/xui/ko/floater_instant_message_group.xml
+++ b/linden/indra/newview/skins/xui/ko/floater_instant_message_group.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>

 <floater label="(알 수 없음)" name="im_floater" title="(알 수 없음)">

-        <layout_stack name="">

+        <layout_stack name="panels">

                 <layout_panel name="im_contents_panel">

                         <button label="그룹 정보" name="group_info_btn" />

                         <button label="전화에 참여하기" name="start_call_btn" />

diff --git a/linden/indra/newview/skins/xui/ko/floater_joystick.xml b/linden/indra/newview/skins/xui/ko/floater_joystick.xml
index 14a5883..6207687 100644
--- a/linden/indra/newview/skins/xui/ko/floater_joystick.xml
+++ b/linden/indra/newview/skins/xui/ko/floater_joystick.xml
@@ -1,96 +1,3 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>

-<floater name="build options floater" title="Flycam 옵션">

-        <text>

-                X축

-        </text>

-        <text>

-                Y축

-        </text>

-        <text>

-                Z축

-        </text>

-        <spinner label="매핑" />

-        <spinner label="매핑" />

-        <spinner label="매핑" />

-        <spinner label="크기" />

-        <spinner label="크기" />

-        <spinner label="크기" />

-        <spinner label="사각지대" />

-        <spinner label="사각지대" />

-        <spinner label="사각지대" />

-        <text>

-                요

-        </text>

-        <text>

-                피치

-        </text>

-        <text>

-                역할

-        </text>

-        <spinner label="매핑" />

-        <spinner label="매핑" />

-        <spinner label="매핑" />

-        <spinner label="크기" />

-        <spinner label="크기" />

-        <spinner label="크기" />

-        <spinner label="사각지대" />

-        <spinner label="사각지대" />

-        <spinner label="사각지대" />

-        <text name="x-axis">

-                X축

-        </text>

-        <text name="y-axis">

-                Y축

-        </text>

-        <text name="z-axis">

-                Z축

-        </text>

-        <spinner label="매핑" name="FlycamAxis1" />

-        <spinner label="매핑" name="FlycamAxis2" />

-        <spinner label="매핑" name="FlycamAxis0" />

-        <spinner label="크기" name="FlycamAxisScale1" />

-        <spinner label="크기" name="FlycamAxisScale2" />

-        <spinner label="크기" name="FlycamAxisScale0" />

-        <spinner label="사각지대" name="FlycamAxisDeadZone1" />

-        <spinner label="사각지대" name="FlycamAxisDeadZone2" />

-        <spinner label="사각지대" name="FlycamAxisDeadZone0" />

-        <text name="yaw">

-                요

-        </text>

-        <text name="pitch">

-                피치

-        </text>

-        <text name="roll">

-                역할

-        </text>

-        <spinner label="매핑" name="FlycamAxis5" />

-        <spinner label="매핑" name="FlycamAxis4" />

-        <spinner label="매핑" name="FlycamAxis3" />

-        <spinner label="크기" name="FlycamAxisScale5" />

-        <spinner label="크기" name="FlycamAxisScale4" />

-        <spinner label="크기" name="FlycamAxisScale3" />

-        <spinner label="사각지대" name="FlycamAxisDeadZone5" />

-        <spinner label="사각지대" name="FlycamAxisDeadZone4" />

-        <spinner label="사각지대" name="FlycamAxisDeadZone3" />

-        <text name="ZoomLabel">

-                확대/축소

-        </text>

-        <spinner label="매핑" />

-        <spinner label="크기" />

-        <spinner label="사각지대" />

-        <check_box label="직접 확대/축소" />

-        <spinner label="매핑" name="FlycamAxis6" />

-        <spinner label="크기" name="FlycamAxisScale6" />

-        <spinner label="사각지대" name="FlycamAxisDeadZone6" />

-        <slider label="깃털 효과" name="FlycamFeathering" />

-        <check_box label="레벨 자동 수정" />

-        <check_box label="3D 커서" />

-        <check_box label="레벨 자동 수정" name="FlycamAutoLeveling" />

-        <check_box label="3D 커서" name="FlycamAbsolute" />

-        <text name="JoystickMonitor">

-                조이스틱 검사

-        </text>

-        <text name="Axis">

-                축 [NUM]

-        </text>

-</floater>

+<floater name="Joystick">

+</floater>
\ No newline at end of file
diff --git a/linden/indra/newview/skins/xui/ko/floater_preview_new_landmark.xml b/linden/indra/newview/skins/xui/ko/floater_preview_new_landmark.xml
deleted file mode 100644
index 5256ce7..0000000
--- a/linden/indra/newview/skins/xui/ko/floater_preview_new_landmark.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="landmark_preview">
-        <button label="텔리포트" label_selected="" name="Teleport btn" />
-        <button label="지도에 표시" label_selected="" name="Show on Map btn" />
-        <button label="취소" label_selected="" name="Discard btn" />
-        <text type="string" length="1" name="desc txt">
-                설명:
-        </text>
-</floater>
diff --git a/linden/indra/newview/skins/xui/ko/floater_rate.xml b/linden/indra/newview/skins/xui/ko/floater_rate.xml
deleted file mode 100644
index 39aebc5..0000000
--- a/linden/indra/newview/skins/xui/ko/floater_rate.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="rate" title="Jeska Linden의 순위">
-        <radio_group name="behavior">
-                <radio_item type="string" length="1" name="Positive">
-                        양수
-                </radio_item>
-                <radio_item type="string" length="1" name="No Rating">
-                        등급 없음
-                </radio_item>
-        </radio_group>
-        <radio_group name="appearance">
-                <radio_item type="string" length="1" name="Positive">
-                        양수
-                </radio_item>
-                <radio_item type="string" length="1" name="No Rating">
-                        등급 없음
-                </radio_item>
-        </radio_group>
-        <radio_group name="building">
-                <radio_item type="string" length="1" name="Positive">
-                        양수
-                </radio_item>
-                <radio_item type="string" length="1" name="No Rating">
-                        등급 없음
-                </radio_item>
-        </radio_group>
-        <button label="확인" label_selected="확인" name="OK" />
-        <button label="취소" label_selected="취소" name="Cancel" />
-        <text type="string" length="1" name="Overall behavior:">
-                전체적 행동:
-        </text>
-        <text type="string" length="1" name="Skill at appearance (clothing and attachments):">
-                꾸미기를 잘 함(의복 및 착용물):
-        </text>
-        <text type="string" length="1" name="Skill at building:">
-                건축을 잘 함:
-        </text>
-        <text type="string" length="1" name="Message:">
-                메시지:
-        </text>
-        <text type="string" length="1" name="cost">
-                비용: 등급 변경 비용은 L$[COST]입니다.  총 비용: L$[TOTAL]입니다.
-        </text>
-</floater>
diff --git a/linden/indra/newview/skins/xui/ko/menu_viewer.xml b/linden/indra/newview/skins/xui/ko/menu_viewer.xml
index d8e85c8..417b1f4 100644
--- a/linden/indra/newview/skins/xui/ko/menu_viewer.xml
+++ b/linden/indra/newview/skins/xui/ko/menu_viewer.xml
@@ -15,7 +15,6 @@
                 <menu_item_call label="스냅샷 미리보기" name="Take Snapshot" />
                 <menu_item_call label="스냅샷 찍기" name="Snapshot to Disk" />
                 <menu_item_separator label="-----------" name="separator4" />
-                <menu_item_call label="동영상 찍기" name="Start/Stop Movie to Disk" />
                 <menu label="창 크기 조절" name="Set Window Size">
                         <menu_item_call label="320x240" name="320x240" />
                         <menu_item_call label="640x480" name="640x480" />
@@ -141,6 +140,7 @@
                 <menu_item_separator label="-----------" name="separator3" />
                 <menu_item_call label="자리비움 설정" name="Set Away" />
                 <menu_item_call label="다른 용무중 설정" name="Set Busy" />
+                <menu_item_call label="모든 애니메이션 중지" name="Stop All Animations" />
                 <menu_item_separator label="-----------" name="separator4" />
                 <menu_item_call label="계정 기록" name="Account History..." />
                 <menu_item_call label="내 계정 관리" name="Manage My Account..." />
@@ -197,7 +197,6 @@
                 <menu_item_call label="연결" name="Link" />
                 <menu_item_call label="연결 해제" name="Unlink" />
                 <menu_item_separator label="-----------" name="separator4" />
-                <menu_item_call label="모든 애니메이션 중지" name="Stop All Animations" />
                 <menu_item_separator label="-----------" name="separator5" />
                 <menu_item_call label="선택 오브젝트에 초점 맞추기" name="Focus on Selection" />
                 <menu_item_call label="선택 영역 확대/축소" name="Zoom to Selection" />
@@ -247,6 +246,16 @@
                 <menu_item_call label="밀기, 타격 등 감지" name="Bumps, Pushes &amp;amp; Hits..." />
                 <menu_item_call label="지연 미터" name="Lag Meter" />
                 <menu_item_separator label="-----------" name="separator5" />
+                <menu label="버그 신고" name="Bug Reporting">
+                        <menu_item_call label="일반 문제 추적하기" name="Public Issue Tracker..." />
+                        <menu_item_call label="일반 문제 추적하기 도움말" name="Publc Issue Tracker Help..." />
+                        <menu_item_call label="버그 보고 101" name="Bug Reporing 101..." />
+                        <menu_item_call label="보안 문제" name="Security Issues..." />
+                        <menu_item_call label="QA 위키" name="QA Wiki..." />
+                        <menu_item_separator label="-----------" name="separator7" />
+                        <menu_item_call label="버그 신고" name="Report Bug..." />
+                </menu>
+
                 <menu_item_call label="출시 정보" name="Release Notes..." />
                 <menu_item_separator label="-----------" name="separator6" />
                 <menu_item_call label="세컨드라이프 정보" name="About Second Life..." />
diff --git a/linden/indra/newview/skins/xui/ko/panel_music_remote.xml b/linden/indra/newview/skins/xui/ko/panel_music_remote.xml
deleted file mode 100644
index fc5dfbf..0000000
--- a/linden/indra/newview/skins/xui/ko/panel_music_remote.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel name="music_remote">
-        <text type="string" length="6" name="text">
-                음악
-        </text>
-        <volume_slider name="volume_slider"
-             tool_tip="이 슬라이더를 사용하여 볼륨을 변경" />
-        <button label="" label_selected="" name="stop_btn" tool_tip="미디어 중지" />
-        <button label="" label_selected="" name="play_btn"
-             tool_tip="미디어 스트림 재생" />
-        <button label="" label_selected="" name="pause_btn"
-             tool_tip="미디어 스트림 일시 정지" />
-        <button name="music_stop" tool_tip="미디어 중지" />
-        <button name="music_play" tool_tip="미디어 스트림 재생" />
-        <button name="music_pause" tool_tip="미디어 스트림 일시 정지" />
-</panel>
diff --git a/linden/indra/newview/skins/xui/ko/panel_overlaybar.xml b/linden/indra/newview/skins/xui/ko/panel_overlaybar.xml
index dc89ec5..bb83a6a 100644
--- a/linden/indra/newview/skins/xui/ko/panel_overlaybar.xml
+++ b/linden/indra/newview/skins/xui/ko/panel_overlaybar.xml
@@ -12,8 +12,8 @@
         <button label="서기" label_selected="서기" name="Stand Up"
              tool_tip="일어서려면 여기를 클릭하십시오." />
         <layout_stack name="overlay_layout_panel">
-                <layout_panel name="">
-                        <layout_stack name="">
+                <layout_panel name="main_panel">
+                        <layout_stack name="chatbar_and_buttons">
                                 <layout_panel name="state_buttons">
                                         <button label="메신저 수령" label_selected="메신저 수령" name="IM Received"
                                              tool_tip="도착한 메시지가 있습니다. 메시지를 확인 하시려면 메신저 버튼을 클릭하십시오." />
diff --git a/linden/indra/newview/skins/xui/ko/panel_preferences_graphics2.xml b/linden/indra/newview/skins/xui/ko/panel_preferences_graphics2.xml
deleted file mode 100644
index 8610748..0000000
--- a/linden/indra/newview/skins/xui/ko/panel_preferences_graphics2.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel label="그래픽 디테일" name="Display panel 3">
-        <text type="string" length="1" name="text">
-                쉐이더:
-        </text>
-        <check_box label="Vertex Shaders 사용함" name="shaders"
-             tool_tip="이 옵션을 사용하지 않으면 일부 그래픽 카드 드라이버에 오류가 발생할 수 있습니다." />
-        <check_box label="범프매핑 및 광택 보이기" name="bumpshiny" />
-        <check_box label="잔물결 보이기" name="ripple" />
-        <check_box label="아바타 버텍스 프로그램" name="avatarvp" />
-        <text type="string" length="1" name="Avatar Rendering:">
-                아바타 렌더링:
-        </text>
-        <radio_group name="Avatar Appearance">
-                <radio_item type="string" length="1" name="Normal">
-                        일반
-                </radio_item>
-                <radio_item type="string" length="1" name="Bump">
-                        범프 맵
-                </radio_item>
-                <radio_item type="string" length="1" name="Cloth">
-                        범프 맵 &amp; 옷감
-                </radio_item>
-        </radio_group>
-        <text type="string" length="1" name="Lighting Detail:">
-                조명 세부 사항:
-        </text>
-        <radio_group name="lighting detail radio">
-                <radio_item type="string" length="1" name="SunMoon">
-                        자연광만 표시
-                </radio_item>
-                <radio_item type="string" length="1" name="LocalLights">
-                        근접 광원 표시
-                </radio_item>
-        </radio_group>
-        <text type="string" length="1" name="Terrain Detail:">
-                지형 세부 사항:
-        </text>
-        <radio_group name="terrain detail radio">
-                <radio_item type="string" length="1" name="0">
-                        낮음
-                </radio_item>
-                <radio_item type="string" length="1" name="2">
-                        높음
-                </radio_item>
-        </radio_group>
-        <text type="string" length="1" name="Object Mesh Detail:">
-                오브젝트 메쉬 디테일:
-        </text>
-        <text type="string" length="1" name="Flexible Mesh Detail:">
-                플렉시블 메쉬 디테일:
-        </text>
-        <text type="string" length="1" name="Tree Mesh Detail:">
-                나무 메쉬 디테일:
-        </text>
-        <text type="string" length="1" name="Avatar Mesh Detail:">
-                아바타 메쉬 디테일:
-        </text>
-</panel>
diff --git a/linden/indra/newview/skins/xui/ko/panel_preferences_graphics3.xml b/linden/indra/newview/skins/xui/ko/panel_preferences_graphics3.xml
deleted file mode 100644
index d64a3d1..0000000
--- a/linden/indra/newview/skins/xui/ko/panel_preferences_graphics3.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel label="그래픽 고급 사항" name="Display panel 2">
-        <text type="string" length="1" name="Filtering:">
-                필터링:
-        </text>
-        <check_box label="Anisotropic 필터링(사용시 느려짐)" name="ani" />
-        <spinner label="감마:" name="gamma" />
-        <text type="string" length="1" name="(brightness, lower is brighter)">
-                (밝기, 낮을 수록 밝음, 기본 설정값 0)
-        </text>
-        <spinner label="야간 밝기:" name="nighttime_brightness" />
-        <text type="string" length="1" name="(higher is brighter, 1.0 is default)">
-                (높을 수록 밝음, 기본 설정값 1.0)
-        </text>
-        <text type="string" length="1" name="Enable VBO:">
-                VBO 사용:
-        </text>
-        <check_box label="OpenGL 버텍스 버퍼 오브젝트 사용" name="vbo"
-             tool_tip="활성화하면 OpenGL 드라이버에 오류가 발생할 수 있습니다." />
-        <text type="string" length="1" name="Graphics Card Memory:">
-                그래픽 카드 메모리:
-        </text>
-        <radio_group name="video card memory radio">
-                <radio_item type="string" length="1" name="radio">
-                        16MB
-                </radio_item>
-                <radio_item type="string" length="1" name="radio2">
-                        32MB
-                </radio_item>
-                <radio_item type="string" length="1" name="radio3">
-                        64MB
-                </radio_item>
-                <radio_item type="string" length="1" name="radio4">
-                        128MB
-                </radio_item>
-                <radio_item type="string" length="1" name="radio5">
-                        256MB
-                </radio_item>
-                <radio_item type="string" length="1" name="radio6">
-                        512MB
-                </radio_item>
-        </radio_group>
-        <spinner label="안개 농도:" name="fog" />
-        <spinner label="최대 파티클 수:" name="particles" />
-        <spinner label="복장 구성 제한:" name="comp limit"
-             tool_tip="디스플레이할 최근 변경 복장의 수" />
-        <text type="string" length="1" name="(lower is faster)">
-                (낮을 수록 빠름)
-        </text>
-        <spinner label="디버그 표시 행 간격:" name="debug beacon line width" />
-        <check_box label="다음 시작할 때 그래픽 하드웨어 자동 감지"
-             name="probe_hardware_checkbox"
-             tool_tip="Second Life는 사용자의 하드웨어에 따라 일부 그래픽 설정을 자동으로 구성합니다.  새로운 하드웨어를 설치하려는 경우, Second Life가 이를 다시 감지하도록 해야 합니다." />
-</panel>
diff --git a/linden/indra/newview/skins/xui/ko/panel_settings_chat.xml b/linden/indra/newview/skins/xui/ko/panel_settings_chat.xml
deleted file mode 100644
index aac33de..0000000
--- a/linden/indra/newview/skins/xui/ko/panel_settings_chat.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel name="chat" title="대화">
-        <text>
-                글자 크기:
-        </text>
-        <radio_group name="chat font size">
-                <radio_item>
-                        소
-                </radio_item>
-                <radio_item>
-                        중
-                </radio_item>
-                <radio_item>
-                        대
-                </radio_item>
-        </radio_group>
-        <text>
-                글자 색:
-        </text>
-        <color_swatch label="시스템" name="system" />
-        <color_swatch label="사용자" name="users" />
-        <color_swatch label="오브젝트" name="objects" />
-        <color_swatch label="말풍선" name="background" />
-        <text>
-                콘솔:
-        </text>
-        <spinner label="채팅창 사라짐" name="fade_chat_time" />
-        <text>
-                (초)
-        </text>
-        <spinner label="" name="max_chat_count" />
-        <text>
-                (#행)
-        </text>
-        <slider label="투명도" name="console_opacity" />
-        <text>
-                옵션:
-        </text>
-        <check_box label="전체화면 사용(재시작 필요)" name="chat_full_width_check" />
-        <check_box label="Enter 키 누른 후 채팅창 닫기" name="close_chat_on_return_check" />
-        <check_box label="화살표 키는 채팅 시 아바타를 움직임"
-             name="arrow_keys_move_avatar_check" />
-        <check_box label="채팅 시간 표시하기" name="show_timestamps_check" />
-        <text>
-                말풍선 채팅:
-        </text>
-        <check_box label="말풍선 표시하기" name="bubble_text_chat" />
-        <slider label="투명도" name="bubble_chat_opacity" />
-        <text>
-                스크립트 오류:
-        </text>
-        <check_box label="스크립트 오류 및 경고를 일반 채팅으로 표시하기"
-             name="script_errors_as_chat" />
-        <color_swatch label="색" name="script_error" />
-</panel>
diff --git a/linden/indra/newview/skins/xui/ko/panel_settings_im.xml b/linden/indra/newview/skins/xui/ko/panel_settings_im.xml
deleted file mode 100644
index 985f2f6..0000000
--- a/linden/indra/newview/skins/xui/ko/panel_settings_im.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel name="im" title="메신저">
-        <text>
-                메신저 옵션:
-        </text>
-        <check_box label="쪽지를 이메일로 전송" name="send_im_to_email"
-             tool_tip="secondlife.com에서 이메일 주소 변경" />
-        <check_box label="채팅 기록에 쪽지 포함" name="include_im_in_chat_history" />
-        <check_box label="메신저에 채팅 시간 표시하기" name="show_timestamps_check" />
-        <text>
-                부재중 답변:
-        </text>
-</panel>
diff --git a/linden/indra/newview/skins/xui/ko/panel_settings_msgbox.xml b/linden/indra/newview/skins/xui/ko/panel_settings_msgbox.xml
deleted file mode 100644
index 6924e8b..0000000
--- a/linden/indra/newview/skins/xui/ko/panel_settings_msgbox.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel label="팝업" name="popups" title="팝업">
-        <text>
-                팝업 차단:
-        </text>
-        <button label="팝업 보기" name="enable_popup" />
-        <text>
-                허용된 팝업:
-        </text>
-        <button label="나중에 알림&apos; 초기화…" name="reset_dialogs_btn" />
-</panel>
diff --git a/linden/indra/newview/skins/xui/ko/panel_settings_network.xml b/linden/indra/newview/skins/xui/ko/panel_settings_network.xml
deleted file mode 100644
index 30d2f8c..0000000
--- a/linden/indra/newview/skins/xui/ko/panel_settings_network.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel name="network" title="네트워크">
-        <text>
-                최대 대역폭:
-        </text>
-        <slider label="" name="max_bandwidth" />
-        <text>
-                kbps (kilobits per second)
-        </text>
-        <text>
-                디스크 캐시 크기:
-        </text>
-        <radio_group name="disk cache">
-                <radio_item>
-                        50MB
-                </radio_item>
-                <radio_item>
-                        200MB
-                </radio_item>
-                <radio_item>
-                        500MB
-                </radio_item>
-                <radio_item>
-                        1000MB
-                </radio_item>
-        </radio_group>
-        <button label="캐시 비우기" name="clear_cache" />
-        <text>
-                프록시 구성:
-        </text>
-        <check_box label="프록시 사용" name="proxy_enabled"
-             tool_tip="프록시 구성 지정" />
-        <text>
-                프록시:
-        </text>
-        <line_editor name="proxy_address" tool_tip="사용할 프록시 이름 또는 IP 주소" />
-        <text>
-                포트:
-        </text>
-        <line_editor name="proxy_port" tool_tip="사용할 프록시의 포트 번호" />
-        <text>
-                양말:
-        </text>
-        <radio_group name="socks_4_5">
-                <radio_item>
-                        양말 v4
-                </radio_item>
-                <radio_item>
-                        양말 v5
-                </radio_item>
-        </radio_group>
-        <text>
-                프록시 없음:
-        </text>
-        <line_editor name="proxy_exclusions"
-             tool_tip="다음에 대해 프록시를 사용하지 않을 이름 또는 IP 주소" />
-</panel>
diff --git a/linden/indra/newview/skins/xui/ko/panel_settings_web.xml b/linden/indra/newview/skins/xui/ko/panel_settings_web.xml
deleted file mode 100644
index b60b43c..0000000
--- a/linden/indra/newview/skins/xui/ko/panel_settings_web.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel name="web" title="웹">
-        <check_box label="외부 웹 브라우저 사용(Firefox, Safari, Internet Explorer)"
-             name="external_browser_check"
-             tool_tip="도움말, 웹 링크 등의 경우 외부 웹 브라우저를 사용하십시오.\n전체 화면을 실행 중인 경우에는 권장되지 않습니다." />
-        <text>
-                프라우저 홈페이지:
-        </text>
-        <line_editor name="home_page"
-             tool_tip="세컨드라이프 브라우저를 열 때 처음으로 방문하는 웹 페이지" />
-        <text>
-                프록시 구성:
-        </text>
-        <check_box label="내부 웹 브라우저에 대해 프록시 사용" name="proxy_enabled"
-             tool_tip="내부 웹 브라우저에 대한 프록시 구성 지정" />
-        <text>
-                프록시:
-        </text>
-        <line_editor name="proxy_address" tool_tip="사용할 프록시 이름 또는 IP 주소" />
-        <text>
-                포트:
-        </text>
-        <line_editor name="proxy_port" tool_tip="사용할 프록시의 포트 번호" />
-        <text>
-                양말:
-        </text>
-        <radio_group name="socks_4_5">
-                <radio_item>
-                        양말 v4
-                </radio_item>
-                <radio_item>
-                        양말 v5
-                </radio_item>
-        </radio_group>
-        <text>
-                다음 프록시 없음:
-        </text>
-        <line_editor name="proxy_exclusions"
-             tool_tip="다음에 대해 프록시를 사용하지 않을 이름 또는 IP 주소" />
-        <check_box
-             label="오브젝트에서 웹 페이지 표시(시험용, 컴퓨터를 다시 시작해야 함)"
-             name="web_pages_on_prims_check" />
-        <text>
-                트러스트된 사이트:
-(로그인하여 보기)
-        </text>
-        <button label="추가" name="add_trusted" />
-        <line_editor name="trusted_site_entry" tool_tip="신용 목록에 추가할 사이트" />
-        <button label="제거" name="rem_trusted" />
-</panel>
diff --git a/linden/indra/newview/skins/xui/ko/panel_speaker_controls.xml b/linden/indra/newview/skins/xui/ko/panel_speaker_controls.xml
index 66948e9..f98eb94 100644
--- a/linden/indra/newview/skins/xui/ko/panel_speaker_controls.xml
+++ b/linden/indra/newview/skins/xui/ko/panel_speaker_controls.xml
@@ -3,10 +3,12 @@
         <string name="moderator_label">

                 (진행자)

         </string>

-        <layout_stack name="">

+        <layout_stack name="panels">

                 <layout_panel name="moderation_mode_panel">

                         <combo_box name="moderation_mode">

-                                음성 제어

+                                <combo_item name="ModeratedVoice" value="moderated">

+                                  음성 제어

+                                </combo_item>

                         </combo_box>

                 </layout_panel>

                 <layout_panel name="moderate_chat_panel">

diff --git a/linden/indra/newview/skins/xui/zh/floater_critical.xml b/linden/indra/newview/skins/xui/zh/floater_critical.xml
index 47d9e91..de628aa 100644
--- a/linden/indra/newview/skins/xui/zh/floater_critical.xml
+++ b/linden/indra/newview/skins/xui/zh/floater_critical.xml
@@ -2,9 +2,6 @@
 <floater name="modal container" title=" ">
         <button label="继续" label_selected="继续" name="Continue" />
         <button label="取消" label_selected="取消" name="Cancel" />
-        <text name="tos_title">
-                紧急信息
-        </text>
         <text name="tos_heading">
                 请仔细阅读下列信息。
         </text>
diff --git a/linden/indra/newview/skins/xui/zh/floater_friends.xml b/linden/indra/newview/skins/xui/zh/floater_friends.xml
deleted file mode 100644
index d79cc3f..0000000
--- a/linden/indra/newview/skins/xui/zh/floater_friends.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="friends" title="伙伴&quot;">
-        <scroll_list name="friend_list"
-             tool_tip="当点击选择多位好友时，按住shift键或者control键">
-                <column label="名字" name="friend_name" />
-        </scroll_list>
-        <panel name="rights_container">
-                <text name="friend_name_label">
-                        选择变更权利的朋友...
-                </text>
-                <check_box label="我的在线状态可见" name="online_status_cb"
-                     tool_tip="在朋友的好友列表或呼叫卡中设置我的在线状态是否对该朋友可见" />
-                <check_box label="我在地图中的位置可见" name="map_status_cb"
-                     tool_tip="设置该好友是否对我在地图中的位置可见" />
-                <check_box label="可以修改我的东东" name="modify_status_cb"
-                     tool_tip="设置该好友是否可以修改我的东东" />
-                <text name="process_rights_label">
-                        正在处理权力变更...
-                </text>
-        </panel>
-        <button label="档案..." name="profile_btn"
-             tool_tip="显示图片，社团以及其它信息" />
-        <button label="提供闪电传送..." name="offer_teleport_btn"
-             tool_tip="为此有人提供一次闪电传运到你现在所在地址。" />
-        <button label="添加..." name="add_btn" tool_tip="为一个用户提供友情卡。" />
-        <button label="付款..." name="pay_btn" tool_tip="馈赠林登元(L$)至这位朋友" />
-        <button label="移除e..." name="remove_btn"
-             tool_tip="将此人从你的友人列表中清除" />
-        <button label="即时通..." name="im_btn" tool_tip="打开即时消息单元" />
-        <button label="同意修改权利..." name="grant_btn"
-             tool_tip="允许此位用户来改进你的物体。" />
-        <button label="废除修改的权利..." name="revoke_btn"
-             tool_tip="允许此位用户来改进你的物体。" />
-</floater>
diff --git a/linden/indra/newview/skins/xui/zh/floater_groups.xml b/linden/indra/newview/skins/xui/zh/floater_groups.xml
deleted file mode 100644
index de227f2..0000000
--- a/linden/indra/newview/skins/xui/zh/floater_groups.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="groups" title="社团">
-        <text name="groupdesc">
-                粗体字显示的是你目前正在活动的社团。
-        </text>
-        <text name="groupcount">
-                你属于[COUNT]个社团(最大数量为[MAX]).
-        </text>
-        <button label="激活" label_selected="激活" name="Activate" />
-        <button label="信息" label_selected="信息" name="Info" />
-        <button label="离开" label_selected="离开" name="Leave" />
-        <button label="创造" label_selected="创造" name="Create" />
-        <button label="搜索..." label_selected="搜索..." name="Search..." />
-        <button label="关闭" label_selected="关闭" name="Close" />
-</floater>
diff --git a/linden/indra/newview/skins/xui/zh/floater_preview_new_landmark.xml b/linden/indra/newview/skins/xui/zh/floater_preview_new_landmark.xml
deleted file mode 100644
index 0b1239a..0000000
--- a/linden/indra/newview/skins/xui/zh/floater_preview_new_landmark.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="Linden Land, Da Boom (155, 136, 35)"
-     title="  Linden Land, Da Boom (155, 136, 35)">
-        <button label="闪电传送" label_selected="" name="Teleport btn" />
-        <button label="在地图中显示" label_selected="" name="Show on Map btn" />
-        <button label="放弃" label_selected="" name="Discard btn" />
-        <text type="string" length="1" name="desc txt">
-                描述:
-        </text>
-</floater>
diff --git a/linden/indra/newview/skins/xui/zh/floater_rate.xml b/linden/indra/newview/skins/xui/zh/floater_rate.xml
deleted file mode 100644
index 1873576..0000000
--- a/linden/indra/newview/skins/xui/zh/floater_rate.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

-<floater name="rate" title="你的杰斯卡 林登等级">

-        <radio_group name="behavior">

-                <radio_item type="string" length="1" name="Positive">

-                        Positive

-                </radio_item>

-                <radio_item type="string" length="1" name="No Rating">

-                        No Rating

-                </radio_item>

-        </radio_group>

-        <radio_group name="appearance">

-                <radio_item type="string" length="1" name="Positive">

-                        Positive

-                </radio_item>

-                <radio_item type="string" length="1" name="No Rating">

-                        No Rating

-                </radio_item>

-        </radio_group>

-        <radio_group name="building">

-                <radio_item type="string" length="1" name="Positive">

-                        Positive

-                </radio_item>

-                <radio_item type="string" length="1" name="No Rating">

-                        No Rating

-                </radio_item>

-        </radio_group>

-        <button label="OK" label_selected="OK" name="OK" />

-        <button label="取消" label_selected="取消" name="Cancel" />

-        <text type="string" length="1" name="Overall behavior:">

-                所有的行为:

-        </text>

-        <text type="string" length="1" name="Skill at appearance (clothing and attachments):">

-                外表的技能(衣服和附属饰品):

-        </text>

-        <text type="string" length="1" name="Skill at building:">

-                创建建筑物的能力:

-        </text>

-        <text type="string" length="1" name="Message:">

-                信息:

-        </text>

-        <text type="string" length="1" name="cost">

-                花费: L$[COST]更改等级约定.  总共收费: L$[TOTAL].

-        </text>

-</floater>

diff --git a/linden/indra/newview/skins/xui/zh/menu_viewer.xml b/linden/indra/newview/skins/xui/zh/menu_viewer.xml
index 1178367..ea8610f 100644
--- a/linden/indra/newview/skins/xui/zh/menu_viewer.xml
+++ b/linden/indra/newview/skins/xui/zh/menu_viewer.xml
@@ -14,7 +14,6 @@
                 <menu_item_call label="拍摄快照" name="Take Snapshot" />

                 <menu_item_call label="快照存至电脑硬盘" name="Snapshot to Disk" />

                 <menu_item_separator label="-----------" name="separator4" />

-                <menu_item_call label="播放/暂停硬盘上的电影" name="Start/Stop Movie to Disk" />

                 <menu label="Set Window Size" name="Set Window Size">

                         <tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~" />

                         <menu_item_call label="320x240" name="320x240" />

@@ -134,6 +133,7 @@
                 <menu_item_separator label="-----------" name="separator3" />

                 <menu_item_call label="设成离开状态" name="Set Away" />

                 <menu_item_call label="设成繁忙模式" name="Set Busy" />

+                <menu_item_call label="停止所有动画" name="Stop All Animations" />

                 <menu_item_separator label="-----------" name="separator4" />

                 <menu_item_call label="帐户历史纪录..." name="Account History..." />

                 <menu_item_call label="管理我的帐户..." name="Manage My Account..." />

@@ -180,7 +180,6 @@
                 <menu_item_call label="链接" name="Link" />

                 <menu_item_call label="解除链接" name="Unlink" />

                 <menu_item_separator label="-----------" name="separator4" />

-                <menu_item_call label="停止所有动画" name="Stop All Animations" />

                 <menu_item_separator label="-----------" name="separator5" />

                 <menu_item_call label="聚焦于选择" name="Focus on Selection" />

                 <menu_item_call label="按所选比例缩放" name="Zoom to Selection" />

diff --git a/linden/indra/newview/skins/xui/zh/panel_music_remote.xml b/linden/indra/newview/skins/xui/zh/panel_music_remote.xml
deleted file mode 100644
index 3e9db0c..0000000
--- a/linden/indra/newview/skins/xui/zh/panel_music_remote.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel name="music_remote">
-        <text type="string" length="1" name="text">
-                音乐控制
-        </text>
-        <button label="" label_selected="" name="stop_btn" tool_tip="停止播放媒体" />
-        <button label="" label_selected="" name="play_btn" tool_tip="播放媒体流" />
-        <button label="" label_selected="" name="pause_btn" tool_tip="停止媒体流" />
-        <volume_slider name="volume_slider" tool_tip="使用这个滑动浮标调整音量" />
-</panel>
diff --git a/linden/indra/newview/skins/xui/zh/panel_preferences_graphics2.xml b/linden/indra/newview/skins/xui/zh/panel_preferences_graphics2.xml
deleted file mode 100644
index 8683fff..0000000
--- a/linden/indra/newview/skins/xui/zh/panel_preferences_graphics2.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel label="Graphics Detail" name="Display panel 3">
-        <text type="string" length="1" name="text">
-                阴影:
-        </text>
-        <check_box label="应用放大地图和闪亮感" name="bumpshiny" />
-        <check_box label="激活水中波纹" name="ripple" />
-        <check_box label="化身最高级程序" name="avatarvp" />
-        <text type="string" length="1" name="Avatar Rendering:">
-                化身表现:
-        </text>
-        <radio_group name="Avatar Appearance">
-                <radio_item type="string" length="1" name="Normal">
-                        Normal
-                </radio_item>
-                <radio_item type="string" length="1" name="Bump">
-                        Bump Mapped
-                </radio_item>
-                <radio_item type="string" length="1" name="Cloth">
-                        Bump Mapped &amp; Cloth
-                </radio_item>
-        </radio_group>
-        <text type="string" length="1" name="Lighting Detail:">
-                照明细节:
-        </text>
-        <radio_group name="lighting detail radio">
-                <radio_item type="string" length="1" name="SunMoon">
-                        Sun and moon only
-                </radio_item>
-                <radio_item type="string" length="1" name="LocalLights">
-                        Nearby local lights
-                </radio_item>
-        </radio_group>
-        <text type="string" length="1" name="Terrain Detail:">
-                地形细节:
-        </text>
-        <radio_group name="terrain detail radio">
-                <radio_item type="string" length="1" name="0">
-                        低
-                </radio_item>
-                <radio_item type="string" length="1" name="2">
-                        高
-                </radio_item>
-        </radio_group>
-        <text type="string" length="1" name="Object Mesh Detail:">
-                对象循环细节:
-        </text>
-        <text type="string" length="1" name="Flexible Mesh Detail:">
-                灵活的网孔细节:
-        </text>
-        <text type="string" length="1" name="Tree Mesh Detail:">
-                树木网格细节:
-        </text>
-        <text type="string" length="1" name="Avatar Mesh Detail:">
-                化身咬合细节:
-        </text>
-</panel>
diff --git a/linden/indra/newview/skins/xui/zh/panel_preferences_graphics3.xml b/linden/indra/newview/skins/xui/zh/panel_preferences_graphics3.xml
deleted file mode 100644
index b17dbfb..0000000
--- a/linden/indra/newview/skins/xui/zh/panel_preferences_graphics3.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel label="Adv. Graphics" name="Display panel 2">
-        <text type="string" length="1" name="Filtering:">
-                过滤:
-        </text>
-        <check_box label="异性过滤(激活该功能时会影响速度)" name="ani" />
-        <spinner label="微克:" name="gamma" />
-        <text type="string" length="1" name="(brightness, lower is brighter)">
-                (亮度, 数字越小亮度越大, 0=使用默认)
-        </text>
-        <spinner label="夜晚亮度:" name="nighttime_brightness" />
-        <text type="string" length="1" name="(higher is brighter, 1.0 is default)">
-                (越高越亮,默认为1.0)
-        </text>
-        <text type="string" length="1" name="AGP Graphics Card:">
-                AGP图像卡:
-        </text>
-        <check_box label="激活AGP (如果使用AGP图像显卡速度会更快)" name="agp"
-             tool_tip="如果您是在使用标准PCI的显卡，启动此项可能会降低性能，并占用更多的内存。" />
-        <text type="string" length="1" name="Graphics Card Memory:">
-                图像卡记忆空间:
-        </text>
-        <radio_group name="video card memory radio">
-                <radio_item type="string" length="1" name="radio">
-                        16MB
-                </radio_item>
-                <radio_item type="string" length="1" name="radio2">
-                        32MB
-                </radio_item>
-                <radio_item type="string" length="1" name="radio3">
-                        64MB
-                </radio_item>
-                <radio_item type="string" length="1" name="radio4">
-                        128MB
-                </radio_item>
-                <radio_item type="string" length="1" name="radio5">
-                        256MB
-                </radio_item>
-                <radio_item type="string" length="1" name="radio6">
-                        512MB
-                </radio_item>
-        </radio_group>
-        <spinner label="浓雾可见率:" name="fog" />
-        <spinner label="最大点数:" name="particles" />
-        <spinner label="最高装备额度:" name="comp limit"
-             tool_tip="显示最近被修改装备的数量。" />
-        <text type="string" length="1" name="(lower is faster)">
-                (越低越快)
-        </text>
-</panel>
diff --git a/linden/indra/newview/skins/xui/zh/panel_settings_chat.xml b/linden/indra/newview/skins/xui/zh/panel_settings_chat.xml
deleted file mode 100644
index 7fd07cd..0000000
--- a/linden/indra/newview/skins/xui/zh/panel_settings_chat.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel name="chat" title="谈话">
-        <text>
-                聊天字体大小:
-        </text>
-        <radio_group name="chat font size">
-                <radio_item>
-                        小型的
-                </radio_item>
-                <radio_item>
-                        中型的
-                </radio_item>
-                <radio_item>
-                        大型的
-                </radio_item>
-        </radio_group>
-        <text>
-                聊天颜色:
-        </text>
-        <color_swatch label="系统" name="system" />
-        <color_swatch label="用户" name="users" />
-        <color_swatch label="东东" name="objects" />
-        <color_swatch label="泡沫" name="background" />
-        <text>
-                聊天控制台:
-        </text>
-        <spinner label="聊天结束后淡出" name="fade_chat_time" />
-        <text>
-                (秒)
-        </text>
-        <spinner label="" name="max_chat_count" />
-        <text>
-                (#行)
-        </text>
-        <slider label="不透明" name="console_opacity" />
-        <text>
-                聊天选项:
-        </text>
-        <check_box label="用全屏宽度聊天 (需重启)" name="chat_full_width_check" />
-        <check_box label="点击返回后关闭聊天窗口" name="close_chat_on_return_check" />
-        <check_box label="；聊天时可用箭头键移动你的化身"
-             name="arrow_keys_move_avatar_check" />
-        <check_box label="在聊天时显示时间" name="show_timestamps_check" />
-        <text>
-                泡泡聊:
-        </text>
-        <check_box label="显示聊天窗口" name="bubble_text_chat" />
-        <slider label="不透明" name="bubble_chat_opacity" />
-        <text>
-                脚本出错:
-        </text>
-        <check_box label="以聊天形式显示脚本错误和警告" name="script_errors_as_chat" />
-        <color_swatch label="颜色" name="script_error" />
-</panel>
diff --git a/linden/indra/newview/skins/xui/zh/panel_settings_im.xml b/linden/indra/newview/skins/xui/zh/panel_settings_im.xml
deleted file mode 100644
index 3f80e77..0000000
--- a/linden/indra/newview/skins/xui/zh/panel_settings_im.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel name="im" title="即时通">
-        <text>
-                即时通选项:
-        </text>
-        <check_box label="发送及时消息往 e-mail" name="send_im_to_email"
-             tool_tip="在 secondlife.com中更改你的电子邮箱地址" />
-        <check_box label="聊天记录中包含即时通信息" name="include_im_in_chat_history" />
-        <check_box label="在即时消息中显示时间" name="show_timestamps_check" />
-        <text>
-                忙碌模式的自动回复:
-        </text>
-</panel>
diff --git a/linden/indra/newview/skins/xui/zh/panel_settings_msgbox.xml b/linden/indra/newview/skins/xui/zh/panel_settings_msgbox.xml
deleted file mode 100644
index 835e436..0000000
--- a/linden/indra/newview/skins/xui/zh/panel_settings_msgbox.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel label="弹出程序" name="popups" title="弹出程序">
-        <text>
-                不显示弹出程序:
-        </text>
-        <button label="Enable this popup" name="enable_popup" />
-        <text>
-                显示弹出程序:
-        </text>
-        <button label="重置 &apos;下次显示&apos;对话..." name="reset_dialogs_btn" />
-</panel>
diff --git a/linden/indra/newview/skins/xui/zh/panel_settings_network.xml b/linden/indra/newview/skins/xui/zh/panel_settings_network.xml
deleted file mode 100644
index b3e987f..0000000
--- a/linden/indra/newview/skins/xui/zh/panel_settings_network.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel name="network" title="网络">
-        <text>
-                最大带宽:
-        </text>
-        <slider label="" name="max_bandwidth" />
-        <text>
-                kbps (每秒kb数)
-        </text>
-        <text>
-                磁盘高速缓存大小:
-        </text>
-        <radio_group name="disk cache">
-                <radio_item>
-                        50 MB
-                </radio_item>
-                <radio_item>
-                        200 MB
-                </radio_item>
-                <radio_item>
-                        500 MB
-                </radio_item>
-                <radio_item>
-                        1000 MB
-                </radio_item>
-        </radio_group>
-        <button label="清除缓存" name="clear_cache" />
-        <text>
-                代理服务器配置:
-        </text>
-        <check_box label="使用代理服务器" name="proxy_enabled"
-             tool_tip="特别设定代理服务器配置。" />
-        <text>
-                代理服务器:
-        </text>
-        <line_editor name="proxy_address" tool_tip="请输入代理服务器的名称或IP地址" />
-        <text>
-                端口：
-        </text>
-        <line_editor name="proxy_port" tool_tip="The port number of the proxy you would like to use" />
-        <text>
-                袜子：
-        </text>
-        <radio_group name="socks_4_5">
-                <radio_item>
-                        Socks v4
-                </radio_item>
-                <radio_item>
-                        Socks v5
-                </radio_item>
-        </radio_group>
-        <text>
-                没有代理:
-        </text>
-        <line_editor name="proxy_exclusions"
-             tool_tip="请输入不想使用代理服务器替换的名称或IP地址" />
-</panel>
diff --git a/linden/indra/newview/skins/xui/zh/panel_settings_web.xml b/linden/indra/newview/skins/xui/zh/panel_settings_web.xml
deleted file mode 100644
index 46334d9..0000000
--- a/linden/indra/newview/skins/xui/zh/panel_settings_web.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel name="web" title="网络">
-        <check_box label="使用外部浏览器(Firefox, Safari, IE)"
-             name="external_browser_check"
-             tool_tip="使用外部网络浏览器获得帮助, 网页链接, 等等。\n若全屏显示则不推荐使用。" />
-        <text>
-                浏览器主页:
-        </text>
-        <line_editor name="home_page" tool_tip="首次打开第二人生浏览器时的浏览页面" />
-        <text>
-                代理服务器配置:
-        </text>
-        <check_box label="内部浏览器使用代理服务器" name="proxy_enabled"
-             tool_tip="请为因特网网络浏览器指定代理服务器配置。" />
-        <text>
-                代理服务器:
-        </text>
-        <line_editor name="proxy_address" tool_tip="请输入代理服务器的名称或IP地址" />
-        <text>
-                端口：
-        </text>
-        <line_editor name="proxy_port" tool_tip="The port number of the proxy you would like to use" />
-        <text>
-                袜子：
-        </text>
-        <radio_group name="socks_4_5">
-                <radio_item>
-                        Socks v4
-                </radio_item>
-                <radio_item>
-                        Socks v5
-                </radio_item>
-        </radio_group>
-        <text>
-                对以下内容不使用代理:
-        </text>
-        <line_editor name="proxy_exclusions"
-             tool_tip="请输入不想使用代理服务器替换的名称或IP地址" />
-        <check_box label="在东东上显示网页 (实验性功能, 需要重启)"
-             name="web_pages_on_prims_check" />
-        <text>
-                安全地址：
-（登陆察看）
-        </text>
-        <button label="添加" name="add_trusted" />
-        <line_editor name="trusted_site_entry" tool_tip="添加到安全名单中的网络地址" />
-        <button label="移除" name="rem_trusted" />
-</panel>
diff --git a/linden/indra/newview/skins/xui/zh/panel_toolbar.xml b/linden/indra/newview/skins/xui/zh/panel_toolbar.xml
index 372a2f5..74f8128 100644
--- a/linden/indra/newview/skins/xui/zh/panel_toolbar.xml
+++ b/linden/indra/newview/skins/xui/zh/panel_toolbar.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel name="toolbar">
+        <layout_stack name="toolbar_stack">
         <button label="即时通" name="im_btn" tool_tip="用即时通联系你的朋友。" />
         <button label="聊天" name="chat_btn"
              tool_tip="与附近的人交谈.点击交谈之后点击历史去查找交谈记录。" />
@@ -16,4 +17,5 @@
              tool_tip="你周围区域的地图。 (Ctrl-Shift-M)" />
         <button label="地图" name="map_btn" tool_tip="全部完整地图。 (Ctrl-M)" />
         <button label="库存" name="inventory_btn" tool_tip="你的东东栏。 (Ctrl-I)" />
+  </layout_stack>
 </panel>