Merge branch 'sl-base-1.22' into next

Conflicts:
	linden/indra/newview/English.lproj/InfoPlist.strings
	linden/indra/newview/skins/default/xui/en-us/panel_chat_bar.xml

25 files changed, 226 insertions, 263 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 25d3a84..42d9782 100644
--- a/linden/indra/newview/skins/default/xui/en-us/alerts.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/alerts.xml
@@ -541,7 +541,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">
@@ -733,7 +733,7 @@ to set its Landing Point.
         </alert>
         <alert modal="true" name="PromptRecipientEmail">
                 <message name="message">
-                        Please enter the recipient&apos;s email address.
+                        Please enter a valid email address for the recipient(s).
                 </message>
         </alert>
         <alert modal="true" name="PromptSelfEmail">
@@ -793,21 +793,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>
@@ -1478,7 +1470,29 @@ chat, or interact with the world.
                         Cancel
                 </option>
         </alert>
-        <alert modal="true" name="InvalidUUID">
+    <alert modal="true" name="EjectAvatarNoBan">
+        <message name="message">
+            Eject this avatar from your land?
+        </message>
+        <option name="Eject">
+            Eject
+        </option>
+        <option name="Cancel">
+            Cancel
+        </option>
+    </alert>
+    <alert modal="true" name="EjectAvatarFullnameNoBan">
+        <message name="message">
+            Eject [AVATAR_NAME] from your land?
+        </message>
+        <option name="Eject">
+            Eject
+        </option>
+        <option name="Cancel">
+            Cancel
+        </option>
+    </alert>
+    <alert modal="true" name="InvalidUUID">
                 <message name="message">
                         Not a valid UUID.
                 </message>
@@ -1660,12 +1674,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">
@@ -2652,7 +2666,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">
@@ -4369,9 +4383,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 Incident Report at:
 
-http://secondlife.com/community/blotter.php
+http://secondlife.com/support/incidentreport.php
                 </message>
         </alert>
         <alert modal="true" name="HelpReportAbuseEmailEO">
@@ -4466,7 +4480,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.
@@ -4476,8 +4490,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..f4422b2 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
@@ -7,13 +7,14 @@
              follows="left|top|right|bottom" font="SansSerifSmall" height="168" left="6"
   max_length="65536" mouse_opaque="true" name="credits_editor" width="458"
   word_wrap="true">
