Second Life viewer sources 1.22.0-RC

21 files changed, 186 insertions, 208 deletions

diff --git a/linden/indra/newview/skins/default/xui/en-us/alerts.xml b/linden/indra/newview/skins/default/xui/en-us/alerts.xml
index 20b04db..44b9141 100644
--- a/linden/indra/newview/skins/default/xui/en-us/alerts.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/alerts.xml
@@ -473,7 +473,7 @@ Do you wish to proceed?
         <alert modal="true" name="JoinGroupCannotAfford">
                 <message name="message">
                         Joining this group costs L$[COST].
-You do not have a sufficient balance to join this group.
+You do not have enough L$ to join this group.
                 </message>
         </alert>
         <alert modal="true" name="LandBuyPass">
@@ -725,21 +725,13 @@ The outfit folder contains no clothing, body parts, or attachments.
                         You can not wear that item because it has not yet loaded. Please try again in a minute.
                 </message>
         </alert>
-        <alert modal="true" name="MustHaveAccountToLogInNoLinks">
-                <message name="message">
-                        You must have an account to connect to [SECOND_LIFE].
-                </message>
-                <option name="OK">
-                        Close
-                </option>
-        </alert>
         <alert modal="true" name="MustHaveAccountToLogIn">
                 <message name="message">
 Oops! Something was left blank.
 You need to enter both the First and Last name of your avatar.
 
 You need an account to enter [SECOND_LIFE]. Would you like to create one now?
-</message>
+                </message>
                 <option name="OK">
                         Create a new account
                 </option>
@@ -1592,12 +1584,12 @@ Expected [VALIDS]
         </alert>
         <alert modal="true" name="InsufficientFundsToUploadFile">
                 <message name="message">
-                        Insufficient L$ to upload file: the price is L$[COST], your balance is L$[BALANCE]
+                        Not enough L$ to upload file: the price is L$[COST], your balance is L$[BALANCE]
                 </message>
         </alert>
         <alert modal="true" name="InsufficientFundsToFinishUpload">
                 <message name="message">
-                        Insufficient L$ to finish uploading [FILE]: the price is L$[COST], your balance is L$[BALANCE]
+                        Not enough L$ to finish uploading [FILE]: the price is L$[COST], your balance is L$[BALANCE]
                 </message>
         </alert>
         <alert modal="true" name="CannotUploadReason">
@@ -2559,7 +2551,7 @@ You can change your mind later.
         </alert>
         <alert modal="true" name="NotEnoughCurrency">
                 <message name="message">
-                        [NAME] L$ [PRICE] You don&apos;t have enough currency to do that.
+                        [NAME] L$ [PRICE] You don&apos;t have enough L$ to do that.
                 </message>
         </alert>
         <alert modal="true" name="GrantedModifyRights">
@@ -2986,6 +2978,20 @@ Download to your Applications folder?
                         Cancel
                 </option>
         </alert>
+        <alert modal="true" name="WebLaunchReleaseNotes">
+                <message name="message">
+                        View the [SECOND_LIFE] Release Notes?
+                </message>
+                <ignore name="ignore">
+                        When launching web browser to view the Release Notes
+                </ignore>
+                <option name="Gotopage">
+                        OK
+                </option>
+                <option name="Cancel">
+                        Cancel
+                </option>
+        </alert>
         <alert modal="true" name="ReturnToOwner">
                 <message name="message">
                         Are you sure you want to return the selected
@@ -4262,9 +4268,9 @@ http://secondlife.com/corporate/cs.php
 
 All reported abuses of the Terms of Service and Community Standards 
 are investigated and resolved. You can view the incident 
-resolution on the Police Blotter at:
+resolution on the on the Incident Report at:
 
-http://secondlife.com/community/blotter.php
+http://secondlife.com/support/incidentreport.php
                 </message>
         </alert>
         <alert modal="true" name="HelpReportAbuseEmailEO">
@@ -4359,7 +4365,7 @@ Entering an accurate description helps us file and process bug reports.
         <alert modal="true" name="HelpReportAbuseContainsCopyright">
                 <message name="message">
                         Dear Resident,
-
+ 
 You appear to be reporting intellectual property infringement. Please make sure you are reporting it correctly:
 
 (1) The Abuse Process. You may submit an abuse report if you believe a Resident is exploiting the Second Life permissions system, for example, by using CopyBot or similar copying tools, to infringe intellectual property rights. The Abuse Team investigates and issues appropriate disciplinary action for behavior that violates the Second Life Community Standards or Terms of Service. However, the Abuse Team does not handle and will not respond to requests to remove content from the Second Life world.
@@ -4369,8 +4375,9 @@ You appear to be reporting intellectual property infringement. Please make sure
 If you still wish to continue with the abuse process, please close this window and finish submitting your report.  You may need to select the specific category 'CopyBot or Permissions Exploit'.
 
 Thank you,
-
-Linden Lab</message>
+ 
+Linden Lab
+                </message>
         </alert>
         <alert modal="true" name="FailedRequirementsCheck">
                 <message name="message">
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_about.xml b/linden/indra/newview/skins/default/xui/en-us/floater_about.xml
index 91e0f00..f50d1ad 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_about.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_about.xml
@@ -14,6 +14,7 @@
   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)
+  DBus/dbus-glib Copyright (C) 2002, 2003  CodeFactory AB / Copyright (C) 2003, 2004 Red Hat, Inc.
   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.
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_about_land.xml b/linden/indra/newview/skins/default/xui/en-us/floater_about_land.xml
index fc1b747..0b4b37c 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_about_land.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_about_land.xml
@@ -481,13 +481,17 @@ Go to World menu > About Land or select another parcel to show its details.
                         </text>
                         <check_box bottom="-40" enabled="true" follows="left|top" font="SansSerifSmall"
                              height="16" initial_value="false" label="Edit Terrain" left="14"
