7 files changed, 137 insertions, 83 deletions

diff --git a/linden/indra/newview/skins/xui/en-us/alerts.xml b/linden/indra/newview/skins/xui/en-us/alerts.xml
index cac8dc4..d32b46a 100644
--- a/linden/indra/newview/skins/xui/en-us/alerts.xml
+++ b/linden/indra/newview/skins/xui/en-us/alerts.xml
@@ -249,7 +249,7 @@ Members cannot be removed from that role.
 The members must resign from the role themselves.
 Are you sure you want to continue?
                 </message>
-                <ignore>
+                <ignore name="ignore">
                         When adding group members to the owner role
                 </ignore>
                 <option name="Yes">
@@ -700,7 +700,7 @@ also appear higher when people search for keywords.
                 <option name="Cancel">
                         Cancel
                 </option>
-                <ignore>
+                <ignore name="ignore">
                         When adding a new Classified
                 </ignore>
         </alert>
@@ -716,6 +716,20 @@ There is no reimbursement for fees paid.
                         Cancel
                 </option>
         </alert>
+        <alert modal="true" name="ClassifiedSave">
+                <message name="message">
+                        Save changes to classified [NAME]?
+                </message>
+                <option name="Save">
+                        Save
+                </option>
+                <option name="Don&apos;tSave">
+                        Don&apos;t Save
+                </option>
+                <option name="Cancel">
+                        Cancel
+                </option>
+        </alert>
         <alert modal="true" name="DeleteAvatarPick">
                 <message name="message">
                         Delete pick [PICK]?
@@ -2696,7 +2710,7 @@ Download to your Applications folder?
                         Deeding this object will cause the group to:
 * Receive L$ paid into the object
                 </message>
-                <ignore>
+                <ignore name="ignore">
                         When deeding objects to groups
                 </ignore>
                 <option name="Deed">
@@ -2718,7 +2732,7 @@ You&apos;ll be asked for a price to pay when clicking Publish.
 Paying more makes your ad appear higher in the list, and
 also appear higher when people search for keywords.
                 </message>
-                <ignore>
+                <ignore name="ignore">
                         When adding a new Classified
                 </ignore>
                 <option name="OK">
@@ -2732,7 +2746,7 @@ also appear higher when people search for keywords.
                 <message name="message">
                         Go to www.secondlife.com to manage your account?
                 </message>
-                <ignore>
+                <ignore name="ignore">
                         When launching web browser to manage your account
                 </ignore>
                 <option name="OK">
@@ -2746,7 +2760,7 @@ also appear higher when people search for keywords.
                 <message name="message">
                         Visit the [SECOND_LIFE] Wiki and Learn how to Report Bugs Correctly.
                 </message>
-                <ignore>
+                <ignore name="ignore">
                         When launching web browser to view the Bug Reporting 101 Wiki
                 </ignore>
                 <option name="Gotopage">
@@ -2760,7 +2774,7 @@ also appear higher when people search for keywords.
                 <message name="message">
                         Visit the [SECOND_LIFE] Wiki for Details of How to Report a Security Issue.
                 </message>
-                <ignore>
+                <ignore name="ignore">
                         When launching web browser to view Security Issues Wiki
                 </ignore>
                 <option name="Gotopage">
@@ -2774,7 +2788,7 @@ also appear higher when people search for keywords.
                 <message name="message">
                         Visit the [SECOND_LIFE] Public Issue Tracker, Where you can Report Bugs and other Issues.
                 </message>
-                <ignore>
+                <ignore name="ignore">
                         When launching web browser to view the Public Issue Tracker
                 </ignore>
                 <option name="Gotopage">
@@ -2788,7 +2802,7 @@ also appear higher when people search for keywords.
                 <message name="message">
                         Visit the [SECOND_LIFE] Wiki for info on how to use the Public Issue Tracker.
                 </message>
-                <ignore>
+                <ignore name="ignore">
                         When launching web browser to view Public Issue Tracker Wiki
                 </ignore>
                 <option name="Gotopage">
@@ -2802,7 +2816,7 @@ also appear higher when people search for keywords.
                 <message name="message">
                         Search the [SECOND_LIFE] Knowledge Base for the latest tips and tricks.
                 </message>