-  Second Life is brought to you by Philip, Tessa, Andrew, Cory, James, Ben, Char, Charlie, Colin, Dan, Daniel, Doug, Eric, Hamlet, Haney, Eve, Hunter, Ian, Jeff, Jennifer, Jim, John, Lee, Mark, Peter, Phoenix, Richard, Robin, Xenon, Steve, Tanya, Eddie, Avi, Frank, Bruce, Aaron, Alice, Bob, Debra, Eileen, Helen, Janet, Louie, Leviathania, Stefan, Ray, Kevin, Tom, Mikeb, MikeT, Burgess, Elena, Tracy, Bill, Todd, Ryan, Zach, Sarah, Nova, Tim, Stephanie, Michael, Evan, Nicolas, Catherine, Rachelle, Dave, Holly, Bub, Kelly, Magellan, Ramzi, Don, Sabin, Jill, Rheya, Jeska, Torley, Kona, Callum, Charity, Ventrella, Jack, Vektor, Iris, Chris, Nicole, Mick, Reuben, Blue, Babbage, Yedwab, Deana, Lauren, Brent, Pathfinder, Chadrick, Altruima, Jesse, Teeny, Monroe, Icculus, David, Tess, Lizzie, Patsy, Isaac, Lawrence, Cyn, Bo, Gia, Annette, Marius, Tbone, Jonathan, Karen, Ginsu, Satoko, Yuko, Makiko, Thomas, Harry, Seth, Alexei, Brian, Guy, Runitai, Ethan, Data, Cornelius, Kenny, Swiss, Zero, Natria, Wendy, Stephen, Teeple, Thumper, Lucy, Dee, Mia, Liana, Warren, Branka, Aura, beez, Milo, Hermia, Red, Thrax, Joe, Sally, Magenta, Mogura, Paul, Jose, Rejean, Henrik, Lexie, Amber, Logan, Xan, Nora, Morpheus, Donovan, Leyla, MichaelFrancis, Beast, Cube, Bucky, Joshua, Stryfe, Harmony, Teresa, Claudia, Walker, Glenn, Fritz, Fordak, June, Cleopetra, Jean, Ivy, Betsy, Roosevelt, Spike, Ken, Which, Tofu, Chiyo, Rob, Zee, dustin, George, Del, Matthew, Cat, Jacqui, Lightfoot, Adrian, Viola, Alfred, Noel, Irfan, Sunil, Yool, Rika, Jane, Xtreme, Frontier, a2, Neo, Siobhan, Yoz, Justin, Elle, Qarl, Benjamin, Isabel, Gulliver, Everett, Christopher, Izzy, Stephany, Garry, Sejong, Sean, Tobin, Iridium, Meta, Anthony, Jeremy, JP, Jake, Maurice, Madhavi, Leopard, Kyle, Joon, Kari, Bert, Belinda, Jon, Kristi, Bridie, Pramod, KJ, Socrates, Maria, Ivan, Aric, Yamasaki, Adreanne, Jay, MitchK, Ceren, Coco, Durl, Jenny, Periapse, Kartic, Storrs, Lotte, Sandy, Rohn, Colossus, Zen, BigPapi, Brad, Pastrami, Kurz, Mani, Neuro, Jaime, MJ, Rowan, Sgt, Elvis, Gecko, Samuel, Sardonyx, Leo, Bryan, Niko, Soft, Poppy, Rachel, Aki, Angelo, Banzai, Alexa, Sue, CeeLo, Bender, CG, Gillian, Pelle, Nick, Echo, Zara, Christine, Shamiran, Emma, Blake, Keiko, Plexus, Joppa, Sidewinder, Erica, Ashlei, Twilight, Kristen, Brett, Q, Enus, Simon, Bevis, Kraft, Kip, Chandler, Ron, LauraP, Ram, KyleJM, Scouse, Prospero, Melissa, Marty, Nat, Hamilton, Kend, Lordan, Jimmy, Kosmo, Seraph, Green, Ekim, Wiggo, JT, Rome, Doris, Miz, Benoc, Whump, Trinity, Patch, Kate, TJ, Bao, Joohwan, Christy, Sofia, Matias, Cogsworth, Johan, Oreh, Cheah, Angela, Brandy, Mango, Lan, Aleks, Gloria, Heidy, Mitchell, Space, Colton, Bambers, Einstein, Maggie, Malbers, Rose, Winnie, Stella, Milton, Rothman, Niall, Marin, Allison, Katie, Dawn, Katt, Dusty, Kalpana, Judy, Andrea, Ambroff, Infinity, Gail, Rico, Raymond, Yi, William, Christa, M, Teagan, Scout, Molly, Dante, Corr, Dynamike, Usi, Kaylee, Vidtuts, Lil, Danica, Sascha, Kelv, Jacob, Nya, Rodney, Brandon, Elsie, Blondin, Grant, Katrin, Nyx, Gabriel, Locklainn, Claire, Devin, Minerva, Monty, Austin, Bradford, Si, Keira, H, Caitlin, Dita, Makai, Jenn, Ann, Meredith, Clare, Joy, Praveen, Cody, Edmund, Ruthe, Sirena, Gayathri, Spider, FJ, Davidoff, Tian, Jennie, Louise, Oskar, Landon, Noelle, Jarv, Ingrid, Al, Sommer, Doc, Aria, Huin, Gray, Lili, Vir, DJ and many others.
+  Second Life is brought to you by Philip, Tessa, Andrew, Cory, James, Ben, Char, Charlie, Colin, Dan, Daniel, Doug, Eric, Hamlet, Haney, Eve, Hunter, Ian, Jeff, Jennifer, Jim, John, Lee, Mark, Peter, Phoenix, Richard, Robin, Xenon, Steve, Tanya, Eddie, Avi, Frank, Bruce, Aaron, Alice, Bob, Debra, Eileen, Helen, Janet, Louie, Leviathania, Stefan, Ray, Kevin, Tom, Mikeb, MikeT, Burgess, Elena, Tracy, Bill, Todd, Ryan, Zach, Sarah, Nova, Tim, Stephanie, Michael, Evan, Nicolas, Catherine, Rachelle, Dave, Holly, Bub, Kelly, Magellan, Ramzi, Don, Sabin, Jill, Rheya, Jeska, Torley, Kona, Callum, Charity, Ventrella, Jack, Vektor, Iris, Chris, Nicole, Mick, Reuben, Blue, Babbage, Yedwab, Deana, Lauren, Brent, Pathfinder, Chadrick, Altruima, Jesse, Teeny, Monroe, Icculus, David, Tess, Lizzie, Patsy, Isaac, Lawrence, Cyn, Bo, Gia, Annette, Marius, Tbone, Jonathan, Karen, Ginsu, Satoko, Yuko, Makiko, Thomas, Harry, Seth, Alexei, Brian, Guy, Runitai, Ethan, Data, Cornelius, Kenny, Swiss, Zero, Natria, Wendy, Stephen, Teeple, Thumper, Lucy, Dee, Mia, Liana, Warren, Branka, Aura, beez, Milo, Hermia, Red, Thrax, Joe, Sally, Magenta, Mogura, Paul, Jose, Rejean, Henrik, Lexie, Amber, Logan, Xan, Nora, Morpheus, Donovan, Leyla, MichaelFrancis, Beast, Cube, Bucky, Joshua, Stryfe, Harmony, Teresa, Claudia, Walker, Glenn, Fritz, Fordak, June, Cleopetra, Jean, Ivy, Betsy, Roosevelt, Spike, Ken, Which, Tofu, Chiyo, Rob, Zee, dustin, George, Del, Matthew, Cat, Jacqui, Lightfoot, Adrian, Viola, Alfred, Noel, Irfan, Sunil, Yool, Rika, Jane, Xtreme, Frontier, a2, Neo, Siobhan, Yoz, Justin, Elle, Qarl, Benjamin, Isabel, Gulliver, Everett, Christopher, Izzy, Stephany, Garry, Sejong, Sean, Tobin, Iridium, Meta, Anthony, Jeremy, JP, Jake, Maurice, Madhavi, Leopard, Kyle, Joon, Kari, Bert, Belinda, Jon, Kristi, Bridie, Pramod, KJ, Socrates, Maria, Ivan, Aric, Yamasaki, Adreanne, Jay, MitchK, Ceren, Coco, Durl, Jenny, Periapse, Kartic, Storrs, Lotte, Sandy, Rohn, Colossus, Zen, BigPapi, Brad, Pastrami, Kurz, Mani, Neuro, Jaime, MJ, Rowan, Sgt, Elvis, Gecko, Samuel, Sardonyx, Leo, Bryan, Niko, Soft, Poppy, Rachel, Aki, Angelo, Banzai, Alexa, Sue, CeeLo, Bender, CG, Gillian, Pelle, Nick, Echo, Zara, Christine, Shamiran, Emma, Blake, Keiko, Plexus, Joppa, Sidewinder, Erica, Ashlei, Twilight, Kristen, Brett, Q, Enus, Simon, Bevis, Kraft, Kip, Chandler, Ron, LauraP, Ram, KyleJM, Scouse, Prospero, Melissa, Marty, Nat, Hamilton, Kend, Lordan, Jimmy, Kosmo, Seraph, Green, Ekim, Wiggo, JT, Rome, Doris, Miz, Benoc, Whump, Trinity, Patch, Kate, TJ, Bao, Joohwan, Christy, Sofia, Matias, Cogsworth, Johan, Oreh, Cheah, Angela, Brandy, Mango, Lan, Aleks, Gloria, Heidy, Mitchell, Space, Colton, Bambers, Einstein, Maggie, Malbers, Rose, Winnie, Stella, Milton, Rothman, Niall, Marin, Allison, Katie, Dawn, Katt, Dusty, Kalpana, Judy, Andrea, Ambroff, Infinity, Gail, Rico, Raymond, Yi, William, Christa, M, Teagan, Scout, Molly, Dante, Corr, Dynamike, Usi, Kaylee, Vidtuts, Lil, Danica, Sascha, Kelv, Jacob, Nya, Rodney, Brandon, Elsie, Blondin, Grant, Katrin, Nyx, Gabriel, Locklainn, Claire, Devin, Minerva, Monty, Austin, Bradford, Si, Keira, H, Caitlin, Dita, Makai, Jenn, Ann, Meredith, Clare, Joy, Praveen, Cody, Edmund, Ruthe, Sirena, Gayathri, Spider, FJ, Davidoff, Tian, Jennie, Louise, Oskar, Landon, Noelle, Jarv, Ingrid, Al, Sommer, Doc, Aria, Huin, Gray, Lili, Vir, DJ, Yang, T, Simone, Maestro, Scott, Charlene, Quixote, Amanda, Susan, Zed, Anne, Enkidu, Esbee, Joroan, Katelin, Roxie, Tay, Scarlet, Kevin, Johnny, Wolfgang, Andren, Bob, Howard, Merov, Rand, Ray, Michon, Newell, Galen, Dessie, Les and many others.
 