-                             mouse_opaque="true" name="edit land check" radio_style="false" width="268" />
+                             mouse_opaque="true" name="edit land check" radio_style="false"
+                             tool_tip="If checked, anyone can terraform your land. It is best to leave this unchecked, as you can always edit your own land."
+                             width="268" />
                         <check_box bottom="-60" enabled="true" follows="left|top" font="SansSerifSmall"
                              height="16" initial_value="false" label="Create Landmarks" left="14"
                              mouse_opaque="true" name="check landmark" radio_style="false" width="268" />
                         <check_box bottom="-80" enabled="true" follows="left|top" font="SansSerifSmall"
                              height="16" initial_value="false" label="Fly" left="14" mouse_opaque="true"
-                             name="check fly" radio_style="false" width="268" />
+                             name="check fly" radio_style="false"
+                             tool_tip="If checked, Residents can fly on your land. If unchecked, they can only fly into and over your land."
+                             width="268" />
                         <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="178"
@@ -538,11 +542,13 @@ Go to World menu > About Land or select another parcel to show its details.
                         </text>
                         <check_box bottom="-120" enabled="true" follows="left|top" font="SansSerifSmall"
                              height="16" initial_value="false" label="Safe (no damage)" left="14"
-                             mouse_opaque="true" name="check safe" radio_style="false" width="268" />
+                             mouse_opaque="true" name="check safe" radio_style="false"
+                             tool_tip="If checked, sets the land to Safe, disabling damage combat. If cleared, damage combat is enabled."
+                             width="268" />
                         <check_box bottom="-120" enabled="true" follows="left|top" font="SansSerifSmall"
-                             height="16" initial_value="false" label="Restrict Pushing" left="178"
+                             height="16" initial_value="false" label="No Pushing" left="178"
                              mouse_opaque="true" name="PushRestrictCheck" radio_style="false"
-                             tool_tip="llPushObject will only work through parcel owner scripts or on scripts where the pushee is the script owner."
+                             tool_tip="Prevents scripts from pushing. Checking this option may be useful for preventing disruptive behavior on your land."
                              width="119" />
                         <check_box bottom="-140" enabled="true" follows="left|top" font="SansSerifSmall"
                              height="16" initial_value="false"
@@ -622,7 +628,7 @@ Go to World menu > About Land or select another parcel to show its details.
                         <button bottom="-303" enabled="true" follows="left|top" font="SansSerifSmall"
                              halign="center" height="16" label="Set" label_selected="Set" left="236"
                              mouse_opaque="true" name="Set" scale_image="true"
-                             tool_tip="Set the landing point to your avatar&apos;s location. It must be inside this land parcel."
+                             tool_tip="Sets the landing point where visitors arrive. Sets to your avatar&apos;s location inside this parcel."
                              width="50" />
                         <button bottom="-303" enabled="true" follows="left|top" font="SansSerifSmall"
                              halign="center" height="16" label="Clear" label_selected="Clear" left="291"
@@ -650,10 +656,10 @@ Go to World menu > About Land or select another parcel to show its details.
                                 </combo_item>
                         </combo_box>
                         <string name="push_restrict_text">
-                                Restrict Pushing
+                                No Pushing
                         </string>
                         <string name="push_restrict_region_text">
-                                Restrict Pushing (Region Override)
+                                No Pushing (Region Override)
                         </string>
                 </panel>
                 <panel border="true" bottom="-349" enabled="true" follows="left|top|right|bottom"
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_beacons.xml b/linden/indra/newview/skins/default/xui/en-us/floater_beacons.xml
new file mode 100644
index 0000000..0fb1aaf
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_beacons.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

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

+     width="250" height="225"

+     name="beacons" title="Beacons"

+     rect_control="FloaterBeaconsRect" control_name="BeaconAlwaysOn">

+        <panel bottom="10" follows="left|top|right|bottom" left="10" width="230" height="200" name="beacons_panel">

+        <check_box bottom_delta="-33" follows="left|top" left="0" name="touch_only" label="Scripted Objects with Touch Only" control_name="scripttouchbeacon" />

+    <check_box bottom_delta="-20" follows="left|top" left="0" name="scripted" label="Scripted Objects" control_name="scriptsbeacon" />

+    <check_box bottom_delta="-20" follows="left|top" left="0" name="physical" label="Physical Objects" control_name="physicalbeacon" />

+    <check_box bottom_delta="-20" follows="left|top" left="0" name="sounds" label="Sound Sources" control_name="soundsbeacon" />

+    <check_box bottom_delta="-20" follows="left|top" left="0" name="particles" label="Particle Sources" control_name="particlesbeacon" />

+    <check_box bottom_delta="-20" follows="left|top" left="0" name="highlights" label="Render Highlights" control_name="renderhighlights" />

+    <check_box bottom_delta="-20" follows="left|top" left="0" name="beacons" label="Render Beacons" control_name="renderbeacons" />

+        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

+             bottom_delta="-30" drop_shadow_visible="true" enabled="true" follows="left|top"

+             font="SansSerifSmall" h_pad="0" halign="left" height="12" left="5"

+             mouse_opaque="true" name="beacon_width_label" v_pad="0" width="128">

+                Beacon Width:

+        </text>

+        <slider bottom_delta="-20" can_edit_text="false" enabled="true" width="185" height="16" mouse_opaque="true"

+             decimal_digits="0" increment="1" initial_val="1" left="30" min_val="1.0" max_val="16.0"

+             name="beacon_width" show_text="true" value="1" control_name="DebugBeaconLineWidth"/>    

+        </panel>

+</floater>

diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_chat_history.xml b/linden/indra/newview/skins/default/xui/en-us/floater_chat_history.xml
index 6bd4424..4be65b6 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_chat_history.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_chat_history.xml
@@ -46,14 +46,16 @@
                              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"
+           track_bottom="true" 
                              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"
+      <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="ChatHistoryTextColor"
-                             text_readonly_color="ChatHistoryTextColor" width="300" word_wrap="true" />
+           track_bottom="true" 
+                             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">
         <string name="gesture_label">Gestures</string>