-                <ignore>
+                <ignore name="ignore">
                         When launching web browser to view the knowledge base
                 </ignore>
                 <option name="Gotopage">
@@ -2816,7 +2830,7 @@ also appear higher when people search for keywords.
                 <message name="message">
                         Contact [SECOND_LIFE] Support.
                 </message>
-                <ignore>
+                <ignore name="ignore">
                         When launching web browser to contact support
                 </ignore>
                 <option name="Gotopage">
@@ -2830,7 +2844,7 @@ also appear higher when people search for keywords.
                 <message name="message">
                         Go to the Official Linden Blog, for the Latest News and Information.
                 </message>
-                <ignore>
+                <ignore name="ignore">
                         When launching web browser to view the blog
                 </ignore>
                 <option name="Gotopage">
@@ -2844,7 +2858,7 @@ also appear higher when people search for keywords.
                 <message name="message">
                         Go to the Scripting Guide for scripting help?
                 </message>
-                <ignore>
+                <ignore name="ignore">
                         When launching web browser to view the Scripting Guide
                 </ignore>
                 <option name="Gotopage">
@@ -2858,7 +2872,7 @@ also appear higher when people search for keywords.
                 <message name="message">
                         Go to the LSL Portal for scripting help?
                 </message>
-                <ignore>
+                <ignore name="ignore">
                         When launching web browser to view the LSL Portal
                 </ignore>
                 <option name="Gotopage">
@@ -2872,7 +2886,7 @@ also appear higher when people search for keywords.
                 <message name="message">
                         View the [SECOND_LIFE] Release Notes?.
                 </message>
-                <ignore>
+                <ignore name="ignore">
                         When launching web browser to view the Release Notes
                 </ignore>
                 <option name="Gotopage">
@@ -2890,7 +2904,7 @@ objects will be returned to their previous owners.
  
 *WARNING* No-transfer deeded objects will be deleted!
                 </message>
-                <ignore>
+                <ignore name="ignore">
                         When returning objects to their owners
                 </ignore>
                 <option name="Return">
@@ -2904,7 +2918,7 @@ objects will be returned to their previous owners.
                 <message name="message">
                         View the Second Life release notes?
                 </message>
-                <ignore>
+                <ignore name="ignore">
                         When viewing the release notes
                 </ignore>
                 <option name="Gotopage">
@@ -2942,6 +2956,12 @@ Leave Group?
                 <message name="message">
                         Do you REALLY want to kick all users off the grid?
                 </message>
+                <option name="Kick">
+                        Kick All Users
+                </option>
+                <option name="Cancel">
+                        Cancel
+                </option>
         </alert>
         <alert modal="true" name="MuteLinden">
                 <message name="message">
@@ -3025,7 +3045,7 @@ Chat and instant messages will be hidden. Instant
 messages will get your Busy mode response. All teleportation
 and inventory offers will be declined.
                 </message>
-                <ignore>
+                <ignore name="ignore">
                         When setting busy mode
                 </ignore>
                 <option name="OK">
@@ -3989,7 +4009,7 @@ These items will be moved to your inventory, not copied.
  
 Move the inventory item(s)?
                 </message>
-                <ignore>
+                <ignore name="ignore">
                         When moving no-copy inventory from objects
                 </ignore>
                 <option name="Move">
@@ -4009,7 +4029,7 @@ to your inventory may cause the script to malfunction.
  
 Move the inventory item(s)?
                 </message>
-                <ignore>
+                <ignore name="ignore">
                         When moving no-copy inventory from scripted objects
                 </ignore>
                 <option name="Move">
@@ -4024,7 +4044,7 @@ Move the inventory item(s)?
                         Warning: The Pay Object click action has been set, but it 
 will only work if a script is added with a money() event. 
                 </message>
-                <ignore>
+                <ignore name="ignore">
                         When Setting &apos;Pay&apos; on objects without money() events
                 </ignore>
         </alert>
@@ -4037,7 +4057,7 @@ will only work if a script is added with a money() event.
                 <message name="message">
                         Go to the Second Life web site to see your account history?
                 </message>