-  Thank you to the following residents for helping to ensure that this is the best version yet: Aminom Marvin, ava ganache, Balthazar Fouroux, CrystalShard Foo, Davec Horsforth, Drew Dwi, Ellla McMahon, Gellan Glenelg, Harleen Gretzky, istephanija munro, Iustinian Tomsen, JC Glimmer, Joeseph Albanese, kelly young, Latif Khalifa, Lex Neva, McCabe Maxsted, Michi Lumin, moni duettmann, Moon Metty, motor loon, Opensource Obscure, Sky Hye, Soap Clawtooth, velveeta biedermann, zeebster colasanti
+  Thank you to the following residents for helping to ensure that this is the best version yet: afon shepherd, Aimee Trescothick, Alexandrea Fride, Alissa Sabre, Amber DeCuir, Asuka Neely, Auron Forcella, Blue Revolution, Bocan Undercroft, Boroondas Gupte, Brandon Shinobu, Bri Gufler, Buckaroo Mu, Celierra Darling, Christos Atlantis, Coder Kas, Cummere Mayo, dakota schwade, Dirk Talamasca, Dizzy Banjo, Drew Dwi, Duckling Kwak, Ellla McMahon, Erikah Jameson, Erinyse Planer, Eyana Yohkoh, Ezian Ecksol, Faron Karu, Fenoe Lowey, Fox Hwasung, Francisca Biedermann, Gally Young, Gellan Glenelg, Geneko Nemeth, Glenn Rotaru, Hagar Qinan, Harleen Gretzky, Holger Gilruth, hotrodjohnny gears, IAm Zabelin, Inigo Catteneo, Iustinian Tomsen, Jacek Antonell, James Benedek, Jim Kupferberg, Joeseph Albanese, JPT62089 Agnon, Kardargo Adamczyk, Kirstenlee Cinquetti, Latif Khalifa, lea Parnall, Lex Neva, Lillith Anatine, Lilly Zenovka, Lim Catteneo, Lindal Kidd, Mark Rosenbaum, MasterJ Chaplin, McCabe Maxsted, Melvin Starbrook, Meni Kaiousei, Mero Collas, Minakothegothicgeisha Kamachi, Moon Metty, neofilo aabye, Neutron Chesnokov, Nomad Ingwer, norritt Xi, Opensource Obscure, Oracle Weatherwax, Ourasi Ferraris, Pabl0 Roffo, Peyton Aleixandre, Phli Foxchase, Psi Merlin, r2d2 Wunderlich, Regi Yifu, Saijanai Kuhn, Sandor Balczo, Sarkan Dreamscape, Scree Raymaker, Sedona Mills, Selena Beale, Sheet Spotter, Shibari Twine, Silver Key, Simon Kline, SLB Wirefly, Stacy Wombat, Sugarcult Dagger, Tayra Dagostino, Tetsuryu Vlodovic, ThaBiGGDoGG Richez, Timo Gufler, tx Oh, wayfinder wishbringer, Wizzytoe McCullough, Wundur Primbee, Yann Dufaux, Yuu Nakamichi, Aminom Marvin, Andred Qinan, arminasx saiman, caroline apollo, Iskar Ariantho, Jenika Connolly, Maghnus Balogh, Nefertiti Nefarious, RodneyLee Jessop
 
   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.