@@ -72,6 +74,9 @@
                                         <flyout_button_item value="say" name="say_item">
                                                 Say
                                         </flyout_button_item>
+                                        <flyout_button_item value="whisper" name="whisper_item">
+                                                Whisper
+                                        </flyout_button_item>
                                 </flyout_button>
                         </panel>
                 </layout_panel>
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_instant_message.xml b/linden/indra/newview/skins/default/xui/en-us/floater_instant_message.xml
index cce06b5..37eb644 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_instant_message.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_instant_message.xml
@@ -56,6 +56,7 @@
              follows="left|top|right|bottom" font="SansSerif" height="221" left="5"
              max_length="2147483647" mouse_opaque="true" name="im_history"
              text_color="ChatHistoryTextColor"
+       track_bottom="true" 
              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"
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_instant_message_ad_hoc.xml b/linden/indra/newview/skins/default/xui/en-us/floater_instant_message_ad_hoc.xml
index eea285c..54e4cee 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_instant_message_ad_hoc.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_instant_message_ad_hoc.xml
@@ -48,6 +48,7 @@
                              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"

+           track_bottom="true" 

                              text_color="ChatHistoryTextColor"

                              text_readonly_color="ChatHistoryTextColor" width="490" word_wrap="true" />

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

diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_instant_message_group.xml b/linden/indra/newview/skins/default/xui/en-us/floater_instant_message_group.xml
index be18c7e..45504e1 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_instant_message_group.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_instant_message_group.xml
@@ -64,6 +64,7 @@
                              follows="left|top|right|bottom" font="SansSerif" left="4"

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

                              text_color="ChatHistoryTextColor"

+           track_bottom="true" 

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

                              word_wrap="true" />

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

diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_pie_object.xml b/linden/indra/newview/skins/default/xui/en-us/menu_pie_object.xml
index c5a04ce..df9b2a0 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_pie_object.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_pie_object.xml
@@ -53,11 +53,11 @@
                         </menu_item_call>
                         <menu_item_separator />
                         <menu_item_separator />
-                        <menu_item_separator />
                         <menu_item_call enabled="false" label="Mute" mouse_opaque="true" name="Object Mute">
                                 <on_click function="Object.Mute" />
                                 <on_enable function="Object.EnableMute" />
                         </menu_item_call>
+                        <menu_item_separator />
                         <menu_item_call enabled="true" label="Inspect" mouse_opaque="true" name="Object Inspect">
                                 <on_click function="Object.Inspect" />
                                 <on_enable function="Object.EnableInspect" />
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
index bbe9fbd..2728962 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
@@ -262,13 +262,11 @@
                 </menu_item_check>
                 <menu_item_check bottom="-132" enabled="true" height="19" label="Local Chat" left="0"
                      mouse_opaque="true" name="Chat History" shortcut="control|H" width="211">
-                        <on_click function="ShowFloater" userdata="chat history" />
-                        <on_check function="FloaterVisible" userdata="chat history" />
+                     <on_click function="View.Communicate"/>
                 </menu_item_check>
                 <menu_item_check bottom="-151" enabled="true" height="19" label="Communicate" left="0"
                      mouse_opaque="true" name="Instant Message" shortcut="control|T" width="211">
-                        <on_click function="ShowFloater" userdata="im" />
-                        <on_check function="FloaterVisible" userdata="im" />
+                        <on_click function="View.Communicate"/>
                 </menu_item_check>
                 <menu_item_call bottom="-170" enabled="true" height="19" label="Inventory" left="0"
                      mouse_opaque="true" name="Inventory" shortcut="control|I" width="211">
@@ -356,87 +354,19 @@
                         <on_click function="View.HighlightTransparent" userdata="" />
                         <on_check function="View.CheckHighlightTransparent" />
                 </menu_item_check>