-                <ignore>
+                <ignore name="ignore">
                         When loading account history web page
                 </ignore>
                 <option name="Gotopage">
@@ -4218,7 +4238,7 @@ completing this transaction?
                         Are you sure you want to permanently remove
 the contents of your Trash folder?
                 </message>
-                <ignore>
+                <ignore name="ignore">
                         When emptying your inventory trash folder
                 </ignore>
                 <option default="true" name="Yes">
@@ -4228,12 +4248,36 @@ the contents of your Trash folder?
                         Cancel
                 </option>
         </alert>
+        <alert modal="true" name="ConfirmClearBrowserCache">
+                <message name="message">
+                        Are you sure you want to clear your
+browser cache?
+                </message>
+                <option default="true" name="Yes">
+                        Yes
+                </option>
+                <option name="No">
+                        Cancel
+                </option>
+        </alert>
+        <alert modal="true" name="ConfirmClearCookies">
+                <message name="message">
+                        Are you sure you want to clear 
+your cookies?
+                </message>
+                <option default="true" name="Yes">
+                        Yes
+                </option>
+                <option name="No">
+                        Cancel
+                </option>
+        </alert>
         <alert modal="true" name="ConfirmEmptyLostAndFound">
                 <message name="message">
                         Are you sure you want to permanently remove
 the contents of your Lost And Found folder?
                 </message>
-                <ignore>
+                <ignore name="ignore">
                         When emptying your inventory Lost And Found folder
                 </ignore>
                 <option default="true" name="Yes">
@@ -4252,7 +4296,7 @@ the contents of your Lost And Found folder?
                         Put it in a web page to give others easy access to this location or
                         try it out yourself by pasting it into the address bar of your web browser.
                 </message>
-                <ignore>
+                <ignore name="ignore">
                         When copying a SLURL to your clipboard
                 </ignore>
         </alert>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_about.xml b/linden/indra/newview/skins/xui/en-us/floater_about.xml
index ea855d9..fbfebf0 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_about.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_about.xml
@@ -7,9 +7,9 @@
              follows="left|top|right|bottom" font="SansSerifSmall" height="168" left="6"
              max_length="65536" mouse_opaque="true" name="credits_editor"
              text_color="1, 1, 1, 1" text_readonly_color="1, 1, 1, 1" width="458"