@@ -32,7 +33,7 @@
   Voice chat Audio coding: Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C)
 
 
-  We can only see a short distance ahead, but we can see plenty there that needs to be done. --Alan Turing</text_editor>
+  I get by with a little help from my friends. --Richard Starkey</text_editor>
 
         <text_editor bottom_delta="174" embedded_items="false"
              follows="left|top|right|bottom" font="SansSerif" height="238" left="6"
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..87aea05 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
@@ -467,7 +467,7 @@ Go to World menu > About Land or select another parcel to show its details.
                                 <column name="online_status" width="-1" />
                                 <column name="name" dynamicwidth="true" label="Name" />
                                 <column name="count" label="Count" width="70" />
-                                <column label="Most Recent" width="160" />
+                                <column name="mostrecent" label="Most Recent" width="160" />
                         </name_list>
                 </panel>
                 <panel border="true" bottom="-349" enabled="true" follows="left|top|right|bottom"
@@ -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_animation_preview.xml b/linden/indra/newview/skins/default/xui/en-us/floater_animation_preview.xml
index f925abd..4038f4f 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_animation_preview.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_animation_preview.xml
@@ -182,8 +182,8 @@
              name="playback_slider" right="290" show_text="false" />
         <text bottom="250" follows="top|left" left="10" name="bad_animation_text">
                 Unable to read animation file.
-        
-        We recommend BVH files exported from Poser 4.
+
+We recommend BVH files exported from Poser 4.
         </text>
         <button bottom="10" follows="bottom|right" height="20" label="Cancel" name="cancel_btn"
              right="290" width="123" />
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..e698878
--- /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="BeaconsEnabled">
+        <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 a12cb2b..d32832c 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
@@ -74,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_group.xml b/linden/indra/newview/skins/default/xui/en-us/floater_instant_message_group.xml
index f59017e..af60c11 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
@@ -49,7 +49,7 @@
                         <button bottom_delta="0" enabled="false" follows="left|top" halign="right" height="20"
                              image_overlay="icn_voice-call-start.tga" image_overlay_alignment="left"
                              label="Join Call" left_delta="85" name="start_call_btn" pad_right="12"