-                <menu_item_check bottom="-384" enabled="true" height="19" label="Beacons Always On" left="0"
-                     mouse_opaque="true" name="Beacons Always On"
-                     width="211">
-                        <on_click function="ToggleControl" userdata="BeaconAlwaysOn" />
-                        <on_check control="BeaconAlwaysOn" />
-                </menu_item_check>
-                <menu bottom="-554" create_jump_keys="true" drop_shadow="true" enabled="true"
-                     height="117" label="Beacons" left="0" mouse_opaque="false" name="Beacons"
-                     opaque="true" tear_off="true" width="129">
-                        <menu_item_check bottom="-29" enabled="true" height="19"
-                             label="Scripted Objects with Touch Only" left="0" mouse_opaque="true"
-                             name="Scripted Objects With Touch Only" width="129">
-                                <on_click function="View.ToggleBeacon" userdata="scripttouchbeacon" />
-                                <on_check function="View.CheckBeaconEnabled" userdata="scripttouchbeacon" />
-                        </menu_item_check>
-                        <menu_item_check bottom="-48" enabled="true" height="19" label="Scripted Objects" left="0"
-                             mouse_opaque="true" name="Scripted Objects" width="129">
-                                <on_click function="View.ToggleBeacon" userdata="scriptsbeacon" />
-                                <on_check function="View.CheckBeaconEnabled" userdata="scriptsbeacon" />
-                        </menu_item_check>
-                        <menu_item_check bottom="-67" enabled="true" height="19" label="Physical Objects" left="0"
-                             mouse_opaque="true" name="Physical Objects" width="129">
-                                <on_click function="View.ToggleBeacon" userdata="physicalbeacon" />
-                                <on_check function="View.CheckBeaconEnabled" userdata="physicalbeacon" />
-                        </menu_item_check>
-                        <menu_item_check bottom="-86" enabled="true" height="19" label="Sound Sources" left="0"
-                             mouse_opaque="true" name="Sound Sources" width="129">
-                                <on_click function="View.ToggleBeacon" userdata="soundsbeacon" />
-                                <on_check function="View.CheckBeaconEnabled" userdata="soundsbeacon" />
-                        </menu_item_check>
-                        <menu_item_check bottom="-105" enabled="true" height="19" label="Particle Sources" left="0"
-                             mouse_opaque="true" name="Particle Sources" width="129">
-                                <on_click function="View.ToggleBeacon" userdata="particlesbeacon" />
-                                <on_check function="View.CheckBeaconEnabled" userdata="particlesbeacon" />
-                        </menu_item_check>
-                        <menu_item_separator bottom="-113" enabled="true" height="8" label="-----------" left="0"
-                             mouse_opaque="true" name="separator" width="129" />
-                        <menu_item_check bottom="-121" enabled="true" height="19" label="Render Highlights" left="0"
-                             mouse_opaque="true" name="Render Highlights" width="129">
-                                <on_click function="View.ToggleBeacon" userdata="renderhighlights" />
-                                <on_check function="View.CheckBeaconEnabled" userdata="renderhighlights" />
-                        </menu_item_check>
-                        <menu_item_check bottom="-140" enabled="true" height="19" label="Render Beacons" left="0"
-                             mouse_opaque="true" name="Render Beacons" width="129">
-                                <on_click function="View.ToggleBeacon" userdata="renderbeacons" />
-                                <on_check function="View.CheckBeaconEnabled" userdata="renderbeacons" />
-                        </menu_item_check>
-                        <menu_item_separator bottom="-159" enabled="true" height="8" label="-----------" left="0"
-                             mouse_opaque="true" name="separator2" width="129" />
-                        <menu_item_check bottom="-167" enabled="true" height="19" label="Hide Particles" left="0"
-                             mouse_opaque="true" name="Hide Particles" width="129">
-                                <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" 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" 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" 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" 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" 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" label="32" left="0" mouse_opaque="true"
-                                     name="Beacon Width 32" width="188">
-                                        <on_click function="View.BeaconWidth" userdata="32" />
-                                </menu_item_call>
-                        </menu>
-                </menu>
-                <menu_item_check bottom="-441" enabled="true" height="19" label="Show HUD Attachments" left="0"
-                     mouse_opaque="true" name="Show HUD Attachments" shortcut="alt|shift|H"
-                     width="211">
+    <menu_item_check bottom="-384" enabled="true" height="19" label="Beacons" left="0"
+       mouse_opaque="true" name="beacons" width="211" shortcut="control|alt|shift|N">
+      <on_click function="ShowFloater" userdata="beacons" />
+      <on_check function="FloaterVisible" userdata="beacons" />
+    </menu_item_check>
+    <menu_item_check bottom="-384" enabled="true" height="19" label="Hide Particles" left="0"
+          mouse_opaque="true" name="Hide Particles" width="129" shortcut="control|alt|shift|=">
+        <on_click function="View.ToggleRenderType" userdata="hideparticles" />
+        <on_check function="View.CheckRenderType" userdata="hideparticles" />
+    </menu_item_check>
+    <menu_item_check bottom="-441" enabled="true" height="19" label="Show HUD Attachments" left="0"
+       mouse_opaque="true" name="Show HUD Attachments" shortcut="alt|shift|H"
+       width="211">
                         <on_click function="View.ShowHUDAttachments" userdata="" />
                         <on_check function="View.CheckHUDAttachments" />
                 </menu_item_check>
@@ -792,10 +722,6 @@
                 </menu_item_call>
                 <menu_item_separator bottom="-102" enabled="true" height="8" label="-----------" left="0"
                      mouse_opaque="true" name="separator2" width="166" />
-                <menu_item_call bottom="-121" enabled="true" height="19" label="Scripting Guide..." left="0"
-                     mouse_opaque="true" name="Scripting Guide..." width="166">
-                        <on_click function="PromptShowFile" userdata="WebLaunchLSLGuide,lsl_guide.html" />
-                </menu_item_call>
                 <menu_item_call bottom="-140" enabled="true" height="19" label="Scripting Portal..." left="0"
                      mouse_opaque="true" name="Scripting Portal..." width="166">
                         <on_click function="PromptShowURL"
diff --git a/linden/indra/newview/skins/default/xui/en-us/notify.xml b/linden/indra/newview/skins/default/xui/en-us/notify.xml
index 6af19ee..63396af 100644
--- a/linden/indra/newview/skins/default/xui/en-us/notify.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/notify.xml
@@ -374,7 +374,7 @@ You cannot fly here.
         </notify>
         <notify name="PushRestricted" tip="false" unique="true">
                 <message name="message">
-                        This land is &apos;llPushObject Restricted&apos;.
+                        This land is &apos;No Pushing&apos;.
 You cannot push others here unless you own the land.
                 </message>
         </notify>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_chat_bar.xml b/linden/indra/newview/skins/default/xui/en-us/panel_chat_bar.xml
index 95604ff..ce6d35b 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_chat_bar.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_chat_bar.xml
@@ -17,15 +17,20 @@
         <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="shout" name="shout_item">
+                        Shout
+                </flyout_button_item>
                 <flyout_button_item value="say" name="say_item">
                         Say
                 </flyout_button_item>
-                <flyout_button_item value="shout" name="shout_item">
-                        Shout
+                <flyout_button_item value="whisper" name="whisper_item">
+                        Whisper
                 </flyout_button_item>
         </flyout_button>
         <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>
         </combo_box>
-  <string name="gesture_label">Gestures</string>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml
index b2bb65f..24753d1 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml
@@ -8,9 +8,9 @@
              mouse_opaque="false" name="text_box" v_pad="0" width="128">
                 Chat Font Size:
         </text>
-        <radio_group bottom="-40" control_name="ChatFontSize" draw_border="true" enabled="true"
+        <radio_group bottom="-40" draw_border="true" enabled="true"
              follows="left|top" height="30" left="148" mouse_opaque="true"