-             word_wrap="true">Second Life is brought to you by Philip, Andrew, Tessa, Cory, Frank, James, Doug, Hunter, Richard, John, Eric, Avi, AaronB, AaronY, Ian, Peter, Mark, Robin, Stephen, Tracy, Ryan, Alberto, Haney, Tanya, JimJ, Dan, Ben, Stephanie, Tim, Evan, Catherine, Colin, Chris, Reuben, Charity, Jeska, James, JonHenry, Kelly, Callum, Char, Daniel, DavidF, Don, Jeff, Lauren, Lee, Michael, Ramzi, Vektor, Steve, TomY, Tess, Kona, Brent, Clarissa, PeterP, Jesse, Annette, Cyn, Blue, Ginsu, Jonathan, Karen, Adam, Nova, Deana, Lizzie, Patsy, DavidK, Isaac, Pathfinder, Monroe, Jill, Benny, Altruima, Rheya, Jennifer, Jack, DaveP, Brad, Mick, Babbage, Elisabeth, Brian, Beth, Data, Ethan, Wendy, Nicole, Sky, Jeffrey, Zero, Coffee, Tesla, Kenny, Makiko, Nigel, Teeple, Lucy, Mia, Dee, Guy, Harry, Liana, Branka, Jimbo, Aura, Vasuda, SarahD, bethanye, Torley, Runitai, MikeS, PaulM, Milo, Hermia, JoeM, Melanie, Rejean, DSmith, SMiller, Susan, Jose, DongYun, Justin, Andrey, Syrah, Donovan, Henrik, Nora, Lexie, AC, Donna, ChrisC, Alex, Leyla, Kyle, Mathew, Devin, Joshua, DanC, Jessica, Harmony, Claudia, Tramel, Glenn, Betsy, Fritz, Jun, Adam, Cassandra, Ken, RyanW, Spike, Varas, Andy, Luke, RobLa, Chiyo, JohnZ, Dustin, George, Del, PeterP, Migyeong, Matthew, RMullane, CChampion, JTurbin, JamesC, Viola, Lightfoot, Jacqui, Sturm, Adrian, Buttercup, Alfred, Sunil, Alfred, Noel, Irfan, Jill, Yool, Jane, Yuki, Yoz, Matthew, Arthur, Jennifer, Karl, Brian, Ben, Janine, Christopher, Madhavi, Everett, Anthony, Joon, Jake, sean, Adreanne, Stephany, KellyJo, Jeremy, Pramod, Joshua, Sean, Christopher, Amy, Ceren, Katherine, jon, Sudheendra, James, Stephan, Kari, Kartic, Todd, Thomas, Joki, Rebecca, Belinda, Bert, Roger, Bridie, Kristi, Brian, Maria, John, Aric, Nathanel, Melinda, Darrell, Jennifer, Sandy, Greg, Rob, Brad, Chris, Eric, Palmer, Asi, Katja, Lisa, Minda, Jen, Aaron, Bryan, Mark, Jonathan, Jamie, Laurel, William, Matthew, Steve, David and many others.
+             word_wrap="true">Second Life is brought to you by Philip, Andrew, Tessa, Cory, Frank, James, Doug, Hunter, Richard, John, Eric, Avi, AaronB, AaronY, Ian, Peter, Mark, Robin, Stephen, Tracy, Ryan, Alberto, Haney, Tanya, JimJ, Dan, Ben, Stephanie, Tim, Evan, Catherine, Colin, Chris, Reuben, Charity, Jeska, James, JonHenry, Kelly, Callum, Char, Daniel, DavidF, Don, Jeff, Lauren, Lee, Michael, Ramzi, Vektor, Steve, TomY, Tess, Kona, Brent, Clarissa, PeterP, Jesse, Annette, Cyn, Blue, Ginsu, Jonathan, Karen, Adam, Nova, Deana, Lizzie, Patsy, DavidK, Isaac, Pathfinder, Monroe, Jill, Benny, Altruima, Rheya, Jennifer, Jack, DaveP, Brad, Mick, Babbage, Elisabeth, Brian, Beth, Data, Ethan, Wendy, Nicole, Sky, Jeffrey, Zero, Coffee, Tesla, Kenny, Makiko, Nigel, Teeple, Lucy, Mia, Dee, Guy, Harry, Liana, Branka, Jimbo, Aura, Vasuda, SarahD, bethanye, Torley, Runitai, MikeS, PaulM, Milo, Hermia, JoeM, Melanie, Rejean, DSmith, SMiller, Susan, Jose, DongYun, Justin, Andrey, Syrah, Donovan, Henrik, Nora, Lexie, AC, Donna, ChrisC, Alex, Leyla, Kyle, Mathew, Devin, Joshua, DanC, Jessica, Harmony, Claudia, Tramel, Glenn, Betsy, Fritz, Jun, Adam, Cassandra, Ken, RyanW, Spike, Varas, Andy, Luke, RobLa, Chiyo, JohnZ, Dustin, George, Del, PeterP, Migyeong, Matthew, RMullane, CChampion, JTurbin, JamesC, Viola, Lightfoot, Jacqui, Sturm, Adrian, Buttercup, Alfred, Sunil, Alfred, Noel, Irfan, Jill, Yool, Jane, Yuki, Yoz, Matthew, Arthur, Jennifer, Karl, Brian, Ben, Janine, Christopher, Madhavi, Everett, Anthony, Joon, Jake, sean, Adreanne, Stephany, KellyJo, Jeremy, Pramod, Joshua, Sean, Christopher, Amy, Ceren, Katherine, jon, Sudheendra, James, Stephan, Kari, Kartic, Todd, Thomas, Joki, Rebecca, Belinda, Bert, Roger, Bridie, Kristi, Brian, Maria, John, Aric, Nathanel, Melinda, Darrell, Jennifer, Sandy, Greg, Rob, Brad, Chris, Eric, Palmer, Asi, Katja, Lisa, Minda, Jen, Aaron, Bryan, Mark, Jonathan, Jamie, Laurel, William, Matthew, Steve, David, Remy, James, Tim, Lee, Brian, Ashlei, Sam, Mike, Ethan, Austin, Wanda, Paul, Brian, Rachel, Valentyn, Emma Williams, Autum, Steven, Laley, Charles, Jessica and many others.
 