-                             width="92" />
+                             width="80" />
                         <button bottom_delta="0" follows="left|top" halign="right" height="20"
                              image_overlay="icn_voice-call-end.tga" image_overlay_alignment="left"
                              label="End Call" left_delta="0" name="end_call_btn" pad_right="12"
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_lagmeter.xml b/linden/indra/newview/skins/default/xui/en-us/floater_lagmeter.xml
index 08c6b53..71c0e60 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_lagmeter.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_lagmeter.xml
@@ -57,7 +57,7 @@
         </text>
         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom="-120" drop_shadow_visible="true" follows="left|top"
-             font="SansSerif" h_pad="0" halign="left" height="16" left="85"
+             font="SansSerif" h_pad="0" halign="left" height="16" left="110"
              mouse_opaque="true" name="server_text" right="-10" v_pad="0">
                 Normal
         </text>
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 086f059..6c88b83 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
@@ -292,12 +292,13 @@
     </menu_item_check>
     <menu_item_check name="Instant Message" label="Communicate"
                      shortcut="control|T">
-      <on_click function="ShowFloater" userdata="im" />
-      <on_check function="FloaterVisible" userdata="im" />
+      <on_click function="View.Communicate"/>
+      <on_check function="FloaterVisible" userdata="communicate" />
     </menu_item_check>
     <menu_item_call name="Inventory" label="Inventory"
                     shortcut="control|I">
       <on_click function="ShowFloater" userdata="inventory" />
+      <on_check function="FloaterVisible" userdata="inventory" />
     </menu_item_call>
     <menu_item_check name="Active Speakers" label="Active Speakers">
       <on_click function="ShowFloater" userdata="active speakers" />
@@ -370,80 +371,16 @@
       <on_click function="View.HighlightTransparent" userdata="" />
       <on_check function="View.CheckHighlightTransparent" />
     </menu_item_check>
-    <menu_item_check name="Beacons Always On" label="Show Beacons">
-      <on_click function="ToggleControl" userdata="BeaconsEnabled" />
-      <on_check control="BeaconsEnabled" />
+    <menu_item_check name="beacons" label="Beacons"
+                     shortcut="control|alt|shift|N">
+      <on_click function="ShowFloater" userdata="beacons" />
+      <on_check function="FloaterVisible" userdata="beacons" />
+    </menu_item_check>
+    <menu_item_check name="Hide Particles" label="Hide Particles"
+                     shortcut="control|alt|shift|=">
+      <on_click function="View.ToggleRenderType" userdata="hideparticles" />
+      <on_check function="View.CheckRenderType" userdata="hideparticles" />
     </menu_item_check>
-    <menu name="Beacons" create_jump_keys="true" label="Beacons"
-          opaque="true" tear_off="true">
-      <menu_item_check name="Scripted Objects With Touch Only"
-                       label="Scripted Objects with Touch Only">
-        <on_click function="View.ToggleBeacon"
-                  userdata="scripttouchbeacon" />
-        <on_check function="View.CheckBeaconEnabled"
-                  userdata="scripttouchbeacon" />
-      </menu_item_check>
-      <menu_item_check name="Scripted Objects" label="Scripted Objects">
-        <on_click function="View.ToggleBeacon"
-                  userdata="scriptsbeacon" />
-        <on_check function="View.CheckBeaconEnabled"
-                  userdata="scriptsbeacon" />
-      </menu_item_check>
-      <menu_item_check name="Physical Objects" label="Physical Objects">
-        <on_click function="View.ToggleBeacon"
-                  userdata="physicalbeacon" />
-        <on_check function="View.CheckBeaconEnabled"
-                  userdata="physicalbeacon" />
-      </menu_item_check>
-      <menu_item_check name="Sound Sources" label="Sound Sources">
-        <on_click function="View.ToggleBeacon"
-                  userdata="soundsbeacon" />
-        <on_check function="View.CheckBeaconEnabled"
-                  userdata="soundsbeacon" />
-      </menu_item_check>
-      <menu_item_check name="Particle Sources" label="Particle Sources">
-        <on_click function="View.ToggleBeacon"
-                  userdata="particlesbeacon" />
-        <on_check function="View.CheckBeaconEnabled"
-                  userdata="particlesbeacon" />
-      </menu_item_check>
-      <menu_item_separator />
-      <menu_item_check name="Render Highlights" label="Render Highlights">
-        <on_click function="View.ToggleBeacon"
-                  userdata="renderhighlights" />
-        <on_check function="View.CheckBeaconEnabled"
-                  userdata="renderhighlights" />
-      </menu_item_check>
-      <menu_item_check name="Render Beacons" label="Render Beacons">
-        <on_click function="View.ToggleBeacon"
-                  userdata="renderbeacons" />
-        <on_check function="View.CheckBeaconEnabled"
-                  userdata="renderbeacons" />
-      </menu_item_check>
-      <menu_item_separator />
-      <menu_item_check name="Hide Particles" label="Hide Particles">
-        <on_click function="View.ToggleRenderType"
-                  userdata="hideparticles" />
-        <on_check function="View.CheckRenderType"
-                  userdata="hideparticles" />
-      </menu_item_check>
-      <menu_item_separator />
-      <menu name="Beacon Width" create_jump_keys="true"
-            label="Beacon Width" opaque="true" tear_off="true">
-        <menu_item_call name="Beacon Width 1" label="1">
-          <on_click function="View.BeaconWidth" userdata="1" />
-        </menu_item_call>
-        <menu_item_call name="Beacon Width 4" label="4">
-          <on_click function="View.BeaconWidth" userdata="4" />
-        </menu_item_call>
-        <menu_item_call name="Beacon Width 16" label="16">
-          <on_click function="View.BeaconWidth" userdata="16" />
-        </menu_item_call>
-        <menu_item_call name="Beacon Width 32" label="32">
-          <on_click function="View.BeaconWidth" userdata="32" />
-        </menu_item_call>
-      </menu>
-    </menu>
     <menu_item_separator />
     <menu name="Zoom Level" create_jump_keys="true"
             label="Zoom Level" opaque="true" tear_off="true">