-             name="chat font size" width="331">
+             name="chat_font_size" width="331">
                 <radio_item type="string" length="1" bottom="-24" enabled="true" height="16" left="0" mouse_opaque="true"
                      name="radio" width="98">
                         Small
@@ -39,12 +39,12 @@
              enabled="true" follows="left|top" height="56" label="Others" left_delta="48"
              mouse_opaque="true" name="agent" width="44" />
         <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-108"
-             can_apply_immediately="true" color="0.6 0.6 1 1" control_name="IMChatColor"
+             can_apply_immediately="true" color="0.6 0.6 1 1"
              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="-108"
              can_apply_immediately="true" color="0.8 1 1 1"
-             control_name="SystemChatColor" enabled="true" follows="left|top"
+             enabled="true" follows="left|top"
              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="-108"
@@ -59,17 +59,17 @@
              name="objects" width="44" />
         <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-165"
              can_apply_immediately="true" color="0.7 0.9 0.7 1"
-             control_name="llOwnerSayChatColor" enabled="true" follows="left|top"
+             enabled="true" follows="left|top"
              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="-165"
              can_apply_immediately="true" color="0 0 0 1"
-             control_name="BackgroundChatColor" enabled="true" follows="left|top"
+             enabled="true" follows="left|top"
              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="-165"
              can_apply_immediately="true" color="0.6 0.6 1 1"
-             control_name="HTMLLinkColor" enabled="true" follows="left|top" height="56"
+             enabled="true" follows="left|top" height="56"
              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="-185" drop_shadow_visible="true" enabled="true" follows="left|top"
@@ -100,7 +100,7 @@
              width="80">
                 (seconds)
         </text>
-        <spinner bottom_delta="-6" control_name="ConsoleMaxLines" decimal_digits="0"
+        <spinner bottom_delta="-6" decimal_digits="0"
              enabled="true" follows="left|top" height="16" increment="1"
              initial_val="10" left="340" max_val="50" min_val="1" mouse_opaque="true"
              name="max_chat_count" width="60" />
@@ -127,20 +127,20 @@
              mouse_opaque="false" name="text_box6" v_pad="0" width="135">
                 Chat Options:
         </text>
-        <check_box bottom_delta="-10" control_name="CloseChatOnReturn" enabled="true"
+        <check_box bottom_delta="-10" enabled="true"
              follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
              label="Close chat bar after hitting return" left="148" mouse_opaque="true"
              name="close_chat_on_return_check" radio_style="false" width="237" />
-        <check_box bottom_delta="-20" control_name="ArrowKeysMoveAvatar" enabled="true"
+        <check_box bottom_delta="-20" enabled="true"
              follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
              label="Arrow keys always move avatar when chatting" left="148"
              mouse_opaque="true" name="arrow_keys_move_avatar_check" radio_style="false"
              width="237" />
-        <check_box bottom_delta="-20" control_name="ChatShowTimestamps" enabled="true"
+        <check_box bottom_delta="-20" enabled="true"
              follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
              label="Show timestamps in Local Chat" left="148" mouse_opaque="true"
              name="show_timestamps_check" radio_style="false" width="237" />
-        <check_box bottom_delta="-20" control_name="PlayTypingAnim" enabled="true"
+        <check_box bottom_delta="-20" enabled="true"
              follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
              label="Play typing animation when chatting" left="148" mouse_opaque="true"
              name="play_typing_animation" radio_style="false" width="237" />
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
index 67d3307..3648ce6 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
@@ -2,20 +2,21 @@
 <panel border="true" bottom="-409" enabled="true" follows="left|top|right|bottom"
      height="408" label="General" left="102" mouse_opaque="true"
      name="general_panel" width="517">
-        <combo_box allow_text_entry="true" bottom="-24" enabled="true" follows="left|bottom"
-             height="16" left="155" max_chars="128" mouse_opaque="true"
-             name="location_combobox" width="146">
-                <combo_item name="MyHome" value="My Home">
-                        My Home
-                </combo_item>
-                <combo_item name="MyLastLocation" value="My Last Location">
-                        My Last Location
-                </combo_item>
-        </combo_box>
-        <check_box bottom="-44" control_name="ShowStartLocation" enabled="true" follows="left|top"
-             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="-45" draw_border="false" follows="left|bottom" height="40" left="151"
+             name="default_start_location" width="220">
+    <radio_item bottom="-20" height="20" left="0" name="MyHome" width="50"
+                  tool_tip="Log into my home location by default.">
+      My Home
+    </radio_item>
+    <radio_item bottom="-20" height="20" left="100" name="MyLastLocation" width="50"
+                  tool_tip="Log into my last location by default.">
+      My Last Location
+    </radio_item>
+  </radio_group>
+  <check_box bottom="-44" enabled="true" follows="left|top"
+       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" />
         <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">
@@ -28,11 +29,11 @@
                         Always
                 </combo_item>
         </combo_box>
-        <check_box bottom_delta="-25" control_name="SmallAvatarNames" follows="left|top"
+        <check_box bottom_delta="-25" follows="left|top"
              font="SansSerifSmall" height="16" initial_value="true"
              label="Small Avatar Names" left="151" name="small_avatar_names_checkbox"
              width="200" />
-        <check_box bottom_delta="-18" control_name="RenderNameHideSelf" follows="left|top"
+        <check_box bottom_delta="-18" 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" />
@@ -41,16 +42,16 @@
              width="394">
                 Group Titles:
         </text>
-        <check_box bottom_delta="0" control_name="RenderHideGroupTitleAll" follows="left|top"
+        <check_box bottom_delta="0" 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"
+        <check_box bottom_delta="-18" 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"
+             can_apply_immediately="false" color="1 1 1 1"
              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="32" />
@@ -60,34 +61,34 @@
              mouse_opaque="true" name="UI Size:" v_pad="0" width="128">
                 UI Size:
         </text>
-        <slider bottom="-217" can_edit_text="true" control_name="UIScaleFactor"
+        <slider bottom="-217" can_edit_text="true"
              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"