-Thank you to the following residents for helping to ensure that this is the best version yet: shinmai Akebono, Evangeline Arcadia, Nargus Asturias, FireFox Bancroft, Verbuda Barragar, Logan Bauer, Freya Becquerel, phoenix Behemoth, Druida Biedermann, Bibi Book, Barney Boomslang, mckinnes1 Boyd, Ice Brodie, Darling Brody, seaone Bunyip, Hypatia Callisto, Upo Choche, Bell Clellon, pizzaguy Clutterbuck, Victor Cole, Patrice Cournoyer, Sherona DeGroot, Mecha Dinosaur, Shack Dougall, Drew Dwi, Bazzerbill Eccleston, Rosa Edelman, Gotobug Fairymeadow, Gianetti Ferlinghetti, Ante Flan, Mario Fonzarelli, Raudf Fox, Lor Gynoid, Moses Gyoza, Corax Homewood, Pietor Huygens, LampLighter Jacobus, Major Johnson, Itoku Kamachi, DaQbet Kish, Max Kleiber, Laurent Laborde, Lightfoot Lindman, Deira Llanfair, Domino Marama, Aminom Marvin, Liberty Mill, Walker Moore, Yumi Murakami, Usagi Musashi, Luciftias Neurocam, Destiny Niles, Alexandra Nino, Kinzo Nurmi, OmniCron Overlord, Julianna Pennyfeather, Coyote Pixie, Maya Remblai, Arenae Rosewood, Grey Ryder, Norm Schack, Funk Schnook, Singular Seoul, tickledgirl Shemesh, Rhyph Somme, Oz Spade, Argent Stonecutter, Eristic Strangelove, Samm Submariner, Seifert Surface, Dirk Talamasca, Ilyara Tardis, Mac Teazle, Winter Ventura, Amaranth Voss, Geri Watson, Will Webb, Patchouli Woollahra, TonyH Wrangler, malee Zhaoying.
+Thank you to the following residents for helping to ensure that this is the best version yet: Hypatia Callisto, Inigo Chamerberlin, Matti Deigan, Jasper Dogpatch, Able Forder, Evy Gardenvale, Bosco Gray, Torben Jensen, Claire Kanno, bebop Kohime, Michael Kyuzo, Sian Lumley, Chase McClure, Lisa McConnell, Alice Obscure, Stumbelina Ophelia, Arenae Rosewood, Joseph Rustamova, Norm Schack, Funk Schnook, Teleio Seferis, Ninnie Stradling, Darzus Strutt, Glory Takashi, Omei Turnbull, Craig Weiland, Johan Yugen, xsdenied Zucker.
 
 APR Copyright (C) 2000-2004 The Apache Software Foundation
 Cg Copyright (C) 2002, NVIDIA Corporationa.
@@ -30,7 +30,7 @@ zlib Copyright (C) 1995-2002 Jean-loup Gailly and Mark Adler.
 All rights reserved.  See licenses.txt for details.
 
 
-Kilroy 2.0 is here. Kilroy 2.0 is everywhere.</text_editor>
+Bananas are the new plywood cubes.</text_editor>
         <text_editor bg_readonly_color="0, 0, 0, 0" bottom_delta="174" embedded_items="false"
              follows="left|top|right|bottom" font="SansSerif" height="238" left="6"
              max_length="65536" mouse_opaque="true" name="support_editor"
diff --git a/linden/indra/newview/skins/xui/en-us/floater_instant_message.xml b/linden/indra/newview/skins/xui/en-us/floater_instant_message.xml
index d64452f..f5b11d6 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_instant_message.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_instant_message.xml
@@ -32,10 +32,6 @@
              max_length="1022" mouse_opaque="true" name="chat_editor"
              select_all_on_focus_received="false" select_on_focus="false" tab_group="1"
              width="345" label="Click here to instant message" />