@@ -519,12 +456,12 @@
     <menu_item_separator />
     <menu_item_call name="Account History..."
                     label="Account History...">
-      <on_click function="PromptShowURL"
+      <on_click function="PromptShowURL" name="AccountHistory_url"
                 userdata="WebLaunchAccountHistory,http://secondlife.com/account/transactions.php" />
     </menu_item_call>
     <menu_item_call name="Manage My Account..."
                     label="Manage My Account...">
-      <on_click function="PromptShowURL"
+      <on_click function="PromptShowURL" name="ManageMyAccount_url"
                 userdata="WebLaunchJoinNow,http://secondlife.com/account/" />
     </menu_item_call>
     <menu_item_call name="Buy and Sell L$..." label="Buy L$...">
@@ -791,14 +728,9 @@
                 userdata="WebLaunchImprudenceForums,http://www.imprudenceviewer.org/forums/" />
     </menu_item_call>
     <menu_item_separator />
-    <menu_item_call name="Scripting Guide..."
-                    label="Scripting Guide...">
-      <on_click function="PromptShowFile"
-                userdata="WebLaunchLSLGuide,lsl_guide.html" />
-    </menu_item_call>
     <menu_item_call name="Scripting Portal..."
                     label="Scripting Portal...">
-      <on_click function="PromptShowURL"
+      <on_click function="PromptShowURL" name="ScriptingPortal_url"
                 userdata="WebLaunchLSLWiki,http://wiki.secondlife.com/wiki/LSL_Portal" />
     </menu_item_call>
     <menu_item_separator />
@@ -1104,14 +1036,6 @@
           <on_check function="Advanced.CheckFeature"
                     userdata="fog" />
         </menu_item_check>
-        <menu_item_check name="Palletized Textures"
-                         label="Palletized Textures"
-                         shortcut="alt|shift|F7">
-          <on_click function="Advanced.ToggleFeature"
-                    userdata="palette" />
-          <on_check function="Advanced.CheckFeature"
-                    userdata="palette" />
-        </menu_item_check>
         <menu_item_check name="Test FRInfo" label="Test FRInfo"
                          shortcut="alt|shift|F8">
           <on_click function="Advanced.ToggleFeature"
@@ -1243,19 +1167,6 @@
           <on_check function="Advanced.CheckInfoDisplay"
                     userdata="glow" />
         </menu_item_check>
-        <menu_item_check name="Show Depth Buffer"
-                         label="Show Depth Buffer">
-          <on_click function="ToggleControl"
-                    userdata="ShowDepthBuffer" />
-          <on_check control="ShowDepthBuffer" />
-        </menu_item_check>
-        <menu_item_check name="Show Select Buffer"
-                         label="Show Select Buffer">
-          <on_click function="Advanced.ToggleSelectBuffer"
-                    userdata="" />
-          <on_check function="Advanced.CheckSelectBuffer"
-                    userdata="" />
-        </menu_item_check>
         <menu_item_check name="Vectorize Perf Test"
                          label="Vectorize Perf Test">
           <on_click function="ToggleControl"