+             name="ui_scale_slider" show_text="true" value="1" width="256" />
+        <check_box bottom="-236" enabled="true" follows="left|top"
              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" decimal_digits="0" enabled="true"
+        <spinner bottom="-260" 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="MiniMapRotate" enabled="true" follows="left|top"
+        <check_box bottom="-286" enabled="true" follows="left|top"
              font="SansSerifSmall" height="16" initial_value="false"
              label="Rotate Mini-Map" left="151" mouse_opaque="true"
              name="rotate_mini_map_checkbox" radio_style="false" width="256" />
-        <check_box bottom="-304" control_name="NotifyMoneyChange" enabled="true"
+        <check_box bottom="-304" enabled="true"
              follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
              label="Notify when Linden dollars (L$) spent or received" left="151"
              mouse_opaque="true" name="notify_money_change_checkbox" radio_style="false"
              width="256" />
-        <check_box bottom="-322" control_name="UseDefaultColorPicker" enabled="true"
+        <check_box bottom="-322" enabled="true"
              follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
              label="Use default system color picker" left="151" mouse_opaque="true"
              name="use_system_color_picker_checkbox" radio_style="false"
              tool_tip="Use the default system color picker instead of the one built into Second Life."
              width="256" />
-        <check_box bottom="-340" control_name="ShowSearchBar" enabled="true" follows="left|top"
+        <check_box bottom="-340" enabled="true" follows="left|top"
              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"
@@ -151,7 +152,7 @@
                         Never send
                 </combo_item>
         </combo_box>
-        <combo_box allow_text_entry="true" bottom="-382" control_name="Language" enabled="true"
+        <combo_box allow_text_entry="true" bottom="-382" 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">
@@ -182,7 +183,7 @@
                         Español (Spanish) - Beta
                 </combo_item>
         </combo_box>
-        <check_box bottom="-400" control_name="LanguageIsPublic" enabled="true"
+        <check_box bottom="-400" enabled="true"
              follows="left|top" font="SansSerifSmall" height="16" hidden="false"
              initial_value="false" label="Share language with objects" left="151"
              mouse_opaque="true" name="language_is_public"
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml
index d3174af..add894b 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml
@@ -26,15 +26,15 @@
              height="16" initial_value="false" label="Send IM to Email ([EMAIL])"
              left="148" mouse_opaque="true" name="send_im_to_email" radio_style="false"
              width="350" />
-        <check_box bottom="-65" control_name="IMInChatHistory" enabled="true" follows="left|top"
+        <check_box bottom="-65" enabled="true" follows="left|top"
              font="SansSerifSmall" height="16" initial_value="false"
              label="Include IM in Local Chat" left="148" mouse_opaque="true"
              name="include_im_in_chat_history" radio_style="false" width="237" />
-        <check_box bottom="-85" control_name="IMShowTimestamps" enabled="true" follows="left|top"
+        <check_box bottom="-85" enabled="true" follows="left|top"
              font="SansSerifSmall" height="16" initial_value="false"
              label="Show timestamps in IM" left="148" mouse_opaque="true"
              name="show_timestamps_check" radio_style="false" width="237" />
-    <check_box bottom="-105" control_name="ChatOnlineNotification" enabled="true"
+    <check_box bottom="-105" enabled="true"
          follows="left|top" font="SansSerifSmall" height="16"
          initial_value="false" label="Show online Friend notifications" left="148"
          mouse_opaque="true" name="friends_online_notify_checkbox"
@@ -54,33 +54,33 @@
              mouse_opaque="false" name="text_box4" v_pad="0" width="128">
                 Logging Options:
         </text>
-        <check_box bottom="-225" control_name="LogInstantMessages" enabled="true"
+        <check_box bottom="-225" enabled="true"
              follows="left|top" font="SansSerifSmall" height="16"
              initial_value="false" label="Save a log of IM on my computer" left="148"
              mouse_opaque="true" name="log_instant_messages" radio_style="false"
              width="237" />
-        <check_box bottom="-245" control_name="IMLogTimestamp" enabled="true"
+        <check_box bottom="-245" enabled="true"
              follows="left|top" font="SansSerifSmall" height="16"
              initial_value="false" label="Show timestamps in IM log" left="168"
              mouse_opaque="true" name="log_instant_messages_timestamp" radio_style="false"
              width="217" />
-        <check_box bottom="-265" control_name="LogShowHistory" enabled="true" follows="left|top"
+        <check_box bottom="-265" enabled="true" follows="left|top"
              font="SansSerifSmall" height="16" initial_value="false"
              label="Show the end of last IM conversation" left="168" mouse_opaque="true"
              name="log_show_history" radio_style="false" width="217" />
-        <check_box bottom="-285" control_name="LogChat" enabled="true" follows="left|top"
+        <check_box bottom="-285" enabled="true" follows="left|top"
              font="SansSerifSmall" height="16" initial_value="false" label="Save a log of Local Chat on my computer"
              left="148" mouse_opaque="true" name="log_chat" radio_style="false"
              width="237" />
-        <check_box bottom="-305" control_name="LogChatTimestamp" enabled="true" follows="left|top"
+        <check_box bottom="-305" enabled="true" follows="left|top"
              font="SansSerifSmall" height="16" initial_value="false"
              label="Show timestamps in Local Chat log" left="168" mouse_opaque="true"
              name="log_chat_timestamp" radio_style="false" width="217" />
-        <check_box bottom="-325" control_name="LogChatIM" enabled="true" follows="left|top"
+        <check_box bottom="-325" enabled="true" follows="left|top"
              font="SansSerifSmall" height="16" initial_value="false"
              label="Show incoming IM in Local Chat log" left="168" mouse_opaque="true"
              name="log_chat_IM" radio_style="false" width="217" />