-        <button bottom="-295" enabled="false" follows="right|bottom" font="SansSerif"
-             halign="center" height="20" hidden="false" label="Teleport"
-             label_selected="Teleport" left="275" mouse_opaque="true"
-             name="teleport_btn" scale_image="true" width="75" />
         <button bottom="-295" enabled="true" follows="right|bottom" font="SansSerif"
              halign="center" height="20" hidden="false" label="Profile..."
              label_selected="Profile..." left="355" mouse_opaque="true"
diff --git a/linden/indra/newview/skins/xui/en-us/panel_preferences_general.xml b/linden/indra/newview/skins/xui/en-us/panel_preferences_general.xml
index 8297887..6792202 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_preferences_general.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_preferences_general.xml
@@ -69,13 +69,7 @@
              label="Notify when Linden dollars (L$) spent or received" left="148"
              mouse_opaque="true" name="notify_money_change_checkbox" radio_style="false"
              width="256" />
-        <check_box bottom="-326" control_name="ShowNewInventory" enabled="true"
-             follows="left|top" font="SansSerifSmall" height="16" hidden="false"
-             initial_value="false" label="Automatic previews of new notecards/textures/landmarks"
-             left="148" mouse_opaque="true" name="show_new_inventory"
-             radio_style="false"
-             width="270" />
-        <check_box bottom="-344" control_name="UseDefaultColorPicker" enabled="true"
+        <check_box bottom="-326" control_name="UseDefaultColorPicker" enabled="true"
              follows="left|top" font="SansSerifSmall" height="16" hidden="false"
              initial_value="false" label="Use default system color picker" left="148"
              mouse_opaque="true" name="use_system_color_picker_checkbox"
diff --git a/linden/indra/newview/skins/xui/en-us/panel_preferences_popups.xml b/linden/indra/newview/skins/xui/en-us/panel_preferences_popups.xml
index 1b9acc6..24c3b19 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_preferences_popups.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_preferences_popups.xml
@@ -1,34 +1,37 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel border="true" bottom="-409" enabled="true" follows="left|top|right|bottom"
-     height="408" hidden="false" label="Popups" left="102" mouse_opaque="true"
-     name="popups" width="517">
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
-             left="12" mouse_opaque="false" name="text_box" v_pad="0" width="300">
+<panel border="true" bottom="0" height="500" label="Popups" left="0" name="popups"
+     title="Popups" width="400">
+        <text bottom="-20" follows="top|left" left="15" width="300">
                 Do not show popups:
         </text>
-        <scroll_list background_visible="true" bottom="-124" column_padding="5" draw_border="true"
-             draw_heading="false" draw_stripes="true" enabled="true" follows="left|top"
-             height="100" hidden="false" left="12" mouse_opaque="true"
-             multi_select="false" name="disabled_popups" width="480" />
-        <button bottom="-148" enabled="false" follows="left|top" font="SansSerif"
-             halign="center" height="20" hidden="false" label="Enable this popup"
-             label_selected="Enable this popup" left="12" mouse_opaque="true"
-             name="enable_popup" scale_image="true" width="150" />
+        <scroll_list follows="top|left" height="100" left="15" name="disabled_popups" width="480" />
+        <button follows="top|left" height="20" label="Enable this popup" left="15"
+             name="enable_popup" width="150" />
+        <text follows="top|left" left="15" width="128">
+                Show popups:
+        </text>
+        <scroll_list follows="top|left" height="100" left="15" name="enabled_popups" width="480" />
+             
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-162" drop_shadow_visible="true" enabled="true" follows="left|top"
+             bottom_delta="-30" drop_shadow_visible="true" enabled="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
-             left="12" mouse_opaque="false" name="text_box2" v_pad="0" width="128">
-                Show popups:
+             left="15" mouse_opaque="false" name="text_box2" v_pad="0" width="270">
+                Offers of notecards, textures and landmarks:
         </text>