@@ -1463,13 +1374,6 @@
         -->
       </menu_item_call>
 
-      <menu_item_check name="Async Keystrokes"
-                       label="Async Keystrokes">
-        <on_click function="Advanced.ToggleAsyncKeystrokes"
-                  userdata="" />
-        <on_check function="Advanced.CheckAsyncKeystrokes"
-                  userdata="" />
-      </menu_item_check>
       <menu_item_call name="Dump SelectMgr" label="Dump SelectMgr">
         <on_click function="Advanced.DumpSelectMgr" userdata="" />
       </menu_item_call>
@@ -1969,8 +1873,8 @@
     <menu_item_check name="Output Debug Minidump"
                      label="Output Debug Minidump">
       <on_click function="ToggleControl"
-                userdata="SaveMiniDump" />
-      <on_check control="SaveMiniDump" />
+                userdata="SaveMinidump" />
+      <on_check control="SaveMinidump" />
     </menu_item_check>
     <menu_item_check name="Clothing..."
                      label="Clothing...">
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 d207a74..99fe75a 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_audio_device.xml b/linden/indra/newview/skins/default/xui/en-us/panel_audio_device.xml
index 13f0e16..4f20e9d 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_audio_device.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_audio_device.xml
@@ -42,7 +42,7 @@
                 Adjust the slider to control how loud you sound to other Residents. To test the input level, simply speak into your microphone.
         </text_editor>
         <volume_slider bottom_delta="-18" enabled="true" follows="left|top" height="17"
-             increment="0.05" initial_val="0.5" left_delta="5" max_val="1" min_val="0"
+             increment="0.05" initial_val="1.0" left_delta="5" max_val="2" min_val="0"
              mouse_opaque="true" name="mic_volume_slider"
              tool_tip="Change the volume using this slider" width="90" />
         <text bottom_delta="-4" follows="left|top" height="20" left_delta="95"
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 1d77909..464ecac 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,11 +17,14 @@
         <flyout_button bottom="-23" follows="right|bottom" height="20" label="Say" left_delta="109"
              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>
         <flyout_button bottom="-23" follows="right|bottom" height="20" label="Gestures" left_delta="83"
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_group_land_money.xml b/linden/indra/newview/skins/default/xui/en-us/panel_group_land_money.xml
index f6b8838..f4c074f 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_group_land_money.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_group_land_money.xml
@@ -3,11 +3,7 @@
      left="1" mouse_opaque="true" name="land_money_tab" select="false"
      width="418">
         <string name="help_text">
-                Parcels owned by the group are listed along with 
-contribution details. A warning appears until the
-Total Land in Use is less than or equal to the Total
-Contribution. The Plannning, Details and Sales tabs
-provide information about the group&apos;s finances.
+                Parcels owned by the group are listed along with contribution details. A warning appears until the Total Land in Use is less than or equal to the Total Contribution. The &apos;Details&apos; and &apos;Sales&apos; tabs provide information about the group&apos;s finances.
         </string>
         <button bottom="-24" font="SansSerif" halign="center" height="16" label="?" left="391"
              name="help_button" width="20" />
@@ -114,6 +110,7 @@ provide information about the group&apos;s finances.
         </text>
         <tab_container border="false" bottom_delta="-189" height="180" left="6" mouse_opaque="false"
              name="group_money_tab_container" tab_position="top" width="406">
+                <!-- Comment out for [DEV-11287]
                 <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">
@@ -125,6 +122,7 @@ provide information about the group&apos;s finances.
                                 Computing...
                         </text_editor>
                 </panel>
+                -->
                 <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">
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 7bd966a..6c8ffdb 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,23 +61,19 @@
              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="220" />
-  <button bottom="-221" enabled="true" follows="left|top"
-             font="SansSerif" halign="center" height="22" label="Reset"
-             label_selected="Reset" left_delta="226" mouse_opaque="true"
-             name="reset_ui_size" scale_image="true" width="80" />
-        <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" />
@@ -84,18 +81,18 @@
                    font="SansSerifSmall" height="16" initial_value="false"
                    label="Doubleclick Mini-Map Teleports" left="280" mouse_opaque="true"
                    name="teleport_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"
@@ -159,7 +156,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">
@@ -168,29 +165,41 @@
                 <combo_item type="string" length="1" enabled="true" name="English" value="en-us">
                         English
                 </combo_item>
-                <combo_item type="string" length="1" enabled="true" name="Chinese" value="zh">
-                        汉语/漢語 (Chinese) - Beta
+                
+                <!-- After "System Default" and "English", please keep the rest of these combo_items in alphabetical order by the first character in the string. -->
+                
+                <combo_item type="string" length="1" enabled="true" name="Danish" value="da">
+                        Dansk (Danish) - Beta
                 </combo_item>
                 <combo_item type="string" length="1" enabled="true" name="Deutsch(German)" value="de">
                         Deutsch (German) - Beta
                 </combo_item>
