72 files changed, 3422 insertions, 2567 deletions
diff --git a/linden/indra/cmake/DirectX.cmake b/linden/indra/cmake/DirectX.cmake
index d406f37..e455755 100644
--- a/linden/indra/cmake/DirectX.cmake
+++ b/linden/indra/cmake/DirectX.cmake
@@ -3,6 +3,8 @@
 if (VIEWER AND WINDOWS)
  find_path(DIRECTX_INCLUDE_DIR dxdiag.h
            "$ENV{DXSDK_DIR}/Include"
+            "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (June 2010)/Include"
+            "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (March 2009)/Include"
            "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (August 2008)/Include"
            "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (June 2008)/Include"
            "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (March 2008)/Include"
@@ -23,6 +25,8 @@ if (VIEWER AND WINDOWS)
  find_path(DIRECTX_LIBRARY_DIR dxguid.lib
            "$ENV{DXSDK_DIR}/Lib/x86"
+            "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (June 2010)/Lib/x86"
+            "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (March 2009)/Lib/x86"
            "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (August 2008)/Lib/x86"
            "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (June 2008)/Lib/x86"
            "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (March 2008)/Lib/x86"
diff --git a/linden/indra/llcommon/llsdserialize.cpp b/linden/indra/llcommon/llsdserialize.cpp
index 9f4ce64..e2be922 100644
--- a/linden/indra/llcommon/llsdserialize.cpp
+++ b/linden/indra/llcommon/llsdserialize.cpp
@@ -441,7 +441,7 @@ S32 LLSDNotationParser::doParse(std::istream& istr, LLSD& data) const
                }
                if(istr.fail())
                {
-                        llinfos << "STREAM FAILURE reading map." << llendl;
+                        llwarns << "STREAM FAILURE reading map." << llendl;
                        parse_count = PARSE_FAILURE;
                }
                break;
@@ -460,7 +460,7 @@ S32 LLSDNotationParser::doParse(std::istream& istr, LLSD& data) const
                }
                if(istr.fail())
                {
-                        llinfos << "STREAM FAILURE reading array." << llendl;
+                        llwarns << "STREAM FAILURE reading array." << llendl;
                        parse_count = PARSE_FAILURE;
                }
                break;
@@ -496,7 +496,7 @@ S32 LLSDNotationParser::doParse(std::istream& istr, LLSD& data) const
                }
                if(istr.fail())
                {
-                        llinfos << "STREAM FAILURE reading boolean." << llendl;
+                        llwarns << "STREAM FAILURE reading boolean." << llendl;
                        parse_count = PARSE_FAILURE;
                }
                break;
@@ -522,7 +522,7 @@ S32 LLSDNotationParser::doParse(std::istream& istr, LLSD& data) const
                }
                if(istr.fail())
                {
-                        llinfos << "STREAM FAILURE reading boolean." << llendl;
+                        llwarns << "STREAM FAILURE reading boolean." << llendl;
                        parse_count = PARSE_FAILURE;
                }
                break;
@@ -535,7 +535,7 @@ S32 LLSDNotationParser::doParse(std::istream& istr, LLSD& data) const
                data = integer;
                if(istr.fail())
                {
-                        llinfos << "STREAM FAILURE reading integer." << llendl;
+                        llwarns << "STREAM FAILURE reading integer." << llendl;
                        parse_count = PARSE_FAILURE;
                }
                break;
@@ -549,7 +549,7 @@ S32 LLSDNotationParser::doParse(std::istream& istr, LLSD& data) const
                data = real;
                if(istr.fail())
                {
-                        llinfos << "STREAM FAILURE reading real." << llendl;
+                        llwarns << "STREAM FAILURE reading real." << llendl;
                        parse_count = PARSE_FAILURE;
                }
                break;
@@ -563,7 +563,7 @@ S32 LLSDNotationParser::doParse(std::istream& istr, LLSD& data) const
                data = id;
                if(istr.fail())
                {
-                        llinfos << "STREAM FAILURE reading uuid." << llendl;
+                        llwarns << "STREAM FAILURE reading uuid." << llendl;
                        parse_count = PARSE_FAILURE;
                }
                break;
@@ -578,7 +578,7 @@ S32 LLSDNotationParser::doParse(std::istream& istr, LLSD& data) const
                }
                if(istr.fail())
                {
-                        llinfos << "STREAM FAILURE reading string." << llendl;
+                        llwarns << "STREAM FAILURE reading string." << llendl;
                        parse_count = PARSE_FAILURE;
                }
                break;
@@ -600,7 +600,7 @@ S32 LLSDNotationParser::doParse(std::istream& istr, LLSD& data) const
                }
                if(istr.fail())
                {
-                        llinfos << "STREAM FAILURE reading link." << llendl;
+                        llwarns << "STREAM FAILURE reading link." << llendl;
                        parse_count = PARSE_FAILURE;
                }
                break;
@@ -623,7 +623,7 @@ S32 LLSDNotationParser::doParse(std::istream& istr, LLSD& data) const
                }
                if(istr.fail())
                {
-                        llinfos << "STREAM FAILURE reading date." << llendl;
+                        llwarns << "STREAM FAILURE reading date." << llendl;
                        parse_count = PARSE_FAILURE;
                }
                break;
@@ -636,14 +636,14 @@ S32 LLSDNotationParser::doParse(std::istream& istr, LLSD& data) const
                }
                if(istr.fail())
                {
-                        llinfos << "STREAM FAILURE reading data." << llendl;
+                        llwarns << "STREAM FAILURE reading data." << llendl;
                        parse_count = PARSE_FAILURE;
                }
                break;
        default:
                parse_count = PARSE_FAILURE;
-                llinfos << "Unrecognized character while parsing: int(" << (int)c
+                llwarns << "Unrecognized character while parsing: int(" << (int)c
                        << ")" << llendl;
                break;
        }
@@ -905,7 +905,7 @@ S32 LLSDBinaryParser::doParse(std::istream& istr, LLSD& data) const
                }
                if(istr.fail())
                {
-                        llinfos << "STREAM FAILURE reading binary map." << llendl;
+                        llwarns << "STREAM FAILURE reading binary map." << llendl;
                        parse_count = PARSE_FAILURE;
                }
                break;
@@ -924,7 +924,7 @@ S32 LLSDBinaryParser::doParse(std::istream& istr, LLSD& data) const
                }
                if(istr.fail())
                {
-                        llinfos << "STREAM FAILURE reading binary array." << llendl;
+                        llwarns << "STREAM FAILURE reading binary array." << llendl;
                        parse_count = PARSE_FAILURE;
                }
                break;
@@ -949,7 +949,7 @@ S32 LLSDBinaryParser::doParse(std::istream& istr, LLSD& data) const
                data = (S32)ntohl(value_nbo);
                if(istr.fail())
                {
-                        llinfos << "STREAM FAILURE reading binary integer." << llendl;
+                        llwarns << "STREAM FAILURE reading binary integer." << llendl;
                }
                break;
        }
@@ -961,7 +961,7 @@ S32 LLSDBinaryParser::doParse(std::istream& istr, LLSD& data) const
                data = ll_ntohd(real_nbo);
                if(istr.fail())
                {
-                        llinfos << "STREAM FAILURE reading binary real." << llendl;
+                        llwarns << "STREAM FAILURE reading binary real." << llendl;
                }
                break;
        }
@@ -973,7 +973,7 @@ S32 LLSDBinaryParser::doParse(std::istream& istr, LLSD& data) const
                data = id;
                if(istr.fail())
                {
-                        llinfos << "STREAM FAILURE reading binary uuid." << llendl;
+                        llwarns << "STREAM FAILURE reading binary uuid." << llendl;
                }
                break;
        }
@@ -994,7 +994,7 @@ S32 LLSDBinaryParser::doParse(std::istream& istr, LLSD& data) const
                }
                if(istr.fail())
                {
-                        llinfos << "STREAM FAILURE reading binary (notation-style) string."
+                        llwarns << "STREAM FAILURE reading binary (notation-style) string."
                                << llendl;
                        parse_count = PARSE_FAILURE;
                }
@@ -1014,7 +1014,7 @@ S32 LLSDBinaryParser::doParse(std::istream& istr, LLSD& data) const
                }
                if(istr.fail())
                {
-                        llinfos << "STREAM FAILURE reading binary string." << llendl;
+                        llwarns << "STREAM FAILURE reading binary string." << llendl;
                        parse_count = PARSE_FAILURE;
                }
                break;
@@ -1033,7 +1033,7 @@ S32 LLSDBinaryParser::doParse(std::istream& istr, LLSD& data) const
                }
                if(istr.fail())
                {
-                        llinfos << "STREAM FAILURE reading binary link." << llendl;
+                        llwarns << "STREAM FAILURE reading binary link." << llendl;
                        parse_count = PARSE_FAILURE;
                }
                break;
@@ -1046,7 +1046,7 @@ S32 LLSDBinaryParser::doParse(std::istream& istr, LLSD& data) const
                data = LLDate(real);
                if(istr.fail())
                {
-                        llinfos << "STREAM FAILURE reading binary date." << llendl;
+                        llwarns << "STREAM FAILURE reading binary date." << llendl;
                        parse_count = PARSE_FAILURE;
                }
                break;
@@ -1075,7 +1075,7 @@ S32 LLSDBinaryParser::doParse(std::istream& istr, LLSD& data) const
                }
                if(istr.fail())
                {
-                        llinfos << "STREAM FAILURE reading binary." << llendl;
+                        llwarns << "STREAM FAILURE reading binary." << llendl;
                        parse_count = PARSE_FAILURE;
                }
                break;
@@ -1083,7 +1083,7 @@ S32 LLSDBinaryParser::doParse(std::istream& istr, LLSD& data) const
        default:
                parse_count = PARSE_FAILURE;
-                llinfos << "Unrecognized character while parsing: int(" << (int)c
+                llwarns << "Unrecognized character while parsing: int(" << (int)c
                        << ")" << llendl;
                break;
        }
diff --git a/linden/indra/llcommon/llsdserialize_xml.cpp b/linden/indra/llcommon/llsdserialize_xml.cpp
index 33206b4..dab6c1d 100644
--- a/linden/indra/llcommon/llsdserialize_xml.cpp
+++ b/linden/indra/llcommon/llsdserialize_xml.cpp
@@ -391,6 +391,14 @@ S32 LLSDXMLParser::Impl::parse(std::istream& input, LLSD& data)
                if (status == XML_STATUS_ERROR)
                {
+                        std::string error_string( XML_ErrorString(XML_GetErrorCode( mParser )));
+                        if ("parsing aborted" != error_string )//end of input
+                        {
+                                S32 line_number = XML_GetCurrentLineNumber( mParser );
+                                llwarns << "LLXmlTree parse failed.  Line " << line_number << ": " 
+                                        << error_string << llendl;
+                        }
                        break;
                }
        }
@@ -408,7 +416,8 @@ S32 LLSDXMLParser::Impl::parse(std::istream& input, LLSD& data)
                {
                        ((char*) buffer)[count ? count - 1 : 0] = '\0';
                }
-                llinfos << "LLSDXMLParser::Impl::parse: XML_STATUS_ERROR parsing:" << (char*) buffer << llendl;
                data = LLSD();
                return LLSDParser::PARSE_FAILURE;
        }
@@ -486,7 +495,13 @@ S32 LLSDXMLParser::Impl::parseLines(std::istream& input, LLSD& data)
        if (status == XML_STATUS_ERROR  
                && !mGracefullStop)
        {
-                llinfos << "LLSDXMLParser::Impl::parseLines: XML_STATUS_ERROR" << llendl;
+                std::string error_string( XML_ErrorString(XML_GetErrorCode( mParser )));
+                if ("parsing aborted" != error_string )//end of input
+                {
+                        S32 line_number = XML_GetCurrentLineNumber( mParser );
+                        llwarns << "LLXmlTree parse failed.  Line " << line_number << ": " 
+                                << error_string << llendl;
+                }
                return LLSDParser::PARSE_FAILURE;
        }
@@ -552,7 +567,9 @@ void LLSDXMLParser::Impl::parsePart(const char* buf, int len)
                XML_Status status = XML_Parse(mParser, buf, len, false);
                if (status == XML_STATUS_ERROR)
                {
-                        llinfos << "Unexpected XML parsing error at start" << llendl;
+                        std::string error_string( XML_ErrorString(XML_GetErrorCode( mParser )) );
+                        llwarns << "Unexpected XML parsing error at start: " << error_string << llendl;
                }
        }
 }
diff --git a/linden/indra/llplugin/llpluginclassmedia.cpp b/linden/indra/llplugin/llpluginclassmedia.cpp
index f0a44f7..31a9d1d 100755
--- a/linden/indra/llplugin/llpluginclassmedia.cpp
+++ b/linden/indra/llplugin/llpluginclassmedia.cpp
@@ -1143,6 +1143,15 @@ void LLPluginClassMedia::setBrowserUserAgent(const std::string& user_agent)
        sendMessage(message);
 }
+#if LL_WINDOWS
+void LLPluginClassMedia::showConsole()
+{
+        LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_INTERNAL, "show_console");
+        sendMessage(message);
+}
+#endif
 void LLPluginClassMedia::crashPlugin()
 {
        LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_INTERNAL, "crash");
diff --git a/linden/indra/llplugin/llpluginclassmedia.h b/linden/indra/llplugin/llpluginclassmedia.h
index 0004971..098312d 100755
--- a/linden/indra/llplugin/llpluginclassmedia.h
+++ b/linden/indra/llplugin/llpluginclassmedia.h
@@ -229,6 +229,11 @@ public:
        std::string getMediaName() const { return mMediaName; };
        std::string getMediaDescription() const { return mMediaDescription; };
+    #if LL_WINDOWS
+        //Open a debug console for this plugin.
+        void showConsole();
+    #endif
        // Crash the plugin.  If you use this outside of a testbed, you will be punished.
        void            crashPlugin();
        
diff --git a/linden/indra/llplugin/llpluginmessage.cpp b/linden/indra/llplugin/llpluginmessage.cpp
index 0810a04..9c4940a 100755
--- a/linden/indra/llplugin/llpluginmessage.cpp
+++ b/linden/indra/llplugin/llpluginmessage.cpp
@@ -368,7 +368,8 @@ std::string LLPluginMessage::generate(void) const
        
        // Pretty XML may be slightly easier to deal with while debugging...
 //      LLSDSerialize::toXML(mMessage, result);
-        LLSDSerialize::toPrettyXML(mMessage, result);
+//      LLSDSerialize::toPrettyXML(mMessage, result);
+        result << mMessage;
        
        return result.str();
 }
@@ -383,10 +384,12 @@ int LLPluginMessage::parse(const std::string &message)
        // clear any previous state
        clear();
-        std::istringstream input(message);
+        std::istringstream input(message);
-        
-        S32 parse_result = LLSDSerialize::fromXML(mMessage, input);
-        
+//      S32 parse_result = LLSDSerialize::fromXML(test, input);
+        S32 parse_result = LLSDSerialize::fromNotation( mMessage, input, LLSDSerialize::SIZE_UNLIMITED) ;
        return (int)parse_result;
 }
diff --git a/linden/indra/llplugin/llpluginprocesschild.cpp b/linden/indra/llplugin/llpluginprocesschild.cpp
index 0d95cac..168236e 100755
--- a/linden/indra/llplugin/llpluginprocesschild.cpp
+++ b/linden/indra/llplugin/llpluginprocesschild.cpp
@@ -42,6 +42,14 @@
 #include "llpluginmessagepipe.h"
 #include "llpluginmessageclasses.h"
+#if LL_WINDOWS
+#include <windows.h>
+#include <fcntl.h>
+#include <io.h>
+#include <iostream>
+#include <fstream>
+#endif
 static const F32 HEARTBEAT_SECONDS = 1.0f;
 static const F32 PLUGIN_IDLE_SECONDS = 1.0f / 100.0f;  // Each call to idle will give the plugin this much time.
@@ -420,6 +428,12 @@ void LLPluginProcessChild::receiveMessageRaw(const std::string &message)
                        {
                                mSleepTime = parsed.getValueReal("time");
                        }
+                #if LL_WINDOWS
+                        else if(message_name == "show_console")
+                        {
+                                createConsole();
+                        }
+                        #endif
                        else if(message_name == "crash")
                        {
                                // Crash the plugin
@@ -569,3 +583,46 @@ void LLPluginProcessChild::deliverQueuedMessages()
                }
        }
 }
+#if LL_WINDOWS
+void LLPluginProcessChild::createConsole()
+{
+        const S32 MAX_CONSOLE_LINES = 500;
+        int h_con_handle;
+        long l_std_handle;
+        CONSOLE_SCREEN_BUFFER_INFO coninfo;
+        FILE *fp;
+        // allocate a console for this app
+        AllocConsole();
+        // set the screen buffer to be big enough to let us scroll text
+        GetConsoleScreenBufferInfo(GetStdHandle(STD_OUTPUT_HANDLE), &coninfo);
+        coninfo.dwSize.Y = MAX_CONSOLE_LINES;
+        SetConsoleScreenBufferSize(GetStdHandle(STD_OUTPUT_HANDLE), coninfo.dwSize);
+        // redirect unbuffered STDOUT to the console
+        l_std_handle = (long)GetStdHandle(STD_OUTPUT_HANDLE);
+        h_con_handle = _open_osfhandle(l_std_handle, _O_TEXT);
+        fp = _fdopen( h_con_handle, "w" );
+        *stdout = *fp;
+        setvbuf( stdout, NULL, _IONBF, 0 );
+        // redirect unbuffered STDIN to the console
+        l_std_handle = (long)GetStdHandle(STD_INPUT_HANDLE);
+        h_con_handle = _open_osfhandle(l_std_handle, _O_TEXT);
+        fp = _fdopen( h_con_handle, "r" );
+        *stdin = *fp;
+        setvbuf( stdin, NULL, _IONBF, 0 );
+        // redirect unbuffered STDERR to the console
+        l_std_handle = (long)GetStdHandle(STD_ERROR_HANDLE);
+        h_con_handle = _open_osfhandle(l_std_handle, _O_TEXT);
+        fp = _fdopen( h_con_handle, "w" );
+        *stderr = *fp;
+        setvbuf( stderr, NULL, _IOFBF, 1024 );  //Assigning a buffer improves speed a LOT, esp on vista/win7
+                      //_IOLBF is borked.
+}
+#endif
+\ No newline at end of file
diff --git a/linden/indra/llplugin/llpluginprocesschild.h b/linden/indra/llplugin/llpluginprocesschild.h
index 5d643d7..6d864bb 100755
--- a/linden/indra/llplugin/llpluginprocesschild.h
+++ b/linden/indra/llplugin/llpluginprocesschild.h
@@ -76,7 +76,11 @@ public:
        // Inherited from LLPluginInstanceMessageListener
        /* virtual */ void receivePluginMessage(const std::string &message);
-        
+#if LL_WINDOWS
+        void createConsole();
+#endif
 private:
        enum EState
diff --git a/linden/indra/llui/lllineeditor.cpp b/linden/indra/llui/lllineeditor.cpp
index 453bb50..c4f9525 100644
--- a/linden/indra/llui/lllineeditor.cpp
+++ b/linden/indra/llui/lllineeditor.cpp
@@ -1344,7 +1344,7 @@ void LLLineEditor::defineMenuCallbacks(LLMenuGL* menu) {
                              "Select All Text",
                              this,
                              (void*)context_enable_selectall);
-        menu->setCtrlResponse(1+LLCallbackInformation::LL_MENU_ITEM_CALL_GL_ON_CLICK,
+        menu->setCtrlResponse(LLCallbackInformation::LL_MENU_ITEM_CALL_GL_ON_CLICK,
                              "Select All Text",
                              this,
                              (void*)context_selectall);
diff --git a/linden/indra/llui/lltexteditor.cpp b/linden/indra/llui/lltexteditor.cpp
index 5bddcbc..dd72a69 100644
--- a/linden/indra/llui/lltexteditor.cpp
+++ b/linden/indra/llui/lltexteditor.cpp
@@ -636,7 +636,7 @@ void LLTextEditor::defineMenuCallbacks(LLMenuGL* menu) {
                              "Select All Text",
                              this,
                              (void*)context_enable_selectall);
-        menu->setCtrlResponse(1+LLCallbackInformation::LL_MENU_ITEM_CALL_GL_ON_CLICK,
+        menu->setCtrlResponse(LLCallbackInformation::LL_MENU_ITEM_CALL_GL_ON_CLICK,
                              "Select All Text",
                              this,
                              (void*)context_selectall);
diff --git a/linden/indra/newview/CMakeLists.txt b/linden/indra/newview/CMakeLists.txt
index 72b2d02..5500a73 100644
--- a/linden/indra/newview/CMakeLists.txt
+++ b/linden/indra/newview/CMakeLists.txt
@@ -330,7 +330,6 @@ set(viewer_SOURCE_FILES
    llpanelplace.cpp
    llpanelskins.cpp
    llpanelvolume.cpp
-    llpanelweb.cpp
    llparcelselection.cpp
    llpatchvertexarray.cpp
    llpolymesh.cpp
@@ -793,7 +792,6 @@ set(viewer_HEADER_FILES
    llpanelplace.h
    llpanelskins.h
    llpanelvolume.h
-    llpanelweb.h
    llparcelselection.h
    llpatchvertexarray.h
    llpolymesh.h
diff --git a/linden/indra/newview/app_settings/logcontrol.xml b/linden/indra/newview/app_settings/logcontrol.xml
index c9e9127..f0db00f 100644
--- a/linden/indra/newview/app_settings/logcontrol.xml
+++ b/linden/indra/newview/app_settings/logcontrol.xml
@@ -90,7 +90,12 @@
              <!--<string>TextureCache</string>-->
              <!--<string>Throttle</string>-->
                                                        <!--<string>Voice</string>-->
+                                                        <!--<string>"VoiceCaps"</string>-->
+                                                        <!--<string>VoiceSession</string>-->
+                                                        <!--<string>VoiceDaemon</string>-->
+                                                        <!--<string>VoiceDevice</string>-->
                                                        <!--<string>VivoxProtocolParser</string>-->
                                                        <!--<string>Wearable</string>-->
              <!--<string>WindLight</string>-->
diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index 80eb65a..1ada9f8 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -39,16 +39,27 @@
    <key>Value</key>
    <integer>0</integer>
  </map>
-  <key>VoiceModule</key>
+  <key>VoiceModuleMumble</key>
  <map>
    <key>Comment</key>
-    <string>Executable file that runs voice. Platform specific parts (like .exe on windows) are added automatically.</string>
+    <string>Executable file that runs mumble voice . Platform specific parts (like .exe on windows) are added automatically, paths are stripped off if present. Defaults to mumble if empty</string>
    <key>Persist</key>
    <integer>1</integer>
    <key>Type</key>
    <string>String</string>
    <key>Value</key>
-    <string>SLVoice</string>
+    <string />
+  </map>
+  <key>VoiceModuleVivox</key>
+  <map>
+    <key>Comment</key>
+    <string>Executable file that runs vivox voice. Platform specific parts (like .exe on windows) are added automatically, paths are stripped off if present. Defaults to SLVoice if empty.</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>String</string>
+    <key>Value</key>
+    <string />
  </map>
  
  <!-- end Aurora-specific settings -->
@@ -204,7 +215,7 @@
  <key>AutoCloseOOC</key>
  <map>
    <key>Comment</key>
-    <string>Auto-close OOC chat (i.e. add \"))\" if not found and \"((\" was used)</string>
+    <string>Auto-close OOC chat (i.e. add &apos;&quot;))&apos;&quot; if not found and &apos;&quot;((&apos;&quot; was used)</string>
    <key>Persist</key>
    <integer>1</integer>
    <key>Type</key>
@@ -459,7 +470,7 @@
    <key>OmitResidentAsLastName</key>
    <map>
      <key>Comment</key>
-      <string>Do not display "Resident" as the last name for new residents in their legacy name</string>
+      <string>Do not display &quot;Resident&quot; as the last name for new residents in their legacy name</string>
      <key>Persist</key>
      <integer>1</integer>
      <key>Type</key>
@@ -639,7 +650,7 @@
  <key>GoAction</key>
  <map>
    <key>Comment</key>
-    <string>How to move for "Go Here" or double-click move. Either "Autopilot" or "Teleport".</string>
+    <string>How to move for &quot;Go Here&quot; or double-click move. Either &quot;Autopilot&quot; or &quot;Teleport&quot;.</string>
    <key>Persist</key>
    <integer>1</integer>
    <key>Type</key>
@@ -1004,6 +1015,17 @@
    <key>Value</key>
    <integer>1</integer>
  </map>
+  <key>ShowTimestamps</key>
+  <map>
+    <key>Comment</key>
+    <string>Show timestamps in chat and IMs</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>1</integer>
+  </map>
  <key>SpeedRez</key>
  <map>
    <key>Comment</key>
@@ -1038,7 +1060,7 @@
    <integer>1</integer>
  </map>
  <key>RenderWaterVoidCulling</key>
-    <map>
+  <map>
    <key>Comment</key>
    <string>Cull void water objects when off-screen.</string>
    <key>Persist</key>
@@ -1060,16 +1082,16 @@
    <integer>0</integer>
  </map>
  <key>ResetFocusOnSelfClick</key>
-                <map>
+  <map>
-                <key>Comment</key>
+    <key>Comment</key>
-                <string>Setting this to TRUE resets your camera when you left-click your avatar</string>
+    <string>Setting this to TRUE resets your camera when you left-click your avatar</string>
-                <key>Persist</key>
+    <key>Persist</key>
-                <integer>1</integer>
+    <integer>1</integer>
-                <key>Type</key>
+    <key>Type</key>
-                <string>Boolean</string>
+    <string>Boolean</string>
-                <key>Value</key>
+    <key>Value</key>
-                <integer>1</integer>
+    <integer>1</integer>
-                </map>
+  </map>
  <key>RezWithLandGroup</key>
  <map>
    <key>Comment</key>
@@ -1513,7 +1535,7 @@
  </map>
  <!-- Begin: OpenRegionInfo -->
-  
  <key>ToggleTeenMode</key>
  <map>
    <key>Comment</key>
@@ -1525,7 +1547,7 @@
    <key>Value</key>
    <integer>1</integer>
  </map>
-  
  <!-- Begin: AO-->
  <key>AOEnabled</key>
@@ -1776,7 +1798,7 @@
    <key>Value</key>
    <integer>1</integer>
  </map>
-  
  <key>DownloadClientTags</key>
  <map>
    <key>Comment</key>
@@ -2131,9 +2153,9 @@
    <key>Value</key>
    <string>English (United States of America)</string>
  </map>
-  
  <!-- End: Spellcheck & Translation -->
-  
  <!-- Begin: RLVa -->
  <key>RestrainedLove</key>
@@ -2205,7 +2227,7 @@
  <key>RLVaEnableWear</key>
  <map>
    <key>Comment</key>
-    <string>Enables the "Wear" option on the inventory item context menu for attachments</string>
+    <string>Enables the &quot;Wear&quot; option on the inventory item context menu for attachments</string>
    <key>Persist</key>
    <integer>1</integer>
    <key>Type</key>
@@ -2227,7 +2249,7 @@
  <key>RLVaHideLockedLayers</key>
  <map>
    <key>Comment</key>
-    <string>Hides "remove outfit" restricted worn clothing layers from @getoufit</string>
+    <string>Hides &quot;remove outfit&quot; restricted worn clothing layers from @getoufit</string>
    <key>Persist</key>
    <integer>1</integer>
    <key>Type</key>
@@ -2260,7 +2282,7 @@
  <key>RLVaShowNameTags</key>
  <map>
    <key>Comment</key>
-    <string>Display of names above avatars is subject to the general "Show Names" setting when @shownames=n restricted</string>
+    <string>Display of names above avatars is subject to the general &quot;Show Names&quot; setting when @shownames=n restricted</string>
    <key>Persist</key>
    <integer>1</integer>
    <key>Type</key>
@@ -2314,7 +2336,7 @@
  </map>
  <!-- End: RLVa -->
-  
  <!-- Begin: socks5 -->
  <key>Socks5ProxyEnabled</key>
@@ -2525,11 +2547,11 @@
    <key>Value</key>
    <integer>-8888888</integer>
  </map>
-  
  <!-- End: full radar (Advanced menu) -->
  <!-- END IMPRUDENCE-SPECIFIC SETTINGS -->
-  
  <key>AFKTimeout</key>
  <map>
    <key>Comment</key>
@@ -2985,7 +3007,7 @@
  <key>AutomaticFly</key>
  <map>
    <key>Comment</key>
-    <string>Fly by holding jump key or using "Fly" command (FALSE = fly by using "Fly" command only)</string>
+    <string>Fly by holding jump key or using &quot;Fly&quot; command (FALSE = fly by using &quot;Fly&quot; command only)</string>
    <key>Persist</key>
    <integer>1</integer>
    <key>Type</key>
@@ -3944,17 +3966,6 @@
    <key>Value</key>
    <real>20.0</real>
  </map>
-  <key>ChatShowTimestamps</key>
-  <map>
-    <key>Comment</key>
-    <string>Show timestamps in chat</string>
-    <key>Persist</key>
-    <integer>1</integer>
-    <key>Type</key>
-    <string>Boolean</string>
-    <key>Value</key>
-    <integer>1</integer>
-  </map>
  <key>ChatVisible</key>
  <map>
    <key>Comment</key>
@@ -5626,7 +5637,7 @@
  <key>DoubleClickAction</key>
  <map>
    <key>Comment</key>
-    <string>What to do when you double-click. Either "None" or "Go".</string>
+    <string>What to do when you double-click. Either &quot;None&quot; or &quot;Go&quot;.</string>
    <key>Persist</key>
    <integer>1</integer>
    <key>Type</key>
@@ -5862,7 +5873,7 @@
  <key>FindLandType</key>
  <map>
    <key>Comment</key>
-    <string>Controls which type of land you are searching for in Find Land interface ("All", "Auction", "For Sale")</string>
+    <string>Controls which type of land you are searching for in Find Land interface (&quot;All&quot;, &quot;Auction&quot;, &quot;For Sale&quot;)</string>
    <key>Persist</key>
    <integer>1</integer>
    <key>Type</key>
@@ -7413,17 +7424,6 @@
    <key>Value</key>
    <integer>0</integer>
  </map>
-  <key>IMShowTimestamps</key>
-  <map>
-    <key>Comment</key>
-    <string>Show timestamps in IM</string>
-    <key>Persist</key>
-    <integer>1</integer>
-    <key>Type</key>
-    <string>Boolean</string>
-    <key>Value</key>
-    <integer>1</integer>
-  </map>
  <key>IgnorePixelDepth</key>
  <map>
    <key>Comment</key>
@@ -7795,7 +7795,7 @@
    <key>LastFindPanel</key>
    <map>
      <key>Comment</key>
-      <string>Controls which find operation appears by default when clicking "Find" button </string>
+      <string>Controls which find operation appears by default when clicking &quot;Find&quot; button </string>
      <key>Persist</key>
      <integer>1</integer>
      <key>Type</key>
@@ -8317,7 +8317,7 @@
  <key>MediaOnAPrimUI</key>
  <map>
    <key>Comment</key>
-    <string>Whether or not to show the "link sharing" UI</string>
+    <string>Whether or not to show the &quot;link sharing&quot; UI</string>
    <key>Persist</key>
    <integer>1</integer>
    <key>Type</key>
@@ -8914,7 +8914,7 @@
    <key>OverlayTitle</key>
    <map>
      <key>Comment</key>
-      <string>Controls watermark text message displayed on screen when "ShowOverlayTitle" is enabled (one word, underscores become spaces)</string>
+      <string>Controls watermark text message displayed on screen when &quot;ShowOverlayTitle&quot; is enabled (one word, underscores become spaces)</string>
      <key>Persist</key>
      <integer>1</integer>
      <key>Type</key>
@@ -13257,7 +13257,7 @@
    <key>UISndHealthReductionThreshold</key>
    <map>
      <key>Comment</key>
-      <string>Amount of health reduction required to trigger "pain" sound</string>
+      <string>Amount of health reduction required to trigger &quot;pain&quot; sound</string>
      <key>Persist</key>
      <integer>1</integer>
      <key>Type</key>
@@ -13290,7 +13290,7 @@
    <key>UISndMoneyChangeThreshold</key>
    <map>
      <key>Comment</key>
-      <string>Amount of change in L$ balance required to trigger "money" sound</string>
+      <string>Amount of change in L$ balance required to trigger &quot;money&quot; sound</string>
      <key>Persist</key>
      <integer>1</integer>
      <key>Type</key>
@@ -13587,7 +13587,7 @@
    <key>UseDebugMenus</key>
    <map>
      <key>Comment</key>
-      <string>Turns on "Debug" menu</string>
+      <string>Turns on &quot;Debug&quot; menu</string>
      <key>Persist</key>
      <integer>1</integer>
      <key>Type</key>
diff --git a/linden/indra/newview/hippogridmanager.cpp b/linden/indra/newview/hippogridmanager.cpp
index 78539f8..4c46d3e 100644
--- a/linden/indra/newview/hippogridmanager.cpp
+++ b/linden/indra/newview/hippogridmanager.cpp
@@ -89,7 +89,7 @@ HippoGridInfo::HippoGridInfo(const std::string& gridNick) :
        mPasswordAvatar(LLStringUtil::null),
        mXmlState(XML_VOID),
        mVoiceConnector("SLVoice"),
-        mRenderCompat(true),
+        mRenderCompat(false),
        mMaxAgentGroups(-1),
        mCurrencySymbol("OS$"),
        mRealCurrencySymbol("US$"),
diff --git a/linden/indra/newview/impprefsfonts.cpp b/linden/indra/newview/impprefsfonts.cpp
index a4dcd34..505761b 100644
--- a/linden/indra/newview/impprefsfonts.cpp
+++ b/linden/indra/newview/impprefsfonts.cpp
@@ -51,6 +51,10 @@ ImpPrefsFonts::~ImpPrefsFonts()
 BOOL ImpPrefsFonts::postBuild()
 {
+        childSetValue("ui_scale_slider", gSavedSettings.getF32("UIScaleFactor"));
+        childSetValue("ui_auto_scale", gSavedSettings.getBOOL("UIAutoScale"));
+        childSetAction("reset_ui_size", onClickResetUISize, this);
        refresh();
        return true;
 }
@@ -79,6 +83,9 @@ void ImpPrefsFonts::refresh()
 void ImpPrefsFonts::apply()
 {
+        gSavedSettings.setF32("UIScaleFactor", childGetValue("ui_scale_slider").asReal());
+        gSavedSettings.setBOOL("UIAutoScale", childGetValue("ui_auto_scale"));
        bool changed = false;
        LLRadioGroup* fonts = getChild<LLRadioGroup>("fonts");
@@ -126,3 +133,11 @@ void ImpPrefsFonts::apply()
 void ImpPrefsFonts::cancel()
 {
 }
+// static
+void ImpPrefsFonts::onClickResetUISize(void* user_data)
+{
+        ImpPrefsFonts* self = (ImpPrefsFonts*)user_data;
+        F32 def = gSavedSettings.getControl("UIScaleFactor")->getDefault().asReal();
+        self->childSetValue("ui_scale_slider", def);
+}
diff --git a/linden/indra/newview/impprefsfonts.h b/linden/indra/newview/impprefsfonts.h
index 12aa0bb..0319261 100644
--- a/linden/indra/newview/impprefsfonts.h
+++ b/linden/indra/newview/impprefsfonts.h
@@ -1,6 +1,6 @@
 /**
 * @file impprefsfonts.h
- * @brief Font preferences panel
+ * @brief UI and font preferences panel
 *
 * Copyright (c) 2010, Jacek Antonelli
 *
@@ -40,6 +40,9 @@ public:
        void refresh();
        void apply();
        void cancel();
+        
+private:
+        static void onClickResetUISize(void*);
 };
 #endif // IMP_PREFSFONTS_H
diff --git a/linden/indra/newview/installers/windows/imprudence_installer_script_experimental.iss b/linden/indra/newview/installers/windows/imprudence_installer_script_experimental.iss
index 398c26d..aa31c3b 100644
--- a/linden/indra/newview/installers/windows/imprudence_installer_script_experimental.iss
+++ b/linden/indra/newview/installers/windows/imprudence_installer_script_experimental.iss
@@ -9,11 +9,11 @@
 ; These will change
 AppId={{1B3E68BC-13EB-4277-9439-CB5FF9259460}
 AppName=Imprudence Viewer Experimental
-AppVerName=Imprudence Viewer 1.4.0 Experimental 2011.03.20
+AppVerName=Imprudence Viewer 1.4.0 Experimental 2011.04.19
 DefaultDirName={pf}\ImprudenceExperimental
 DefaultGroupName=Imprudence Viewer Experimental
 VersionInfoProductName=Imprudence Viewer Experimental
-OutputBaseFilename=Imprudence-1.4.0-Experimental-2011.03.20-Setup
+OutputBaseFilename=Imprudence-1.4.0-Experimental-2011.04.19-Setup
 VersionInfoVersion=1.4.0
 VersionInfoTextVersion=1.4.0
 VersionInfoProductVersion=1.4.0
diff --git a/linden/indra/newview/kowopenregionsettings.cpp b/linden/indra/newview/kowopenregionsettings.cpp
index 0c4bb38..6257147 100644
--- a/linden/indra/newview/kowopenregionsettings.cpp
+++ b/linden/indra/newview/kowopenregionsettings.cpp
@@ -36,7 +36,6 @@
 #include "llviewerobject.h"
 #include "llfloaterregioninfo.h"
 #include "llfloaterworldmap.h"
-#include "llvoiceclient.h"
 #include "viewertime.h"
 //DEBUG includes
@@ -205,12 +204,7 @@ class OpenRegionInfoUpdate : public LLHTTPNode
                {
                        gHippoLimits->mAllowParcelWindLight = body["AllowParcelWindLight"].asInteger() == 1;
                }
-                if ( body.has("Voice") )
-                {
-                        gSavedSettings.setString("VoiceModule", body["Voice"].asString());
-                        //gVoiceClient->close();
-                        //gVoiceClient->start();
-                }
                if (limitschanged)
                        gFloaterTools->updateToolsSizeLimits();
diff --git a/linden/indra/newview/llface.cpp b/linden/indra/newview/llface.cpp
index aa8cd15..cf681fa 100644
--- a/linden/indra/newview/llface.cpp
+++ b/linden/indra/newview/llface.cpp
@@ -159,6 +159,7 @@ void LLFace::init(LLDrawable* drawablep, LLViewerObject* objp)
        mIndicesIndex   = 0;
        mTexture                = NULL;
        mTEOffset               = -1;
+        mIndexInTex             = 0;
        setDrawable(drawablep);
        mVObjp = objp;
diff --git a/linden/indra/newview/llface.h b/linden/indra/newview/llface.h
index e31b93f..f870370 100644
--- a/linden/indra/newview/llface.h
+++ b/linden/indra/newview/llface.h
@@ -228,7 +228,7 @@ private:
        U16                     mGeomIndex;                     // index into draw pool
        U32                     mIndicesCount;
        U32                     mIndicesIndex;          // index into draw pool for indices (yeah, I know!)
-        S32                     mIndexInTex ;
+        S32                     mIndexInTex ;           // index of this face in the texture's face list
        //previous rebuild's geometry info
        U16                     mLastGeomCount;
diff --git a/linden/indra/newview/llfloaterchat.cpp b/linden/indra/newview/llfloaterchat.cpp
index f3d71d7..1142e5c 100644
--- a/linden/indra/newview/llfloaterchat.cpp
+++ b/linden/indra/newview/llfloaterchat.cpp
@@ -216,7 +216,7 @@ void add_timestamped_line(LLViewerTextEditor* edit, LLChat chat, const LLColor4&
 {
        std::string line = chat.mText;
        bool prepend_newline = true;
-        if (gSavedSettings.getBOOL("ChatShowTimestamps"))
+        if (gSavedSettings.getBOOL("ShowTimestamps"))
        {
                edit->appendTime(prepend_newline);
                prepend_newline = false;
diff --git a/linden/indra/newview/llfloaterpreference.cpp b/linden/indra/newview/llfloaterpreference.cpp
index 52192b8..d518eac 100644
--- a/linden/indra/newview/llfloaterpreference.cpp
+++ b/linden/indra/newview/llfloaterpreference.cpp
@@ -60,7 +60,6 @@
 #include "llpanellogin.h"
 #include "llpanelLCD.h"
 #include "llpanelmsgs.h"
-#include "llpanelweb.h"
 #include "llpanelskins.h"
 #include "llprefsadvanced.h"
 #include "llprefschat.h"
@@ -151,10 +150,6 @@ LLPreferenceCore::LLPreferenceCore(LLTabContainer* tab_container, LLButton * def
        mTabContainer->addTabPanel(mNetworkPanel, mNetworkPanel->getLabel(), FALSE, onTabChanged, mTabContainer);
        mNetworkPanel->setDefaultBtn(default_btn);
-        mWebPanel = new LLPanelWeb();
-        mTabContainer->addTabPanel(mWebPanel, mWebPanel->getLabel(), FALSE, onTabChanged, mTabContainer);
-        mWebPanel->setDefaultBtn(default_btn);
        mDisplayPanel = new LLPanelDisplay();
        mTabContainer->addTabPanel(mDisplayPanel, mDisplayPanel->getLabel(), FALSE, onTabChanged, mTabContainer);
        mDisplayPanel->setDefaultBtn(default_btn);
@@ -167,10 +162,6 @@ LLPreferenceCore::LLPreferenceCore(LLTabContainer* tab_container, LLButton * def
        mTabContainer->addTabPanel(mPrefsChat->getPanel(), mPrefsChat->getPanel()->getLabel(), FALSE, onTabChanged, mTabContainer);
        mPrefsChat->getPanel()->setDefaultBtn(default_btn);
-        mPrefsColors = new LLPrefsColors();
-        mTabContainer->addTabPanel(mPrefsColors, mPrefsColors->getLabel(), FALSE, onTabChanged, mTabContainer);
-        mPrefsColors->setDefaultBtn(default_btn);
        mPrefsIM = new LLPrefsIM();
        mTabContainer->addTabPanel(mPrefsIM->getPanel(), mPrefsIM->getPanel()->getLabel(), FALSE, onTabChanged, mTabContainer);
        mPrefsIM->getPanel()->setDefaultBtn(default_btn);
@@ -197,6 +188,10 @@ LLPreferenceCore::LLPreferenceCore(LLTabContainer* tab_container, LLButton * def
        mMsgPanel = new LLPanelMsgs();
        mTabContainer->addTabPanel(mMsgPanel, mMsgPanel->getLabel(), FALSE, onTabChanged, mTabContainer);
        mMsgPanel->setDefaultBtn(default_btn);
+        mPrefsColors = new LLPrefsColors();
+        mTabContainer->addTabPanel(mPrefsColors, mPrefsColors->getLabel(), FALSE, onTabChanged, mTabContainer);
+        mPrefsColors->setDefaultBtn(default_btn);
        
        mSkinsPanel = new LLPanelSkins();
        mTabContainer->addTabPanel(mSkinsPanel, mSkinsPanel->getLabel(), FALSE, onTabChanged, mTabContainer);
@@ -259,11 +254,6 @@ LLPreferenceCore::~LLPreferenceCore()
                delete mMsgPanel;
                mMsgPanel = NULL;
        }
-        if (mWebPanel)
-        {
-                delete mWebPanel;
-                mWebPanel = NULL;
-        }
        if (mSkinsPanel)
        {
                delete mSkinsPanel;
@@ -306,7 +296,6 @@ void LLPreferenceCore::apply()
        // hardware menu apply
        LLFloaterHardwareSettings::instance()->apply();
-        mWebPanel->apply();
 #if LL_LCD_COMPILE
        // only add this option if we actually have a logitech keyboard / speaker set
        if (gLcdScreen->Enabled())
@@ -314,7 +303,6 @@ void LLPreferenceCore::apply()
                mLCDPanel->apply();
        }
 #endif
-//      mWebPanel->apply();
 }
@@ -337,7 +325,6 @@ void LLPreferenceCore::cancel()
        // cancel hardware menu
        LLFloaterHardwareSettings::instance()->cancel();
-        mWebPanel->cancel();
 #if LL_LCD_COMPILE
        // only add this option if we actually have a logitech keyboard / speaker set
        if (gLcdScreen->Enabled())
@@ -345,7 +332,6 @@ void LLPreferenceCore::cancel()
                mLCDPanel->cancel();
        }
 #endif
-//      mWebPanel->cancel();
 }
 // static
@@ -359,7 +345,8 @@ void LLPreferenceCore::onTabChanged(void* user_data, bool from_click)
 void LLPreferenceCore::setPersonalInfo(const std::string& visibility, bool im_via_email, const std::string& email)
 {
-        mPrefsIM->setPersonalInfo(visibility, im_via_email, email);
+        mPrefsIM->setPersonalInfo(visibility);
+        mPrefsChat->setPersonalInfo(im_via_email, email);
 }
 void LLPreferenceCore::updateIsLoggedIn(bool enable)
diff --git a/linden/indra/newview/llfloaterpreference.h b/linden/indra/newview/llfloaterpreference.h
index d5eccbc..ae4f4d9 100644
--- a/linden/indra/newview/llfloaterpreference.h
+++ b/linden/indra/newview/llfloaterpreference.h
@@ -48,7 +48,6 @@ class LLPanelDisplay;
 class LLPanelAudioPrefs;
 class LLPanelDebug;
 class LLPanelNetwork;
-class LLPanelWeb;
 class LLMessageSystem;
 class LLPrefsChat;
 class LLPrefsVoice;
@@ -92,7 +91,6 @@ private:
        LLPrefsChat                             *mPrefsChat;
        LLPrefsVoice                    *mPrefsVoice;
        LLPrefsIM                               *mPrefsIM;
-        LLPanelWeb                              *mWebPanel;
        LLPanelMsgs                             *mMsgPanel;
        LLPanelLCD                              *mLCDPanel;
        LLPrefsAdvanced                 *mPrefsAdvanced;
diff --git a/linden/indra/newview/llhudeffectlookat.cpp b/linden/indra/newview/llhudeffectlookat.cpp
index ccd723f..333bd13 100644
--- a/linden/indra/newview/llhudeffectlookat.cpp
+++ b/linden/indra/newview/llhudeffectlookat.cpp
@@ -702,6 +702,11 @@ bool LLHUDEffectLookAt::calcTargetPosition()
        LLVOAvatar* source_avatar = (LLVOAvatar*)(LLViewerObject*)mSourceObject;
+        if (!source_avatar->isBuilt())
+        {
+                return false;
+        }
        if (target_obj && target_obj->mDrawable.notNull())
        {
                LLQuaternion target_rot;
diff --git a/linden/indra/newview/llimpanel.cpp b/linden/indra/newview/llimpanel.cpp
index a3e917f..5f6624b 100644
--- a/linden/indra/newview/llimpanel.cpp
+++ b/linden/indra/newview/llimpanel.cpp
@@ -1618,7 +1618,7 @@ void LLFloaterIMPanel::addHistoryLine(const std::string &utf8msg, const LLColor4
        // Actually add the line
        std::string timestring;
        bool prepend_newline = true;
-        if (gSavedSettings.getBOOL("IMShowTimestamps"))
+        if (gSavedSettings.getBOOL("ShowTimestamps"))
        {
                timestring = mHistoryEditor->appendTime(prepend_newline);
                prepend_newline = false;
diff --git a/linden/indra/newview/llpaneldisplay.cpp b/linden/indra/newview/llpaneldisplay.cpp
index a5c0d97..9ee7dc3 100644
--- a/linden/indra/newview/llpaneldisplay.cpp
+++ b/linden/indra/newview/llpaneldisplay.cpp
@@ -120,7 +120,6 @@ BOOL LLPanelDisplay::postBuild()
        mCtrlWindowed->setCallbackUserData(this);
        mAspectRatioLabel1 = getChild<LLTextBox>("AspectRatioLabel1");
-        mFullScreenInfo = getChild<LLTextEditor>("FullScreenInfo");
        mDisplayResLabel = getChild<LLTextBox>("DisplayResLabel");
        S32 num_resolutions = 0;
@@ -229,7 +228,7 @@ BOOL LLPanelDisplay::postBuild()
        mCtrlReflections = getChild<LLCheckBoxCtrl>("Reflections");
        mCtrlReflections->setCommitCallback(&LLPanelDisplay::onVertexShaderEnable);
        mCtrlReflections->setCallbackUserData(this);
-        mRadioReflectionDetail = getChild<LLRadioGroup>("ReflectionDetailRadio");
+        mComboReflectionDetail = getChild<LLComboBox>("ReflectionDetailCombo");
        
        // WindLight
        mCtrlWindLight = getChild<LLCheckBoxCtrl>("WindLightUseAtmosShaders");
@@ -251,11 +250,11 @@ BOOL LLPanelDisplay::postBuild()
        //----------------------------------------------------------------------------
        // radio set for lighting detail
-        mRadioLightingDetail2 = getChild<LLRadioGroup>("LightingDetailRadio");
+        mComboLightingDetail = getChild<LLComboBox>("LightingDetailCombo");
        //----------------------------------------------------------------------------
        // radio set for terrain detail mode
-        mRadioTerrainDetail = getChild<LLRadioGroup>("TerrainDetailRadio");
+        mComboTerrainDetail = getChild<LLComboBox>("TerrainDetailCombo");
        //----------------------------------------------------------------------------
        // Global Shader Enable
@@ -316,7 +315,6 @@ BOOL LLPanelDisplay::postBuild()
        // Avatar imposter count
        mCtrlAvatarMaxVisible = getChild<LLSliderCtrl>("AvatarMaxVisible");
-        mAvatarCountText = getChild<LLTextBox>("AvatarCountText");
        // Text boxes (for enabling/disabling)
        mShaderText = getChild<LLTextBox>("ShadersText");
@@ -325,10 +323,7 @@ BOOL LLPanelDisplay::postBuild()
        mTerrainText = getChild<LLTextBox>("TerrainDetailText");
        mLightingText = getChild<LLTextBox>("LightingDetailText");
        mMeshDetailText = getChild<LLTextBox>("MeshDetailText");
+        mLimitsText = getChild<LLTextBox>("LimitsText");
-        static BOOL* sEnableWindlightRemote = rebind_llcontrol<BOOL>("EnableWindlightRemote", &gSavedSettings, true);
-        childSetValue("toggle_windlight_control", (*sEnableWindlightRemote));
-        mWLControl = (*sEnableWindlightRemote);
        refresh();
@@ -420,10 +415,6 @@ void LLPanelDisplay::refresh()
        mLightingDetail = gSavedSettings.getS32("RenderLightingDetail");
        mTerrainDetail =  gSavedSettings.getS32("RenderTerrainDetail");
-        // windlight remote
-        static BOOL* sEnableWindlightRemote = rebind_llcontrol<BOOL>("EnableWindlightRemote", &gSavedSettings, true);
-        mWLControl = (*sEnableWindlightRemote);
        // max avatar count
        mAvatarMaxVisible = gSavedSettings.getS32("RenderAvatarMaxVisible");
@@ -449,7 +440,6 @@ void LLPanelDisplay::refreshEnabledState()
        mCtrlAspectRatio->setVisible(isFullScreen);
        mAspectRatioLabel1->setVisible(isFullScreen);
        mCtrlAutoDetectAspect->setVisible(isFullScreen);
-        mFullScreenInfo->setVisible(!isFullScreen);
        mWindowSizeLabel->setVisible(!isFullScreen);
        // disable graphics settings and exit if it's not set to custom
@@ -475,10 +465,7 @@ void LLPanelDisplay::refreshEnabledState()
        bool bumpshiny = gGLManager.mHasCubeMap && LLCubeMap::sUseCubeMaps && LLFeatureManager::getInstance()->isFeatureAvailable("RenderObjectBump");
        mCtrlBumpShiny->setEnabled(bumpshiny ? TRUE : FALSE);
        
-        for (S32 i = 0; i < mRadioReflectionDetail->getItemCount(); ++i)
+        mComboReflectionDetail->setEnabled(mCtrlReflections->get() && reflections);
-        {
-                mRadioReflectionDetail->setIndexEnabled(i, mCtrlReflections->get() && reflections);
-        }
        // Avatar Mode
        S32 max_avatar_shader = LLViewerShaderMgr::instance()->mMaxAvatarShaderLevel;
@@ -505,12 +492,12 @@ void LLPanelDisplay::refreshEnabledState()
        BOOL shaders = mCtrlShaderEnable->get();
        if (shaders)
        {
-                mRadioTerrainDetail->setValue(1);
+                mComboTerrainDetail->setValue(1);
-                mRadioTerrainDetail->setEnabled(FALSE);
+                mComboTerrainDetail->setEnabled(FALSE);
        }
        else
        {
-                mRadioTerrainDetail->setEnabled(TRUE);
+                mComboTerrainDetail->setEnabled(TRUE);
        }
        // *HACK just checks to see if we can use shaders... 
@@ -588,7 +575,6 @@ void LLPanelDisplay::disableUnavailableSettings()
        }
        
        mCtrlAvatarMaxVisible->setEnabled(mCtrlAvatarImpostors->getValue().asBoolean());
-        mAvatarCountText->setEnabled(mCtrlAvatarImpostors->getValue().asBoolean());
 }
 void LLPanelDisplay::setHiddenGraphicsState(bool isHidden)
@@ -622,10 +608,10 @@ void LLPanelDisplay::setHiddenGraphicsState(bool isHidden)
        llassert(mCtrlShaderEnable != NULL);
        llassert(mCtrlAvatarImpostors != NULL);
        llassert(mCtrlAvatarCloth != NULL);
-        llassert(mRadioLightingDetail2 != NULL);
+        llassert(mComboLightingDetail != NULL);
-        llassert(mRadioTerrainDetail != NULL);
+        llassert(mComboTerrainDetail != NULL);
-        llassert(mRadioReflectionDetail != NULL);
+        llassert(mComboReflectionDetail != NULL);
        llassert(mMeshDetailText != NULL);
        llassert(mShaderText != NULL);
@@ -633,7 +619,7 @@ void LLPanelDisplay::setHiddenGraphicsState(bool isHidden)
        llassert(mAvatarText != NULL);
        llassert(mLightingText != NULL);
        llassert(mTerrainText != NULL);
-        llassert(mAvatarCountText != NULL);
+        llassert(mLimitsText != NULL);
        // enable/disable the states
        mGraphicsBorder->setVisible(!isHidden);
@@ -668,10 +654,10 @@ void LLPanelDisplay::setHiddenGraphicsState(bool isHidden)
        mCtrlShaderEnable->setVisible(!isHidden);
        mCtrlAvatarImpostors->setVisible(!isHidden);
        mCtrlAvatarCloth->setVisible(!isHidden);
-        mRadioLightingDetail2->setVisible(!isHidden);
+        mComboLightingDetail->setVisible(!isHidden);
-        mRadioTerrainDetail->setVisible(!isHidden);
+        mComboTerrainDetail->setVisible(!isHidden);
-        mRadioReflectionDetail->setVisible(!isHidden);
+        mComboReflectionDetail->setVisible(!isHidden);
        // text boxes
        mShaderText->setVisible(!isHidden);
@@ -679,8 +665,7 @@ void LLPanelDisplay::setHiddenGraphicsState(bool isHidden)
        mAvatarText->setVisible(!isHidden);
        mLightingText->setVisible(!isHidden);
        mTerrainText->setVisible(!isHidden);
-        mAvatarCountText->setVisible(!isHidden);
+        mLimitsText->setVisible(!isHidden);
        mMeshDetailText->setVisible(!isHidden);
        mCtrlAvatarMaxVisible->setVisible(!isHidden);
@@ -719,8 +704,6 @@ void LLPanelDisplay::cancel()
        gSavedSettings.setS32("RenderMaxPartCount", mParticleCount);
        gSavedSettings.setS32("RenderGlowResolutionPow", mPostProcess);
-        gSavedSettings.setBOOL("EnableWindlightRemote", mWLControl);
        gSavedSettings.setS32("RenderAvatarMaxVisible", mAvatarMaxVisible);
 }
@@ -992,5 +975,4 @@ void LLPanelDisplay::onImpostorsEnable(LLUICtrl* ctrl, void* user_data)
        LLCheckBoxCtrl* checkbox = (LLCheckBoxCtrl*)ctrl;
        self->mCtrlAvatarMaxVisible->setEnabled(checkbox->getValue().asBoolean());
-        self->mAvatarCountText->setEnabled(checkbox->getValue().asBoolean());
 }
diff --git a/linden/indra/newview/llpaneldisplay.h b/linden/indra/newview/llpaneldisplay.h
index d7727e7..e64e9ba 100644
--- a/linden/indra/newview/llpaneldisplay.h
+++ b/linden/indra/newview/llpaneldisplay.h
@@ -113,14 +113,13 @@ protected:
        LLCheckBoxCtrl  *mCtrlShaderEnable;
        LLCheckBoxCtrl  *mCtrlAvatarImpostors;
        LLCheckBoxCtrl  *mCtrlAvatarCloth;
-        LLRadioGroup    *mRadioLightingDetail2;
+        LLComboBox              *mComboLightingDetail;
-        LLRadioGroup    *mRadioTerrainDetail;
+        LLComboBox              *mComboTerrainDetail;
-        LLRadioGroup    *mRadioReflectionDetail;
+        LLComboBox              *mComboReflectionDetail;
        LLTextBox               *mAspectRatioLabel1;
        LLTextBox               *mDisplayResLabel;
-        LLTextEditor    *mFullScreenInfo;
        LLTextBox       *mWindowSizeLabel;
        
        LLTextBox               *mShaderText;
@@ -137,7 +136,7 @@ protected:
        LLTextBox               *mTerrainFactorText;
        LLTextBox               *mSkyFactorText;
        LLTextBox               *mPostProcessText;
-        LLTextBox               *mAvatarCountText;
+        LLTextBox               *mLimitsText;
        BOOL mFSAutoDetectAspect;
        F32 mAspectRatio;
@@ -173,8 +172,6 @@ protected:
        S32 mAvatarMaxVisible;
-        BOOL mWLControl;
        static void setGraphicsSettings(LLControlGroup& group);
        static void createGroup();
diff --git a/linden/indra/newview/llpanelgeneral.cpp b/linden/indra/newview/llpanelgeneral.cpp
index 70146ce..ac957ed 100644
--- a/linden/indra/newview/llpanelgeneral.cpp
+++ b/linden/indra/newview/llpanelgeneral.cpp
@@ -36,7 +36,7 @@
 #include "llpanelgeneral.h"
 // project includes
-#include "llcolorswatch.h"
+#include "llcheckboxctrl.h"
 #include "llcombobox.h"
 #include "lluictrlfactory.h"
 #include "llurlsimstring.h"
@@ -90,28 +90,25 @@ BOOL LLPanelGeneral::postBuild()
        childSetValue("show_location_checkbox", gSavedSettings.getBOOL("ShowStartLocation"));
        childSetValue("show_all_title_checkbox", gSavedSettings.getBOOL("RenderHideGroupTitleAll"));
        childSetValue("show_my_name_checkbox", gSavedSettings.getBOOL("RenderNameHideSelf"));
-        childSetValue("small_avatar_names_checkbox", gSavedSettings.getBOOL("SmallAvatarNames"));
+        childSetValue("large_avatar_names_checkbox", !gSavedSettings.getBOOL("SmallAvatarNames"));
        childSetValue("highlight_friends_checkbox", gSavedSettings.getBOOL("HighlightFriends"));
-        childSetValue("show_my_title_checkbox", gSavedSettings.getBOOL("RenderHideGroupTitle"));
+        //childSetValue("show_my_title_checkbox", gSavedSettings.getBOOL("RenderHideGroupTitle")); -- MC
-        childSetValue("afk_timeout_spinner", gSavedSettings.getF32("AFKTimeout"));
+        childSetEnabled("afk_timeout_spinner", gSavedSettings.getBOOL("AllowIdleAFK"));
+        childSetValue("afk_timeout_spinner", llround(gSavedSettings.getF32("AFKTimeout") / 60)); // User enters minutes, we store as seconds -- MC
        childSetValue("afk_timeout_checkbox", gSavedSettings.getBOOL("AllowIdleAFK"));
+        childSetCommitCallback("afk_timeout_checkbox", onCommitAFKCheckbox, this);
        childSetValue("mini_map_notify_chat", gSavedSettings.getBOOL("MiniMapNotifyChatRange"));
        childSetValue("mini_map_notify_sim", gSavedSettings.getBOOL("MiniMapNotifySimRange"));
 //      mDisplayNamesUsage =  gSavedSettings.getU32("DisplayNamesUsage");
 //      mLegacyNamesForFriends =  gSavedSettings.getBOOL("LegacyNamesForFriends");
-        getChild<LLColorSwatchCtrl>("effect_color_swatch")->set(gSavedSettings.getColor4("EffectColor"));
-        childSetValue("ui_scale_slider", gSavedSettings.getF32("UIScaleFactor"));
-        childSetValue("ui_auto_scale", gSavedSettings.getBOOL("UIAutoScale"));
        LLComboBox* time_combobox = getChild<LLComboBox>("time_combobox");
        time_combobox->setCurrentByIndex(gSavedSettings.getU32("TimeFormat"));
        
        childSetValue("language_combobox",      gSavedSettings.getString("Language"));
-        childSetAction("reset_ui_size", onClickResetUISize, this);
        
        // if we have no agent, we can't let them choose anything
        // if we have an agent, then we only let them choose if they have a choice
@@ -166,16 +163,13 @@ void LLPanelGeneral::apply()
        gSavedSettings.setBOOL("ShowStartLocation", childGetValue("show_location_checkbox"));
        gSavedSettings.setBOOL("RenderHideGroupTitleAll", childGetValue("show_all_title_checkbox"));
        gSavedSettings.setBOOL("RenderNameHideSelf", childGetValue("show_my_name_checkbox"));
-        gSavedSettings.setBOOL("SmallAvatarNames", childGetValue("small_avatar_names_checkbox"));
+        gSavedSettings.setBOOL("SmallAvatarNames", !childGetValue("large_avatar_names_checkbox"));
        gSavedSettings.setBOOL("HighlightFriends", childGetValue("highlight_friends_checkbox"));
-        gSavedSettings.setBOOL("RenderHideGroupTitle", childGetValue("show_my_title_checkbox"));
+        //gSavedSettings.setBOOL("RenderHideGroupTitle", childGetValue("show_my_title_checkbox")); -- MC
-        gSavedSettings.setF32("AFKTimeout", childGetValue("afk_timeout_spinner").asReal());
+        gSavedSettings.setF32("AFKTimeout", 60 * childGetValue("afk_timeout_spinner").asReal()); // User enters minutes, we store as seconds -- MC
        gSavedSettings.setBOOL("AllowIdleAFK", childGetValue("afk_timeout_checkbox"));
        gSavedSettings.setBOOL("MiniMapNotifyChatRange", childGetValue("mini_map_notify_chat"));
        gSavedSettings.setBOOL("MiniMapNotifySimRange", childGetValue("mini_map_notify_sim"));
-        gSavedSettings.setColor4("EffectColor", childGetValue("effect_color_swatch"));
-        gSavedSettings.setF32("UIScaleFactor", childGetValue("ui_scale_slider").asReal());
-        gSavedSettings.setBOOL("UIAutoScale", childGetValue("ui_auto_scale"));
        gSavedSettings.setString("Language", childGetValue("language_combobox"));
        /*
@@ -218,14 +212,6 @@ void LLPanelGeneral::cancel()
 }
 // static
-void LLPanelGeneral::onClickResetUISize(void* user_data)
-{
-        LLPanelGeneral* self = (LLPanelGeneral*)user_data;
-        F32 def = gSavedSettings.getControl("UIScaleFactor")->getDefault().asReal();
-        self->childSetValue("ui_scale_slider", def);
-}
-// static
 void LLPanelGeneral::onClickGrid(void *)
 {
        FloaterGridManager::getInstance()->open();
@@ -241,3 +227,14 @@ void LLPanelGeneral::onLocationChanged(LLUICtrl* ctrl, void* data)
                self->getChild<LLComboBox>("default_location_combo")->setTextEntry(LLURLSimString::sInstance.mSimString);
        }
 }
+// static
+void LLPanelGeneral::onCommitAFKCheckbox(LLUICtrl* ctrl, void* data)
+{
+        LLPanelGeneral* self = (LLPanelGeneral*)data;
+        LLCheckBoxCtrl* check = (LLCheckBoxCtrl*)ctrl;
+        if (!self || !check) return;
+        self->childSetEnabled("afk_timeout_spinner", check->get());
+        self->childSetEnabled("minutes_textbox", check->get());
+}
diff --git a/linden/indra/newview/llpanelgeneral.h b/linden/indra/newview/llpanelgeneral.h
index 56cc3de..4080079 100644
--- a/linden/indra/newview/llpanelgeneral.h
+++ b/linden/indra/newview/llpanelgeneral.h
@@ -48,9 +48,9 @@ public:
        void cancel();
        
 private:
-        static void onClickResetUISize(void*);
        static void onClickGrid(void*);
        static void onLocationChanged(LLUICtrl* ctrl, void* data);
+        static void onCommitAFKCheckbox(LLUICtrl* ctrl, void* data);
        U32 mDisplayNamesUsage;
        bool mLegacyNamesForFriends;
diff --git a/linden/indra/newview/llpanelinput.cpp b/linden/indra/newview/llpanelinput.cpp
index 32c4af3..9664b6f 100644
--- a/linden/indra/newview/llpanelinput.cpp
+++ b/linden/indra/newview/llpanelinput.cpp
@@ -31,7 +31,10 @@
 */
 #include "llviewerprecompiledheaders.h"
 #include "llpanelinput.h"
+#include "llcombobox.h"
 #include "lluictrlfactory.h"
 #include "llviewercamera.h"
 #include "llviewercontrol.h"
@@ -60,7 +63,6 @@ BOOL LLPanelInput::postBuild()
        mPreAdjustCameraOffsetScale = gSavedSettings.getF32("CameraOffsetScale");
        childSetValue("mouse_sensitivity", gSavedSettings.getF32("MouseSensitivity"));
-        childSetValue("automatic_fly", gSavedSettings.getBOOL("AutomaticFly"));
        childSetValue("invert_mouse", gSavedSettings.getBOOL("InvertMouse"));
        childSetValue("edit_camera_movement", gSavedSettings.getBOOL("EditCameraMovement"));
        childSetValue("appearance_camera_movement", gSavedSettings.getBOOL("AppearanceCameraMovement"));
@@ -75,6 +77,7 @@ BOOL LLPanelInput::postBuild()
        fov_slider->setValue(LLViewerCamera::getInstance()->getView());
        
        childSetValue("double_click_action", gSavedSettings.getString("DoubleClickAction"));
+        childSetCommitCallback("double_click_action", onCommitAction, this);
        childSetValue("go_action", gSavedSettings.getString("GoAction"));
        childSetValue("Disable camera constraints", gSavedSettings.getBOOL("DisableCameraConstraints"));
@@ -95,7 +98,6 @@ void LLPanelInput::apply()
        mPreAdjustCameraOffsetScale = childGetValue("camera_offset_scale").asReal();
        gSavedSettings.setF32("MouseSensitivity", childGetValue("mouse_sensitivity").asReal());
-        gSavedSettings.setBOOL("AutomaticFly", childGetValue("automatic_fly"));
        gSavedSettings.setBOOL("InvertMouse", childGetValue("invert_mouse"));
        gSavedSettings.setBOOL("EditCameraMovement", childGetValue("edit_camera_movement"));
        gSavedSettings.setBOOL("AppearanceCameraMovement", childGetValue("appearance_camera_movement"));
@@ -130,3 +132,14 @@ void LLPanelInput::onClickJoystickSetup(void* user_data)
        }
 }
+// static
+void LLPanelInput::onCommitAction(LLUICtrl* ctrl, void* user_data)
+{
+        LLPanelInput* self = (LLPanelInput*)user_data;
+        LLComboBox* combo = (LLComboBox*)ctrl;
+        if (self && combo)
+        {
+                self->childSetEnabled("go_action_label", combo->getSimple() == "Go");
+                self->childSetEnabled("go_action", combo->getSimple() == "Go");
+        }
+}
diff --git a/linden/indra/newview/llpanelinput.h b/linden/indra/newview/llpanelinput.h
index 9a2bebe..29bc04e 100644
--- a/linden/indra/newview/llpanelinput.h
+++ b/linden/indra/newview/llpanelinput.h
@@ -47,6 +47,8 @@ public:
 private:
        static void onClickJoystickSetup(void* user_data);
+        static void onCommitAction(LLUICtrl* ctrl, void* user_data);
        F32 mPreAdjustFOV;
        F32 mPreAdjustCameraOffsetScale;
 };
diff --git a/linden/indra/newview/llpanelmsgs.cpp b/linden/indra/newview/llpanelmsgs.cpp
index 9e04070..572bcc3 100644
--- a/linden/indra/newview/llpanelmsgs.cpp
+++ b/linden/indra/newview/llpanelmsgs.cpp
@@ -70,6 +70,8 @@ BOOL LLPanelMsgs::postBuild()
        childSetValue("notify_money_change_checkbox", gSavedSettings.getBOOL("NotifyMoneyChange"));
        childSetLabelArg("notify_money_change_checkbox", "[CURRENCY]", gHippoGridManager->getConnectedGrid()->getCurrencySymbol());
+        childSetValue("friends_online_notify_checkbox", gSavedSettings.getBOOL("ChatOnlineNotification"));
        return TRUE;
 }
@@ -166,6 +168,8 @@ void LLPanelMsgs::apply()
        gSavedSettings.setBOOL("ShowNewInventory", childGetValue("show_new_inventory"));
        gSavedSettings.setBOOL("ShowInInventory", childGetValue("show_in_inventory"));
        gSavedSettings.setBOOL("NotifyMoneyChange", childGetValue("notify_money_change_checkbox"));
+        gSavedSettings.setBOOL("ChatOnlineNotification", childGetValue("friends_online_notify_checkbox").asBoolean());
 }
 void LLPanelMsgs::cancel()
diff --git a/linden/indra/newview/llpanelnetwork.cpp b/linden/indra/newview/llpanelnetwork.cpp
index 3b866eb..b4ebe42 100644
--- a/linden/indra/newview/llpanelnetwork.cpp
+++ b/linden/indra/newview/llpanelnetwork.cpp
@@ -44,6 +44,30 @@
 #include "llviewercontrol.h"
 #include "llviewerwindow.h"
+// project includes
+#include "llcheckboxctrl.h"
+#include "hippogridmanager.h"
+#include "lluictrlfactory.h"
+#include "llviewercontrol.h"
+#include "llviewermedia.h"
+#include "llviewerwindow.h"
+#include "llpluginclassmedia.h"
+#include "hippogridmanager.h"
+#include "llpluginclassmedia.h"
+#include "llviewermedia.h"
+// helper functions for getting/freeing the web browser media
+// if creating/destroying these is too slow, we'll need to create
+// a static member and update all our static callbacks
+viewer_media_t get_web_media()
+{
+        viewer_media_t media_source = LLViewerMedia::newMediaImpl("", LLUUID::null, 0, 0, 0, 0, "text/html");
+        return media_source;
+}
 bool LLPanelNetwork::sSocksSettingsChanged;
 LLPanelNetwork::LLPanelNetwork()
@@ -54,16 +78,16 @@ LLPanelNetwork::LLPanelNetwork()
 BOOL LLPanelNetwork::postBuild()
 {
        std::string cache_location = gDirUtilp->getExpandedFilename(LL_PATH_CACHE, "");
-        childSetText("cache_location", cache_location);
+        childSetText("disk_cache_location", cache_location);
                
-        childSetAction("clear_cache", onClickClearCache, this);
+        childSetAction("clear_disk_cache", onClickClearDiskCache, this);
-        childSetAction("set_cache", onClickSetCache, this);
+        childSetAction("set_disk_cache", onClickSetDiskCache, this);
-        childSetAction("reset_cache", onClickResetCache, this);
+        childSetAction("reset_disk_cache", onClickResetDiskCache, this);
        
        childSetEnabled("connection_port", gSavedSettings.getBOOL("ConnectionPortEnabled"));
        childSetCommitCallback("connection_port_enabled", onCommitPort, this);
-        childSetValue("cache_size", (F32)gSavedSettings.getU32("CacheSize"));
+        childSetValue("disk_cache_size", (F32)gSavedSettings.getU32("CacheSize"));
        childSetValue("max_bandwidth", gSavedSettings.getF32("ThrottleBandwidthKBPS"));
        childSetValue("connection_port_enabled", gSavedSettings.getBOOL("ConnectionPortEnabled"));
        childSetValue("connection_port", (F32)gSavedSettings.getU32("ConnectionPort"));
@@ -99,8 +123,48 @@ BOOL LLPanelNetwork::postBuild()
        // Socks 5 settings, Set all controls and labels enabled state
        updateProxyEnabled(this, gSavedSettings.getBOOL("Socks5ProxyEnabled"), gSavedSettings.getString("Socks5AuthType"));
+        childSetEnabled("xmlrpc_proxy_editor", gSavedSettings.getBOOL("XMLRPCProxyEnabled"));
+        childSetEnabled("xmlrpc_proxy_port", gSavedSettings.getBOOL("XMLRPCProxyEnabled"));
+        childSetEnabled("xmlrpc_proxy_text_label", gSavedSettings.getBOOL("XMLRPCProxyEnabled"));
+        childSetValue("http_texture_check", gSavedSettings.getBOOL("ImagePipelineUseHTTP"));
+        childSetValue("speed_rez_check", gSavedSettings.getBOOL("SpeedRez"));
+        childSetValue("speed_rez_interval_spinner", (F32)gSavedSettings.getU32("SpeedRezInterval"));
+        childSetCommitCallback("speed_rez_check", onCommitSpeedRezCheckBox, this);
        sSocksSettingsChanged = false;
+        // formerly the Web panel -- MC
+        childSetAction("clear_web_cache", onClickClearWebCache, this);
+        childSetCommitCallback("web_proxy_enabled", onCommitWebProxyEnabled, this);
+        std::string value = gSavedSettings.getBOOL("UseExternalBrowser") ? "external" : "internal";
+        childSetValue("use_external_browser", value);
+        childSetValue("cookies_enabled", gSavedSettings.getBOOL("BrowserCookiesEnabled"));
+        childSetAction("clear_cookies", onClickClearCookies,this);
+        childSetValue("web_proxy_enabled", gSavedSettings.getBOOL("BrowserProxyEnabled"));
+        childSetValue("web_proxy_editor", gSavedSettings.getString("BrowserProxyAddress"));
+        childSetValue("web_proxy_port", gSavedSettings.getS32("BrowserProxyPort"));
+        if (gHippoGridManager->getConnectedGrid()->isSecondLife()) 
+        {
+                childSetValue("world_search_editor", gSavedSettings.getString("SearchURLQuery")) ;
+        }
+        else
+        {       
+                childSetValue("world_search_editor", gSavedSettings.getString("SearchURLQueryOpenSim")) ;
+        }
+        childSetAction("world_search_reset_default", onClickSearchDefault, this);
+        childSetAction("world_search_clear", onClickSearchClear, this);
+        childSetEnabled("proxy_text_label", gSavedSettings.getBOOL("BrowserProxyEnabled"));
+        childSetEnabled("web_proxy_editor", gSavedSettings.getBOOL("BrowserProxyEnabled"));
+        childSetEnabled("web_proxy_port", gSavedSettings.getBOOL("BrowserProxyEnabled"));
+        refresh();
        return TRUE;
 }
@@ -112,7 +176,7 @@ LLPanelNetwork::~LLPanelNetwork()
 void LLPanelNetwork::apply()
 {
-        gSavedSettings.setU32("CacheSize", childGetValue("cache_size").asInteger());
+        gSavedSettings.setU32("CacheSize", childGetValue("disk_cache_size").asInteger());
        gSavedSettings.setF32("ThrottleBandwidthKBPS", childGetValue("max_bandwidth").asReal());
        gSavedSettings.setBOOL("ConnectionPortEnabled", childGetValue("connection_port_enabled"));
        gSavedSettings.setU32("ConnectionPort", childGetValue("connection_port").asInteger());
@@ -130,6 +194,10 @@ void LLPanelNetwork::apply()
        gSavedSettings.setString("Socks5Username", childGetValue("socks5_proxy_username"));
        gSavedSettings.setString("Socks5Password", childGetValue("socks5_proxy_password"));
+        gSavedSettings.setBOOL("ImagePipelineUseHTTP", childGetValue("http_texture_check"));
+        gSavedSettings.setBOOL("SpeedRez", childGetValue("speed_rez_check"));
+        gSavedSettings.setU32("SpeedRezInterval", childGetValue("speed_rez_interval_spinner").asReal());
        if (sSocksSettingsChanged)
        {
                if (LLStartUp::getStartupState() != STATE_LOGIN_WAIT)
@@ -142,14 +210,62 @@ void LLPanelNetwork::apply()
                        LLSocks::getInstance()->updated();
                }
        }
+        // formerly the Web panel -- MC
+        gSavedSettings.setBOOL("BrowserCookiesEnabled", childGetValue("cookies_enabled"));
+        bool proxy_enable = childGetValue("web_proxy_enabled");
+        std::string proxy_address = childGetValue("web_proxy_editor");
+        int proxy_port = childGetValue("web_proxy_port");
+        gSavedSettings.setBOOL("BrowserProxyEnabled", proxy_enable);
+        gSavedSettings.setString("BrowserProxyAddress", proxy_address);
+        gSavedSettings.setS32("BrowserProxyPort", proxy_port);
+        LLViewerMedia::setProxyConfig(proxy_enable, proxy_address, proxy_port);
+        if (gHippoGridManager->getConnectedGrid()->isSecondLife()) 
+        {
+                gSavedSettings.setString("SearchURLQuery", childGetValue("world_search_editor"));
+        }
+        else
+        {
+                gSavedSettings.setString("SearchURLQueryOpenSim", childGetValue("world_search_editor"));
+        }
+        bool value = childGetValue("use_external_browser").asString() == "external" ? true : false;
+        gSavedSettings.setBOOL("UseExternalBrowser", value);
+        
+        viewer_media_t media_source = get_web_media();
+        if (media_source && media_source->hasMedia())
+        {
+                media_source->getMediaPlugin()->enable_cookies(childGetValue("cookies_enabled"));
+                bool proxy_enable = childGetValue("web_proxy_enabled");
+                std::string proxy_address = childGetValue("web_proxy_editor");
+                int proxy_port = childGetValue("web_proxy_port");
+                media_source->getMediaPlugin()->proxy_setup(proxy_enable, proxy_address, proxy_port);
+        }
 }
 void LLPanelNetwork::cancel()
 {
 }
+void LLPanelNetwork::refresh()
+{
+        if (childGetValue("speed_rez_check").asBoolean())
+        {
+                childEnable("speed_rez_interval_spinner");
+                childEnable("speed_rez_seconds_text");
+        }
+        else
+        {
+                childDisable("speed_rez_interval_spinner");
+                childDisable("speed_rez_seconds_text");
+        }
+}
 // static
-void LLPanelNetwork::onClickClearCache(void*)
+void LLPanelNetwork::onClickClearDiskCache(void*)
 {
        // flag client cache for clearing next time the client runs
        gSavedSettings.setBOOL("PurgeCacheOnNextStartup", TRUE);
@@ -157,7 +273,7 @@ void LLPanelNetwork::onClickClearCache(void*)
 }
 // static
-void LLPanelNetwork::onClickSetCache(void* user_data)
+void LLPanelNetwork::onClickSetDiskCache(void* user_data)
 {
        LLPanelNetwork* self = (LLPanelNetwork*)user_data;
@@ -173,19 +289,19 @@ void LLPanelNetwork::onClickSetCache(void* user_data)
        std::string dir_name = picker.getDirName();
        if (!dir_name.empty() && dir_name != cur_name)
        {
-                self->childSetText("cache_location", dir_name);
+                self->childSetText("disk_cache_location", dir_name);
                LLNotifications::instance().add("CacheWillBeMoved");
                gSavedSettings.setString("NewCacheLocation", dir_name);
        }
        else
        {
                std::string cache_location = gDirUtilp->getCacheDir();
-                self->childSetText("cache_location", cache_location);
+                self->childSetText("disk_cache_location", cache_location);
        }
 }
 // static
-void LLPanelNetwork::onClickResetCache(void* user_data)
+void LLPanelNetwork::onClickResetDiskCache(void* user_data)
 {
        LLPanelNetwork* self = (LLPanelNetwork*)user_data;
        if (!gSavedSettings.getString("CacheLocation").empty())
@@ -194,7 +310,7 @@ void LLPanelNetwork::onClickResetCache(void* user_data)
                LLNotifications::instance().add("CacheWillBeMoved");
        }
        std::string cache_location = gDirUtilp->getCacheDir(true);
-        self->childSetText("cache_location", cache_location);
+        self->childSetText("disk_cache_location", cache_location);
 }
 // static
@@ -300,3 +416,104 @@ void LLPanelNetwork::updateProxyEnabled(LLPanelNetwork * self, bool enabled, std
        self->childSetEnabled("xmlrpc_proxy_port", !enabled);
        self->childSetEnabled("xmlrpc_proxy_text_label", !enabled);
 }
+// static
+void LLPanelNetwork::onClickClearWebCache(void*)
+{
+        LLNotifications::instance().add("ConfirmClearBrowserCache", LLSD(), LLSD(), callback_clear_browser_cache);
+}
+//static
+bool LLPanelNetwork::callback_clear_browser_cache(const LLSD& notification, const LLSD& response)
+{
+        S32 option = LLNotification::getSelectedOption(notification, response);
+        if ( option == 0 ) // YES
+        {
+                viewer_media_t media_source = get_web_media();
+                if (media_source && media_source->hasMedia())
+                        media_source->getMediaPlugin()->clear_cache();
+        }
+        return false;
+}
+// static
+void LLPanelNetwork::onClickClearCookies(void*)
+{
+        LLNotifications::instance().add("ConfirmClearCookies", LLSD(), LLSD(), callback_clear_cookies);
+}
+//static
+bool LLPanelNetwork::callback_clear_cookies(const LLSD& notification, const LLSD& response)
+{
+        S32 option = LLNotification::getSelectedOption(notification, response);
+        if ( option == 0 ) // YES
+        {
+                viewer_media_t media_source = get_web_media();
+                if (media_source && media_source->hasMedia())
+                        media_source->getMediaPlugin()->clear_cookies();
+        }
+        return false;
+}
+// static
+void LLPanelNetwork::onCommitCookies(LLUICtrl* ctrl, void* data)
+{
+  LLPanelNetwork* self = (LLPanelNetwork*)data;
+  LLCheckBoxCtrl* check = (LLCheckBoxCtrl*)ctrl;
+  if (!self || !check) return;
+  viewer_media_t media_source = get_web_media();
+                if (media_source && media_source->hasMedia())
+          media_source->getMediaPlugin()->enable_cookies(check->get());
+}
+// static
+void LLPanelNetwork::onCommitWebProxyEnabled(LLUICtrl* ctrl, void* data)
+{
+        LLPanelNetwork* self = (LLPanelNetwork*)data;
+        LLCheckBoxCtrl* check = (LLCheckBoxCtrl*)ctrl;
+        if (!self || !check) return;
+        self->childSetEnabled("web_proxy_editor", check->get());
+        self->childSetEnabled("web_proxy_port", check->get());
+        self->childSetEnabled("proxy_text_label", check->get());
+}
+// static
+void LLPanelNetwork::onClickSearchDefault(void* user_data)
+{
+        LLPanelNetwork* self = (LLPanelNetwork*)user_data;
+        LLControlVariable* controlp = 
+                (gHippoGridManager->getConnectedGrid()->isSecondLife()) 
+                ? 
+                gSavedSettings.getControl("SearchURLQuery")
+                :
+                gSavedSettings.getControl("SearchURLQueryOpenSim");
+        if (controlp)
+        {
+                self->childSetValue("world_search_editor",controlp->getDefault().asString()) ;
+        }
+        else
+        {
+                llwarns << "SearchURLQuery or SearchURLQueryOpenSim missing from settings.xml - thats bad!" << llendl;
+        }
+}
+// static
+void LLPanelNetwork::onClickSearchClear(void* user_data)
+{
+        LLPanelNetwork* self = (LLPanelNetwork*)user_data;
+        self->childSetValue("world_search_editor","") ;
+}
+//static
+void LLPanelNetwork::onCommitSpeedRezCheckBox(LLUICtrl* ctrl, void* user_data)
+{
+        LLPanelNetwork* self = (LLPanelNetwork*)user_data;
+        if (self)
+        {
+                self->refresh();
+        }
+}
diff --git a/linden/indra/newview/llpanelnetwork.h b/linden/indra/newview/llpanelnetwork.h
index 628f713..b8e5618 100644
--- a/linden/indra/newview/llpanelnetwork.h
+++ b/linden/indra/newview/llpanelnetwork.h
@@ -47,9 +47,13 @@ public:
        void cancel();
 private:
-        static void onClickClearCache(void*);
+        void refresh();
-        static void onClickSetCache(void*);
-        static void onClickResetCache(void*);
+        static void onCommitSpeedRezCheckBox(LLUICtrl* ctrl, void* user_data);
+        static void onClickClearDiskCache(void*);
+        static void onClickSetDiskCache(void*);
+        static void onClickResetDiskCache(void*);
        static void onCommitPort(LLUICtrl* ctrl, void*);
        static void onCommitXMLRPCProxyEnabled(LLUICtrl* ctrl, void* data);
        static void onCommitSocks5ProxyEnabled(LLUICtrl* ctrl, void* data);
@@ -60,6 +64,16 @@ private:
        
        static bool sSocksSettingsChanged;
+        // formerly the web panel -- MC
+        static void onClickClearWebCache(void*);
+        static void onClickClearCookies(void*);
+        static void onClickSearchDefault(void* user_data);
+        static void onClickSearchClear(void* user_data);
+        static bool callback_clear_browser_cache(const LLSD& notification, const LLSD& response);
+        static bool callback_clear_cookies(const LLSD& notification, const LLSD& response);
+        static void onCommitCookies(LLUICtrl* ctrl, void* data);
+        static void onCommitWebProxyEnabled(LLUICtrl* ctrl, void* data);
 };
 #endif
diff --git a/linden/indra/newview/llpanelweb.cpp b/linden/indra/newview/llpanelweb.cpp
deleted file mode 100644
index 93441dd..0000000
--- a/linden/indra/newview/llpanelweb.cpp
+++ /dev/null
@@ -1,234 +0,0 @@
-/** 
- * @file LLPanelWeb.cpp
- * @brief Network preferences panel
- *
- * $LicenseInfo:firstyear=2001&license=viewergpl$
- * 
- * Copyright (c) 2001-2009, Linden Research, Inc.
- * 
- * Second Life Viewer Source Code
- * The source code in this file ("Source Code") is provided by Linden Lab
- * to you under the terms of the GNU General Public License, version 2.0
- * ("GPL"), unless you have obtained a separate licensing agreement
- * ("Other License"), formally executed by you and Linden Lab.  Terms of
- * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
- * 
- * There are special exceptions to the terms and conditions of the GPL as
- * it is applied to this Source Code. View the full text of the exception
- * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at
- * http://secondlifegrid.net/programs/open_source/licensing/flossexception
- * 
- * By copying, modifying or distributing this software, you acknowledge
- * that you have read and understood your obligations described above,
- * and agree to abide by those obligations.
- * 
- * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
- * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
- * COMPLETENESS OR PERFORMANCE.
- * $/LicenseInfo$
- */
-#include "llviewerprecompiledheaders.h"
-// file include
-#include "llpanelweb.h"
-// project includes
-#include "llcheckboxctrl.h"
-#include "hippogridmanager.h"
-#include "lluictrlfactory.h"
-#include "llviewercontrol.h"
-#include "llviewermedia.h"
-#include "llviewerwindow.h"
-#include "llpluginclassmedia.h"
-// helper functions for getting/freeing the web browser media
-// if creating/destroying these is too slow, we'll need to create
-// a static member and update all our static callbacks
-viewer_media_t get_web_media()
-{
-        viewer_media_t media_source = LLViewerMedia::newMediaImpl("", LLUUID::null, 0, 0, 0, 0, "text/html");
-        return media_source;
-}
-LLPanelWeb::LLPanelWeb()
-{
-        LLUICtrlFactory::getInstance()->buildPanel(this, "panel_preferences_web.xml");
-}
-BOOL LLPanelWeb::postBuild()
-{
-        childSetAction("clear_cache", onClickClearCache, this);
-        childSetCommitCallback("web_proxy_enabled", onCommitWebProxyEnabled, this);
-        std::string value = gSavedSettings.getBOOL("UseExternalBrowser") ? "external" : "internal";
-        childSetValue("use_external_browser", value);
-        childSetValue("cookies_enabled", gSavedSettings.getBOOL("BrowserCookiesEnabled"));
-        childSetAction("clear_cookies", onClickClearCookies,this);
-        childSetValue("web_proxy_enabled", gSavedSettings.getBOOL("BrowserProxyEnabled"));
-        childSetValue("web_proxy_editor", gSavedSettings.getString("BrowserProxyAddress"));
-        childSetValue("web_proxy_port", gSavedSettings.getS32("BrowserProxyPort"));
-        if (gHippoGridManager->getConnectedGrid()->isSecondLife()) 
-        {
-                childSetValue("world_search_editor", gSavedSettings.getString("SearchURLQuery")) ;
-        }
-        else
-        {       
-                childSetValue("world_search_editor", gSavedSettings.getString("SearchURLQueryOpenSim")) ;
-        }
-        childSetAction("world_search_reset_default", onClickDefault, this);
-        childSetAction("world_search_clear", onClickClear, this);
-        childSetEnabled("proxy_text_label", gSavedSettings.getBOOL("BrowserProxyEnabled"));
-        childSetEnabled("web_proxy_editor", gSavedSettings.getBOOL("BrowserProxyEnabled"));
-        childSetEnabled("web_proxy_port", gSavedSettings.getBOOL("BrowserProxyEnabled"));
-        return TRUE;
-}
-LLPanelWeb::~LLPanelWeb()
-{
-        // Children all cleaned up by default view destructor.
-}
-void LLPanelWeb::apply()
-{
-        gSavedSettings.setBOOL("BrowserCookiesEnabled", childGetValue("cookies_enabled"));
-        bool proxy_enable = childGetValue("web_proxy_enabled");
-        std::string proxy_address = childGetValue("web_proxy_editor");
-        int proxy_port = childGetValue("web_proxy_port");
-        gSavedSettings.setBOOL("BrowserProxyEnabled", proxy_enable);
-        gSavedSettings.setString("BrowserProxyAddress", proxy_address);
-        gSavedSettings.setS32("BrowserProxyPort", proxy_port);
-        LLViewerMedia::setProxyConfig(proxy_enable, proxy_address, proxy_port);
-        if (gHippoGridManager->getConnectedGrid()->isSecondLife()) 
-        {
-                gSavedSettings.setString("SearchURLQuery", childGetValue("world_search_editor"));
-        }
-        else
-        {
-                gSavedSettings.setString("SearchURLQueryOpenSim", childGetValue("world_search_editor"));
-        }
-        bool value = childGetValue("use_external_browser").asString() == "external" ? true : false;
-        gSavedSettings.setBOOL("UseExternalBrowser", value);
-        
-        viewer_media_t media_source = get_web_media();
-        if (media_source && media_source->hasMedia())
-        {
-                media_source->getMediaPlugin()->enable_cookies(childGetValue("cookies_enabled"));
-                bool proxy_enable = childGetValue("web_proxy_enabled");
-                std::string proxy_address = childGetValue("web_proxy_editor");
-                int proxy_port = childGetValue("web_proxy_port");
-                media_source->getMediaPlugin()->proxy_setup(proxy_enable, proxy_address, proxy_port);
-        }
-}
-void LLPanelWeb::cancel()
-{
-}
-// static
-void LLPanelWeb::onClickClearCache(void*)
-{
-        LLNotifications::instance().add("ConfirmClearBrowserCache", LLSD(), LLSD(), callback_clear_browser_cache);
-}
-//static
-bool LLPanelWeb::callback_clear_browser_cache(const LLSD& notification, const LLSD& response)
-{
-        S32 option = LLNotification::getSelectedOption(notification, response);
-        if ( option == 0 ) // YES
-        {
-                viewer_media_t media_source = get_web_media();
-                if (media_source && media_source->hasMedia())
-                        media_source->getMediaPlugin()->clear_cache();
-        }
-        return false;
-}
-// static
-void LLPanelWeb::onClickClearCookies(void*)
-{
-        LLNotifications::instance().add("ConfirmClearCookies", LLSD(), LLSD(), callback_clear_cookies);
-}
-//static
-bool LLPanelWeb::callback_clear_cookies(const LLSD& notification, const LLSD& response)
-{
-        S32 option = LLNotification::getSelectedOption(notification, response);
-        if ( option == 0 ) // YES
-        {
-                viewer_media_t media_source = get_web_media();
-                if (media_source && media_source->hasMedia())
-                        media_source->getMediaPlugin()->clear_cookies();
-        }
-        return false;
-}
-// static
-void LLPanelWeb::onCommitCookies(LLUICtrl* ctrl, void* data)
-{
-  LLPanelWeb* self = (LLPanelWeb*)data;
-  LLCheckBoxCtrl* check = (LLCheckBoxCtrl*)ctrl;
-  if (!self || !check) return;
-  viewer_media_t media_source = get_web_media();
-                if (media_source && media_source->hasMedia())
-          media_source->getMediaPlugin()->enable_cookies(check->get());
-}
-// static
-void LLPanelWeb::onCommitWebProxyEnabled(LLUICtrl* ctrl, void* data)
-{
-        LLPanelWeb* self = (LLPanelWeb*)data;
-        LLCheckBoxCtrl* check = (LLCheckBoxCtrl*)ctrl;
-        if (!self || !check) return;
-        self->childSetEnabled("web_proxy_editor", check->get());
-        self->childSetEnabled("web_proxy_port", check->get());
-        self->childSetEnabled("proxy_text_label", check->get());
-}
-// static
-void LLPanelWeb::onClickDefault(void* user_data)
-{
-        LLPanelWeb* self = (LLPanelWeb*)user_data;
-        LLControlVariable* controlp = 
-                (gHippoGridManager->getConnectedGrid()->isSecondLife()) 
-                ? 
-                gSavedSettings.getControl("SearchURLQuery")
-                :
-                gSavedSettings.getControl("SearchURLQueryOpenSim");
-        if (controlp)
-        {
-                self->childSetValue("world_search_editor",controlp->getDefault().asString()) ;
-        }
-        else
-        {
-                llwarns << "SearchURLQuery or SearchURLQueryOpenSim missing from settings.xml - thats bad!" << llendl;
-        }
-}
-// static
-void LLPanelWeb::onClickClear(void* user_data)
-{
-        LLPanelWeb* self = (LLPanelWeb*)user_data;
-        self->childSetValue("world_search_editor","") ;
-}
diff --git a/linden/indra/newview/llpanelweb.h b/linden/indra/newview/llpanelweb.h
deleted file mode 100644
index 3282827..0000000
--- a/linden/indra/newview/llpanelweb.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/** 
- * @file llpanelweb.h
- * @brief Web browser preferences panel
- *
- * $LicenseInfo:firstyear=2005&license=viewergpl$
- * 
- * Copyright (c) 2005-2009, Linden Research, Inc.
- * 
- * Second Life Viewer Source Code
- * The source code in this file ("Source Code") is provided by Linden Lab
- * to you under the terms of the GNU General Public License, version 2.0
- * ("GPL"), unless you have obtained a separate licensing agreement
- * ("Other License"), formally executed by you and Linden Lab.  Terms of
- * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
- * 
- * There are special exceptions to the terms and conditions of the GPL as
- * it is applied to this Source Code. View the full text of the exception
- * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at
- * http://secondlifegrid.net/programs/open_source/licensing/flossexception
- * 
- * By copying, modifying or distributing this software, you acknowledge
- * that you have read and understood your obligations described above,
- * and agree to abide by those obligations.
- * 
- * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
- * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
- * COMPLETENESS OR PERFORMANCE.
- * $/LicenseInfo$
- */
-#ifndef LL_LLPANELWEB_H
-#define LL_LLPANELWEB_H
-#include "llpanel.h"
-class LLPanelWeb : public LLPanel
-{
-public:
-        LLPanelWeb();
-        ~LLPanelWeb();
-        BOOL postBuild();
-        void apply();
-        void cancel();
-private:
-        static void onClickClearCache(void*);
-        static void onClickClearCookies(void*);
-        static void onClickDefault(void* user_data);
-        static void onClickClear(void* user_data);
-        static bool callback_clear_browser_cache(const LLSD& notification, const LLSD& response);
-        static bool callback_clear_cookies(const LLSD& notification, const LLSD& response);
-        static void onCommitCookies(LLUICtrl* ctrl, void* data);
-        static void onCommitWebProxyEnabled(LLUICtrl* ctrl, void* data);
-};
-#endif
diff --git a/linden/indra/newview/llprefsadvanced.cpp b/linden/indra/newview/llprefsadvanced.cpp
index f1b2428..a9500f7 100644
--- a/linden/indra/newview/llprefsadvanced.cpp
+++ b/linden/indra/newview/llprefsadvanced.cpp
@@ -32,14 +32,11 @@
 #include "llcombobox.h"
-#include "floatercommandline.h"
 #include "llagent.h"
 #include "llprefsadvanced.h"
 #include "llviewercontrol.h"
 #include "llviewermenu.h"
 #include "llvoavatar.h"
-#include "lgghunspell_wrapper.h"
-#include "lggautocorrectfloater.h"
 #include "llcombobox.h"
 #include "llcolorswatch.h"
 #include "llstartup.h"
@@ -57,9 +54,6 @@ LLPrefsAdvanced::LLPrefsAdvanced()
        sInstance = this;
        childSetCommitCallback("speed_rez_check", onCommitCheckBox, this);
-        childSetCommitCallback("command_line_check", onCommitCheckBox, this);
-        childSetAction("command_line_btn", onClickCommandLine, this);
 }
 LLPrefsAdvanced::~LLPrefsAdvanced()
@@ -68,17 +62,6 @@ LLPrefsAdvanced::~LLPrefsAdvanced()
        sInstance = NULL;
 }
-void LLPrefsAdvanced::initHelpBtn(const std::string& name, const std::string& xml_alert)
-{
-        childSetAction(name, onClickHelp, new std::string(xml_alert));
-}
-void LLPrefsAdvanced::onClickHelp(void* data)
-{
-        std::string* xml_alert = (std::string*)data;
-        LLNotifications::instance().add(*xml_alert);
-}
 BOOL LLPrefsAdvanced::postBuild()
 {
        childSetValue("disable_log_screen_check", gSavedSettings.getBOOL("DisableLoginLogoutScreens"));
@@ -86,23 +69,15 @@ BOOL LLPrefsAdvanced::postBuild()
        static BOOL* sShowClientNameTag = rebind_llcontrol<BOOL>("ShowClientNameTag", &gSavedSettings, true);
        childSetValue("client_name_tag_check", (*sShowClientNameTag));
-        static BOOL* sShowClientColor = rebind_llcontrol<BOOL>("ShowClientColor", &gSavedSettings, true);
-        childSetValue("client_name_color_check", (*sShowClientColor));
        childSetValue("client_name_hover_check", gSavedSettings.getBOOL("ShowClientNameHoverTip"));
        childSetValue("client_name_tag_broadcast_check", gSavedSettings.getBOOL("ShowMyClientTagToOthers"));
-        getChild<LLColorSwatchCtrl>("client_tag_color")->set(gSavedSettings.getColor4("ImprudenceTagColor"));
-        mClientTagColor = gSavedSettings.getColor4("ImprudenceTagColor");
-        childSetValue("http_texture_check", gSavedSettings.getBOOL("ImagePipelineUseHTTP"));
-        childSetValue("speed_rez_check", gSavedSettings.getBOOL("SpeedRez"));
-        childSetValue("speed_rez_interval_spinner", (F32)gSavedSettings.getU32("SpeedRezInterval"));
        childSetValue("appearance_anim_check", gSavedSettings.getBOOL("AppearanceAnimate"));
        childSetValue("legacy_pie_menu_checkbox", gSavedSettings.getBOOL("LegacyPieEnabled"));
        childSetValue("language_is_public", gSavedSettings.getBOOL("LanguageIsPublic"));
        childSetValue("allow_mupose", gSavedSettings.getBOOL("AllowMUpose"));
        childSetValue("auto_close_ooc", gSavedSettings.getBOOL("AutoCloseOOC"));
        childSetValue("shadows_check", gSavedSettings.getBOOL("ShadowsEnabled"));
-        childSetValue("command_line_check", gSavedSettings.getBOOL("CmdLineChatbarEnabled"));
        childSetValue("lightshare_combo",
                      LLSD((S32)gSavedSettings.getU32("LightShareAllowed")));
@@ -110,19 +85,20 @@ BOOL LLPrefsAdvanced::postBuild()
        LLComboBox* crash_behavior_combobox = getChild<LLComboBox>("crash_behavior_combobox");
        crash_behavior_combobox->setCurrentByIndex(gCrashSettings.getS32(CRASH_BEHAVIOR_SETTING));
-        getChild<LLComboBox>("EmeraldSpellBase")->setCommitCallback(onSpellBaseComboBoxCommit);
-        getChild<LLButton>("EmSpell_EditCustom")->setClickedCallback(onSpellEditCustom, this);
-        getChild<LLButton>("EmSpell_GetMore")->setClickedCallback(onSpellGetMore, this);
-        getChild<LLButton>("EmSpell_Add")->setClickedCallback(onSpellAdd, this);
-        getChild<LLButton>("EmSpell_Remove")->setClickedCallback(onSpellRemove, this);
-        getChild<LLButton>("ac_button")->setClickedCallback(onAutoCorrectButton,this);
-        initHelpBtn("EmeraldHelp_SpellCheck",           "EmeraldHelp_SpellCheck");
        getChild<LLButton>("reset_cloud_this_account")->setClickedCallback(onResetThisCloudButton,this);
        getChild<LLButton>("save_cloud_this_account")->setClickedCallback(onSaveThisCloudButton,this);
        getChild<LLButton>("save_cloud_any_account")->setClickedCallback(onSaveAnyoneCloudButton,this);
+        childSetValue("automatic_fly", gSavedSettings.getBOOL("AutomaticFly"));
+        static BOOL* sEnableWindlightRemote = rebind_llcontrol<BOOL>("EnableWindlightRemote", &gSavedSettings, true);
+        childSetValue("toggle_windlight_control", (*sEnableWindlightRemote));
+        mWLControl = (*sEnableWindlightRemote);
+        childSetValue("script_errors_as_chat", gSavedSettings.getBOOL("ScriptErrorsAsChat"));
+        childSetValue("show_timestamps_check", gSavedSettings.getBOOL("ShowTimestamps"));
+        childSetValue("arrow_keys_move_avatar_check", gSavedSettings.getBOOL("ArrowKeysMoveAvatar"));
        refresh();
        return TRUE;
@@ -133,18 +109,11 @@ void LLPrefsAdvanced::apply()
        gSavedSettings.setBOOL("DisableLoginLogoutScreens", childGetValue("disable_log_screen_check"));
        gSavedSettings.setBOOL("DisableTeleportScreens", childGetValue("disable_tp_screen_check"));
        gSavedSettings.setBOOL("ShowClientNameTag", childGetValue("client_name_tag_check"));
-        gSavedSettings.setBOOL("ShowClientColor", childGetValue("client_name_color_check"));
        gSavedSettings.setBOOL("ShowClientNameHoverTip", childGetValue("client_name_hover_check"));
-        gSavedSettings.setColor4("ImprudenceTagColor", getChild<LLColorSwatchCtrl>("client_tag_color")->get());
-        mClientTagColor = getChild<LLColorSwatchCtrl>("client_tag_color")->get();
-        gSavedSettings.setBOOL("ImagePipelineUseHTTP", childGetValue("http_texture_check"));
-        gSavedSettings.setBOOL("SpeedRez", childGetValue("speed_rez_check"));
-        gSavedSettings.setU32("SpeedRezInterval", childGetValue("speed_rez_interval_spinner").asReal());
        gSavedSettings.setBOOL("AppearanceAnimate", childGetValue("appearance_anim_check"));
        gSavedSettings.setBOOL("LanguageIsPublic", childGetValue("language_is_public"));
-        gSavedSettings.setBOOL("AllowMUpose", childGetValue("allow_mupose"));
-        gSavedSettings.setBOOL("AutoCloseOOC", childGetValue("auto_close_ooc"));
        gSavedSettings.setU32("LightShareAllowed",
                              (U32)childGetValue("lightshare_combo").asInteger());
@@ -210,8 +179,6 @@ void LLPrefsAdvanced::apply()
                build_pie_menus();
        }
-        gSavedSettings.setBOOL("CmdLineChatbarEnabled", childGetValue("command_line_check").asBoolean());
        LLComboBox* crash_behavior_combobox = getChild<LLComboBox>("crash_behavior_combobox");
        gCrashSettings.setS32(CRASH_BEHAVIOR_SETTING, crash_behavior_combobox->getCurrentIndex());
        
@@ -219,79 +186,34 @@ void LLPrefsAdvanced::apply()
        {
                onSaveThisCloudButton(NULL);
        }
+        gSavedSettings.setBOOL("AutomaticFly", childGetValue("automatic_fly"));
+        // windlight remote
+        static BOOL* sEnableWindlightRemote = rebind_llcontrol<BOOL>("EnableWindlightRemote", &gSavedSettings, true);
+        mWLControl = (*sEnableWindlightRemote);
+        gSavedSettings.setBOOL("AllowMUpose", childGetValue("allow_mupose"));
+        gSavedSettings.setBOOL("AutoCloseOOC", childGetValue("auto_close_ooc"));
+        gSavedSettings.setBOOL("ArrowKeysMoveAvatar", childGetValue("arrow_keys_move_avatar_check"));
+        gSavedSettings.setBOOL("ScriptErrorsAsChat", childGetValue("script_errors_as_chat"));
+        gSavedSettings.setBOOL("ShowTimestamps", childGetValue("show_timestamps_check"));
 }
 void LLPrefsAdvanced::cancel()
 {
-        gSavedSettings.setColor4("ImprudenceTagColor", mClientTagColor);
 //      llwarns << "cancel" << llendl;
 //      cool - "ok" is also cancel
 //      LLVOAvatar::sCloud.mPartData.mStartColor = mCloudStartColor;
 //      LLVOAvatar::sCloud.mPartData.mEndColor = mCloudEndColor;
+        gSavedSettings.setBOOL("EnableWindlightRemote", mWLControl);
 }
 void LLPrefsAdvanced::refresh()
 {
-        if (childGetValue("speed_rez_check").asBoolean())
-        {
-                childEnable("speed_rez_interval_spinner");
-                childEnable("speed_rez_seconds_text");
-        }
-        else
-        {
-                childDisable("speed_rez_interval_spinner");
-                childDisable("speed_rez_seconds_text");
-        }
-        if (childGetValue("command_line_check").asBoolean())
-        {
-                childEnable("command_line_btn");
-        }
-        else
-        {
-                childDisable("command_line_btn");
-        }
-        LLComboBox* comboBox = getChild<LLComboBox>("EmeraldSpellBase");
-        if (comboBox != NULL) 
-        {
-                comboBox->removeall();
-                std::vector<std::string> names = glggHunSpell->getDicts();
-                for (int i = 0; i < (int)names.size(); i++) 
-                {
-                        comboBox->add(names[i]);
-                }
-                comboBox->setSimple(gSavedSettings.getString("EmeraldSpellBase"));
-        }
-        comboBox = getChild<LLComboBox>("EmSpell_Avail");
-        if (comboBox != NULL) 
-        {
-                LLSD selected = comboBox->getSelectedValue();
-                comboBox->removeall();
-                std::vector<std::string> names = glggHunSpell->getAvailDicts();
-                for (int i = 0; i < (int)names.size(); i++) 
-                {
-                        comboBox->add(names[i]);
-                }
-                comboBox->selectByValue(selected);
-        }
-        comboBox = getChild<LLComboBox>("EmSpell_Installed");
-        if (comboBox != NULL) 
-        {
-                LLSD selected = comboBox->getSelectedValue();
-                comboBox->removeall();
-                std::vector<std::string> names = glggHunSpell->getInstalledDicts();
-                for (int i = 0; i < (int)names.size(); i++) 
-                {
-                        comboBox->add(names[i]);
-                }
-                comboBox->selectByValue(selected);
-        }
        bool is_logged_in = LLStartUp::isLoggedIn();
        setParticleControls(is_logged_in);
 }
 void LLPrefsAdvanced::draw()
@@ -363,65 +285,10 @@ void LLPrefsAdvanced::setParticleControls(bool is_logged_in)
 void LLPrefsAdvanced::onCommitCheckBox(LLUICtrl* ctrl, void* user_data)
 {
        LLPrefsAdvanced* self = (LLPrefsAdvanced*)user_data;
-        self->refresh();
+        if (self)
-}
-void LLPrefsAdvanced::onSpellAdd(void* data)
-{
-        LLPrefsAdvanced* panel = (LLPrefsAdvanced*)data;
-        if(panel)
        {
-                glggHunSpell->addButton(panel->childGetValue("EmSpell_Avail").asString());
+                self->refresh();
        }
-        panel->refresh();
-}
-void LLPrefsAdvanced::onSpellRemove(void* data)
-{
-        LLPrefsAdvanced* panel = (LLPrefsAdvanced*)data;
-        if(panel)
-        {
-                glggHunSpell->removeButton(panel->childGetValue("EmSpell_Installed").asString());
-        }
-        panel->refresh();
-}
-void LLPrefsAdvanced::onSpellGetMore(void* data)
-{
-        glggHunSpell->getMoreButton(data);
-}
-void LLPrefsAdvanced::onSpellEditCustom(void* data)
-{
-        glggHunSpell->editCustomButton();
-}
-void LLPrefsAdvanced::onSpellBaseComboBoxCommit(LLUICtrl* ctrl, void* userdata)
-{
-        LLComboBox* box = (LLComboBox*)ctrl;
-        if (box)
-        {
-                glggHunSpell->newDictSelection(box->getValue().asString());
-                //LLPanelEmerald* panel = (LLPanelEmerald*)userdata;//box->getParent();
-                if (sInstance)
-                {
-                        sInstance->refresh();
-                }
-        }
-        //LLPanelEmerald* panel = (LLPanelEmerald*)userdata;
-        //if(panel)panel->refresh();
-}
-void LLPrefsAdvanced::onAutoCorrectButton(void * data)
-{
-        lggAutoCorrectFloaterStart::show(TRUE,data);
-}
-void LLPrefsAdvanced::onClickCommandLine(void* data)
-{
-        FloaterCommandLine::getInstance()->open();
-        FloaterCommandLine::getInstance()->center();
 }
 void LLPrefsAdvanced::onResetThisCloudButton(void * data)
diff --git a/linden/indra/newview/llprefsadvanced.h b/linden/indra/newview/llprefsadvanced.h
index e4febcc..b863db3 100644
--- a/linden/indra/newview/llprefsadvanced.h
+++ b/linden/indra/newview/llprefsadvanced.h
@@ -51,30 +51,19 @@ private:
        static LLPrefsAdvanced* sInstance;
        static void onCommitCheckBox(LLUICtrl* ctrl, void* user_data);
-        static void onClickCommandLine(void* data);
-        static void onSpellAdd(void* data);
-        static void onSpellRemove(void* data);
-        static void onSpellGetMore(void* data);
-        static void onSpellEditCustom(void* data);
-        static void onSpellBaseComboBoxCommit(LLUICtrl* ctrl, void* userdata);  
-        static void onAutoCorrectButton(void * data);
        static void onResetThisCloudButton(void * data);
        static void onSaveThisCloudButton(void * data);
        static void onSaveAnyoneCloudButton(void * data);
-        LLColor4 mClientTagColor;
 protected:
        void setParticleControls(bool is_logged_in);
-        void initHelpBtn(const std::string& name, const std::string& xml_alert);
-        static void onClickHelp(void* data);
 private:
        bool mWasLoggedIn;
        LLColor4 mCloudStartColor;
        LLColor4 mCloudEndColor;
        LLUUID mCloudTextureID;
+        BOOL mWLControl;
 };
 #endif // LLPREFSADVANCED_H
diff --git a/linden/indra/newview/llprefschat.cpp b/linden/indra/newview/llprefschat.cpp
index 5f74a25..9490ba2 100644
--- a/linden/indra/newview/llprefschat.cpp
+++ b/linden/indra/newview/llprefschat.cpp
@@ -33,13 +33,20 @@
 #include "llviewerprecompiledheaders.h"
+#include "llcombobox.h"
+#include "llpanel.h"
+#include "llstylemap.h"
+#include "lluictrlfactory.h"
+#include "floatercommandline.h"
+#include "llagent.h"
 #include "llchatbar.h"
 #include "llfloaterchat.h"
+#include "lgghunspell_wrapper.h"
+#include "lggautocorrectfloater.h"
 #include "llprefschat.h"
 #include "llviewercontrol.h"
-#include "lluictrlfactory.h"
+#include "llviewermessage.h"
-#include "llradiogroup.h"
-#include "llstylemap.h"
 class LLPrefsChatImpl : public LLPanel
 {
@@ -47,44 +54,53 @@ public:
        LLPrefsChatImpl();
        /*virtual*/ ~LLPrefsChatImpl(){};
+        /*virtual*/ BOOL postBuild();
        void apply();
        void cancel();
+        void refresh();
+        void setPersonalInfo(bool im_via_email, const std::string& email);
+        void initHelpBtn(const std::string& name, const std::string& xml_alert);
+        static void onAutoCorrectButton(void * data);
+        static void onClickHelp(void* data);
+        static void onClickCommandLine(void* data);
+        static void onCommitCheckBox(LLUICtrl* ctrl, void* user_data);
+        static void onSpellAdd(void* data);
+        static void onSpellRemove(void* data);
+        static void onSpellGetMore(void* data);
+        static void onSpellEditCustom(void* data);
+        static void onSpellBaseComboBoxCommit(LLUICtrl* ctrl, void* userdata);
+protected:
+        bool mOriginalIMViaEmail;
+        bool mGotPersonalInfo;
 private:
-        void refreshValues();
+        bool mChatChannel;
-        S32     mChatSize;
-        F32     mChatPersist;
-        S32     mChatMaxLines;
-        BOOL mChatFullWidth;
-        BOOL mCloseChatOnReturn;
-        BOOL mArrowKeysMoveAvatar;
-        BOOL mShowTimestamps;
-        BOOL mPlayTypingAnim;
-        BOOL mChatBubbles;
-        BOOL mLocalChatBubbles;
-        BOOL mScriptErrorAsChat;
-        BOOL mChatChannel;
-        F32     mConsoleOpacity;
-        F32     mBubbleOpacity;
-        std::string mTranslateLanguage;
-        BOOL mTranslateChat;
 };
 LLPrefsChatImpl::LLPrefsChatImpl()
-        :       LLPanel(std::string("Chat Panel"))
+        :       LLPanel(std::string("Chat Panel")),
+        mChatChannel(false),
+        mOriginalIMViaEmail(false),
+        mGotPersonalInfo(false)
 {
-        refreshValues(); // initialize member data from saved settings
        LLUICtrlFactory::getInstance()->buildPanel(this, "panel_preferences_chat.xml");
+}
+BOOL LLPrefsChatImpl::postBuild()
+{
+        requires("send_im_to_email");
+        childSetLabelArg("send_im_to_email", "[EMAIL]", getString("log_in_to_change"));
+        // Don't enable these until we get personal data
+        childSetEnabled("send_im_to_email", false);
-        getChild<LLRadioGroup>("chat_font_size")->setSelectedIndex(gSavedSettings.getS32("ChatFontSize"));
+        getChild<LLComboBox>("chat_font_size")->setValue(gSavedSettings.getS32("ChatFontSize"));
        childSetValue("fade_chat_time", gSavedSettings.getF32("ChatPersistTime"));
        childSetValue("max_chat_count", gSavedSettings.getS32("ConsoleMaxLines"));
-        childSetValue("arrow_keys_move_avatar_check", gSavedSettings.getBOOL("ArrowKeysMoveAvatar"));
-        childSetValue("show_timestamps_check", gSavedSettings.getBOOL("ChatShowTimestamps"));
-        childSetValue("script_errors_as_chat", gSavedSettings.getBOOL("ScriptErrorsAsChat"));
- 
        childSetValue("bubble_text_chat", gSavedSettings.getBOOL("UseChatBubbles"));
        childSetValue("local_bubble_text_chat", gSavedSettings.getBOOL("UseLocalChatWithBubbles"));
        childSetValue("chat_full_width_check", gSavedSettings.getBOOL("ChatFullWidth"));
@@ -95,59 +111,89 @@ LLPrefsChatImpl::LLPrefsChatImpl()
        childSetValue("bubble_chat_opacity", gSavedSettings.getF32("ChatBubbleOpacity"));
        childSetValue("translate_language_combobox",    gSavedSettings.getString("TranslateLanguage"));
        childSetValue("translate_chat",         gSavedSettings.getBOOL("TranslateChat"));
-}
-void LLPrefsChatImpl::refreshValues()
-{
-        //set values
-        mChatSize = gSavedSettings.getS32("ChatFontSize");
-        mChatPersist = gSavedSettings.getF32("ChatPersistTime");
-        mChatMaxLines = gSavedSettings.getS32("ConsoleMaxLines");
-        mArrowKeysMoveAvatar = gSavedSettings.getBOOL("ArrowKeysMoveAvatar");
-        mShowTimestamps = gSavedSettings.getBOOL("ChatShowTimestamps");
-        mScriptErrorAsChat = gSavedSettings.getBOOL("ScriptErrorsAsChat");
-        mChatBubbles = gSavedSettings.getBOOL("UseChatBubbles");
-        mLocalChatBubbles = gSavedSettings.getBOOL("UseLocalChatWithBubbles");
-        mChatFullWidth = gSavedSettings.getBOOL("ChatFullWidth");
-        mCloseChatOnReturn = gSavedSettings.getBOOL("CloseChatOnReturn");
-        mPlayTypingAnim = gSavedSettings.getBOOL("PlayTypingAnim"); 
        mChatChannel = gSavedSettings.getBOOL("ChatChannelSelect");
-        mConsoleOpacity = gSavedSettings.getF32("ConsoleBackgroundOpacity");
-        mTranslateLanguage = gSavedSettings.getString("TranslateLanguage");
+        childSetValue("command_line_check", gSavedSettings.getBOOL("CmdLineChatbarEnabled"));
-        mTranslateChat = gSavedSettings.getBOOL("TranslateChat");
+        childSetCommitCallback("command_line_check", onCommitCheckBox, this);
-        static F32* sChatBubbleOpacity = rebind_llcontrol<F32>("ChatBubbleOpacity", &gSavedSettings, true);
+        childSetAction("command_line_btn", onClickCommandLine, this);
-        mBubbleOpacity = *sChatBubbleOpacity;
+        getChild<LLComboBox>("EmeraldSpellBase")->setCommitCallback(onSpellBaseComboBoxCommit);
+        getChild<LLButton>("EmSpell_EditCustom")->setClickedCallback(onSpellEditCustom, this);
+        getChild<LLButton>("EmSpell_GetMore")->setClickedCallback(onSpellGetMore, this);
+        getChild<LLButton>("EmSpell_Add")->setClickedCallback(onSpellAdd, this);
+        getChild<LLButton>("EmSpell_Remove")->setClickedCallback(onSpellRemove, this);
+        getChild<LLButton>("ac_button")->setClickedCallback(onAutoCorrectButton, this);
+        initHelpBtn("EmeraldHelp_SpellCheck", "EmeraldHelp_SpellCheck");
+        childSetValue("include_im_in_chat_console", gSavedSettings.getBOOL("IMInChatConsole"));
+        childSetValue("include_im_in_chat_history", gSavedSettings.getBOOL("IMInChatHistory"));
+        childSetValue("vertical-imtabs-toggle", gSavedSettings.getBOOL("VerticalIMTabs"));
+        refresh();
+        return TRUE;
+}
+void LLPrefsChatImpl::refresh()
+{
+                if (childGetValue("command_line_check").asBoolean())
+        {
+                childEnable("command_line_btn");
+        }
+        else
+        {
+                childDisable("command_line_btn");
+        }
+        LLComboBox* comboBox = getChild<LLComboBox>("EmeraldSpellBase");
+        if (comboBox != NULL) 
+        {
+                comboBox->removeall();
+                std::vector<std::string> names = glggHunSpell->getDicts();
+                for (int i = 0; i < (int)names.size(); i++) 
+                {
+                        comboBox->add(names[i]);
+                }
+                comboBox->setSimple(gSavedSettings.getString("EmeraldSpellBase"));
+        }
+        comboBox = getChild<LLComboBox>("EmSpell_Avail");
+        if (comboBox != NULL) 
+        {
+                LLSD selected = comboBox->getSelectedValue();
+                comboBox->removeall();
+                std::vector<std::string> names = glggHunSpell->getAvailDicts();
+                for (int i = 0; i < (int)names.size(); i++) 
+                {
+                        comboBox->add(names[i]);
+                }
+                comboBox->selectByValue(selected);
+        }
+        comboBox = getChild<LLComboBox>("EmSpell_Installed");
+        if (comboBox != NULL) 
+        {
+                LLSD selected = comboBox->getSelectedValue();
+                comboBox->removeall();
+                std::vector<std::string> names = glggHunSpell->getInstalledDicts();
+                for (int i = 0; i < (int)names.size(); i++) 
+                {
+                        comboBox->add(names[i]);
+                }
+                comboBox->selectByValue(selected);
+        }
 }
 void LLPrefsChatImpl::cancel()
 {
-        gSavedSettings.setS32("ChatFontSize", mChatSize);
-        gSavedSettings.setF32("ChatPersistTime", mChatPersist);
-        gSavedSettings.setS32("ConsoleMaxLines", mChatMaxLines);
-        gSavedSettings.setBOOL("ArrowKeysMoveAvatar", mArrowKeysMoveAvatar);
-        gSavedSettings.setBOOL("ChatShowTimestamps", mShowTimestamps);
-        gSavedSettings.setBOOL("ScriptErrorsAsChat", mScriptErrorAsChat);
-        gSavedSettings.setBOOL("UseChatBubbles", mChatBubbles);
-        gSavedSettings.setBOOL("UseLocalChatWithBubbles", mLocalChatBubbles);
-        gSavedSettings.setBOOL("ChatFullWidth", mChatFullWidth);
-        gSavedSettings.setBOOL("CloseChatOnReturn", mCloseChatOnReturn);
-        gSavedSettings.setBOOL("PlayTypingAnim", mPlayTypingAnim); 
-        gSavedSettings.setBOOL("ChatChannelSelect", mChatChannel); 
-        gSavedSettings.setF32("ConsoleBackgroundOpacity", mConsoleOpacity);
-        gSavedSettings.setF32("ChatBubbleOpacity", mBubbleOpacity);     
-        gSavedSettings.setString("TranslateLanguage", mTranslateLanguage);      
-        gSavedSettings.setBOOL("TranslateChat", mTranslateChat);
 }
 void LLPrefsChatImpl::apply()
 {
-        gSavedSettings.setS32("ChatFontSize", getChild<LLRadioGroup>("chat_font_size")->getSelectedIndex());
+        gSavedSettings.setS32("ChatFontSize", getChild<LLComboBox>("chat_font_size")->getValue().asInteger());
        gSavedSettings.setF32("ChatPersistTime", childGetValue("fade_chat_time").asReal());
        gSavedSettings.setS32("ConsoleMaxLines", childGetValue("max_chat_count"));
-        gSavedSettings.setBOOL("ArrowKeysMoveAvatar", childGetValue("arrow_keys_move_avatar_check"));
-        gSavedSettings.setBOOL("ChatShowTimestamps", childGetValue("show_timestamps_check"));
-        gSavedSettings.setBOOL("ScriptErrorsAsChat", childGetValue("script_errors_as_chat"));
        gSavedSettings.setBOOL("UseChatBubbles", childGetValue("bubble_text_chat"));
        gSavedSettings.setBOOL("UseLocalChatWithBubbles", childGetValue("local_bubble_text_chat"));
        gSavedSettings.setBOOL("ChatFullWidth", childGetValue("chat_full_width_check"));
@@ -160,7 +206,7 @@ void LLPrefsChatImpl::apply()
        gSavedSettings.setString("TranslateLanguage", childGetValue("translate_language_combobox"));
        gSavedSettings.setBOOL("TranslateChat", childGetValue("translate_chat"));
-        BOOL chan_check = childGetValue("toggle_channel_control");
+        bool chan_check = childGetValue("toggle_channel_control");
        gSavedSettings.setBOOL("ChatChannelSelect", chan_check);
        if (mChatChannel != chan_check)
        {
@@ -172,7 +218,138 @@ void LLPrefsChatImpl::apply()
                mChatChannel = chan_check;
        }
-        refreshValues(); // member values become the official values and cancel becomes a no-op.
+        gSavedSettings.setBOOL("CmdLineChatbarEnabled", childGetValue("command_line_check").asBoolean());
+        gSavedSettings.setBOOL("VerticalIMTabs", childGetValue("vertical-imtabs-toggle").asBoolean());
+        gSavedSettings.setBOOL("IMInChatConsole", childGetValue("include_im_in_chat_console").asBoolean());
+        gSavedSettings.setBOOL("IMInChatHistory", childGetValue("include_im_in_chat_history").asBoolean());
+        if (mGotPersonalInfo)
+        {
+                bool new_im_via_email = childGetValue("send_im_to_email").asBoolean();  
+                if (new_im_via_email != mOriginalIMViaEmail)
+                {
+                        LLMessageSystem* msg = gMessageSystem;
+                        msg->newMessageFast(_PREHASH_UpdateUserInfo);
+                        msg->nextBlockFast(_PREHASH_AgentData);
+                        msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
+                        msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
+                        msg->nextBlockFast(_PREHASH_UserData);
+                        msg->addBOOLFast(_PREHASH_IMViaEMail, new_im_via_email);
+                        gAgent.sendReliableMessage();
+                }
+        }
+        // Spell checking prefs aren't here because Emerald never supported the cancel button. We should fix this -- MC
+}
+// Enable and set the value of settings recieved from the sim in AgentInfoReply
+void LLPrefsChatImpl::setPersonalInfo(bool im_via_email, const std::string& email)
+{
+        mGotPersonalInfo = true;
+        mOriginalIMViaEmail = im_via_email;
+        childEnable("send_im_to_email");
+        childSetValue("send_im_to_email", im_via_email);
+        // Truncate the e-mail address if it's too long (to prevent going off
+        // the edge of the dialog).
+        std::string display_email(email);
+        if(display_email.size() > 30)
+        {
+                display_email.resize(30);
+                display_email += "...";
+        }
+        else if (display_email.empty())
+        {
+                display_email = getString("default_email_used");
+        }
+        childSetLabelArg("send_im_to_email", "[EMAIL]", display_email);
+}
+// static
+void LLPrefsChatImpl::onSpellAdd(void* data)
+{
+        LLPrefsChatImpl* panel = (LLPrefsChatImpl*)data;
+        if (panel)
+        {
+                glggHunSpell->addButton(panel->childGetValue("EmSpell_Avail").asString());
+                panel->refresh();
+        }
+}
+// static
+void LLPrefsChatImpl::onSpellRemove(void* data)
+{
+        LLPrefsChatImpl* panel = (LLPrefsChatImpl*)data;
+        if (panel)
+        {
+                glggHunSpell->removeButton(panel->childGetValue("EmSpell_Installed").asString());
+                panel->refresh();
+        }
+}
+// static
+void LLPrefsChatImpl::onSpellGetMore(void* data)
+{
+        glggHunSpell->getMoreButton(data);
+}
+// static
+void LLPrefsChatImpl::onSpellEditCustom(void* data)
+{
+        glggHunSpell->editCustomButton();
+}
+// static
+void LLPrefsChatImpl::onSpellBaseComboBoxCommit(LLUICtrl* ctrl, void* userdata)
+{
+        LLComboBox* box = (LLComboBox*)ctrl;
+        if (box)
+        {
+                glggHunSpell->newDictSelection(box->getValue().asString());
+        }
+        LLPrefsChatImpl* panel = (LLPrefsChatImpl*)userdata;
+        if (panel)
+        {
+                panel->refresh();
+        }
+}
+// static
+void LLPrefsChatImpl::onAutoCorrectButton(void * data)
+{
+        lggAutoCorrectFloaterStart::show(TRUE,data);
+}
+// static
+void LLPrefsChatImpl::onClickCommandLine(void* data)
+{
+        FloaterCommandLine::getInstance()->open();
+        FloaterCommandLine::getInstance()->center();
+}
+//static
+void LLPrefsChatImpl::onCommitCheckBox(LLUICtrl* ctrl, void* user_data)
+{
+        LLPrefsChatImpl* self = (LLPrefsChatImpl*)user_data;
+        if (self)
+        {
+                self->refresh();
+        }
+}
+void LLPrefsChatImpl::initHelpBtn(const std::string& name, const std::string& xml_alert)
+{
+        childSetAction(name, onClickHelp, new std::string(xml_alert));
+}
+// static
+void LLPrefsChatImpl::onClickHelp(void* data)
+{
+        std::string* xml_alert = (std::string*)data;
+        LLNotifications::instance().add(*xml_alert);
 }
 //---------------------------------------------------------------------------
@@ -197,6 +374,11 @@ void LLPrefsChat::cancel()
        impl.cancel();
 }
+void LLPrefsChat::setPersonalInfo(bool im_via_email, const std::string& email)
+{
+        impl.setPersonalInfo(im_via_email, email);
+}
 LLPanel* LLPrefsChat::getPanel()
 {
        return &impl;
diff --git a/linden/indra/newview/llprefschat.h b/linden/indra/newview/llprefschat.h
index 86718a8..64bfb36 100644
--- a/linden/indra/newview/llprefschat.h
+++ b/linden/indra/newview/llprefschat.h
@@ -44,6 +44,7 @@ public:
        void apply();
        void cancel();
+        void setPersonalInfo(bool im_via_email, const std::string& email);
        LLPanel* getPanel();
diff --git a/linden/indra/newview/llprefscolors.cpp b/linden/indra/newview/llprefscolors.cpp
index b0bc345..0b4caf5 100644
--- a/linden/indra/newview/llprefscolors.cpp
+++ b/linden/indra/newview/llprefscolors.cpp
@@ -80,6 +80,12 @@ BOOL LLPrefsColors::postBuild()
        childSetCommitCallback("HighlightOwnNameInChat", onCommitCheckSelfName, this);
        childSetCommitCallback("HighlightFriendsChat", onCommitCheckFriends, this);
+        getChild<LLColorSwatchCtrl>("effect_color_swatch")->set(gSavedSettings.getColor4("EffectColor"));
+        getChild<LLColorSwatchCtrl>("client_tag_color")->set(gSavedSettings.getColor4("ImprudenceTagColor"));
+        static BOOL* sShowClientColor = rebind_llcontrol<BOOL>("ShowClientColor", &gSavedSettings, true);
+        childSetValue("client_name_color_check", (*sShowClientColor));
        return TRUE;
 }
@@ -96,6 +102,8 @@ void LLPrefsColors::refreshColors()
        mHTMLLinkColor = gSavedSettings.getColor4("HTMLLinkColor");
        mFriendsChatColor = gSavedSettings.getColor4("FriendsChatColor");
        mOwnNameChatColor = gSavedSettings.getColor4("OwnNameChatColor");
+        mEffectColor = gSavedSettings.getColor4("EffectColor");
+        mClientTagColor = gSavedSettings.getColor4("ImprudenceTagColor");
 }
 // static
@@ -113,9 +121,6 @@ void LLPrefsColors::updateSelfCheck()
        childSetEnabled("nick01", highlight_names_enabled);
        childSetEnabled("nick02", highlight_names_enabled);
        childSetEnabled("nick03", highlight_names_enabled);
-        childSetEnabled("nick01_text", highlight_names_enabled);
-        childSetEnabled("nick02_text", highlight_names_enabled);
-        childSetEnabled("nick03_text", highlight_names_enabled);
 }
 // static
@@ -130,6 +135,18 @@ void LLPrefsColors::updateFriendsCheck()
        getChild<LLColorSwatchCtrl>("FriendsChatColor")->setEnabled(childGetValue("HighlightFriendsChat"));
 }
+// static
+void LLPrefsColors::onCommitCheckClient(LLUICtrl* ctrl, void* userdata)
+{
+        LLPrefsColors* self = (LLPrefsColors*)userdata;
+        self->updateClientCheck();
+}
+void LLPrefsColors::updateClientCheck()
+{
+        getChild<LLColorSwatchCtrl>("client_tag_color")->setEnabled(childGetValue("client_name_color_checkt"));
+}
 void LLPrefsColors::cancel()
 {
        gSavedSettings.setColor4("SystemChatColor", mSystemChatColor);
@@ -143,6 +160,8 @@ void LLPrefsColors::cancel()
        gSavedSettings.setColor4("HTMLLinkColor", mHTMLLinkColor);
        gSavedSettings.setColor4("FriendsChatColor", mFriendsChatColor);
        gSavedSettings.setColor4("OwnNameChatColor", mOwnNameChatColor);
+        gSavedSettings.setColor4("EffectColor", mEffectColor);
+        gSavedSettings.setColor4("ImprudenceTagColor", mClientTagColor);
 }
 void LLPrefsColors::apply()
@@ -177,5 +196,10 @@ void LLPrefsColors::apply()
        boost::trim(nick03);
        gSavedSettings.setString("HighlightNickname03", nick03);
+        gSavedSettings.setColor4("EffectColor", childGetValue("effect_color_swatch"));
+        gSavedSettings.setBOOL("ShowClientColor", childGetValue("client_name_color_check"));
+        gSavedSettings.setColor4("ImprudenceTagColor", getChild<LLColorSwatchCtrl>("client_tag_color")->get());
        refreshColors(); // member values become the official values and cancel becomes a no-op.
 }
diff --git a/linden/indra/newview/llprefscolors.h b/linden/indra/newview/llprefscolors.h
index 70bda89..d580add 100644
--- a/linden/indra/newview/llprefscolors.h
+++ b/linden/indra/newview/llprefscolors.h
@@ -47,9 +47,11 @@ public:
 private:
        static void onCommitCheckSelfName(LLUICtrl* ctrl, void* userdata);
        static void onCommitCheckFriends(LLUICtrl* ctrl, void* userdata);
+        static void onCommitCheckClient(LLUICtrl* ctrl, void* userdata);
        void refreshColors();
        void updateFriendsCheck();
        void updateSelfCheck();
+        void updateClientCheck();
        LLColor4 mSystemChatColor;
        LLColor4 mUserChatColor;
@@ -62,6 +64,8 @@ private:
        LLColor4 mHTMLLinkColor;
        LLColor4 mFriendsChatColor;
        LLColor4 mOwnNameChatColor;
+        LLColor4 mEffectColor;
+        LLColor4 mClientTagColor;
 };
 #endif //LLPREFSCOLORS_H
diff --git a/linden/indra/newview/llprefsim.cpp b/linden/indra/newview/llprefsim.cpp
index 33d9701..47b5d8b 100644
--- a/linden/indra/newview/llprefsim.cpp
+++ b/linden/indra/newview/llprefsim.cpp
@@ -65,7 +65,7 @@ public:
        void apply();
        void cancel();
-        void setPersonalInfo(const std::string& visibility, bool im_via_email, const std::string& email);
+        void setPersonalInfo(const std::string& visibility);
        void preparePerAccountPrefs(bool enable);
        void enableHistory();
        
@@ -78,7 +78,6 @@ protected:
 
        bool mGotPersonalInfo;
        bool mGotPerAccountSettings;
-        bool mOriginalIMViaEmail;
        bool mOriginalHideOnlineStatus;
        std::string mDirectoryVisibility;
@@ -89,7 +88,6 @@ LLPrefsIMImpl::LLPrefsIMImpl()
        : LLPanel(std::string("IM Prefs Panel")),
          mGotPersonalInfo(false),
          mGotPerAccountSettings(false),
-          mOriginalIMViaEmail(false),
          mOriginalHideOnlineStatus(false)
 {
        LLUICtrlFactory::getInstance()->buildPanel(this, "panel_preferences_im.xml");
@@ -102,29 +100,14 @@ void LLPrefsIMImpl::cancel()
 BOOL LLPrefsIMImpl::postBuild()
 {
        requires("online_visibility");
-        requires("send_im_to_email");
+        
        if (!checkRequirements())
        {
                return FALSE;
        }
-        childSetLabelArg("send_im_to_email", "[EMAIL]", getString("log_in_to_change"));
+        // Don't enable this until we get personal data
-        // Don't enable these until we get personal data
        childSetEnabled("online_visibility", false);
-        childSetEnabled("send_im_to_email", false);
-        // These are safe to enable
-        childSetEnabled("include_im_in_chat_console", true);
-        childSetEnabled("include_im_in_chat_history", true);
-        childSetEnabled("show_timestamps_check", true);
-        childSetEnabled("friends_online_notify_checkbox", true);
-        childSetEnabled("vertical-imtabs-toggle", true);
-        childSetValue("include_im_in_chat_console", gSavedSettings.getBOOL("IMInChatConsole"));
-        childSetValue("include_im_in_chat_history", gSavedSettings.getBOOL("IMInChatHistory"));
-        childSetValue("show_timestamps_check", gSavedSettings.getBOOL("IMShowTimestamps"));
-        childSetValue("friends_online_notify_checkbox", gSavedSettings.getBOOL("ChatOnlineNotification"));
-        childSetValue("vertical-imtabs-toggle", gSavedSettings.getBOOL("VerticalIMTabs"));
        childSetAction("log_path_button", onClickLogPath, this);
        childSetCommitCallback("log_chat",onCommitLogging,this);
@@ -191,11 +174,9 @@ void LLPrefsIMImpl::apply()
        if (mGotPersonalInfo)
        {
-                bool new_im_via_email = childGetValue("send_im_to_email").asBoolean();
                bool new_hide_online = childGetValue("online_visibility").asBoolean();          
-                if((new_im_via_email != mOriginalIMViaEmail)
+                if (new_hide_online != mOriginalHideOnlineStatus)
-                   ||(new_hide_online != mOriginalHideOnlineStatus))
                {
                        LLMessageSystem* msg = gMessageSystem;
                        msg->newMessageFast(_PREHASH_UpdateUserInfo);
@@ -203,7 +184,7 @@ void LLPrefsIMImpl::apply()
                        msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
                        msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
                        msg->nextBlockFast(_PREHASH_UserData);
-                        msg->addBOOLFast(_PREHASH_IMViaEMail, new_im_via_email);
+                        //msg->addBOOLFast(_PREHASH_IMViaEMail, new_im_via_email);
                        // This hack is because we are representing several different    
                        // possible strings with a single checkbox. Since most users     
                        // can only select between 2 values, we represent it as a        
@@ -220,19 +201,12 @@ void LLPrefsIMImpl::apply()
                        gAgent.sendReliableMessage();
                }
        }
-        gSavedSettings.setBOOL("VerticalIMTabs", childGetValue("vertical-imtabs-toggle").asBoolean());
-        gSavedSettings.setBOOL("IMInChatConsole", childGetValue("include_im_in_chat_console").asBoolean());
-        gSavedSettings.setBOOL("IMInChatHistory", childGetValue("include_im_in_chat_history").asBoolean());
-        gSavedSettings.setBOOL("IMShowTimestamps", childGetValue("show_timestamps_check").asBoolean());
-        gSavedSettings.setBOOL("ChatOnlineNotification", childGetValue("friends_online_notify_checkbox").asBoolean());
 }
 // Enable and set the value of settings recieved from the sim in AgentInfoReply
-void LLPrefsIMImpl::setPersonalInfo(const std::string& visibility, bool im_via_email, const std::string& email)
+void LLPrefsIMImpl::setPersonalInfo(const std::string& visibility)
 {
        mGotPersonalInfo = true;
-        mOriginalIMViaEmail = im_via_email;
        mDirectoryVisibility = visibility;
        
        if(visibility == VISIBILITY_DEFAULT)
@@ -252,22 +226,6 @@ void LLPrefsIMImpl::setPersonalInfo(const std::string& visibility, bool im_via_e
        childSetValue("online_visibility", mOriginalHideOnlineStatus);   
        childSetLabelArg("online_visibility", "[DIR_VIS]", mDirectoryVisibility);
-        childEnable("send_im_to_email");
-        childSetValue("send_im_to_email", im_via_email);
-        // Truncate the e-mail address if it's too long (to prevent going off
-        // the edge of the dialog).
-        std::string display_email(email);
-        if(display_email.size() > 30)
-        {
-                display_email.resize(30);
-                display_email += "...";
-        }
-        else if (display_email.empty())
-        {
-                display_email = getString("default_email_used");
-        }
-        childSetLabelArg("send_im_to_email", "[EMAIL]", display_email);
 }
 // Enable and set the value of settings that need an account name
@@ -373,9 +331,9 @@ void LLPrefsIM::cancel()
        impl.cancel();
 }
-void LLPrefsIM::setPersonalInfo(const std::string& visibility, bool im_via_email, const std::string& email)
+void LLPrefsIM::setPersonalInfo(const std::string& visibility)
 {
-        impl.setPersonalInfo(visibility, im_via_email, email);
+        impl.setPersonalInfo(visibility);
 }
 void LLPrefsIM::preparePerAccountPrefs(bool enable)
diff --git a/linden/indra/newview/llprefsim.h b/linden/indra/newview/llprefsim.h
index acf9b0f..054e4c7 100644
--- a/linden/indra/newview/llprefsim.h
+++ b/linden/indra/newview/llprefsim.h
@@ -45,7 +45,7 @@ public:
        void apply();
        void cancel();
-        void setPersonalInfo(const std::string& visibility, bool im_via_email, const std::string& email);
+        void setPersonalInfo(const std::string& visibility);
        void preparePerAccountPrefs(bool enable);
        LLPanel* getPanel();
diff --git a/linden/indra/newview/llprefsvoice.cpp b/linden/indra/newview/llprefsvoice.cpp
index fe5446b..0e8e816 100644
--- a/linden/indra/newview/llprefsvoice.cpp
+++ b/linden/indra/newview/llprefsvoice.cpp
@@ -189,6 +189,8 @@ void LLPrefsVoice::onCommitEnableVoiceChat(LLUICtrl* ctrl, void* user_data)
        self->childSetEnabled("push_to_talk_label", enable);
        self->childSetEnabled("voice_call_friends_only_check", enable);
        self->childSetEnabled("auto_disengage_mic_check", enable);
+        self->childSetEnabled("privacy_heading", enable);
+        self->childSetEnabled("push_to_talk_heading", enable);
        self->childSetEnabled("push_to_talk_toggle_check", enable);
        self->childSetEnabled("ear_location", enable);
        self->childSetEnabled("set_voice_hotkey_button", enable);
diff --git a/linden/indra/newview/llstartup.cpp b/linden/indra/newview/llstartup.cpp
index b05e36d..083a082 100644
--- a/linden/indra/newview/llstartup.cpp
+++ b/linden/indra/newview/llstartup.cpp
@@ -1884,8 +1884,7 @@ bool idle_startup()
                        tmp = LLUserAuth::getInstance()->getResponse("max-agent-groups");
                        if (!tmp.empty()) gHippoGridManager->getConnectedGrid()->setMaxAgentGroups(atoi(tmp.c_str()));
-                        tmp = LLUserAuth::getInstance()->getResponse("VoiceConnector");
-                        if (!tmp.empty()) gHippoGridManager->getConnectedGrid()->setVoiceConnector(tmp);
                        gHippoGridManager->saveFile();
                        gHippoLimits->setLimits();
@@ -1931,8 +1930,7 @@ bool idle_startup()
                        }
                        // else llwarns << "MapServerURL empty"<< llendl;
-                        // Pass the user information to the voice chat server interface.
-                        gVoiceClient->userAuthorized(firstname, lastname, gAgentID);
                }
                else // if(successful_login)
                {
@@ -2065,6 +2063,7 @@ bool idle_startup()
                LL_DEBUGS("AppInitStartupState") << "STATE_SEED_CAP_GRANTED" << LL_ENDL;
                update_texture_fetch();
                if ( gViewerWindow != NULL)
                {       // This isn't the first logon attempt, so show the UI
                        gViewerWindow->setNormalControlsVisible( TRUE );
@@ -2123,6 +2122,9 @@ bool idle_startup()
                //
                LL_INFOS("AppInit") << "Initializing communications..." << LL_ENDL;
+                // Pass the user information to the voice chat server interface.
+                gVoiceClient->userAuthorized(firstname, lastname, gAgentID);
                // register callbacks for messages. . . do this after initial handshake to make sure that we don't catch any unwanted
                register_viewer_callbacks(gMessageSystem);
@@ -2142,7 +2144,7 @@ bool idle_startup()
                        gCacheName->addObserver(callback_cache_name);
        
                        // Load stored cache if possible
-            LLAppViewer::instance()->loadNameCache();
+                        LLAppViewer::instance()->loadNameCache();
                        // Start cache in not-running state until we figure out if we have
                        // capabilities for display name lookup
diff --git a/linden/indra/newview/lltexturefetch.cpp b/linden/indra/newview/lltexturefetch.cpp
index ab867a6..bdad2b8 100644
--- a/linden/indra/newview/lltexturefetch.cpp
+++ b/linden/indra/newview/lltexturefetch.cpp
@@ -874,15 +874,6 @@ bool LLTextureFetchWorker::doWork(S32 param)
                                }
                        }
-                        // *TODO: remove this hack when not needed anymore
-                        S32 buggy_range_fudge = 0;
-                        if (LLTextureFetch::hasBuggyHTTPRange())
-                        {
-                                buggy_range_fudge = 1;
-                                resetFormattedData(); // discard any previous data we had
-                                cur_size = 0 ;
-                        }
                        mRequestedSize = mDesiredSize;
                        mRequestedDiscard = mDesiredDiscard;
                        mRequestedSize -= cur_size;
@@ -898,7 +889,7 @@ bool LLTextureFetchWorker::doWork(S32 param)
                                mGetReason.clear();
                                LL_DEBUGS("TextureFetch") << "HTTP GET: " << mID << " Offset: " << offset
                                                << " Bytes: " << mRequestedSize
-                                                << " Range: " << offset << "-" << offset+mRequestedSize-1+buggy_range_fudge
+                                                << " Range: " << offset << "-" << offset+mRequestedSize-1
                                                << " Bandwidth(kbps): " << mFetcher->getTextureBandwidth() << "/" << max_bandwidth
                                                << LL_ENDL;
                                setPriority(LLWorkerThread::PRIORITY_LOW | mWorkPriority);
@@ -908,7 +899,7 @@ bool LLTextureFetchWorker::doWork(S32 param)
                                // Will call callbackHttpGet when curl request completes
                                std::vector<std::string> headers;
                                headers.push_back("Accept: image/x-j2c");
-                                res = mFetcher->mCurlGetRequest->getByteRange(mUrl, headers, offset, mRequestedSize + buggy_range_fudge,
+                                res = mFetcher->mCurlGetRequest->getByteRange(mUrl, headers, offset, mRequestedSize,
                                                                                                                          new HTTPGetResponder(mFetcher, mID, LLTimer::getTotalTime(), mRequestedSize, offset));
                        }
                        if (!res)
@@ -2279,45 +2270,3 @@ void LLTextureFetch::dump()
                                << llendl;
        }
 }
-// This tries to detect if the sim has this bug:
-// http://opensimulator.org/mantis/view.php?id=5081
-//
-// *TODO: This is a *HACK and may not work if the grid is heterogenous.
-//        Remove it once OpenSim versions in the wild are > 0.7.0.2!
-#include "hippogridmanager.h"
-#include <boost/regex.hpp> 
-//static
-bool LLTextureFetch::hasBuggyHTTPRange()
-{
-        static std::string s_version;
-        static bool buggy = false;
-        if ((s_version != gLastVersionChannel) && !gLastVersionChannel.empty())
-        {
-                s_version = gLastVersionChannel;
-                buggy = false;
-                if (gHippoGridManager->getConnectedGrid()->getPlatform() == HippoGridInfo::PLATFORM_OPENSIM)
-                {
-                        std::string ver_string;
-                        try
-                        {
-                                const boost::regex re(".*OpenSim.*?([0-9.]+).+");
-                                ver_string = regex_replace(s_version, re, "\\1", boost::match_default);
-                        }
-                        catch(std::runtime_error)
-                        {
-                                ver_string = "0.0";
-                        }
-                        LLStringUtil::replaceChar(ver_string, '.', '0');
-                        ver_string = "0." + ver_string;
-                        F64 version = atof(ver_string.c_str());
-                        // we look for "0.6.8" < version < "0.7.0.3"
-                        if ((version > 0.00608) && (version < 0.0070003))
-                        {
-                                buggy = true;
-                                llwarns << "Setting buggy http ranges mode for current sim, because we're on " << s_version << llendl;
-                        }
-                }
-        }
-        return buggy;
-}
diff --git a/linden/indra/newview/lltexturefetch.h b/linden/indra/newview/lltexturefetch.h
index 5fa2d1c..6c6bb52 100644
--- a/linden/indra/newview/lltexturefetch.h
+++ b/linden/indra/newview/lltexturefetch.h
@@ -86,8 +86,6 @@ public:
        LLTextureInfo* getTextureInfo() { return &mTextureInfo; }
        
-        static bool hasBuggyHTTPRange(); // *TODO: remove this *HACK once buggy OpenSim versions are gone
 protected:
        void addToNetworkQueue(LLTextureFetchWorker* worker);
        void removeFromNetworkQueue(LLTextureFetchWorker* worker, bool cancel);
diff --git a/linden/indra/newview/llviewerimagelist.cpp b/linden/indra/newview/llviewerimagelist.cpp
index 039896f..de92903 100644
--- a/linden/indra/newview/llviewerimagelist.cpp
+++ b/linden/indra/newview/llviewerimagelist.cpp
@@ -193,6 +193,13 @@ void LLViewerImageList::doPreloadImages()
                mImagePreloads.insert(image);
        }
+        // Preload default unrezzad avatar cloud
+        image = getImageFromFile("cloud-particle.j2c",MIPMAP_YES,IMMEDIATE_YES,0,0,DEFAULT_UNREZZED_AVATAR_PARTICLE);
+        if (image)
+        {
+                image->setAddressMode(LLTexUnit::TAM_WRAP);
+                mImagePreloads.insert(image);
+        }
 }
 static std::string get_texture_list_name()
diff --git a/linden/indra/newview/llviewermedia.cpp b/linden/indra/newview/llviewermedia.cpp
index 89d7b1f..dbb6f62 100644
--- a/linden/indra/newview/llviewermedia.cpp
+++ b/linden/indra/newview/llviewermedia.cpp
@@ -547,6 +547,13 @@ LLPluginClassMedia* LLViewerMediaImpl::newSourceFromMediaType(std::string media_
                        if (media_source->init(launcher_name, plugin_name, gSavedSettings.getBOOL("PluginAttachDebuggerToPlugins")))
                        {
+                                #if LL_WINDOWS
+                                if (gSavedSettings.getBOOL("ShowConsoleWindow"))
+                                {
+                                        media_source->showConsole();
+                                }
+                                #endif
                                return media_source;
                        }
                        else
diff --git a/linden/indra/newview/llviewermedia_streamingaudio.cpp b/linden/indra/newview/llviewermedia_streamingaudio.cpp
index 6a4dd0f..f02870b 100644
--- a/linden/indra/newview/llviewermedia_streamingaudio.cpp
+++ b/linden/indra/newview/llviewermedia_streamingaudio.cpp
@@ -96,7 +96,7 @@ void LLStreamingAudio_MediaPlugins::stop()
        {
                mMediaPlugin->stop();
        }
+        llinfos << "Stopping internet stream." << llendl;
        mURL.clear();
 }
diff --git a/linden/indra/newview/llvoavatar.cpp b/linden/indra/newview/llvoavatar.cpp
index ed51a24..b044309 100644
--- a/linden/indra/newview/llvoavatar.cpp
+++ b/linden/indra/newview/llvoavatar.cpp
@@ -1525,7 +1525,7 @@ void LLVOAvatar::loadCloud(const std::string& filename,  LLPartSysData& particle
        if(particles.mPartImageID.isNull() || default_id == particles.mPartImageID)
        {
                LLViewerImage* cloud_image =
-                        gImageList.getImageFromFile("cloud-particle.j2c", MIPMAP_YES, IMMEDIATE_YES, 0, 0, default_id);
+                        gImageList.getImage(default_id);
                particles.mPartImageID = cloud_image->getID();
        }
 }
diff --git a/linden/indra/newview/llvoavatar.h b/linden/indra/newview/llvoavatar.h
index 4d08bf0..b9e4d17 100644
--- a/linden/indra/newview/llvoavatar.h
+++ b/linden/indra/newview/llvoavatar.h
@@ -231,6 +231,7 @@ public:
        BOOL                    isVisible();
        BOOL                    isSelf() const { return mIsSelf; }
+        bool                    isBuilt() const { return mIsBuilt; }
        BOOL                    isCulled() const { return mCulled; }
 public:
diff --git a/linden/indra/newview/llvoiceclient.cpp b/linden/indra/newview/llvoiceclient.cpp
index 2266aab..115f6e8 100644
--- a/linden/indra/newview/llvoiceclient.cpp
+++ b/linden/indra/newview/llvoiceclient.cpp
@@ -139,22 +139,23 @@ class LLViewerVoiceAccountProvisionResponder :
        public LLHTTPClient::Responder
 {
 public:
-        LLViewerVoiceAccountProvisionResponder(int retries)
+        LLViewerVoiceAccountProvisionResponder(int retries, LLUUID response_id)
        {
                mRetries = retries;
+                mResponseID = response_id;
        }
        virtual void error(U32 status, const std::string& reason)
        {
                if ( mRetries > 0 )
                {
-                        LL_WARNS("Voice") << "ProvisionVoiceAccountRequest returned an error, retrying.  status = " << status << ", reason = \"" << reason << "\"" << LL_ENDL;
+                        LL_DEBUGS("VoiceCaps") << "ProvisionVoiceAccountRequest returned an error, retrying.  status = " << status << ", reason = \"" << reason << "\"" << LL_ENDL;
                        if ( gVoiceClient ) gVoiceClient->requestVoiceAccountProvision(
                                mRetries - 1);
                }
                else
                {
-                        LL_WARNS("Voice") << "ProvisionVoiceAccountRequest returned an error, too many retries (giving up).  status = " << status << ", reason = \"" << reason << "\"" << LL_ENDL;
+                        LL_DEBUGS("VoiceCaps") << "ProvisionVoiceAccountRequest returned an error, too many retries (giving up).  status = " << status << ", reason = \"" << reason << "\"" << LL_ENDL;
                        if ( gVoiceClient ) gVoiceClient->giveUp();
                }
        }
@@ -166,7 +167,7 @@ public:
                        std::string voice_sip_uri_hostname;
                        std::string voice_account_server_uri;
                        
-                        LL_DEBUGS("Voice") << "ProvisionVoiceAccountRequest response:" << ll_pretty_print_sd(content) << LL_ENDL;
+                        LL_DEBUGS("VoiceCaps") << "ProvisionVoiceAccountRequest response:" << ll_pretty_print_sd(content) << LL_ENDL;
                        
                        if(content.has("voice_sip_uri_hostname"))
                                voice_sip_uri_hostname = content["voice_sip_uri_hostname"].asString();
@@ -179,12 +180,14 @@ public:
                                content["username"].asString(),
                                content["password"].asString(),
                                voice_sip_uri_hostname,
-                                voice_account_server_uri);
+                                voice_account_server_uri,
+                                mResponseID);
                }
        }
 private:
        int mRetries;
+        LLUUID mResponseID;
 };
 /** 
@@ -364,7 +367,7 @@ LLIOPipe::EStatus LLVivoxProtocolParser::process_impl(
                // If this message isn't set to be squelched, output the raw XML received.
                if(!squelchDebugOutput)
                {
-                        LL_DEBUGS("Voice") << "parsing: " << mInput.substr(start, delim - start) << LL_ENDL;
+                        LL_DEBUGS("VivoxProtocolParser") << "parsing: " << mInput.substr(start, delim - start) << LL_ENDL;
                }
                
                start = delim + 3;
@@ -378,7 +381,7 @@ LLIOPipe::EStatus LLVivoxProtocolParser::process_impl(
        if(!gVoiceClient->mConnected)
        {
                // If voice has been disabled, we just want to close the socket.  This does so.
-                LL_INFOS("Voice") << "returning STATUS_STOP" << LL_ENDL;
+                LL_INFOS("VivoxProtocolParser") << "returning STATUS_STOP" << LL_ENDL;
                return STATUS_STOP;
        }
        
@@ -1008,12 +1011,13 @@ static LLVoiceClientFriendsObserver *friendslist_listener = NULL;
 class LLVoiceClientCapResponder : public LLHTTPClient::Responder
 {
 public:
-        LLVoiceClientCapResponder(void){};
+        LLVoiceClientCapResponder(LLUUID response_id):mResponseID(response_id) {};
        virtual void error(U32 status, const std::string& reason);      // called with bad status codes
        virtual void result(const LLSD& content);
 private:
+        LLUUID mResponseID;
 };
 void LLVoiceClientCapResponder::error(U32 status, const std::string& reason)
@@ -1027,7 +1031,7 @@ void LLVoiceClientCapResponder::result(const LLSD& content)
 {
        LLSD::map_const_iterator iter;
        
-        LL_DEBUGS("Voice") << "ParcelVoiceInfoRequest response:" << ll_pretty_print_sd(content) << LL_ENDL;
+        LL_DEBUGS("VoiceCaps") << "ParcelVoiceInfoRequest response:\n" << ll_pretty_print_sd(content) << LL_ENDL;
        if ( content.has("voice_credentials") )
        {
@@ -1045,7 +1049,7 @@ void LLVoiceClientCapResponder::result(const LLSD& content)
                                voice_credentials["channel_credentials"].asString();
                }
-                gVoiceClient->setSpatialChannel(uri, credentials);
+                gVoiceClient->setSpatialChannel(uri, credentials, mResponseID);
        }
 }
@@ -1126,6 +1130,8 @@ LLVoiceClient::LLVoiceClient()
        mAudioSessionChanged = false;
        // Initial dirty state
+        mAccountActive = false;
+        mVAPRequested = false;
        mSpatialCoordsDirty = false;
        mPTTDirty = true;
        mFriendsListDirty = true;
@@ -1347,6 +1353,7 @@ void LLVoiceClient::userAuthorized(const std::string& firstName, const std::stri
        sConnectingToAgni = LLViewerLogin::getInstance()->isInProductionGrid();
        mAccountName = nameFromID(agentID);
+        mAccountActive = true;
 }
 void LLVoiceClient::requestVoiceAccountProvision(S32 retries)
@@ -1357,12 +1364,21 @@ void LLVoiceClient::requestVoiceAccountProvision(S32 retries)
                        gAgent.getRegion()->getCapability(
                                "ProvisionVoiceAccountRequest");
-                if ( url == "" ) return;
+                if ( url.empty() )
+                {
+                        mVAPRequested = false;
+                        mAccountActive = false;
+                        setState(stateDisableCleanup);
+                }
+                LL_DEBUGS("VoiceCaps") << "Got ProvisionVoiceAccountRequest capability: " 
+                                << url << llendl;
+                mVAPCapResponseID.generate();
                LLHTTPClient::post(
                        url,
                        LLSD(),
-                        new LLViewerVoiceAccountProvisionResponder(retries));
+                        new LLViewerVoiceAccountProvisionResponder(retries, mVAPCapResponseID));
        }
 }
@@ -1370,11 +1386,44 @@ void LLVoiceClient::login(
        const std::string& account_name,
        const std::string& password,
        const std::string& voice_sip_uri_hostname,
-        const std::string& voice_account_server_uri)
+        const std::string& voice_account_server_uri,
+        const LLUUID& response_id)
 {
+        if(response_id != mVAPCapResponseID) return;
+        std::string new_scheme;
+        std::string old_scheme;
+        if(!voice_account_server_uri.empty())
+        {
+                new_scheme = voice_account_server_uri.substr(0, voice_account_server_uri.find("://"));
+        }
+        if(!mDaemonScheme.empty())
+        {
+                old_scheme = mDaemonScheme;
+        }
+        else
+        {
+                old_scheme = new_scheme;
+        }
        mVoiceSIPURIHostName = voice_sip_uri_hostname;
        mVoiceAccountServerURI = voice_account_server_uri;
+        LL_DEBUGS("VoiceCaps") << "new_scheme: \"" << new_scheme << "\""
+                << "\nold_scheme: \"" << old_scheme << "\""
+                << "\ngateway running: " << ( isGatewayRunning() ? "true" : "false" ) << llendl;
+        if(!isGatewayRunning() )
+        {
+                loadDaemon(new_scheme);
+        }
+        else if(old_scheme != new_scheme)
+        {
+                mAccountActive = true;
+                setState(stateDisableCleanup);
+        }
        if(!mAccountHandle.empty())
        {
                // Already logged in.
@@ -1432,6 +1481,183 @@ void LLVoiceClient::login(
        }
 }
+void LLVoiceClient::loadDaemon(const std::string& scheme)
+{
+        // Launch the voice daemon
+        
+        // *FIX:Mani - Using the executable dir instead 
+        // of mAppRODataDir, the working directory from which the app
+        // is launched.
+        //std::string exe_path = gDirUtilp->getAppRODataDir();
+        std::string exe_path = gDirUtilp->getExecutableDir();
+        exe_path += gDirUtilp->getDirDelimiter();
+#if LL_DARWIN
+        exe_path += "../Resources/";
+#endif
+        //exe_path += gSavedSettings.getString("VoiceModule");
+        llwarns << "Scheme: " << scheme << llendl;
+        
+        std::string module;
+        if (scheme == "tcp")
+        {
+                module = gSavedSettings.getString("VoiceModuleMumble").empty() ?
+                                "mumble" : gSavedSettings.getString("VoiceModuleMumble");
+        }
+        else
+        {
+                module = gSavedSettings.getString("VoiceModuleVivox").empty() ?
+                                "SLVoice" : gSavedSettings.getString("VoiceModuleVivox");
+        }
+        size_t pos_to_tst = module.find_last_of("/\\");
+        if( pos_to_tst != std::string::npos )
+        {
+                module = module.substr(pos_to_tst+1);
+        }
+#if LL_WINDOWS
+        std::string extension = ".exe";
+        if ( module.rfind(extension) != module.length()-extension.length())
+        {
+                module.append(extension);
+        }
+#endif
+        exe_path.append(module);
+        // See if the vivox executable exists
+        llstat s;
+        if(!LLFile::stat(exe_path, &s))
+        {
+                // vivox executable exists.  Build the command line and launch the daemon.
+                // SLIM SDK: these arguments are no longer necessary.
+                // std::string args = " -p tcp -h -c";
+                std::string args;
+                std::string cmd;
+                std::string loglevel = gSavedSettings.getString("VivoxDebugLevel");
+                
+                if(loglevel.empty())
+                {
+                        loglevel = "-1";        // turn logging off completely
+                }
+                
+                args += " -ll ";
+                args += loglevel;
+                
+                llwarns << "Voice loaded from: " << exe_path << " " << args << LL_ENDL;
+#if LL_WINDOWS
+                PROCESS_INFORMATION pinfo;
+                STARTUPINFOA sinfo;
+                memset(&sinfo, 0, sizeof(sinfo));
+                std::string exe_dir = gDirUtilp->getAppRODataDir();
+                
+                // So retarded.  Windows requires that the second parameter to CreateProcessA be a writable (non-const) string...
+                char *args2 = new char[args.size() + 1];
+                strcpy(args2, args.c_str());
+                if(!CreateProcessA(exe_path.c_str(), args2, NULL, NULL, FALSE, 0, NULL, exe_dir.c_str(), &sinfo, &pinfo))
+                {
+                        // DWORD dwErr = GetLastError();
+                }
+                else
+                {
+                        // foo = pinfo.dwProcessId; // get your pid here if you want to use it later on
+                        // CloseHandle(pinfo.hProcess); // stops leaks - nothing else
+                        sGatewayHandle = pinfo.hProcess;
+                        CloseHandle(pinfo.hThread); // stops leaks - nothing else
+                }               
+                
+                delete[] args2;
+#else   // LL_WINDOWS
+                // This should be the same for mac and linux
+                {
+                        std::vector<std::string> arglist;
+                        arglist.push_back(exe_path);
+                        
+                        // Split the argument string into separate strings for each argument
+                        typedef boost::tokenizer<boost::char_separator<char> > tokenizer;
+                        boost::char_separator<char> sep(" ");
+                        tokenizer tokens(args, sep);
+                        tokenizer::iterator token_iter;
+                        for(token_iter = tokens.begin(); token_iter != tokens.end(); ++token_iter)
+                        {
+                                arglist.push_back(*token_iter);
+                        }
+                        
+                        // create an argv vector for the child process
+                        char **fakeargv = new char*[arglist.size() + 1];
+                        int i;
+                        for(i=0; i < arglist.size(); i++)
+                                fakeargv[i] = const_cast<char*>(arglist[i].c_str());
+                        fakeargv[i] = NULL;
+                        
+                        fflush(NULL); // flush all buffers before the child inherits them
+                        pid_t id = vfork();
+                        if(id == 0)
+                        {
+                                // child
+                                execv(exe_path.c_str(), fakeargv);
+                                
+                                // If we reach this point, the exec failed.
+                                // Use _exit() instead of exit() per the vfork man page.
+                                _exit(0);
+                        }
+                        // parent
+                        delete[] fakeargv;
+                        sGatewayPID = id;
+                }
+#endif  // LL_WINDOWS
+                mDaemonScheme = scheme;
+                mDaemonHost = LLHost(gSavedSettings.getString("VoiceHost").c_str(), gSavedSettings.getU32("VoicePort"));
+                // Dirty the states we'll need to sync with the daemon when it comes up.
+                mPTTDirty = true;
+                mMicVolumeDirty = true;
+                mSpeakerVolumeDirty = true;
+                mSpeakerMuteDirty = true;
+                // These only need to be set if they're not default (i.e. empty string).
+                mCaptureDeviceDirty = !mCaptureDevice.empty();
+                mRenderDeviceDirty = !mRenderDevice.empty();
+                
+                mMainSessionGroupHandle.clear();
+                // kick in
+        
+                mUpdateTimer.start();
+                mUpdateTimer.setTimerExpirySec(CONNECT_THROTTLE_SECONDS);
+                
+                setState(stateDaemonLaunched);
+        
+                //trigger parcel changed in the state engine
+                mCurrentRegionName.append("kick in");
+        
+        }       
+        else
+        {
+                LL_WARNS("Voice") << exe_path << " not found." << LL_ENDL;
+                mAccountActive = false;
+                setState(stateDisableCleanup);
+        }
+        // we are done, re-allow ProvisionVoiceAccountRequest
+        mVAPRequested = false;
+}
 void LLVoiceClient::idle(void* user_data)
 {
        LLVoiceClient* self = (LLVoiceClient*)user_data;
@@ -1537,11 +1763,20 @@ void LLVoiceClient::start()
 void LLVoiceClient::stateMachine()
 {
+        if( stateJail == getState())
+        {
+                return;
+        }
+        if(gSavedSettings.getBOOL("CmdLineDisableVoice"))
+        {
+                // Voice is locked out, we must not launch the vivox daemon.
+                setState(stateJail);
+        }
        // Disable voice as long as the viewer is disconnected from the sim (login/relog)
        setVoiceEnabled(!gDisconnected
-                        && gSavedSettings.getBOOL("EnableVoiceChat")
+                        && gSavedSettings.getBOOL("EnableVoiceChat") );
-                        && !gSavedSettings.getBOOL("CmdLineDisableVoice") );
        if(mVoiceEnabled)
        {
@@ -1560,12 +1795,8 @@ void LLVoiceClient::stateMachine()
                        {
                                // if voice was turned off after the daemon was launched but before we could connect to it, we may need to issue a kill.
                                LL_WARNS("Voice") << "Disabling voice before connection to daemon, terminating." << LL_ENDL;
-                                killGateway();
                        }
                        
-                        logout();
-                        connectorShutdown();
-                        
                        setState(stateDisableCleanup);
                }
        }
@@ -1580,42 +1811,23 @@ void LLVoiceClient::stateMachine()
                {
                        S32 parcelLocalID = parcel->getLocalID();
                        std::string regionName = region->getName();
-                        std::string capURI = region->getCapability("ParcelVoiceInfoRequest");
-                
-//                      LL_DEBUGS("Voice") << "Region name = \"" << regionName << "\", parcel local ID = " << parcelLocalID << ", cap URI = \"" << capURI << "\"" << LL_ENDL;
                        // The region name starts out empty and gets filled in later.  
                        // Also, the cap gets filled in a short time after the region cross, but a little too late for our purposes.
                        // If either is empty, wait for the next time around.
-                        if(!regionName.empty())
+                        if(/*getState() >= stateNoChannel &&*/ !regionName.empty())
                        {
-                                if(!capURI.empty())
-                                {
+                                if((parcelLocalID != mCurrentParcelLocalID) || (regionName != mCurrentRegionName))
-                                        if((parcelLocalID != mCurrentParcelLocalID) || (regionName != mCurrentRegionName))
-                                        {
-                                                // We have changed parcels.  Initiate a parcel channel lookup.
-                                                mCurrentParcelLocalID = parcelLocalID;
-                                                mCurrentRegionName = regionName;
-                                                
-                                                parcelChanged();
-                                        }
-                                }
-                                else
                                {
-                                        static int count = 0;
+                                        // We have changed parcels.  Initiate a parcel channel lookup.
-                                        static int count2 = 0;
+                                        mCurrentParcelLocalID = parcelLocalID;
-                                        static int num = 1;
+                                        mCurrentRegionName = regionName;
-                                        ++count;
+                                        
-                                        if (count % num == 0)
+                                        parcelChanged();
-                                        {
-                                          LL_DEBUGS("Voice") << "region doesn't have ParcelVoiceInfoRequest capability.  This is normal for a short time after teleporting, but bad if it persists for very long (" << count << ")." << LL_ENDL;
-                                          if (num < 1000 && ++count2 == 10)
-                                          {
-                                            num *= 10;
-                                            count2 = 0;
-                                          }
-                                        }
                                }
                        }
                }
        }
@@ -1624,22 +1836,34 @@ void LLVoiceClient::stateMachine()
        {
                //MARK: stateDisableCleanup
                case stateDisableCleanup:
-                        // Clean up and reset everything. 
+                        // Clean up and reset everything.
+                        mVAPCapResponseID.setNull();
+                        mPIRCapResponseID.setNull();
+                        if(isGatewayRunning())
+                        {
+                                killGateway();
+                        }
+                        logoutSendMessage();
+                        mConnected = false;
                        closeSocket();
                        deleteAllSessions();
-                        deleteAllBuddies();             
+                        deleteAllBuddies();
                        
                        mConnectorHandle.clear();
                        mAccountHandle.clear();
                        mAccountPassword.clear();
                        mVoiceAccountServerURI.clear();
-                        
+                        mVAPRequested = false;
-                        setState(stateDisabled);        
+                        setState(stateDisabled);
                break;
                
                //MARK: stateDisabled
                case stateDisabled:
-                        if(mTuningMode || (mVoiceEnabled && !mAccountName.empty()))
+                        if(mTuningMode || (mVoiceEnabled && mAccountActive && !mAccountName.empty()))
                        {
                                setState(stateStart);
                        }
@@ -1647,165 +1871,26 @@ void LLVoiceClient::stateMachine()
                
                //MARK: stateStart
                case stateStart:
-                        if(gSavedSettings.getBOOL("CmdLineDisableVoice"))
+                {
+                        bool have_region = (NULL != gAgent.getRegion() );
+                        if(mVoiceEnabled && !mVAPRequested && !mAccountName.empty() && have_region)
                        {
-                                // Voice is locked out, we must not launch the vivox daemon.
+                                mVAPRequested = true;
-                                setState(stateJail);
+                                requestVoiceAccountProvision();
                        }
-                        else if(!isGatewayRunning())
+                } break;
-                        {
-                                if(true)
-                                {
-                                        // Launch the voice daemon
-                                        
-                                        // *FIX:Mani - Using the executable dir instead 
-                                        // of mAppRODataDir, the working directory from which the app
-                                        // is launched.
-                                        //std::string exe_path = gDirUtilp->getAppRODataDir();
-                                        std::string exe_path = gDirUtilp->getExecutableDir();
-                                        exe_path += gDirUtilp->getDirDelimiter();
-#if LL_DARWIN
-                                        exe_path += "../Resources/";
-#endif
-                                        exe_path += gSavedSettings.getString("VoiceModule");
-#if LL_WINDOWS
-                                        exe_path += ".exe";
-#endif
-                                        // See if the vivox executable exists
-                                        llstat s;
-                                        if(!LLFile::stat(exe_path, &s))
-                                        {
-                                                // vivox executable exists.  Build the command line and launch the daemon.
-                                                // SLIM SDK: these arguments are no longer necessary.
-//                                              std::string args = " -p tcp -h -c";
-                                                std::string args;
-                                                std::string cmd;
-                                                std::string loglevel = gSavedSettings.getString("VivoxDebugLevel");
-                                                
-                                                if(loglevel.empty())
-                                                {
-                                                        loglevel = "-1";        // turn logging off completely
-                                                }
-                                                
-                                                args += " -ll ";
-                                                args += loglevel;
-                                                
-                                                LL_DEBUGS("Voice") << "Args for SLVoice: " << args << LL_ENDL;
-#if LL_WINDOWS
-                                                PROCESS_INFORMATION pinfo;
-                                                STARTUPINFOA sinfo;
-                                                memset(&sinfo, 0, sizeof(sinfo));
-                                                std::string exe_dir = gDirUtilp->getAppRODataDir();
-                                                cmd = gSavedSettings.getString("VoiceModule");
-                                                cmd += ".exe";
-                                                cmd += args;
-                                                
-                                                // So retarded.  Windows requires that the second parameter to CreateProcessA be a writable (non-const) string...
-                                                char *args2 = new char[args.size() + 1];
-                                                strcpy(args2, args.c_str());
-                                                if(!CreateProcessA(exe_path.c_str(), args2, NULL, NULL, FALSE, 0, NULL, exe_dir.c_str(), &sinfo, &pinfo))
-                                                {
-//                                                      DWORD dwErr = GetLastError();
-                                                }
-                                                else
-                                                {
-                                                        // foo = pinfo.dwProcessId; // get your pid here if you want to use it later on
-                                                        // CloseHandle(pinfo.hProcess); // stops leaks - nothing else
-                                                        sGatewayHandle = pinfo.hProcess;
-                                                        CloseHandle(pinfo.hThread); // stops leaks - nothing else
-                                                }               
-                                                
-                                                delete[] args2;
-#else   // LL_WINDOWS
-                                                // This should be the same for mac and linux
-                                                {
-                                                        std::vector<std::string> arglist;
-                                                        arglist.push_back(exe_path);
-                                                        
-                                                        // Split the argument string into separate strings for each argument
-                                                        typedef boost::tokenizer<boost::char_separator<char> > tokenizer;
-                                                        boost::char_separator<char> sep(" ");
-                                                        tokenizer tokens(args, sep);
-                                                        tokenizer::iterator token_iter;
-                                                        for(token_iter = tokens.begin(); token_iter != tokens.end(); ++token_iter)
-                                                        {
-                                                                arglist.push_back(*token_iter);
-                                                        }
-                                                        
-                                                        // create an argv vector for the child process
-                                                        char **fakeargv = new char*[arglist.size() + 1];
-                                                        int i;
-                                                        for(i=0; i < arglist.size(); i++)
-                                                                fakeargv[i] = const_cast<char*>(arglist[i].c_str());
-                                                        fakeargv[i] = NULL;
-                                                        
-                                                        fflush(NULL); // flush all buffers before the child inherits them
-                                                        pid_t id = vfork();
-                                                        if(id == 0)
-                                                        {
-                                                                // child
-                                                                execv(exe_path.c_str(), fakeargv);
-                                                                
-                                                                // If we reach this point, the exec failed.
-                                                                // Use _exit() instead of exit() per the vfork man page.
-                                                                _exit(0);
-                                                        }
-                                                        // parent
-                                                        delete[] fakeargv;
-                                                        sGatewayPID = id;
-                                                }
-#endif  // LL_WINDOWS
-                                                mDaemonHost = LLHost(gSavedSettings.getString("VoiceHost").c_str(), gSavedSettings.getU32("VoicePort"));
-                                        }       
-                                        else
-                                        {
-                                                LL_WARNS("Voice") << exe_path << " not found." << LL_ENDL;
-                                                mVoiceEnabled = false;
-                                        }       
-                                }
-                                else
-                                {               
-                                        // SLIM SDK: port changed from 44124 to 44125.
-                                        // We can connect to a client gateway running on another host.  This is useful for testing.
-                                        // To do this, launch the gateway on a nearby host like this:
-                                        //  vivox-gw.exe -p tcp -i 0.0.0.0:44125
-                                        // and put that host's IP address here.
-                                        mDaemonHost = LLHost(gSavedSettings.getString("VoiceHost"), gSavedSettings.getU32("VoicePort"));
-                                }
-                                mUpdateTimer.start();
-                                mUpdateTimer.setTimerExpirySec(CONNECT_THROTTLE_SECONDS);
-                                setState(stateDaemonLaunched);
-                                
-                                // Dirty the states we'll need to sync with the daemon when it comes up.
-                                mPTTDirty = true;
-                                mMicVolumeDirty = true;
-                                mSpeakerVolumeDirty = true;
-                                mSpeakerMuteDirty = true;
-                                // These only need to be set if they're not default (i.e. empty string).
-                                mCaptureDeviceDirty = !mCaptureDevice.empty();
-                                mRenderDeviceDirty = !mRenderDevice.empty();
-                                
-                                mMainSessionGroupHandle.clear();
-                        }
-                break;
                //MARK: stateDaemonLaunched
                case stateDaemonLaunched:
                        if(mUpdateTimer.hasExpired())
                        {
-                                LL_DEBUGS("Voice") << "Connecting to vivox daemon" << LL_ENDL;
+                                
                                mUpdateTimer.setTimerExpirySec(CONNECT_THROTTLE_SECONDS);
                                if(!mSocket)
                                {
+                                        LL_DEBUGS("VoiceDaemon") << "Connecting to voice daemon. Protocol: " 
+                                                << mDaemonScheme << LL_ENDL;
                                        mSocket = LLSocket::create(LLSocket::STREAM_TCP);
                                }
                                
@@ -1817,6 +1902,7 @@ void LLVoiceClient::stateMachine()
                                else
                                {
                                        // If the connect failed, the socket may have been put into a bad state.  Delete it.
+                                        LL_DEBUGS("VoiceDaemon") << "voice daemon not ready yet, retrying" << LL_ENDL;
                                        closeSocket();
                                }
                        }
@@ -1871,24 +1957,16 @@ void LLVoiceClient::stateMachine()
                        }
                        else if(!mAccountName.empty() && mVoiceEnabled)
                        {
-                                LLViewerRegion *region = gAgent.getRegion();
+                                if ( mAccountPassword.empty() )
-                                
-                                if(region)
                                {
-                                        if ( region->getCapability("ProvisionVoiceAccountRequest") != "" )
+                                        requestVoiceAccountProvision();
-                                        {
+                                }
-                                                if ( mAccountPassword.empty() )
+                                else
-                                                {
+                                {
-                                                        requestVoiceAccountProvision();
+                                        setState(stateConnectorStart);
-                                                }
-                                                setState(stateConnectorStart);
-                                        }
-                                        else
-                                        {
-                                                LL_DEBUGS("Voice") << "region doesn't have ProvisionVoiceAccountRequest capability!" << LL_ENDL;
-                                        }
                                }
                        }
                break;
                //MARK: stateMicTuningStart
@@ -2025,7 +2103,8 @@ void LLVoiceClient::stateMachine()
                        if(mLoginRetryCount > MAX_LOGIN_RETRIES)
                        {
                                LL_WARNS("Voice") << "too many login retries, giving up." << LL_ENDL;
-                                setState(stateLoginFailed);
+                                mAccountActive = false;
+                                setState(stateDisableCleanup);
                        }
                        else
                        {
@@ -2569,7 +2648,7 @@ void LLVoiceClient::sessionGroupCreateSendMessage()
 void LLVoiceClient::sessionCreateSendMessage(sessionState *session, bool startAudio, bool startText)
 {
-        LL_DEBUGS("Voice") << "requesting create: " << session->mSIPURI << LL_ENDL;
+        LL_DEBUGS("VoiceSession") << "requesting create: " << session->mSIPURI << LL_ENDL;
        
        session->mCreateInProgress = true;
        if(startAudio)
@@ -2605,7 +2684,7 @@ void LLVoiceClient::sessionCreateSendMessage(sessionState *session, bool startAu
 void LLVoiceClient::sessionGroupAddSessionSendMessage(sessionState *session, bool startAudio, bool startText)
 {
-        LL_DEBUGS("Voice") << "requesting create: " << session->mSIPURI << LL_ENDL;
+        LL_DEBUGS("VoiceSession") << "requesting create: " << session->mSIPURI << LL_ENDL;
        
        session->mCreateInProgress = true;
        if(startAudio)
@@ -2642,7 +2721,7 @@ void LLVoiceClient::sessionGroupAddSessionSendMessage(sessionState *session, boo
 void LLVoiceClient::sessionMediaConnectSendMessage(sessionState *session)
 {
-        LL_DEBUGS("Voice") << "connecting audio to session handle: " << session->mHandle << LL_ENDL;
+        LL_DEBUGS("VoiceSession") << "connecting audio to session handle: " << session->mHandle << LL_ENDL;
        session->mMediaConnectInProgress = true;
        
@@ -2660,7 +2739,7 @@ void LLVoiceClient::sessionMediaConnectSendMessage(sessionState *session)
 void LLVoiceClient::sessionTextConnectSendMessage(sessionState *session)
 {
-        LL_DEBUGS("Voice") << "connecting text to session handle: " << session->mHandle << LL_ENDL;
+        LL_DEBUGS("VoiceSession") << "connecting text to session handle: " << session->mHandle << LL_ENDL;
        
        std::ostringstream stream;
@@ -2689,7 +2768,7 @@ void LLVoiceClient::leaveAudioSession()
 {
        if(mAudioSession)
        {
-                LL_DEBUGS("Voice") << "leaving session: " << mAudioSession->mSIPURI << LL_ENDL;
+                LL_DEBUGS("VoiceSession") << "leaving session: " << mAudioSession->mSIPURI << LL_ENDL;
                switch(getState())
                {
@@ -2724,7 +2803,7 @@ void LLVoiceClient::leaveAudioSession()
                                }
                                else
                                {
-                                        LL_WARNS("Voice") << "called with no session handle" << LL_ENDL;        
+                                        LL_WARNS("VoiceSession") << "called with no session handle" << LL_ENDL; 
                                        setState(stateSessionTerminated);
                                }
                        break;
@@ -2734,13 +2813,13 @@ void LLVoiceClient::leaveAudioSession()
                        break;
                        
                        default:
-                                LL_WARNS("Voice") << "called from unknown state" << LL_ENDL;
+                                LL_WARNS("VoiceSession") << "called from unknown state" << LL_ENDL;
                        break;
                }
        }
        else
        {
-                LL_WARNS("Voice") << "called with no active session" << LL_ENDL;
+                LL_WARNS("VoiceSession") << "called with no active session" << LL_ENDL;
                setState(stateSessionTerminated);
        }
 }
@@ -2749,7 +2828,7 @@ void LLVoiceClient::sessionTerminateSendMessage(sessionState *session)
 {
        std::ostringstream stream;
        
-        LL_DEBUGS("Voice") << "Sending Session.Terminate with handle " << session->mHandle << LL_ENDL;  
+        LL_DEBUGS("VoiceSession") << "Sending Session.Terminate with handle " << session->mHandle << LL_ENDL;   
        stream
        << "<Request requestId=\"" << mCommandCookie++ << "\" action=\"Session.Terminate.1\">"
                << "<SessionHandle>" << session->mHandle << "</SessionHandle>"
@@ -2762,7 +2841,7 @@ void LLVoiceClient::sessionGroupTerminateSendMessage(sessionState *session)
 {
        std::ostringstream stream;
        
-        LL_DEBUGS("Voice") << "Sending SessionGroup.Terminate with handle " << session->mGroupHandle << LL_ENDL;        
+        LL_DEBUGS("VoiceSession") << "Sending SessionGroup.Terminate with handle " << session->mGroupHandle << LL_ENDL; 
        stream
        << "<Request requestId=\"" << mCommandCookie++ << "\" action=\"SessionGroup.Terminate.1\">"
                << "<SessionGroupHandle>" << session->mGroupHandle << "</SessionGroupHandle>"
@@ -2775,7 +2854,7 @@ void LLVoiceClient::sessionMediaDisconnectSendMessage(sessionState *session)
 {
        std::ostringstream stream;
        
-        LL_DEBUGS("Voice") << "Sending Session.MediaDisconnect with handle " << session->mHandle << LL_ENDL;    
+        LL_DEBUGS("VoiceSession") << "Sending Session.MediaDisconnect with handle " << session->mHandle << LL_ENDL;     
        stream
        << "<Request requestId=\"" << mCommandCookie++ << "\" action=\"Session.MediaDisconnect.1\">"
                << "<SessionGroupHandle>" << session->mGroupHandle << "</SessionGroupHandle>"
@@ -2791,7 +2870,7 @@ void LLVoiceClient::sessionTextDisconnectSendMessage(sessionState *session)
 {
        std::ostringstream stream;
        
-        LL_DEBUGS("Voice") << "Sending Session.TextDisconnect with handle " << session->mHandle << LL_ENDL;     
+        LL_DEBUGS("VoiceSession") << "Sending Session.TextDisconnect with handle " << session->mHandle << LL_ENDL;      
        stream
        << "<Request requestId=\"" << mCommandCookie++ << "\" action=\"Session.TextDisconnect.1\">"
                << "<SessionGroupHandle>" << session->mGroupHandle << "</SessionGroupHandle>"
@@ -2823,13 +2902,13 @@ void LLVoiceClient::getRenderDevicesSendMessage()
 void LLVoiceClient::clearCaptureDevices()
 {
-        LL_DEBUGS("Voice") << "called" << LL_ENDL;
+        LL_DEBUGS("VoiceDevice") << "called" << LL_ENDL;
        mCaptureDevices.clear();
 }
 void LLVoiceClient::addCaptureDevice(const std::string& name)
 {
-        LL_DEBUGS("Voice") << name << LL_ENDL;
+        LL_DEBUGS("VoiceDevice") << name << LL_ENDL;
        mCaptureDevices.push_back(name);
 }
@@ -2861,13 +2940,13 @@ void LLVoiceClient::setCaptureDevice(const std::string& name)
 void LLVoiceClient::clearRenderDevices()
 {       
-        LL_DEBUGS("Voice") << "called" << LL_ENDL;
+        LL_DEBUGS("VoiceDevice") << "called" << LL_ENDL;
        mRenderDevices.clear();
 }
 void LLVoiceClient::addRenderDevice(const std::string& name)
 {
-        LL_DEBUGS("Voice") << name << LL_ENDL;
+        LL_DEBUGS("VoiceDevice") << name << LL_ENDL;
        mRenderDevices.push_back(name);
 }
@@ -2951,7 +3030,7 @@ void LLVoiceClient::tuningRenderStopSendMessage()
 void LLVoiceClient::tuningCaptureStartSendMessage(int duration)
 {
-        LL_DEBUGS("Voice") << "sending CaptureAudioStart" << LL_ENDL;
+        LL_DEBUGS("VoiceDevice") << "sending CaptureAudioStart" << LL_ENDL;
        
        std::ostringstream stream;
        stream
@@ -2964,7 +3043,7 @@ void LLVoiceClient::tuningCaptureStartSendMessage(int duration)
 void LLVoiceClient::tuningCaptureStopSendMessage()
 {
-        LL_DEBUGS("Voice") << "sending CaptureAudioStop" << LL_ENDL;
+        LL_DEBUGS("VoiceDevice") << "sending CaptureAudioStop" << LL_ENDL;
        
        std::ostringstream stream;
        stream
@@ -3038,12 +3117,8 @@ void LLVoiceClient::daemonDied()
 void LLVoiceClient::giveUp()
 {
-        // All has failed.  Clean up and stop trying.
+        mAccountActive = false;
-        closeSocket();
+        setState(stateDisableCleanup);
-        deleteAllSessions();
-        deleteAllBuddies();
-        
-        setState(stateJail);
 }
 static void oldSDKTransform (LLVector3 &left, LLVector3 &up, LLVector3 &at, LLVector3d &pos, LLVector3 &vel)
@@ -3378,7 +3453,7 @@ void LLVoiceClient::buildSetCaptureDevice(std::ostringstream &stream)
 {
        if(mCaptureDeviceDirty)
        {
-                LL_DEBUGS("Voice") << "Setting input device = \"" << mCaptureDevice << "\"" << LL_ENDL;
+                LL_DEBUGS("VoiceDevice") << "Setting input device = \"" << mCaptureDevice << "\"" << LL_ENDL;
        
                stream 
                << "<Request requestId=\"" << mCommandCookie++ << "\" action=\"Aux.SetCaptureDevice.1\">"
@@ -4099,29 +4174,29 @@ void LLVoiceClient::reapSession(sessionState *session)
        {
                if(!session->mHandle.empty())
                {
-                        LL_DEBUGS("Voice") << "NOT deleting session " << session->mSIPURI << " (non-null session handle)" << LL_ENDL;
+                        LL_DEBUGS("VoiceSession") << "NOT deleting session " << session->mSIPURI << " (non-null session handle)" << LL_ENDL;
                }
                else if(session->mCreateInProgress)
                {
-                        LL_DEBUGS("Voice") << "NOT deleting session " << session->mSIPURI << " (create in progress)" << LL_ENDL;
+                        LL_DEBUGS("VoiceSession") << "NOT deleting session " << session->mSIPURI << " (create in progress)" << LL_ENDL;
                }
                else if(session->mMediaConnectInProgress)
                {
-                        LL_DEBUGS("Voice") << "NOT deleting session " << session->mSIPURI << " (connect in progress)" << LL_ENDL;
+                        LL_DEBUGS("VoiceSession") << "NOT deleting session " << session->mSIPURI << " (connect in progress)" << LL_ENDL;
                }
                else if(session == mAudioSession)
                {
-                        LL_DEBUGS("Voice") << "NOT deleting session " << session->mSIPURI << " (it's the current session)" << LL_ENDL;
+                        LL_DEBUGS("VoiceSession") << "NOT deleting session " << session->mSIPURI << " (it's the current session)" << LL_ENDL;
                }
                else if(session == mNextAudioSession)
                {
-                        LL_DEBUGS("Voice") << "NOT deleting session " << session->mSIPURI << " (it's the next session)" << LL_ENDL;
+                        LL_DEBUGS("VoiceSession") << "NOT deleting session " << session->mSIPURI << " (it's the next session)" << LL_ENDL;
                }
                else
                {
                        // TODO: Question: Should we check for queued text messages here?
                        // We don't have a reason to keep tracking this session, so just delete it.
-                        LL_DEBUGS("Voice") << "deleting session " << session->mSIPURI << LL_ENDL;
+                        LL_DEBUGS("VoiceSession") << "deleting session " << session->mSIPURI << LL_ENDL;
                        deleteSession(session);
                        session = NULL;
                }       
@@ -4179,17 +4254,17 @@ void LLVoiceClient::leftAudioSession(
                        case stateJoinSessionFailed:
                        case stateJoinSessionFailedWaiting:
                                // normal transition
-                                LL_DEBUGS("Voice") << "left session " << session->mHandle << " in state " << state2string(getState()) << LL_ENDL;
+                                LL_DEBUGS("VoiceSession") << "left session " << session->mHandle << " in state " << state2string(getState()) << LL_ENDL;
                                setState(stateSessionTerminated);
                        break;
                        
                        case stateSessionTerminated:
                                // this will happen sometimes -- there are cases where we send the terminate and then go straight to this state.
-                                LL_WARNS("Voice") << "left session " << session->mHandle << " in state " << state2string(getState()) << LL_ENDL;
+                                LL_WARNS("VoiceSession") << "left session " << session->mHandle << " in state " << state2string(getState()) << LL_ENDL;
                        break;
                        
                        default:
-                                LL_WARNS("Voice") << "unexpected SessionStateChangeEvent (left session) in state " << state2string(getState()) << LL_ENDL;
+                                LL_WARNS("VoiceSession") << "unexpected SessionStateChangeEvent (left session) in state " << state2string(getState()) << LL_ENDL;
                                setState(stateSessionTerminated);
                        break;
                }
@@ -4249,7 +4324,7 @@ void LLVoiceClient::mediaStreamUpdatedEvent(
 {
        sessionState *session = findSession(sessionHandle);
        
-        LL_DEBUGS("Voice") << "session " << sessionHandle << ", status code " << statusCode << ", string \"" << statusString << "\"" << LL_ENDL;
+        LL_DEBUGS("VoiceSession") << "session " << sessionHandle << ", status code " << statusCode << ", string \"" << statusString << "\"" << LL_ENDL;
        
        if(session)
        {
@@ -4314,7 +4389,7 @@ void LLVoiceClient::mediaStreamUpdatedEvent(
        }
        else
        {
-                LL_WARNS("Voice") << "session " << sessionHandle << "not found"<< LL_ENDL;
+                LL_WARNS("VoiceSession") << "session " << sessionHandle << "not found"<< LL_ENDL;
        }
 }
@@ -4435,7 +4510,7 @@ void LLVoiceClient::participantRemovedEvent(
        }
        else
        {
-                LL_DEBUGS("Voice") << "unknown session " << sessionHandle << LL_ENDL;
+                LL_DEBUGS("VoiceSession") << "unknown session " << sessionHandle << LL_ENDL;
        }
 }
@@ -4479,7 +4554,7 @@ void LLVoiceClient::participantUpdatedEvent(
        }
        else
        {
-                LL_WARNS("Voice") << "unknown session " << sessionHandle << LL_ENDL;
+                LL_WARNS("VoiceSession") << "unknown session " << sessionHandle << LL_ENDL;
        }
 }
@@ -5058,22 +5133,34 @@ LLVoiceClient::participantState* LLVoiceClient::findParticipantByID(const LLUUID
 void LLVoiceClient::parcelChanged()
 {
-        if(getState() >= stateNoChannel)
+        if( (getState() >= stateNoChannel) && !inNonSpatialChannel() )
        {
-                // If the user is logged in, start a channel lookup.
+                // If the user is logged in, start a channel lookup,
-                LL_DEBUGS("Voice") << "sending ParcelVoiceInfoRequest (" << mCurrentRegionName << ", " << mCurrentParcelLocalID << ")" << LL_ENDL;
+                // but not if already in a private call/conference.
+                mAccountActive = true;
                std::string url = gAgent.getRegion()->getCapability("ParcelVoiceInfoRequest");
-                LLSD data;
+                LL_DEBUGS("VoiceCaps") << "sending ParcelVoiceInfoRequest (" << mCurrentRegionName << ", " << mCurrentParcelLocalID << ")" << " cap url:" << url << LL_ENDL;
-                LLHTTPClient::post(
+                if(! url.empty() )
-                        url,
+                {
-                        data,
+                        mPIRCapResponseID.generate();
-                        new LLVoiceClientCapResponder);
+                        LLSD data;
+                        LLHTTPClient::post(
+                                url,
+                                data,
+                                new LLVoiceClientCapResponder(mPIRCapResponseID));
+                }
+                else
+                {
+                        mAccountActive = false;
+                        setState(stateDisableCleanup);
+                }
        }
        else
        {
+                mAccountActive = true;
                // The transition to stateNoChannel needs to kick this off again.
-                LL_WARNS("Voice") << "not logged in yet, deferring" << LL_ENDL;
+                LL_DEBUGS("Voice") << "not logged in yet, deferring" << LL_ENDL;
        }
 }
@@ -5086,12 +5173,40 @@ void LLVoiceClient::switchChannel(
 {
        bool needsSwitch = false;
        
-        LL_DEBUGS("Voice") 
+        LL_DEBUGS("VoiceSession") 
-                << "called in state " << state2string(getState()) 
+                << "Switch channel called in state " << state2string(getState()) 
                << " with uri \"" << uri << "\"" 
                << (spatial?", spatial is true":", spatial is false")
                << LL_ENDL;
-        
+        size_t new_uri_find_sip = std::string::npos;
+        size_t old_uri_find_sip = std::string::npos;
+        if(!uri.empty())
+        {
+                new_uri_find_sip = uri.find("sip:");
+        }
+        if(     mNextAudioSession 
+                && !( mNextAudioSession->mSIPURI.empty() )
+                && (mNextAudioSession->mSIPURI != uri) )
+        {
+                old_uri_find_sip = mNextAudioSession->mSIPURI.find("sip:");
+        }
+        else
+        {
+                // just logged in or voice disabled land in SL,
+                // anyway right daemon is already up
+                old_uri_find_sip = new_uri_find_sip;
+        }
+        if(old_uri_find_sip != new_uri_find_sip)
+        {
+                mAccountActive = true;
+                setState(stateDisableCleanup);
+                return;
+        }
        switch(getState())
        {
                case stateJoinSessionFailed:
@@ -5148,7 +5263,7 @@ void LLVoiceClient::switchChannel(
                if(uri.empty())
                {
                        // Leave any channel we may be in
-                        LL_DEBUGS("Voice") << "leaving channel" << LL_ENDL;
+                        LL_DEBUGS("VoiceSession") << "leaving channel" << LL_ENDL;
                        sessionState *oldSession = mNextAudioSession;
                        mNextAudioSession = NULL;
@@ -5160,7 +5275,7 @@ void LLVoiceClient::switchChannel(
                }
                else
                {
-                        LL_DEBUGS("Voice") << "switching to channel " << uri << LL_ENDL;
+                        LL_DEBUGS("VoiceSession") << "switching to channel " << uri << LL_ENDL;
                        mNextAudioSession = addSession(uri);
                        mNextAudioSession->mHash = hash;
@@ -5205,8 +5320,14 @@ void LLVoiceClient::setNonSpatialChannel(
 void LLVoiceClient::setSpatialChannel(
        const std::string &uri,
-        const std::string &credentials)
+        const std::string &credentials,
+        const LLUUID& response_id)
 {
+        if (response_id != mPIRCapResponseID)
+        {
+                return;
+        }
        mSpatialSessionURI = uri;
        mSpatialSessionCredentials = credentials;
        mAreaVoiceDisabled = mSpatialSessionURI.empty();
@@ -5282,7 +5403,7 @@ bool LLVoiceClient::sendTextMessage(const LLUUID& participant_id, const std::str
        }       
        else
        {
-                LL_DEBUGS("Voice") << "Session not found for participant ID " << participant_id << LL_ENDL;
+                LL_DEBUGS("VoiceSession") << "Session not found for participant ID " << participant_id << LL_ENDL;
        }
        
        return result;
@@ -5331,7 +5452,7 @@ void LLVoiceClient::endUserIMSession(const LLUUID &uuid)
        }       
        else
        {
-                LL_DEBUGS("Voice") << "Session not found for participant ID " << uuid << LL_ENDL;
+                LL_DEBUGS("VoiceSession") << "Session not found for participant ID " << uuid << LL_ENDL;
        }
 }
@@ -5452,7 +5573,7 @@ void LLVoiceClient::declineInvite(std::string &sessionHandle)
 void LLVoiceClient::leaveNonSpatialChannel()
 {
-        LL_DEBUGS("Voice") 
+        LL_DEBUGS("VoiceSession") 
                << "called in state " << state2string(getState()) 
                << LL_ENDL;
        
@@ -5644,6 +5765,18 @@ bool LLVoiceClient::inSpatialChannel(void)
        return result;
 }
+bool LLVoiceClient::inNonSpatialChannel(void)
+{
+        bool result = false;
+        
+        if(mAudioSession)
+                result =  !(mAudioSession->mIsSpatial);
+        if(mNextAudioSession)
+                result |= !(mNextAudioSession->mIsSpatial);
+        return result;
+}
 std::string LLVoiceClient::getAudioSessionURI()
 {
        std::string result;
@@ -6397,7 +6530,7 @@ LLVoiceClient::sessionState *LLVoiceClient::addSession(const std::string &uri, c
        {
                // No existing session found.
                
-                LL_DEBUGS("Voice") << "adding new session: handle " << handle << " URI " << uri << LL_ENDL;
+                LL_DEBUGS("VoiceSession") << "adding new session: handle " << handle << " URI " << uri << LL_ENDL;
                result = new sessionState();
                result->mSIPURI = uri;
                result->mHandle = handle;
@@ -6416,7 +6549,7 @@ LLVoiceClient::sessionState *LLVoiceClient::addSession(const std::string &uri, c
                if(uri != result->mSIPURI)
                {
                        // TODO: Should this be an internal error?
-                        LL_DEBUGS("Voice") << "changing uri from " << result->mSIPURI << " to " << uri << LL_ENDL;
+                        LL_DEBUGS("VoiceSession") << "changing uri from " << result->mSIPURI << " to " << uri << LL_ENDL;
                        setSessionURI(result, uri);
                }
@@ -6425,17 +6558,17 @@ LLVoiceClient::sessionState *LLVoiceClient::addSession(const std::string &uri, c
                        if(handle.empty())
                        {
                                // There's at least one race condition where where addSession was clearing an existing session handle, which caused things to break.
-                                LL_DEBUGS("Voice") << "NOT clearing handle " << result->mHandle << LL_ENDL;
+                                LL_DEBUGS("VoiceSession") << "NOT clearing handle " << result->mHandle << LL_ENDL;
                        }
                        else
                        {
                                // TODO: Should this be an internal error?
-                                LL_DEBUGS("Voice") << "changing handle from " << result->mHandle << " to " << handle << LL_ENDL;
+                                LL_DEBUGS("VoiceSession") << "changing handle from " << result->mHandle << " to " << handle << LL_ENDL;
                                setSessionHandle(result, handle);
                        }
                }
                
-                LL_DEBUGS("Voice") << "returning existing session: handle " << handle << " URI " << uri << LL_ENDL;
+                LL_DEBUGS("VoiceSession") << "returning existing session: handle " << handle << " URI " << uri << LL_ENDL;
        }
        verifySessionState();
@@ -6455,14 +6588,14 @@ void LLVoiceClient::setSessionHandle(sessionState *session, const std::string &h
                {
                        if(iter->second != session)
                        {
-                                LL_ERRS("Voice") << "Internal error: session mismatch!" << LL_ENDL;
+                                LL_ERRS("VoiceSession") << "Internal error: session mismatch!" << LL_ENDL;
                        }
                        mSessionsByHandle.erase(iter);
                }
                else
                {
-                        LL_ERRS("Voice") << "Internal error: session handle not found in map!" << LL_ENDL;
+                        LL_ERRS("VoiceSession") << "Internal error: session handle not found in map!" << LL_ENDL;
                }
        }
                        
@@ -6494,7 +6627,7 @@ void LLVoiceClient::deleteSession(sessionState *session)
                {
                        if(iter->second != session)
                        {
-                                LL_ERRS("Voice") << "Internal error: session mismatch" << LL_ENDL;
+                                LL_ERRS("VoiceSession") << "Internal error: session mismatch" << LL_ENDL;
                        }
                        mSessionsByHandle.erase(iter);
                }
@@ -6525,7 +6658,7 @@ void LLVoiceClient::deleteSession(sessionState *session)
 void LLVoiceClient::deleteAllSessions()
 {
-        LL_DEBUGS("Voice") << "called" << LL_ENDL;
+        LL_DEBUGS("VoiceSession") << "called" << LL_ENDL;
        while(!mSessions.empty())
        {
@@ -6534,20 +6667,20 @@ void LLVoiceClient::deleteAllSessions()
        
        if(!mSessionsByHandle.empty())
        {
-                LL_ERRS("Voice") << "Internal error: empty session map, non-empty handle map" << LL_ENDL;
+                LL_ERRS("VoiceSession") << "Internal error: empty session map, non-empty handle map" << LL_ENDL;
        }
 }
 void LLVoiceClient::verifySessionState(void)
 {
        // This is mostly intended for debugging problems with session state management.
-        LL_DEBUGS("Voice") << "Total session count: " << mSessions.size() << " , session handle map size: " << mSessionsByHandle.size() << LL_ENDL;
+        LL_DEBUGS("VoiceSession") << "Total session count: " << mSessions.size() << " , session handle map size: " << mSessionsByHandle.size() << LL_ENDL;
        for(sessionIterator iter = sessionsBegin(); iter != sessionsEnd(); iter++)
        {
                sessionState *session = *iter;
-                LL_DEBUGS("Voice") << "session " << session << ": handle " << session->mHandle << ", URI " << session->mSIPURI << LL_ENDL;
+                LL_DEBUGS("VoiceSession") << "session " << session << ": handle " << session->mHandle << ", URI " << session->mSIPURI << LL_ENDL;
                
                if(!session->mHandle.empty())
                {
@@ -6555,13 +6688,13 @@ void LLVoiceClient::verifySessionState(void)
                        sessionMap::iterator i2 = mSessionsByHandle.find(&(session->mHandle));
                        if(i2 == mSessionsByHandle.end())
                        {
-                                LL_ERRS("Voice") << "internal error (handle " << session->mHandle << " not found in session map)" << LL_ENDL;
+                                LL_ERRS("VoiceSession") << "internal error (handle " << session->mHandle << " not found in session map)" << LL_ENDL;
                        }
                        else
                        {
                                if(i2->second != session)
                                {
-                                        LL_ERRS("Voice") << "internal error (handle " << session->mHandle << " in session map points to another session)" << LL_ENDL;
+                                        LL_ERRS("VoiceSession") << "internal error (handle " << session->mHandle << " in session map points to another session)" << LL_ENDL;
                                }
                        }
                }
@@ -6574,13 +6707,13 @@ void LLVoiceClient::verifySessionState(void)
                sessionIterator i2 = mSessions.find(session);
                if(i2 == mSessions.end())
                {
-                        LL_ERRS("Voice") << "internal error (session for handle " << session->mHandle << " not found in session map)" << LL_ENDL;
+                        LL_ERRS("VoiceSession") << "internal error (session for handle " << session->mHandle << " not found in session map)" << LL_ENDL;
                }
                else
                {
                        if(session->mHandle != (*i2)->mHandle)
                        {
-                                LL_ERRS("Voice") << "internal error (session for handle " << session->mHandle << " points to session with different handle " << (*i2)->mHandle << ")" << LL_ENDL;
+                                LL_ERRS("VoiceSession") << "internal error (session for handle " << session->mHandle << " points to session with different handle " << (*i2)->mHandle << ")" << LL_ENDL;
                        }
                }
        }
@@ -7010,6 +7143,8 @@ class LLViewerParcelVoiceInfo : public LLHTTPNode
                {
                        LLSD body = input["body"];
+                        LL_DEBUGS("VoiceCaps") << "ParcelVoiceInfo response: " 
+                        << ll_pretty_print_sd(input) << LL_ENDL; 
                        //body has "region_name" (str), "parcel_local_id"(int),
                        //"voice_credentials" (map).
@@ -7036,7 +7171,10 @@ class LLViewerParcelVoiceInfo : public LLHTTPNode
                                                voice_credentials["channel_credentials"].asString();
                                }
-                                gVoiceClient->setSpatialChannel(uri, credentials);
+                                LLUUID response_id;
+                                response_id.generate();
+                                gVoiceClient->setPIRCapResponseID(response_id);
+                                gVoiceClient->setSpatialChannel(uri, credentials, response_id);
                        }
                }
        }
@@ -7050,10 +7188,13 @@ class LLViewerRequiredVoiceVersion : public LLHTTPNode
                const LLSD& context,
                const LLSD& input) const
        {
                //You received this messsage (most likely on region cross or
                //teleport)
                if ( input.has("body") && input["body"].has("major_version") )
                {
+                        LL_DEBUGS("VoiceCaps") << "RequiredVoiceVersion response: " 
+                                << ll_pretty_print_sd(input)<< LL_ENDL;
                        int major_voice_version =
                                input["body"]["major_version"].asInteger();
 //                      int minor_voice_version =
diff --git a/linden/indra/newview/llvoiceclient.h b/linden/indra/newview/llvoiceclient.h
index 9ef3be9..fb59b4e 100644
--- a/linden/indra/newview/llvoiceclient.h
+++ b/linden/indra/newview/llvoiceclient.h
@@ -424,11 +424,15 @@ static	void updatePosition(void);
                        const std::string& account_name,
                        const std::string& password,
                        const std::string& voice_sip_uri_hostname,
-                        const std::string& voice_account_server_uri);
+                        const std::string& voice_account_server_uri,
+                        const LLUUID& response_id);
                void loginSendMessage();
                void logout();
                void logoutSendMessage();
+                void loadDaemon(const std::string& scheme);
                void accountListBlockRulesSendMessage();
                void accountListAutoAcceptRulesSendMessage();
                
@@ -474,7 +478,8 @@ static	void updatePosition(void);
                        const std::string &credentials);
                void setSpatialChannel(
                        const std::string &uri,
-                        const std::string &credentials);
+                        const std::string &credentials,
+                        const LLUUID& response_id);
                // start a voice session with the specified user
                void callUser(const LLUUID &uuid);
                
@@ -519,7 +524,7 @@ static	void updatePosition(void);
                void close();
                void start();
-                
+                void setPIRCapResponseID(const LLUUID& response_id){ mPIRCapResponseID = response_id; }
        private:
                // internal state for a simple state machine.  This is used to deal with the asynchronous nature of some of the messages.
@@ -595,7 +600,13 @@ static	void updatePosition(void);
                std::string mAccountDisplayName;
                std::string mAccountFirstName;
                std::string mAccountLastName;
-                                
+                bool mAccountActive;
+                bool mVAPRequested;
+                std::string mDaemonScheme;
+                LLUUID mVAPCapResponseID;
+                LLUUID mPIRCapResponseID;
                bool mTuningMode;
                float mTuningEnergy;
                std::string mTuningAudioFile;
@@ -667,6 +678,7 @@ static	std::string displayNameFromAvatar(LLVOAvatar *avatar);
 static  std::string nameFromsipURI(const std::string &uri);             
                bool inSpatialChannel(void);
+                bool inNonSpatialChannel(void);
                std::string getAudioSessionURI();
                std::string getAudioSessionHandle();
                                
diff --git a/linden/indra/newview/llvovolume.cpp b/linden/indra/newview/llvovolume.cpp
index 4a53d4e..8d5bfb4 100644
--- a/linden/indra/newview/llvovolume.cpp
+++ b/linden/indra/newview/llvovolume.cpp
@@ -93,7 +93,6 @@ LLVOVolume::LLVOVolume(const LLUUID &id, const LLPCode pcode, LLViewerRegion *re
        mRelativeXformInvTrans.setIdentity();
        mLOD = MIN_LOD;
-        mSculptLevel = -2;
        mTextureAnimp = NULL;
        mVObjRadius = LLVector3(1,1,0.5f).length();
        mNumFaces = 0;
@@ -507,9 +506,8 @@ void LLVOVolume::updateTextureVirtualSize()
        
        if (isSculpted())
        {
-                LLSculptParams *sculpt_params = (LLSculptParams *)getParameterEntry(LLNetworkData::PARAMS_SCULPT);
+                updateSculptTexture();
-                LLUUID id =  sculpt_params->getSculptTexture(); 
-                mSculptTexture = gImageList.getImage(id);
                if (mSculptTexture.notNull())
                {
                        mSculptTexture->setBoostLevel(llmax((S32)mSculptTexture->getBoostLevel(),
@@ -532,14 +530,14 @@ void LLVOVolume::updateTextureVirtualSize()
                                }
                        }
        
-                        S32 texture_discard = mSculptTexture->getCachedRawImageLevel(); //try to match the texture
+                        S32 texture_discard = mSculptTexture->getDiscardLevel(); //try to match the texture
-                        S32 current_discard = mSculptLevel;
+                        S32 current_discard = getVolume() ? getVolume()->getSculptLevel() : -2;
                        if (texture_discard >= 0 && //texture has some data available
                                (texture_discard < current_discard || //texture has more data than last rebuild
                                current_discard < 0)) //no previous rebuild
                        {
-                                markForUpdate(FALSE);
+                                gPipeline.markRebuild(mDrawable, LLDrawable::REBUILD_VOLUME, FALSE);
                                mSculptChanged = TRUE;
                        }
@@ -687,19 +685,17 @@ BOOL LLVOVolume::setVolume(const LLVolumeParams &volume_params, const S32 detail
                        mVolumeImpl->onSetVolume(volume_params, detail);
                }
                
+                updateSculptTexture();
                if (isSculpted())
                {
-                        mSculptTexture = gImageList.getImage(volume_params.getSculptID());
                        if (mSculptTexture.notNull())
                        {
                                sculpt();
-                                mSculptLevel = getVolume()->getSculptLevel();
                                mSculptSurfaceArea = getVolume()->sculptGetSurfaceArea();
                        }
                }
                else
                {
-                        mSculptTexture = NULL;
                        mSculptSurfaceArea = 0.0;
                }
@@ -708,6 +704,38 @@ BOOL LLVOVolume::setVolume(const LLVolumeParams &volume_params, const S32 detail
        return FALSE;
 }
+void LLVOVolume::updateSculptTexture()
+{
+        LLPointer<LLViewerImage> old_sculpt = mSculptTexture;
+        if (isSculpted())
+        {
+                LLSculptParams *sculpt_params = (LLSculptParams *)getParameterEntry(LLNetworkData::PARAMS_SCULPT);
+                LLUUID id =  sculpt_params->getSculptTexture();
+                if (id.notNull())
+                {
+                        mSculptTexture = gImageList.getImage(id);
+                }
+        }
+        else
+        {
+                mSculptTexture = NULL;
+        }
+        if (mSculptTexture != old_sculpt)
+        {
+                if (old_sculpt.notNull())
+                {
+                        old_sculpt->removeVolume(this);
+                }
+                if (mSculptTexture.notNull())
+                {
+                        mSculptTexture->addVolume(this);
+                }
+        }
+}
 // sculpt replaces generate() for sculpted surfaces
 void LLVOVolume::sculpt()
 {       
@@ -718,7 +746,7 @@ void LLVOVolume::sculpt()
                S8 sculpt_components = 0;
                const U8* sculpt_data = NULL;
        
-                S32 discard_level = mSculptTexture->getCachedRawImageLevel() ;
+                S32 discard_level = mSculptTexture->getDiscardLevel() ;
                LLImageRaw* raw_image = mSculptTexture->getCachedRawImage() ;
                
                S32 max_discard = mSculptTexture->getMaxDiscardLevel();
@@ -762,7 +790,7 @@ void LLVOVolume::sculpt()
                }
                getVolume()->sculpt(sculpt_width, sculpt_height, sculpt_components, sculpt_data, discard_level);
-                /*//notify rebuild any other VOVolumes that reference this sculpty volume
+                //notify rebuild any other VOVolumes that reference this sculpty volume
                for (S32 i = 0; i < mSculptTexture->getNumVolumes(); ++i)
                {
                        LLVOVolume* volume = (*(mSculptTexture->getVolumeList()))[i];
@@ -770,7 +798,7 @@ void LLVOVolume::sculpt()
                        {
                                gPipeline.markRebuild(volume->mDrawable, LLDrawable::REBUILD_GEOMETRY, FALSE);
                        }
-                }*/
+                }
        }
 }
diff --git a/linden/indra/newview/llvovolume.h b/linden/indra/newview/llvovolume.h
index 7fba28c..2da1d7a 100644
--- a/linden/indra/newview/llvovolume.h
+++ b/linden/indra/newview/llvovolume.h
@@ -171,6 +171,7 @@ public:
                                void    setTexture(const S32 face);
                                S32     getIndexInTex() const {return mIndexInTex ;}
        /*virtual*/ BOOL        setVolume(const LLVolumeParams &volume_params, const S32 detail, bool unique_volume = false);
+                                void    updateSculptTexture();
                                void    setIndexInTex(S32 index) { mIndexInTex = index ;}
                                void    sculpt();
                                void    updateRelativeXform();
@@ -232,7 +233,6 @@ private:
        LLFrameTimer mTextureUpdateTimer;
        S32                     mLOD;
        BOOL            mLODChanged;
-        S32         mSculptLevel;
        BOOL            mSculptChanged;
        LLMatrix4       mRelativeXform;
        LLMatrix3       mRelativeXformInvTrans;
@@ -240,7 +240,7 @@ private:
        F32                     mVObjRadius;
        LLVolumeInterface *mVolumeImpl;
        LLPointer<LLViewerImage> mSculptTexture;
-        S32 mIndexInTex;
+        S32 mIndexInTex;                // index of this volume in the texture's volume list
        
        // statics
 public:
diff --git a/linden/indra/newview/primbackup.cpp b/linden/indra/newview/primbackup.cpp
index 7f050a0..613000a 100644
--- a/linden/indra/newview/primbackup.cpp
+++ b/linden/indra/newview/primbackup.cpp
@@ -625,6 +625,8 @@ void primbackup::export_next_texture()
 void primbackup::import_object(bool upload)
 {
        textures.clear();
        assetmap.clear();
        current_asset=LLUUID::null;
@@ -641,9 +643,21 @@ void primbackup::import_object(bool upload)
        std::string file_name = file_picker.getFirstFile().c_str();
        folder = gDirUtilp->getDirName(file_name);
-        llifstream import_file(file_name);
+        {
-        LLSDSerialize::fromXML(llsd, import_file);
+                LLSD import_llsd;
-        import_file.close();
+                llifstream import_file(file_name);
+                S32 status;
+                status = LLSDSerialize::fromXML(import_llsd, import_file);
+                import_file.close();
+        
+                if (LLSDParser::PARSE_FAILURE == status)
+                {
+                        llwarns << "invalid xml file." << llendl;
+                        return;
+                }
+                llsd = import_llsd;
+        }
        show();
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
index 3b66fb8..a32a1c7 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
@@ -1,54 +1,166 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<!-- 
+ALL PREFS OPTIONS START AT 20px FROM LEFT, 10px FROM TOP
+USE bottom_delta BETWEEN OPTIONS IN A GROUP
+USE LINES BETWEEN GROUPS
+USE font-style="BOLD|SHADOW" FOR GROUP LABELS
+GROUP LABEL CONTENTS ARE INDENTED 30px
+USE left="270" FOR TABBING OPTIONS
+-->
 <panel border="true" bottom="-409" enabled="true" follows="left|top|right|bottom"
     height="408" label="Advanced" left="102" mouse_opaque="true"
     name="advanced_panel" width="517">
-  <!-- Start organizing these when we get enough of 'em - MC -->
+  
  <tab_container label="Page 2" bottom="0" height="450" left="0" mouse_opaque="false"
-   name="tab2" tab_min_width="50" tab_position="top" width="495" bg_opaque_color="0,0,0,0.0">
+      name="tab2" tab_min_width="50" tab_position="top" width="495" bg_opaque_color="0,0,0,0.0">
+    
    
    <panel border="true" bottom="-409" enabled="true" follows="left|top|right|bottom"
-     height="408" label="Main" left="102" mouse_opaque="true"
+         height="408" label="Main" left="102" mouse_opaque="true"
-     name="main_panel" width="517">
+         name="main_panel" width="517">
-      <check_box bottom="-30" enabled="true"
+      <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-style="BOLD|SHADOW"
+          font="SansSerifSmall" h_pad="0" halign="left" height="10" left="20"
+          mouse_opaque="true" name="textbox" v_pad="0" width="394">
+        User Interface:
+      </text>
+      
+      <check_box bottom_delta="-25" enabled="true"
           follows="left|top" font="SansSerifSmall" height="16"
-           initial_value="false" label="Disable login/logout screens" left="12"
+           initial_value="false" label="Disable login/logout screens" left_delta="30"
           mouse_opaque="true" name="disable_log_screen_check" radio_style="false"
           width="217" />
-      <check_box bottom_delta="-18" enabled="true" follows="left|top"
+      <check_box bottom_delta="0" enabled="true" follows="left|top"
                 font="SansSerifSmall" height="16" initial_value="false"
-                 label="Disable teleport screen" left="12" mouse_opaque="true"
+                 label="Disable teleport screen" left="270" mouse_opaque="true"
                 name="disable_tp_screen_check" radio_style="false" width="217" />
+      <check_box bottom_delta="-18" enabled="true" follows="left|top"
+           font="SansSerifSmall" height="16" initial_value="false"
+           label="Show WindLight toolbar" left="50"  mouse_opaque="true"
+           name="toggle_windlight_control" radio_style="false" width="237"
+           control_name="EnableWindlightRemote" />
+      <check_box bottom_delta="-18" enabled="true"
+           follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+           label="Use legacy pie menus" left_delta="0"
+           mouse_opaque="true" name="legacy_pie_menu_checkbox" radio_style="false"
+           width="256" />
+      <view_border bevel_style="none" border_thickness="1" bottom_delta="-15" follows="left|top"
+            height="1" left="55" name="border" width="380" />      
+      
+      
+      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+          bottom_delta="-18" drop_shadow_visible="true" enabled="true" follows="left|top" font-style="BOLD|SHADOW"
+          font="SansSerifSmall" h_pad="0" halign="left" height="10" left="20"
+          mouse_opaque="true" name="textbox" v_pad="0" width="394">
+        Avatar:
+      </text>
+      
      <check_box bottom_delta="-25" enabled="true" follows="left|top"
          font="SansSerifSmall" height="16" initial_value="false"
-          label="Show client names in nametags" left="12" mouse_opaque="true"
+          label="Show client names in nametags" left_delta="30" mouse_opaque="true"
          name="client_name_tag_check" radio_style="false" width="160" />
-      <check_box bottom_delta="-18" enabled="true" follows="left|top"
+      <check_box bottom_delta="0" enabled="true" follows="left|top"
           font="SansSerifSmall" height="16" initial_value="false"
-           label="Show client names in hovertip" left_delta="0" mouse_opaque="true"
+           label="Show client names in hovertip" left="270" mouse_opaque="true"
           name="client_name_hover_check" radio_style="false" width="160" />
      <check_box bottom_delta="-18" enabled="true" follows="left|top"
           font="SansSerifSmall" height="16" initial_value="false"
-           label="Show your client name to others" left_delta="0" mouse_opaque="true"
+           label="Show your client name to others" left="50" mouse_opaque="true"
           name="client_name_tag_broadcast_check" radio_style="false" width="217" />
-      <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-122"
-           can_apply_immediately="true" color="0.79 0.44 0.88 1"
-           enabled="true" follows="left|top"
-           height="65" label="Imprudence" left="250" mouse_opaque="true"
-           name="client_tag_color" width="65" />
      <check_box bottom_delta="-18" enabled="true" follows="left|top"
           font="SansSerifSmall" height="16" initial_value="false"
-           label="Show client names with color" left_delta="0" mouse_opaque="true"
+           tool_tip="Toggle editing animation and standing up when entering appearance mode"
-           name="client_name_color_check" radio_style="false" width="160" />
+           label="Animate avatar when editing appearance" left_delta="0" mouse_opaque="true"
+           name="appearance_anim_check" radio_style="false" width="217" />
+      <check_box bottom_delta="-18" control_name="HeadFollowsMouse" enabled="true"
+           follows="left|top" font="SansSerifSmall" height="16"
+           label="Head follows mouse" tooltip="If your avatars head follows your mouse movements" left_delta="0"
+           mouse_opaque="true" name="head_follows_mouse_checkbox" radio_style="false"
+           width="256" />
+      <check_box bottom_delta="-18" enabled="true"
+           follows="left|top" font="SansSerifSmall" height="16" hidden="false"
+           initial_value="false" label="Share language with objects" left_delta="0"
+           mouse_opaque="true" name="language_is_public"
+           radio_style="false" tool_tip="This lets in-world objects know your preferred language."
+           width="256" />
+      <check_box bottom_delta="-18" enabled="true" follows="left|top"
+           font="SansSerifSmall" height="16" label="Fly/land on holding up/down"
+           left_delta="0" mouse_opaque="true" name="automatic_fly" radio_style="false"
+           width="178" />
+      <check_box bottom_delta="-18" enabled="true"
+           follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+           label="Arrow keys always move avatar when chatting" left_delta="0"
+           mouse_opaque="true" name="arrow_keys_move_avatar_check" radio_style="false"
+           width="237" />
+      
+      <view_border bevel_style="none" border_thickness="1" bottom_delta="-15" follows="left|top"
+            height="1" left="55" name="border" width="380" />
+      
+      
+      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+          bottom_delta="-18" drop_shadow_visible="true" enabled="true" follows="left|top" font-style="BOLD|SHADOW"
+          font="SansSerifSmall" h_pad="0" halign="left" height="10" left="20"
+          mouse_opaque="true" name="textbox" v_pad="0" width="394">
+        Chat:
+      </text>
+      <check_box bottom_delta="-25" control_name="ScriptErrorsAsChat" enabled="true"
+           follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+           label="Show script errors and warnings as regular chat" left_delta="30"
+           mouse_opaque="true" name="script_errors_as_chat" radio_style="false"
+           width="275" />
+      <check_box bottom_delta="-18" enabled="true" follows="left|top"
+           font="SansSerifSmall" height="16" initial_value="false"
+           label="Show timestamps with messages" left_delta="0" mouse_opaque="true"
+           name="show_timestamps_check" radio_style="false" width="237" />
+      <check_box bottom_delta="-18" enabled="true"
+           follows="left|top" font="SansSerifSmall" height="16" hidden="false"
+           initial_value="false" label="Use MU* pose style chat and IM" left_delta="0"
+           mouse_opaque="true" name="allow_mupose"
+           radio_style="false" tool_tip="Use MU* pose style in chat and IM (with ':' as a synonymous to '/me ')."
+           width="256" />
+      <check_box bottom_delta="0" enabled="true"
+           follows="left|top" font="SansSerifSmall" height="16" hidden="false"
+           initial_value="false" label="Auto-close OOC (( )) chat" left="270"
+           mouse_opaque="true" name="auto_close_ooc"
+           radio_style="false" tool_tip="Auto-close OOC chat (i.e. add )) if not found and (( was used)."
+           width="256" />
+      
+      <view_border bevel_style="none" border_thickness="1" bottom_delta="-15" follows="left|top"
+            height="1" left="55" name="border" width="380" />
+      
+      
+      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+          bottom_delta="-18" drop_shadow_visible="true" enabled="true" follows="left|top" font-style="BOLD|SHADOW"
+          font="SansSerifSmall" h_pad="0" halign="left" height="10" left="20"
+          mouse_opaque="true" name="textbox" v_pad="0" width="394">
+        World:
+      </text>
+      
      <check_box bottom_delta="-25" enabled="true" follows="left|top"
           font="SansSerifSmall" height="16" initial_value="false"
-           label="Enable shadows (WARNING: unstable and requires Ultra graphics)" left="12" mouse_opaque="true"
+           label="Enable shadows (WARNING: unstable and requires Ultra graphics)" left_delta="30" mouse_opaque="true"
           name="shadows_check" radio_style="false" width="217" />
-      <text bottom_delta="-25" left="16" height="15" width="300"
+      <text bottom_delta="-25" left_delta="0" height="15" width="300"
           follows="top|left">
-          Allow region WindLight settings (LightShare):
+        Allow region WindLight settings (LightShare):
      </text>
      <combo_box name="lightshare_combo"
-                 bottom_delta="-2" left_delta="250" height="18" width="135"
+                 bottom_delta="-2" left="275" height="18" width="160"
                 allow_text_entry="false" follows="left|top">
        <combo_item type="string" name="never" value="0">
          Never
@@ -60,62 +172,6 @@
          Always
        </combo_item>
      </combo_box>
-      <check_box bottom_delta="-25" enabled="true" follows="left|top"
-           font="SansSerifSmall" height="16" initial_value="false"
-           label="Use HTTP texture fetching (experimental)" left="12" mouse_opaque="true"
-           name="http_texture_check" radio_style="false" width="217" />
-      <check_box bottom_delta="-18" enabled="true" follows="left|top"
-           font="SansSerifSmall" height="16" initial_value="false"
-           label="Increase rez speed via draw distance stepping" left="12" mouse_opaque="true"
-           name="speed_rez_check" radio_style="false" width="217" />
-      <spinner bottom_delta="-18" decimal_digits="0"
-           tool_tip="Interval in seconds between each draw distance increment"
-           follows="left|top" height="16" increment="1" initial_val="12"
-           label="Step interval every:" label_width="105" left_delta="20" max_val="20"
-           min_val="1" mouse_opaque="true" name="speed_rez_interval_spinner" width="145" />
-      <text bottom_delta="0" follows="top|left" height="15" left_delta="150"
-                 name="speed_rez_seconds_text" width="115">
-        seconds
-      </text>
-      <check_box bottom_delta="-25" enabled="true" follows="left|top"
-           font="SansSerifSmall" height="16" initial_value="false"
-           tool_tip="Toggle editing animation and standing up when entering appearance mode" 
-           label="Animate avatar when editing appearance" left="12" mouse_opaque="true"
-           name="appearance_anim_check" radio_style="false" width="217" />
-      <check_box bottom_delta="-25" control_name="HeadFollowsMouse" enabled="true"
-           follows="left|top" font="SansSerifSmall" height="16" 
-           label="Head follows mouse" tooltip="If your avatars head follows your mouse movements" left="12"
-           mouse_opaque="true" name="head_follows_mouse_checkbox" radio_style="false"
-           width="256" />
-      <check_box bottom_delta="-25" enabled="true"
-           follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-           label="Use legacy pie menus" left="12"
-           mouse_opaque="true" name="legacy_pie_menu_checkbox" radio_style="false"
-           width="256" />
-      <check_box bottom_delta="-25" enabled="true"
-           follows="left|top" font="SansSerifSmall" height="16" hidden="false"
-           initial_value="false" label="Share language with objects" left="12"
-           mouse_opaque="true" name="language_is_public"
-           radio_style="false" tool_tip="This lets in-world objects know your preferred language."
-           width="256" />
-      <check_box bottom_delta="-25" enabled="true"
-           follows="left|top" font="SansSerifSmall" height="16" hidden="false"
-           initial_value="false" label="Use MU* pose style chat and IM" left="12"
-           mouse_opaque="true" name="allow_mupose"
-           radio_style="false" tool_tip="Use MU* pose style in chat and IM (with ':' as a synonymous to '/me ')."
-           width="256" />
-      <check_box bottom_delta="0" enabled="true"
-           follows="left|top" font="SansSerifSmall" height="16" hidden="false"
-           initial_value="false" label="Auto-close OOC (( )) chat" left_delta="250"
-           mouse_opaque="true" name="auto_close_ooc"
-           radio_style="false" tool_tip="Auto-close OOC chat (i.e. add )) if not found and (( was used)."
-           width="256" />
-      <check_box bottom_delta="-25" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
-           initial_value="false" label="Use the chatbar as a command line" left="12"
-           mouse_opaque="true" name="command_line_check" radio_style="false" width="270"/>
-      <button bottom_delta="-20" follows="left|top" font="SansSerif" height="20" width="150"
-           label="Chatbar Commands" name="command_line_btn" left="12"
-           tool_tip="Set specific chatbar command line commands here" />
  <!-- Uncomment when we start using the crash logger - MC -->
  <!--<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
@@ -137,69 +193,33 @@
      Never send
    </combo_item>
  </combo_box>-->
+      
    </panel>
    
-    <panel border="true" bottom="-580" follows="left|top|right|bottom" height="525" label="SpellCheck"
+    
-       left="1" mouse_opaque="true" name="SpellCheck" width="418">
+    <panel border="true" bottom="-580" follows="left|top|right|bottom" height="525" label="Avatar Cloud"
-      <button bottom="-25" follows="left|top" font="SansSerifSmall" height="18" label="?"
-         name="EmeraldHelp_SpellCheck" tool_tip="Click here for help regarding the settings in this page."
-         right="490" width="18"/>
-      <check_box bottom="-25" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
-         label="Show misspelled words in red" left="12" mouse_opaque="true" name="EmeraldSpellDisplay"
-         control_name="EmeraldSpellDisplay" width="126"/>
-      <text bottom_delta="-30" follows="left|top" font="SansSerifSmall" height="16" left="12"
-         name="EmSpell_txt1" width="512">
-        Current language (dictionary):
-      </text>
-      <combo_box allow_text_entry="false" bottom_delta="-20" left_delta="0" follows="left|top" height="18"
-         max_chars="200" mouse_opaque="true" name="EmeraldSpellBase" width="250"
-         control_name="EmeraldSpellBase" tool_tip=""/>
-      <text bottom_delta="-30" follows="left|top" font="SansSerifSmall" height="16" left="12"
-         name="EmSpell_txt3" width="512">
-        Downloaded languages (dictionaries):
-      </text>
-      <combo_box allow_text_entry="false" bottom_delta="-20" left_delta="0" follows="left|top" height="18"
-         max_chars="200" mouse_opaque="true" name="EmSpell_Avail" width="250"
-         control_name="EmSpell_Avail" tool_tip=""/>
-      <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="20" label="Install"
-         name="EmSpell_Add" tool_tip="" left_delta="255" width="80"/>
-      <button bottom_delta="-22" follows="left|top" font="SansSerifSmall" height="20" label="Download More..."
-         name="EmSpell_GetMore" tool_tip="Get more dictionaries availabe online" left="12" width="250"/>
-      <text bottom_delta="-30" follows="left|top" font="SansSerifSmall" height="16" left="12"
-         name="EmSpell_txt2" width="512">
-        Additional custom languages (dictionaries):
-      </text>
-      <combo_box allow_text_entry="false" bottom_delta="-20" left_delta="0" follows="left|top" height="18"
-         max_chars="200" mouse_opaque="true" name="EmSpell_Installed" width="250"
-         control_name="EmSpell_Installed" tool_tip=""/>
-      <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="20" label="Remove"
-         name="EmSpell_Remove" tool_tip="" left_delta="255" width="80"/>
-      <!--<button bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="18" label="Edit Custom dictionary"
-         name="EmSpell_EditCustom" tool_tip="" left_delta="20" width="130"/>-->
-      <text bottom_delta="-30" follows="left|top" font="SansSerifSmall" height="16" left="12"
-         name="EmSpell_txt4" width="512">
-To use spellcheck, right-click a misspelled word
-(red or otherwise) and select its replacement
-      </text>
-      <button name="ac_button" label="AutoCorrect Options..." halign="center"
-         tool_tip="Modify the AutoCorrect word list and settings" left="12"
-         bottom_delta="-50" width="180" height="20" font="SansSerifSmall" follows="left|top"/>
-    </panel>
-    <panel border="true" bottom="-580" follows="left|top|right|bottom" height="525" label="Eye Candy"
       left="1" mouse_opaque="true"  filename="panel_particle_settings.xml" name="AvatarCloud" width="418">
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+      
-                bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
+      
-                font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
+            <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                mouse_opaque="true" name="must_be_logged_in_textbox" v_pad="0" width="394">
+                    bottom_delta="-18" drop_shadow_visible="true" enabled="true" follows="left|top"
-                You must be logged in to change this
+                    font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
-        </text>
+                    mouse_opaque="true" name="must_be_logged_in_textbox" v_pad="0" width="394">
-        <check_box bottom_delta="-4" control_name="PreviewAvatarAsCloud" enabled="true"
+                    You must be logged in to change this
-             follows="left|top" font="SansSerifSmall" height="16"
+            </text>
-             label="Preview avatar as cloud" left="10"
+            <check_box bottom_delta="-4" control_name="PreviewAvatarAsCloud" enabled="true"
-             mouse_opaque="true" name="preview_cloud"
+                 follows="left|top" font="SansSerifSmall" height="16"
-             radio_style="false" tool_tip="Preview avatar as cloud when already rezzed"
+                 label="Preview avatar as cloud" left="10"
-             width="80" />
+                 mouse_opaque="true" name="preview_cloud"
+                 radio_style="false" tool_tip="Preview avatar as cloud when already rezzed"
+                 width="80" />
+      
+      
    </panel>
+    
+    
  </tab_container>
+  
+  
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_audio.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_audio.xml
index 355d7e8..5a94d6a 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_audio.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_audio.xml
@@ -1,93 +1,121 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<!-- 
+ALL PREFS OPTIONS START AT 20px FROM LEFT, 10px FROM TOP
+USE bottom_delta BETWEEN OPTIONS IN A GROUP
+USE LINES BETWEEN GROUPS
+USE font-style="BOLD|SHADOW" FOR GROUP LABELS
+GROUP LABEL CONTENTS ARE INDENTED 30px
+USE left="270" FOR TABBING OPTIONS
+-->
 <panel border="true" bottom="-409" enabled="true" follows="left|top|right|bottom"
     height="408" label="Audio &amp; Video" left="102" mouse_opaque="true"
     name="Media panel" width="517">
+  
+  
        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-22" drop_shadow_visible="true" enabled="true" follows="left|top"
+             bottom="-22" drop_shadow_visible="true" enabled="true" follows="left|top" font-style="BOLD|SHADOW"
-             font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10"
+             font="SansSerifSmall" h_pad="0" halign="left" height="12" left="20"
             mouse_opaque="true" name="muting_text" v_pad="0" width="128">
                Volume:
        </text>
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+  
-             bottom="-202" drop_shadow_visible="true" enabled="true" follows="left|top"
+  <panel border="true" bottom_delta="-180" enabled="true" filename="panel_audio.xml"
-             font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10"
+             follows="left|top|right|bottom" height="180" label="Volume" left_delta="30"
-             mouse_opaque="true" name="streaming_prefs_text" v_pad="0" width="128">
-                Streaming:
-        </text>
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-315" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10"
-             mouse_opaque="true" name="audio_prefs_text" v_pad="0" width="128">
-                Audio:
-        </text>
-        <panel border="true" bottom="-187" enabled="true" filename="panel_audio.xml"
-             follows="left|top|right|bottom" height="180" label="Volume" left="148"
             mouse_opaque="true" name="Volume Panel" width="260" />
-        <check_box bottom="-205" control_name="AudioStreamingMusic" enabled="true"
+  
+  <view_border bevel_style="none" border_thickness="1" bottom_delta="0" follows="left|top"
+      height="1" left="55" name="border" width="380" />
+  
+  
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top" font-style="BOLD|SHADOW"
+             font="SansSerifSmall" h_pad="0" halign="left" height="12" left="20"
+             mouse_opaque="true" name="streaming_prefs_text" v_pad="0" width="128">
+    Streaming:
+  </text>
+  <check_box bottom_delta="-25" control_name="AudioStreamingMusic" enabled="true"
             follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
             label="Play streaming music when available (uses more bandwidth)"
-             left="142" mouse_opaque="true" name="streaming_music" radio_style="false"
+             left_delta="30" mouse_opaque="true" name="streaming_music" radio_style="false"
             width="339" />
  <check_box bottom_delta="-20" control_name="ShowStreamTitle" enabled="true"
             follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
-             label="Show stream info in chat" left="162" mouse_opaque="true"
+             label="Show stream info in chat" left_delta="30" mouse_opaque="true"
       name="show_stream_title" radio_style="false" width="338" />
-        <check_box bottom_delta="-20" control_name="AudioStreamingVideo" enabled="true"
+  <check_box bottom_delta="-20" control_name="AudioStreamingVideo" enabled="true"
             follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
             label="Play Streaming Media When Available (uses more bandwidth)"
-             left="142" mouse_opaque="true" name="streaming_video" radio_style="false"
+             left_delta="-30" mouse_opaque="true" name="streaming_video" radio_style="false"
             width="338" />
-        <check_box bottom_delta="-20" control_name="ParcelMediaAutoPlayEnable" enabled="true"
+  <check_box bottom_delta="-20" control_name="ParcelMediaAutoPlayEnable" enabled="true"
             follows="left|top" font="SansSerifSmall" height="16"
-             initial_value="true" label="Automatically play media" left="162"
+             initial_value="true" label="Automatically play media" left_delta="30"
             mouse_opaque="true" name="auto_streaming_video" radio_style="false"
             width="338" />
-        <check_box bottom_delta="-20" control_name="MediaOnAPrimUI" enabled="true"
+  <check_box bottom_delta="-20" control_name="MediaOnAPrimUI" enabled="true"
             follows="left|top" font="SansSerifSmall" height="16"
-             initial_value="true" label="Media helper widget" left="162"
+             initial_value="true" label="Media helper widget" left_delta="0"
             mouse_opaque="true" name="media_helper_widget" radio_style="false"
-             width="338" />     
+             width="338" />
-        <check_box bottom_delta="-20" control_name="MediaEnableFilter" enabled="true"
+  <check_box bottom_delta="-20" control_name="MediaEnableFilter" enabled="true"
             follows="left|top" font="SansSerifSmall" height="16"
-             initial_value="true" label="Filter media URLs" left="142"
+             initial_value="true" label="Filter media URLs" left_delta="-30"
             mouse_opaque="true" name="enable_media_filter" radio_style="false"
             width="200" />
-        <button name="show_media_filter" font="SansSerif" label="Media Filter Settings" halign="center"
+  <button name="show_media_filter" font="SansSerifSmall" label="Media Filter Settings" halign="center"
             tool_tip="Edit settings and the blocked and allowed lists for the Media Filter."
-             enabled="false" mouse_opaque="true" follows="top|right"
+             enabled="false" mouse_opaque="true" follows="left|top"
-             bottom_delta="-2" right="-15" height="20" width="180" />
+             bottom_delta="-2" left="270" height="20" width="160" />
-        <check_box bottom_delta="-33" control_name="MuteWhenMinimized" enabled="true"
+  <view_border bevel_style="none" border_thickness="1" bottom_delta="-15" follows="left|top"
+      height="1" left="55" name="border" width="380" />
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top" font-style="BOLD|SHADOW"
+             font="SansSerifSmall" h_pad="0" halign="left" height="12" left="20"
+             mouse_opaque="true" name="audio_prefs_text" v_pad="0" width="128">
+    Audio:
+  </text>
+        <check_box bottom_delta="-25" control_name="MuteWhenMinimized" enabled="true"
             follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
-             label="Mute audio when window minimized" left="142" mouse_opaque="true"
+             label="Mute audio when minimized" left_delta="30" mouse_opaque="true"
             name="mute_when_minimized" radio_style="false" width="215" />
  <spinner bottom_delta="-20" control_name="UISndMoneyChangeThreshold" decimal_digits="0"
             enabled="true" follows="left|top" height="16" increment="10"
-             initial_val="10" label="[CURRENCY] change threshold:" label_width="158" left="148"
+             initial_val="10" label="[CURRENCY] sound threshhold:" label_width="138" left_delta="0"
             max_val="10000" min_val="0" mouse_opaque="true" name="L$ Change Threshold"
-             width="212" />
+             width="192" />
  <spinner bottom_delta="-20" control_name="UISndHealthReductionThreshold"
             decimal_digits="0" enabled="true" follows="left|top" height="16"
-             increment="10" initial_val="20" label="Health change threshold:"
+             increment="10" initial_val="20" label="Health sound threshold:"
-             label_width="158" left="148" max_val="10000" min_val="0"
+             label_width="138" left_delta="0"  max_val="10000" min_val="0"
-             mouse_opaque="true" name="Health change threshold" width="212" />
+             mouse_opaque="true" name="Health change threshold" width="192" />
-  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+  <check_box bottom_delta="40" enabled="true" follows="left|top"
-       bottom_delta="-27" drop_shadow_visible="true" enabled="true" follows="left|top"
-       font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10"
-       mouse_opaque="true" name="ambient_prefs_text" v_pad="0" width="128">
-    Ambient:
-  </text>
-  <check_box bottom_delta="-4" enabled="true" follows="left|top"
       font="SansSerifSmall" height="16" initial_value="false"
-       label="Enable wind generation" left="142" mouse_opaque="true"
+       label="Enable wind generation" left="270" mouse_opaque="true"
       name="mute_wind_check" radio_style="false" width="217" />
  <slider bottom_delta="-20" control_name="AudioLevelDoppler" edit_text="true"
       enabled="true" follows="left|top" height="15" increment="0.1"
-       initial_val="1" label="Doppler effect:" label_width="100" left="148"
+       initial_val="1" label="Doppler effect:" label_width="100" left_delta="0"
       max_val="2" min_val="0" mouse_opaque="true" name="Doppler Effect"
-       show_text="true" width="250" />
+       show_text="true" width="200" />
  <slider bottom_delta="-20" control_name="AudioLevelRolloff" edit_text="true"
             enabled="true" follows="left|top" height="15" increment="0.1"
-             initial_val="1" label="Rolloff factor:" label_width="100" left="148"
+             initial_val="1" label="Rolloff factor:" label_width="100" left_delta="0"
             max_val="2" min_val="0" mouse_opaque="true" name="Rolloff Factor"
-             show_text="true" width="250" />
+             show_text="true" width="200" />
+  
+  
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml
index 9ead3bf..0a2678f 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
@@ -1,196 +1,358 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<!-- 
+ALL PREFS OPTIONS START AT 20px FROM LEFT, 10px FROM TOP
+USE bottom_delta BETWEEN OPTIONS IN A GROUP
+USE LINES BETWEEN GROUPS
+USE font-style="BOLD|SHADOW" FOR GROUP LABELS
+GROUP LABEL CONTENTS ARE INDENTED 30px
+USE left="270" FOR TABBING OPTIONS
+-->
 <panel border="true" bottom="-409" enabled="true" follows="left|top|right|bottom"
    height="408" label="Chat" left="102" mouse_opaque="true" name="chat"
    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"
+  <tab_container bottom="0" height="450" left="0" mouse_opaque="false"
-             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12"
+      name="chattab2" tab_min_width="50" tab_position="top" width="495" bg_opaque_color="0,0,0,0.0">
-             mouse_opaque="false" name="text_box" v_pad="0" width="128">
-                Font Size:
-        </text>
+    <!-- CHAT OPTIONS PANEL -->
-        <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">
+    <panel border="true" bottom="-409" enabled="true" follows="left|top|right|bottom"
-                <radio_item type="string" length="1" bottom="-24" enabled="true" height="16" left="0" mouse_opaque="true"
+           height="408" label="Chat &amp; IMs" left="102" mouse_opaque="true"
-                     name="radio" width="98">
+           name="chat_panel" width="517">
-                        Small
-                </radio_item>
+      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                <radio_item type="string" length="1" bottom="-24" enabled="true" height="16" left="110" mouse_opaque="true"
+                 bottom="-20" drop_shadow_visible="true" enabled="true" follows="left|top" font-style="BOLD|SHADOW"
-                     name="radio2" width="98">
+                 font="SansSerifSmall" h_pad="0" halign="left" height="10" left="20"
-                        Medium
+                 mouse_opaque="false" name="text_box" v_pad="0" width="128">
-                </radio_item>
+        Chat Text Size:
-                <radio_item type="string" length="1" bottom="-24" enabled="true" height="16" left="220" mouse_opaque="true"
+      </text>
-                     name="radio3" width="98">
-                        Large
+      <combo_box allow_text_entry="false" bottom_delta="-25" enabled="true" follows="left|top"
-                </radio_item>
+           height="16" left_delta="30" max_chars="100" mouse_opaque="true"
-        </radio_group>
+           name="chat_font_size" width="160">
+        <combo_item type="string" length="1" enabled="true" name="0" value="0">
-  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+          Small
-     bottom_delta="-40" drop_shadow_visible="true" enabled="true" follows="left|top"
+        </combo_item>
-     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12"
+        <combo_item type="string" length="1" enabled="true" name="1" value="1">
-     mouse_opaque="false" name="text_translate_chat" v_pad="0" width="128">
+          Medium
-    Translate Chat:
+        </combo_item>
-  </text>
+        <combo_item type="string" length="1" enabled="true" name="2" value="2">
-  <check_box bottom_delta="-3" control_name="TranslateChat" enabled="true" follows="left|top"
+          Large
-             font="SansSerifSmall" height="16" initial_value="false"
+        </combo_item>
-             label="Use machine translation while chatting (powered by Google)" left="148" mouse_opaque="true"
+      </combo_box>
-             name="translate_chat" radio_style="false" width="237" />
+      
-  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom_delta="-16" drop_shadow_visible="true" enabled="true" follows="left|top"
+      <view_border bevel_style="none" border_thickness="1" bottom_delta="-15" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="149"
+          height="1" left="55" name="border" width="380" />
-             mouse_opaque="false" name="text_translate_chat" v_pad="0" width="160">
+      
-    Translate into this language:
-  </text>
+      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-  <combo_box allow_text_entry="true" bottom_delta="-5" enabled="true"
+                 bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top" font-style="BOLD|SHADOW"
-             follows="left|top" height="16" left_delta="183" max_chars="135"
+                 font="SansSerifSmall" h_pad="0" halign="left" height="10" left="20"
-             mouse_opaque="true" name="translate_language_combobox" width="146">
+                 mouse_opaque="false" name="text_box3" v_pad="0" width="135">
-    <combo_item type="string" length="1" enabled="true" name="System Default Language" value="default">
+        Chat Console:
-      System Default
+      </text>
-    </combo_item>
+      <spinner bottom_delta="-25" control_name="ChatPersistTime" decimal_digits="0"
-    <combo_item type="string" length="1" enabled="true" name="English" value="en">
+                 enabled="true" follows="left|top" height="16" increment="1"
-      English
+                 initial_val="10" label="Fade chat after" label_width="80" left_delta="30"
-    </combo_item>
+                 max_val="60" min_val="2" mouse_opaque="true" name="fade_chat_time"
+                 width="130" />
-    <!-- After "System Default" and "English", please keep the rest of these combo_items in alphabetical order by the first character in the string. -->
+      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                 bottom_delta="6" drop_shadow_visible="true" enabled="true"
-    <combo_item type="string" length="1" enabled="true" name="Danish" value="da">
+                 follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
-      Dansk (Danish)
+                 height="10" left_delta="135" mouse_opaque="false" name="text_box4" v_pad="0"
-    </combo_item>
+                 width="80">
-    <combo_item type="string" length="1" enabled="true" name="Deutsch(German)" value="de">
+        seconds and
-      Deutsch (German)
+      </text>
-    </combo_item>
+      <spinner bottom_delta="-6" decimal_digits="0"
-    <combo_item type="string" length="1" enabled="true" name="Spanish" value="es">
+                 enabled="true" follows="left|top" height="16" increment="1"
-      Español (Spanish)
+                 initial_val="10" left_delta="82" max_val="50" min_val="1" mouse_opaque="true"
-    </combo_item>
+                 name="max_chat_count" width="60" />
-    <combo_item type="string" length="1" enabled="true" name="French" value="fr">
+      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-      Français (French)
+                 bottom_delta="6" drop_shadow_visible="true" enabled="true"
-    </combo_item>
+                 follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
-    <combo_item type="string" length="1" enabled="true" name="Italian" value="it">
+                 height="10" left_delta="65" mouse_opaque="false" name="text_box5" v_pad="0"
-      Italiano (Italian)
+                 width="60">
-    </combo_item>
+        lines
-    <combo_item type="string" length="1" enabled="true" name="Hungarian" value="hu">
+      </text>
-      Magyar (Hungarian)
+      
-    </combo_item>
+      <slider bottom_delta="-25" can_edit_text="false" control_name="ConsoleBackgroundOpacity"
-    <combo_item type="string" length="1" enabled="true" name="Dutch" value="nl">
+                 decimal_digits="3" enabled="true" follows="left|top" height="12"
-      Nederlands (Dutch)
+                 increment="0.05" initial_val="1" label="Console opacity:" left="50" max_val="1"
-    </combo_item>
+                 min_val="0" mouse_opaque="true" name="console_opacity" show_text="true"
-    <combo_item type="string" length="1" enabled="true" name="Polish" value="pl">
+                 value="0.4" width="200" />
-      Polski (Polish)
+      <check_box bottom_delta="-4" control_name="ChatFullWidth" enabled="true"
-    </combo_item>
+                 follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-    <combo_item type="string" length="1" enabled="true" name="Portugese" value="pt">
+                 label="Full screen width (requires restart)" left="270"
-      Portugués (Portuguese)
+                 mouse_opaque="true" name="chat_full_width_check" radio_style="false"
-    </combo_item>
+                 width="239" />
-    <combo_item type="string" length="1" enabled="true" name="Russian" value="ru">
+      
-      Русский (Russian)
-    </combo_item>
+      <view_border bevel_style="none" border_thickness="1" bottom_delta="-15" follows="left|top"
-    <combo_item type="string" length="1" enabled="true" name="Turkish" value="tr">
+          height="1" left="55" name="border" width="380" />
-      Türkçe (Turkish)
+      
-    </combo_item>
+      
-    <combo_item type="string" length="1" enabled="true" name="Ukrainian" value="uk">
+      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-      Українська (Ukrainian)
+         bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top" font-style="BOLD|SHADOW"
-    </combo_item>
+         font="SansSerifSmall" h_pad="0" halign="left" height="10" left="20"
-    <combo_item type="string" length="1" enabled="true" name="Chinese" value="zh">
+         mouse_opaque="false" name="text_box7" v_pad="0" width="128">
-      中文 (简体) (Chinese)
+        Chat Bubbles:
-    </combo_item>
+      </text>
-    <combo_item type="string" length="1" enabled="true" name="(Japanese)" value="ja">
+      
-      日本語 (Japanese)
+      <check_box bottom_delta="-25" control_name="UseChatBubbles" enabled="true" follows="left|top"
-    </combo_item>
+                 font="SansSerifSmall" height="16" initial_value="false"
-    <combo_item type="string" length="1" enabled="true" name="(Korean)" value="ko">
+                 label="Show chat bubbles" left_delta="30" mouse_opaque="true"
-      한국어 (Korean)
+                 name="bubble_text_chat" radio_style="false" width="237" />
-    </combo_item>
+      <check_box bottom_delta="-0" control_name="UseLocalChatBubbles" enabled="true" follows="left|top"
-  </combo_box>
+                 font="SansSerifSmall" height="16" initial_value="false"
+                 label="Show local chat and bubbles" left="270" mouse_opaque="true"
+                 name="local_bubble_text_chat" radio_style="false" width="237" />
+      <slider bottom_delta="-20" can_edit_text="false" control_name="ChatBubbleOpacity"
+                 decimal_digits="3" enabled="true" follows="left|top" height="12"
+                 increment="0.05" initial_val="1" label="Bubble opacity:" left="50" max_val="1"
+                 min_val="0" mouse_opaque="true" name="bubble_chat_opacity" show_text="true"
+                 value="0.5" width="200" />
+      
+      <view_border bevel_style="none" border_thickness="1" bottom_delta="-15" follows="left|top"
+          height="1" left="55" name="border" width="380" />
+      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                  bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top" font-style="BOLD|SHADOW"
+                 font="SansSerifSmall" h_pad="0" halign="left" height="10" left="20"
+                 mouse_opaque="false" name="text_box6" v_pad="0" width="135">
+        Chatbar:
+      </text>
+      <check_box bottom_delta="-25" enabled="true"
+           follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+           label="Close chatbar after hitting return" left_delta="30" mouse_opaque="true"
+           name="close_chat_on_return_check" radio_style="false" width="237" />
+      <check_box bottom_delta="0" enabled="true" follows="left|top"
+           font="SansSerifSmall" height="16" initial_value="false"
+           label="Show custom chat channel" left="270" mouse_opaque="true"
+           name="toggle_channel_control" radio_style="false" width="237" />
+      <check_box bottom_delta="-20" enabled="true"
+                 follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
+                 label="Play typing animation when chatting" left="50" mouse_opaque="true"
+                 name="play_typing_animation" radio_style="false" width="237" />
+      <check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
+           initial_value="false" label="Use the chatbar as a command line" left="50"
+           mouse_opaque="true" name="command_line_check" radio_style="false" width="250"/>
+      <button bottom_delta="-2" follows="left|top" font="SansSerifSmall" height="20" width="160"
+           label="Chatbar Commands" name="command_line_btn" left="270"
+           tool_tip="Set specific chatbar command line commands here" />
+      <view_border bevel_style="none" border_thickness="1" bottom_delta="-15" follows="left|top"
+            height="1" left="55" name="border" width="380" />
+      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                  bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top" font-style="BOLD|SHADOW"
+                 font="SansSerifSmall" h_pad="0" halign="left" height="10" left="20"
+                 mouse_opaque="false" name="text_box6" v_pad="0" width="135">
+        Instant Messages:
+      </text>
+      <check_box bottom_delta="-25" enabled="true" follows="left|top" font="SansSerifSmall"
+           height="16" initial_value="false" label="Send offline IMs to email ([EMAIL])"
+           left_delta="30" mouse_opaque="true" name="send_im_to_email" radio_style="false"
+           width="350" />
+      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+           bottom_delta="-14" drop_shadow_visible="true" enabled="true" follows="left|top"
+           font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="0"
+           mouse_opaque="false" name="show_ims_label" v_pad="0" width="100">
+        Show IMs in:
+      </text>
+      <check_box bottom_delta="-6" enabled="true" follows="left|top"
+           font="SansSerifSmall" height="16" initial_value="false"
+           label="Main chat" left="150" mouse_opaque="true"
+           name="include_im_in_chat_console" radio_style="false" width="100" />
+      <check_box bottom_delta="0" enabled="true" follows="left|top"
+           font="SansSerifSmall" height="16" initial_value="false"
+           label="Local Chat window" left="270" mouse_opaque="true"
+           name="include_im_in_chat_history" radio_style="false" width="100" />
+      <check_box bottom_delta="-20" enabled="true"
+           follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+           label="Vertical IM tabs (requires restart)" left="50" mouse_opaque="true"
+           name="vertical-imtabs-toggle" radio_style="false" width="270" />
+    </panel>
+    
+    
+    <!-- SPELL CHECKING AND TRANSLATE PANEL -->
+    <panel border="true" bottom="-580" follows="left|top|right|bottom" height="525" label="Spell Checking &amp; Translate"
+         left="1" mouse_opaque="true" name="spell_check_tab" width="418">
+      <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-style="BOLD|SHADOW"
+          font="SansSerifSmall" h_pad="0" halign="left" height="10" left="20"
+          mouse_opaque="false" name="text_box" v_pad="0" width="128">
+        Spell Checking:
+      </text>
+      <check_box bottom_delta="-25" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
+         label="Enable spell checking" left_delta="30" mouse_opaque="true" name="EmeraldSpellDisplay"
+         control_name="EmeraldSpellDisplay" width="126"/>
+      <text bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16" left_delta="30"
+         name="EmSpell_txt4" width="512">
+        Right-click a misspelled/red-underlined word to correct
+      </text>
+      <text bottom_delta="-30" follows="left|top" font="SansSerifSmall" height="16" left_delta="-30"
+         name="EmSpell_txt1" width="512">
+        Current language (dictionary):
+      </text>
+      <combo_box allow_text_entry="false" bottom_delta="-20" left_delta="0" follows="left|top" height="18"
+         max_chars="200" mouse_opaque="true" name="EmeraldSpellBase" width="250"
+         control_name="EmeraldSpellBase" tool_tip=""/>
+      <text bottom_delta="-30" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
+         name="EmSpell_txt3" width="512">
+        Downloaded languages (dictionaries):
+      </text>
+      <combo_box allow_text_entry="false" bottom_delta="-20" left_delta="0" follows="left|top" height="18"
+         max_chars="200" mouse_opaque="true" name="EmSpell_Avail" width="250"
+         control_name="EmSpell_Avail" tool_tip=""/>
+      <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="20" label="Install"
+         name="EmSpell_Add" tool_tip="" left_delta="255" width="110"/>
+      <button bottom_delta="-22" follows="left|top" font="SansSerifSmall" height="20" label="Download More..."
+         name="EmSpell_GetMore" tool_tip="Get more dictionaries availabe online" left="50" width="250"/>
+      <text bottom_delta="-30" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
+         name="EmSpell_txt2" width="512">
+        Additional custom languages (dictionaries):
+      </text>
+      <combo_box allow_text_entry="false" bottom_delta="-20" left_delta="0" follows="left|top" height="18"
+         max_chars="200" mouse_opaque="true" name="EmSpell_Installed" width="250"
+         control_name="EmSpell_Installed" tool_tip=""/>
+      <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="20" label="Remove"
+         name="EmSpell_Remove" tool_tip="" left_delta="255" width="110"/>
+      <!--<button bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="18" label="Edit Custom dictionary"
+         name="EmSpell_EditCustom" tool_tip="" left_delta="20" width="130"/>-->
+      <button name="ac_button" label="AutoCorrect..." halign="center"
+         tool_tip="Modify the AutoCorrect word list and settings" left="50"
+         bottom_delta="-40" width="160" height="20" font="SansSerifSmall" follows="left|top"/>
+      <view_border bevel_style="none" border_thickness="1" bottom_delta="-15" follows="left|top"
+            height="1" left="55" name="border" width="380" />
+      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+          bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top" font-style="BOLD|SHADOW"
+          font="SansSerifSmall" h_pad="0" halign="left" height="10" left="20"
+          mouse_opaque="false" name="text_box" v_pad="0" width="128">
+        Translate Chat:
+      </text>
+      <check_box bottom_delta="-25" control_name="TranslateChat" enabled="true" follows="left|top"
+           font="SansSerifSmall" height="16" initial_value="false"
+           label="Use machine translation while chatting (powered by Google)" left_delta="30" mouse_opaque="true"
+           name="translate_chat" radio_style="false" width="237" />
+      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+           bottom_delta="-16" drop_shadow_visible="true" enabled="true" follows="left|top"
+           font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="0"
+           mouse_opaque="false" name="text_translate_chat" v_pad="0" width="160">
+        Translate into this language:
+      </text>
+      <combo_box allow_text_entry="false" bottom_delta="-5" enabled="true"
+           follows="left|top" height="16" left="270" max_chars="135"
+           mouse_opaque="true" name="translate_language_combobox" width="160">
+        <combo_item type="string" length="1" enabled="true" name="System Default Language" value="default">
+          System Default
+        </combo_item>
+        <combo_item type="string" length="1" enabled="true" name="English" value="en">
+          English
+        </combo_item>
+        <!-- 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)
+        </combo_item>
+        <combo_item type="string" length="1" enabled="true" name="Deutsch(German)" value="de">
+          Deutsch (German)
+        </combo_item>
+        <combo_item type="string" length="1" enabled="true" name="Spanish" value="es">
+          Español (Spanish)
+        </combo_item>
+        <combo_item type="string" length="1" enabled="true" name="French" value="fr">
+          Français (French)
+        </combo_item>
+        <combo_item type="string" length="1" enabled="true" name="Italian" value="it">
+          Italiano (Italian)
+        </combo_item>
+        <combo_item type="string" length="1" enabled="true" name="Hungarian" value="hu">
+          Magyar (Hungarian)
+        </combo_item>
+        <combo_item type="string" length="1" enabled="true" name="Dutch" value="nl">
+          Nederlands (Dutch)
+        </combo_item>
+        <combo_item type="string" length="1" enabled="true" name="Polish" value="pl">
+          Polski (Polish)
+        </combo_item>
+        <combo_item type="string" length="1" enabled="true" name="Portugese" value="pt">
+          Portugués (Portuguese)
+        </combo_item>
+        <combo_item type="string" length="1" enabled="true" name="Russian" value="ru">
+          Русский (Russian)
+        </combo_item>
+        <combo_item type="string" length="1" enabled="true" name="Turkish" value="tr">
+          Türkçe (Turkish)
+        </combo_item>
+        <combo_item type="string" length="1" enabled="true" name="Ukrainian" value="uk">
+          Українська (Ukrainian)
+        </combo_item>
+        <combo_item type="string" length="1" enabled="true" name="Chinese" value="zh">
+          中文 (简体) (Chinese)
+        </combo_item>
+        <combo_item type="string" length="1" enabled="true" name="(Japanese)" value="ja">
+          日本語 (Japanese)
+        </combo_item>
+        <combo_item type="string" length="1" enabled="true" name="(Korean)" value="ko">
+          한국어 (Korean)
+        </combo_item>
+      </combo_box>
+      <button bottom="-20" follows="left|top" font="SansSerifSmall" height="18" label="?"
+             name="EmeraldHelp_SpellCheck" tool_tip="Click here for help regarding the settings in this page."
+             right="490" width="18"/>
+    </panel>
+    
+    
+  </tab_container>
+  
  
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+  <string name="log_in_to_change">
-             bottom_delta="-40" drop_shadow_visible="true" enabled="true" follows="left|top"
+    log in to change
-             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12"
+  </string>
-             mouse_opaque="false" name="text_box3" v_pad="0" width="135">
+  <string name="default_email_used">
-                Chat Console:
+    using default address
-        </text>
+  </string>
-        <spinner bottom_delta="-8" control_name="ChatPersistTime" decimal_digits="0"
-             enabled="true" follows="left|top" height="16" increment="1"
-             initial_val="10" label="Fade chat after" label_width="80" left="148"
-             max_val="60" min_val="2" mouse_opaque="true" name="fade_chat_time"
-             width="130" />
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom_delta="6" drop_shadow_visible="true" enabled="true"
-             follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
-             height="10" left="282" mouse_opaque="false" name="text_box4" v_pad="0"
-             width="80">
-                (seconds)
-        </text>
-        <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" />
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom_delta="6" drop_shadow_visible="true" enabled="true"
-             follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
-             height="10" left="405" mouse_opaque="false" name="text_box5" v_pad="0"
-             width="60">
-                (# lines)
-        </text>
-        <slider bottom_delta="-25" can_edit_text="false" control_name="ConsoleBackgroundOpacity"
-             decimal_digits="3" enabled="true" follows="left|top" height="12"
-             increment="0.05" initial_val="1" label="Console opacity:" left="148" max_val="1"
-             min_val="0" mouse_opaque="true" name="console_opacity" show_text="true"
-             value="0.4" width="225" />
-        <check_box bottom_delta="-25" control_name="ChatFullWidth" enabled="true"
-             follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-             label="Use full screen width  (requires restart)" left="148"
-             mouse_opaque="true" name="chat_full_width_check" radio_style="false"
-             width="239" />
-  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-     bottom_delta="-40" drop_shadow_visible="true" enabled="true" follows="left|top"
-     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12"
-     mouse_opaque="false" name="text_box7" v_pad="0" width="128">
-    Chat Bubbles:
-  </text>
-  <check_box bottom_delta="-8" control_name="UseChatBubbles" enabled="true" follows="left|top"
-             font="SansSerifSmall" height="16" initial_value="false"
-             label="Show chat bubbles" left="148" mouse_opaque="true"
-             name="bubble_text_chat" radio_style="false" width="237" />
-  <check_box bottom_delta="-0" control_name="UseLocalChatBubbles" enabled="true" follows="left|top"
-             font="SansSerifSmall" height="16" initial_value="false"
-             label="Show local chat and bubbles" left="288" mouse_opaque="true"
-             name="local_bubble_text_chat" radio_style="false" width="237" />
-  <slider bottom_delta="-20" can_edit_text="false" control_name="ChatBubbleOpacity"
-             decimal_digits="3" enabled="true" follows="left|top" height="12"
-             increment="0.05" initial_val="1" label="Bubble opacity:" left="148" max_val="1"
-             min_val="0" mouse_opaque="true" name="bubble_chat_opacity" show_text="true"
-             value="0.5" width="225" />
  
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-              bottom_delta="-40" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12"
-             mouse_opaque="false" name="text_box6" v_pad="0" width="135">
-    Miscellaneous:
-  </text>
-        <check_box bottom_delta="-8" 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="-18" 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="-18" 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="-18" control_name="ScriptErrorsAsChat" enabled="true"
-             follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-             label="Show script errors and warnings as regular chat" left="148"
-             mouse_opaque="true" name="script_errors_as_chat" radio_style="false"
-             width="275" />
-        <check_box bottom_delta="-18" 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" />
-        <check_box bottom_delta="-18" enabled="true" follows="left|top"
-             font="SansSerifSmall" height="16" initial_value="false" 
-             label="Show custom chat channel" left="148" mouse_opaque="true"
-             name="toggle_channel_control" radio_style="false" width="237" />
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_colors.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_colors.xml
index 40a75a6..26aab9a 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_colors.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_colors.xml
@@ -1,115 +1,152 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<!-- 
+ALL PREFS OPTIONS START AT 20px FROM LEFT, 10px FROM TOP
+USE bottom_delta BETWEEN OPTIONS IN A GROUP
+USE LINES BETWEEN GROUPS
+USE font-style="BOLD|SHADOW" FOR GROUP LABELS
+GROUP LABEL CONTENTS ARE INDENTED 30px
+USE left="270" FOR TABBING OPTIONS
+-->
 <panel border="true" bottom="-409" enabled="true" follows="left|top|right|bottom"
-    height="408" label="Chat Colors" left="102" mouse_opaque="true" name="colors"
+    height="408" label="Colors" left="102" mouse_opaque="true" name="colors"
    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-style="BOLD|SHADOW"
+        font="SansSerifSmall" h_pad="0" halign="left" height="10" left="20"
+        mouse_opaque="true" name="effects_color_textbox" v_pad="0" width="394">
+    Selection Beam Color:
+  </text>
+  
+  <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom_delta="-80"
+             can_apply_immediately="false" color="1 1 1 1"
+             enabled="true" follows="left|top" height="65" label="" left="50"
+             mouse_opaque="true" name="effect_color_swatch"
+             tool_tip="Click to open Color Picker" width="65" />
+  
+  
+  <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-style="BOLD|SHADOW"
+        font="SansSerifSmall" h_pad="0" halign="left" height="10" left="270"
+        mouse_opaque="true" name="effects_color_textbox" v_pad="0" width="394">
+    Client Tag Color:
+  </text>
+  <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom_delta="-80"
+       can_apply_immediately="true" color="0.79 0.44 0.88 1"
+       enabled="true" follows="left|top"
+       height="65" label="Imprudence" left_delta="30" mouse_opaque="true"
+       name="client_tag_color" width="65" />
+  <check_box bottom_delta="45" enabled="true" follows="left|top"
+       font="SansSerifSmall" height="16" initial_value="false"
+       label="Color client tags" left_delta="76" mouse_opaque="true"
+       name="client_name_color_check" radio_style="false" width="160" />
+  
+  
+  <view_border bevel_style="none" border_thickness="1" bottom_delta="-60" follows="left|top"
+       height="1" left="55" name="border" width="380" />  
+  
+  
  <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"
+             bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top" font-style="BOLD|SHADOW"
-             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12"
+             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="20"
             mouse_opaque="false" name="text_box2" v_pad="0" width="128">
-    Chat Colors:
+    Chat:
  </text>
-  <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-75"
+  <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom_delta="-80"
             can_apply_immediately="true" color="1 1 1 1" control_name="UserChatColor"
-             enabled="true" follows="left|top" height="65" label="Your chat" left="120"
+             enabled="true" follows="left|top" height="65" label="Your chat" left="50"
             mouse_opaque="true" name="user" width="65" />
-  <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-75"
+  <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom_delta="0"
             can_apply_immediately="true" color="1 1 1 1" control_name="AgentChatColor"
             enabled="true" follows="left|top" height="65" label="Others' chat" left_delta="76"
             mouse_opaque="true" name="agent" width="65" />
-  <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-75"
+  <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom_delta="0"
             can_apply_immediately="true" color="0.6 0.6 1 1"
             enabled="true" follows="left|top" height="65" label="IMs" left_delta="76"
             mouse_opaque="true" name="im" width="65" />
-  <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-75"
+  <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom_delta="0"
             can_apply_immediately="true" color="0.8 1 1 1"
             enabled="true" follows="left|top"
             height="65" label="System" left_delta="76" mouse_opaque="true"
             name="system" width="65" />
-  <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-75"
+  <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom_delta="0"
             can_apply_immediately="true" color="0.82 0.82 0.99 1"
             control_name="ScriptErrorColor" enabled="true" follows="left|top"
             height="65" label="Script errors" left_delta="76" mouse_opaque="true"
             name="script_error" width="65" />
-  <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-146"
+  
+  <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom_delta="-70"
             can_apply_immediately="true" color="0.7 0.9 0.7 1"
             control_name="ObjectChatColor" enabled="true" follows="left|top"
-             height="65" label="Object chat" left="120" mouse_opaque="true"
+             height="65" label="Object chat" left="50" mouse_opaque="true"
             name="objects" width="65" />
-  <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-146"
+  <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom_delta="0"
             can_apply_immediately="true" color="0.7 0.9 0.7 1"
       control_name="ObjectIMColor" enabled="true" follows="left|top"
             height="65" label="Object IMs" left_delta="76" mouse_opaque="true"
       name="object_ims" width="65" />
-  <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-146"
+  <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom_delta="0"
             can_apply_immediately="true" color="0.7 0.9 0.7 1"
             enabled="true" follows="left|top"
             height="65" label="Owner chat" left_delta="76" mouse_opaque="true" name="owner"
             width="65" />
-  <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-146"
+  <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom_delta="0"
             can_apply_immediately="true" color="0 0 0 1"
             enabled="true" follows="left|top"
             height="65" label="Bubble chat" left_delta="76" mouse_opaque="true"
             name="background" width="65" />
-  <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-146"
+  <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom_delta="0"
             can_apply_immediately="true" color="0.6 0.6 1 1"
             enabled="true" follows="left|top" height="65"
             label="Links" left_delta="76" mouse_opaque="true" name="links" width="65" />
+  
+  <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom_delta="-85"
+       can_apply_immediately="true" color="1 1 1 1" control_name="FriendsChatColor"
+       enabled="true" follows="left|top" height="65" label="Friends" left="50"
+       mouse_opaque="true" name="FriendsChatColor" width="65" />
+  <check_box bottom_delta="45" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
+       initial_value="true" label="Highlight chat from friends" left_delta="76"
+       mouse_opaque="true" name="HighlightFriendsChat" radio_style="false" width="270"/>
-  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+  <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom_delta="-121"
-     bottom_delta="-30" drop_shadow_visible="true" enabled="true" follows="left|top"
+       can_apply_immediately="true" color="1 1 1 1" control_name="OwnNameChatColor"
-     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12"
+       enabled="true" follows="left|top" height="65" label="Your name" left="50"
-     mouse_opaque="false" name="text_box3" v_pad="0" width="128">
+       mouse_opaque="true" name="OwnNameChatColor" width="65" />
-    Line Highlighting:
+  <check_box bottom_delta="45" enabled="true" follows="left|top"
-  </text>
+       font="SansSerifSmall" height="16" initial_value="true"
+       label="Highlight local chat containing your name and/or nicknames:" left_delta="76" mouse_opaque="true"
-  <check_box bottom_delta="-7" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
+       name="HighlightOwnNameInChat" radio_style="false" width="217" />
-      initial_value="true" label="Highlight chat from friends" left="120"
-      mouse_opaque="true" name="HighlightFriendsChat" radio_style="false" width="270"/>
-  <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom_delta="-70"
-      can_apply_immediately="true" color="1 1 1 1" control_name="FriendsChatColor"
-      enabled="true" follows="left|top" height="65" label="Friends" left_delta="20"
-      mouse_opaque="true" name="FriendsChatColor" width="65" />
-  <check_box bottom_delta="-25" enabled="true" follows="left|top"
-     font="SansSerifSmall" height="16" initial_value="true"
-     label="Highlight local chat containing your name" left="120" mouse_opaque="true"
-     name="HighlightOwnNameInChat" radio_style="false" width="217" />
  <check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
-      initial_value="true" label="Highlight group chat containing your name" left_delta="0"
+       initial_value="true" label="Highlight group chat containing your name and/or nicknames:" left_delta="0"
-      mouse_opaque="true" name="HighlightOwnNameInIM" radio_style="false" width="270"/>
+       mouse_opaque="true" name="HighlightOwnNameInIM" radio_style="false" width="270"/>
-  <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom_delta="-70"
-      can_apply_immediately="true" color="1 1 1 1" control_name="OwnNameChatColor"
-      enabled="true" follows="left|top" height="65" label="Your name" left_delta="20"
-      mouse_opaque="true" name="OwnNameChatColor" width="65" />
-  <text bottom_delta="-30" follows="left|top" font="SansSerifSmall" height="20" 
-      left="140" name="nick01_text" width="150">
+  <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-22"
-    Highlight nickname 1:
+      enabled="true" follows="left|top" font="SansSerif" label="Nickname 1"
-  </text>
+      handle_edit_keys_directly="true" height="18" left_delta="0"  
-  <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="3"
-      enabled="true" follows="left|top" font="SansSerif"
-      handle_edit_keys_directly="true" height="20" left_delta="125"
      max_length="50" mouse_opaque="true" name="nick01"
-      select_all_on_focus_received="true" width="160" word_wrap="false" />
+      select_all_on_focus_received="true" width="110" word_wrap="false" />
-  <text bottom_delta="-25" follows="left|top" font="SansSerifSmall" height="20" 
+  <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="0"
-      left="140" name="nick02_text" width="150">
+      enabled="true" follows="left|top" font="SansSerif" label="Nickname 2"
-    Highlight nickname 2:
+      handle_edit_keys_directly="true" height="18" left_delta="120"
-  </text>
-  <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="3"
-      enabled="true" follows="left|top" font="SansSerif"
-      handle_edit_keys_directly="true" height="20" left_delta="125"
      max_length="50" mouse_opaque="true" name="nick02"
-      select_all_on_focus_received="true" width="160" word_wrap="false" />
+      select_all_on_focus_received="true" width="110" word_wrap="false" />
-  <text bottom_delta="-25" follows="left|top" font="SansSerifSmall" height="20"
+  <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="0"
-      left="140" name="nick03_text" width="150">
+      enabled="true" follows="left|top" font="SansSerif" label="Nickname 3"
-    Highlight nickname 3:
+      handle_edit_keys_directly="true" height="18" left_delta="120"
-  </text>
-  <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="3"
-      enabled="true" follows="left|top" font="SansSerif"
-      handle_edit_keys_directly="true" height="20" left_delta="125"
      max_length="50" mouse_opaque="true" name="nick03"
-      select_all_on_focus_received="true" width="160" word_wrap="false" />
+      select_all_on_focus_received="true" width="110" word_wrap="false" />
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_fonts.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_fonts.xml
index c64ce9f..8488656 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_fonts.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_fonts.xml
@@ -1,15 +1,35 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel name="font_panel" label="Fonts"
+<!-- 
+ALL PREFS OPTIONS START AT 20px FROM LEFT, 10px FROM TOP
+USE bottom_delta BETWEEN OPTIONS IN A GROUP
+USE LINES BETWEEN GROUPS
+USE font-style="BOLD|SHADOW" FOR GROUP LABELS
+GROUP LABEL CONTENTS ARE INDENTED 30px
+USE left="270" FOR TABBING OPTIONS
+-->
+<panel name="fonts_panel" label="Fonts"
       bottom="-409" left="102" height="408" width="517"
       border="true" follows="left|top|right|bottom">
-  <text bottom="-25" left="10" height="15" width="300">
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-    User interface font (requires restart):
+       bottom="-22" drop_shadow_visible="true" enabled="true" follows="left|top"
+       font="SansSerifSmall" h_pad="0" halign="left" height="12" left="20"
+       mouse_opaque="true" name="fontselect" v_pad="0" width="128" font-style="BOLD|SHADOW">
+    Select UI Font:
+  </text>
+  <text font="SansSerifSmall" bottom="-22" left_delta="80" height="12" width="300">
+    (requires restart)
  </text>
  <radio_group name="fonts" draw_border="false"
-               top="-30" left="20" bottom="0" right="-20"
+               top="-30" left="50" bottom="0" right="-20"
               follows="top|left|bottom|right">
    <radio_item name="DroidSans" bottom="-20" left="0" height="20">
@@ -48,12 +68,37 @@
  <spinner name="font_mult" label="Font size multiplier:" label_width="130"
-           bottom="-280" left="20" height="16" width="180" follows="left|top"
+           bottom_delta="150" left="50" height="16" width="180" follows="left|top"
           decimal_digits="2" increment="0.01" max_val="3.0" min_val="0.1"
           tool_tip="Multiply all font sizes by this amount." />
  <check_box name="font_round" follows="left|top"
-             bottom="-300" left="20" height="16" width="300"
+             bottom_delta="-20" left_delta="0" height="16" width="300"
             label="Force integer font sizes (may fix blurry fonts)" />
+  <view_border bevel_style="none" border_thickness="1" bottom_delta="-15" follows="left|top"
+      height="1" left="55" name="border" width="380" />
+  
+  
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+       bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
+       font="SansSerifSmall" h_pad="0" halign="left" height="12" left="20"
+       mouse_opaque="true" name="UI Size:" v_pad="0" width="128" font-style="BOLD|SHADOW">
+    UI Size:
+  </text>
+  
+  <slider bottom_delta="22" can_edit_text="true" label_width="0" label=""
+             decimal_digits="3" enabled="true" height="16" increment="0.001"
+             initial_val="1" left="50" max_val="1.4" min_val="0.75" mouse_opaque="true"
+             name="ui_scale_slider" show_text="true" value="1" width="160" />
+  <button bottom_delta="-48" enabled="true" follows="left|top"
+             font="SansSerifSmall" halign="center" height="20" label="Reset to Default"
+             left="270" mouse_opaque="true"
+             name="reset_ui_size" scale_image="true" width="160" />
+  <check_box bottom_delta="-20" enabled="true" follows="left|top"
+             font="SansSerifSmall" height="16" initial_value="false"
+             label="Use resolution independent scale" left="50" mouse_opaque="true"
+             name="ui_auto_scale" radio_style="false" width="256" />
 </panel>
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 8b354b4..e96def5 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
@@ -1,18 +1,35 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<!-- 
+ALL PREFS OPTIONS START AT 20px FROM LEFT, 10px FROM TOP
+USE bottom_delta BETWEEN OPTIONS IN A GROUP
+USE LINES BETWEEN GROUPS
+USE font-style="BOLD|SHADOW" FOR GROUP LABELS
+GROUP LABEL CONTENTS ARE INDENTED 30px
+USE left="270" FOR TABBING OPTIONS
+-->
 <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">
+  
+  
        <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" left="10"
+             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="20" font-style="BOLD|SHADOW" 
             mouse_opaque="true" name="start_location_textbox" v_pad="0" width="394">
-                Start Location:
+                Default Start Location:
        </text>
        <string name="region_name_prompt">
                &lt;Type region name&gt;
        </string>
  <combo_box name="default_location_combo"
-             bottom="-22" left="155" height="16" width="150"
+             bottom_delta="-25" left="50" height="16" width="160"
             follows="left|top" font="SansSerifSmall"
             mouse_opaque="true" allow_text_entry="true" max_chars="128">
    <combo_item name="MyHome" value="My Home">
@@ -26,153 +43,122 @@
    </combo_item>
  </combo_box>
  <button name="grid_btn" label="Grid Manager"
-          bottom_delta="-3" left="330" height="20" width="100"
+          bottom_delta="-3" left="270" height="20" width="160"
          follows="left|top" font="SansSerifSmall" halign="center"
                      mouse_opaque="true" scale_image="TRUE" />
-  <check_box bottom="-44" enabled="true" follows="left|top"
+  <check_box bottom_delta="-17" enabled="true" follows="left|top"
       font="SansSerifSmall" height="16" initial_value="true"
-       label="Show start location at login screen" left="151" mouse_opaque="true"
+       label="Show at login screen" left="50" mouse_opaque="true"
       name="show_location_checkbox" radio_style="false" width="256" />
+  <view_border bevel_style="none" border_thickness="1" bottom_delta="-15" follows="left|top"
+       height="1" left="55" name="border" width="380" />
+  
+  
        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom_delta="-24" drop_shadow_visible="true" enabled="true" follows="left|top"
+             bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
+             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="20" font-style="BOLD|SHADOW"
             mouse_opaque="true" name="show_names_textbox" v_pad="0" width="394">
                Nametags:
        </text>
-        <combo_box bottom_delta="0" follows="left|top" height="18" left="155"
+        <combo_box bottom_delta="-30" follows="left|top" height="18" left="50"
-             mouse_opaque="true" name="fade_out_combobox" width="146">
+             mouse_opaque="true" name="fade_out_combobox" width="160">
                <combo_item name="Never" value="Never">
-                        Never show
+                        Never show nametags
                </combo_item>
                <combo_item name="Show Temporarily" value="Show Temporarily">
-                        Temporarily show
+                        Briefly show nametags
                </combo_item>
                <combo_item name="Always" value="Always">
-                        Always show
+                        Always show nametags
                </combo_item>
        </combo_box>
        <check_box bottom_delta="0" follows="left|top"
-             font="SansSerifSmall" height="16" initial_value="true"
+             font="SansSerifSmall" height="16" initial_value="false"
-             label="Small avatar names" left="330" name="small_avatar_names_checkbox"
+             label="Large nametags" left="270" name="large_avatar_names_checkbox"
             width="200" />
        <check_box bottom_delta="-20" follows="left|top"
             font="SansSerifSmall" height="16" initial_value="false"
-             label="Hide my name on my screen" left="151" name="show_my_name_checkbox"
+             label="Hide my nametag" left="50" name="show_my_name_checkbox"
             width="200" />
+        <check_box bottom_delta="0" follows="left|top"
-        <check_box bottom_delta="-20" follows="left|top"
             font="SansSerifSmall" height="16" initial_value="false"
-             label="Highlight friends tags" left="151" name="highlight_friends_checkbox"
+             label="Bold my friends' nametags" left="270" name="highlight_friends_checkbox"
             width="200" />
-        <text type="string" length="1" bottom_delta="-24" follows="left|top" font="SansSerifSmall" h_pad="0"
+  <check_box bottom_delta="-20" follows="left|top"
-             halign="left" height="16" left="10" name="Display_Names_textbox" v_pad="0"
+       font="SansSerifSmall" height="16" initial_value="false"
-             width="394">
+       label="Hide group titles in nametags" left="50" mouse_opaque="true"
+       name="show_all_title_checkbox" radio_style="false" width="256" />
+  <view_border bevel_style="none" border_thickness="1" bottom_delta="-15" follows="left|top"
+       height="1" left="55" name="border" width="380" />
+  
+        <text type="string" length="1" bottom_delta="-20" follows="left|top" font="SansSerifSmall" h_pad="0"
+             halign="left" height="10" left="20" name="Display_Names_textbox" v_pad="0"
+             width="394" font-style="BOLD|SHADOW">
                Display Names:
        </text>
        <radio_group name="displaynames" draw_border="false"
-               bottom_delta="0" left_delta="60" height="18"
+               bottom_delta="-30" left="50" height="18"
               follows="top|left"
               control_name="DisplayNamesUsage">
-                <radio_item name="0" bottom_delta="-8" left_delta="40" height="18">
+                <radio_item name="0" bottom_delta="-8" left="0" height="18">
-                Legacy Names
+                Show legacy names
                </radio_item>
-                <radio_item name="1" bottom_delta="0" left_delta="50" height="18">
+                <radio_item name="1" bottom_delta="0" left_delta="70" height="18">
-                Display Names
+                Show display names
                </radio_item>
-                <radio_item name="2" bottom_delta="0" left_delta="50" height="18">
+                <radio_item name="2" bottom_delta="0" left_delta="70" height="18">
                Show Both
                </radio_item>
        </radio_group>
-        <check_box bottom_delta="-20" follows="left|top" control_name="LegacyNamesForFriends"
+        <check_box bottom_delta="-17" follows="left|top" control_name="LegacyNamesForFriends"
             font="SansSerifSmall" height="16" initial_value="false"
-             label="Show legacy names for friends" left="151" name="legacy_friends_checkbox"
+             label="Show legacy names for friends" left="50" name="legacy_friends_checkbox"
             width="200" />
-        <text type="string" length="1" bottom_delta="-24" follows="left|top" font="SansSerifSmall" h_pad="0"
-             halign="left" height="16" left="10" name="group_titles_textbox" v_pad="0"
-             width="394">
+  <view_border bevel_style="none" border_thickness="1" bottom_delta="-15" follows="left|top"
-                Group Titles:
+        height="1" left="55" name="border" width="380" />
-        </text>
+  
-        <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="0" follows="left|top"
-             font="SansSerifSmall" height="16" initial_value="false"
-             label="Hide my group title" left="330" name="show_my_title_checkbox"
-             radio_style="false" width="256" />
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom_delta="-24" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
-             mouse_opaque="true" name="effects_color_textbox" v_pad="0" width="394">
-                Selection Beam Color:
-        </text>
-  <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom_delta="-44"
-             can_apply_immediately="false" color="1 1 1 1"
-             enabled="true" follows="left|top" height="55" label="" left="153"
-             mouse_opaque="true" name="effect_color_swatch"
-             tool_tip="Click to open Color Picker" width="45" />
  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom_delta="-18" drop_shadow_visible="true" enabled="true" follows="left|top"
+       bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10"
+       font="SansSerifSmall" h_pad="0" halign="left" height="10" left="20" font-style="BOLD|SHADOW"
-             mouse_opaque="true" name="UI Size:" v_pad="0" width="128">
+       mouse_opaque="true" name="afk_textbox" v_pad="0" width="394">
-    UI Size:
+    Idle Away:
  </text>
-  <slider bottom_delta="42" can_edit_text="true"
+  <check_box bottom_delta="-25" enabled="true" follows="left|top"
-             decimal_digits="3" enabled="true" height="16" increment="0.001"
+       font="SansSerifSmall" height="16" initial_value="false"
-             initial_val="1" left="148" max_val="1.4" min_val="0.75" mouse_opaque="true"
+       label="Go Away/AFK when idle after" left="50" mouse_opaque="true"
-             name="ui_scale_slider" show_text="true" value="1" width="220" />
+       name="afk_timeout_checkbox" radio_style="false" width="256" />
-  <button bottom_delta="-48" enabled="true" follows="left|top"
+  <spinner bottom_delta="0" decimal_digits="0" enabled="true"
-             font="SansSerif" halign="center" height="22" label="Reset"
+             follows="left|top" height="16" increment="1" initial_val="5"
-             label_selected="Reset" left_delta="226" mouse_opaque="true"
+             label="" label_width="0" left="270" max_val="360"
-             name="reset_ui_size" scale_image="true" width="80" />
+             min_val="1" mouse_opaque="true" name="afk_timeout_spinner" width="50" />
-  <check_box bottom_delta="-14" 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_delta="-24" 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" />
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom_delta="6" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="220"
-             mouse_opaque="true" name="seconds_textbox" v_pad="0" width="128">
-                seconds
-        </text>
-    <check_box bottom_delta="-5" enabled="true" follows="left|top"
-                   font="SansSerifSmall" height="16" initial_value="false"
-                   label="Go Away/AFK when idle" left="330" mouse_opaque="true"
-                   name="afk_timeout_checkbox" radio_style="false" width="256" />
  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-       bottom_delta="-27" drop_shadow_visible="true" enabled="true" follows="left|top"
+       bottom_delta="5" drop_shadow_visible="true" enabled="true" follows="left|top"
-       font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10"
+       font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="55"
-       mouse_opaque="true" name="Mini-Map Notify:" v_pad="0" width="128">
+       mouse_opaque="true" name="minutes_textbox" v_pad="0" width="128">
-    Mini-Map Notify:
+    minute(s)
  </text>
-  <check_box bottom_delta="-4" enabled="true"
-             follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-             label="Entering chat range" left="151"
+  <view_border bevel_style="none" border_thickness="1" bottom_delta="-15" follows="left|top"
-             mouse_opaque="true" name="mini_map_notify_chat" radio_style="false"
+      height="1" left="55" name="border" width="380" />
-             width="256" />
+  
-  <check_box bottom_delta="0" enabled="true"
+  
-       follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-       label="Entering sim" left="330"
-       mouse_opaque="true" name="mini_map_notify_sim" radio_style="false"
-       width="256" />
        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom_delta="-24" drop_shadow_visible="true" enabled="true" follows="left|top"
+             bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
+             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="20" font-style="BOLD|SHADOW"
             mouse_opaque="true" name="maturity_desired_label" v_pad="0" width="394">
-                 Rating:
+                 Access Content Rated:
-        </text>
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom_delta="0" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="151"
-             mouse_opaque="true" name="maturity_desired_prompt" v_pad="0" width="394">
-                 I want to access content rated:
        </text>
-        <combo_box bottom_delta="-6" follows="left|top" height="18" left="315"
+        <combo_box bottom_delta="-25" follows="left|top" height="18" left="50"
-             mouse_opaque="true" name="maturity_desired_combobox" width="150">
+             mouse_opaque="true" name="maturity_desired_combobox" width="160">
                <combo_item name="Desired_Adult" value="42">
                        PG, Mature and Adult
                </combo_item>
@@ -185,100 +171,108 @@
        </combo_box>
        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
             bottom_delta="0" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="315"
+             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="50"
-             mouse_opaque="true" name="maturity_desired_textbox" v_pad="0" width="150">
+             mouse_opaque="true" name="maturity_desired_textbox" v_pad="0" width="160">
                 PG only
        </text>
+  
+  <view_border bevel_style="none" border_thickness="1" bottom_delta="-15" follows="left|top"
+        height="1" left="55" name="border" width="380" />
+  
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom_delta="-24" drop_shadow_visible="true" enabled="true" follows="left|top"
+             bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="18" left="10"
+             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="20" font-style="BOLD|SHADOW"
-             mouse_opaque="true" name="time_textbox" v_pad="0" width="394">
-                Clock:
-        </text>
-        <combo_box allow_text_entry="false" bottom_delta="0" enabled="true" follows="left|top"
-             height="18" left="153" max_chars="20" mouse_opaque="true"
-             name="time_combobox" width="146">
-                <combo_item type="string" name="12HourTime" value="PST 12">
-                        12-hour PST/PDT
-                </combo_item>
-                <combo_item type="string" name="24HourTime" value="PST 24">
-                        24-hour PST/PDT
-                </combo_item>
-                <combo_item type="string" name="UTCTime" value="UTC">
-                        UTC
-                </combo_item>
-        </combo_box>
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom_delta="-24" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="18" left="10"
             mouse_opaque="true" name="language_textbox" v_pad="0" width="394">
-                Language:
+    Language:
-        </text>
+  </text>
-        <combo_box allow_text_entry="false" bottom_delta="0" enabled="true"
+  <combo_box allow_text_entry="false" bottom_delta="-30" enabled="true"
-             follows="left|top" height="18" left="153" max_chars="135"
+             follows="left|top" height="18" left="50" max_chars="135"
-             mouse_opaque="true" name="language_combobox" width="146">
+             mouse_opaque="true" name="language_combobox" width="160">
-                <combo_item type="string" length="1" enabled="true" name="System Default Language" value="default">
+    <combo_item type="string" length="1" enabled="true" name="System Default Language" value="default">
-                        System Default
+      System Default
-                </combo_item>
+    </combo_item>
-                <combo_item type="string" length="1" enabled="true" name="English" value="en-us">
+    <combo_item type="string" length="1" enabled="true" name="English" value="en-us">
-                        English
+      English
-                </combo_item>
+    </combo_item>
-                
-                <!-- After "System Default" and "English", please keep the rest of these combo_items in alphabetical order by the first character in the string. -->
+    <!-- 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">
+    <combo_item type="string" length="1" enabled="true" name="Danish" value="da">
-                        Dansk (Danish) - Beta
+      Dansk (Danish) - Beta
-                </combo_item>
+    </combo_item>
-                <combo_item type="string" length="1" enabled="true" name="Deutsch(German)" value="de">
+    <combo_item type="string" length="1" enabled="true" name="Deutsch(German)" value="de">
-                        Deutsch (German) - Beta
+      Deutsch (German) - Beta
-                </combo_item>
+    </combo_item>
-                <combo_item type="string" length="1" enabled="true" name="Spanish" value="es">
+    <combo_item type="string" length="1" enabled="true" name="Spanish" value="es">
-                        Español (Spanish) - Beta
+      Español (Spanish) - Beta
-                </combo_item>
+    </combo_item>
-                <combo_item type="string" length="1" enabled="true" name="French" value="fr">
+    <combo_item type="string" length="1" enabled="true" name="French" value="fr">
-                        Français (French) - Beta
+      Français (French) - Beta
-                </combo_item>
+    </combo_item>
-                <combo_item type="string" length="1" enabled="true" name="Italian" value="it">
+    <combo_item type="string" length="1" enabled="true" name="Italian" value="it">
-                        Italiano (Italian) - Beta
+      Italiano (Italian) - Beta
-                </combo_item>
+    </combo_item>
-                <combo_item type="string" length="1" enabled="true" name="Hungarian" value="hu">
+    <combo_item type="string" length="1" enabled="true" name="Hungarian" value="hu">
-                        Magyar (Hungarian) - Beta
+      Magyar (Hungarian) - Beta
-                </combo_item>
+    </combo_item>
-                <combo_item type="string" length="1" enabled="true" name="Dutch" value="nl">
+    <combo_item type="string" length="1" enabled="true" name="Dutch" value="nl">
-                        Nederlands (Dutch) - Beta
+      Nederlands (Dutch) - Beta
-                </combo_item>
+    </combo_item>
-                <combo_item type="string" length="1" enabled="true" name="Polish" value="pl">
+    <combo_item type="string" length="1" enabled="true" name="Polish" value="pl">
-                        Polski (Polish) - Beta
+      Polski (Polish) - Beta
-                </combo_item>
+    </combo_item>
-                <combo_item type="string" length="1" enabled="true" name="Portugese" value="pt">
+    <combo_item type="string" length="1" enabled="true" name="Portugese" value="pt">
-                        Portugués (Portuguese) - Beta
+      Portugués (Portuguese) - Beta
-                </combo_item>
+    </combo_item>
-                <combo_item type="string" length="1" enabled="true" name="Russian" value="ru">
+    <combo_item type="string" length="1" enabled="true" name="Russian" value="ru">
-                        Русский (Russian) - Beta
+      Русский (Russian) - Beta
-                </combo_item>
+    </combo_item>
-                <combo_item type="string" length="1" enabled="true" name="Turkish" value="tr">
+    <combo_item type="string" length="1" enabled="true" name="Turkish" value="tr">
-                        Türkçe (Turkish) - Beta
+      Türkçe (Turkish) - Beta
-                </combo_item>
+    </combo_item>
-                <combo_item type="string" length="1" enabled="true" name="Ukrainian" value="uk">
+    <combo_item type="string" length="1" enabled="true" name="Ukrainian" value="uk">
-                        Українська (Ukrainian) - Beta
+      Українська (Ukrainian) - Beta
-                </combo_item>
+    </combo_item>
-                <combo_item type="string" length="1" enabled="true" name="Chinese" value="zh">
+    <combo_item type="string" length="1" enabled="true" name="Chinese" value="zh">
-                        中文 (简体) (Chinese) - Beta
+      中文 (简体) (Chinese) - Beta
-                </combo_item>
+    </combo_item>
-                <combo_item type="string" length="1" enabled="true" name="(Japanese)" value="ja">
+    <combo_item type="string" length="1" enabled="true" name="(Japanese)" value="ja">
-                        日本語 (Japanese) - Beta
+      日本語 (Japanese) - Beta
-                </combo_item>
+    </combo_item>
-                <combo_item type="string" length="1" enabled="true" name="(Korean)" value="ko">
+    <combo_item type="string" length="1" enabled="true" name="(Korean)" value="ko">
-                        한국어 (Korean) - Beta
+      한국어 (Korean) - Beta
-                </combo_item>
+    </combo_item>
-        </combo_box>
+  </combo_box>
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom_delta="0" drop_shadow_visible="true" enabled="true"
+             bottom_delta="-20" drop_shadow_visible="true" enabled="true"
             follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
-             height="18" left_delta="150" mouse_opaque="true" name="language_textbox2"
+             height="18" left="50" mouse_opaque="true" name="language_textbox2"
-             v_pad="0" width="400">
+             v_pad="0" width="380">
-                (requires restart for full effect)
+    (requires restart)
-        </text>
+  </text>
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+     bottom_delta="50" drop_shadow_visible="true" enabled="true" follows="left|top"
+     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="270" font-style="BOLD|SHADOW"
+     mouse_opaque="true" name="time_textbox" v_pad="0" width="394">
+    Inworld Clock:
+  </text>
+  <combo_box allow_text_entry="false" bottom_delta="-30" enabled="true" follows="left|top"
+             height="18" left="300" max_chars="20" mouse_opaque="true"
+             name="time_combobox" width="160">
+    <combo_item type="string" name="12HourTime" value="PST 12">
+      12-hour PST/PDT
+    </combo_item>
+    <combo_item type="string" name="24HourTime" value="PST 24">
+      24-hour PST/PDT
+    </combo_item>
+    <combo_item type="string" name="UTCTime" value="UTC">
+      UTC
+    </combo_item>
+  </combo_box>
+  
+  
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml
index 2ed0869..a5d1e7d 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml
@@ -1,34 +1,56 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<!-- 
+ALL PREFS OPTIONS START AT 20px FROM LEFT, 10px FROM TOP
+USE bottom_delta BETWEEN OPTIONS IN A GROUP
+USE LINES BETWEEN GROUPS
+USE font-style="BOLD|SHADOW" FOR GROUP LABELS
+GROUP LABEL CONTENTS ARE INDENTED 30px
+USE left="270" FOR TABBING OPTIONS
+-->
 <panel border="true" bottom="-409" enabled="true" follows="left|top|right|bottom"
     height="408" label="Graphics" left="102" mouse_opaque="true"
     name="Display panel" width="517">
+  
+  
        <button bottom="-22" follows="left|top" font="SansSerif" height="18" label="?"
             left="470" name="GraphicsPreferencesHelpButton" width="22" />
-        <check_box bottom="-23" enabled="true" follows="left|top" font="SansSerifSmall"
+  
+  <text type="string" length="1" bottom="-20" follows="left|top" font="SansSerifSmall" h_pad="0"
+             halign="left" height="10" left="20" name="Display_textbox" v_pad="0"
+             width="394" font-style="BOLD|SHADOW">
+    Display Mode:
+  </text>  
+  
+  
+        <check_box bottom_delta="-25" enabled="true" follows="left|top" font="SansSerifSmall"
             height="16" initial_value="false"
-             label="Run Imprudence in a window" left="10" mouse_opaque="true"
+       tool_tip="If unchecked, viewer will display full-screen when logged in" 
+             label="Windowed mode" left_delta="30" mouse_opaque="true"
             name="windowed mode" radio_style="false" width="100" />
-  <check_box bottom_delta="0" enabled="true" follows="left|top"
-             font="SansSerifSmall" height="16" initial_value="false"
-       label="Show WindLight toolbar" left="275" mouse_opaque="true"
-             name="toggle_windlight_control" radio_style="false" width="237"
-             control_name="EnableWindlightRemote" />
-        <text_editor type="string" length="1" allow_html="false" bg_readonly_color="0 0 0 0" bottom="-43"
-             embedded_items="false" enabled="false" follows="left|top"
-             font="SansSerifSmall" height="20" hide_border="true"
-             hide_scrollbar="true" left="10" max_length="65535" mouse_opaque="true"
-             name="FullScreenInfo" tab_stop="false" width="350" word_wrap="true">
-                If unchecked, viewer will display full-screen when logged in.
-        </text_editor>
        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-62" drop_shadow_visible="true" enabled="true" follows="left|top"
+             bottom_delta="-16" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10"
+             font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="0"
             mouse_opaque="true" name="WindowSizeLabel" v_pad="0" width="128">
                Window size:
        </text>
-        <combo_box allow_text_entry="false" bottom="-67" enabled="true" follows="left|top"
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             bottom_delta="0" drop_shadow_visible="true" enabled="true" follows="left|top"
+             font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="0"
+             mouse_opaque="true" name="DisplayResLabel" v_pad="0" width="128">
+    Display resolution:
+  </text>
+  <combo_box allow_text_entry="false" bottom_delta="-4" enabled="true" follows="left|top"
             height="18" left="185" max_chars="20" mouse_opaque="true"
-             name="windowsize combo" width="150">
+             name="windowsize combo" width="160">
                <combo_item type="string" length="1" enabled="true" name="800x600" value="800 x 600">
                        800x600 
                </combo_item>
@@ -51,25 +73,20 @@
      1920x1080 (HD1080)
    </combo_item>
  </combo_box>
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+        <combo_box allow_text_entry="false" bottom_delta="0" enabled="true" follows="left|top"
-             bottom="-62" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10"
-             mouse_opaque="true" name="DisplayResLabel" v_pad="0" width="128">
-                Display resolution:
-        </text>
-        <combo_box allow_text_entry="false" bottom="-67" enabled="true" follows="left|top"
             height="18" left="185" max_chars="20" mouse_opaque="true"
-             name="fullscreen combo" width="150" />
+             name="fullscreen combo" width="160" />
+  
        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-39" drop_shadow_visible="true" enabled="true" follows="left|top"
+             bottom_delta="-16" drop_shadow_visible="true" enabled="true" follows="left|top"
             font="SansSerifSmall" h_pad="0" halign="left" height="12"
-             left="10" mouse_opaque="true" name="AspectRatioLabel1"
+             left="50" mouse_opaque="true" name="AspectRatioLabel1"
             tool_tip="width / height" v_pad="0" width="160">
                Aspect ratio:
        </text>
-        <combo_box allow_text_entry="true" bottom="-43" enabled="true" follows="left|top"
+        <combo_box allow_text_entry="true" bottom_delta="-4" enabled="true" follows="left|top"
             height="16" left="185" max_chars="100" mouse_opaque="true"
-             name="aspect_ratio" tool_tip="width / height" width="150">
+             name="aspect_ratio" tool_tip="width / height" width="160">
                <combo_item type="string" length="1" enabled="true" name="4:3(StandardCRT)" value="1.333333">
                        4:3 (Standard CRT)
                </combo_item>
@@ -83,319 +100,316 @@
                        16:9 (Widescreen)
                </combo_item>
        </combo_box>
-        <check_box bottom="-44" control_name="FullScreenAutoDetectAspectRatio" enabled="true"
+        <check_box bottom_delta="-2" control_name="FullScreenAutoDetectAspectRatio" enabled="true"
             follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-             label="Auto-detect ratio" left="358" mouse_opaque="true"
+             label="Auto-detect" left_delta="165" mouse_opaque="true"
             name="aspect_auto_detect" radio_style="false" width="256" />
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-85" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="12"
+  <view_border bevel_style="none" border_thickness="1" bottom_delta="-15" follows="left|top"
-             left="10" mouse_opaque="true" name="HigherText" v_pad="0" width="80">
+        height="1" left="55" name="border" width="380" />
-                Quality and
-        </text>
+  
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+  <text type="string" length="1" bottom_delta="-20" follows="left|top" font="SansSerifSmall" h_pad="0"
-             bottom_delta="-14" drop_shadow_visible="true" enabled="true"
+      halign="left" height="10" left="20" name="textbox" v_pad="0"
-             follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
+      width="394" font-style="BOLD|SHADOW">
-             height="12" left_delta="0" mouse_opaque="true"
+    Performance
-             name="QualityText" v_pad="0" width="95">
+  </text>
-                performance:
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-        </text>
+             bottom_delta="-22" drop_shadow_visible="true" enabled="true" follows="left|top"
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-86" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="12"
-             left="115" mouse_opaque="true" name="FasterText" v_pad="0" width="80">
-                Faster
-        </text>
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-105" drop_shadow_visible="true" enabled="true" follows="left|top"
             font="SansSerifSmall" h_pad="0" halign="left" height="12"
-             left="158" mouse_opaque="true" name="ShadersPrefText" v_pad="0" width="40">
+             left="110" mouse_opaque="true" name="ShadersPrefText" v_pad="0" width="40">
-                Low
+    Low
-        </text>
+  </text>
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
             bottom_delta="0" drop_shadow_visible="true" enabled="true"
             follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
-             height="12" left_delta="47" mouse_opaque="true"
+             height="12" left_delta="62" mouse_opaque="true"
             name="ShadersPrefText2" v_pad="0" width="40">
-                Mid
+    Mid
-        </text>
+  </text>
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
             bottom_delta="0" drop_shadow_visible="true" enabled="true"
             follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
-             height="12" left_delta="47" mouse_opaque="true"
+             height="12" left_delta="62" mouse_opaque="true"
             name="ShadersPrefText3" v_pad="0" width="40">
-                High
+    High
-        </text>
+  </text>
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
             bottom_delta="0" drop_shadow_visible="true" enabled="true"
             follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
-             height="12" left_delta="47" mouse_opaque="true"
+             height="12" left_delta="62" mouse_opaque="true"
             name="ShadersPrefText4" v_pad="0" width="40">
-                Ultra
+    Ultra
-        </text>
+  </text>
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+  <icon bottom_delta="18" color="0.12 0.12 0.12 1.0" height="14" follows="left|top"
-             bottom="-80" drop_shadow_visible="true" enabled="true" follows="left|top"
+             image_name="rounded_square.tga" left="123" name="LowGraphicsDivet"
-             font="SansSerifSmall" h_pad="0" halign="left" height="12"
-             left="334" mouse_opaque="true" name="HigherText2" v_pad="0" width="80">
-                Higher
-        </text>
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom_delta="-14" drop_shadow_visible="true" enabled="true"
-             follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
-             height="12" left_delta="0" mouse_opaque="true"
-             name="QualityText2" v_pad="0" width="95">
-                Quality
-        </text>
-        <icon bottom="-89" color="0.12 0.12 0.12 1.0" height="14" follows="left|top" 
-             image_name="rounded_square.tga" left="173" name="LowGraphicsDivet"
             width="2" />
-        <icon bottom_delta="0" color="0.12 0.12 0.12 1.0" height="14" follows="left|top"
+  <icon bottom_delta="0" color="0.12 0.12 0.12 1.0" height="14" follows="left|top"
-             image_name="rounded_square.tga" left_delta="44" name="MidGraphicsDivet"
+             image_name="rounded_square.tga" left_delta="60" name="MidGraphicsDivet"
             width="2" />
-        <icon bottom_delta="0" color="0.12 0.12 0.12 1.0" height="14" follows="left|top"
+  <icon bottom_delta="0" color="0.12 0.12 0.12 1.0" height="14" follows="left|top"
-             image_name="rounded_square.tga" left_delta="44" name="HighGraphicsDivet"
+             image_name="rounded_square.tga" left_delta="61" name="HighGraphicsDivet"
             width="2" />
-        <icon bottom_delta="0" color="0.12 0.12 0.12 1.0" height="14" follows="left|top"
+  <icon bottom_delta="0" color="0.12 0.12 0.12 1.0" height="14" follows="left|top"
-             image_name="rounded_square.tga" left_delta="44" name="UltraGraphicsDivet"
+             image_name="rounded_square.tga" left_delta="61" name="UltraGraphicsDivet"
             width="2" />
-        <slider bottom="-90" can_edit_text="false" control_name="RenderQualityPerformance"
+  <slider bottom_delta="0" can_edit_text="false" control_name="RenderQualityPerformance"
             decimal_digits="0" enabled="true" follows="left|top" height="16"
             increment="1" initial_val="0" label="" label_width="0"
-             left="165" max_val="3" min_val="0" mouse_opaque="true"
+             left="115" max_val="3" min_val="0" mouse_opaque="true"
-             name="QualityPerformanceSelection" show_text="false" width="150" />
+             name="QualityPerformanceSelection" show_text="false" width="200" />
-        <check_box bottom="-91" control_name="RenderCustomSettings" enabled="true"
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             bottom_delta="2" drop_shadow_visible="true" enabled="true" follows="left|top" font-style="BOLD|SHADOW"
+             font="SansSerifSmall" h_pad="0" halign="left" height="12"
+             left="340" mouse_opaque="true" name="HigherText2" v_pad="0" width="200">
+    Graphics Quality
+  </text>
+  
+  
+  <check_box bottom_delta="-50" control_name="RenderCustomSettings" enabled="true"
             follows="left|top" font="SansSerifSmall" height="16"
-             initial_value="true" label="Custom" left="385" mouse_opaque="true"
+             initial_value="true" label="Advanced options" left="50" mouse_opaque="true"
             name="CustomSettings" radio_style="false" width="256" />
-        <view_border bevel_style="none" border_thickness="1" bottom="-415" follows="left|top"
-             height="300" left="5" name="GraphicsBorder" width="485" />
+  <button bottom_delta="0" enabled="true" font="SansSerifSmall" halign="center" height="20"
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+       label="Recommended Settings" left="210" mouse_opaque="true"
-             bottom="-130" drop_shadow_visible="true" enabled="true" follows="left|top"
+       name="Defaults" scale_image="true" width="160" follows="left|top" />
-             font="SansSerifSmall" h_pad="0" halign="left" height="12"
+  <button bottom_delta="0" enabled="true" font="SansSerifSmall" halign="center" height="20"
+             label="Hardware"
+             left_delta="165" mouse_opaque="true" name="GraphicsHardwareButton"
+             scale_image="true" width="110" follows="left|top" />
+  
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             bottom_delta="-15" drop_shadow_visible="true" enabled="true" follows="left|top" font-style="BOLD|SHADOW"
+             font="SansSerifSmall" h_pad="0" halign="left" height="10"
             left="10" mouse_opaque="true" name="ShadersText" v_pad="0" width="128">
-                Shaders:
+    Shaders:
-        </text>
+  </text>
-        <check_box bottom="-153" control_name="RenderObjectBump" enabled="true" follows="left|top"
+  <check_box bottom_delta="-23" control_name="RenderObjectBump" enabled="true" follows="left|top"
             font="SansSerifSmall" height="16" initial_value="true"
-             label="Bump mapping and shiny" left="10" mouse_opaque="true"
+             label="Bump mapping and shiny" left_delta="10" mouse_opaque="true"
             name="BumpShiny" radio_style="false" width="256" />
-        <check_box bottom_delta="-17" control_name="VertexShaderEnable" enabled="true"
+  <check_box bottom_delta="-18" control_name="VertexShaderEnable" enabled="true"
             follows="left|top" font="SansSerifSmall" height="16"
             initial_value="true" label="Basic shaders" left_delta="0"
             mouse_opaque="true" name="BasicShaders" radio_style="false"
             tool_tip="Disabling this option may prevent some graphics card drivers from crashing."
             width="315" />
-        <check_box bottom_delta="-17" control_name="WindLightUseAtmosShaders" enabled="true"
+  <check_box bottom_delta="-18" control_name="WindLightUseAtmosShaders" enabled="true"
             follows="left|top" font="SansSerifSmall" height="16"
             initial_value="true" label="Atmospheric shaders" left_delta="0"
             mouse_opaque="true" name="WindLightUseAtmosShaders" radio_style="false"
             width="256" />
-        <check_box bottom_delta="-17" control_name="RenderWaterReflections" enabled="true"
+  <check_box bottom_delta="-18" control_name="RenderWaterReflections" enabled="true"
             follows="left|top" font="SansSerifSmall" height="16"
             initial_value="true" label="Water reflections" left_delta="0"
             mouse_opaque="true" name="Reflections" radio_style="false" width="256" />
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-223" drop_shadow_visible="true" enabled="true" follows="left|top"
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             font="SansSerifSmall" h_pad="0" halign="left" height="12"
+             bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top" font-style="BOLD|SHADOW"
-             left="10" mouse_opaque="true" name="ReflectionDetailText" v_pad="0"
+             font="SansSerifSmall" h_pad="0" halign="left" height="10"
+             left_delta="-10" mouse_opaque="true" name="ReflectionDetailText" v_pad="0"
             width="128">
-                Reflection Detail:
+    Water Reflections:
-        </text>
+  </text>
-        <radio_group bottom_delta="-73" control_name="RenderReflectionDetail" draw_border="false"
+  <combo_box allow_text_entry="false" bottom_delta="-23" enabled="true" follows="left|top"
-             enabled="true" follows="left|top" height="70"
+             height="16" left_delta="10" max_chars="100" mouse_opaque="true" control_name="RenderReflectionDetail"
-             left_delta="-2" mouse_opaque="true" name="ReflectionDetailRadio"
+             name="ReflectionDetailCombo" width="160">
-             width="321">
+    <combo_item type="string" length="1" enabled="true" name="0" value="0">
-                <radio_item type="string" length="1" bottom="-19" enabled="true" follows="left|top" height="16"
+      Terrain and trees
-                     left="3" mouse_opaque="true" name="0" width="315">
+    </combo_item>
-                        Terrain and trees
+    <combo_item type="string" length="1" enabled="true" name="1" value="1">
-                </radio_item>
+      All static objects
-                <radio_item type="string" length="1" bottom="-35" enabled="true" follows="left|top" height="16"
+    </combo_item>
-                     left="3" mouse_opaque="true" name="1" width="315">
+    <combo_item type="string" length="1" enabled="true" name="2" value="2">
-                        All static objects
+      All avatars and objects
-                </radio_item>
+    </combo_item>
-                <radio_item type="string" length="1" bottom="-51" enabled="true" follows="left|top" height="16"
+    <combo_item type="string" length="1" enabled="true" name="3" value="3">
-                     left="3" mouse_opaque="true" name="2" width="315">
+      Everything
-                        All avatars and objects
+    </combo_item>
-                </radio_item>
+  </combo_box>
-                <radio_item type="string" length="1" bottom="-67" enabled="true" follows="left|top" height="16"
-                     left="3" mouse_opaque="true" name="3" width="315">
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                        Everything
+             bottom_delta="-25" drop_shadow_visible="true" enabled="true" follows="left|top" font-style="BOLD|SHADOW"
-                </radio_item>
+             font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="-10"
-        </radio_group>
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-313" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10"
             mouse_opaque="true" name="AvatarRenderingText" v_pad="0" width="128">
-                Avatar Rendering:
+    Avatar Rendering:
-        </text>
+  </text>
-        <check_box bottom_delta="-23" control_name="RenderUseImpostors" enabled="true"
+  <check_box bottom_delta="-23" control_name="RenderUseImpostors" enabled="true"
             follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
-             label="Avatar impostors" left_delta="0" mouse_opaque="true"
+             label="Avatar impostors" left_delta="10" mouse_opaque="true"
             name="AvatarImpostors" radio_style="false" width="256" />
-        <check_box bottom_delta="-17" control_name="RenderAvatarVP" enabled="true"
+  <check_box bottom_delta="-18" control_name="RenderAvatarVP" enabled="true"
             follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
             label="Hardware skinning" left_delta="0" mouse_opaque="true"
             name="AvatarVertexProgram" radio_style="false" width="256" />
-        <check_box bottom_delta="-17" control_name="RenderAvatarCloth" enabled="true"
+  <check_box bottom_delta="-18" control_name="RenderAvatarCloth" enabled="true"
             follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
             label="Avatar cloth" left_delta="0" mouse_opaque="true" name="AvatarCloth"
             radio_style="false" width="256" />
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             bottom_delta="-27" drop_shadow_visible="true" enabled="true" follows="left|top" font-style="BOLD|SHADOW"
+             font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="-10"
+             mouse_opaque="true" name="TerrainDetailText" v_pad="0" width="128">
+    Terrain Detail:
+  </text>
+  <combo_box allow_text_entry="false" bottom_delta="-23" enabled="true" follows="left|top"
+             height="16" left_delta="10" max_chars="100" mouse_opaque="true" control_name="RenderTerrainDetail"
+             name="TerrainDetailCombo" width="160">
+    <combo_item type="string" length="1" enabled="true" name="0" value="0">
+      Low
+    </combo_item>
+    <combo_item type="string" length="1" enabled="true" name="1" value="1">
+      High
+    </combo_item>
+  </combo_box>
  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-       bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
+     bottom="-190" drop_shadow_visible="true" enabled="true" follows="left|top" font-style="BOLD|SHADOW"
-       font="SansSerifSmall" h_pad="0" halign="left" height="12" left_delta="0" 
+     font="SansSerifSmall" h_pad="0" halign="left" height="10"
-       mouse_opaque="true" name="AvatarCountText" v_pad="0" width="128">
+     left="210" mouse_opaque="true" name="LimitsText" v_pad="0" width="128">
-    Max. non-imposters:
+    Limits:
  </text>
-  <slider bottom_delta="-20" can_edit_text="true" control_name="RenderAvatarMaxVisible"
+  <slider bottom_delta="-23" can_edit_text="true" control_name="RenderFarClip"
-       decimal_digits="0" enabled="true" follows="left|top" height="16"
-       increment="1" initial_val="35" label="" 
-       label_width="0" left_delta="0" max_val="50" min_val="0" mouse_opaque="true"
-       name="AvatarMaxVisible" show_text="true" width="100" />
-        <slider bottom="-135" can_edit_text="true" control_name="RenderFarClip"
             decimal_digits="0" enabled="true" follows="left|top" height="16"
             increment="4" initial_val="160" label="Draw distance (meters):"
-             label_width="140" left="215" max_val="1024" min_val="32" mouse_opaque="true"
+             label_width="140" left_delta="10" max_val="1024" min_val="32" mouse_opaque="true"
             name="DrawDistance" show_text="true" width="262" />
-        <slider bottom_delta="-20" can_edit_text="true" control_name="RenderMaxPartCount"
+  <slider bottom_delta="-18" can_edit_text="true" control_name="RenderMaxPartCount"
             decimal_digits="0" enabled="true" follows="left|top" height="16"
             increment="256" initial_val="4096"
             label="Max. particle count:" label_width="140" left_delta="0"
             max_val="8192" min_val="0" mouse_opaque="true" name="MaxParticleCount"
             show_text="true" width="262" />
-        <slider bottom_delta="-20" can_edit_text="false" control_name="RenderGlowResolutionPow"
+  <slider bottom_delta="-18" can_edit_text="true" control_name="RenderAvatarMaxVisible"
+       decimal_digits="0" enabled="true" follows="left|top" height="16"
+       increment="1" initial_val="35" label="Max. non-imposters:"
+       label_width="140" left_delta="0" max_val="50" min_val="0" mouse_opaque="true"
+       name="AvatarMaxVisible" show_text="true" width="250" />
+  <slider bottom_delta="-18" can_edit_text="false" control_name="RenderGlowResolutionPow"
             decimal_digits="0" enabled="true" follows="left|top" height="16"
             increment="1" initial_val="8" label="Post process quality:"
             label_width="140" left_delta="0" max_val="9" min_val="8"
             mouse_opaque="true" name="RenderPostProcess" show_text="false" width="223" />
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom_delta="-17" drop_shadow_visible="true" enabled="true"
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             bottom_delta="-20" drop_shadow_visible="true" enabled="true" font-style="BOLD|SHADOW"
             follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
-             height="12" left="215" mouse_opaque="true" name="MeshDetailText" v_pad="0"
+             height="12" left_delta="0" mouse_opaque="true" name="MeshDetailText" v_pad="0"
             width="128">
-                Mesh Detail:
+    Mesh Detail:
-        </text>
+  </text>
-        <slider bottom_delta="-22" can_edit_text="false" control_name="RenderVolumeLODFactor"
+  <slider bottom_delta="-23" can_edit_text="false" control_name="RenderVolumeLODFactor"
             decimal_digits="3" enabled="true" follows="left|top" height="16"
             increment="0.125" initial_val="160" label="  Objects:"
             label_width="140" left_delta="0" max_val="4" min_val="0"
             mouse_opaque="true" name="ObjectMeshDetail" show_text="false" width="223" />
-        <slider bottom_delta="-20" can_edit_text="false" control_name="RenderFlexTimeFactor"
+  <slider bottom_delta="-18" can_edit_text="false" control_name="RenderFlexTimeFactor"
             decimal_digits="3" enabled="true" follows="left|top" height="16"
             increment="0.1" initial_val="160" label="  Flexiprims:"
             label_width="140" left_delta="0" max_val="1" min_val="0"
             mouse_opaque="true" name="FlexibleMeshDetail" show_text="false" width="223" />
-        <slider bottom_delta="-20" can_edit_text="false" control_name="RenderTreeLODFactor"
+  <slider bottom_delta="-18" can_edit_text="false" control_name="RenderTreeLODFactor"
             decimal_digits="3" enabled="true" follows="left|top" height="16"
             increment="0.125" initial_val="160" label="  Trees:"
             label_width="140" left_delta="0" max_val="1" min_val="0"
             mouse_opaque="true" name="TreeMeshDetail" show_text="false" width="223" />
-        <slider bottom_delta="-20" can_edit_text="false" control_name="RenderAvatarLODFactor"
+  <slider bottom_delta="-18" can_edit_text="false" control_name="RenderAvatarLODFactor"
             decimal_digits="3" enabled="true" follows="left|top" height="16"
             increment="0.125" initial_val="160" label="  Avatars:"
             label_width="140" left_delta="0" max_val="1" min_val="0"
             mouse_opaque="true" name="AvatarMeshDetail" show_text="false" width="223" />
-        <slider bottom_delta="-20" can_edit_text="false" control_name="RenderTerrainLODFactor"
+  <slider bottom_delta="-18" can_edit_text="false" control_name="RenderTerrainLODFactor"
             decimal_digits="3" enabled="true" follows="left|top" height="16"
             increment="0.125" initial_val="160" label="  Terrain:"
             label_width="140" left_delta="0" max_val="2" min_val="1"
             mouse_opaque="true" name="TerrainMeshDetail" show_text="false" width="223" />
-        <slider bottom_delta="-20" can_edit_text="false" control_name="WLSkyDetail"
+  <slider bottom_delta="-18" can_edit_text="false" control_name="WLSkyDetail"
             decimal_digits="0" enabled="true" follows="left|top" height="16"
             increment="8" initial_val="160" label="  Sky:"
             label_width="140" left_delta="0" max_val="128" min_val="16"
             mouse_opaque="true" name="SkyMeshDetail" show_text="false" width="223" />
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-172" drop_shadow_visible="true" enabled="true" follows="left|top"
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             bottom="-266" drop_shadow_visible="true" enabled="true" follows="left|top"
             font="SansSerifSmall" h_pad="0" halign="left" height="12"
             left="444" mouse_opaque="true" name="PostProcessText" v_pad="0" width="128">
-                Low
+    Low
-        </text>
+  </text>
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-210" drop_shadow_visible="true" enabled="true" follows="left|top"
+             bottom_delta="-44" drop_shadow_visible="true" enabled="true" follows="left|top"
             font="SansSerifSmall" h_pad="0" halign="left" height="12"
             left="444" mouse_opaque="true" name="ObjectMeshDetailText" v_pad="0"
             width="128">
-                Low
+    Low
-        </text>
+  </text>
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom_delta="-20" drop_shadow_visible="true" enabled="true"
+             bottom_delta="-18" drop_shadow_visible="true" enabled="true"
             follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
             height="12" left_delta="0" mouse_opaque="true"
             name="FlexibleMeshDetailText" v_pad="0" width="128">
-                Low
+    Low
-        </text>
+  </text>
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom_delta="-20" drop_shadow_visible="true" enabled="true"
+             bottom_delta="-18" drop_shadow_visible="true" enabled="true"
             follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
             height="12" left_delta="0" mouse_opaque="true"
             name="TreeMeshDetailText" v_pad="0" width="128">
-                Low
+    Low
-        </text>
+  </text>
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom_delta="-20" drop_shadow_visible="true" enabled="true"
+             bottom_delta="-18" drop_shadow_visible="true" enabled="true"
             follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
             height="12" left_delta="0" mouse_opaque="true"
             name="AvatarMeshDetailText" v_pad="0" width="128">
-                Low
+    Low
-        </text>
+  </text>
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom_delta="-20" drop_shadow_visible="true" enabled="true"
+             bottom_delta="-18" drop_shadow_visible="true" enabled="true"
             follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
             height="12" left_delta="0" mouse_opaque="true"
             name="TerrainMeshDetailText" v_pad="0" width="128">
-                Low
+    Low
-        </text>
+  </text>
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom_delta="-20" drop_shadow_visible="true" enabled="true"
+             bottom_delta="-18" drop_shadow_visible="true" enabled="true"
             follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
             height="12" left_delta="0" mouse_opaque="true"
             name="SkyMeshDetailText" v_pad="0" width="128">
-                Low
+    Low
-        </text>
+  </text>
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-331" drop_shadow_visible="true" enabled="true" follows="left|top"
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top" font-style="BOLD|SHADOW"
             font="SansSerifSmall" h_pad="0" halign="left" height="12"
             left="210" mouse_opaque="true" name="LightingDetailText" v_pad="0"
             width="128">
-                Lighting Detail:
+    Lighting Detail:
-        </text>
+  </text>
-        <radio_group bottom_delta="-43" control_name="RenderLightingDetail" draw_border="false"
+  <combo_box allow_text_entry="false" bottom_delta="-23" enabled="true" follows="left|top"
-             enabled="true" follows="left|top" height="38" left_delta="0"
+             height="16" left_delta="10" max_chars="100" mouse_opaque="true" control_name="RenderLightingDetail"
-             mouse_opaque="true" name="LightingDetailRadio" width="321">
+             name="LightingDetailCombo" width="160">
-                <radio_item type="string" length="1" bottom="-19" enabled="true" follows="left|top" height="16"
+    <combo_item type="string" length="1" enabled="true" name="0" value="0">
-                     left="3" mouse_opaque="true" name="SunMoon" width="156">
+      Sun and moon only
-                        Sun and moon only
+    </combo_item>
-                </radio_item>
+    <combo_item type="string" length="1" enabled="true" name="1" value="1">
-                <radio_item type="string" length="1" bottom="-35" enabled="true" follows="left|top" height="16"
+      Nearby local lights
-                     left="3" mouse_opaque="true" name="LocalLights" width="156">
+    </combo_item>
-                        Nearby local lights
+  </combo_box>  
-                </radio_item>
-        </radio_group>
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+  <view_border bevel_style="none" border_thickness="1" bottom="-448" follows="left|top"
-             bottom="-331" drop_shadow_visible="true" enabled="true" follows="left|top"
+             height="271" left="5" name="GraphicsBorder" width="488" />  
-             font="SansSerifSmall" h_pad="0" halign="left" height="12" left="360"
+  
-             mouse_opaque="true" name="TerrainDetailText" v_pad="0" width="128">
+  
-                Terrain Detail:
-        </text>
-        <radio_group bottom_delta="-43" control_name="RenderTerrainDetail" draw_border="false"
-             enabled="true" follows="left|top" height="38" left_delta="0"
-             mouse_opaque="true" name="TerrainDetailRadio" width="321">
-                <radio_item type="string" length="1" bottom="-19" enabled="true" follows="left|top" height="16"
-                     left="3" mouse_opaque="true" name="0" width="315">
-                        Low
-                </radio_item>
-                <radio_item type="string" length="1" bottom="-35" enabled="true" follows="left|top" height="16"
-                     left="3" mouse_opaque="true" name="2" width="315">
-                        High
-                </radio_item>
-        </radio_group>
-        <button bottom="4" enabled="true" font="SansSerif" halign="center" height="20"
-             label="Recommended Settings" left="130" mouse_opaque="true"
-             name="Defaults" scale_image="true" width="170" follows="left|bottom" />
-  <button bottom="4" enabled="true" font="SansSerif" halign="center" height="20"
-             label="Hardware Options" label_selected="Hardware Options"
-             left="310" mouse_opaque="true" name="GraphicsHardwareButton"
-             scale_image="true" width="170" follows="left|bottom" />
        <string name="resolution_format">
                [RES_X] x [RES_Y]
        </string>
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 fe17e7a..dd3e183 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
@@ -1,114 +1,108 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<!-- 
+ALL PREFS OPTIONS START AT 20px FROM LEFT, 10px FROM TOP
+USE bottom_delta BETWEEN OPTIONS IN A GROUP
+USE LINES BETWEEN GROUPS
+USE font-style="BOLD|SHADOW" FOR GROUP LABELS
+GROUP LABEL CONTENTS ARE INDENTED 30px
+USE left="270" FOR TABBING OPTIONS
+-->
 <panel border="true" bottom="-409" enabled="true" follows="left|top|right|bottom"
-     height="408" label="IMs &amp; Logging" left="102" mouse_opaque="true" name="im"
+     height="408" label="Logging &amp; Privacy" left="102" mouse_opaque="true" name="im"
     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"
+       bottom="-20" drop_shadow_visible="true" enabled="true" follows="left|top" font-style="BOLD|SHADOW"
-             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12"
+       font="SansSerifSmall" h_pad="0" halign="left" height="10" left="20"
-             mouse_opaque="false" name="text_box" v_pad="0" width="128">
+       mouse_opaque="false" name="text_box" v_pad="0" width="128">
-    My Online Status:
+    Logging:
  </text>
-  <check_box bottom="-25" enabled="true" follows="left|top" font="SansSerifSmall"
-             height="16" initial_value="false"
+  <check_box bottom_delta="-25" enabled="true"
-             label="Only my Friends and Groups can see when I am online"
-             left="148" mouse_opaque="true" name="online_visibility" radio_style="false"
-             width="350" />
-  <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="10" left="12"
-             mouse_opaque="false" name="text_box2" v_pad="0" width="128">
-    IM Options:
-  </text>
-  <string name="log_in_to_change">
-    log in to change
-  </string>
-  <string name="default_email_used">
-    using default address
-  </string>
-  <check_box bottom="-45" enabled="true" follows="left|top" font="SansSerifSmall"
-             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" />
-  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-59" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="148"
-             mouse_opaque="false" name="show_ims_label" v_pad="0" width="100">
-    Show IMs in:
-  </text>
-  <check_box bottom="-65" enabled="true" follows="left|top"
-             font="SansSerifSmall" height="16" initial_value="false"
-             label="Main chat" left="248" mouse_opaque="true"
-             name="include_im_in_chat_console" radio_style="false" width="100" />
-  <check_box bottom="-65" enabled="true" follows="left|top"
-             font="SansSerifSmall" height="16" initial_value="false"
-             label="Local Chat window" left="348" mouse_opaque="true"
-             name="include_im_in_chat_history" radio_style="false" width="100" />
-  <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" enabled="true"
       follows="left|top" font="SansSerifSmall" height="16"
-       initial_value="false" label="Show online Friend notifications" left="148"
+       initial_value="false" label="Save a log of IM on my computer" left_delta="30"
-       mouse_opaque="true" name="friends_online_notify_checkbox"
+       mouse_opaque="true" name="log_instant_messages" radio_style="false"
-       radio_style="false" width="256" />
+       width="237" />
-  <check_box bottom_delta="-20" enabled="true"
-           follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-           label="Vertical IM tabs (requires restart)" left_delta="0" mouse_opaque="true"
-           name="vertical-imtabs-toggle" radio_style="false" width="270" />
-  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12"
-             mouse_opaque="false" name="text_box3" v_pad="0" width="128">
-    Busy Mode Response:
-  </text>
-  <text_editor type="string" length="1" bottom_delta="-60" embedded_items="false" enabled="true" follows="left|top"
-             font="SansSerifSmall" height="70" left="148" max_length="255"
-             mouse_opaque="true" name="busy_response" width="330" word_wrap="true" spell_check="true" />
-  <button bottom_delta="-25" follows="top|right" height="22" label="IM Response Options"
-     left="164" name="busy_adv_btn" tool_tip="Instant message Auto-Response options"
-     width="180" />
-  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom_delta="-23" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12"
-             mouse_opaque="false" name="text_box4" v_pad="0" width="128">
-    Logging Options:
-  </text>
-  <check_box bottom_delta="-7" 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_delta="-20" enabled="true"
             follows="left|top" font="SansSerifSmall" height="16"
-             initial_value="false" label="Show timestamps in IM log" left="168"
+             initial_value="false" label="Show timestamps in IM log" left_delta="30"
             mouse_opaque="true" name="log_instant_messages_timestamp" radio_style="false"
             width="217" />
  <check_box bottom_delta="-20" 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"
+             label="Show the end of last IM conversation" left_delta="0" mouse_opaque="true"
             name="log_show_history" radio_style="false" width="217" />
  <check_box bottom_delta="-20" 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"
+             left_delta="-30" mouse_opaque="true" name="log_chat" radio_style="false"
             width="237" />
  <check_box bottom_delta="-20" enabled="true" follows="left|top"
             font="SansSerifSmall" height="16" initial_value="false"
-             label="Show timestamps in Local Chat log" left="168" mouse_opaque="true"
+             label="Show timestamps in Local Chat log" left_delta="30" mouse_opaque="true"
             name="log_chat_timestamp" radio_style="false" width="217" />
  <check_box bottom_delta="-20" 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"
+             label="Show incoming IM in Local Chat log" left_delta="0" mouse_opaque="true"
             name="log_chat_IM" radio_style="false" width="217" />
  <check_box bottom_delta="-20" enabled="true" follows="left|top"
             font="SansSerifSmall" height="16" initial_value="false"
-             label="Include date with timestamps" left="148" mouse_opaque="true"
+             label="Include date with timestamps" left_delta="-30" mouse_opaque="true"
             name="log_date_timestamp" radio_style="false" width="237" />
-  <button bottom_delta="-22" follows="left|top" font="SansSerif" halign="center"
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             height="20" label="Change Path" label_selected="Change Path" left="148"
+       bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
-             mouse_opaque="true" name="log_path_button" width="96" />
+       font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="0"
-  <line_editor border_drop_shadow_visible="false" border_visible="false" bottom_delta="1"
+       mouse_opaque="false" name="text_box" v_pad="0" width="128">
-             drop_shadow_visible="true" enabled="false" follows="top|left|right"
+    Log location:
-             font="SansSerifSmall" halign="right" height="19" left="248"
+  </text>
-             max_length="254" mouse_opaque="false" name="log_path_string" right="-20" />
+  <line_editor border_drop_shadow_visible="false" border_visible="false" bottom_delta="-25"
+       drop_shadow_visible="true" enabled="false" follows="top|left|right" width="395" 
+       font="SansSerifSmall" halign="right" height="19" left_delta="0"
+       max_length="254" mouse_opaque="false" name="log_path_string" />
+  <button bottom_delta="-25" follows="left|top" font="SansSerifSmall" halign="center"
+             height="20" label="Change Location" label_selected="Change Path" left_delta="0"
+             mouse_opaque="true" name="log_path_button" width="160" />
+  
+  <view_border bevel_style="none" border_thickness="1" bottom_delta="-15" follows="left|top"
+      height="1" left="55" name="border" width="380" />
+  
+  
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+       bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top" font-style="BOLD|SHADOW"
+       font="SansSerifSmall" h_pad="0" halign="left" height="10" left="20"
+       mouse_opaque="false" name="text_box" v_pad="0" width="128">
+    Privacy:
+  </text>
+  <check_box bottom_delta="-25" enabled="true" follows="left|top" font="SansSerifSmall"
+             height="16" initial_value="false"
+             label="Only my Friends and Groups can see when I am online"
+             left_delta="30" mouse_opaque="true" name="online_visibility" radio_style="false"
+             width="350" />
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
+             font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="0"
+             mouse_opaque="false" name="text_box3" v_pad="0" width="128">
+    Busy Mode Response:
+  </text>
+  <text_editor type="string" length="1" bottom_delta="-75" embedded_items="false" enabled="true" follows="left|top"
+             font="SansSerifSmall" height="70" left_delta="0" max_length="255"
+             mouse_opaque="true" name="busy_response" width="330" word_wrap="true" spell_check="true" />
+  <button bottom_delta="-30" follows="top|left" height="20" label="Auto-Response Options"
+       left_delta="0" name="busy_adv_btn" tool_tip="Instant message Auto-Response options"
+       width="160" font="SansSerifSmall" />
+  <string name="log_in_to_change">
+    log in to change
+  </string>
+  
+  
 </panel>
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 70c8464..5713933 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
@@ -1,152 +1,180 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<!-- 
+ALL PREFS OPTIONS START AT 20px FROM LEFT, 10px FROM TOP
+USE bottom_delta BETWEEN OPTIONS IN A GROUP
+USE LINES BETWEEN GROUPS
+USE font-style="BOLD|SHADOW" FOR GROUP LABELS
+GROUP LABEL CONTENTS ARE INDENTED 30px
+USE left="270" FOR TABBING OPTIONS
+-->
 <panel border="true" bottom="-409" enabled="true" follows="left|top|right|bottom"
     height="408" label="Input &amp; Camera" left="102" mouse_opaque="true"
     name="Input panel" width="517">
+  <text name="double_click_action_label" font-style="BOLD|SHADOW"
+      bottom="-26" left="20" height="16" width="200"
+      follows="left|top" font="SansSerifSmall" mouse_opaque="true">
+    Double-Click Action:
+  </text>
+  <combo_box name="double_click_action"
+             bottom_delta="-25" left_delta="30" height="18" width="160"
+             follows="left|top" mouse_opaque="true">
+    <combo_item name="None" value="None">
+      No action
+    </combo_item>
+    <combo_item name="Go" value="Go">
+      Autopilot
+    </combo_item>
+  </combo_box>
+  <text name="go_action_label"
+              bottom_delta="-25" left_delta="0" height="18" width="200"
+        follows="left|top" font="SansSerifSmall" mouse_opaque="true">
+    Autopilot:
+  </text>
+  <combo_box name="go_action"
+             bottom_delta="0" left_delta="70" height="18" width="90"
+             follows="left|top" mouse_opaque="true">
+    <combo_item name="Move" value="Move">
+      Move
+    </combo_item>
+    <combo_item name="Teleport" value="Teleport">
+      Teleport
+    </combo_item>
+  </combo_box>
+  <view_border bevel_style="none" border_thickness="1" bottom_delta="-15" follows="left|top"
+     height="1" left="55" name="border" width="380" />
+  
+  
        <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"
+             bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top" font-style="BOLD|SHADOW"
-             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
+             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="20"
             mouse_opaque="true" name=" Mouselook Options:" v_pad="0" width="266">
                Mouselook:
        </text>
        <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"
+             bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="148"
+             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="50"
             mouse_opaque="true" name=" Mouse Sensitivity:" v_pad="0" width="128">
                Mouse sensitivity:
        </text>
-        <slider_bar bottom="-26" enabled="true" follows="left|top"
+        <slider_bar bottom_delta="-6" enabled="true" follows="left|top"
-             height="16" increment="0.25" initial_val="2" left="276" max_val="15"
+             height="16" increment="0.25" initial_val="2" left_delta="98" max_val="15"
-             min_val="0" mouse_opaque="true" name="mouse_sensitivity" width="128" />
+             min_val="0" mouse_opaque="true" name="mouse_sensitivity" width="88" />
-        <check_box bottom_delta="-18" enabled="true" follows="left|top"
+        <check_box bottom_delta="0" enabled="true" follows="left|top"
-             font="SansSerifSmall" height="16" label="Invert mouse" left="148"
+             font="SansSerifSmall" height="16" label="Invert mouse" left="270"
             mouse_opaque="true" name="invert_mouse" radio_style="false" width="128" />
-  <check_box bottom_delta="-18" enabled="true"
+  <check_box bottom_delta="-20" enabled="true"
       follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-       label="Show avatar in mouselook" left="148" mouse_opaque="true" name="first_person_avatar_visible"
+       label="Show my avatar in mouselook" left_delta="0" mouse_opaque="true" name="first_person_avatar_visible"
       radio_style="false" width="256" />
+  <view_border bevel_style="none" border_thickness="1" bottom_delta="-15" follows="left|top"
+     height="1" left="55" name="border" width="380" />
  <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"
+       bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
+       font="SansSerifSmall" h_pad="0" halign="left" height="10" left="20" font-style="BOLD|SHADOW"
-             mouse_opaque="true" name=" Auto Fly Options:" v_pad="0" width="266">
+       mouse_opaque="true" name="text2" v_pad="0" width="128">
-    Auto-Fly:
+    Joystick:
  </text>
-  <check_box bottom_delta="-6" enabled="true" follows="left|top"
+  <button bottom_delta="-25" follows="left|top" font="SansSerifSmall" height="20"
-             font="SansSerifSmall" height="16" label="Fly/land on holding up/down"
+             label="Joystick Setup" left="50" mouse_opaque="true"
-             left="148" mouse_opaque="true" name="automatic_fly" radio_style="false"
+             name="joystick_setup_button" width="160" />
-             width="178" />
+  <view_border bevel_style="none" border_thickness="1" bottom_delta="-15" follows="left|top"
+     height="1" left="55" name="border" width="380" />
+  
  <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"
+             bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top" font-style="BOLD|SHADOW"
-             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
+             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="20"
-             mouse_opaque="true" name=" Camera Options:" v_pad="0" width="266">
+             mouse_opaque="true" name="Camera Options:" v_pad="0" width="266">
-    Default Camera:
+    Camera:
  </text>
+  <check_box bottom_delta="-25" enabled="true"
+       follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+       label="Automatic edit camera movement" left="50" mouse_opaque="true"
+       name="edit_camera_movement" radio_style="false"
+       tool_tip="Use automatic camera positioning when entering and exiting edit mode"
+       width="201" />
+  <check_box bottom_delta="-20" enabled="true"
+             follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+             label="Automatic appearance camera movement" left_delta="0" mouse_opaque="true"
+             name="appearance_camera_movement" radio_style="false"
+             tool_tip="Use automatic camera positioning while in edit mode" width="242" />
+  <check_box bottom_delta="-20" enabled="true"
+             follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+             label="Disable camera constraints" left_delta="0" mouse_opaque="true"
+             name="Disable camera constraints" radio_style="false"
+             tool_tip="Disables camera limits such as distance and terrain" width="242" />
+  <check_box bottom_delta="-20" enabled="true"
+       follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+       label="Disable minimum zoom distance" left_delta="30" mouse_opaque="true"
+       name="disable_min_zoom_check" radio_style="false"
+       tool_tip="Disables minimum zoom distance for prims and avatars" width="242" />
+  
+  
  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom_delta="0" drop_shadow_visible="true" enabled="true" follows="left|top"
+             bottom_delta="-30" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="148"
+             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="50"
             mouse_opaque="true" name="camera_fov_label" v_pad="0" width="128">
-    Camera view angle:
+    View angle:
  </text>
  <slider bottom_delta="-6" can_edit_text="true"
-             decimal_digits="2" enabled="true" follows="left|top" width="128" height="16"
+             decimal_digits="2" enabled="true" follows="left|top" width="100" height="16"
-             increment=".025" initial_val="1.57" left="276" max_val="2.97" min_val=".17"
+             increment=".025" initial_val="1.57" left_delta="98" max_val="2.97" min_val=".17"
             mouse_opaque="true" name="camera_fov" show_text="false" value="60" />
+  
  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
             bottom_delta="-18" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="148"
+             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="50"
             mouse_opaque="true" name="Camera Follow Distance:" v_pad="0" width="128">
-    Camera follow distance:
+    Follow distance:
  </text>
  <slider bottom_delta="-6" can_edit_text="true" control_name="CameraOffsetScale"
             decimal_digits="2" enabled="true" follows="left|top" height="16"
-             increment=".025" initial_val="1" left="276" min_val=".5" max_val="3"
+             increment=".025" initial_val="1" left_delta="98" min_val=".5" max_val="3"
             mouse_opaque="true" name="camera_offset_scale" show_text="false" value="1"
-             width="128" />
+             width="100" />
+  
  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
       bottom_delta="-18" drop_shadow_visible="true" enabled="true" follows="left|top"
-       font="SansSerifSmall" h_pad="0" halign="left" height="10" left="148"
+       font="SansSerifSmall" h_pad="0" halign="left" height="10" left="50"
       mouse_opaque="true" name="Camera Transition Time:" v_pad="0" width="128">
-    Camera transition time:
+    Transition time:
  </text>
  <slider bottom_delta="-6" 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"
+       initial_val="0.4" left_delta="98" max_val="4" min_val="0" mouse_opaque="true"
-       name="zoom_time" show_text="false" value="2" width="128" />
+       name="zoom_time" show_text="false" value="2" width="100" />
  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
             bottom_delta="-18" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="148"
+             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="50"
             mouse_opaque="true" name="Camera Smoothing:" v_pad="0" width="128">
-    Camera smoothing:
+    Smoothing:
  </text>
  <slider bottom_delta="-6" 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"
+             increment="0.1" initial_val="1" left_delta="98" max_val="9" min_val="0"
             mouse_opaque="true" name="camera_position_smoothing" show_text="false" value="2"
-             width="128" />
+             width="100" />
-  <check_box bottom_delta="-24" enabled="true"
-             follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-             label="Automatic edit camera movement" left="148" mouse_opaque="true"
-             name="edit_camera_movement" radio_style="false"
-             tool_tip="Use automatic camera positioning when entering and exiting edit mode"
-             width="201" />
-  <check_box bottom_delta="-18" enabled="true"
-             follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-             label="Automatic appearance camera movement" left="148" mouse_opaque="true"
-             name="appearance_camera_movement" radio_style="false"
-             tool_tip="Use automatic camera positioning while in edit mode" width="242" />
-  <check_box bottom_delta="-18" enabled="true"
-             follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-             label="Disable camera constraints" left="148" mouse_opaque="true"
-             name="Disable camera constraints" radio_style="false"
-             tool_tip="Disables camera limits such as distance and terrain" width="242" />
-  <check_box bottom_delta="-18" enabled="true"
-       follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-       label="Disable minimum zoom distance" left="168" mouse_opaque="true"
-       name="disable_min_zoom_check" radio_style="false"
-       tool_tip="Disables minimum zoom distance for prims and avatars" width="242" />
-  <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"
-             font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10"
-             mouse_opaque="true" name="text2" v_pad="0" width="128">
-                Joystick:
-        </text>
-        <button bottom_delta="-4" follows="left|top" font="SansSerif" height="20"
-             label="Joystick Setup" left="148" mouse_opaque="true"
-             name="joystick_setup_button" width="155" />
-        <text name="double_click_action_label"
-              bottom_delta="-35" left="10" height="18" width="200"
-        follows="left|top" font="SansSerifSmall" mouse_opaque="true">
-    Double-Click Action:
-        </text>
-  <combo_box name="double_click_action"
-             bottom_delta="0" left_delta="138" height="18" width="150"
-             follows="left|top" mouse_opaque="true">
-                <combo_item name="None" value="None">
-                        None
-                </combo_item>
-                <combo_item name="Go" value="Go">
-                        Autopilot
-                </combo_item>
-  </combo_box>
-        <text name="go_action_label"
-              bottom_delta="-20" left="10" height="18" width="200"
-        follows="left|top" font="SansSerifSmall" mouse_opaque="true">
-    Autopilot Style:
-        </text>
-  <combo_box name="go_action"
-             bottom_delta="0" left_delta="138" height="18" width="150"
-             follows="left|top" mouse_opaque="true">
-                <combo_item name="Move" value="Move">
-                        Move
-                </combo_item>
-                <combo_item name="Teleport" value="Teleport">
-                        Teleport
-                </combo_item>
-  </combo_box>
 </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 7d6bb4a..976e7a8 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
@@ -1,178 +1,434 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<!-- 
+ALL PREFS OPTIONS START AT 20px FROM LEFT, 10px FROM TOP
+USE bottom_delta BETWEEN OPTIONS IN A GROUP
+USE LINES BETWEEN GROUPS
+USE font-style="BOLD|SHADOW" FOR GROUP LABELS
+GROUP LABEL CONTENTS ARE INDENTED 30px
+USE left="270" FOR TABBING OPTIONS
+-->
 <panel border="true" bottom="-409" enabled="true" follows="left|top|right|bottom"
     height="408" label="Network" left="102" mouse_opaque="true" name="network"
     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" left="12"
+  <tab_container bottom="0" height="450" left="0" mouse_opaque="false"
-             mouse_opaque="false" name="text_box" v_pad="0" width="200">
+     name="networktab2" tab_min_width="50" tab_position="top" width="495" bg_opaque_color="0,0,0,0.0">
-                Maximum bandwidth:
-        </text>
+    
-        <slider bottom_delta="-25" can_edit_text="true" control_name="ThrottleBandwidthKBPS"
+    <!-- BANDWIDTH SETTINGS PANEL -->
-             decimal_digits="0" enabled="true" follows="left|top" height="15"
+    
-             increment="10" initial_val="1000" left_delta="0" max_val="5000" min_val="50"
-             mouse_opaque="true" name="max_bandwidth" show_text="true" value="1000"
+    <panel border="true" bottom="-409" enabled="true" follows="left|top|right|bottom"
-             width="180" />
+       height="408" label="Performance" left="102" mouse_opaque="true"
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+       name="bandwidth_panel" width="517">
-             bottom_delta="4" drop_shadow_visible="true" enabled="true"
-             follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
-             height="10" left_delta="186" mouse_opaque="false" name="text_box2"
+      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             v_pad="0" width="200">
+                 bottom="-20" drop_shadow_visible="true" enabled="true" follows="left|top" font-style="BOLD|SHADOW"
-                kbps (kilobits per second)
+                 font="SansSerifSmall" h_pad="0" halign="left" height="10" left="20"
-        </text>
+                 mouse_opaque="false" name="text_box" v_pad="0" width="200">
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+        Maximum Viewer Bandwidth:
-             bottom_delta="-25" drop_shadow_visible="true" enabled="true"
+      </text>
-             follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
+      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             height="10" left="12" mouse_opaque="false" name="cache_size_label_l"
+                 bottom_delta="-25" drop_shadow_visible="true" enabled="true"
-             v_pad="0" width="200">
+                 follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
-                Disk cache size (MB):
+                 height="10" left="50" mouse_opaque="false" name="cache_size_label_l"
-        </text>
+                 v_pad="0" width="200">
-        <slider bottom_delta="-25" can_edit_text="true" control_name="CacheSize"
+        Speed:
-             decimal_digits="0" enabled="true" follows="left|top" height="15"
+      </text>      
-             increment="10" initial_val="50" left_delta="0" max_val="1000" min_val="10"
+      <slider bottom_delta="-4" can_edit_text="true" control_name="ThrottleBandwidthKBPS"
-             mouse_opaque="true" name="cache_size" show_text="true" width="180" />
+                 decimal_digits="0" enabled="true" follows="left|top" height="15"
-        <button bottom_delta="-4" enabled="true" follows="left|top"
+                 increment="10" initial_val="1000" left_delta="50" max_val="5000" min_val="50"
-             font="SansSerif" halign="center" height="22" label="Clear Disk Cache" left="340"
+                 mouse_opaque="true" name="max_bandwidth" show_text="true" value="1000"
-             left_delta="186" mouse_opaque="true" name="clear_cache" scale_image="true"
+                 width="160" />
-             width="150" />
+      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                 bottom_delta="4" drop_shadow_visible="true" enabled="true"
-             bottom_delta="-17" drop_shadow_visible="true" enabled="true"
+                 follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
-             follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
+                 height="10" left_delta="166" mouse_opaque="false" name="text_box2"
-             height="10" left="12" mouse_opaque="false" name="cache_location_label"
+                 v_pad="0" width="200">
-             v_pad="0" width="200">
+        kbps (kilobits per second)
-                Disk cache location:
+      </text>
-        </text>
-        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-28"
-             enabled="false" follows="left|top" font="SansSerif"
+      <view_border bevel_style="none" border_thickness="1" bottom_delta="-15" follows="left|top"
-             handle_edit_keys_directly="true" height="20" left_delta="0"
+           height="1" left="55" name="border" width="380" />
-             max_length="4096" mouse_opaque="true" name="cache_location"
-             select_all_on_focus_received="false" width="470" word_wrap="false" />
-        <button bottom_delta="-25" enabled="true" follows="left|top" font="SansSerif"
+      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             halign="center" height="22" label="Set" label_selected="Set" left_delta="0"
+           bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top" font-style="BOLD|SHADOW"
-             mouse_opaque="true" name="set_cache" scale_image="true" width="100" />
+           font="SansSerifSmall" h_pad="0" halign="left" height="10" left="20"
-        <button bottom="-105" bottom_delta="0" enabled="true" follows="left|top"
+           mouse_opaque="false" name="text_box" v_pad="0" width="200">
-             font="SansSerif" halign="center" height="22" label="Reset"
+        Texture Fetching:
-             label_selected="Set" left_delta="103" mouse_opaque="true"
+      </text>
-             name="reset_cache" scale_image="true" width="100" />
-        <check_box bottom="-173" bottom_delta="-25" control_name="ConnectionPortEnabled"
+      <check_box bottom_delta="-25" enabled="true" follows="left|top"
-             enabled="true" follows="left|top" font="SansSerifSmall" height="16"
+           font="SansSerifSmall" height="16" initial_value="false"
-             initial_value="false" label="Enable custom outgoing port" left="12"
+           label="Use HTTP texture fetching (experimental)" left="50" mouse_opaque="true"
-             mouse_opaque="true" name="connection_port_enabled" radio_style="false"
+           name="http_texture_check" radio_style="false" width="217" />
-       tool_tip="Enables custom port for outgoing connections" 
-             width="256" />
+      <check_box bottom_delta="-25" enabled="true" follows="left|top"
-        <spinner bottom="-193" bottom_delta="-20" control_name="ConnectionPort"
+           font="SansSerifSmall" height="16" initial_value="false"
-             decimal_digits="0" enabled="true" follows="left|top" height="16"
+           label="Increase rez speed via draw distance stepping" left_delta="0" mouse_opaque="true"
-             increment="1" initial_val="13000" label="Port number:" label_width="75"
+           name="speed_rez_check" radio_style="false" width="217" />
-             left_delta="20" max_val="13050" min_val="13000" mouse_opaque="true"
+      <spinner bottom_delta="-20" decimal_digits="0"
-             name="connection_port" width="140" />
+           tool_tip="Interval in seconds between each draw distance increment"
-  
+           follows="left|top" height="16" increment="1" initial_val="12"
-  <!-- XMLRPC PROXY -->
+           label="Step interval every:" label_width="105" left_delta="30" max_val="20"
+           min_val="1" mouse_opaque="true" name="speed_rez_interval_spinner" width="145" />
-  <check_box bottom_delta="-25" enabled="true"
+      <text bottom_delta="0" follows="top|left" height="15" left_delta="150"
-             follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+                 name="speed_rez_seconds_text" width="115">
-             label="Enable XMLRPC proxy (Login, Land, and Money purchases)" left="15" mouse_opaque="true"
+        seconds
-             name="xmlrpc_proxy_enabled" radio_style="false" width="300" />
+      </text>      
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom_delta="-18" drop_shadow_visible="true" enabled="true"
-             follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
+      <view_border bevel_style="none" border_thickness="1" bottom_delta="-15" follows="left|top"
-             height="10" left_delta="20" mouse_opaque="false" name="xmlrpc_proxy_text_label"
+           height="1" left="55" name="border" width="380" />
-             v_pad="0" width="128">
-                Address:
+      
-        </text>
+      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-        <line_editor bottom_delta="-8" enabled="true" follows="left|top" font="SansSerif"
+           bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top" font-style="BOLD|SHADOW"
-             height="20" left="112" name="xmlrpc_proxy_editor"
+           font="SansSerifSmall" h_pad="0" halign="left" height="10" left="20"
-             tool_tip="The name or IP address of the proxy you would like to use"
+           mouse_opaque="false" name="text_box" v_pad="0" width="200">
-             width="200" />
+        Disk Cache:
-        <spinner bottom_delta="-20" decimal_digits="0"
+      </text>
-             enabled="true" follows="left|top" height="16" increment="1"
+      
-             initial_val="80" label="Port number:" label_width="75" left="35"
+      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             max_val="65535" min_val="10" mouse_opaque="true" name="xmlrpc_proxy_port"
+                 bottom_delta="-25" drop_shadow_visible="true" enabled="true"
-             width="140" />
+                 follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
+                 height="10" left="50" mouse_opaque="false" name="cache_size_label_l"
-  <!-- SOCKS 5 PROXY -->
+                 v_pad="0" width="200">
+        Size:
-  <check_box bottom_delta="-24" enabled="true"
+      </text>
-             follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+      <slider bottom_delta="-4" can_edit_text="true" control_name="CacheSize"
-             label="Enable SOCKS 5 proxy" left="15" mouse_opaque="true"
+                 decimal_digits="0" enabled="true" follows="left|top" height="15"
-             name="socks5_proxy_enabled" radio_style="false" width="256" />
+                 increment="10" initial_val="50" left_delta="50" max_val="1000" min_val="10"
-  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                 mouse_opaque="true" name="disk_cache_size" show_text="true" width="160" />
-             bottom_delta="-18" drop_shadow_visible="true" enabled="true"
+      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
+                 bottom_delta="4" drop_shadow_visible="true" enabled="true"
-             height="10" left="35" mouse_opaque="false" name="socks5_host_label"
+                 follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
-             v_pad="0" width="128">
+                 height="10" left_delta="166" mouse_opaque="false" name="cache_size_label_l"
-    SOCKS 5 host:
+                 v_pad="0" width="200">
-  </text>
+        megabytes
-  <line_editor bottom_delta="-6" enabled="true" follows="left|top" font="SansSerif"
+      </text>      
-             height="20" left="113" name="socks5_proxy_host"
+      
-             tool_tip="The name or IP address of the SOCKS5 proxy you would like to use"
+      <button bottom_delta="-30" enabled="true" follows="left|top"
-             width="200" />
+                 font="SansSerifSmall" halign="center" height="20" label="Clear Disk Cache"
-  <spinner bottom_delta="-20" decimal_digits="0"
+                 left="50" mouse_opaque="true" name="clear_disk_cache" scale_image="true"
-             enabled="true" follows="left|top" height="16" increment="1"
+                 width="160" />
-             initial_val="80" label="Port number:" label_width="75" left="35"
+      
-             max_val="65535" min_val="10" mouse_opaque="true" name="socks5_proxy_port"
+      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             width="140" />
+                 bottom_delta="-25" drop_shadow_visible="true" enabled="true"
-  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                 follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
-             bottom_delta="-20" drop_shadow_visible="true" enabled="true"
+                 height="10" left="50" mouse_opaque="false" name="cache_location_label"
-             follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
+                 v_pad="0" width="200">
-             height="10" left="35" mouse_opaque="false" name="socks5_auth_label"
+        Location:
-             v_pad="0" width="128">
+      </text>
-    SOCKS 5 authentication:
+      <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-25"
-  </text>
+                 enabled="false" follows="left|top" font="SansSerif"
-  <radio_group bottom_delta="-6" draw_border="false" follows="left|top" height="20" left="35"
+                 handle_edit_keys_directly="true" height="20" left_delta="0"
-             name="socks5_auth" width="420">
+                 max_length="4096" mouse_opaque="true" name="disk_cache_location"
-    <radio_item bottom="0" height="20" left_delta="80" name="None" width="50"
+                 select_all_on_focus_received="false" width="395" word_wrap="false" />
-        tool_tip="No authentication">
+      <button bottom_delta="-25" enabled="true" follows="left|top" font="SansSerifSmall"
-      None
+                 halign="center" height="20" label="Change Location" left_delta="0"
-    </radio_item>
+                 mouse_opaque="true" name="set_disk_cache" scale_image="true" width="160" />
-    <radio_item bottom="0" height="20" left_delta="50" name="UserPass" width="50"
+      <button bottom_delta="0" enabled="true" follows="left|top"
-        tool_tip="Username / Password authentication">
+                 font="SansSerifSmall" halign="center" height="20" label="Reset to Default"
-      Username / Password
+                 left_delta="165" mouse_opaque="true"
-    </radio_item>
+                 name="reset_disk_cache" scale_image="true" width="160" />
-  </radio_group>
-  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom_delta="-16" drop_shadow_visible="true" enabled="true"
+    </panel>
-             follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
-             height="10" left="122" mouse_opaque="false" name="socks5_username_label"
-             v_pad="0" width="128">
+    <!-- PROXY SETTINGS PANEL -->
-    Username:
-  </text>
-  <line_editor bottom_delta="-8" enabled="true" follows="left|top" font="SansSerif"
+    <panel border="true" bottom="-580" follows="left|top|right|bottom" height="525" label="Proxy Settings"
-             height="20" left="200" name="socks5_proxy_username"
+           left="1" mouse_opaque="true" name="proxies" width="418">
-             tool_tip="Username for the Socks5 proxy"
-             width="200" />
+      <!-- XMLRPC PROXY -->
-  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+      
-             bottom_delta="-14" drop_shadow_visible="true" enabled="true"
+      
-             follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
+      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             height="10" left="122" mouse_opaque="false" name="socks5_password_label"
+           bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top" font-style="BOLD|SHADOW"
-             v_pad="0" width="128">
+           font="SansSerifSmall" h_pad="0" halign="left" height="10" left="20"
-    Password:
+           mouse_opaque="false" name="text_box" v_pad="0" width="200">
-  </text>
+        XMLRPC:
-  <line_editor bottom_delta="-8" enabled="true" follows="left|top" font="SansSerif"
+      </text>
-             height="20" left="200" name="socks5_proxy_password"
+      
-             tool_tip="Password for the Socks5 proxy"
+      <check_box bottom_delta="-25" enabled="true"
-             width="200" />
+                 follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+                 label="Enable XMLRPC proxy (Login, Land, and Money purchases)" left="50" mouse_opaque="true"
-  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                 name="xmlrpc_proxy_enabled" radio_style="false" width="300" />
-     bottom_delta="-20" drop_shadow_visible="true" enabled="true"
-     follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
+      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-     height="10" left="35" mouse_opaque="false" name="http_proxy_label"
+                 bottom_delta="-18" drop_shadow_visible="true" enabled="true"
-     v_pad="0" width="128">
+                 follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
-    HTTP proxy:
+                 height="10" left_delta="30" mouse_opaque="false" name="xmlrpc_proxy_text_label"
-  </text>
+                 v_pad="0" width="128">
-  <radio_group bottom_delta="-8" draw_border="false" follows="left|top" height="20" left="35"
+        Address:
-             name="socks5_http_proxy_type" width="380" >
+      </text>
-    <radio_item height="20" bottom="0" left="100" name="None" width="50"
+      <line_editor bottom_delta="-8" enabled="true" follows="left|top" font="SansSerif"
-        tool_tip="No HTTP proxy">
+                 height="20" left_delta="50" name="xmlrpc_proxy_editor"
-      None
+                 tool_tip="The name or IP address of the proxy you would like to use"
-    </radio_item>
+                 width="200" />
-    <radio_item height="20" bottom="0" left="170" name="Socks" width="50"
+      <spinner bottom_delta="-20" decimal_digits="0"
-        tool_tip="Use Socks for HTTP proxy">
+                 enabled="true" follows="left|top" height="16" increment="1"
-      SOCKS 5
+                 initial_val="80" label="Port number:" label_width="75" left_delta="-50"
-    </radio_item>
+                 max_val="65535" min_val="10" mouse_opaque="true" name="xmlrpc_proxy_port"
-    <radio_item height="20" bottom="0" left="250" name="Web" width="50"
+                 width="140" />
-        tool_tip="Use web proxy for HTTP proxy">
+      
-      Web
+      
-    </radio_item>
+      <view_border bevel_style="none" border_thickness="1" bottom_delta="-15" follows="left|top"
-  </radio_group>
+           height="1" left="55" name="border" width="380" />
+      
+      
+      <!-- SOCKS 5 PROXY -->
+      
+      
+      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+           bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top" font-style="BOLD|SHADOW"
+           font="SansSerifSmall" h_pad="0" halign="left" height="10" left="20"
+           mouse_opaque="false" name="text_box" v_pad="0" width="200">
+        SOCKS 5:
+      </text>
+      
+      <check_box bottom_delta="-25" enabled="true"
+                 follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+                 label="Enable SOCKS 5 proxy" left="50" mouse_opaque="true"
+                 name="socks5_proxy_enabled" radio_style="false" width="256" />
+      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                 bottom_delta="-18" drop_shadow_visible="true" enabled="true"
+                 follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
+                 height="10" left_delta="30" mouse_opaque="false" name="socks5_host_label"
+                 v_pad="0" width="128">
+        SOCKS 5 host:
+      </text>
+      <line_editor bottom_delta="-6" enabled="true" follows="left|top" font="SansSerif"
+                 height="20" left_delta="80" name="socks5_proxy_host"
+                 tool_tip="The name or IP address of the SOCKS5 proxy you would like to use"
+                 width="200" />
+      <spinner bottom_delta="-20" decimal_digits="0"
+                 enabled="true" follows="left|top" height="16" increment="1"
+                 initial_val="80" label="Port number:" label_width="78" left_delta="-80"
+                 max_val="65535" min_val="10" mouse_opaque="true" name="socks5_proxy_port"
+                 width="140" />
+      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                 bottom_delta="-20" drop_shadow_visible="true" enabled="true"
+                 follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
+                 height="10" left_delta="0" mouse_opaque="false" name="socks5_auth_label"
+                 v_pad="0" width="128">
+        SOCKS 5 authentication:
+      </text>
+      <radio_group bottom_delta="-6" draw_border="false" follows="left|top" height="20" left_delta="0"
+                 name="socks5_auth" width="420">
+        <radio_item bottom="0" height="20" left_delta="80" name="None" width="50"
+            tool_tip="No authentication">
+          None
+        </radio_item>
+        <radio_item bottom="0" height="20" left_delta="50" name="UserPass" width="50"
+            tool_tip="Username / Password authentication">
+          Username / Password
+        </radio_item>
+      </radio_group>
+      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                 bottom_delta="-16" drop_shadow_visible="true" enabled="true"
+                 follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
+                 height="10" left="122" mouse_opaque="false" name="socks5_username_label"
+                 v_pad="0" width="128">
+        Username:
+      </text>
+      <line_editor bottom_delta="-8" enabled="true" follows="left|top" font="SansSerif"
+                 height="20" left="200" name="socks5_proxy_username"
+                 tool_tip="Username for the Socks5 proxy"
+                 width="200" />
+      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                 bottom_delta="-14" drop_shadow_visible="true" enabled="true"
+                 follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
+                 height="10" left="122" mouse_opaque="false" name="socks5_password_label"
+                 v_pad="0" width="128">
+        Password:
+      </text>
+      <line_editor bottom_delta="-8" enabled="true" follows="left|top" font="SansSerif"
+                 height="20" left="200" name="socks5_proxy_password"
+                 tool_tip="Password for the Socks5 proxy"
+                 width="200" />
+      
+      
+      <view_border bevel_style="none" border_thickness="1" bottom_delta="-15" follows="left|top"
+           height="1" left="55" name="border" width="380" />
+      
+      
+      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+           bottom_delta="-20" drop_shadow_visible="true" enabled="true" font-style="BOLD|SHADOW"
+           follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
+           height="10" left="20" mouse_opaque="false" name="http_proxy_label"
+           v_pad="0" width="128">
+        HTTP Textures Proxy:
+      </text>
+      <radio_group bottom_delta="-25" draw_border="false" follows="left|top" height="20" left="50"
+                 name="socks5_http_proxy_type" width="380" >
+        <radio_item height="20" bottom="0" left="50" name="None" width="50"
+            tool_tip="No HTTP proxy">
+          None
+        </radio_item>
+        <radio_item height="20" bottom="0" left="160" name="Socks" width="50"
+            tool_tip="Use Socks for HTTP proxy">
+          SOCKS 5
+        </radio_item>
+        <radio_item height="20" bottom="0" left="270" name="Web" width="50"
+            tool_tip="Use web proxy for HTTP proxy">
+          Web
+        </radio_item>
+      </radio_group>
+      
+      
+      <view_border bevel_style="none" border_thickness="1" bottom_delta="-15" follows="left|top"
+           height="1" left="55" name="border" width="380" />
+      
+      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+           bottom_delta="-20" drop_shadow_visible="true" enabled="true" font-style="BOLD|SHADOW"
+           follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
+           height="10" left="20" mouse_opaque="false" name="port_label"
+           v_pad="0" width="128">
+        Ougoing Connections:
+      </text>
+      <check_box bottom_delta="-25" control_name="ConnectionPortEnabled"
+           enabled="true" follows="left|top" font="SansSerifSmall" height="16"
+           initial_value="false" label="Enable custom outgoing port" left_delta="30"
+           mouse_opaque="true" name="connection_port_enabled" radio_style="false"
+           tool_tip="Enables custom port for outgoing connections"
+           width="256" />
+      <spinner bottom_delta="-20" control_name="ConnectionPort"
+                 decimal_digits="0" enabled="true" follows="left|top" height="16"
+                 increment="1" initial_val="13000" label="Port number:" label_width="75"
+                 left_delta="30" max_val="13050" min_val="13000" mouse_opaque="true"
+                 name="connection_port" width="140" />
+      
+      
+    </panel>
+    <!-- WEB BROWSER PANEL -->
+    <panel border="true" bottom="-580" follows="left|top|right|bottom" height="525" label="Web Browser"
+           left="1" mouse_opaque="true" name="web_browser" width="418">
+      
+      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+           bottom="-20" drop_shadow_visible="true" enabled="true" font-style="BOLD|SHADOW"
+           follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
+           height="10" left="20" mouse_opaque="false" name="open_links_label"
+           v_pad="0" width="128">
+        Open Links In:
+      </text>
+      
+      <radio_group bottom_delta="-45" draw_border="false" follows="top|left" height="40" left="50"
+         name="use_external_browser" width="480">
+        <radio_item bottom="-20" height="20" left="0" name="external" width="480"
+          tool_tip="Use the default system web browser for help, web links, etc. Not recommended if running full screen.">
+          My external browser (Firefox, Safari, Internet Explorer, etc.)
+        </radio_item>
+        <radio_item bottom="-40" height="20" left="0" name="internal" width="480"
+          tool_tip="Use the internal browser for help, web links, etc. This browser opens as a new window inside Second Life.">
+          Imprudence's internal browser
+        </radio_item>
+      </radio_group>
+      <view_border bevel_style="none" border_thickness="1" bottom_delta="-15" follows="left|top"
+           height="1" left="55" name="border" width="380" />
+      
+      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+          bottom_delta="-20" drop_shadow_visible="true" enabled="true" font-style="BOLD|SHADOW"
+          follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
+          height="10" left="20" mouse_opaque="false" name="internal_browser_label"
+          v_pad="0" width="128">
+        Internal Browser:
+      </text>
+      
+      <button bottom_delta="-30" enabled="true" follows="left|top" font="SansSerifSmall"
+           halign="center" height="20" label="Clear Internal Browser Cache" left_delta="30"
+           mouse_opaque="true" name="clear_web_cache" scale_image="true" width="320" />
+      
+      <check_box bottom_delta="-35" enabled="true" follows="left|top"
+           font="SansSerifSmall" height="16" initial_value="false"
+           label="Accept cookies while using internal browser" left_delta="0" mouse_opaque="true"
+           tool_top="Allows the internal browser to accept cookies from websites"
+           name="cookies_enabled" radio_style="false" width="256" />
+      <button bottom_delta="-25" enabled="true" follows="left|top" font="SansSerifSmall"
+           halign="center" height="20" label="Clear Cookies" left_delta="30"
+           tool_tip="Clear Cookies"
+           mouse_opaque="true" name="clear_ookies" scale_image="true" width="160" />
+      
+      <check_box bottom_delta="-35" enabled="true"
+           follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+           label="Enable proxy for internal browser" left="50" mouse_opaque="true"
+           name="web_proxy_enabled" radio_style="false" width="256" />
+      
+      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+           bottom_delta="-18" drop_shadow_visible="true" enabled="true"
+           follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
+           height="10" left_delta="30" mouse_opaque="false" name="proxy_text_label"
+           v_pad="0" width="128">
+        Address:
+      </text>
+      <line_editor bottom_delta="-8" enabled="true" follows="left|top" font="SansSerif"
+           height="20" left_delta="50" name="web_proxy_editor"
+           tool_tip="The name or IP address of the proxy you would like to use"
+           width="200" />
+      <spinner bottom_delta="-20" decimal_digits="0"
+           enabled="true" follows="left|top" height="16" increment="1"
+           initial_val="80" label="Port number:" label_width="75" left_delta="-50"
+           max_val="12000" min_val="10" mouse_opaque="true" name="web_proxy_port"
+           width="140" />
+      <view_border bevel_style="none" border_thickness="1" bottom_delta="-15" follows="left|top"
+           height="1" left="55" name="border" width="380" />
+      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+          bottom_delta="-20" drop_shadow_visible="true" enabled="true" font-style="BOLD|SHADOW"
+          follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
+          height="10" left="20" mouse_opaque="false" name="search_url_label"
+          v_pad="0" width="200">
+        Custom All (Web) Search URL:
+      </text>      
+      
+      <line_editor bottom_delta="-25" enabled="true" follows="left|top"
+           font="SansSerifSmall" height="18" left_delta="30" name="world_search_editor"
+           tool_tip="Address of the world search engine you would like to use"
+           width="395" />
+      <button  bottom_delta="-22" enabled="true" follows="left|top" font="SansSerifSmall"
+           halign="center" height="20" label="Clear" left_delta="0"
+           tool_tip="clear field"
+           mouse_opaque="true" name="world_search_clear" scale_image="true" width="160" />
+      <button bottom_delta="0" enabled="true" follows="left|top" font="SansSerifSmall"
+           halign="center" height="20" label="Reset to Default" left_delta="165"
+           mouse_opaque="true" name="world_search_reset_default" scale_image="true" width="160" />
+    </panel>
+  </tab_container>
 </panel>
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 2168137..aa3857c 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
@@ -1,47 +1,117 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel border="true" bottom="0" height="500" label="Popups" left="0" name="popups"
-     title="Popups" width="400">
+<!-- 
-        <text bottom="-20" follows="top|left" left="15" width="300" name="dont_show_label">
+ALL PREFS OPTIONS START AT 20px FROM LEFT, 10px FROM TOP
-                Hide These Popups:
-        </text>
+USE bottom_delta BETWEEN OPTIONS IN A GROUP
-        <scroll_list follows="top|left" height="88" left="15" name="disabled_popups" width="480" />
-        <button follows="top|left" height="20" label="Enable This Popup" left="15"
+USE LINES BETWEEN GROUPS
-             name="enable_popup" width="175" />
-        <button follows="top|left" height="20" label="Enable All Popups" left="200"
+USE font-style="BOLD|SHADOW" FOR GROUP LABELS
-             name="reset_dialogs_btn"
+GROUP LABEL CONTENTS ARE INDENTED 30px
+USE left="270" FOR TABBING OPTIONS
+-->
+<panel border="true" bottom="-409" height="408" label="Notifications" left="0" name="popups"
+     title="Notifications" width="400">
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+       bottom="-22" drop_shadow_visible="true" enabled="true" follows="left|top"
+       font="SansSerifSmall" h_pad="0" halign="left" height="12" left="20"
+       mouse_opaque="true" name="hidetext" v_pad="0" width="200" font-style="BOLD|SHADOW">
+    Hide These Notifications:
+  </text>
+  
+        <scroll_list follows="top|left" height="88" left="50" name="disabled_popups" width="420"/>
+  
+        <button follows="top|left" height="20" label="Enable This" left="50" bottom_delta="-22" 
+             name="enable_popup" width="160" font="SansSerifSmall" />
+        <button follows="top|left" height="20" label="Enable All" left="270"
+             name="reset_dialogs_btn" font="SansSerifSmall" 
             tool_tip="Enable all of the optional popups and &apos;first time use&apos; notifications."
-             width="175" bottom_delta="0" />
+             width="160" bottom_delta="0" />
-        <text follows="top|left" left="15" width="128" name="show_label" bottom_delta="-24">
-                Show These Popups:
-        </text>
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-        <scroll_list follows="top|left" height="88" left="15" name="enabled_popups" width="480" />
+       bottom_delta="-25" drop_shadow_visible="true" enabled="true" follows="left|top"
-        <button bottom_delta="-24" follows="top|left" height="20"
+       font="SansSerifSmall" h_pad="0" halign="left" height="12" left="20"
-             label="Disable All Popups" left="200"
+       mouse_opaque="true" name="showtext" v_pad="0" width="200" font-style="BOLD|SHADOW">
-             name="skip_dialogs_btn"
+    Show These Notifications:
+  </text>
+  
+        <scroll_list follows="top|left" height="88" left="50" name="enabled_popups" width="420" />
+  
+        <button bottom_delta="-22" follows="top|left" height="20"
+             label="Disable All" left="270"
+             name="skip_dialogs_btn" font="SansSerifSmall" 
             tool_tip="Disable all of the optional popups and &apos;first time use&apos; notifications."
-             width="175" />
+             width="160" />
+    
+    <view_border bevel_style="none" border_thickness="1" bottom_delta="-15" follows="left|top"
+         height="1" left="55" name="border" width="380" />
+    
+    
        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom_delta="-24" drop_shadow_visible="true" enabled="true"
+             bottom_delta="-20" drop_shadow_visible="true" enabled="true" font-style="BOLD|SHADOW"
             follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
-             height="10" left="15" mouse_opaque="false" name="text_box2" v_pad="0"
+             height="10" left="20" mouse_opaque="false" name="text_box2" v_pad="0"
             width="270">
-                Offers of Notecards, Textures and Landmarks:
+                Inventory Offers:
        </text>
        <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"
+             label="Automatically accept" left="50" mouse_opaque="true"
             name="accept_new_inventory" radio_style="false" width="270" />
        <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"
+             label="Automatically view Notecards, Textures and Landmarks after accepting" left_delta="0" mouse_opaque="true"
             name="show_new_inventory" radio_style="false" width="270" />
-        <check_box bottom_delta="-20" enabled="true"
+ <check_box bottom_delta="-20" enabled="true"
             follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
-             label="Automatically show newly accepted objects in inventory" left="40" mouse_opaque="true"
+             label="Automatically show newly accepted objects in inventory" left_delta="0" mouse_opaque="true"
             name="show_in_inventory" radio_style="false" width="270" />
-  <check_box bottom_delta="-30" enabled="true"
+  <view_border bevel_style="none" border_thickness="1" bottom_delta="-15" follows="left|top"
+     height="1" left="55" name="border" width="380" />
+  
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+     bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
+     font="SansSerifSmall" h_pad="0" halign="left" height="12" left="20" font-style="BOLD|SHADOW"
+     mouse_opaque="true" name="radar_text" v_pad="0" width="128">
+    Chat Notifications:
+  </text>
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+       bottom_delta="-16" drop_shadow_visible="true" enabled="true" follows="left|top"
+       font="SansSerifSmall" h_pad="0" halign="left" height="10" left="50"
+       mouse_opaque="true" name="radar_text" v_pad="0" width="128">
+    When an avatar enters:
+  </text>
+  <check_box bottom_delta="-6" enabled="true"
+             follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+             label="Chat range" left="270"
+             mouse_opaque="true" name="mini_map_notify_chat" radio_style="false"
+             width="256" />
+  <check_box bottom_delta="0" enabled="true"
+       follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+       label="Current sim" left="390"
+       mouse_opaque="true" name="mini_map_notify_sim" radio_style="false"
+       width="256" />
+  <check_box bottom_delta="-20" enabled="true"
+       follows="left|top" font="SansSerifSmall" height="16"
+       initial_value="false" label="When Friends come online" left="50"
+       mouse_opaque="true" name="friends_online_notify_checkbox"
+       radio_style="false" width="256" />
+  <check_box bottom_delta="0" enabled="true"
       follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-       label="Notify when [CURRENCY] spent or received" left="15"
+       label="When [CURRENCY] spent or received" left="270"
       mouse_opaque="true" name="notify_money_change_checkbox" radio_style="false"
       width="256" />
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_skins.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_skins.xml
index 58a2989..eb1dc79 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_skins.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_skins.xml
@@ -1,14 +1,39 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<!-- 
+ALL PREFS OPTIONS START AT 20px FROM LEFT, 10px FROM TOP
+USE bottom_delta BETWEEN OPTIONS IN A GROUP
+USE LINES BETWEEN GROUPS
+USE font-style="BOLD|SHADOW" FOR GROUP LABELS
+GROUP LABEL CONTENTS ARE INDENTED 30px
+USE left="270" FOR TABBING OPTIONS
+-->
 <panel border="true" bottom="-409" enabled="true" follows="left|top|right|bottom"
     height="408" label="Skins" left="102" mouse_opaque="true"
     name="Skins panel" width="517">
+  
+  
  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-22" drop_shadow_visible="true" enabled="true" follows="left|top"
+             bottom="-22" drop_shadow_visible="true" enabled="true" follows="left|top" font-style="BOLD|SHADOW"
-             font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10"
+             font="SansSerifSmall" h_pad="0" halign="left" height="12" left="20"
             mouse_opaque="true" name="muting_text" v_pad="0" width="500">
-    Select a skin (requires restart). (Please see the skin folders for information and credits)
+    Select Skin:
  </text>
-  <radio_group bottom="0" draw_border="false" follows="top|left" height="380" left="12"
+ 
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+     bottom="-22" drop_shadow_visible="true" enabled="true" follows="left|top"
+     font="SansSerifSmall" h_pad="0" halign="left" height="12" left_delta="80"
+     mouse_opaque="true" name="muting_text" v_pad="0" width="500">
+    (requires restart).  See skin folder for credits
+  </text>
+  
+  <radio_group bottom="0" draw_border="false" follows="top|left" height="380" left="50"
             name="skin_selection" width="480">
    <radio_item bottom="-20" height="20" left="0" name="default" width="480">
      Default
@@ -40,24 +65,24 @@
          scale_image="true" label="" image_selected="skin_thumbnail_gemini.png" 
          image_hover_selected="skin_thumbnail_gemini.png" image_unselected="skin_thumbnail_gemini.png" 
          image_hover_unselected="skin_thumbnail_gemini.png" follows="left|top" />
-  <text name="skin_current_text"
+  <text name="skin_current_text" font-style="BOLD|SHADOW"
-              left="10" bottom="5" halign="left" height="12"
+              left="20" bottom="5" halign="left" height="12"
        follows="left|bottom" h_pad="0" v_pad="0"
        bg_visible="false" drop_shadow_visible="true"
        border_visible="false" border_drop_shadow_visible="false"
-              font="SansSerif" mouse_opaque="true">
+              font="SansSerifSmall" mouse_opaque="true">
-    Other Skin Name:
+    Custom Skin Name:
  </text>
  <line_editor name="skin_current_edit"
-               bottom_delta="0" left_delta="120" height="20" width="120"
+               bottom_delta="-2" left_delta="110" height="18" width="160"
               follows="left|bottom" font="SansSerif"
               bevel_style="in" border_style="line" border_thickness="1"
               max_length="31" mouse_opaque="true"
               handle_edit_keys_directly="true"
               select_all_on_focus_received="true" />
  <button name="save_skin" label="Save"
-          bottom_delta="-2" left_delta="120" height="24" width="90"
+          bottom_delta="-2" left_delta="165" height="20" width="110"
-          follows="left|center" font="SansSerif" halign="center"
+          follows="left|center" font="SansSerifSmall" halign="center"
                mouse_opaque="true" scale_image="TRUE" />
 </panel>
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 b4939ca..d9c3f5e 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
@@ -1,20 +1,39 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel border="true" bottom="-409" enabled="true" follows="left|top|right|bottom"
-     height="408" label="Voice" left="102" mouse_opaque="true" name="chat"
+<!-- 
+ALL PREFS OPTIONS START AT 20px FROM LEFT, 10px FROM TOP
+USE bottom_delta BETWEEN OPTIONS IN A GROUP
+USE LINES BETWEEN GROUPS
+USE font-style="BOLD|SHADOW" FOR GROUP LABELS
+GROUP LABEL CONTENTS ARE INDENTED 30px
+USE left="270" FOR TABBING OPTIONS
+-->
+<panel border="true" bottom="-20" enabled="true" follows="left|top|right|bottom"
+     height="408" label="Voice" left="102" mouse_opaque="true" name="voice_chat"
     width="517">
-        <text_editor type="string" length="1" allow_html="false" bg_readonly_color="0 0 0 0" bottom_delta="-26"
-             embedded_items="false" enabled="false" follows="left|top"
+  
-             font="SansSerifSmall" height="20" hide_border="true" hide_scrollbar="true"
+  <text_editor type="string" length="1" allow_html="false" bg_readonly_color="0 0 0 0" bottom="-30"
-             left_delta="8" max_length="65535" mouse_opaque="true"
+     embedded_items="false" enabled="false" follows="left|top"
-             name="voice_unavailable" tab_stop="false" width="450" word_wrap="true">
+     font="SansSerifSmall" height="20" hide_border="true" hide_scrollbar="true"
-                Voice Chat Is Not Available
+     left="20" max_length="65535" mouse_opaque="true"
-        </text_editor>
+     name="voice_unavailable" tab_stop="false" width="450" word_wrap="true">
-        <check_box bottom_delta="0" enabled="true"
+    Voice Chat Is Not Available
-             follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+  </text_editor>
-             label="Enable voice chat" left="8" mouse_opaque="true"
+  <check_box bottom="-26" enabled="true"
-             name="enable_voice_check" radio_style="false" width="200" />
+     follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+     label="Enable voice chat" left="20" mouse_opaque="true"
+     name="enable_voice_check" radio_style="false" width="200" />
+  
+  
        <radio_group bottom_delta="-40" draw_border="false" follows="left|top" height="40"
-             left_delta="20" name="ear_location" width="364">
+             left_delta="30" name="ear_location" width="364">
                <radio_item type="string" length="1" bottom="-19" follows="left|top" height="16" left="3" name="0" width="315">
                        Hear Voice Chat from camera position.
                </radio_item>
@@ -22,17 +41,19 @@
                        Hear Voice Chat from avatar position.
                </radio_item>
        </radio_group>
-        <text type="string" length="1" allow_html="false" bg_readonly_color="0 0 0 0" bottom_delta="-20"
+  
-             embedded_items="false" enabled="true" follows="left|top"
+  
+        <text type="string" length="1" allow_html="false" bg_readonly_color="0 0 0 0" bottom_delta="-30"
+             embedded_items="false" enabled="true" follows="left|top" font-style="BOLD|SHADOW"
             font="SansSerifSmall" height="16" hide_border="true" hide_scrollbar="true"
-             left_delta="0" max_length="65535" mouse_opaque="true"
+             left="20" max_length="65535" mouse_opaque="true"
             name="push_to_talk_heading" width="445" word_wrap="true">
                Push To Talk:
        </text>
        <text_editor type="string" length="1" allow_html="false" bg_readonly_color="0 0 0 0" bottom_delta="-60"
             embedded_items="false" enabled="false" follows="left|top"
             font="SansSerifSmall" height="65" hide_border="true" hide_scrollbar="true"
-             left_delta="20" max_length="65535" mouse_opaque="true"
+             left_delta="30" max_length="65535" mouse_opaque="true"
             name="voice_chat_description" tab_stop="false" width="465" 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>
@@ -51,34 +72,38 @@
             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" />
+             width="320" />
-        <button bottom_delta="-25" follows="left|top" font="SansSerif" halign="center"
+        <button bottom_delta="-25" follows="left|top" font="SansSerifSmall" halign="center"
             height="20" label="Set Key" left_delta="0" mouse_opaque="true"
-             name="set_voice_hotkey_button" width="115" />
+             name="set_voice_hotkey_button" width="160" />
-        <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center" height="20"
+        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" halign="center" height="20"
-             label="Middle Mouse Button" left_delta="120" mouse_opaque="true"
+             label="Reset to Default" left_delta="165" mouse_opaque="true"
             name="set_voice_middlemouse_button" width="160" />
-        <text allow_html="false" bg_readonly_color="0 0 0 0" bottom_delta="-25"
+  
-             embedded_items="false" enabled="true" follows="left|top" height="16"
+  
-             left="28" name="privacy_heading" width="445">
+        <text allow_html="false" bg_readonly_color="0 0 0 0" bottom_delta="-30" font="SansSerifSmall"
+             embedded_items="false" enabled="true" follows="left|top" height="16" font-style="BOLD|SHADOW"
+             left="30" name="privacy_heading" width="445">
                Privacy:
        </text>
        <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"
+             label="Only accept calls from my friends"
-             left_delta="20" mouse_opaque="true" name="voice_call_friends_only_check"
+             left_delta="30" mouse_opaque="true" name="voice_call_friends_only_check"
             radio_style="false" width="200" />
        <check_box bottom_delta="-18" enabled="true"
             follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-             label="Switch off microphone when ending IM calls"
+             label="Switch off microphone when ending calls"
                 mouse_opaque="true" name="auto_disengage_mic_check"
             radio_style="false" width="200" />
-        <button bottom_delta="-40" follows="left|top" font="SansSerif" height="20"
+  
-             label="Device Settings" left="28" mouse_opaque="true"
+  
-             name="device_settings_btn" width="155" />
+        <button bottom_delta="-40" follows="left|top" font="SansSerifSmall" height="20"
-        <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center" height="20"
+             label="Device Settings" left="30" mouse_opaque="true"
-                label="Reconnect to Voice" left_delta="160" mouse_opaque="true"
+             name="device_settings_btn" width="160" />
-                name="reset_voice" width="160" />
+        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" halign="center" height="20"
+        label="Reconnect to Voice" left_delta="160" mouse_opaque="true"
+        name="reset_voice" width="160" />
        <text_editor type="string" length="1" allow_html="false" bg_readonly_color="0 0 0 0" bottom_delta="-32"
             embedded_items="false" enabled="false" follows="left|top"
             font="SansSerifSmall" height="35" hide_border="true" hide_scrollbar="true"
@@ -86,4 +111,6 @@
             name="device_settings_text" tab_stop="false" width="450" word_wrap="true">
                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
deleted file mode 100644
index 7de8ef7..0000000
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_web.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel border="true" bottom="-409" enabled="true" follows="left|top|right|bottom"
-     height="408" label="Web Browser" left="102" mouse_opaque="true" name="web"
-     width="517">
-        <radio_group bottom="-45" draw_border="false" follows="top|left" height="40" left="12"
-             name="use_external_browser" width="480">
-                <radio_item bottom="-20" height="20" left="0" name="external" width="480" 
-                  tool_tip="Use the default system web browser for help, web links, etc. Not recommended if running full screen.">
-                        Use external web browser (Firefox, Safari, Internet Explorer)
-                </radio_item>
-                <radio_item bottom="-40" height="20" left="0" name="internal" width="480" 
-                  tool_tip="Use the built-in web browser for help, web links, etc. This browser opens as a new window inside Second Life.">
-                        Use built-in web browser
-                </radio_item>
-        </radio_group>
-        <button bottom_delta="-30" enabled="true" follows="left|top" font="SansSerif"
-             halign="center" height="22" label="Clear Built-In Browser Cache" left="35"
-             mouse_opaque="true" name="clear_cache" scale_image="true" width="250" />
-        <check_box bottom_delta="-35" enabled="true" follows="left|top" 
-                   font="SansSerifSmall" height="16" initial_value="false"
-             label="Accept cookies while using built-in web browser" left="15" mouse_opaque="true"
-       tool_top="Allows the built-in web browser to accept cookies from websites" 
-             name="cookies_enabled" radio_style="false" width="256" />
-        <button  bottom_delta="-25" enabled="true" follows="left|top" font="SansSerif"
-             halign="center" height="20" label="Clear Cookies" left_delta="20" 
-             tool_tip="Clear Cookies"
-             mouse_opaque="true" name="clear_ookies" scale_image="true" width="110" />
-        <check_box bottom_delta="-35" enabled="true"
-             follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-             label="Enable proxy for built-in web browser" left="15" mouse_opaque="true"
-             name="web_proxy_enabled" radio_style="false" width="256" />
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom_delta="-18" drop_shadow_visible="true" enabled="true"
-             follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
-             height="10" left_delta="20" mouse_opaque="false" name="proxy_text_label"
-             v_pad="0" width="128">
-                Address:
-        </text>
-        <line_editor bottom_delta="-8" enabled="true" follows="left|top" font="SansSerif"
-             height="20" left="112" name="web_proxy_editor"
-             tool_tip="The name or IP address of the proxy you would like to use"
-             width="200" />
-        <spinner bottom_delta="-20" decimal_digits="0"
-             enabled="true" follows="left|top" height="16" increment="1"
-             initial_val="80" label="Port number:" label_width="75" left="35"
-             max_val="12000" min_val="10" mouse_opaque="true" name="web_proxy_port"
-             width="140" />
-        <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="10" left="15" mouse_opaque="false" name="cache_size_label_l"
-             v_pad="0" width="200">
-    Custom All (web) search tab URL:
-  </text>
-        <line_editor bottom_delta="-25" enabled="true" follows="left|top"
-             font="SansSerifSmall" height="18" left="15" name="world_search_editor"
-             tool_tip="Address of the world search engine you would like to use"
-             width="400" />
-        <button bottom_delta="-22" enabled="true" follows="left|top" font="SansSerif"
-             halign="center" height="20" label="Reset" left="15" 
-             tool_tip="Reset to default"
-             mouse_opaque="true" name="world_search_reset_default" scale_image="true" width="80" />
-        <button  bottom_delta="0" enabled="true" follows="left|top" font="SansSerif"
-             halign="center" height="20" label="Clear" left_delta="85" 
-             tool_tip="clear field"
-             mouse_opaque="true" name="world_search_clear" scale_image="true" width="80" />
-</panel>