-        <check_box bottom="-345" control_name="LogTimestampDate" enabled="true" follows="left|top"
+        <check_box bottom="-345" enabled="true" follows="left|top"
              font="SansSerifSmall" height="16" initial_value="false"
              label="Include date with timestamps" left="148" mouse_opaque="true"
              name="log_date_timestamp" radio_style="false" width="237" />
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_input.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_input.xml
index 23e357f..a2114af 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_input.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_input.xml
@@ -14,21 +14,21 @@
              mouse_opaque="true" name=" Mouse Sensitivity:" v_pad="0" width="128">
                 Mouse Sensitivity:
         </text>
-        <slider_bar bottom="-26" control_name="MouseSensitivity" enabled="true" follows="left|top"
+        <slider_bar bottom="-26" enabled="true" follows="left|top"
              height="16" increment="0.25" initial_val="2" left="276" max_val="15"
-             min_val="0" mouse_opaque="true" name="Mouse Sensitivity" width="128" />
-        <check_box bottom="-44" control_name="InvertMouse" enabled="true" follows="left|top"
+             min_val="0" mouse_opaque="true" name="mouse_sensitivity" width="128" />
+        <check_box bottom="-44" enabled="true" follows="left|top"
              font="SansSerifSmall" height="16" label="Invert Mouse" left="148"
-             mouse_opaque="true" name="invert mouse" radio_style="false" width="128" />
+             mouse_opaque="true" name="invert_mouse" radio_style="false" width="128" />
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom="-74" drop_shadow_visible="true" enabled="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
              mouse_opaque="true" name=" Auto Fly Options:" v_pad="0" width="266">
                 Auto Fly Options:
         </text>
-        <check_box bottom="-80" control_name="AutomaticFly" enabled="true" follows="left|top"
+        <check_box bottom="-80" enabled="true" follows="left|top"
              font="SansSerifSmall" height="16" label="Fly/land on holding up/down"
-             left="148" mouse_opaque="true" name="automatic fly" radio_style="false"
+             left="148" mouse_opaque="true" name="automatic_fly" radio_style="false"
              width="178" />
         <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"
@@ -42,10 +42,10 @@
              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"
+        <slider bottom="-116" can_edit_text="true"
              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="DynamicCameraStrength" show_text="true" value="2"
+             mouse_opaque="true" name="dynamic_camera_strength" show_text="true" value="2"
              width="128" />
         <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"
@@ -53,31 +53,31 @@
              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"
+        <slider bottom="-140" can_edit_text="true" 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" />
+             name="zoom_time" 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"
+        <slider bottom="-164" can_edit_text="true"
              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"
+             mouse_opaque="true" name="camera_position_smoothing" show_text="true" value="2"
              width="128" />
-        <check_box bottom="-188" control_name="EditCameraMovement" enabled="true"
+        <check_box bottom="-188" 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"
+             name="edit_camera_movement" radio_style="false"
              tool_tip="Use automatic camera positioning when entering and exiting edit mode"
              width="201" />
-        <check_box bottom="-206" control_name="AppearanceCameraMovement" enabled="true"
+        <check_box bottom="-206" 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"
+             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="-228" drop_shadow_visible="true" enabled="true" follows="left|top"
@@ -85,9 +85,9 @@
              mouse_opaque="true" name="text2" v_pad="0" width="128">
                 Avatar Display Options:
         </text>
-        <check_box bottom="-232" control_name="FirstPersonAvatarVisible" enabled="true"
+        <check_box bottom="-232" enabled="true"
              follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-             label="Show Avatar in Mouselook" left="148" mouse_opaque="true" name="avfp"
+             label="Show Avatar in Mouselook" left="148" mouse_opaque="true" name="first_person_avatar_visible"
              radio_style="false" width="256" />
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom="-264" drop_shadow_visible="true" enabled="true" follows="left|top"
@@ -97,5 +97,5 @@
         </text>
         <button bottom_delta="-4" follows="left|top" font="SansSerif" height="20"
              label="Joystick Setup" left="148" mouse_opaque="true"
-             name="joystic_setup_button" width="155" />
+             name="joystick_setup_button" width="155" />
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_network.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_network.xml
index a0f0936..48da432 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_network.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_network.xml
@@ -8,7 +8,7 @@
              mouse_opaque="false" name="text_box" v_pad="0" width="200">
                 Maximum Bandwidth:
         </text>
-        <slider bottom_delta="-25" can_edit_text="true" control_name="ThrottleBandwidthKBPS"
+        <slider bottom_delta="-25" can_edit_text="true"
              decimal_digits="0" enabled="true" follows="left|top" height="15"
              increment="10" initial_val="50" left_delta="0" max_val="1500" min_val="50"
              mouse_opaque="true" name="max_bandwidth" show_text="true" value="500"
@@ -27,7 +27,7 @@
              v_pad="0" width="200">
                 Disk Cache Size:
         </text>
-        <slider bottom_delta="-25" can_edit_text="true" control_name="CacheSize"
+        <slider bottom_delta="-25" can_edit_text="true"
              decimal_digits="0" enabled="true" follows="left|top" height="15"
              increment="10" initial_val="50" left_delta="0" max_val="1000" min_val="10"
              mouse_opaque="true" name="cache_size" show_text="true" width="180" />
@@ -61,12 +61,12 @@
              font="SansSerif" halign="center" height="22" label="Reset"
              label_selected="Set" left_delta="103" mouse_opaque="true"
              name="reset_cache" scale_image="true" width="100" />
-        <check_box bottom="-173" bottom_delta="-35" control_name="ConnectionPortEnabled"
+        <check_box bottom="-173" bottom_delta="-35"
              enabled="true" follows="left|top" font="SansSerifSmall" height="16"
              initial_value="false" label="Custom Port Connection" left="12"
              mouse_opaque="true" name="connection_port_enabled" radio_style="false"
              width="256" />