+                <combo_item type="string" length="1" enabled="true" name="Spanish" value="es">
+                        Español (Spanish) - Beta
+                </combo_item>
                 <combo_item type="string" length="1" enabled="true" name="French" value="fr">
                         Français (French) - Beta
                 </combo_item>
-                <combo_item type="string" length="1" enabled="true" name="(Japanese)" value="ja">
-                        日本語 (Japanese) - Beta
+                <combo_item type="string" length="1" enabled="true" name="Hungarian" value="hu">
+                        Magyar (Hungarian) - Beta
                 </combo_item>
-                <combo_item type="string" length="1" enabled="true" name="(Korean)" value="ko">
-                        한국어 (Korean) - Beta
+                <combo_item type="string" length="1" enabled="true" name="Polish" value="pl">
+                        Polski (Polish) - Beta
                 </combo_item>
                 <combo_item type="string" length="1" enabled="true" name="Portugese" value="pt">
                         Portugués (Portuguese) - Beta
                 </combo_item>
-                <combo_item type="string" length="1" enabled="true" name="Spanish" value="es">
-                        Español (Spanish) - Beta
+                <combo_item type="string" length="1" enabled="true" name="Chinese" value="zh">
+                        中文 (简体) (Chinese) - Beta
+                </combo_item>
+                <combo_item type="string" length="1" enabled="true" name="(Japanese)" value="ja">
+                        日本語 (Japanese) - Beta
+                </combo_item>
+                <combo_item type="string" length="1" enabled="true" name="(Korean)" value="ko">
+                        한국어 (Korean) - 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 8020e9a..f0f79e4 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="Show IMs with 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 1867323..a0f1744 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" />
         <check_box bottom_delta="-18" control_name="DisableCameraConstraints" enabled="true"
              follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
@@ -90,9 +90,9 @@
              mouse_opaque="true" name="text2" v_pad="0" width="128">
                 Avatar Display Options:
         </text>
-        <check_box bottom_delta="-4" control_name="FirstPersonAvatarVisible" enabled="true"
+        <check_box bottom_delta="-4" 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_delta="-32" drop_shadow_visible="true" enabled="true" follows="left|top"
@@ -102,5 +102,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 89b07dd..d3c0003 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_region_debug.xml b/linden/indra/newview/skins/default/xui/en-us/panel_region_debug.xml
index 462728a..91a81df 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_region_debug.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_region_debug.xml
@@ -58,9 +58,9 @@
              left="10" name="top_colliders_btn"
              tool_tip="List of objects experiencing the most potential collisions"
              width="150" />
-        <button bottom_delta="-3" follows="left|top" font="SansSerifSmall" height="18" label="?"
+        <button bottom_delta="0" 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..."
+        <button bottom_delta="-23" follows="left|top" height="20" label="Get Top Scripts..."
              left="10" name="top_scripts_btn"
              tool_tip="List of objects spending the most time running scripts"
              width="150" />
@@ -69,9 +69,9 @@
         <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="-3" follows="left|top" font="SansSerifSmall" height="18" label="?"
+        <button bottom_delta="0" 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"
+        <button bottom_delta="-23" follows="left|top" height="20" label="Delay Restart"
              left="10" name="cancel_restart_btn"
              tool_tip="Delay region restart by one hour" width="130" />
 </panel>
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=""
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_voice_remote.xml b/linden/indra/newview/skins/default/xui/en-us/panel_voice_remote.xml
index a0dc47b..c98b86b 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_voice_remote.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_voice_remote.xml
@@ -3,6 +3,6 @@
      enabled="true" follows="right|bottom" height="20" left="0"
      mouse_opaque="true" name="voice_remote" use_bounding_rect="true"
      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 bottom="1" filename="panel_bg_tab.xml" name="panel_bg_tab" height="22" left="0" width="130" />
+        <panel bottom="3" filename="panel_voice_controls.xml" name="panel_voice_controls" height="20" left="1" width="130" />
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_voice_remote_expanded.xml b/linden/indra/newview/skins/default/xui/en-us/panel_voice_remote_expanded.xml
index 88cc305..08d7a28 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_voice_remote_expanded.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_voice_remote_expanded.xml
@@ -2,7 +2,7 @@
 <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="130">
-        <panel bottom="1" filename="panel_bg_tab.xml" height="47" left="0" width="130" />
+        <panel bottom="1" filename="panel_bg_tab.xml" name="panel_bg_tab" 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"