-        <scroll_list background_visible="true" bottom="-266" column_padding="5" draw_border="true"
-             draw_heading="false" draw_stripes="true" enabled="true" follows="left|top"
-             height="100" hidden="false" left="12" mouse_opaque="true"
-             multi_select="false" name="enabled_popups" width="480" />
-        <button bottom="-311" enabled="true" follows="left|top" font="SansSerif"
-             halign="center" height="20" hidden="false"
-             label="Reset &apos;Show next time&apos; Dialogs..."
-             label_selected="Reset &apos;Show next time&apos; Dialogs..." left="12"
-             mouse_opaque="true" name="reset_dialogs_btn" scale_image="true" width="210" />
+        <check_box bottom_delta="-25" control_name="AutoAcceptNewInventory" enabled="true"
+             follows="left|top" font="SansSerifSmall" height="16" hidden="false"
+             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"
+             follows="left|top" font="SansSerifSmall" height="16" hidden="false"
+             initial_value="true" label="Automatically view after accepting"
+             left="40" mouse_opaque="true" name="show_new_inventory"
+             radio_style="false"
+             width="270" />
+
+        <button bottom_delta="-35" follows="top|left" height="20"
+             label="Reset &apos;Show next time&apos; Dialogs..." left="15"
+             name="reset_dialogs_btn" width="210" />
 </panel>
diff --git a/linden/indra/newview/skins/xui/en-us/panel_preferences_web.xml b/linden/indra/newview/skins/xui/en-us/panel_preferences_web.xml
new file mode 100644
index 0000000..fa1fffd
--- /dev/null
+++ b/linden/indra/newview/skins/xui/en-us/panel_preferences_web.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel border="true" bottom="-409" enabled="true" follows="left|top|right|bottom"
+     height="408" hidden="false" label="Web" left="102" mouse_opaque="true"
+     name="web" width="517">
+        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             bottom="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
+             font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
+             left="12" mouse_opaque="false" name="cache_size_label_l" v_pad="0" width="128">
+                Browser cache:
+        </text>
+        <button bottom="-30" enabled="true" follows="left|bottom" font="SansSerif"
+             halign="center" height="22" hidden="false"
+             label="Clear Now" left="140" mouse_opaque="true"
+             name="clear_cache" scale_image="true" width="85" />
+
+        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             bottom="-60" drop_shadow_visible="true" enabled="true" follows="left|top"
+             font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
+             left="12" mouse_opaque="false" name="cookie_label" v_pad="0" width="128">
+                Cookies:
+        </text>
+
+        <check_box bottom="-65" control_name="CookiesEnabled" enabled="true" follows="left|top" font="SansSerifSmall"
+             height="16" hidden="false" initial_value="false" label="Accept cookies from sites"
+             left="140" mouse_opaque="true" name="cookies_enabled" radio_style="false"
+             width="256" /> 
+             
+        <button bottom="-95" enabled="true" follows="left|bottom" font="SansSerif"
+             halign="center" height="22" hidden="false"
+             label="Clear Now" left="140" mouse_opaque="true"
+             name="clear_cookies" scale_image="true" width="85" />
+
+
+</panel>
diff --git a/linden/indra/newview/skins/xui/en-us/panel_settings_msgbox.xml b/linden/indra/newview/skins/xui/en-us/panel_settings_msgbox.xml
deleted file mode 100644
index d6f3967..0000000
--- a/linden/indra/newview/skins/xui/en-us/panel_settings_msgbox.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel border="true" bottom="0" height="500" label="Popups" left="0" name="popups"
-     title="Popups" width="400">
-        <text bottom="-20" follows="top|left" left="12" width="300">
-                Do not show popups:
-        </text>
-        <scroll_list follows="top|left" height="100" left="12" name="disabled_popups" width="480" />
-        <button follows="top|left" height="20" label="Enable this popup" left="12"
-             name="enable_popup" width="150" />
-        <text follows="top|left" left="12" width="128">
-                Show popups:
-        </text>
-        <scroll_list follows="top|left" height="100" left="12" name="enabled_popups" width="480" />
-        <button bottom_delta="-45" follows="top|left" height="20"
-             label="Reset &apos;Show next time&apos; Dialogs..." left="12"
-             name="reset_dialogs_btn" width="210" />
-</panel>