-        <spinner bottom="-193" bottom_delta="-20" control_name="ConnectionPort"
+        <spinner bottom="-193" bottom_delta="-20"
              decimal_digits="0" enabled="true" follows="left|top" height="16"
              increment="1" initial_val="13000" label="Port Number:" label_width="75"
              left_delta="20" max_val="13050" min_val="13000" mouse_opaque="true"
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_popups.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_popups.xml
index 11d15f4..65734d6 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_popups.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_popups.xml
@@ -27,11 +27,11 @@
              width="270">
                 Offers of notecards, textures and landmarks:
         </text>
-        <check_box bottom_delta="-25" control_name="AutoAcceptNewInventory" enabled="true"
+        <check_box bottom_delta="-25" enabled="true"
              follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
              label="Automatically accept" left="40" mouse_opaque="true"
              name="accept_new_inventory" radio_style="false" width="270" />
-        <check_box bottom_delta="-20" control_name="ShowNewInventory" enabled="true"
+        <check_box bottom_delta="-20" enabled="true"
              follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
              label="Automatically view after accepting" left="40" mouse_opaque="true"
              name="show_new_inventory" radio_style="false" width="270" />
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_voice.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_voice.xml
index 2d36853..4b9ec5c 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_voice.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_voice.xml
@@ -9,7 +9,7 @@
              name="voice_unavailable" tab_stop="false" width="450" word_wrap="true">

                 Voice Chat Is Not Available

         </text_editor>

-        <check_box bottom_delta="0" control_name="EnableVoiceChat" enabled="true"

+        <check_box bottom_delta="0" enabled="true"

              follows="left|top" font="SansSerifSmall" height="16" initial_value="false"

              label="Enable voice chat" left="8" mouse_opaque="true"

              name="enable_voice_check" radio_style="false" width="200" />

@@ -36,7 +36,7 @@
              name="voice_chat_description" tab_stop="false" width="450" word_wrap="true">

                 Push-to-Talk mode lets you control when your voice is transmitted. When in toggle mode, press and release the push-to-talk trigger to switch your microphone on and off. When not in toggle mode, the microphone is active only when the trigger is held down.

         </text_editor>

-        <check_box bottom_delta="-20" control_name="PushToTalkToggle" enabled="true"

+        <check_box bottom_delta="-20" enabled="true"

              follows="left|top" font="SansSerifSmall" height="16" initial_value="false"

              label="Use Push-to-Talk in toggle mode" left_delta="0" mouse_opaque="true"

              name="push_to_talk_toggle_check" radio_style="false" width="200" />

@@ -48,7 +48,7 @@
                 Push-to-Talk trigger:

         </text>

         <line_editor border_drop_shadow_visible="false" border_visible="false" bottom_delta="-20"

-             control_name="PushToTalkButton" drop_shadow_visible="true" enabled="false"

+             drop_shadow_visible="true" enabled="false"

              follows="top|left" font="SansSerifSmall" halign="right" height="19"

              left_delta="0" max_length="254" mouse_opaque="false" name="modifier_combo"

              width="280" />

@@ -63,7 +63,7 @@
              left="28" name="privacy_heading" width="445">

                 Privacy Options

         </text>

-        <check_box bottom_delta="-20" control_name="VoiceCallsFriendsOnly" enabled="true"

+        <check_box bottom_delta="-20" enabled="true"

              follows="left|top" font="SansSerifSmall" height="16" initial_value="false"

              label="Only accept voice calls from people on My Friends list"

              left_delta="20" mouse_opaque="true" name="voice_call_friends_only_check"

@@ -76,6 +76,6 @@
              font="SansSerifSmall" height="35" hide_border="true" hide_scrollbar="true"

              left="28" max_length="65535" mouse_opaque="true"

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

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

+                NOTE: Running the Device Settings will temporarily disconnect you from Voice Chat, and changes you make will be immediately applied.

         </text_editor>

 </panel>

diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_web.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_web.xml
index b708bf3..ed13e8f 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_web.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_web.xml
@@ -30,8 +30,8 @@
              width="128">
                 Cookies:
         </text>
-        <check_box bottom_delta="-7" control_name="CookiesEnabled" enabled="true"
-             follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+        <check_box bottom_delta="-7" enabled="true" follows="left|top" 
+                 font="SansSerifSmall" height="16" initial_value="false"
              label="Accept cookies from sites" left="140" mouse_opaque="true"
              name="cookies_enabled" radio_style="false" width="256" />
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
@@ -41,7 +41,7 @@
              width="128">
                 Web Proxy:
         </text>
-        <check_box bottom_delta="-7" control_name="BrowserProxyEnabled" enabled="true"
+        <check_box bottom_delta="-7" enabled="true"
              follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
              label="Enable Web Proxy" left="140" mouse_opaque="true"
              name="web_proxy_enabled" radio_style="false" width="256" />
@@ -56,7 +56,7 @@
              height="20" left="217" name="web_proxy_editor"
              tool_tip="The name or IP address of the proxy you would like to use"
              width="200" />
-        <spinner bottom_delta="-25" control_name="BrowserProxyPort" decimal_digits="0"
+        <spinner bottom_delta="-25" decimal_digits="0"
              enabled="true" follows="left|top" height="16" increment="1"
              initial_val="80" label="Port Number:" label_width="75" left="140"
              max_val="12000" min_val="10" mouse_opaque="true" name="web_proxy_port"
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_status_bar.xml b/linden/indra/newview/skins/default/xui/en-us/panel_status_bar.xml
index 614f1f9..63d2ca3 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_status_bar.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_status_bar.xml
@@ -75,7 +75,7 @@
              halign="center" height="18" image_selected="status_no_push.tga"
              image_unselected="status_no_push.tga" label="" label_selected="" left="521"
              mouse_opaque="true" name="restrictpush" scale_image="false"
-             tool_tip="llPushObject restricted" visible="false" width="24" />
+             tool_tip="No Pushing" visible="false" width="24" />
         <button bottom="-22" enabled="true" follows="right|bottom" font="SansSerif"
              halign="center" height="18" image_selected="status_no_voice.tga"
              image_unselected="status_no_voice.tga" label="" label_selected=""