Merge branch 'next' of git://github.com/jacek/imprudence into next

Conflicts (manually merged):
	linden/indra/llcommon/llversionviewer.h
	linden/indra/llvfs/lldir.cpp
	linden/indra/llvfs/lldir_mac.cpp
	linden/indra/newview/CMakeLists.txt
	linden/indra/newview/English.lproj/InfoPlist.strings
	linden/indra/newview/Info-Imprudence.plist
	linden/indra/newview/Info-meta-impy.plist
	linden/indra/newview/llappviewer.cpp
	linden/indra/newview/llpanellogin.cpp
	linden/indra/newview/packaging/mac/Info.plist.in
	linden/indra/newview/res/viewerRes.rc
	linden/indra/newview/skins/default/xui/en-us/floater_about.xml
	linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
	linden/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml
	linden/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml
	linden/indra/newview/skins/default/xui/en-us/panel_preferences_skins.xml
	linden/indra/newview/skins/default/xui/en-us/panel_preferences_web.xml
	linden/indra/newview/skins/default/xui/zh/menu_viewer.xml
	linden/indra/newview/skins/default/xui/zh/panel_group_general.xml
	linden/indra/newview/viewer_manifest.py
	linden/indra/newview/viewerversion.cpp
	linden/indra/newview/viewerversion.h
	linden/install.xml

Also some post merge tweaks.

280 files changed, 10804 insertions, 4102 deletions

diff --git a/linden/indra/cmake/00-Common.cmake b/linden/indra/cmake/00-Common.cmake
index 583e15e..9ff5906 100644
--- a/linden/indra/cmake/00-Common.cmake
+++ b/linden/indra/cmake/00-Common.cmake
@@ -14,10 +14,13 @@ set(CMAKE_CXX_FLAGS_RELWITHDEBINFO
     "-DLL_RELEASE=1 -D_SECURE_SCL=0 -DLL_SEND_CRASH_REPORTS=0 -DNDEBUG -DLL_RELEASE_WITH_DEBUG_INFO=1")
 
 
-# Don't bother with a MinSizeRel build.
+# Available build types / configurations.
+# Add our current build type first, to coax Xcode into selecting it by default.
 
-set(CMAKE_CONFIGURATION_TYPES "RelWithDebInfo;Release;Debug" CACHE STRING
-    "Supported build types." FORCE)
+set(TYPES ${CMAKE_BUILD_TYPE} RelWithDebInfo Release Debug)
+list(REMOVE_DUPLICATES TYPES)
+set(CMAKE_CONFIGURATION_TYPES ${TYPES} CACHE STRING "Supported build types." FORCE)
+unset(TYPES)
 
 
 # Determine the number of bits of this processor
diff --git a/linden/indra/cmake/AddPackageTarget.cmake b/linden/indra/cmake/AddPackageTarget.cmake
new file mode 100644
index 0000000..66adf3e
--- /dev/null
+++ b/linden/indra/cmake/AddPackageTarget.cmake
@@ -0,0 +1,32 @@
+# This function adds a custom target named 'package', which runs
+# scripts/package.py to create an installer package.
+# 
+# By default, you must manually build the 'package' target when you
+# are ready to create the installer package. But if the global
+# AUTOPACKAGE variable is ON ("cmake -D AUTOPACKAGE:BOOL=ON"), the
+# 'package' target will be added to the default build target.
+
+
+set(AUTOPACKAGE OFF CACHE BOOL
+    "Automatically build an installer package after compiling.")
+
+
+function( add_package_target )
+
+  if (AUTOPACKAGE)
+    add_custom_target(package ALL)
+  else (AUTOPACKAGE)
+    add_custom_target(package)
+  endif (AUTOPACKAGE)
+
+  add_custom_command(
+    TARGET package POST_BUILD
+    COMMAND
+      ${PYTHON_EXECUTABLE}
+      ${SCRIPTS_DIR}/package.py
+      --build-dir=${CMAKE_BINARY_DIR}
+      --build-type=${CMAKE_BUILD_TYPE}
+      --source-dir=${CMAKE_SOURCE_DIR}
+  )
+
+endfunction( add_package_target )
diff --git a/linden/indra/cmake/Audio.cmake b/linden/indra/cmake/Audio.cmake
index d23bc2f..10d11bb 100644
--- a/linden/indra/cmake/Audio.cmake
+++ b/linden/indra/cmake/Audio.cmake
@@ -32,6 +32,12 @@ else (STANDALONE)
     set(VORBISENC_LIBRARIES vorbisenc)
     set(VORBISFILE_LIBRARIES vorbisfile)
   endif (WINDOWS)
+  if(LINUX AND ${ARCH} STREQUAL "x86_64")
+    set(VORBIS_LIBRARY_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib)
+    set(VORBISENC_LIBRARY_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib)
+    set(VORBISFILE_LIBRARY_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib)
+    set(OGG_LIBRARY_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib)
+  endif(LINUX AND ${ARCH} STREQUAL "x86_64")
 endif (STANDALONE)
 
 link_directories(
@@ -40,3 +46,13 @@ link_directories(
     ${VORBISFILE_LIBRARY_DIRS}
     ${OGG_LIBRARY_DIRS}
     )
+
+if(NOT vorbis_link_msg)
+  set(vorbis_link_msg ON CACHE BOOL "ogg vorbis linked from:\n")
+  message("ogg vorbis linked from:\n"
+    ${VORBIS_LIBRARY_DIRS} "\n"
+    ${VORBISENC_LIBRARY_DIRS} "\n"
+    ${VORBISFILE_LIBRARY_DIRS} "\n"
+    ${OGG_LIBRARY_DIRS} "\n"
+  )
+endif(NOT vorbis_link_msg)
diff --git a/linden/indra/cmake/BuildVersion.cmake b/linden/indra/cmake/BuildVersion.cmake
index 59b36ff..f86e9e5 100644
--- a/linden/indra/cmake/BuildVersion.cmake
+++ b/linden/indra/cmake/BuildVersion.cmake
@@ -2,17 +2,32 @@
 
 include(Python)
 
+if (NOT SCRIPTS_DIR)
+  set( SCRIPTS_DIR "${CMAKE_SOURCE_DIR}/../scripts" )
+endif (NOT SCRIPTS_DIR)
+
 macro (build_version _target)
   execute_process(
-      COMMAND ${PYTHON_EXECUTABLE} ${SCRIPTS_DIR}/build_version.py
-        viewerversion.xml ${CMAKE_CURRENT_SOURCE_DIR}/app_settings/
+      COMMAND ${PYTHON_EXECUTABLE} ${SCRIPTS_DIR}/viewer_info.py --version
       OUTPUT_VARIABLE ${_target}_VERSION
       OUTPUT_STRIP_TRAILING_WHITESPACE
       )
 
-  if (${_target}_VERSION)
-    message(STATUS "Version of ${_target} is ${${_target}_VERSION}")
+  execute_process(
+      COMMAND ${PYTHON_EXECUTABLE} ${SCRIPTS_DIR}/viewer_info.py --name
+      OUTPUT_VARIABLE ${_target}_NAME
+      OUTPUT_STRIP_TRAILING_WHITESPACE
+      )
+
+  execute_process(
+      COMMAND ${PYTHON_EXECUTABLE} ${SCRIPTS_DIR}/viewer_info.py --bundle-id
+      OUTPUT_VARIABLE ${_target}_BUNDLE_ID
+      OUTPUT_STRIP_TRAILING_WHITESPACE
+      )
+
+  if ("${_target}_VERSION" AND "${_target}_NAME")
+    message(STATUS "Version of ${_target} is ${${_target}_NAME} ${${_target}_VERSION}")
   else (${_target}_VERSION)
     message(SEND_ERROR "Could not determine ${_target} version")
-  endif (${_target}_VERSION)
+  endif ("${_target}_VERSION" AND "${_target}_NAME")
 endmacro (build_version)
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/cmake/LLWindow.cmake b/linden/indra/cmake/LLWindow.cmake
index 1023693..345359a 100644
--- a/linden/indra/cmake/LLWindow.cmake
+++ b/linden/indra/cmake/LLWindow.cmake
@@ -45,4 +45,7 @@ else (SERVER AND LINUX)
           comdlg32
           )
   endif (WINDOWS)
+  if (LINUX)
+    list(APPEND LLWINDOW_LIBRARIES fontconfig)
+  endif (LINUX)
 endif (SERVER AND LINUX)
diff --git a/linden/indra/develop.py b/linden/indra/develop.py
index a705719..9f7c4f2 100755
--- a/linden/indra/develop.py
+++ b/linden/indra/develop.py
@@ -121,7 +121,7 @@ class PlatformSetup(object):
             opts=quote(opts),
             standalone=self.standalone,
             unattended=self.unattended,
-            type=self.build_type.upper(),
+            type=self.build_type,
             )
         #if simple:
         #    return 'cmake %(opts)s %(dir)r' % args
@@ -287,7 +287,7 @@ class LinuxSetup(UnixSetup):
             opts=quote(opts),
             standalone=self.standalone,
             unattended=self.unattended,
-            type=self.build_type.upper(),
+            type=self.build_type,
             project_name=self.project_name
             )
         if not self.is_internal_tree():
@@ -427,7 +427,7 @@ class DarwinSetup(UnixSetup):
             unattended=self.unattended,
             project_name=self.project_name,
             universal=self.universal,
-            type=self.build_type.upper()
+            type=self.build_type
             )
         if self.universal == 'ON':
             args['universal'] = '-DCMAKE_OSX_ARCHITECTURES:STRING=\'i386\''
diff --git a/linden/indra/llcommon/CMakeLists.txt b/linden/indra/llcommon/CMakeLists.txt
index ed04ca6..b6015a8 100644
--- a/linden/indra/llcommon/CMakeLists.txt
+++ b/linden/indra/llcommon/CMakeLists.txt
@@ -200,7 +200,7 @@ set_source_files_properties(${llcommon_HEADER_FILES}
 list(APPEND llcommon_SOURCE_FILES ${llcommon_HEADER_FILES})
 
 add_library (llcommon SHARED ${llcommon_SOURCE_FILES})
-target_link_libraries(
+set (llcommon_link_LIBRARIES
     llcommon
     ${APRUTIL_LIBRARIES}
     ${APR_LIBRARIES}
@@ -218,3 +218,11 @@ if (DARWIN)
     INSTALL_NAME_DIR "@executable_path/../Resources"
     )
 endif (DARWIN)
+
+if (LINUX)
+  list(APPEND llcommon_link_LIBRARIES rt)
+endif (LINUX)
+
+target_link_libraries(
+    ${llcommon_link_LIBRARIES}
+    )
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/llcommon/llversionviewer.h b/linden/indra/llcommon/llversionviewer.h
index a571b95..e7d5134 100644
--- a/linden/indra/llcommon/llversionviewer.h
+++ b/linden/indra/llcommon/llversionviewer.h
@@ -33,8 +33,6 @@
 #ifndef LL_LLVERSIONVIEWER_H
 #define LL_LLVERSIONVIEWER_H
 
-// Version info should be accessed using newview\viewerversion.h -- MC
-
 const S32 LL_VERSION_MAJOR = 1;
 const S32 LL_VERSION_MINOR = 23;
 const S32 LL_VERSION_PATCH = 5;
@@ -42,17 +40,13 @@ const S32 LL_VERSION_BUILD = 136262;
 
 const char * const LL_VIEWER_NAME = "meta-impy";
 
-// These aren't used anymore. 
-// The channel is ViewerChannelName in settings.xml
-// The meta-impy version is set in app_settings\viewerversion.xml -- MC
-
-/*const char * const LL_CHANNEL = "meta-impy";
-
-const char * const IMP_VIEWER_NAME = "meta-impy";
-
-const S32 IMP_VERSION_MAJOR = 1;
-const S32 IMP_VERSION_MINOR = 3;
-const S32 IMP_VERSION_PATCH = 0;
-const char * const IMP_VERSION_TEST = "beta 4";*/
+// These aren't used anymore. See newview/viewerinfo.cpp instead.
+//
+// const char * const LL_CHANNEL = "meta-impy";
+// const char * const IMP_VIEWER_NAME = "meta-impy";
+// const S32 IMP_VERSION_MAJOR = 0;
+// const S32 IMP_VERSION_MINOR = 0;
+// const S32 IMP_VERSION_PATCH = 0;
+// const char * const IMP_VERSION_TEST = "";
 
 #endif
diff --git a/linden/indra/llmessage/CMakeLists.txt b/linden/indra/llmessage/CMakeLists.txt
index b3f2b4c..61b6418 100644
--- a/linden/indra/llmessage/CMakeLists.txt
+++ b/linden/indra/llmessage/CMakeLists.txt
@@ -208,13 +208,21 @@ set_source_files_properties(${llmessage_HEADER_FILES}
 list(APPEND llmessage_SOURCE_FILES ${llmessage_HEADER_FILES})
 
 add_library (llmessage ${llmessage_SOURCE_FILES})
-target_link_libraries(
+set (llmessage_link_LIBRARIES
     llmessage
     ${CURL_LIBRARIES}
     ${CARES_LIBRARIES}
     ${OPENSSL_LIBRARIES}
     ${CRYPTO_LIBRARIES}
     ${XMLRPCEPI_LIBRARIES}
+)
+if (LINUX)
+  list(APPEND llmessage_link_LIBRARIES pthread)
+endif (LINUX)
+
+target_link_libraries(
+    ${llmessage_link_LIBRARIES}
+
     )
 
 IF (NOT LINUX AND VIEWER)
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);
-        
-        S32 parse_result = LLSDSerialize::fromXML(mMessage, input);
-        
+        std::istringstream input(message);
+
+
+//      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/llrender/llglslshader.cpp b/linden/indra/llrender/llglslshader.cpp
index 08d6548..429cf6f 100644
--- a/linden/indra/llrender/llglslshader.cpp
+++ b/linden/indra/llrender/llglslshader.cpp
@@ -160,7 +160,9 @@ BOOL LLGLSLShader::createShader(vector<string> * attributes,
 
 BOOL LLGLSLShader::attachObject(std::string object)
 {
-        if (LLShaderMgr::instance()->mShaderObjects.count(object) > 0)
+        //if (LLShaderMgr::instance()->mShaderObjects.count(object) > 0)
+    std::map<std::string, GLhandleARB> &ShaderObjects = LLShaderMgr::instance()->mShaderObjects; 
+    if (ShaderObjects.find(object) != ShaderObjects.end()) 
         {
                 stop_glerror();
                 glAttachObjectARB(mProgramObject, LLShaderMgr::instance()->mShaderObjects[object]);
diff --git a/linden/indra/llui/lllineeditor.cpp b/linden/indra/llui/lllineeditor.cpp
index 453bb50..5f16853 100644
--- a/linden/indra/llui/lllineeditor.cpp
+++ b/linden/indra/llui/lllineeditor.cpp
@@ -223,18 +223,15 @@ LLLineEditor::LLLineEditor(const std::string& name, const LLRect& rect,
         }
         mImage = sImage;
 
-
         LLMenuGL* menu = LLUICtrlFactory::getInstance()->buildMenu("menu_rightclick_text.xml",this);
         if (!menu)
         {
-                  menu = new LLMenuGL(LLStringUtil::null);
+                menu = new LLMenuGL(LLStringUtil::null);
         }
 
         defineMenuCallbacks(menu);
         mPopupMenuHandle = menu->getHandle();
-        menu->setBorderColor(gColors.getColor("MenuItemDisabledColor"));
         menu->setBackgroundColor(gColors.getColor("MenuPopupBgColor"));
-
 }
 
 
@@ -1344,7 +1341,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/llmenugl.cpp b/linden/indra/llui/llmenugl.cpp
index d5e1186..2d4a2f1 100644
--- a/linden/indra/llui/llmenugl.cpp
+++ b/linden/indra/llui/llmenugl.cpp
@@ -3099,8 +3099,7 @@ void LLMenuGL::draw( void )
 
         if( mBgVisible )
         {
-                gl_rect_2d( -1, getRect().getHeight()+2, getRect().getWidth()+2, -2, mBorderColor,FALSE);
-                gl_rect_2d(  0, getRect().getHeight(),   getRect().getWidth(),   0, mBackgroundColor );
+                gl_rect_2d(  0, getRect().getHeight(),   getRect().getWidth(),    0, mBackgroundColor );
         }
         LLView::draw();
 }
@@ -3157,37 +3156,18 @@ LLMenuGL* LLMenuGL::getChildMenuByName(const std::string& name, BOOL recurse) co
 }
 
 
-void LLMenuGL::setBackgroundColor( const LLColor4& color ) {
-
-  mBackgroundColor = color;
-  item_list_t::iterator item_iter;
-  for (item_iter = mItems.begin(); item_iter != mItems.end(); ++item_iter)
-    {
-              if((*item_iter)->getType()=="menu")
-                 {
-                   LLMenuItemBranchGL *menuBranchItem = (LLMenuItemBranchGL*)(*item_iter);
-                   menuBranchItem->getBranch()->setBackgroundColor(color);
-                 }
-    }
-
-
-}
-
-
-void LLMenuGL::setBorderColor( const LLColor4& color ) {
-
-  mBorderColor = color;
-  item_list_t::iterator item_iter;
-  for (item_iter = mItems.begin(); item_iter != mItems.end(); ++item_iter)
+void LLMenuGL::setBackgroundColor( const LLColor4& color )
+{
+        mBackgroundColor = color;
+        item_list_t::iterator item_iter;
+        for (item_iter = mItems.begin(); item_iter != mItems.end(); ++item_iter)
     {
-              if((*item_iter)->getType()=="menu")
-                 {
-                   LLMenuItemBranchGL *menuBranchItem = (LLMenuItemBranchGL*)(*item_iter);
-                   menuBranchItem->getBranch()->setBorderColor(color);
-                 }
-    }
-
-
+        if((*item_iter)->getType()=="menu")
+                {
+                        LLMenuItemBranchGL *menuBranchItem = (LLMenuItemBranchGL*)(*item_iter);
+                        menuBranchItem->getBranch()->setBackgroundColor(color);
+                }
+        }
 }
 
 
diff --git a/linden/indra/llui/llmenugl.h b/linden/indra/llui/llmenugl.h
index 9a9d1b0..3b57a32 100644
--- a/linden/indra/llui/llmenugl.h
+++ b/linden/indra/llui/llmenugl.h
@@ -514,10 +514,8 @@ public:
 
         // background colors
         static void setDefaultBackgroundColor( const LLColor4& color ) { sDefaultBackgroundColor = color; }
-        void setBackgroundColor( const LLColor4& color );
-        void setBorderColor( const LLColor4& color );
+    void setBackgroundColor( const LLColor4& color );
         const LLColor4& getBackgroundColor() const { return mBackgroundColor; }
-        const LLColor4& getBorderColor() const { return mBorderColor; }
         void setBackgroundVisible( BOOL b )     { mBgVisible = b; }
         void setCanTearOff(BOOL tear_off, LLHandle<LLFloater> parent_floater_handle = LLHandle<LLFloater>());
 
@@ -631,7 +629,6 @@ private:
         static BOOL             sKeyboardMode;
 
         LLColor4                mBackgroundColor;
-        LLColor4                mBorderColor;
         BOOL                    mBgVisible;
         LLMenuItemGL*   mParentMenuItem;
         LLUIString              mLabel;
diff --git a/linden/indra/llui/lltexteditor.cpp b/linden/indra/llui/lltexteditor.cpp
index 28859b1..8612427 100644
--- a/linden/indra/llui/lltexteditor.cpp
+++ b/linden/indra/llui/lltexteditor.cpp
@@ -389,14 +389,12 @@ LLTextEditor::LLTextEditor(
         LLMenuGL* menu = LLUICtrlFactory::getInstance()->buildMenu("menu_rightclick_text.xml",this);
         if (!menu)
         {
-                  menu = new LLMenuGL(LLStringUtil::null);
+                menu = new LLMenuGL(LLStringUtil::null);
         }
 
         defineMenuCallbacks(menu);
         mPopupMenuHandle = menu->getHandle();
-        menu->setBorderColor(gColors.getColor("MenuItemDisabledColor"));
         menu->setBackgroundColor(gColors.getColor("MenuPopupBgColor"));
-
 }
 
 LLTextEditor::~LLTextEditor()
@@ -636,7 +634,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);
@@ -3869,6 +3867,12 @@ void LLTextEditor::onTabInto()
 // virtual
 void LLTextEditor::clear()
 {
+        // Also clear any styling we might have added -- MC
+        mParseHTML = FALSE;
+        mParseHighlights = FALSE;
+
+        mSegments.clear();
+
         setText(LLStringUtil::null);
         std::for_each(mSegments.begin(), mSegments.end(), DeletePointer());
         mSegments.clear();
diff --git a/linden/indra/llvfs/lldir.cpp b/linden/indra/llvfs/lldir.cpp
index 8bd68f4..4f108b9 100644
--- a/linden/indra/llvfs/lldir.cpp
+++ b/linden/indra/llvfs/lldir.cpp
@@ -249,7 +249,7 @@ std::string LLDir::buildSLOSCacheDir() const
         }
         else
         {
-                res = getOSCacheDir() + mDirDelimiter + "meta-impyExperimental";
+                res = getOSCacheDir() + mDirDelimiter + "meta-impy";
         }
         return res;
 }
diff --git a/linden/indra/llvfs/lldir_mac.cpp b/linden/indra/llvfs/lldir_mac.cpp
index 7fb235b..cb5c748 100644
--- a/linden/indra/llvfs/lldir_mac.cpp
+++ b/linden/indra/llvfs/lldir_mac.cpp
@@ -173,7 +173,7 @@ LLDir_Mac::LLDir_Mac()
                 if (error == noErr)
                 {
                         FSRefToLLString(&cacheDirRef, mOSCacheDir);
-                        (void)CFCreateDirectory(&cacheDirRef, CFSTR("meta-impyExperimental"),NULL);
+                        (void)CFCreateDirectory(&cacheDirRef, CFSTR("meta-impy"),NULL);
                 }
                 
                 // mOSUserAppDir
diff --git a/linden/indra/newview/CMakeLists.txt b/linden/indra/newview/CMakeLists.txt
index f11ee12..83ad646 100644
--- a/linden/indra/newview/CMakeLists.txt
+++ b/linden/indra/newview/CMakeLists.txt
@@ -3,6 +3,7 @@
 project(viewer)
 
 include(00-Common)
+include(AddPackageTarget)
 include(Boost)
 include(BuildVersion)
 include(DBusGlib)
@@ -361,7 +362,6 @@ set(viewer_SOURCE_FILES
     llpanelplace.cpp
     llpanelskins.cpp
     llpanelvolume.cpp
-    llpanelweb.cpp
     llparcelselection.cpp
     llpatchvertexarray.cpp
     llpolymesh.cpp
@@ -532,8 +532,8 @@ set(viewer_SOURCE_FILES
     rlvextensions.cpp
     rlvfloaterbehaviour.cpp
     slfloatermediafilter.cpp
+    viewerinfo.cpp
     viewertime.cpp
-    viewerversion.cpp
     windlightsettingsupdate.cpp
     wlfloatermanager.cpp
     wlfloaterwindlightsend.cpp
@@ -830,7 +830,6 @@ set(viewer_HEADER_FILES
     llpanelplace.h
     llpanelskins.h
     llpanelvolume.h
-    llpanelweb.h
     llparcelselection.h
     llpatchvertexarray.h
     llpolymesh.h
@@ -1011,8 +1010,8 @@ set(viewer_HEADER_FILES
     slfloatermediafilter.h
     VertexCache.h
     VorbisFramework.h
+    viewerinfo.h
     viewertime.h
-    viewerversion.h
     wlfloatermanager.h
     wlfloaterwindlightsend.h
     wlretrievesettings.h
@@ -1047,14 +1046,14 @@ if (DARWIN)
     viewer.icns
     macview.r
     gpu_table.txt
-    Info-meta-impy.plist
-    meta-impy.nib/
+    packaging/mac/Info.plist.in
+    packaging/mac/viewer.nib/
     # CMake doesn't seem to support Xcode language variants well just yet
-    English.lproj/InfoPlist.strings
-    English.lproj/language.txt
-    German.lproj/language.txt
-    Japanese.lproj/language.txt
-    Korean.lproj/language.txt
+    packaging/mac/English.lproj/InfoPlist.strings
+    packaging/mac/English.lproj/language.txt
+    packaging/mac/German.lproj/language.txt
+    packaging/mac/Japanese.lproj/language.txt
+    packaging/mac/Korean.lproj/language.txt
     )
   set_source_files_properties(
     ${viewer_RESOURCE_FILES}
@@ -1265,7 +1264,6 @@ set(viewer_APPSETTINGS_FILES
     app_settings/trees.xml
     app_settings/ultra_graphics.xml
     app_settings/viewerart.xml
-    app_settings/viewerversion.xml
     ${CMAKE_SOURCE_DIR}/../etc/message.xml
     ${CMAKE_SOURCE_DIR}/../scripts/messages/message_template.msg
     )
@@ -1343,6 +1341,10 @@ add_executable(${VIEWER_BINARY_NAME}
     )
 #check_message_template(${VIEWER_BINARY_NAME})
 
+
+# NOTE: This variable is DEPRECATED, and should not be used anymore.
+# The package target should always be added. The variable AUTOPACKAGE
+# (in AddPackageTarget.cmake) controls whether package is auto-built.
 set(PACKAGE OFF CACHE BOOL
     "Add a package target that builds an installer package.")
 
@@ -1502,121 +1504,102 @@ set(ARTWORK_DIR ${CMAKE_CURRENT_SOURCE_DIR} CACHE PATH
 
 
 if (LINUX)
-  add_custom_command(
-      OUTPUT meta-impy-stripped
-      COMMAND strip
-      ARGS --strip-debug -o meta-impy-stripped ${VIEWER_BINARY_NAME}
-      DEPENDS meta-impy-bin
-      )
+  string(REPLACE "-bin" "-stripped"
+         VIEWER_STRIPPED_NAME ${VIEWER_BINARY_NAME})
 
-  set(product meta-impy-${ARCH}-${viewer_VERSION})
+  add_dependencies(${VIEWER_BINARY_NAME}
+    SLPlugin
+    media_plugin_gstreamer010
+    media_plugin_webkit)
 
   add_custom_command(
-      OUTPUT ${product}.tar.bz2
-      COMMAND ${PYTHON_EXECUTABLE}
-      ARGS
-        ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py
-        --standalone=${STANDALONE}
-        --buildtype=${CMAKE_BUILD_TYPE}
-        --grid=${GRID}
-        --channel=${VIEWER_CHANNEL}
-        --login_channel=${VIEWER_LOGIN_CHANNEL}
-        --installer_name=${product}
-        --arch=${ARCH}
-        --source=${CMAKE_CURRENT_SOURCE_DIR}
-        --artwork=${ARTWORK_DIR}
-        --build=${CMAKE_CURRENT_BINARY_DIR}
-        --dest=${CMAKE_CURRENT_BINARY_DIR}/packaged
-        --touch=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/.${product}.touched
-      DEPENDS meta-impy-stripped ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py
-      )
-      
-  add_dependencies(${VIEWER_BINARY_NAME} SLPlugin media_plugin_gstreamer010 media_plugin_webkit)
+    OUTPUT ${VIEWER_STRIPPED_NAME}
+    COMMAND strip
+    ARGS --strip-debug -o ${VIEWER_STRIPPED_NAME} ${VIEWER_BINARY_NAME}
+    DEPENDS ${VIEWER_BINARY_NAME}
+    )
+
+  add_custom_target(
+    viewer-manifest-target
+    ALL
+    COMMAND
+      ${PYTHON_EXECUTABLE}
+      ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py
+      --standalone=${STANDALONE}
+      --buildtype=${CMAKE_BUILD_TYPE}
+      --grid=${GRID}
+      --channel=${VIEWER_CHANNEL}
+      --login_channel=${VIEWER_LOGIN_CHANNEL}
+      --arch=${ARCH}
+      --source=${CMAKE_CURRENT_SOURCE_DIR}
+      --artwork=${ARTWORK_DIR}
+      --build=${CMAKE_CURRENT_BINARY_DIR}
+      --dest=${CMAKE_CURRENT_BINARY_DIR}/packaged
+    DEPENDS
+      ${VIEWER_STRIPPED_NAME}
+      linux-crash-logger
+      ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py
+    )
+
+  add_package_target()
+  add_dependencies(package viewer-manifest-target)
 
-  if (NOT INSTALL)
-    add_custom_target(package ALL DEPENDS ${product}.tar.bz2)
-    add_dependencies(package linux-crash-logger-strip-target)
-  endif (NOT INSTALL)
 endif (LINUX)
 
+
 if (DARWIN)
-  set(product "meta-impy")
+  set(product "${viewer_NAME}")
+
   set_target_properties(
     ${VIEWER_BINARY_NAME}
     PROPERTIES
     OUTPUT_NAME "${product}"
-    MACOSX_BUNDLE_INFO_STRING "info string - localize me"
-    MACOSX_BUNDLE_ICON_FILE "viewer.icns"
-    MACOSX_BUNDLE_GUI_IDENTIFIER "meta-impy"
-    MACOSX_BUNDLE_LONG_VERSION_STRING "ververver"
-    MACOSX_BUNDLE_BUNDLE_NAME "meta-impy"
-    MACOSX_BUNDLE_SHORT_VERSION_STRING "asdf"
-    MACOSX_BUNDLE_BUNDLE_VERSION "asdf"
-    MACOSX_BUNDLE_COPYRIGHT "copyright linden lab 2007 - localize me and run me through a legal wringer"
     )
+    
+  # Generate Info.plist from the template.
+  add_custom_target(
+    GenerateInfoPlist
+    ALL
+    COMMENT "Generating Info.plist..."
+    VERBATIM
+    DEPENDS
+      ${CMAKE_CURRENT_SOURCE_DIR}/packaging/mac/GenerateInfoPlist.cmake
+      ${CMAKE_CURRENT_SOURCE_DIR}/packaging/mac/Info.plist.in
+      ${CMAKE_CURRENT_SOURCE_DIR}/viewerinfo.cpp
+    COMMAND
+      ${CMAKE_COMMAND}
+      -DSOURCE_DIR=${CMAKE_SOURCE_DIR}
+      -DBINARY_DIR=${CMAKE_BINARY_DIR}
+      -P ${CMAKE_CURRENT_SOURCE_DIR}/packaging/mac/GenerateInfoPlist.cmake
+  )
+
+  # Ensure that it's generated before the binary is built, so
+  # that it will definitely be ready when viewer_manifest.py runs.
+  add_dependencies(${VIEWER_BINARY_NAME} GenerateInfoPlist)
+
 
   add_custom_command(
     TARGET ${VIEWER_BINARY_NAME} POST_BUILD
     COMMAND ${PYTHON_EXECUTABLE}
     ARGS
       ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py
-      --grid=${GRID}
       --actions=copy
-      --configuration=${CMAKE_CFG_INTDIR}
-      --source=${CMAKE_CURRENT_SOURCE_DIR}
       --artwork=${ARTWORK_DIR}
       --build=${CMAKE_CURRENT_BINARY_DIR}
+      --buildtype=${CMAKE_BUILD_TYPE}
+      --configuration=${CMAKE_CFG_INTDIR}
       --dest=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${product}.app
+      --grid=${GRID}
+      --source=${CMAKE_CURRENT_SOURCE_DIR}
+      --standalone=${STANDALONE}
     DEPENDS ${VIEWER_BINARY_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py
     )
-    
-  add_dependencies(${VIEWER_BINARY_NAME} SLPlugin media_plugin_quicktime media_plugin_webkit media_plugin_gstreamer010)
-
-  if (PACKAGE)
-      add_custom_target(package ALL DEPENDS ${VIEWER_BINARY_NAME}) 
-      add_dependencies(package mac-updater mac-crash-logger)
-
-      add_custom_command(
-        TARGET package POST_BUILD
-        COMMAND ${PYTHON_EXECUTABLE}
-        ARGS
-          ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py
-          --standalone=${STANDALONE}
-          --buildtype=${CMAKE_BUILD_TYPE}
-          --grid=${GRID}
-          --configuration=${CMAKE_CFG_INTDIR}
-          --channel=${VIEWER_CHANNEL}
-          --login_channel=${VIEWER_LOGIN_CHANNEL}
-          --source=${CMAKE_CURRENT_SOURCE_DIR}
-          --artwork=${ARTWORK_DIR}
-          --build=${CMAKE_CURRENT_BINARY_DIR}
-          --dest=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${product}.app
-          --touch=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/.${product}.touched
 
-        DEPENDS
-          ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py
-      )
+  add_dependencies(${VIEWER_BINARY_NAME} SLPlugin media_plugin_quicktime media_plugin_webkit media_plugin_gstreamer010 mac-updater mac-crash-logger)
 
-      add_dependencies(${VIEWER_BINARY_NAME} SLPlugin media_plugin_quicktime media_plugin_webkit media_plugin_gstreamer010)
-      add_custom_command(
-        TARGET package POST_BUILD
-        COMMAND ${PYTHON_EXECUTABLE}
-        ARGS
-          ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py
-          --grid=${GRID}
-          --configuration=${CMAKE_CFG_INTDIR}
-          --channel=${VIEWER_CHANNEL}
-          --login_channel=${VIEWER_LOGIN_CHANNEL}
-          --source=${CMAKE_CURRENT_SOURCE_DIR}
-          --artwork=${ARTWORK_DIR}
-          --build=${CMAKE_CURRENT_BINARY_DIR}
-          --dest=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${product}.app
-          --touch=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/.${product}.touched
-        DEPENDS
-          ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py
-      )
+  add_package_target()
+  add_dependencies(package ${VIEWER_BINARY_NAME})
 
-  endif (PACKAGE)
 endif (DARWIN)
 
 if (INSTALL)
diff --git a/linden/indra/newview/English.lproj/InfoPlist.strings b/linden/indra/newview/English.lproj/InfoPlist.strings
deleted file mode 100644
index 3027772..0000000
--- a/linden/indra/newview/English.lproj/InfoPlist.strings
+++ /dev/null
@@ -1,6 +0,0 @@
-/* Localized versions of Info.plist keys */
-
-CFBundleName = "meta-impy";
-CFBundleShortVersionString = "meta-impy Experimental 2011.04.02";
-CFBundleGetInfoString = "meta-impy Experimental 2011.04.02";
-
diff --git a/linden/indra/newview/app_settings/logcontrol.xml b/linden/indra/newview/app_settings/logcontrol.xml
index 027afaf..a94bc1b 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>VivoxProtocolParserTag</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 97c4c5c..cb026ef 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>
@@ -499,7 +510,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>
@@ -679,7 +690,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>
@@ -1033,6 +1044,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>
@@ -1067,7 +1089,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>
@@ -1089,16 +1111,16 @@
     <integer>0</integer>
   </map>
   <key>ResetFocusOnSelfClick</key>
-                <map>
-                <key>Comment</key>
-                <string>Setting this to TRUE resets your camera when you left-click your avatar</string>
-                <key>Persist</key>
-                <integer>1</integer>
-                <key>Type</key>
-                <string>Boolean</string>
-                <key>Value</key>
-                <integer>1</integer>
-                </map>
+  <map>
+    <key>Comment</key>
+    <string>Setting this to TRUE resets your camera when you left-click your avatar</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>1</integer>
+  </map>
   <key>RezWithLandGroup</key>
   <map>
     <key>Comment</key>
@@ -1542,7 +1564,7 @@
   </map>
 
   <!-- Begin: OpenRegionInfo -->
-  
+
   <key>ToggleTeenMode</key>
   <map>
     <key>Comment</key>
@@ -1554,7 +1576,7 @@
     <key>Value</key>
     <integer>1</integer>
   </map>
-  
+
   <!-- Begin: AO-->
 
   <key>AOEnabled</key>
@@ -1805,7 +1827,7 @@
     <key>Value</key>
     <integer>1</integer>
   </map>
-  
+
   <key>DownloadClientTags</key>
   <map>
     <key>Comment</key>
@@ -2160,9 +2182,9 @@
     <key>Value</key>
     <string>English (United States of America)</string>
   </map>
-  
+
   <!-- End: Spellcheck & Translation -->
-  
+
   <!-- Begin: RLVa -->
 
   <key>RestrainedLove</key>
@@ -2234,7 +2256,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>
@@ -2256,7 +2278,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>
@@ -2289,7 +2311,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>
@@ -2343,7 +2365,7 @@
   </map>
 
   <!-- End: RLVa -->
-  
+
   <!-- Begin: socks5 -->
 
   <key>Socks5ProxyEnabled</key>
@@ -2554,11 +2576,11 @@
     <key>Value</key>
     <integer>-8888888</integer>
   </map>
-  
+
   <!-- End: full radar (Advanced menu) -->
 
   <!-- END IMPRUDENCE-SPECIFIC SETTINGS -->
-  
+
   <key>AFKTimeout</key>
   <map>
     <key>Comment</key>
@@ -3014,7 +3036,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>
@@ -3973,17 +3995,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>
@@ -5655,7 +5666,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>
@@ -5891,7 +5902,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>
@@ -7476,17 +7487,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>
@@ -7858,7 +7858,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>
@@ -8380,7 +8380,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>
@@ -8977,7 +8977,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>
@@ -13331,7 +13331,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>
@@ -13364,7 +13364,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>
@@ -13661,7 +13661,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/app_settings/viewerversion.xml b/linden/indra/newview/app_settings/viewerversion.xml
deleted file mode 100644
index 051f2a3..0000000
--- a/linden/indra/newview/app_settings/viewerversion.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<!-- 
-Set the version for Imprudence here!
-
-NOTE: llcommon/llviewerversion.h still
-contains the version for the LL viewer.
-
-OS-specific version resources still 
-need to be changed manually - MC
--->
-
-<viewer_version>
-
-  <!--int-->
-  <viewer version_major="1" />
-
-  <!--int-->
-  <viewer version_minor="4" />
-
-  <!--int-->
-  <viewer version_patch="0" />
-
-  <!--string-->
-  <viewer version_test="Experimental 2011.04.19" />
-  
-</viewer_version>
diff --git a/linden/indra/newview/floaterlocalassetbrowse.cpp b/linden/indra/newview/floaterlocalassetbrowse.cpp
index 8ea13cc..8633ac4 100644
--- a/linden/indra/newview/floaterlocalassetbrowse.cpp
+++ b/linden/indra/newview/floaterlocalassetbrowse.cpp
@@ -943,7 +943,7 @@ void FloaterLocalAssetBrowser::UpdateRightSide()
                         sLFInstance->mLinkTxt->setText( unit->getLinkStatus() );
                         sLFInstance->mTypeComboBox->selectNthItem( unit->getType() );
 
-                        sLFInstance->mTextureView->setEnabled(true);
+                        sLFInstance->mTextureView->setEnabled(false);
                         sLFInstance->mUpdateChkBox->setEnabled(true);
                         sLFInstance->mTypeComboBox->setEnabled(true);
                 }
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/linux_tools/wrapper.sh b/linden/indra/newview/linux_tools/wrapper.sh
index 08ae537..d4eaf33 100755
--- a/linden/indra/newview/linux_tools/wrapper.sh
+++ b/linden/indra/newview/linux_tools/wrapper.sh
@@ -138,16 +138,16 @@ if [ -n "$LL_RUN_ERR" ]; then
         fi
 fi
 
-LOGS_PATH="${HOME}/.imprudence/logs"
+LOGS_PATH="${HOME}/.meta-impy/logs"
 if [ -f "${LOGS_PATH}/stack_trace.log" ]; then
         LOG_PACKAGE_NAME="MAIL-THIS-CRASHLOG-PLEASE.$(date +%y%m%d%H%M).tar.bz2"
         cp "${LOGS_PATH}/stack_trace.log" stack_trace.log
-        cp "${LOGS_PATH}/Imprudence.log" Imprudence.log
+        cp "${LOGS_PATH}/meta-impy.log" meta-impy.log
         tar --numeric-owner -cjf  ${LOG_PACKAGE_NAME} \
                                 stack_trace.log \
-                                Imprudence.log
+                                meta-impy.log
         rm stack_trace.log
-        rm Imprudence.log
+        rm meta-impy.log
         echo "You find a crash log package to mail to Imprudence here:"
         echo "${RUN_PATH}/${LOG_PACKAGE_NAME}"
         echo "See where to send: http://wiki.kokuaviewer.org/wiki/Imprudence:Debug_Logs#Where_to_Send_Them"
diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp
index 09b4eda..a026391 100644
--- a/linden/indra/newview/llappviewer.cpp
+++ b/linden/indra/newview/llappviewer.cpp
@@ -154,7 +154,7 @@
 #include "llflexibleobject.h" 
 #include "llvosurfacepatch.h"
 #include "llslider.h"
-#include "viewerversion.h"
+#include "viewerinfo.h"
 
 // includes for idle() idleShutdown()
 #include "floaterao.h"
@@ -602,7 +602,7 @@ bool LLAppViewer::init()
         
         // Need to do this initialization before we do anything else, since anything
         // that touches files should really go through the lldir API
-        gDirUtilp->initAppDirs(ViewerVersion::getImpViewerName());
+        gDirUtilp->initAppDirs(ViewerInfo::viewerName());
         // set skin search path to default, will be overridden later
         // this allows simple skinned file lookups to work
         gDirUtilp->setSkinFolder("default");
@@ -624,15 +624,8 @@ bool LLAppViewer::init()
     writeSystemInfo();
 
 
-        // Build a string representing the current version number.
-        gCurrentVersion = llformat(
-                "%s %d.%d.%d.%d",
-                gSavedSettings.getString("VersionChannelName").c_str(),
-                ViewerVersion::getImpMajorVersion(), 
-                ViewerVersion::getImpMinorVersion(), 
-                ViewerVersion::getImpPatchVersion(),
-                0 // our 'build number'
-    );
+        // String representing the current version name/number.
+        gCurrentVersion = ViewerInfo::terseInfo();
 
         //////////////////////////////////////////////////////////////////////////////
         //////////////////////////////////////////////////////////////////////////////
@@ -1800,9 +1793,6 @@ std::string LLAppViewer::getSettingsFilename(const std::string& location_key,
 
 bool LLAppViewer::initConfiguration()
 {       
-        // init Imprudence version - MC
-        ViewerVersion::initViewerVersion();
-
         //Set up internal pointers      
         gSettings[sGlobalSettingsName] = &gSavedSettings;
         gSettings[sPerAccountSettingsName] = &gSavedPerAccountSettings;
@@ -1848,9 +1838,9 @@ bool LLAppViewer::initConfiguration()
         // - set procedural settings 
         gSavedSettings.setString("ClientSettingsFile", 
         // gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, getSettingsFilename("Default", "Global")));
-        gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, "settings_meta-impy_experimental.xml"));
+        gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, "settings_meta-impy.xml"));
 
-        gSavedSettings.setString("VersionChannelName", ViewerVersion::getImpViewerName());
+        gSavedSettings.setString("VersionChannelName", ViewerInfo::nameWithVariant());
 
         //*FIX:Mani - Set default to disabling watchdog mainloop 
         // timeout for mac and linux. There is no call stack info 
@@ -2096,7 +2086,7 @@ bool LLAppViewer::initConfiguration()
     mYieldTime = gSavedSettings.getS32("YieldTime");
              
         // XUI:translate
-        gSecondLife = ViewerVersion::getImpViewerName();
+        gSecondLife = ViewerInfo::viewerName();
 
         // Read skin/branding settings if specified.
         //if (! gDirUtilp->getSkinDir().empty() )
@@ -2468,11 +2458,12 @@ void LLAppViewer::writeSystemInfo()
 {
         gDebugInfo["SLLog"] = LLError::logFileName();
 
-        gDebugInfo["ClientInfo"]["Name"] = gSavedSettings.getString("VersionChannelName");
-        gDebugInfo["ClientInfo"]["MajorVersion"] = ViewerVersion::getImpMajorVersion();
-        gDebugInfo["ClientInfo"]["MinorVersion"] = ViewerVersion::getImpMinorVersion();
-        gDebugInfo["ClientInfo"]["PatchVersion"] = ViewerVersion::getImpPatchVersion();
-        gDebugInfo["ClientInfo"]["BuildVersion"] = 0;
+        gDebugInfo["ClientInfo"]["Name"] = ViewerInfo::viewerName();
+        gDebugInfo["ClientInfo"]["MajorVersion"] = ViewerInfo::versionMajor();
+        gDebugInfo["ClientInfo"]["MinorVersion"] = ViewerInfo::versionMinor();
+        gDebugInfo["ClientInfo"]["PatchVersion"] = ViewerInfo::versionPatch();
+        gDebugInfo["ClientInfo"]["ReleaseVersion"] = ViewerInfo::versionRelease();
+        gDebugInfo["ClientInfo"]["ExtraVersion"] = ViewerInfo::versionExtra();
 
         gDebugInfo["CAFilename"] = gDirUtilp->getCAFile();
 
@@ -2557,11 +2548,12 @@ void LLAppViewer::handleViewerCrash()
         
         //We already do this in writeSystemInfo(), but we do it again here to make /sure/ we have a version
         //to check against no matter what
-        gDebugInfo["ClientInfo"]["Name"] = gSavedSettings.getString("VersionChannelName");
-        gDebugInfo["ClientInfo"]["MajorVersion"] = ViewerVersion::getImpMajorVersion();
-        gDebugInfo["ClientInfo"]["MinorVersion"] = ViewerVersion::getImpMinorVersion();
-        gDebugInfo["ClientInfo"]["PatchVersion"] = ViewerVersion::getImpPatchVersion();
-        gDebugInfo["ClientInfo"]["BuildVersion"] = 0;
+        gDebugInfo["ClientInfo"]["Name"] = ViewerInfo::viewerName();
+        gDebugInfo["ClientInfo"]["MajorVersion"] = ViewerInfo::versionMajor();
+        gDebugInfo["ClientInfo"]["MinorVersion"] = ViewerInfo::versionMinor();
+        gDebugInfo["ClientInfo"]["PatchVersion"] = ViewerInfo::versionPatch();
+        gDebugInfo["ClientInfo"]["ReleaseVersion"] = ViewerInfo::versionRelease();
+        gDebugInfo["ClientInfo"]["ExtraVersion"] = ViewerInfo::versionExtra();
 
         LLParcel* parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
         if ( parcel && parcel->getMusicURL()[0])
@@ -4341,11 +4333,12 @@ void LLAppViewer::handleLoginComplete()
         initMainloopTimeout("Mainloop Init");
 
         // Store some data to DebugInfo in case of a freeze.
-        gDebugInfo["ClientInfo"]["Name"] = gSavedSettings.getString("VersionChannelName");
-        gDebugInfo["ClientInfo"]["MajorVersion"] = ViewerVersion::getImpMajorVersion();
-        gDebugInfo["ClientInfo"]["MinorVersion"] = ViewerVersion::getImpMinorVersion();
-        gDebugInfo["ClientInfo"]["PatchVersion"] = ViewerVersion::getImpPatchVersion();
-        gDebugInfo["ClientInfo"]["BuildVersion"] = 0;
+        gDebugInfo["ClientInfo"]["Name"] = ViewerInfo::viewerName();
+        gDebugInfo["ClientInfo"]["MajorVersion"] = ViewerInfo::versionMajor();
+        gDebugInfo["ClientInfo"]["MinorVersion"] = ViewerInfo::versionMinor();
+        gDebugInfo["ClientInfo"]["PatchVersion"] = ViewerInfo::versionPatch();
+        gDebugInfo["ClientInfo"]["ReleaseVersion"] = ViewerInfo::versionRelease();
+        gDebugInfo["ClientInfo"]["ExtraVersion"] = ViewerInfo::versionExtra();
 
         gDebugInfo["SettingsFilename"] = gSavedSettings.getString("ClientSettingsFile");
         gDebugInfo["CAFilename"] = gDirUtilp->getCAFile();
diff --git a/linden/indra/newview/llappviewerlinux.cpp b/linden/indra/newview/llappviewerlinux.cpp
index eb713b8..1f84a11 100644
--- a/linden/indra/newview/llappviewerlinux.cpp
+++ b/linden/indra/newview/llappviewerlinux.cpp
@@ -472,7 +472,7 @@ gboolean viewer_app_api_HotplugJoystick(ViewerAppAPI *obj, gchar *dummy, gboolea
         return TRUE; // the invokation succeeded, even if the actual dispatch didn't.
 
         // TODO: fire this by the spacenavi udev rule.
-        // for testing plug in joystick while Imprudence is running and type in a 
+        // for testing plug in joystick while viewer is running and type in a 
         // console: dbus-send --type=method_call --dest=com.secondlife.ViewerAppAPIService /com/secondlife/ViewerAppAPI com.secondlife.ViewerAppAPI.HotplugJoystick string:'dummy'
 }
 
diff --git a/linden/indra/newview/lldrawpoolwlsky.cpp b/linden/indra/newview/lldrawpoolwlsky.cpp
index 451d08e..46de496 100644
--- a/linden/indra/newview/lldrawpoolwlsky.cpp
+++ b/linden/indra/newview/lldrawpoolwlsky.cpp
@@ -276,18 +276,17 @@ void LLDrawPoolWLSky::render(S32 pass)
         LLVector3 const & origin = LLViewerCamera::getInstance()->getOrigin();
         glPushMatrix();
 
-                glTranslatef(origin.mV[0], origin.mV[1], origin.mV[2]);
+        glTranslatef(origin.mV[0], origin.mV[1], origin.mV[2]);
 
-                // *NOTE: have to bind a texture here since register combiners blending in
-                // renderStars() requires something to be bound and we might as well only
-                // bind the moon's texture once.
-                LLImageGL * tex  = gSky.mVOSkyp->mFace[LLVOSky::FACE_MOON]->getTexture();
-                gGL.getTexUnit(0)->bind(tex);
+        // *NOTE: have to bind a texture here since register combiners blending in
+        // renderStars() requires something to be bound and we might as well only
+        // bind the moon's texture once.
+        LLImageGL * tex  = gSky.mVOSkyp->mFace[LLVOSky::FACE_MOON]->getTexture();
+        gGL.getTexUnit(0)->bind(tex);
 
-                renderHeavenlyBodies();
+        renderStars();
 
-                renderStars();
-                
+        renderHeavenlyBodies();
 
         glPopMatrix();
 
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/llfloaterabout.cpp b/linden/indra/newview/llfloaterabout.cpp
index a5d2c98..8878de5 100644
--- a/linden/indra/newview/llfloaterabout.cpp
+++ b/linden/indra/newview/llfloaterabout.cpp
@@ -59,7 +59,7 @@
 #include "llglheaders.h"
 #include "llviewerwindow.h"
 #include "llwindow.h"
-#include "viewerversion.h"
+#include "viewerinfo.h"
 
 // [RLVa:KB]
 #include "rlvhandler.h"
@@ -120,11 +120,7 @@ LLFloaterAbout::LLFloaterAbout()
         viewer_link_style->setColor(gSavedSettings.getColor4("HTMLLinkColor"));
 
         // Version string
-        std::string version = llformat(
-          "%s %d.%d.%d %s (%s %s)\n",
-          ViewerVersion::getImpViewerName().c_str(),
-          ViewerVersion::getImpMajorVersion(), ViewerVersion::getImpMinorVersion(), ViewerVersion::getImpPatchVersion(), ViewerVersion::getImpTestVersion().c_str(),
-          __DATE__, __TIME__);
+        std::string version = llformat("%s (%s %s)\n", ViewerInfo::prettyInfo().c_str(), __DATE__, __TIME__);
 
         support_widget->appendColoredText(version, FALSE, FALSE, gColors.getColor("TextFgReadOnlyColor"));
         support_widget->appendStyledText(LLTrans::getString("ReleaseNotes"), false, false, viewer_link_style);
@@ -318,13 +314,13 @@ void LLFloaterAbout::onClickCopy(void* user_data)
 static std::string get_viewer_release_notes_url()
 {
         std::ostringstream version;
-        version << ViewerVersion::getImpMajorVersion() << "."
-                << ViewerVersion::getImpMinorVersion() << "."
-                << ViewerVersion::getImpPatchVersion();
+        version << ViewerInfo::versionMajor() << "."
+                << ViewerInfo::versionMinor() << "."
+                << ViewerInfo::versionPatch();
 
         // Append the test version if it's not empty
-        if( !(ViewerVersion::getImpTestVersion().empty()) )
-                version << "-" << ViewerVersion::getImpTestVersion();
+        if( !(ViewerInfo::versionExtra().empty()) )
+                version << "-" << ViewerInfo::versionExtra();
 
         std::ostringstream url;
         url << RELEASE_NOTES_BASE_URL << version.str();
diff --git a/linden/indra/newview/llfloaterchat.cpp b/linden/indra/newview/llfloaterchat.cpp
index 4de7918..681cbb2 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/llfloatermediabrowser.cpp b/linden/indra/newview/llfloatermediabrowser.cpp
index a78c9d1..54ffc0f 100644
--- a/linden/indra/newview/llfloatermediabrowser.cpp
+++ b/linden/indra/newview/llfloatermediabrowser.cpp
@@ -119,7 +119,6 @@ BOOL LLFloaterMediaBrowser::postBuild()
         childSetAction("pause", onClickPlay, this);
         childSetAction("seek", onClickSeek, this);
         childSetAction("go", onClickGo, this);
-        childSetAction("close", onClickClose, this);
         childSetAction("open_browser", onClickOpenWebBrowser, this);
         childSetAction("assign", onClickAssign, this);
         childSetAction("home", onClickHome, this);
@@ -248,14 +247,6 @@ void LLFloaterMediaBrowser::onClickGo(void* user_data)
 }
 
 //static 
-void LLFloaterMediaBrowser::onClickClose(void* user_data)
-{
-        LLFloaterMediaBrowser* self = (LLFloaterMediaBrowser*)user_data;
-
-        self->close();
-}
-
-//static 
 void LLFloaterMediaBrowser::onClickOpenWebBrowser(void* user_data)
 {
         LLFloaterMediaBrowser* self = (LLFloaterMediaBrowser*)user_data;
diff --git a/linden/indra/newview/llfloatermediabrowser.h b/linden/indra/newview/llfloatermediabrowser.h
index 7de1900..f2597f5 100644
--- a/linden/indra/newview/llfloatermediabrowser.h
+++ b/linden/indra/newview/llfloatermediabrowser.h
@@ -82,7 +82,6 @@ public:
         static void onClickBack(void* user_data);
         static void onClickForward(void* user_data);
         static void onClickGo(void* user_data);
-        static void onClickClose(void* user_data);
         static void onClickOpenWebBrowser(void* user_data);
         static void onClickAssign(void* user_data);
         static void onClickHome(void* user_data);
diff --git a/linden/indra/newview/llfloaterpreference.cpp b/linden/indra/newview/llfloaterpreference.cpp
index 7d0ef93..94eb2de 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"
@@ -155,10 +154,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);
@@ -171,10 +166,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);
@@ -201,6 +192,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);
@@ -263,11 +258,6 @@ LLPreferenceCore::~LLPreferenceCore()
                 delete mMsgPanel;
                 mMsgPanel = NULL;
         }
-        if (mWebPanel)
-        {
-                delete mWebPanel;
-                mWebPanel = NULL;
-        }
         if (mSkinsPanel)
         {
                 delete mSkinsPanel;
@@ -310,7 +300,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())
@@ -318,7 +307,6 @@ void LLPreferenceCore::apply()
                 mLCDPanel->apply();
         }
 #endif
-//      mWebPanel->apply();
 }
 
 
@@ -341,7 +329,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())
@@ -349,7 +336,6 @@ void LLPreferenceCore::cancel()
                 mLCDPanel->cancel();
         }
 #endif
-//      mWebPanel->cancel();
 }
 
 // static
@@ -363,7 +349,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/llfloaterreporter.cpp b/linden/indra/newview/llfloaterreporter.cpp
index 7f6386b..1911e4e 100644
--- a/linden/indra/newview/llfloaterreporter.cpp
+++ b/linden/indra/newview/llfloaterreporter.cpp
@@ -80,7 +80,7 @@
 #include "llselectmgr.h"
 #include "lluictrlfactory.h"
 #include "llviewernetwork.h"
-#include "viewerversion.h"
+#include "viewerinfo.h"
 
 #include "llassetuploadresponders.h"
 
@@ -742,13 +742,11 @@ LLSD LLFloaterReporter::gatherReport()
 
         if ( mReportType == BUG_REPORT)
         {
-                summary << short_platform << " V" << ViewerVersion::getLLMajorVersion() << "."
-                        << ViewerVersion::getLLMinorVersion() << "."
-                        << ViewerVersion::getLLPatchVersion() << "."
-                        << ViewerVersion::getLLBuildVersion()
-                        << " (" << regionp->getName() << ")"
-                        << "[" << category_name << "] "
-                        << "\"" << childGetValue("summary_edit").asString() << "\"";
+                summary << short_platform << " "
+                        << ViewerInfo::terseInfo()
+                        << " (" << regionp->getName() << ")"
+                        << "["  << category_name << "] "
+                        << "\"" << childGetValue("summary_edit").asString() << "\"";
         }
         else
         {
@@ -763,10 +761,7 @@ LLSD LLFloaterReporter::gatherReport()
         std::ostringstream details;
         if (mReportType != BUG_REPORT)
         {
-                details << "V" << ViewerVersion::getLLMajorVersion() << "."                                                             // client version moved to body of email for abuse reports
-                        << ViewerVersion::getLLMinorVersion() << "."
-                        << ViewerVersion::getLLPatchVersion() << "."
-                        << ViewerVersion::getLLBuildVersion() << std::endl << std::endl;
+                details << ViewerInfo::terseInfo() << std::endl << std::endl;
         }
         std::string object_name = childGetText("object_name");
         std::string owner_name = childGetText("owner_name");
@@ -786,10 +781,8 @@ LLSD LLFloaterReporter::gatherReport()
 
         std::string version_string;
         version_string = llformat(
-                        "%d.%d.%d %s %s %s %s",
-                        ViewerVersion::getLLMajorVersion(),
-                        ViewerVersion::getLLMinorVersion(),
-                        ViewerVersion::getLLPatchVersion(),
+                        "%s %s %s %s %s",
+                        ViewerInfo::terseInfo().c_str(),
                         platform,
                         gSysCPU.getFamily().c_str(),
                         gGLManager.mGLRenderer.c_str(),
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 7ccf49c..752ebb4 100644
--- a/linden/indra/newview/llimpanel.cpp
+++ b/linden/indra/newview/llimpanel.cpp
@@ -1660,7 +1660,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/llpanelavatar.cpp b/linden/indra/newview/llpanelavatar.cpp
index 6a3a0bd..e3fe141 100644
--- a/linden/indra/newview/llpanelavatar.cpp
+++ b/linden/indra/newview/llpanelavatar.cpp
@@ -1990,6 +1990,7 @@ void LLPanelAvatar::processAvatarPropertiesReply(LLMessageSystem *msg, void**)
                 LLTextEditor* about_field = self->mPanelSecondLife->getChild<LLTextEditor>("about");
                 if (about_field)
                 {
+                        about_field->clear();
                         if (self->mAllowEdit && (self->mAvatarID == agent_id))
                         {
                                 about_field->setText(about_text);
@@ -2009,8 +2010,10 @@ void LLPanelAvatar::processAvatarPropertiesReply(LLMessageSystem *msg, void**)
                         about_field = self->mPanelFirstLife->getChild<LLTextEditor>("about");
                         if (about_field)
                         {
+                                about_field->clear();
                                 if (self->mAllowEdit && (self->mAvatarID == agent_id))
                                 {
+                                        about_field->setText(fl_about_text);
                                 }
                                 else
                                 {
diff --git a/linden/indra/newview/llpaneldisplay.cpp b/linden/indra/newview/llpaneldisplay.cpp
index e8c67e8..00dc2cd 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");
-
-        static BOOL* sEnableWindlightRemote = rebind_llcontrol<BOOL>("EnableWindlightRemote", &gSavedSettings, true);
-        childSetValue("toggle_windlight_control", (*sEnableWindlightRemote));
-        mWLControl = (*sEnableWindlightRemote);
+        mLimitsText = getChild<LLTextBox>("LimitsText");
 
         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)
-        {
-                mRadioReflectionDetail->setIndexEnabled(i, mCtrlReflections->get() && reflections);
-        }
+        mComboReflectionDetail->setEnabled(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);
-                mRadioTerrainDetail->setEnabled(FALSE);
+                mComboTerrainDetail->setValue(1);
+                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(mRadioReflectionDetail != NULL);
+        llassert(mComboTerrainDetail != 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);
-        mRadioReflectionDetail->setVisible(!isHidden);
+        mComboTerrainDetail->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;
-        LLRadioGroup    *mRadioReflectionDetail;
+        LLComboBox              *mComboTerrainDetail;
+        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("afk_timeout_spinner", gSavedSettings.getF32("AFKTimeout"));
+        //childSetValue("show_my_title_checkbox", gSavedSettings.getBOOL("RenderHideGroupTitle")); -- MC
+
+        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.setF32("AFKTimeout", childGetValue("afk_timeout_spinner").asReal());
+        //gSavedSettings.setBOOL("RenderHideGroupTitle", childGetValue("show_my_title_checkbox")); -- MC
+        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/llpanelgroupgeneral.cpp b/linden/indra/newview/llpanelgroupgeneral.cpp
index 8e61c60..8c522cc 100644
--- a/linden/indra/newview/llpanelgroupgeneral.cpp
+++ b/linden/indra/newview/llpanelgroupgeneral.cpp
@@ -814,6 +814,7 @@ void LLPanelGroupGeneral::update(LLGroupChange gc)
 
         if (mEditCharter)
         {
+                mEditCharter->clear();
                 if (mAllowEdit && can_change_ident)
                 {
                         mEditCharter->setText(gdatap->mCharter);
diff --git a/linden/indra/newview/llpanelgroupnotices.cpp b/linden/indra/newview/llpanelgroupnotices.cpp
index 3d5cd3e..8135306 100644
--- a/linden/indra/newview/llpanelgroupnotices.cpp
+++ b/linden/indra/newview/llpanelgroupnotices.cpp
@@ -52,6 +52,7 @@
 #include "lltextbox.h"
 
 #include "roles_constants.h"
+#include "llviewercontrol.h"
 #include "llviewerwindow.h"
 #include "llviewermessage.h"
 #include "llnotifications.h"
@@ -533,7 +534,12 @@ void LLPanelGroupNotices::showNotice(const std::string& subject,
         arrangeNoticeView(VIEW_PAST_NOTICE);
 
         if(mViewSubject) mViewSubject->setText(subject);
-        if(mViewMessage) mViewMessage->setText(message);
+        if(mViewMessage)
+        {
+                mViewMessage->clear();
+                mViewMessage->setParseHTML(TRUE);
+                mViewMessage->appendColoredText(message, false, false, gColors.getColor("TextFgReadOnlyColor"));
+        }
         
         if (mInventoryOffer)
         {
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/llpanellogin.cpp b/linden/indra/newview/llpanellogin.cpp
index 39df8b6..c709015 100644
--- a/linden/indra/newview/llpanellogin.cpp
+++ b/linden/indra/newview/llpanellogin.cpp
@@ -73,7 +73,7 @@
 #include "lluictrlfactory.h"
 #include "llhttpclient.h"
 #include "llweb.h"
-#include "viewerversion.h"
+#include "viewerinfo.h"
 #include "llmediactrl.h"
 
 #include "llfloatermediabrowser.h"
@@ -264,25 +264,10 @@ LLPanelLogin::LLPanelLogin(const LLRect &rect,
 
         // childSetAction("quit_btn", onClickQuit, this);
 
-        std::string imp_channel = gSavedSettings.getString("VersionChannelName");
-        std::string imp_version = llformat("%d.%d.%d %s",
-                ViewerVersion::getImpMajorVersion(),
-                ViewerVersion::getImpMinorVersion(),
-                ViewerVersion::getImpPatchVersion(),
-                ViewerVersion::getImpTestVersion().c_str() );
-
-        std::string ll_channel = ViewerVersion::getLLViewerName();
-        std::string ll_version = llformat("%d.%d.%d (%d)",
-                ViewerVersion::getLLMajorVersion(),
-                ViewerVersion::getLLMinorVersion(),
-                ViewerVersion::getLLPatchVersion(),
-                ViewerVersion::getLLBuildVersion() );
+        std::string imp_version = ViewerInfo::prettyInfo();
 
         LLTextBox* channel_text = getChild<LLTextBox>("channel_text");
-        channel_text->setTextArg("[CHANNEL]", imp_channel);
         channel_text->setTextArg("[VERSION]", imp_version);
-        channel_text->setTextArg("[ALT_CHANNEL]", ll_channel);
-        channel_text->setTextArg("[ALT_VERSION]", ll_version);
         channel_text->setClickedCallback(onClickVersion);
         channel_text->setCallbackUserData(this);
         
@@ -931,12 +916,8 @@ void LLPanelLogin::loadLoginPage()
         }
 
         // Channel and Version
-        std::string version = llformat("%d.%d.%d %s",
-                ViewerVersion::getImpMajorVersion(), ViewerVersion::getImpMinorVersion(),
-                ViewerVersion::getImpPatchVersion(), ViewerVersion::getImpTestVersion().c_str() );
-
-        char* curl_channel = curl_escape(gSavedSettings.getString("VersionChannelName").c_str(), 0);
-        char* curl_version = curl_escape(version.c_str(), 0);
+        char* curl_channel = curl_escape(ViewerInfo::nameWithVariant().c_str(), 0);
+        char* curl_version = curl_escape(ViewerInfo::versionNumbers4().c_str(), 0);
 
         oStr << "&channel=" << curl_channel;
         oStr << "&version=" << curl_version;
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 8dc6601..a867a9c 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("set_cache", onClickSetCache, this);
-        childSetAction("reset_cache", onClickResetCache, this);
+        childSetAction("clear_disk_cache", onClickClearDiskCache, this);
+        childSetAction("set_disk_cache", onClickSetDiskCache, 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*);
-        static void onClickSetCache(void*);
-        static void onClickResetCache(void*);
+        void refresh();
+
+        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();
-}
-
-void LLPrefsAdvanced::onSpellAdd(void* data)
-{
-        LLPrefsAdvanced* panel = (LLPrefsAdvanced*)data;
-        if(panel)
+        if (self)
         {
-                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 "llradiogroup.h"
-#include "llstylemap.h"
+#include "llviewermessage.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();
-        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;
+        bool mChatChannel;
 };
 
 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");
-        mTranslateChat = gSavedSettings.getBOOL("TranslateChat");
-        static F32* sChatBubbleOpacity = rebind_llcontrol<F32>("ChatBubbleOpacity", &gSavedSettings, true);
-        mBubbleOpacity = *sChatBubbleOpacity;
+
+        childSetValue("command_line_check", gSavedSettings.getBOOL("CmdLineChatbarEnabled"));
+        childSetCommitCallback("command_line_check", onCommitCheckBox, this);
+        childSetAction("command_line_btn", onClickCommandLine, this);
+
+        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 ddf027f..53be673 100644
--- a/linden/indra/newview/llprefsim.cpp
+++ b/linden/indra/newview/llprefsim.cpp
@@ -66,7 +66,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();
         
@@ -80,7 +80,6 @@ protected:
  
         bool mGotPersonalInfo;
         bool mGotPerAccountSettings;
-        bool mOriginalIMViaEmail;
 
         bool mOriginalHideOnlineStatus;
         std::string mDirectoryVisibility;
@@ -91,7 +90,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");
@@ -104,29 +102,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 these until we get personal data
+        // Don't enable this 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);
@@ -194,11 +177,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)
-                   ||(new_hide_online != mOriginalHideOnlineStatus))
+                if (new_hide_online != mOriginalHideOnlineStatus)
                 {
                         LLMessageSystem* msg = gMessageSystem;
                         msg->newMessageFast(_PREHASH_UpdateUserInfo);
@@ -206,7 +187,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        
@@ -223,19 +204,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)
@@ -255,22 +229,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
@@ -383,9 +341,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 7c50f4a..0e8e816 100644
--- a/linden/indra/newview/llprefsvoice.cpp
+++ b/linden/indra/newview/llprefsvoice.cpp
@@ -153,8 +153,8 @@ void LLPrefsVoice::apply()
         if (enable_voice && !gSavedSettings.getBOOL("VivoxLicenseAccepted"))
         {
                 // This window enables voice chat if license is accepted
-                FloaterVoiceLicense::getInstance()->open();
-                FloaterVoiceLicense::getInstance()->center();
+                FloaterVoiceLicense::getInstance()->open();
+                FloaterVoiceLicense::getInstance()->center();
         }
         else
         {
@@ -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 89c944d..428596b 100644
--- a/linden/indra/newview/llstartup.cpp
+++ b/linden/indra/newview/llstartup.cpp
@@ -191,7 +191,7 @@
 #include "llwaterparammanager.h"
 #include "llagentlanguage.h"
 #include "llsocks5.h"
-#include "viewerversion.h"
+#include "viewerinfo.h"
 
 #include "lgghunspell_wrapper.h"
 #include "jcfloater_animation_list.h"
@@ -539,9 +539,9 @@ bool idle_startup()
                         if(!start_messaging_system(
                                    message_template_path,
                                    port,
-                                   ViewerVersion::getLLMajorVersion(),
-                                   ViewerVersion::getLLMinorVersion(),
-                                   ViewerVersion::getLLPatchVersion(),
+                                   ViewerInfo::versionMajor(),
+                                   ViewerInfo::versionMinor(),
+                                   ViewerInfo::versionPatch(),
                                    FALSE,
                                    std::string(),
                                    responder,
@@ -1891,8 +1891,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();
 
@@ -1938,8 +1937,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)
                 {
@@ -2072,6 +2070,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 );
@@ -2130,6 +2129,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);
 
@@ -2149,7 +2151,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/lltexturecache.cpp b/linden/indra/newview/lltexturecache.cpp
index 5dc1018..d33d507 100644
--- a/linden/indra/newview/lltexturecache.cpp
+++ b/linden/indra/newview/lltexturecache.cpp
@@ -1207,6 +1207,7 @@ void LLTextureCache::readHeaderCache()
                                 {
                                         purge_list.insert(iter->second);
                                 }
+                                llassert_always(purge_list.size() >= entries_to_purge);
                         }
                         else
                         {
diff --git a/linden/indra/newview/lltexturectrl.cpp b/linden/indra/newview/lltexturectrl.cpp
index ccc3ab2..e58b0b4 100644
--- a/linden/indra/newview/lltexturectrl.cpp
+++ b/linden/indra/newview/lltexturectrl.cpp
@@ -1304,6 +1304,7 @@ public:
 
 BOOL LLTextureCtrl::handleHover(S32 x, S32 y, MASK mask)
 {
+        if (!getEnabled()) { return FALSE; }
         getWindow()->setCursor(UI_CURSOR_HAND);
         return TRUE;
 }
@@ -1311,6 +1312,7 @@ BOOL LLTextureCtrl::handleHover(S32 x, S32 y, MASK mask)
 
 BOOL LLTextureCtrl::handleMouseDown(S32 x, S32 y, MASK mask)
 {
+        if (!getEnabled()) { return FALSE; }
         BOOL handled = LLUICtrl::handleMouseDown( x, y , mask );
         if( handled )
         {
@@ -1421,6 +1423,8 @@ BOOL LLTextureCtrl::handleDragAndDrop(S32 x, S32 y, MASK mask,
                                           EAcceptance *accept,
                                           std::string& tooltip_msg)
 {
+        if (!getEnabled()) { return FALSE; }
+
         BOOL handled = FALSE;
 
         // this downcast may be invalid - but if the second test below
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 2ba6b50..c38408d 100644
--- a/linden/indra/newview/llviewermedia.cpp
+++ b/linden/indra/newview/llviewermedia.cpp
@@ -40,7 +40,7 @@
 #include "llviewerimage.h"
 #include "llviewerwindow.h"
 #include "llviewerimagelist.h"
-//#include "viewerversion.h"
+//#include "viewerinfo.h"
 
 #include "llpluginclassmedia.h"
 
@@ -261,7 +261,7 @@ std::string LLViewerMedia::getCurrentUserAgent()
         std::ostringstream codec;
         codec << "SecondLife/";
         codec << "C64 Basic V2";
-        //codec << ViewerVersion::getImpMajorVersion() << "." << ViewerVersion::getImpMinorVersion() << "." << ViewerVersion::getImpPatchVersion() << " " << ViewerVersion::getImpTestVersion();
+        //codec << " " << ViewerInfo::versionNumbers3();
         //codec << " (" << channel << "; " << skin_name << " skin)";
 //      llinfos << codec.str() << llendl;
         
@@ -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/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp
index b85f3ca..9b5c687 100644
--- a/linden/indra/newview/llviewermenu.cpp
+++ b/linden/indra/newview/llviewermenu.cpp
@@ -564,7 +564,7 @@ void pre_init_menus()
         // static information
         LLColor4 color;
         color = gColors.getColor( "MenuDefaultBgColor" );
-        LLMenuGL::setDefaultBackgroundColor( color );
+        LLMenuGL::setDefaultBackgroundColor(color);
         color = gColors.getColor( "MenuItemEnabledColor" );
         LLMenuItemGL::setEnabledColor( color );
         color = gColors.getColor( "MenuItemDisabledColor" );
@@ -651,18 +651,8 @@ void init_menus()
         color = gColors.getColor( "MenuPopupBgColor" );
         gPopupMenuView->setBackgroundColor( color );
 
-        // If we are not in production, use a different color to make it apparent.
-        if (LLViewerLogin::getInstance()->isInProductionGrid())
-        {
-                color = gColors.getColor( "MenuBarBgColor" );
-        }
-        else
-        {
-                color = gColors.getColor( "MenuNonProductionBgColor" );
-        }
         gMenuBarView = (LLMenuBarGL*)LLUICtrlFactory::getInstance()->buildMenu("menu_viewer.xml", gMenuHolder);
         gMenuBarView->setRect(LLRect(0, top, 0, top - MENU_BAR_HEIGHT));
-        gMenuBarView->setBackgroundColor( color );
 
     // gMenuBarView->setItemVisible("Tools", FALSE);
         gMenuBarView->arrange();
@@ -673,8 +663,7 @@ void init_menus()
         // flash when an item is triggered (the flash occurs in the holder)
         gViewerWindow->getRootView()->addChild(gMenuHolder);
    
-    gViewerWindow->setMenuBackgroundColor(false, 
-        LLViewerLogin::getInstance()->isInProductionGrid());
+    gViewerWindow->setMenuBackgroundColor(false, LLViewerLogin::getInstance()->isInProductionGrid());
 
         // Assume L$10 for now, the server will tell us the real cost at login
         std::string fee = gHippoGridManager->getConnectedGrid()->getCurrencySymbol() + "10";
@@ -723,8 +712,6 @@ void init_menus()
         LLRect menuBarRect = gLoginMenuBarView->getRect();
         gLoginMenuBarView->setRect(LLRect(menuBarRect.mLeft, menuBarRect.mTop, gViewerWindow->getRootView()->getRect().getWidth() - menuBarRect.mLeft,  menuBarRect.mBottom));
 
-        gLoginMenuBarView->setBackgroundColor( color );
-
         gMenuHolder->addChild(gLoginMenuBarView);
 }
 
diff --git a/linden/indra/newview/llviewermessage.cpp b/linden/indra/newview/llviewermessage.cpp
index 84e2b7e..3e686f4 100755
--- a/linden/indra/newview/llviewermessage.cpp
+++ b/linden/indra/newview/llviewermessage.cpp
@@ -1973,7 +1973,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
         {
         case IM_CONSOLE_AND_CHAT_HISTORY:
                 // These are used for system messages, hence don't need the name,
-                // as it is always "Imprudence".
+                // as it is always "Imprudence".  Or "meta-impy" maybe?  shrugs
                 // *TODO:translate
                 args["MESSAGE"] = message;
 
diff --git a/linden/indra/newview/llviewerwindow.cpp b/linden/indra/newview/llviewerwindow.cpp
index 868094e..a49dde6 100644
--- a/linden/indra/newview/llviewerwindow.cpp
+++ b/linden/indra/newview/llviewerwindow.cpp
@@ -2025,15 +2025,15 @@ void LLViewerWindow::setMenuBackgroundColor(bool god_mode, bool dev_grid)
     LLSD args;
     LLColor4 new_bg_color;
 
-    if(god_mode && LLViewerLogin::getInstance()->isInProductionGrid())
+    if (god_mode && dev_grid)
     {
         new_bg_color = gColors.getColor( "MenuBarGodBgColor" );
     }
-    else if(god_mode && !LLViewerLogin::getInstance()->isInProductionGrid())
+    else if(god_mode && !dev_grid)
     {
         new_bg_color = gColors.getColor( "MenuNonProductionGodBgColor" );
     }
-    else if(!god_mode && !LLViewerLogin::getInstance()->isInProductionGrid())
+    else if(!god_mode && !dev_grid)
     {
         new_bg_color = gColors.getColor( "MenuNonProductionBgColor" );
     }
@@ -2042,10 +2042,12 @@ void LLViewerWindow::setMenuBackgroundColor(bool god_mode, bool dev_grid)
         new_bg_color = gColors.getColor( "MenuBarBgColor" );
     }
 
-    if(gMenuBarView)
+        // Not doing this is a cheap workaround for the menu not having a good way to tell
+        // the difference between bar and item color -- MC
+        /*if(gMenuBarView)
     {
         gMenuBarView->setBackgroundColor( new_bg_color );
-    }
+    }*/
 
     if(gStatusBar)
     {
diff --git a/linden/indra/newview/llvoavatar.cpp b/linden/indra/newview/llvoavatar.cpp
index c268580..5c537a8 100644
--- a/linden/indra/newview/llvoavatar.cpp
+++ b/linden/indra/newview/llvoavatar.cpp
@@ -67,8 +67,9 @@
 #include "lltexlayer.h"
 #include "lltoolgrab.h" // for needsRenderBeam
 #include "lltoolmgr.h" // for needsRenderBeam
-#include "lltoolmorph.h"
+#include "lltoolmorph.h" // for auto de-ruth
 #include "llviewercamera.h"
+#include "llviewergenericmessage.h"
 #include "llviewerimagelist.h"
 #include "llviewermedia.h"
 #include "llviewermenu.h"
@@ -870,6 +871,8 @@ LLVOAvatar::LLVOAvatar(const LLUUID& id,
         mOohMorph      = NULL;
         mAahMorph      = NULL;
 
+        mRuthTimer.reset();
+
         //-------------------------------------------------------------------------
         // initialize joint, mesh and shape members
         //-------------------------------------------------------------------------
@@ -1525,7 +1528,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();
         }
 }
@@ -7461,6 +7464,8 @@ BOOL LLVOAvatar::updateIsFullyLoaded()
                 loading = TRUE;
         }
 
+        updateRuthTimer(loading);
+
         // special case to keep nudity off orientation island -
         // this is fragilely dependent on the compositing system,
         // which gets available textures in the following order:
@@ -7513,6 +7518,35 @@ BOOL LLVOAvatar::updateIsFullyLoaded()
         return changed;
 }
 
+void LLVOAvatar::updateRuthTimer(bool loading)
+{
+        if (isSelf() || !loading) 
+        {
+                return;
+        }
+
+        if (mPreviousFullyLoaded)
+        {
+                mRuthTimer.reset();
+        }
+
+        const F32 LOADING_TIMEOUT__SECONDS = 90.f;
+        if (mRuthTimer.getElapsedTimeF32() > LOADING_TIMEOUT__SECONDS)
+        {
+                llinfos << "Ruth Timer timeout: Missing texture data for '" << getFullname() << "' "
+                        << "( Params loaded : " << !visualParamWeightsAreDefault() << " ) "
+                        << "( Lower : " << isTextureDefined(TEX_LOWER_BAKED) << " ) "
+                        << "( Upper : " << isTextureDefined(TEX_UPPER_BAKED) << " ) "
+                        << "( Head : " << isTextureDefined(TEX_HEAD_BAKED) << " )."
+                        << llendl;
+
+                //LLAvatarPropertiesProcessor::getInstance()->sendAvatarTexturesRequest(getID());
+                std::vector<std::string> strings;
+                strings.push_back(getID().asString());
+                send_generic_message("avatartexturesrequest", strings);
+                mRuthTimer.reset();
+        }
+}
 
 BOOL LLVOAvatar::isFullyLoaded()
 {
@@ -7603,7 +7637,8 @@ LLGLuint LLVOAvatar::getScratchTexName( LLGLenum format, U32* texture_bytes )
         {
         case GL_LUMINANCE:                      components = 1; internal_format = GL_LUMINANCE8;                break;
         case GL_ALPHA:                          components = 1; internal_format = GL_ALPHA8;                    break;
-        case GL_COLOR_INDEX:            components = 1; internal_format = GL_COLOR_INDEX8_EXT;  break;
+// Deprecated.  See http://svn.secondlife.com/trac/linden/changeset/2757
+//      case GL_COLOR_INDEX:            components = 1; internal_format = GL_COLOR_INDEX8_EXT;  break;
         case GL_LUMINANCE_ALPHA:        components = 2; internal_format = GL_LUMINANCE8_ALPHA8; break;
         case GL_RGB:                            components = 3; internal_format = GL_RGB8;                              break;
         case GL_RGBA:                           components = 4; internal_format = GL_RGBA8;                             break;
@@ -8756,7 +8791,6 @@ void LLVOAvatar::processAvatarAppearance( LLMessageSystem* mesgsys )
 
                                 if( !param )
                                 {
-                                        llwarns << "Number of params in AvatarAppearance msg does not match number of params in avatar xml file." << llendl;
                                         break;
                                 }
 
@@ -8798,10 +8832,9 @@ void LLVOAvatar::processAvatarAppearance( LLMessageSystem* mesgsys )
                         }
                 }
 
-                S32 expected_tweakable_count = getVisualParamCountInGroup(VISUAL_PARAM_GROUP_TWEAKABLE); // don't worry about VISUAL_PARAM_GROUP_TWEAKABLE_NO_TRANSMIT
-                if (num_blocks != expected_tweakable_count)
+                while( param && (param->getGroup() != VISUAL_PARAM_GROUP_TWEAKABLE) )
                 {
-                        llinfos << "Number of params in AvatarAppearance msg (" << num_blocks << ") does not match number of tweakable params in avatar xml file (" << expected_tweakable_count << "). Processing what we can. Object: " << getID() << llendl;
+                        param = getNextVisualParam();
                 }
 
                 if (params_changed)
@@ -8822,6 +8855,23 @@ void LLVOAvatar::processAvatarAppearance( LLMessageSystem* mesgsys )
         else
         {
                 llwarns << "AvatarAppearance msg received without any parameters, object: " << getID() << llendl;
+                const F32 LOADING_TIMEOUT_SECONDS = 60.f;
+                // this isn't really a problem if we already have a non-default shape
+                if (visualParamWeightsAreDefault() && mRuthTimer.getElapsedTimeF32() > LOADING_TIMEOUT_SECONDS)
+                {
+                        // re-request appearance, hoping that it comes back with a shape next time
+                        llinfos << "Re-requesting AvatarAppearance for object: "  << getID() << llendl;
+                        //LLAvatarPropertiesProcessor::getInstance()->sendAvatarTexturesRequest(getID());
+                        std::vector<std::string> strings;
+                        strings.push_back(getID().asString());
+                        send_generic_message("avatartexturesrequest", strings);
+                        mRuthTimer.reset();
+                }
+                else
+                {
+                        llinfos << "That's okay, we already have a non-default shape for object: "  << getID() << llendl;
+                        // we don't really care.
+                }
         }
 
         setCompositeUpdatesEnabled( TRUE );
diff --git a/linden/indra/newview/llvoavatar.h b/linden/indra/newview/llvoavatar.h
index 4d08bf0..5dbc945 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:
@@ -371,12 +372,15 @@ public:
 public:
         BOOL            isFullyLoaded();
         BOOL            updateIsFullyLoaded();
+protected:
+        void            updateRuthTimer(bool loading);
 private:
         BOOL            mFullyLoaded;
         BOOL            mPreviousFullyLoaded;
         BOOL            mFullyLoadedInitialized;
         S32             mFullyLoadedFrameCounter;
         LLFrameTimer    mFullyLoadedTimer;
+        LLFrameTimer    mRuthTimer;
 
         //--------------------------------------------------------------------
         // Collision Volumes
diff --git a/linden/indra/newview/llvoiceclient.cpp b/linden/indra/newview/llvoiceclient.cpp
index 63362be..4b5d3ce 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;
         }
         
@@ -452,13 +455,13 @@ void LLVivoxProtocolParser::StartTag(const char *tag, const char **attr)
                                 }
                         }
                 }
-                LL_DEBUGS("VivoxProtocolParser") << tag << " (" << responseDepth << ")"  << LL_ENDL;
+                LL_DEBUGS("VivoxProtocolParserTag") << tag << " (" << responseDepth << ")"  << LL_ENDL;
         }
         else
         {
                 if (ignoringTags)
                 {
-                        LL_DEBUGS("VivoxProtocolParser") << "ignoring tag " << tag << " (depth = " << responseDepth << ")" << LL_ENDL;
+                        LL_DEBUGS("VivoxProtocolParserTag") << "ignoring tag " << tag << " (depth = " << responseDepth << ")" << LL_ENDL;
                 }
                 else
                 {
@@ -471,7 +474,7 @@ void LLVivoxProtocolParser::StartTag(const char *tag, const char **attr)
                                 ignoreDepth = responseDepth;
                                 accumulateText = false;
 
-                                LL_DEBUGS("VivoxProtocolParser") << "starting ignore, ignoreDepth is " << ignoreDepth << LL_ENDL;
+                                LL_DEBUGS("VivoxProtocolParserTag") << "starting ignore, ignoreDepth is " << ignoreDepth << LL_ENDL;
                         }
                         else if (!stricmp("CaptureDevices", tag))
                         {
@@ -512,18 +515,18 @@ void LLVivoxProtocolParser::EndTag(const char *tag)
         {
                 if (ignoreDepth == responseDepth)
                 {
-                        LL_DEBUGS("VivoxProtocolParser") << "end of ignore" << LL_ENDL;
+                        LL_DEBUGS("VivoxProtocolParserTag") << "end of ignore" << LL_ENDL;
                         ignoringTags = false;
                 }
                 else
                 {
-                        LL_DEBUGS("VivoxProtocolParser") << "ignoring tag " << tag << " (depth = " << responseDepth << ")" << LL_ENDL;
+                        LL_DEBUGS("VivoxProtocolParserTag") << "ignoring tag " << tag << " (depth = " << responseDepth << ")" << LL_ENDL;
                 }
         }
         
         if (!ignoringTags)
         {
-                LL_DEBUGS("VivoxProtocolParser") << "processing tag " << tag << " (depth = " << responseDepth << ")" << LL_ENDL;
+                LL_DEBUGS("VivoxProtocolParserTag") << "processing tag " << tag << " (depth = " << responseDepth << ")" << LL_ENDL;
 
                 // Closing a tag. Finalize the text we've accumulated and reset
                 if (!stricmp("ReturnCode", tag))
@@ -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;
@@ -1169,11 +1175,13 @@ LLVoiceClient::LLVoiceClient()
                 // Ignoring SIGCHLD should prevent zombies from being created.  Alternately, we could use wait(), but I'd rather not do that.
                 signal(SIGCHLD, SIG_IGN);
 #endif
-
-        // set up state machine
-        setState(stateDisabled);
-        
-        gIdleCallbacks.addFunction(idle, this);
+        if(!gSavedSettings.getBOOL("CmdLineDisableVoice"))//no reason to lag non-voice users
+        {
+                // set up state machine
+                setState(stateDisabled);
+                
+                gIdleCallbacks.addFunction(idle, this);
+        }
 }
 
 //---------------------------------------------------
@@ -1347,22 +1355,33 @@ void LLVoiceClient::userAuthorized(const std::string& firstName, const std::stri
         sConnectingToAgni = LLViewerLogin::getInstance()->isInProductionGrid();
 
         mAccountName = nameFromID(agentID);
+        mAccountActive = true;
 }
 
 void LLVoiceClient::requestVoiceAccountProvision(S32 retries)
 {
-        if ( gAgent.getRegion() && mVoiceEnabled )
+        LLViewerRegion* region =  gAgent.getRegion();
+        if ( mVoiceEnabled  && region && region->capabilitiesReceived())
         {
-                std::string url = 
-                        gAgent.getRegion()->getCapability(
-                                "ProvisionVoiceAccountRequest");
+                std::string url = region->getCapability("ProvisionVoiceAccountRequest");
+
+                if ( url.empty() )
+                {
+                        mVAPRequested = false;
+                        mAccountActive = false;
+                        LL_DEBUGS("VoiceSession") << "Cancel Session: ProvisionVoiceAccountRequest capability empty."
+                                << llendl;
+                        setState(stateDisableCleanup);
+                }
 
-                if ( url == "" ) return;
+                LL_DEBUGS("VoiceCaps") << "Got ProvisionVoiceAccountRequest capability: " 
+                                << url << llendl;
 
+                mVAPCapResponseID.generate();
                 LLHTTPClient::post(
                         url,
                         LLSD(),
-                        new LLViewerVoiceAccountProvisionResponder(retries));
+                        new LLViewerVoiceAccountProvisionResponder(retries, mVAPCapResponseID));
         }
 }
 
@@ -1370,11 +1389,46 @@ 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;
+                LL_DEBUGS("VoiceSession") << "Cancel Session: Protocol changed."
+                                << llendl;
+                setState(stateDisableCleanup);
+        }
+
+
         if(!mAccountHandle.empty())
         {
                 // Already logged in.
@@ -1432,6 +1486,185 @@ 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.setTimerExpirySec(CONNECT_THROTTLE_SECONDS);
+                mUpdateTimer.start();
+                
+                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;
+                LL_DEBUGS("VoiceSession") << "Cancel Session: no module"
+                                << llendl;
+                setState(stateDisableCleanup);
+        }
+
+        // we are done, re-allow ProvisionVoiceAccountRequest
+        mVAPRequested = false;
+}
+
+
 void LLVoiceClient::idle(void* user_data)
 {
         LLVoiceClient* self = (LLVoiceClient*)user_data;
@@ -1527,6 +1760,8 @@ void LLVoiceClient::setState(state inState)
 }
 void LLVoiceClient::close()
 {
+        LL_DEBUGS("VoiceSession") << "Cancel Session: LLVoiceClient::close() called."
+                                << llendl;
         setState(stateDisableCleanup);
 }
 
@@ -1537,11 +1772,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("CmdLineDisableVoice") );
+                        && gSavedSettings.getBOOL("EnableVoiceChat") );
 
         if(mVoiceEnabled)
         {
@@ -1560,12 +1804,10 @@ 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();
-                        
+                        LL_DEBUGS("VoiceSession") << "Cancel Session: User turned off voice or logs off."
+                                << llendl;
+                        mAccountActive = false;
                         setState(stateDisableCleanup);
                 }
         }
@@ -1574,47 +1816,21 @@ void LLVoiceClient::stateMachine()
         if(mVoiceEnabled)
         {
                 LLViewerRegion *region = gAgent.getRegion();
-                LLParcel *parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
-                
-                if(region && parcel)
+                if(region && region->capabilitiesReceived())
                 {
-                        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())
+                        LLParcel *parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
+                        if(parcel)
                         {
-                                if(!capURI.empty())
-                                {
-                                        if((parcelLocalID != mCurrentParcelLocalID) || (regionName != mCurrentRegionName))
-                                        {
-                                                // We have changed parcels.  Initiate a parcel channel lookup.
-                                                mCurrentParcelLocalID = parcelLocalID;
-                                                mCurrentRegionName = regionName;
-                                                
-                                                parcelChanged();
-                                        }
-                                }
-                                else
+                                S32 parcelLocalID = parcel->getLocalID();
+                                std::string regionName = region->getName();
+        
+                                if((parcelLocalID != mCurrentParcelLocalID) || (regionName != mCurrentRegionName))
                                 {
-                                        static int count = 0;
-                                        static int count2 = 0;
-                                        static int num = 1;
-                                        ++count;
-                                        if (count % num == 0)
-                                        {
-                                          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;
-                                          }
-                                        }
+                                        // We have changed parcels.  Initiate a parcel channel lookup.
+                                        mCurrentParcelLocalID = parcelLocalID;
+                                        mCurrentRegionName = regionName;
+                                        
+                                        parcelChanged();
                                 }
                         }
                 }
@@ -1624,191 +1840,65 @@ 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();
-                        
-                        setState(stateDisabled);        
+                        mVAPRequested = false;
+                        setState(stateDisabled);
                 break;
                 
                 //MARK: stateDisabled
                 case stateDisabled:
-                        if(mTuningMode || (mVoiceEnabled && !mAccountName.empty()))
+                        if(mTuningMode || (mVoiceEnabled && mAccountActive && !mAccountName.empty()))
                         {
                                 setState(stateStart);
                         }
                 break;
-                
+
                 //MARK: stateStart
                 case stateStart:
-                        if(gSavedSettings.getBOOL("CmdLineDisableVoice"))
-                        {
-                                // Voice is locked out, we must not launch the vivox daemon.
-                                setState(stateJail);
-                        }
-                        else if(!isGatewayRunning())
+                {
+                        LLViewerRegion *region = gAgent.getRegion();
+                        bool have_region = (NULL != region && region->capabilitiesReceived());
+                        if(mVoiceEnabled && !mVAPRequested && !mAccountName.empty() && have_region)
                         {
-                                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();
+                                mVAPRequested = true;
+                                requestVoiceAccountProvision();
                         }
-                break;
+                } 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);
                                 }
-                                
+
                                 mConnected = mSocket->blockingConnect(mDaemonHost);
                                 if(mConnected)
                                 {
@@ -1817,6 +1907,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();
                                 }
                         }
@@ -1842,9 +1933,8 @@ void LLVoiceClient::stateMachine()
 
                         setState(stateConnected);
                 }
-
                 break;
-                
+
                 //MARK: stateConnected
                 case stateConnected:
                         // Initial devices query
@@ -1871,24 +1961,16 @@ void LLVoiceClient::stateMachine()
                         }
                         else if(!mAccountName.empty() && mVoiceEnabled)
                         {
-                                LLViewerRegion *region = gAgent.getRegion();
-                                
-                                if(region)
+                                if ( mAccountPassword.empty() )
                                 {
-                                        if ( region->getCapability("ProvisionVoiceAccountRequest") != "" )
-                                        {
-                                                if ( mAccountPassword.empty() )
-                                                {
-                                                        requestVoiceAccountProvision();
-                                                }
-                                                setState(stateConnectorStart);
-                                        }
-                                        else
-                                        {
-                                                LL_DEBUGS("Voice") << "region doesn't have ProvisionVoiceAccountRequest capability!" << LL_ENDL;
-                                        }
+                                        requestVoiceAccountProvision();
+                                }
+                                else
+                                {
+                                        setState(stateConnectorStart);
                                 }
                         }
+
                 break;
 
                 //MARK: stateMicTuningStart
@@ -2025,7 +2107,10 @@ void LLVoiceClient::stateMachine()
                         if(mLoginRetryCount > MAX_LOGIN_RETRIES)
                         {
                                 LL_WARNS("Voice") << "too many login retries, giving up." << LL_ENDL;
-                                setState(stateLoginFailed);
+                                LL_DEBUGS("VoiceSession") << "Cancel Session: too many login retries."
+                                << llendl;
+                                mAccountActive = false;
+                                setState(stateDisableCleanup);
                         }
                         else
                         {
@@ -2385,7 +2470,11 @@ void LLVoiceClient::stateMachine()
 
                 //MARK: stateConnectorStopped
                 case stateConnectorStopped:             // connector stop received
+                {
+                        LL_DEBUGS("VoiceSession") << "Cancel Session: entered stateConnectorStopped."
+                                << llendl;      
                         setState(stateDisableCleanup);
+                }
                 break;
 
                 //MARK: stateConnectorFailed
@@ -2396,6 +2485,8 @@ void LLVoiceClient::stateMachine()
                 case stateConnectorFailedWaiting:
                         if(!mVoiceEnabled)
                         {
+                                LL_DEBUGS("VoiceSession") << "Cancel Session: entered stateConnectorFailedWaiting."
+                                        << llendl;
                                 setState(stateDisableCleanup);
                         }
                 break;
@@ -2408,6 +2499,8 @@ void LLVoiceClient::stateMachine()
                 case stateLoginFailedWaiting:
                         if(!mVoiceEnabled)
                         {
+                                LL_DEBUGS("VoiceSession") << "Cancel Session: entered stateLoginFailedWaiting."
+                                                << llendl;
                                 setState(stateDisableCleanup);
                         }
                 break;
@@ -2569,7 +2662,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 +2698,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 +2735,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 +2753,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 +2782,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 +2817,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 +2827,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 +2842,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 +2855,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 +2868,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 +2884,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 +2916,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 +2954,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 +3044,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 +3057,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
@@ -3033,17 +3126,17 @@ void LLVoiceClient::daemonDied()
         LL_WARNS("Voice") << "Connection to vivox daemon lost.  Resetting state."<< LL_ENDL;
 
         // Try to relaunch the daemon
+        LL_DEBUGS("VoiceSession") << "Cancel Session: voice daemon died."
+                                << llendl;
         setState(stateDisableCleanup);
 }
 
 void LLVoiceClient::giveUp()
 {
-        // All has failed.  Clean up and stop trying.
-        closeSocket();
-        deleteAllSessions();
-        deleteAllBuddies();
-        
-        setState(stateJail);
+        mAccountActive = false;
+        LL_DEBUGS("VoiceSession") << "Cancel Session: giveUp() called."
+                                << llendl;
+        setState(stateDisableCleanup);
 }
 
 static void oldSDKTransform (LLVector3 &left, LLVector3 &up, LLVector3 &at, LLVector3d &pos, LLVector3 &vel)
@@ -3378,7 +3471,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 +4192,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 +4272,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 +4342,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 +4407,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 +4528,7 @@ void LLVoiceClient::participantRemovedEvent(
         }
         else
         {
-                LL_DEBUGS("Voice") << "unknown session " << sessionHandle << LL_ENDL;
+                LL_DEBUGS("VoiceSession") << "unknown session " << sessionHandle << LL_ENDL;
         }
 }
 
@@ -4479,7 +4572,7 @@ void LLVoiceClient::participantUpdatedEvent(
         }
         else
         {
-                LL_WARNS("Voice") << "unknown session " << sessionHandle << LL_ENDL;
+                LL_WARNS("VoiceSession") << "unknown session " << sessionHandle << LL_ENDL;
         }
 }
 
@@ -5058,22 +5151,44 @@ LLVoiceClient::participantState* LLVoiceClient::findParticipantByID(const LLUUID
 
 void LLVoiceClient::parcelChanged()
 {
-        if(getState() >= stateNoChannel)
+        mAccountActive = true;
+        LLViewerRegion* region = gAgent.getRegion();
+        if( (getState() >= stateNoChannel) && region && region->capabilitiesReceived())
         {
-                // If the user is logged in, start a channel lookup.
-                LL_DEBUGS("Voice") << "sending ParcelVoiceInfoRequest (" << mCurrentRegionName << ", " << mCurrentParcelLocalID << ")" << LL_ENDL;
+                // If the user is logged in, start a channel lookup,
+                // but not if already in a private call/conference (then SL regions return an empty cap).
+                        //
 
-                std::string url = gAgent.getRegion()->getCapability("ParcelVoiceInfoRequest");
-                LLSD data;
-                LLHTTPClient::post(
-                        url,
-                        data,
-                        new LLVoiceClientCapResponder);
+                std::string url = region->getCapability("ParcelVoiceInfoRequest");
+                LL_DEBUGS("VoiceCaps") << "sending ParcelVoiceInfoRequest (" << mCurrentRegionName << ", " << mCurrentParcelLocalID << ")" << " cap url:" << url << LL_ENDL;
+                if(! url.empty() )
+                {
+                        mPIRCapResponseID.generate();
+                        LLSD data;
+                        LLHTTPClient::post(
+                                url,
+                                data,
+                                new LLVoiceClientCapResponder(mPIRCapResponseID));
+                }
+                else
+                {
+
+                        mAccountActive = false;
+                        LL_DEBUGS("VoiceSession") << "Cancel Session: ParcelVoiceInfoRequest cap empty."
+                                << llendl;
+                        setState(stateDisableCleanup);
+                }
+        }
+        else if (region && !region->capabilitiesReceived())
+        {
+                // We don't know yet where to get the cap so requesting it makes no sense
+                mCurrentRegionName.append("retry");
+                return;
         }
         else
         {
                 // 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 +5201,42 @@ void LLVoiceClient::switchChannel(
 {
         bool needsSwitch = false;
         
-        LL_DEBUGS("Voice") 
-                << "called in state " << state2string(getState()) 
+        LL_DEBUGS("VoiceSession") 
+                << "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;
+                LL_DEBUGS("VoiceSession") << "Cancel Session: Session type changed"
+                                << llendl;
+                setState(stateDisableCleanup);
+                return;
+        }
+
         switch(getState())
         {
                 case stateJoinSessionFailed:
@@ -5148,7 +5293,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 +5305,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 +5350,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 +5433,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 +5482,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 +5603,7 @@ void LLVoiceClient::declineInvite(std::string &sessionHandle)
 
 void LLVoiceClient::leaveNonSpatialChannel()
 {
-        LL_DEBUGS("Voice") 
+        LL_DEBUGS("VoiceSession") 
                 << "called in state " << state2string(getState()) 
                 << LL_ENDL;
         
@@ -5640,7 +5791,9 @@ bool LLVoiceClient::inSpatialChannel(void)
         
         if(mAudioSession)
                 result = mAudioSession->mIsSpatial;
-                
+        if(mNextAudioSession)
+                result |= !(mNextAudioSession->mIsSpatial);
+
         return result;
 }
 
@@ -5821,11 +5974,13 @@ void LLVoiceClient::setVoiceEnabled(bool enabled)
                 mVoiceEnabled = enabled;
                 if (enabled)
                 {
+                        mAccountActive = true;
                         LLVoiceChannel::getCurrentVoiceChannel()->activate();
                 }
                 else
                 {
                         // Turning voice off looses your current channel -- this makes sure the UI isn't out of sync when you re-enable it.
+                        mAccountActive = false;
                         LLVoiceChannel::getCurrentVoiceChannel()->deactivate();
                 }
         }
@@ -6397,7 +6552,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 +6571,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 +6580,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 +6610,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 +6649,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 +6680,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 +6689,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 +6710,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 +6729,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 +7165,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 +7193,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 +7210,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..f5c6d87 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;
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);
-                LLUUID id =  sculpt_params->getSculptTexture(); 
-                mSculptTexture = gImageList.getImage(id);
+                updateSculptTexture();
+
                 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 current_discard = mSculptLevel;
+                        S32 texture_discard = mSculptTexture->getDiscardLevel(); //try to match the texture
+                        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/packaging/mac/ConfigureDMG.scpt b/linden/indra/newview/packaging/mac/ConfigureDMG.scpt
new file mode 100644
index 0000000..198ab9e
--- /dev/null
+++ b/linden/indra/newview/packaging/mac/ConfigureDMG.scpt
@@ -0,0 +1,110 @@
+(*
+
+@file ConfigureDMG.scpt
+@author Jacek Antonelli
+@brief Script for configuring the Mac installer disk image.
+
+Copyright (c) 2011, Jacek Antonelli
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation files
+(the "Software"), to deal in the Software without restriction,
+including without limitation the rights to use, copy, modify, merge,
+publish, distribute, sublicense, and/or sell copies of the Software,
+and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+-----
+
+This AppleScript script configures the view options and icon layout of
+the Mac installer disk image (DMG) as part of the packaging process.
+See also scripts/package.py, which executes this script.
+
+This script takes two required positional command line arguments:
+
+  1: the name of the mounted volume (e.g. for "/Volumes/Imprudence Installer",
+     the volume name is "Imprudence Installer").
+  2: the name of the application file (e.g. "Imprudence.app").
+
+Example usage:
+
+  osascript ConfigureDMG.scpt "Imprudence Installer" "Imprudence.app"
+
+Some preparation is necessary before running this script:
+
+  * The target disk image must be currently attached as a volume, with
+    the volume name specified by the first command line argument.
+  * The volume must contain the application file, with the file
+    name specified by the second command line argument.
+  * The volume must contain the "background.png" image file.
+  * The volume must not contain a file or folder named "Applications".
+  * It might be necessary to "Enable access for assistive devices"
+    in System Preferences > Universal Access.
+
+*)
+
+on run argv
+
+  -- Read the first positional argument, the volume name.
+  set volumeName to item 1 of argv
+
+  -- Read the second positional argument, the app name.
+  set appName to item 2 of argv
+
+  tell application "Finder" to tell disk volumeName
+    -- Open the volume in a Finder window.
+    open 
+    set theWindow to the container window
+
+    -- Tweak some options.
+    set current view of theWindow to icon view
+    set toolbar visible of theWindow to false
+    set statusbar visible of theWindow to false
+
+    -- Set window to position {150,150}, size {+600,+420}.
+    set bounds of theWindow to {150, 150, 750, 570}
+
+    -- Tweak some more options.
+    set viewOptions to the icon view options of theWindow
+    set arrangement of viewOptions to not arranged
+    set icon size of viewOptions to 128
+
+    -- Make sure background.png is visible, so Finder can see it.
+    set bgPicPath to the quoted form of (the POSIX path of (it as alias) & "background.png")
+    do shell script ("SetFile -a v " & bgPicPath)
+    update without registering applications
+
+    -- Use background.png as the background picture.
+    set background picture of viewOptions to file "background.png"
+
+    -- Now set background.png to invisible, so the end user won't see it.
+    do shell script ("SetFile -a V " & bgPicPath)
+
+    -- Position the application file.
+    set position of item appName of theWindow to {138, 260}
+
+    -- Create and position an alias to the Applications folder.
+    set appAlias to make new alias file at theWindow to POSIX file "/Applications"
+    set name of appAlias to "Applications"
+    set position of appAlias to {470, 260}
+
+    -- Visually update the window so all the changes take effect.
+    update without registering applications
+
+    -- Pause briefly so we can admire the results.
+    delay 2
+  end tell
+
+end run
diff --git a/linden/indra/newview/packaging/mac/English.lproj/InfoPlist.strings b/linden/indra/newview/packaging/mac/English.lproj/InfoPlist.strings
new file mode 100644
index 0000000..1ebe727
--- /dev/null
+++ b/linden/indra/newview/packaging/mac/English.lproj/InfoPlist.strings
@@ -0,0 +1,5 @@
+/* Localized versions of Info.plist keys */
+
+CFBundleName = "Imprudence";
+CFBundleShortVersionString = "Imprudence 1.4.0 beta 1";
+CFBundleGetInfoString = "Imprudence 1.4.0 beta 1";
diff --git a/linden/indra/newview/English.lproj/language.txt b/linden/indra/newview/packaging/mac/English.lproj/language.txt
index bc0aa57..bc0aa57 100644
--- a/linden/indra/newview/English.lproj/language.txt
+++ b/linden/indra/newview/packaging/mac/English.lproj/language.txt
diff --git a/linden/indra/newview/packaging/mac/GenerateInfoPlist.cmake b/linden/indra/newview/packaging/mac/GenerateInfoPlist.cmake
new file mode 100644
index 0000000..ecbec34
--- /dev/null
+++ b/linden/indra/newview/packaging/mac/GenerateInfoPlist.cmake
@@ -0,0 +1,39 @@
+# 
+# Generate the Info.plist file from the template.
+# Only @-style "@VARIABLES@" are substituted in the template (not "${VARIABLES}").
+# 
+# This script is needed because CMake has no other way to perform
+# configure_file() as a build-time custom command. :(
+# 
+# When running this script, you must define (-D) SOURCE_DIR and
+# BINARY_DIR to refer to indra and the build directory respectively.
+# (Equivalent to CMAKE_SOURCE_DIR and CMAKE_BINARY_DIR in
+# CMakeLists.txt )
+# 
+
+if (NOT SOURCE_DIR)
+  message( FATAL_ERROR "You forgot to define SOURCE_DIR!" )
+endif (NOT SOURCE_DIR)
+
+if (NOT BINARY_DIR)
+  message( FATAL_ERROR "You forgot to define BINARY_DIR!" )
+endif (NOT BINARY_DIR)
+
+set(SCRIPTS_DIR "${SOURCE_DIR}/../scripts")
+set(CMAKE_MODULE_PATH "${SOURCE_DIR}/cmake/" "${CMAKE_ROOT/Modules}")
+
+include(BuildVersion)
+build_version(viewer)
+
+SET( BUNDLE_NAME           "${viewer_NAME}"                   )
+SET( EXECUTABLE            "${viewer_NAME}"                   )
+set( BUNDLE_VERSION        "${viewer_VERSION}"                )
+set( SHORT_VERSION_STRING  "${viewer_NAME} ${viewer_VERSION}" )
+set( ICON_FILE             "viewer.icns"                      )
+set( IDENTIFIER            "${viewer_BUNDLE_ID}"              )
+set( SIGNATURE             "impr"                             )
+
+configure_file(
+  ${SOURCE_DIR}/newview/packaging/mac/Info.plist.in
+  ${BINARY_DIR}/newview/packaging/mac/Info.plist 
+  @ONLY)
diff --git a/linden/indra/newview/German.lproj/language.txt b/linden/indra/newview/packaging/mac/German.lproj/language.txt
index c42e816..c42e816 100644
--- a/linden/indra/newview/German.lproj/language.txt
+++ b/linden/indra/newview/packaging/mac/German.lproj/language.txt
diff --git a/linden/indra/newview/Info-meta-impy.plist b/linden/indra/newview/packaging/mac/Info.plist.in
index 3469e5c..3469e5c 100644
--- a/linden/indra/newview/Info-meta-impy.plist
+++ b/linden/indra/newview/packaging/mac/Info.plist.in
diff --git a/linden/indra/newview/Japanese.lproj/language.txt b/linden/indra/newview/packaging/mac/Japanese.lproj/language.txt
index c6e3ab6..c6e3ab6 100644
--- a/linden/indra/newview/Japanese.lproj/language.txt
+++ b/linden/indra/newview/packaging/mac/Japanese.lproj/language.txt
diff --git a/linden/indra/newview/Korean.lproj/language.txt b/linden/indra/newview/packaging/mac/Korean.lproj/language.txt
index b03ec72..b03ec72 100644
--- a/linden/indra/newview/Korean.lproj/language.txt
+++ b/linden/indra/newview/packaging/mac/Korean.lproj/language.txt
diff --git a/linden/indra/newview/packaging/mac/background.png b/linden/indra/newview/packaging/mac/background.png
new file mode 100644
index 0000000..9b0b0b2
--- /dev/null
+++ b/linden/indra/newview/packaging/mac/background.png
diff --git a/linden/indra/newview/da.lproj/language.txt b/linden/indra/newview/packaging/mac/da.lproj/language.txt
index 316d25d..316d25d 100644
--- a/linden/indra/newview/da.lproj/language.txt
+++ b/linden/indra/newview/packaging/mac/da.lproj/language.txt
diff --git a/linden/indra/newview/es.lproj/language.txt b/linden/indra/newview/packaging/mac/es.lproj/language.txt
index 6c43814..6c43814 100644
--- a/linden/indra/newview/es.lproj/language.txt
+++ b/linden/indra/newview/packaging/mac/es.lproj/language.txt
diff --git a/linden/indra/newview/fr.lproj/language.txt b/linden/indra/newview/packaging/mac/fr.lproj/language.txt
index 717280a..717280a 100644
--- a/linden/indra/newview/fr.lproj/language.txt
+++ b/linden/indra/newview/packaging/mac/fr.lproj/language.txt
diff --git a/linden/indra/newview/hu.lproj/language.txt b/linden/indra/newview/packaging/mac/hu.lproj/language.txt
index 6c604cf..6c604cf 100644
--- a/linden/indra/newview/hu.lproj/language.txt
+++ b/linden/indra/newview/packaging/mac/hu.lproj/language.txt
diff --git a/linden/indra/newview/it.lproj/language.txt b/linden/indra/newview/packaging/mac/it.lproj/language.txt
index c919714..c919714 100644
--- a/linden/indra/newview/it.lproj/language.txt
+++ b/linden/indra/newview/packaging/mac/it.lproj/language.txt
diff --git a/linden/indra/newview/nl.lproj/language.txt b/linden/indra/newview/packaging/mac/nl.lproj/language.txt
index d5f5c2a..d5f5c2a 100644
--- a/linden/indra/newview/nl.lproj/language.txt
+++ b/linden/indra/newview/packaging/mac/nl.lproj/language.txt
diff --git a/linden/indra/newview/pl.lproj/language.txt b/linden/indra/newview/packaging/mac/pl.lproj/language.txt
index 55239f3..55239f3 100644
--- a/linden/indra/newview/pl.lproj/language.txt
+++ b/linden/indra/newview/packaging/mac/pl.lproj/language.txt
diff --git a/linden/indra/newview/pt.lproj/language.txt b/linden/indra/newview/packaging/mac/pt.lproj/language.txt
index 9e3340e..9e3340e 100644
--- a/linden/indra/newview/pt.lproj/language.txt
+++ b/linden/indra/newview/packaging/mac/pt.lproj/language.txt
diff --git a/linden/indra/newview/ru.lproj/language.txt b/linden/indra/newview/packaging/mac/ru.lproj/language.txt
index adc719b..adc719b 100644
--- a/linden/indra/newview/ru.lproj/language.txt
+++ b/linden/indra/newview/packaging/mac/ru.lproj/language.txt
diff --git a/linden/indra/newview/tr.lproj/language.txt b/linden/indra/newview/packaging/mac/tr.lproj/language.txt
index 44266bf..44266bf 100644
--- a/linden/indra/newview/tr.lproj/language.txt
+++ b/linden/indra/newview/packaging/mac/tr.lproj/language.txt
diff --git a/linden/indra/newview/uk.lproj/language.txt b/linden/indra/newview/packaging/mac/uk.lproj/language.txt
index fbc658f..fbc658f 100644
--- a/linden/indra/newview/uk.lproj/language.txt
+++ b/linden/indra/newview/packaging/mac/uk.lproj/language.txt
diff --git a/linden/indra/newview/SecondLife.nib/classes.nib b/linden/indra/newview/packaging/mac/viewer.nib/classes.nib
index ea58db1..ea58db1 100644
--- a/linden/indra/newview/SecondLife.nib/classes.nib
+++ b/linden/indra/newview/packaging/mac/viewer.nib/classes.nib
diff --git a/linden/indra/newview/SecondLife.nib/info.nib b/linden/indra/newview/packaging/mac/viewer.nib/info.nib
index 1b531de..1b531de 100644
--- a/linden/indra/newview/SecondLife.nib/info.nib
+++ b/linden/indra/newview/packaging/mac/viewer.nib/info.nib
diff --git a/linden/indra/newview/SecondLife.nib/objects.xib b/linden/indra/newview/packaging/mac/viewer.nib/objects.xib
index 7ef13e0..7ef13e0 100644
--- a/linden/indra/newview/SecondLife.nib/objects.xib
+++ b/linden/indra/newview/packaging/mac/viewer.nib/objects.xib
diff --git a/linden/indra/newview/zh-Hans.lproj/language.txt b/linden/indra/newview/packaging/mac/zh-Hans.lproj/language.txt
index 147d659..147d659 100644
--- a/linden/indra/newview/zh-Hans.lproj/language.txt
+++ b/linden/indra/newview/packaging/mac/zh-Hans.lproj/language.txt
diff --git a/linden/indra/newview/primbackup.cpp b/linden/indra/newview/primbackup.cpp
index a534cef..29b635e 100644
--- a/linden/indra/newview/primbackup.cpp
+++ b/linden/indra/newview/primbackup.cpp
@@ -632,6 +632,8 @@ void primbackup::export_next_texture()
 
 void primbackup::import_object(bool upload)
 {
+
+
         textures.clear();
         assetmap.clear();
         current_asset=LLUUID::null;
@@ -648,9 +650,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);
-        import_file.close();
+        {
+                LLSD import_llsd;
+                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/res/viewerRes.rc b/linden/indra/newview/res/viewerRes.rc
index 65d4cbb..e4d8e9c 100644
--- a/linden/indra/newview/res/viewerRes.rc
+++ b/linden/indra/newview/res/viewerRes.rc
@@ -138,8 +138,8 @@ TOOLMEDIAOPEN           CURSOR                  "toolmediaopen.cur"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,3,0
- PRODUCTVERSION 1,3,0
+ FILEVERSION 1,4,0
+ PRODUCTVERSION 1,4,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -155,12 +155,12 @@ BEGIN
         BLOCK "040904b0"
         BEGIN
             VALUE "CompanyName", "meta-impy Viewer Project"
-            VALUE "FileDescription", "meta-impy Experimental"
-            VALUE "FileVersion", "2011.04.02"
-            VALUE "InternalName", "meta-impy Experimental"
+            VALUE "FileDescription", "meta-impy"
+            VALUE "FileVersion", "1.4.0 beta 1"
+            VALUE "InternalName", "meta-impy"
             VALUE "OriginalFilename", "meta-impy.exe"
-            VALUE "ProductName", "meta-impy Weekly"
-            VALUE "ProductVersion", "2011.04.02"
+            VALUE "ProductName", "meta-impy"
+            VALUE "ProductVersion", "1.4.0 beta 1"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/linden/indra/newview/skins/default/textures/textures.xml b/linden/indra/newview/skins/default/textures/textures.xml
index 60fb4e0..9151ee9 100644
--- a/linden/indra/newview/skins/default/textures/textures.xml
+++ b/linden/indra/newview/skins/default/textures/textures.xml
@@ -397,5 +397,10 @@
   <texture name="media_btn_stoploading.png"/>
   <texture name="media_panel_divider.png"/>
   <texture name="media_panel_scrollbg.png"/>
+  
+  <texture name="go-previous-4.png"/>
+  <texture name="go-next-4.png"/>
+  <texture name="view-refresh-5.png"/> 
+  <texture name="go-home-4.png"/>
 
 </textures>
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_about.xml b/linden/indra/newview/skins/default/xui/en-us/floater_about.xml
index d0f72c2..95cdcd0 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_about.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_about.xml
@@ -57,24 +57,24 @@
 
   Many thanks to the many residents in many grids who contributed towards this viewer in countless ways.
 
-        3Dconnexion SDK Copyright (C) 1992-2007 3Dconnexion
-        APR Copyright (C) 2000-2004 The Apache Software Foundation
-        cURL Copyright (C) 1996-2002, Daniel Stenberg, (daniel@haxx.se)
-        DBus/dbus-glib Copyright (C) 2002, 2003  CodeFactory AB / Copyright (C) 2003, 2004 Red Hat, Inc.
-        expat Copyright (C) 1998, 1999, 2000 Thai Open Source Software Center Ltd.
-        FreeType Copyright (C) 1996-2002, The FreeType Project (www.freetype.org).
-        GL Copyright (C) 1999-2004 Brian Paul.
-        Havok.com(TM) Copyright (C) 1999-2001, Telekinesys Research Limited.
-        jpeg2000 Copyright (C) 2001, David Taubman, The University of New South Wales (UNSW)
-        jpeglib Copyright (C) 1991-1998, Thomas G. Lane.
-        ogg/vorbis Copyright (C) 2001, Xiphophorus
-        OpenSSL Copyright (C) 1998-2002 The OpenSSL Project.
-        SDL Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga
-        SSLeay Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
-        xmlrpc-epi Copyright (C) 2000 Epinions, Inc.
-        zlib Copyright (C) 1995-2002 Jean-loup Gailly and Mark Adler.
-        google-perftools Copyright (c) 2005, Google Inc.
-        Code from FAAD2 is copyright (c) Nero AG, www.nero.com
+        3Dconnexion SDK Copyright © 1992-2007 3Dconnexion
+        APR Copyright © 2000-2004 The Apache Software Foundation
+        cURL Copyright © 1996-2002, Daniel Stenberg, (daniel@haxx.se)
+        DBus/dbus-glib Copyright © 2002, 2003  CodeFactory AB / Copyright © 2003, 2004 Red Hat, Inc.
+        expat Copyright © 1998, 1999, 2000 Thai Open Source Software Center Ltd.
+        FreeType Copyright © 1996-2002, The FreeType Project (www.freetype.org).
+        GL Copyright © 1999-2004 Brian Paul.
+        Havok.com(TM) Copyright © 1999-2001, Telekinesys Research Limited.
+        jpeg2000 Copyright © 2001, David Taubman, The University of New South Wales (UNSW)
+        jpeglib Copyright © 1991-1998, Thomas G. Lane.
+        ogg/vorbis Copyright © 2001, Xiphophorus
+        OpenSSL Copyright © 1998-2002 The OpenSSL Project.
+        SDL Copyright © 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga
+        SSLeay Copyright © 1995-1998 Eric Young (eay@cryptsoft.com)
+        xmlrpc-epi Copyright © 2000 Epinions, Inc.
+        zlib Copyright © 1995-2002 Jean-loup Gailly and Mark Adler.
+        google-perftools Copyright © 2005, Google Inc.
+        Code from FAAD2 is copyright © Nero AG, www.nero.com
 
         All rights reserved.  See LICENSE-libraries.txt for details.
 
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_about_land.xml b/linden/indra/newview/skins/default/xui/en-us/floater_about_land.xml
index d57ca5f..fcaa869 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_about_land.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_about_land.xml
@@ -888,7 +888,7 @@ Only large parcels can be listed in search.
                                  height="16"
                                  left="10"
                                  length="1"
-                                 name="at URL:"
+                                 name="Current URL:"
                                  type="string"
                                  width="65">
                                 Current URL:
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_busy.xml b/linden/indra/newview/skins/default/xui/en-us/floater_busy.xml
index 9f55f67..50ec87c 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_busy.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_busy.xml
@@ -93,4 +93,4 @@
   <button bottom_delta="0" follows="top|right" height="22" label="OK"
     right="-85" name="btn_ok" tool_tip="" enabled="true" width="80" />
   
-</floater>
\ No newline at end of file
+</floater>
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_command_line.xml b/linden/indra/newview/skins/default/xui/en-us/floater_command_line.xml
index 13b334b..a1eb3c8 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_command_line.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_command_line.xml
@@ -93,12 +93,12 @@
      font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
      tool_tip="Clears the Chat History to prevent lag effects from chat spammers." name="CmdLineChatbarClearChat" control_name="CmdLineChatbarClearChat" width="200"/>
   <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
-        name="loltxt15" width="512">        Set the media url (usage: cmd url type)</text>
+        name="set_media_url_text" width="512">        Set the media url (usage: cmd url type)</text>
   <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
         font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
         tool_tip="Sets and plays your media stream to the entered url" name="CmdLineChatbarMedia" control_name="CmdLineChatbarMedia" width="200"/>
   <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
-        name="loltxt15" width="512">        Set the music stream url (usage: cmd url)</text>
+        name="set_music_url_text" width="512">        Set the music stream url (usage: cmd url)</text>
   <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
         font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
         tool_tip="sets and plays your music stream to the entered url" name="CmdLineChatbarMusic" control_name="CmdLineChatbarMusic" width="200"/>
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_grid_default_selector.xml b/linden/indra/newview/skins/default/xui/en-us/floater_grid_default_selector.xml
index 157588d..51ba35f 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_grid_default_selector.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_grid_default_selector.xml
@@ -17,4 +17,4 @@
       right="-5" name="btn_cancel" width="85" />
   <button bottom_delta="0" follows="bottom|right" height="20" label="OK"
             left_delta="-90" name="btn_ok" width="85" />
-</floater>
\ No newline at end of file
+</floater>
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_inventory.xml b/linden/indra/newview/skins/default/xui/en-us/floater_inventory.xml
index 3ab7c7b..554f79d 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_inventory.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_inventory.xml
@@ -170,7 +170,7 @@
                                 </menu_item_call>
                         </menu>
                         <menu bottom_delta="-599" drop_shadow="true" height="85" left="0"
-                             mouse_opaque="false" name="New Body Parts" opaque="true" width="118">
+                             mouse_opaque="false" label="New Body Parts" name="New Body Parts" opaque="true" width="118">
                                 <menu_item_call bottom_delta="-18" height="18" label="New Shape" left="0" mouse_opaque="true"
                                      name="New Shape" width="118">
                                         <on_click filter="" function="Inventory.DoCreate" userdata="shape" />
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_local_asset_browse.xml b/linden/indra/newview/skins/default/xui/en-us/floater_local_asset_browse.xml
index f9bb3a7..a8ce59c 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_local_asset_browse.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_local_asset_browse.xml
@@ -118,12 +118,12 @@
     default_image_name="Default"
     can_apply_immediately="true"
     follows="left|top"
-    label="Texture"
     bottom_delta="20"
     left_delta="0"
     mouse_opaque="true"
     name="texture_view"
     visible="true"
+    enabled="false"
     />
 
   <check_box
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_media_browser.xml b/linden/indra/newview/skins/default/xui/en-us/floater_media_browser.xml
index c1bfdcc..76eee6f 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_media_browser.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_media_browser.xml
@@ -3,20 +3,20 @@
      height="440" min_height="140" min_width="467" name="floater_about"
      rect_control="FloaterMediaRect" title="Web Browser" width="560">
         <layout_stack name="stack1" bottom="0" follows="left|right|top|bottom" left="10" top="-20" width="540">
-                <layout_panel auto_resize="false" bottom="0" height="20" left="0" name="nav_controls" user_resize="false"
+                <layout_panel auto_resize="false" bottom="0" height="25" left="0" name="nav_controls" user_resize="false"
                      width="800">
-                        <button bottom="0" follows="left|top" height="20" label="Back" left="0" name="back"
-                             width="55" />
-                        <button bottom_delta="0" follows="left|top" height="20" label="Forward" left_delta="55"
-                             name="forward" width="68" />
-                        <button bottom_delta="0" enabled="false" follows="left|top" height="20" label="Reload"
-                             left_delta="70" name="reload" width="70" />
-                        <combo_box allow_text_entry="true" bottom_delta="0" follows="left|top|right" height="20"
-                             left_delta="75" max_chars="255" name="address" width="485" />
-                        <button bottom_delta="0" enabled="false" follows="right|top" height="20" label="Go"
-                             left_delta="487" name="go" width="55" />
-                        <button bottom_delta="0" enabled="true" follows="right|top" height="20" label="Home"
-                             left_delta="58" name="home" width="55" />
+                        <button bottom="0" follows="left|top" height="25" label="" image_overlay="go-previous-4.png" left="0" name="back"
+                             width="25" />
+                        <button bottom_delta="0" follows="left|top" height="25" label="" image_overlay="go-next-4.png" left_delta="27"
+                             name="forward" width="25" />
+                        <button bottom_delta="0" enabled="false" follows="left|top" height="25" label="" image_overlay="view-refresh-5.png" 
+                             left_delta="27" name="reload" width="25" />
+                        <combo_box allow_text_entry="true" bottom_delta="4" follows="left|top|right" height="20"
+                             left_delta="29" max_chars="255" name="address" width="622" />
+                        <button bottom_delta="-4" enabled="false" follows="right|top" height="25" label="Go" font="SansSerif" 
+                             left_delta="625" name="go" width="55" />
+                        <button bottom_delta="0" enabled="true" follows="right|top" height="25" label="" image_overlay="go-home-4.png" 
+                             left_delta="58" name="home" width="35" />
                 </layout_panel>
     <layout_panel auto_resize="false" bottom="0" height="20" left="0" name="time_controls" user_resize="false"
                      width="800">
@@ -33,22 +33,19 @@
     </layout_panel>
     <layout_panel auto_resize="false" bottom="0" height="20" left="0"
                      name="parcel_owner_controls" user_resize="false" width="540">
-                        <button bottom="0" enabled="false" follows="left|top" height="20"
-                             label="Send Current URL to Parcel" left="0" name="assign" width="200" />
+                        <button bottom="0" enabled="false" follows="left|top" height="22"
+                             label="Send Current URL To Parcel" left="0" name="assign" width="200" />
                 </layout_panel>
                 <layout_panel auto_resize="true" bottom="0" height="20" left="0" name="external_controls" user_resize="false"
                      width="540">
                         <web_browser bottom="30" follows="left|right|top|bottom" left="0" name="browser" top="20"
                              width="540" />
-                        <button bottom="5" follows="bottom|left" height="20" label="Open in My Web Browser"
+                        <button bottom="4" follows="bottom|left" height="22" label="Open In External Browser" font="SansSerif"
                              left="0" name="open_browser" width="185" />
-                        <check_box bottom="5" control_name="UseExternalBrowser" follows="bottom|left" height="20"
-                             label="Always open in my web browser" left_delta="184" name="open_always"
-                             width="200" />
-                        <button bottom="5" enabled="false" follows="bottom|right" height="20" label="Set As Home"
-                             left="-176" name="set_home" width="104" />
-                        <button bottom="5" follows="bottom|right" height="20" label="Close" left="-70"
-                             name="close" width="70" />
+                        <check_box bottom="6" control_name="UseExternalBrowser" follows="bottom|left" height="22"
+                             label="Always open in external browser" left_delta="190" name="open_always" width="200" />
+      <button bottom="4" enabled="false" follows="bottom|right" height="22" label="Set As Home" font="SansSerif"
+                             left="-110" name="set_home" width="104" />
                 </layout_panel>
         </layout_stack>
   <string name="home_page_url">
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_preview_notecard.xml b/linden/indra/newview/skins/default/xui/en-us/floater_preview_notecard.xml
index fe2d977..ce6ab7d 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_preview_notecard.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_preview_notecard.xml
@@ -20,14 +20,14 @@
         <menu_bar bottom="-56" drop_shadow="false" enabled="true" follows="left|top|right"
              height="18" left="8" mouse_opaque="false" name="motecard_menu" opaque="false"
              tear_off="false" width="220">
-    <menu drop_shadow="true" enabled="true" mouse_opaque="false" name="File" opaque="true" tear_off="false">
+    <menu drop_shadow="true" enabled="true" label="File" mouse_opaque="false" name="File" opaque="true" tear_off="false">
       <menu_item_call enabled="false" mouse_opaque="true" label="Save" name="Save Menu" shortcut="control|S" />
       <menu_item_separator />
       <menu_item_call enabled="false" mouse_opaque="true" label="Export Text..." name="Export Text..." />
       <menu_item_call enabled="false" mouse_opaque="true" label="Import Text..." name="Import Text..." />
     </menu>
                 <menu bottom_delta="16" left="0" drop_shadow="true" enabled="true" height="198" width="150"
-                     mouse_opaque="false" name="Edit" opaque="true" tear_off="false">
+                    label="Edit" mouse_opaque="false" name="Edit" opaque="true" tear_off="false">
                         <menu_item_call bottom_delta="-30" enabled="false" height="20" label="Undo" left="0"
                              mouse_opaque="true" name="Undo" width="139" />
                         <menu_item_call bottom_delta="-50" enabled="false" height="20" label="Redo" left="0"
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_radar.xml b/linden/indra/newview/skins/default/xui/en-us/floater_radar.xml
index 7db7330..bfe30d4 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_radar.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_radar.xml
@@ -187,7 +187,7 @@
                                    tool_tip="Report avatars getting within or beyond the draw distance" />
 
                         <check_box height="16" label="Avatars within/beyond the shout range"
-                                   left="20" bottom_delta="-18" name="alerts_chat"
+                                   left="20" bottom_delta="-18" name="alerts_shout"
                                    width="200" follows="bottom|left"
                                    hidden="false" mouse_opaque="true" font="SansSerifSmall"
                                    initial_value="true" enabled="true" radio_style="false"
@@ -324,4 +324,4 @@
                                />
                 </panel>
         </tab_container>
-</floater>
\ No newline at end of file
+</floater>
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_login.xml b/linden/indra/newview/skins/default/xui/en-us/menu_login.xml
index 87907ec..ffdafe2 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_login.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_login.xml
@@ -1,18 +1,24 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<menu_bar name="Login Menu" opaque="true" tear_off="false" height="18" bottom="-18" follows="left|top|right">
-        <menu create_jump_keys="true" label="File" name="File" opaque="true" tear_off="false">
-                <menu_item_call label="Quit" name="Quit" shortcut="control|Q">
-                        <on_click function="File.Quit" userdata="" />
-                </menu_item_call>
-        </menu>
-        <menu create_jump_keys="true" label="Edit" name="Edit" 
-        opaque="true" tear_off="false">
+<menu_bar name="Login Menu" opaque="true" tear_off="false" 
+          mouse_opaque="false"
+          drop_shadow="false"
+          height="18" bottom="-18" follows="left|top|right">
+        <menu create_jump_keys="true" label="File" name="File" opaque="true" tear_off="false"
+        drop_shadow="true" mouse_opaque="false">
+    <menu_item_call label="Quit" name="Quit" shortcut="control|Q">
+      <on_click function="File.Quit" userdata="" />
+    </menu_item_call>
+  </menu>
+  <menu create_jump_keys="true" label="Edit" name="Edit"
+        opaque="true" tear_off="false"
+        drop_shadow="true" mouse_opaque="false">
                 <menu_item_call label="Preferences..." name="Preferences..." shortcut="control|P">
                         <on_click function="ShowFloater" userdata="preferences" />
                 </menu_item_call>
         </menu>
         <menu create_jump_keys="true" label="Help" name="Help" 
-        opaque="true" tear_off="false">
+        opaque="true" tear_off="false"
+        drop_shadow="true" mouse_opaque="false">
                 <menu_item_call label="Grid Help" name="Grid Help" shortcut="F1">
                         <on_click function="ShowFloater" userdata="help f1" />
                 </menu_item_call>
@@ -32,7 +38,8 @@
                         <on_click function="ShowFloater" userdata="about" />
                 </menu_item_call>
         </menu>
-        <menu name="Advanced" create_jump_keys="true" opaque="true">
+        <menu name="Advanced" create_jump_keys="true" opaque="true"
+        drop_shadow="true" mouse_opaque="false">
                 <menu_item_call name="Debug Settings" label="Debug Settings">
                         <on_click function="Advanced.ShowDebugSettings" userdata="" />
                 </menu_item_call>
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
index 603c212..03967d9 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 
 <menu_bar name="Main Menu" drop_shadow="false" follows="left|top|right"
-          opaque="false" tear_off="false">
+          opaque="false" mouse_opaque="false" tear_off="false">
 
 
   <!-- FILE -->
 
   <menu name="File" create_jump_keys="true" label="File"
+        drop_shadow="true" mouse_opaque="false"
         opaque="true" tear_off="true">
     <menu label="Upload" create_jump_keys="true" name="Upload"
           opaque="true" tear_off="true">
@@ -103,6 +104,7 @@
   <!-- EDIT -->
 
   <menu name="Edit" create_jump_keys="true" label="Edit"
+        drop_shadow="true" mouse_opaque="false"
         opaque="true" tear_off="true">
     <menu_item_call name="Undo" enabled="false" label="Undo"
                     shortcut="control|Z">
@@ -156,13 +158,16 @@
     <menu_item_separator />
 
     <menu name="Attach Object" create_jump_keys="true"
+          drop_shadow="true" mouse_opaque="false"
           label="Attach Object" opaque="true" tear_off="true" />
 
     <menu name="Detach Object" create_jump_keys="true"
+          drop_shadow="true" mouse_opaque="false"
           label="Detach Object" opaque="true" tear_off="true" />
 
 
     <menu name="Take Off Clothing" create_jump_keys="true"
+          drop_shadow="true" mouse_opaque="false"
           label="Take Off Clothing" opaque="true" tear_off="true">
 
       <menu_item_call name="Shirt" enabled="false" label="Shirt">
@@ -295,6 +300,7 @@
   <!-- VIEW -->
 
   <menu name="View" create_jump_keys="true" label="View"
+        drop_shadow="true" mouse_opaque="false"
         opaque="true" tear_off="true">
     <menu_item_call name="Mouselook" label="Mouselook"
                     shortcut="M">
@@ -406,6 +412,7 @@
     </menu_item_check>
     <menu_item_separator />
     <menu name="Hover Tips" create_jump_keys="true" label="Hover Tips"
+          drop_shadow="true" mouse_opaque="false"
           opaque="true" tear_off="true">
       <menu_item_check name="Show Tips" label="Show Tips"
                        shortcut="control|shift|T">
@@ -449,8 +456,9 @@
       <on_check function="View.CheckHUDAttachments" />
     </menu_item_check>
     <menu_item_separator />
-    <menu name="Zoom Level" create_jump_keys="true"
-            label="Zoom Level" opaque="true" tear_off="true">
+    <menu name="Zoom Level" label="Zoom Level" create_jump_keys="true"
+          drop_shadow="true" mouse_opaque="false"
+          opaque="true" tear_off="true">
       <menu_item_call name="Zoom In" label="Zoom In"
                       shortcut="control|0">
         <on_click function="View.ZoomIn" userdata="" />
@@ -483,6 +491,7 @@
   <!-- WORLD -->
 
   <menu name="World" create_jump_keys="true" label="World"
+        drop_shadow="true" mouse_opaque="false"
         opaque="true" tear_off="true">
     <menu_item_call name="Chat" label="Chat" shortcut="">
       <on_click function="World.Chat" userdata="" />
@@ -562,8 +571,9 @@
       <on_click function="ShowFloater" userdata="about region" />
     </menu_item_call>
     <menu_item_separator />
-    <menu name="Environment Settings" create_jump_keys="true"
-          label="Environment Settings" opaque="true" tear_off="true">
+    <menu name="Environment Settings" label="Environment Settings"
+          create_jump_keys="true" drop_shadow="true"
+          mouse_opaque="false" opaque="true" tear_off="true">
       <menu_item_call name="Sunrise" label="Sunrise">
         <on_click function="World.EnvSettings" userdata="sunrise" />
       </menu_item_call>
@@ -595,8 +605,10 @@
   <!-- TOOLS -->
 
   <menu name="Tools" create_jump_keys="true" label="Tools"
+        drop_shadow="true" mouse_opaque="false"
         opaque="true" tear_off="true" visible="false">
     <menu name="Select Tool" create_jump_keys="true" label="Choose Tool"
+          drop_shadow="true" mouse_opaque="false"
           opaque="true" tear_off="true">
       <menu_item_call name="Focus" label="Focus" shortcut="control|1">
         <on_click function="Tools.SelectTool" userdata="focus" />
@@ -626,6 +638,7 @@
       <on_enable function="Tools.SomethingSelectedNoHUD" />
     </menu_item_call>
     <menu name="Selection Options" label="Selection Options"
+          drop_shadow="true" mouse_opaque="false"
           create_jump_keys="true" opaque="true" tear_off="true">
       <menu_item_check name="Select Only My Objects"
                        label="Select Only My Objects">
@@ -774,6 +787,7 @@
     </menu_item_call>
                 <menu name="Recompile Scripts in Selection" create_jump_keys="true"
                       label="Recompile Scripts in Selection" opaque="true"
+          drop_shadow="true" mouse_opaque="false"
           tear_off="true">
                   <menu_item_call name="Mono" label="Mono">
                           <on_click function="Tools.SelectedScriptAction"
@@ -820,6 +834,7 @@
   <!-- HELP -->
 
   <menu name="Help" create_jump_keys="true" label="Help"
+        drop_shadow="true" mouse_opaque="false"
         opaque="true" tear_off="true">
     <menu_item_call name="Grid Help" label="Grid Help"
                     shortcut="F1">
@@ -868,14 +883,14 @@
 
   <!-- ADVANCED -->
 
-  <menu name="Advanced" drop_shadow="true"
-        opaque="true" tear_off="true">
+  <menu label="Advanced" name="Advanced" drop_shadow="true"
+        mouse_opaque="false" opaque="true" tear_off="true">
 
 
     <!-- CONSOLES -->
 
-    <menu name="Consoles" drop_shadow="true"
-          opaque="true" tear_off="true">
+    <menu label="Consoles" name="Consoles" drop_shadow="true"
+          mouse_opaque="false" opaque="true" tear_off="true">
       <menu_item_check name="Frame Console" label="Frame Console"
                        shortcut="control|shift|2">
         <on_click function="Advanced.ToggleConsole"
@@ -958,8 +973,8 @@
 
     <!-- HUD INFO -->
 
-    <menu name="HUD Info" drop_shadow="true"
-          opaque="true" tear_off="true">
+    <menu label="HUD Info" name="HUD Info" drop_shadow="true"
+          mouse_opaque="false" opaque="true" tear_off="true">
       <menu_item_check name="Velocity" label="Velocity">
         <on_click function="Advanced.ToggleHUDInfo"
                   userdata="velocity" />
@@ -1027,12 +1042,12 @@
 
     <!-- RENDERING -->
 
-    <menu name="Rendering" drop_shadow="true"
-          opaque="true" tear_off="true">
+    <menu label="Rendering" name="Rendering" drop_shadow="true"
+          mouse_opaque="false" opaque="true" tear_off="true">
 
       <!-- TYPES -->
-      <menu name="Types" drop_shadow="true"
-            opaque="true" tear_off="true">
+      <menu label="Types" name="Types" drop_shadow="true"
+            mouse_opaque="false" opaque="true" tear_off="true">
         <menu_item_check name="Simple" label="Simple"
                          shortcut="control|alt|shift|1">
           <on_click function="Advanced.ToggleRenderType"
@@ -1128,8 +1143,8 @@
 
 
       <!-- FEATURES -->
-      <menu name="Features" drop_shadow="true"
-            opaque="true" tear_off="true">
+      <menu label="Features" name="Features" drop_shadow="true"
+            mouse_opaque="false" opaque="true" tear_off="true">
         <menu_item_check name="UI" label="UI"
                          shortcut="alt|shift|F1">
           <on_click function="Advanced.ToggleFeature"
@@ -1191,8 +1206,8 @@
 
 
       <!-- INFO DISPLAYS -->
-      <menu name="Info Displays" drop_shadow="true"
-            opaque="true" tear_off="true">
+      <menu label="Info Displays" name="Info Displays" drop_shadow="true"
+            mouse_opaque="false" opaque="true" tear_off="true">
         <menu_item_check name="Verify" label="Verify">
           <on_click function="Advanced.ToggleInfoDisplay"
                     userdata="verify" />
@@ -1318,8 +1333,8 @@
 
 
       <!-- RENDER TESTS -->
-      <menu name="Render Tests" drop_shadow="true"
-            opaque="true" tear_off="true">
+      <menu label="Render Tests" name="Render Tests" drop_shadow="true"
+            mouse_opaque="false" opaque="true" tear_off="true">
         <menu_item_check name="Camera Offset" label="Camera Offset">
           <on_click function="ToggleControl"
                     userdata="CameraOffset" />
@@ -1463,8 +1478,8 @@
 
     <!-- WORLD -->
 
-    <menu name="World" drop_shadow="true"
-          opaque="true" tear_off="true">
+    <menu label="World" name="World" drop_shadow="true"
+          mouse_opaque="false" opaque="true" tear_off="true">
       <!-- Disabled because you can't do this in Windlight.
       <menu_item_check name="Mouse Moves Sun"
                        label="Mouse Moves Sun"
@@ -1499,9 +1514,11 @@
 
     <!-- RLVa -->
 
-    <menu name="RLVa" drop_shadow="true" opaque="true" tear_off="true">
+    <menu label="RLVa" name="RLVa" drop_shadow="true"
+          mouse_opaque="false" opaque="true" tear_off="true">
 
-      <menu name="Debug" drop_shadow="true" opaque="true" tear_off="true">
+      <menu label="Debug"  name="Debug" drop_shadow="true"
+            mouse_opaque="false" opaque="true" tear_off="true">
 
         <menu_item_check name="Show Debug Messages"
                          label="Show Debug Messages">
@@ -1574,8 +1591,8 @@
 
     <!-- UI -->
 
-    <menu name="UI" drop_shadow="true"
-          opaque="true" tear_off="true">
+    <menu label="UI" name="UI" drop_shadow="true"
+          mouse_opaque="false" opaque="true" tear_off="true">
 
       
       <menu_item_check name="Use default system color picker"
@@ -1735,8 +1752,8 @@
 
     <!-- XUI -->
 
-    <menu name="XUI" drop_shadow="true"
-          opaque="true" tear_off="true">
+    <menu label="XUI" name="XUI" drop_shadow="true"
+          mouse_opaque="false" opaque="true" tear_off="true">
       <menu_item_call name="Floater Test"
                       label="Floater Test">
         <on_click function="Advanced.ShowFloaterTest"
@@ -1781,11 +1798,11 @@
 
     <!-- CHARACTER -->
 
-    <menu name="Character" drop_shadow="true"
-          opaque="true" tear_off="true">
+    <menu label="Character" name="Character" drop_shadow="true"
+          mouse_opaque="false" opaque="true" tear_off="true">
 
-      <menu name="Grab Baked Texture" drop_shadow="true"
-            opaque="true" tear_off="true">
+      <menu label="Grab Baked Texture" name="Grab Baked Texture" drop_shadow="true"
+            mouse_opaque="false" opaque="true" tear_off="true">
 
         <menu_item_call name="Iris" enabled="false"
                         label="Iris">
@@ -1825,8 +1842,8 @@
       </menu>
 
       <!-- CHARACTER TESTS -->
-      <menu name="Character Tests" drop_shadow="true"
-            opaque="true" tear_off="true">
+      <menu label="Character Tests" name="Character Tests" drop_shadow="true"
+            mouse_opaque="false" opaque="true" tear_off="true">
         <menu_item_call name="Appearance To XML"
                         label="Appearance To XML">
           <on_click function="Advanced.ToggleAppearanceToXML"
@@ -1996,8 +2013,8 @@
 
     <!-- CRASH -->
 
-    <menu name="Crash" drop_shadow="true"
-          opaque="true" tear_off="true">
+    <menu label="Crash" name="Crash" drop_shadow="true"
+          mouse_opaque="false" opaque="true" tear_off="true">
       <menu_item_call name="Force Bad Memory Access"
                       label="Force Bad Memory Access">
         <on_click function="Advanced.Crash"
@@ -2034,8 +2051,8 @@
 
     <!-- NETWORK -->
 
-    <menu name="Network" drop_shadow="true"
-          opaque="true" tear_off="true">
+    <menu label="Network" name="Network" drop_shadow="true"
+          mouse_opaque="false" opaque="true" tear_off="true">
       <menu_item_call name="Enable Message Log"
                       label="Enable Message Log">
         <on_click function="Advanced.EnableMessageLog"
@@ -2071,8 +2088,8 @@
 
     <!-- RECORDER -->
 
-    <menu name="Recorder" drop_shadow="true"
-          opaque="true" tear_off="true">
+    <menu label="Recorder" name="Recorder" drop_shadow="true"
+          mouse_opaque="false" opaque="true" tear_off="true">
       <menu_item_check name="Full Session Logging"
                        label="Full Session Logging">
         <on_click function="ToggleControl"
@@ -2129,8 +2146,8 @@
     
     <!-- ADMIN OPTIONS -->
 
-    <menu name="Admin Options" drop_shadow="true"
-          opaque="true" tear_off="true">
+    <menu label="Admin Options" name="Admin Options" drop_shadow="true"
+          mouse_opaque="false" opaque="true" tear_off="true">
       <menu_item_check name="View Admin Options"
                    label="View Admin Options"
                    shortcut="control|alt|V">
diff --git a/linden/indra/newview/skins/default/xui/en-us/notifications.xml b/linden/indra/newview/skins/default/xui/en-us/notifications.xml
index 1dcde4f..b682534 100644
--- a/linden/indra/newview/skins/default/xui/en-us/notifications.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/notifications.xml
@@ -1733,7 +1733,7 @@ Cannot find the region this land is in.
  type="alertmodal">
 Unable to buy land:
 
-Your allowed/preferred maturity level does not permit you to buy this land. You may need to your maturity level in Preferences first.
+Your allowed/preferred maturity level does not permit you to buy this land. You may need to adjust your maturity level in Preferences first.
 </notification>
 
 <notification
@@ -6920,44 +6920,44 @@ Typing stop packets - sends encrypted messages differently so they do not wind u
  type="alert">
 The following constants are accepted in this tab:
 
-PX  --  X-axis position
-PY  --  Y-axis position
-PZ  --  Z-axis position
-SX  --  X-axis size
-SY  --  Y-axis size
-SZ  --  Z-axis size
-RX  --  X-axis rotation
-RY  --  Y-axis rotation
-RZ  --  Z-axis rotation
-CB  --  Path cut begin
-CE  --  Path cut end
-HLW  --  Hollow size
-SKW  --  Skew
-PB  --  Slice/Dimple/Profile cut begin
-PE  --  Slice/Dimple/Profile cut end
-TB  --  Twist begin
-TE  --  Twist end
-SHX  --  X-axis top shear
-SHY  --  Y-axis top shear
-HLX  --  X-axis hole size
-HLY  --  Y-axis hole size
-TPX  --  X-axis taper
-TPY  --  Y-axis taper
-ROF  --  Radius offset
-REV  --  Revolutions
-
-PI  --  pi
-TWO_PI  --  2pi
-PI_BY_TWO  --  pi/2
-SQRT2  --  Square root of 2
-DEG_TO_RAD  --  DEG_TO_RAD conversion (pi/180)
-RAD_TO_DEG  --  RAD_TO_DEG conversion (180/pi)
-GRAVITY  --  -9.8
-
-*  --  Multiplication
-\  --  Division
-  --  Addition
--  --  Subtraction
+PX  —  X-axis position
+PY  —  Y-axis position
+PZ  —  Z-axis position
+SX  —  X-axis size
+SY  —  Y-axis size
+SZ  —  Z-axis size
+RX  —  X-axis rotation
+RY  —  Y-axis rotation
+RZ  —  Z-axis rotation
+CB  —  Path cut begin
+CE  —  Path cut end
+HLW  —  Hollow size
+SKW  —  Skew
+PB  —  Slice/Dimple/Profile cut begin
+PE  —  Slice/Dimple/Profile cut end
+TB  —  Twist begin
+TE  —  Twist end
+SHX  —  X-axis top shear
+SHY  —  Y-axis top shear
+HLX  —  X-axis hole size
+HLY  —  Y-axis hole size
+TPX  —  X-axis taper
+TPY  —  Y-axis taper
+ROF  —  Radius offset
+REV  —  Revolutions
+
+PI  —  π
+TWO_PI  —  2π
+PI_BY_TWO  —  π/2
+SQRT2  —  Square root of 2
+DEG_TO_RAD  —  degrees to radians (pi/180)
+RAD_TO_DEG  —  radians to degrees (180/pi)
+GRAVITY  —  -9.8
+
+*  —  Multiplication
+\  —  Division
+  —  Addition
+-  —  Subtraction
 
 For information about this feature, click "More Info".
   <url option="1" name="url">
@@ -6975,18 +6975,18 @@ For information about this feature, click "More Info".
  type="alert">
 The following constants are accepted in this tab:
 
-TSU  --  Repeats per face (horizontal)
-TSV  --  Repeats per face (vertical)
-TOU  --  Offsets per face (horizontal)
-TOV  --  Offsets per face (vertical)
-TRNS --  Transparency
-TROT --  Texture rotation
-GLOW --  Glow
-
-*  --  Multiplication
-\  --  Division
-  --  Addition
--  --  Subtraction
+TSU  —  Repeats per face (horizontal)
+TSV  —  Repeats per face (vertical)
+TOU  —  Offsets per face (horizontal)
+TOV  —  Offsets per face (vertical)
+TRNS —  Transparency
+TROT —  Texture rotation
+GLOW —  Glow
+
+*  —  Multiplication
+\  —  Division
+  —  Addition
+-  —  Subtraction
 
 For information about this feature, click "More Info".
   <url option="1" name="url">
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_login.xml b/linden/indra/newview/skins/default/xui/en-us/panel_login.xml
index 35ecc6e..d60f985 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_login.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_login.xml
@@ -213,6 +213,6 @@
         border_visible="false" border_drop_shadow_visible="false"
         font="SansSerifSmall" mouse_opaque="true"
         hover="true" hover_color="50 115 185">
-    [CHANNEL] [VERSION]
+    [VERSION]
   </text>
 </panel>
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 fbd605f..b589a1d 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,122 +1,176 @@
 <?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 -->
-  <!-- The time is now! Chris Tuchs -->
+
   <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"
-     name="main_panel" width="517">
-      <check_box bottom="-30" enabled="true"
+         height="408" label="Main" left="102" mouse_opaque="true"
+         name="main_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-style="BOLD|SHADOW"
+          font="SansSerifSmall" h_pad="0" halign="left" height="10" left="20"
+          mouse_opaque="true" name="user_interface_text" 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="avatar_text" 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"
-           name="client_name_color_check" radio_style="false" width="160" />
-      <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"
-           name="shadows_check" radio_style="false" width="217" />
-      <text bottom_delta="-25" left="16" height="15" width="300"
-           follows="top|left">
-          Allow region WindLight settings (LightShare):
-      </text>
-      <combo_box name="lightshare_combo"
-                 bottom_delta="-2" left_delta="250" height="18" width="135"
-                 allow_text_entry="false" follows="left|top">
-        <combo_item type="string" name="never" value="0">
-          Never
-        </combo_item>
-        <combo_item type="string" name="ask" value="1">
-          Ask me every time
-        </combo_item>
-        <combo_item type="string" name="always" value="2">
-          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"
+           tool_tip="Toggle editing animation and standing up when entering appearance mode"
+           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="-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"
+      <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="-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"
+      <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="12"
+           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="-25" enabled="true"
+      <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="chat_text" 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="12"
+           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_delta="250"
+           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" />
-      <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" />
+      
+
+      <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_delta="30" mouse_opaque="true"
+           name="shadows_check" radio_style="false" width="217" />
+      <text bottom_delta="-25" left_delta="0" height="15" width="300"
+           follows="top|left" name="lightshare_text">
+        Allow region WindLight settings (LightShare):
+      </text>
+      <combo_box name="lightshare_combo"
+                 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
+        </combo_item>
+        <combo_item type="string" name="ask" value="1">
+          Ask me every time
+        </combo_item>
+        <combo_item type="string" name="always" value="2">
+          Always
+        </combo_item>
+      </combo_box>
 
   <!-- 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"
@@ -138,69 +192,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">
-      <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"
+    
+    <panel border="true" bottom="-580" follows="left|top|right|bottom" height="525" label="Avatar Cloud"
        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"
-                mouse_opaque="true" name="must_be_logged_in_textbox" v_pad="0" width="394">
-                You must be logged in to change this
-        </text>
-        <check_box bottom_delta="-4" control_name="PreviewAvatarAsCloud" enabled="true"
-             follows="left|top" font="SansSerifSmall" height="16"
-             label="Preview avatar as cloud" left="10"
-             mouse_opaque="true" name="preview_cloud"
-             radio_style="false" tool_tip="Preview avatar as cloud when already rezzed"
-             width="80" />
+      
+      
+            <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="10"
+                    mouse_opaque="true" name="must_be_logged_in_textbox" v_pad="0" width="394">
+                    You must be logged in to change this
+            </text>
+            <check_box bottom_delta="-4" control_name="PreviewAvatarAsCloud" enabled="true"
+                 follows="left|top" font="SansSerifSmall" height="16"
+                 label="Preview avatar as cloud" left="10"
+                 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"
-             font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10"
+             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="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"
-             font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10"
-             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"
+  
+  <panel border="true" bottom_delta="-180" enabled="true" filename="panel_audio.xml"
+             follows="left|top|right|bottom" height="180" label="Volume" left_delta="30"
              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" />     
-        <check_box bottom_delta="-20" control_name="MediaEnableFilter" enabled="true"
+             width="338" />
+  <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"
-             bottom_delta="-2" right="-15" height="20" width="180" />
-        <check_box bottom_delta="-33" control_name="MuteWhenMinimized" enabled="true"
+             enabled="false" mouse_opaque="true" follows="left|top"
+             bottom_delta="-2" left="270" height="20" 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="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:"
-             label_width="158" left="148" max_val="10000" min_val="0"
-             mouse_opaque="true" name="Health change threshold" width="212" />
-  <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="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"
+             increment="10" initial_val="20" label="Health sound threshold:"
+             label_width="138" left_delta="0"  max_val="10000" min_val="0"
+             mouse_opaque="true" name="Health change threshold" width="192" />
+  <check_box bottom_delta="40" 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..e14442a 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"
-             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12"
-             mouse_opaque="false" name="text_box" v_pad="0" width="128">
-                Font Size:
-        </text>
-        <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">
-                <radio_item type="string" length="1" bottom="-24" enabled="true" height="16" left="0" mouse_opaque="true"
-                     name="radio" width="98">
-                        Small
-                </radio_item>
-                <radio_item type="string" length="1" bottom="-24" enabled="true" height="16" left="110" mouse_opaque="true"
-                     name="radio2" width="98">
-                        Medium
-                </radio_item>
-                <radio_item type="string" length="1" bottom="-24" enabled="true" height="16" left="220" mouse_opaque="true"
-                     name="radio3" width="98">
-                        Large
-                </radio_item>
-        </radio_group>
-
-  <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_translate_chat" v_pad="0" width="128">
-    Translate Chat:
-  </text>
-  <check_box bottom_delta="-3" 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="148" 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="149"
-             mouse_opaque="false" name="text_translate_chat" v_pad="0" width="160">
-    Translate into this language:
-  </text>
-  <combo_box allow_text_entry="true" bottom_delta="-5" enabled="true"
-             follows="left|top" height="16" left_delta="183" max_chars="135"
-             mouse_opaque="true" name="translate_language_combobox" width="146">
-    <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>
+
+  <tab_container bottom="0" height="450" left="0" mouse_opaque="false"
+      name="chattab2" tab_min_width="50" tab_position="top" width="495" bg_opaque_color="0,0,0,0.0">
+
+
+    <!-- CHAT OPTIONS PANEL -->
+
+
+    <panel border="true" bottom="-409" enabled="true" follows="left|top|right|bottom"
+           height="408" label="Chat &amp; IMs" left="102" mouse_opaque="true"
+           name="chat_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-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">
+        Chat Text Size:
+      </text>
+
+      <combo_box allow_text_entry="false" bottom_delta="-25" enabled="true" follows="left|top"
+           height="16" left_delta="30" max_chars="100" mouse_opaque="true"
+           name="chat_font_size" width="160">
+        <combo_item type="string" length="1" enabled="true" name="0" value="0">
+          Small
+        </combo_item>
+        <combo_item type="string" length="1" enabled="true" name="1" value="1">
+          Medium
+        </combo_item>
+        <combo_item type="string" length="1" enabled="true" name="2" value="2">
+          Large
+        </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_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_box3" v_pad="0" width="135">
+        Chat Console:
+      </text>
+      <spinner bottom_delta="-25" 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_delta="30"
+                 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_delta="135" mouse_opaque="false" name="text_box4" v_pad="0"
+                 width="80">
+        seconds and
+      </text>
+      <spinner bottom_delta="-6" decimal_digits="0"
+                 enabled="true" follows="left|top" height="16" increment="1"
+                 initial_val="10" left_delta="82" 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_delta="65" 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="50" max_val="1"
+                 min_val="0" mouse_opaque="true" name="console_opacity" show_text="true"
+                 value="0.4" width="200" />
+      <check_box bottom_delta="-4" control_name="ChatFullWidth" enabled="true"
+                 follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+                 label="Full screen width (requires restart)" left="270"
+                 mouse_opaque="true" name="chat_full_width_check" radio_style="false"
+                 width="239" />
+      
+
+      <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_box7" v_pad="0" width="128">
+        Chat Bubbles:
+      </text>
+      
+      <check_box bottom_delta="-25" control_name="UseChatBubbles" enabled="true" follows="left|top"
+                 font="SansSerifSmall" height="16" initial_value="false"
+                 label="Show chat bubbles" left_delta="30" 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="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="Instant Messages:" 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_translate" 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"
-             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_box3" v_pad="0" width="135">
-                Chat Console:
-        </text>
-        <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" />
+  <string name="log_in_to_change">
+    log in to change
+  </string>
+  <string name="default_email_used">
+    using default address
+  </string>
   
-        <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..9b55822 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="client_tag_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"
-             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12"
+             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_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"
-     bottom_delta="-30" 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">
-    Line Highlighting:
-  </text>
-
-  <check_box bottom_delta="-7" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
-      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" />
+  <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom_delta="-121"
+       can_apply_immediately="true" color="1 1 1 1" control_name="OwnNameChatColor"
+       enabled="true" follows="left|top" height="65" label="Your name" left="50"
+       mouse_opaque="true" name="OwnNameChatColor" width="65" />
+  <check_box bottom_delta="45" enabled="true" follows="left|top"
+       font="SansSerifSmall" height="16" initial_value="true"
+       label="Highlight local chat containing your name and/or nicknames:" left_delta="76" 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"
-      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" />
+       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"/>
 
-  <text bottom_delta="-30" follows="left|top" font="SansSerifSmall" height="20" 
-      left="140" name="nick01_text" width="150">
-    Highlight nickname 1:
-  </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"
+
+  <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-22"
+      enabled="true" follows="left|top" font="SansSerif" label="Nickname 1"
+      handle_edit_keys_directly="true" height="18" left_delta="0"  
       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" 
-      left="140" name="nick02_text" width="150">
-    Highlight nickname 2:
-  </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"
+  <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="0"
+      enabled="true" follows="left|top" font="SansSerif" label="Nickname 2"
+      handle_edit_keys_directly="true" height="18" left_delta="120"
       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"
-      left="140" name="nick03_text" width="150">
-    Highlight nickname 3:
-  </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"
+  <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="0"
+      enabled="true" follows="left|top" font="SansSerif" label="Nickname 3"
+      handle_edit_keys_directly="true" height="18" left_delta="120"
       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..cd896b8 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">
-    User interface font (requires restart):
+  <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="fontselect" v_pad="0" width="128" font-style="BOLD|SHADOW">
+    Select UI Font:
+  </text>
+  <text font="SansSerifSmall" bottom="-22" left_delta="80" height="12" name="(requires restart)" 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"
-             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
+             bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
+             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"
-             mouse_opaque="true" name="fade_out_combobox" width="146">
+        <combo_box bottom_delta="-30" follows="left|top" height="18" left="50"
+             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"
-             label="Small avatar names" left="330" name="small_avatar_names_checkbox"
+             font="SansSerifSmall" height="16" initial_value="false"
+             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="-20" follows="left|top"
+        <check_box bottom_delta="0" 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"
-             halign="left" height="16" left="10" name="Display_Names_textbox" v_pad="0"
-             width="394">
+  <check_box bottom_delta="-20" follows="left|top"
+       font="SansSerifSmall" height="16" initial_value="false"
+       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">
-                Legacy Names
+                <radio_item name="0" bottom_delta="-8" left="0" height="18">
+                Show legacy names
                 </radio_item>
-                <radio_item name="1" bottom_delta="0" left_delta="50" height="18">
-                Display Names
+                <radio_item name="1" bottom_delta="0" left_delta="70" height="18">
+                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">
-                Group Titles:
-        </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" />
+
+
+  <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="SansSerifSmall" h_pad="0" halign="left" height="12" left="10"
-             mouse_opaque="true" name="UI Size:" v_pad="0" width="128">
-    UI Size:
+       bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
+       font="SansSerifSmall" h_pad="0" halign="left" height="10" left="20" font-style="BOLD|SHADOW"
+       mouse_opaque="true" name="afk_textbox" v_pad="0" width="394">
+    Idle Away:
   </text>
-  <slider bottom_delta="42" can_edit_text="true"
-             decimal_digits="3" enabled="true" height="16" increment="0.001"
-             initial_val="1" left="148" max_val="1.4" min_val="0.75" mouse_opaque="true"
-             name="ui_scale_slider" show_text="true" value="1" width="220" />
-  <button bottom_delta="-48" enabled="true" follows="left|top"
-             font="SansSerif" halign="center" height="22" label="Reset"
-             label_selected="Reset" left_delta="226" mouse_opaque="true"
-             name="reset_ui_size" scale_image="true" width="80" />
-  <check_box bottom_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" />
+  <check_box bottom_delta="-25" enabled="true" follows="left|top"
+       font="SansSerifSmall" height="16" initial_value="false"
+       label="Go Away/AFK when idle after" left="50" mouse_opaque="true"
+       name="afk_timeout_checkbox" radio_style="false" width="256" />
+  <spinner bottom_delta="0" decimal_digits="0" enabled="true"
+             follows="left|top" height="16" increment="1" initial_val="5"
+             label="" label_width="0" left="270" max_val="360"
+             min_val="1" mouse_opaque="true" name="afk_timeout_spinner" width="50" />
   <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="SansSerifSmall" h_pad="0" halign="left" height="12" left="10"
-       mouse_opaque="true" name="Mini-Map Notify:" v_pad="0" width="128">
-    Mini-Map Notify:
+       bottom_delta="5" drop_shadow_visible="true" enabled="true" follows="left|top"
+       font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="55"
+       mouse_opaque="true" name="minutes_textbox" v_pad="0" width="128">
+    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"
-             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="Entering sim" left="330"
-       mouse_opaque="true" name="mini_map_notify_sim" 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"
-             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
+             bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
+             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:
-        </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:
+                 Access Content Rated:
         </text>
-        <combo_box bottom_delta="-6" follows="left|top" height="18" left="315"
-             mouse_opaque="true" name="maturity_desired_combobox" width="150">
+        <combo_box bottom_delta="-25" follows="left|top" height="18" left="50"
+             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"
-             mouse_opaque="true" name="maturity_desired_textbox" v_pad="0" width="150">
+             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="50"
+             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"
-             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="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"
+  <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="20" font-style="BOLD|SHADOW"
              mouse_opaque="true" name="language_textbox" v_pad="0" width="394">
-                Language:
-        </text>
-        <combo_box allow_text_entry="false" bottom_delta="0" enabled="true"
-             follows="left|top" height="18" left="153" max_chars="135"
-             mouse_opaque="true" name="language_combobox" width="146">
-                <combo_item type="string" length="1" enabled="true" name="System Default Language" value="default">
-                        System Default
-                </combo_item>
-                <combo_item type="string" length="1" enabled="true" name="English" value="en-us">
-                        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) - Beta
-                </combo_item>
-                <combo_item type="string" length="1" enabled="true" name="Deutsch(German)" value="de">
-                        Deutsch (German) - Beta
-                </combo_item>
-                <combo_item type="string" length="1" enabled="true" name="Spanish" value="es">
-                        Español (Spanish) - Beta
-                </combo_item>
-                <combo_item type="string" length="1" enabled="true" name="French" value="fr">
-                        Français (French) - Beta
-                </combo_item>
-                <combo_item type="string" length="1" enabled="true" name="Italian" value="it">
-                        Italiano (Italian) - Beta
-                </combo_item>
-                <combo_item type="string" length="1" enabled="true" name="Hungarian" value="hu">
-                        Magyar (Hungarian) - Beta
-                </combo_item>
-                <combo_item type="string" length="1" enabled="true" name="Dutch" value="nl">
-                        Nederlands (Dutch) - Beta
-                </combo_item>
-                <combo_item type="string" length="1" enabled="true" name="Polish" value="pl">
-                        Polski (Polish) - Beta
-                </combo_item>
-                <combo_item type="string" length="1" enabled="true" name="Portugese" value="pt">
-                        Portugués (Portuguese) - Beta
-                </combo_item>
-                <combo_item type="string" length="1" enabled="true" name="Russian" value="ru">
-                        Ру��кий (Russian) - Beta
-                </combo_item>
-                <combo_item type="string" length="1" enabled="true" name="Turkish" value="tr">
-                        Türkçe (Turkish) - Beta
-                </combo_item>
-                <combo_item type="string" length="1" enabled="true" name="Ukrainian" value="uk">
-                        Україн�ька (Ukrainian) - Beta
-                </combo_item>
-                <combo_item type="string" length="1" enabled="true" name="Chinese" value="zh">
-                        中文 (简体) (Chinese) - Beta
-                </combo_item>
-                <combo_item type="string" length="1" enabled="true" name="(Japanese)" value="ja">
-                        日本語 (Japanese) - Beta
-                </combo_item>
-                <combo_item type="string" length="1" enabled="true" name="(Korean)" value="ko">
-                        한국어 (Korean) - Beta
-                </combo_item>
-        </combo_box>
-        <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"
+    Language:
+  </text>
+  <combo_box allow_text_entry="false" bottom_delta="-30" enabled="true"
+             follows="left|top" height="18" left="50" max_chars="135"
+             mouse_opaque="true" name="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-us">
+      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) - Beta
+    </combo_item>
+    <combo_item type="string" length="1" enabled="true" name="Deutsch(German)" value="de">
+      Deutsch (German) - Beta
+    </combo_item>
+    <combo_item type="string" length="1" enabled="true" name="Spanish" value="es">
+      Español (Spanish) - Beta
+    </combo_item>
+    <combo_item type="string" length="1" enabled="true" name="French" value="fr">
+      Français (French) - Beta
+    </combo_item>
+    <combo_item type="string" length="1" enabled="true" name="Italian" value="it">
+      Italiano (Italian) - Beta
+    </combo_item>
+    <combo_item type="string" length="1" enabled="true" name="Hungarian" value="hu">
+      Magyar (Hungarian) - Beta
+    </combo_item>
+    <combo_item type="string" length="1" enabled="true" name="Dutch" value="nl">
+      Nederlands (Dutch) - Beta
+    </combo_item>
+    <combo_item type="string" length="1" enabled="true" name="Polish" value="pl">
+      Polski (Polish) - Beta
+    </combo_item>
+    <combo_item type="string" length="1" enabled="true" name="Portugese" value="pt">
+      Portugués (Portuguese) - Beta
+    </combo_item>
+    <combo_item type="string" length="1" enabled="true" name="Russian" value="ru">
+      Ру��кий (Russian) - Beta
+    </combo_item>
+    <combo_item type="string" length="1" enabled="true" name="Turkish" value="tr">
+      Türkçe (Turkish) - Beta
+    </combo_item>
+    <combo_item type="string" length="1" enabled="true" name="Ukrainian" value="uk">
+      Україн�ька (Ukrainian) - Beta
+    </combo_item>
+    <combo_item type="string" length="1" enabled="true" name="Chinese" value="zh">
+      中文 (简体) (Chinese) - Beta
+    </combo_item>
+    <combo_item type="string" length="1" enabled="true" name="(Japanese)" value="ja">
+      日本語 (Japanese) - Beta
+    </combo_item>
+    <combo_item type="string" length="1" enabled="true" name="(Korean)" value="ko">
+      한국어 (Korean) - Beta
+    </combo_item>
+  </combo_box>
+  <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="18" left_delta="150" mouse_opaque="true" name="language_textbox2"
-             v_pad="0" width="400">
-                (requires restart for full effect)
-        </text>
+             height="18" left="50" mouse_opaque="true" name="language_textbox2"
+             v_pad="0" width="380">
+    (requires restart)
+  </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 fe19929..2e92689 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,75 +1,92 @@
 <?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 meta-impy 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"
-             font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10"
+             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="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 
+                        800×600 
                 </combo_item>
                 <combo_item type="string" length="1" enabled="true" name="720x480" value="720 x 480">
-                        720x480 (NTSC)
+                        720×480 (NTSC)
                 </combo_item>
                 <combo_item type="string" length="1" enabled="true" name="768x576" value="768 x 576">
-                        768x576 (PAL)
+                        768×576 (PAL)
                 </combo_item>
                 <combo_item type="string" length="1" enabled="true" name="1024x768" value="1024 x 768">
-                        1024x768
+                        1024×768
                 </combo_item>
     <combo_item type="string" length="1" enabled="true" name="1280x720" value="1280 x 720">
-      1280x720 (HDV720)
+      1280×720 (HDV720)
     </combo_item>
     <combo_item type="string" length="1" enabled="true" name="1440x1080" value="1440 x 1080">
-      1440x1080 (HDV1080)
+      1440×1080 (HDV1080)
     </combo_item>
     <combo_item type="string" length="1" enabled="true" name="1920x1080" value="1920 x 1080">
-      1920x1080 (HD1080)
+      1920×1080 (HD1080)
     </combo_item>
   </combo_box>
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-62" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="12" 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"
+        <combo_box allow_text_entry="false" bottom_delta="0" 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,321 +100,318 @@
                         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"
-             left="10" mouse_opaque="true" name="HigherText" v_pad="0" width="80">
-                Quality and
-        </text>
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom_delta="-14" drop_shadow_visible="true" enabled="true"
-             follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
-             height="12" left_delta="0" mouse_opaque="true"
-             name="QualityText" v_pad="0" width="95">
-                performance:
-        </text>
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-86" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="12"
-             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"
+
+
+  <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="textbox" v_pad="0"
+      width="394" font-style="BOLD|SHADOW">
+    Performance
+  </text>
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             bottom_delta="-22" 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">
-                Low
-        </text>
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             left="110" mouse_opaque="true" name="ShadersPrefText" v_pad="0" width="40">
+    Low
+  </text>
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom_delta="0" drop_shadow_visible="true" enabled="true"
              follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
-             height="12" left_delta="47" mouse_opaque="true"
+             height="12" left_delta="62" mouse_opaque="true"
              name="ShadersPrefText2" v_pad="0" width="40">
-                Mid
-        </text>
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+    Mid
+  </text>
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom_delta="0" drop_shadow_visible="true" enabled="true"
              follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
-             height="12" left_delta="47" mouse_opaque="true"
+             height="12" left_delta="62" mouse_opaque="true"
              name="ShadersPrefText3" v_pad="0" width="40">
-                High
-        </text>
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+    High
+  </text>
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom_delta="0" drop_shadow_visible="true" enabled="true"
              follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
-             height="12" left_delta="47" mouse_opaque="true"
+             height="12" left_delta="62" mouse_opaque="true"
              name="ShadersPrefText4" v_pad="0" width="40">
-                Ultra
-        </text>
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-80" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="12"
-             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"
+    Ultra
+  </text>
+  <icon bottom_delta="18" color="0.12 0.12 0.12 1.0" height="14" follows="left|top"
+             image_name="rounded_square.tga" left="123" name="LowGraphicsDivet"
              width="2" />
-        <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"
+  <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="60" name="MidGraphicsDivet"
              width="2" />
-        <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"
+  <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="61" name="HighGraphicsDivet"
              width="2" />
-        <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"
+  <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="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"
-             name="QualityPerformanceSelection" show_text="false" width="150" />
-        <check_box bottom="-91" control_name="RenderCustomSettings" enabled="true"
+             left="115" max_val="3" min_val="0" mouse_opaque="true"
+             name="QualityPerformanceSelection" show_text="false" width="200" />
+  <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" />
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-130" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="12"
+
+  <button bottom_delta="0" enabled="true" font="SansSerifSmall" halign="center" height="20"
+       label="Recommended Settings" left="210" mouse_opaque="true"
+       name="Defaults" scale_image="true" width="160" follows="left|top" />
+  <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:
-        </text>
-        <check_box bottom="-153" control_name="RenderObjectBump" enabled="true" follows="left|top"
+    Shaders:
+  </text>
+  <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"
-             font="SansSerifSmall" h_pad="0" halign="left" height="12"
-             left="10" mouse_opaque="true" name="ReflectionDetailText" v_pad="0"
+
+  <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_delta="-10" mouse_opaque="true" name="ReflectionDetailText" v_pad="0"
              width="128">
-                Reflection Detail:
-        </text>
-        <radio_group bottom_delta="-73" control_name="RenderReflectionDetail" draw_border="false"
-             enabled="true" follows="left|top" height="70"
-             left_delta="-2" mouse_opaque="true" name="ReflectionDetailRadio"
-             width="321">
-                <radio_item type="string" length="1" bottom="-19" enabled="true" follows="left|top" height="16"
-                     left="3" mouse_opaque="true" name="0" width="315">
-                        Terrain and trees
-                </radio_item>
-                <radio_item type="string" length="1" bottom="-35" enabled="true" follows="left|top" height="16"
-                     left="3" mouse_opaque="true" name="1" width="315">
-                        All static objects
-                </radio_item>
-                <radio_item type="string" length="1" bottom="-51" enabled="true" follows="left|top" height="16"
-                     left="3" mouse_opaque="true" name="2" width="315">
-                        All avatars and objects
-                </radio_item>
-                <radio_item type="string" length="1" bottom="-67" enabled="true" follows="left|top" height="16"
-                     left="3" mouse_opaque="true" name="3" width="315">
-                        Everything
-                </radio_item>
-        </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"
+    Water Reflections:
+  </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="RenderReflectionDetail"
+             name="ReflectionDetailCombo" width="160">
+    <combo_item type="string" length="1" enabled="true" name="0" value="0">
+      Terrain and trees
+    </combo_item>
+    <combo_item type="string" length="1" enabled="true" name="1" value="1">
+      All static objects
+    </combo_item>
+    <combo_item type="string" length="1" enabled="true" name="2" value="2">
+      All avatars and objects
+    </combo_item>
+    <combo_item type="string" length="1" enabled="true" name="3" value="3">
+      Everything
+    </combo_item>
+  </combo_box>
+
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             bottom_delta="-25" 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="AvatarRenderingText" v_pad="0" width="128">
-                Avatar Rendering:
-        </text>
-        <check_box bottom_delta="-23" control_name="RenderUseImpostors" enabled="true"
+    Avatar Rendering:
+  </text>
+  <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"
-       font="SansSerifSmall" h_pad="0" halign="left" height="12" left_delta="0" 
-       mouse_opaque="true" name="AvatarCountText" v_pad="0" width="128">
-    Max. non-imposters:
+     bottom="-190" drop_shadow_visible="true" enabled="true" follows="left|top" font-style="BOLD|SHADOW"
+     font="SansSerifSmall" h_pad="0" halign="left" height="10"
+     left="210" mouse_opaque="true" name="LimitsText" v_pad="0" width="128">
+    Limits:
   </text>
-  <slider bottom_delta="-20" can_edit_text="true" control_name="RenderAvatarMaxVisible"
-       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"
+  <slider bottom_delta="-23" 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:
-        </text>
-        <slider bottom_delta="-22" can_edit_text="false" control_name="RenderVolumeLODFactor"
+    Mesh Detail:
+  </text>
+  <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
-        </text>
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-210" drop_shadow_visible="true" enabled="true" follows="left|top"
+    Low
+  </text>
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             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
-        </text>
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom_delta="-20" drop_shadow_visible="true" enabled="true"
+    Low
+  </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"
              height="12" left_delta="0" mouse_opaque="true"
              name="FlexibleMeshDetailText" v_pad="0" width="128">
-                Low
-        </text>
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom_delta="-20" drop_shadow_visible="true" enabled="true"
+    Low
+  </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"
              height="12" left_delta="0" mouse_opaque="true"
              name="TreeMeshDetailText" v_pad="0" width="128">
-                Low
-        </text>
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom_delta="-20" drop_shadow_visible="true" enabled="true"
+    Low
+  </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"
              height="12" left_delta="0" mouse_opaque="true"
              name="AvatarMeshDetailText" v_pad="0" width="128">
-                Low
-        </text>
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom_delta="-20" drop_shadow_visible="true" enabled="true"
+    Low
+  </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"
              height="12" left_delta="0" mouse_opaque="true"
              name="TerrainMeshDetailText" v_pad="0" width="128">
-                Low
-        </text>
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom_delta="-20" drop_shadow_visible="true" enabled="true"
+    Low
+  </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"
              height="12" left_delta="0" mouse_opaque="true"
              name="SkyMeshDetailText" v_pad="0" width="128">
-                Low
-        </text>
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-331" drop_shadow_visible="true" enabled="true" follows="left|top"
+    Low
+  </text>
+
+
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top" font-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:
-        </text>
-        <radio_group bottom_delta="-43" control_name="RenderLightingDetail" draw_border="false"
-             enabled="true" follows="left|top" height="38" left_delta="0"
-             mouse_opaque="true" name="LightingDetailRadio" width="321">
-                <radio_item type="string" length="1" bottom="-19" enabled="true" follows="left|top" height="16"
-                     left="3" mouse_opaque="true" name="SunMoon" width="156">
-                        Sun and moon only
-                </radio_item>
-                <radio_item type="string" length="1" bottom="-35" enabled="true" follows="left|top" height="16"
-                     left="3" mouse_opaque="true" name="LocalLights" width="156">
-                        Nearby local lights
-                </radio_item>
-        </radio_group>
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-331" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="12" 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" />
+    Lighting 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="RenderLightingDetail"
+             name="LightingDetailCombo" width="160">
+    <combo_item type="string" length="1" enabled="true" name="0" value="0">
+      Sun and moon only
+    </combo_item>
+    <combo_item type="string" length="1" enabled="true" name="1" value="1">
+      Nearby local lights
+    </combo_item>
+  </combo_box>  
+
+
+  <view_border bevel_style="none" border_thickness="1" bottom="-448" follows="left|top"
+             height="271" left="5" name="GraphicsBorder" width="488" />  
+  
+  
         <string name="resolution_format">
-                [RES_X] x [RES_Y]
+                [RES_X] × [RES_Y]
         </string>
         <string name="aspect_ratio_text">
                 [NUM]:[DEN]
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 2c71998..93bc84c 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,117 +1,111 @@
 <?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"
-             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12"
-             mouse_opaque="false" name="text_box" v_pad="0" width="128">
-    My Online Status:
+       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="Logging:" v_pad="0" width="128">
+    Logging:
   </text>
-  <check_box bottom="-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="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"
+
+  <check_box bottom_delta="-25" enabled="true"
        follows="left|top" font="SansSerifSmall" height="16"
-       initial_value="false" label="Show online Friend notifications" left="148"
-       mouse_opaque="true" name="friends_online_notify_checkbox"
-       radio_style="false" width="256" />
-  <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" />
-  <button bottom_delta="0" follows="left|top" height="22" label="OTR Options"
-     left="330" name="otr_adv_btn" tool_tip="Off The Record options"
-     width="120" />
-  <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" />
+       initial_value="false" label="Save a log of IM on my computer" left_delta="30"
+       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"
-             height="20" label="Change Path" label_selected="Change Path" left="148"
-             mouse_opaque="true" name="log_path_button" width="96" />
-  <line_editor border_drop_shadow_visible="false" border_visible="false" bottom_delta="1"
-             drop_shadow_visible="true" enabled="false" follows="top|left|right"
-             font="SansSerifSmall" halign="right" height="19" left="248"
-             max_length="254" mouse_opaque="false" name="log_path_string" right="-20" />
+  <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="Log location:" v_pad="0" width="128">
+    Log location:
+  </text>
+  <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" 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="Privacy:" 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" />
+  <button bottom_delta="0" follows="left|top" height="22" label="OTR Options"
+     left_delta="200" name="otr_adv_btn" tool_tip="Off The Record options"
+     width="120" />
+
+  <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"
-             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
+             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="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"
-             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="148"
+             bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
+             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"
-             height="16" increment="0.25" initial_val="2" left="276" max_val="15"
-             min_val="0" mouse_opaque="true" name="mouse_sensitivity" width="128" />
-        <check_box bottom_delta="-18" enabled="true" follows="left|top"
-             font="SansSerifSmall" height="16" label="Invert mouse" left="148"
+        <slider_bar bottom_delta="-6" enabled="true" follows="left|top"
+             height="16" increment="0.25" initial_val="2" left_delta="98" max_val="15"
+             min_val="0" mouse_opaque="true" name="mouse_sensitivity" width="88" />
+        <check_box bottom_delta="0" enabled="true" follows="left|top"
+             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"
-             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
-             mouse_opaque="true" name=" Auto Fly Options:" v_pad="0" width="266">
-    Auto-Fly:
+       bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
+       font="SansSerifSmall" h_pad="0" halign="left" height="10" left="20" font-style="BOLD|SHADOW"
+       mouse_opaque="true" name="text2" v_pad="0" width="128">
+    Joystick:
   </text>
-  <check_box bottom_delta="-6" enabled="true" follows="left|top"
-             font="SansSerifSmall" height="16" label="Fly/land on holding up/down"
-             left="148" mouse_opaque="true" name="automatic_fly" radio_style="false"
-             width="178" />
+  <button bottom_delta="-25" follows="left|top" font="SansSerifSmall" height="20"
+             label="Joystick Setup" left="50" mouse_opaque="true"
+             name="joystick_setup_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="-30" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
-             mouse_opaque="true" name=" Camera Options:" v_pad="0" width="266">
-    Default Camera:
+             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="true" name="Camera Options:" v_pad="0" width="266">
+    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"
-             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="148"
+             bottom_delta="-30" drop_shadow_visible="true" enabled="true" follows="left|top"
+             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"
-             increment=".025" initial_val="1.57" left="276" max_val="2.97" min_val=".17"
+             decimal_digits="2" enabled="true" follows="left|top" width="100" height="16"
+             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"
-       name="zoom_time" show_text="false" value="2" width="128" />
+       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="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" />
-  <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>
-
+             width="100" />
 
-        <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..57d8f31 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"
-             mouse_opaque="false" name="text_box" v_pad="0" width="200">
-                Maximum bandwidth:
-        </text>
-        <slider bottom_delta="-25" can_edit_text="true" control_name="ThrottleBandwidthKBPS"
-             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"
-             width="180" />
-        <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"
-             follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
-             height="10" left_delta="186" mouse_opaque="false" name="text_box2"
-             v_pad="0" width="200">
-                kbps (kilobits per second)
-        </text>
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom_delta="-25" drop_shadow_visible="true" enabled="true"
-             follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
-             height="10" left="12" mouse_opaque="false" name="cache_size_label_l"
-             v_pad="0" width="200">
-                Disk cache size (MB):
-        </text>
-        <slider bottom_delta="-25" can_edit_text="true" control_name="CacheSize"
-             decimal_digits="0" enabled="true" follows="left|top" height="15"
-             increment="10" initial_val="50" left_delta="0" max_val="1000" min_val="10"
-             mouse_opaque="true" name="cache_size" show_text="true" width="180" />
-        <button bottom_delta="-4" enabled="true" follows="left|top"
-             font="SansSerif" halign="center" height="22" label="Clear Disk Cache" left="340"
-             left_delta="186" mouse_opaque="true" name="clear_cache" scale_image="true"
-             width="150" />
-        <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"
-             follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
-             height="10" left="12" mouse_opaque="false" name="cache_location_label"
-             v_pad="0" width="200">
-                Disk cache location:
-        </text>
-        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-28"
-             enabled="false" follows="left|top" font="SansSerif"
-             handle_edit_keys_directly="true" height="20" left_delta="0"
-             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"
-             halign="center" height="22" label="Set" label_selected="Set" left_delta="0"
-             mouse_opaque="true" name="set_cache" scale_image="true" width="100" />
-        <button bottom="-105" bottom_delta="0" enabled="true" follows="left|top"
-             font="SansSerif" halign="center" height="22" label="Reset"
-             label_selected="Set" left_delta="103" mouse_opaque="true"
-             name="reset_cache" scale_image="true" width="100" />
-        <check_box bottom="-173" bottom_delta="-25" control_name="ConnectionPortEnabled"
-             enabled="true" follows="left|top" font="SansSerifSmall" height="16"
-             initial_value="false" label="Enable custom outgoing port" left="12"
-             mouse_opaque="true" name="connection_port_enabled" radio_style="false"
-       tool_tip="Enables custom port for outgoing connections" 
-             width="256" />
-        <spinner bottom="-193" 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="20" max_val="13050" min_val="13000" mouse_opaque="true"
-             name="connection_port" width="140" />
-  
-  <!-- XMLRPC PROXY -->
-
-  <check_box bottom_delta="-25" enabled="true"
-             follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-             label="Enable XMLRPC proxy (Login, Land, and Money purchases)" left="15" mouse_opaque="true"
-             name="xmlrpc_proxy_enabled" radio_style="false" width="300" />
-        <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="xmlrpc_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="xmlrpc_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="65535" min_val="10" mouse_opaque="true" name="xmlrpc_proxy_port"
-             width="140" />
-
-  <!-- SOCKS 5 PROXY -->
-
-  <check_box bottom_delta="-24" enabled="true"
-             follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-             label="Enable SOCKS 5 proxy" left="15" 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="35" 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="113" 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="75" left="35"
-             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="35" 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="35"
-             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" />
-
-  <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="35" mouse_opaque="false" name="http_proxy_label"
-     v_pad="0" width="128">
-    HTTP proxy:
-  </text>
-  <radio_group bottom_delta="-8" draw_border="false" follows="left|top" height="20" left="35"
-             name="socks5_http_proxy_type" width="380" >
-    <radio_item height="20" bottom="0" left="100" name="None" width="50"
-        tool_tip="No HTTP proxy">
-      None
-    </radio_item>
-    <radio_item height="20" bottom="0" left="170" name="Socks" width="50"
-        tool_tip="Use Socks for HTTP proxy">
-      SOCKS 5
-    </radio_item>
-    <radio_item height="20" bottom="0" left="250" name="Web" width="50"
-        tool_tip="Use web proxy for HTTP proxy">
-      Web
-    </radio_item>
-  </radio_group>
+
+
+  <tab_container bottom="0" height="450" left="0" mouse_opaque="false"
+     name="networktab2" tab_min_width="50" tab_position="top" width="495" bg_opaque_color="0,0,0,0.0">
+
+    
+    <!-- BANDWIDTH SETTINGS PANEL -->
+    
+
+    <panel border="true" bottom="-409" enabled="true" follows="left|top|right|bottom"
+       height="408" label="Performance" left="102" mouse_opaque="true"
+       name="bandwidth_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-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">
+        Maximum Viewer Bandwidth:
+      </text>
+      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                 bottom_delta="-25" drop_shadow_visible="true" enabled="true"
+                 follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
+                 height="10" left="50" mouse_opaque="false" name="Speed:"
+                 v_pad="0" width="200">
+        Speed:
+      </text>      
+      <slider bottom_delta="-4" can_edit_text="true" control_name="ThrottleBandwidthKBPS"
+                 decimal_digits="0" enabled="true" follows="left|top" height="15"
+                 increment="10" initial_val="1000" left_delta="50" max_val="5000" min_val="50"
+                 mouse_opaque="true" name="max_bandwidth" show_text="true" value="1000"
+                 width="160" />
+      <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"
+                 follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
+                 height="10" left_delta="166" mouse_opaque="false" name="text_box2"
+                 v_pad="0" width="200">
+        kbps (kilobits per second)
+      </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"
+           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="Texture Fetching:" v_pad="0" width="200">
+        Texture Fetching:
+      </text>
+
+      <check_box bottom_delta="-25" enabled="true" follows="left|top"
+           font="SansSerifSmall" height="16" initial_value="false"
+           label="Use HTTP texture fetching (experimental)" left="50" mouse_opaque="true"
+           name="http_texture_check" radio_style="false" width="217" />
+
+      <check_box bottom_delta="-25" enabled="true" follows="left|top"
+           font="SansSerifSmall" height="16" initial_value="false"
+           label="Increase rez speed via draw distance stepping" left_delta="0" mouse_opaque="true"
+           name="speed_rez_check" radio_style="false" width="217" />
+      <spinner bottom_delta="-20" 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="30" 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>      
+
+
+      <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="Disk Cache:" v_pad="0" width="200">
+        Disk Cache:
+      </text>
+      
+      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                 bottom_delta="-25" drop_shadow_visible="true" enabled="true"
+                 follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
+                 height="10" left="50" mouse_opaque="false" name="cache_size_label_l"
+                 v_pad="0" width="200">
+        Size:
+      </text>
+      <slider bottom_delta="-4" can_edit_text="true" control_name="CacheSize"
+                 decimal_digits="0" enabled="true" follows="left|top" height="15"
+                 increment="10" initial_val="50" left_delta="50" max_val="1000" min_val="10"
+                 mouse_opaque="true" name="disk_cache_size" show_text="true" width="160" />
+      <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"
+                 follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
+                 height="10" left_delta="166" mouse_opaque="false" name="text_box5"
+                 v_pad="0" width="200">
+        megabytes
+      </text>      
+      
+      <button bottom_delta="-30" enabled="true" follows="left|top"
+                 font="SansSerifSmall" halign="center" height="20" label="Clear Disk Cache"
+                 left="50" mouse_opaque="true" name="clear_disk_cache" scale_image="true"
+                 width="160" />
+      
+      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                 bottom_delta="-25" drop_shadow_visible="true" enabled="true"
+                 follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
+                 height="10" left="50" mouse_opaque="false" name="cache_location_label"
+                 v_pad="0" width="200">
+        Location:
+      </text>
+      <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-25"
+                 enabled="false" follows="left|top" font="SansSerif"
+                 handle_edit_keys_directly="true" height="20" left_delta="0"
+                 max_length="4096" mouse_opaque="true" name="disk_cache_location"
+                 select_all_on_focus_received="false" width="395" word_wrap="false" />
+      <button bottom_delta="-25" enabled="true" follows="left|top" font="SansSerifSmall"
+                 halign="center" height="20" label="Change Location" left_delta="0"
+                 mouse_opaque="true" name="set_disk_cache" 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="reset_disk_cache" scale_image="true" width="160" />
+
+
+    </panel>
+
+
+    <!-- PROXY SETTINGS PANEL -->
+
+
+    <panel border="true" bottom="-580" follows="left|top|right|bottom" height="525" label="Proxy Settings"
+           left="1" mouse_opaque="true" name="proxies" width="418">
+
+
+      <!-- XMLRPC 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">
+        XMLRPC:
+      </text>
+      
+      <check_box bottom_delta="-25" enabled="true"
+                 follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+                 label="Enable XMLRPC proxy (Login, Land, and Money purchases)" left="50" mouse_opaque="true"
+                 name="xmlrpc_proxy_enabled" radio_style="false" width="300" />
+
+      <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="xmlrpc_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="xmlrpc_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="65535" min_val="10" mouse_opaque="true" name="xmlrpc_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" />
+      
+      
+      <!-- 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 Imprudence.">
+          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..061d02c 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">
-                Hide These Popups:
-        </text>
-        <scroll_list follows="top|left" height="88" left="15" name="disabled_popups" width="480" />
-        <button follows="top|left" height="20" label="Enable This Popup" left="15"
-             name="enable_popup" width="175" />
-        <button follows="top|left" height="20" label="Enable All Popups" left="200"
-             name="reset_dialogs_btn"
+
+<!-- 
+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" 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="dont_show_label" 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" />
-        <text follows="top|left" left="15" width="128" name="show_label" bottom_delta="-24">
-                Show These Popups:
-        </text>
-        <scroll_list follows="top|left" height="88" left="15" name="enabled_popups" width="480" />
-        <button bottom_delta="-24" follows="top|left" height="20"
-             label="Disable All Popups" left="200"
-             name="skip_dialogs_btn"
+             width="160" bottom_delta="0" />
+
+
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+       bottom_delta="-25" drop_shadow_visible="true" enabled="true" follows="left|top"
+       font="SansSerifSmall" h_pad="0" halign="left" height="12" left="20"
+       mouse_opaque="true" name="show_label" v_pad="0" width="200" font-style="BOLD|SHADOW">
+    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="When an avatar enters:" 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 region" 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 4a5c95a..eae0103 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"
-             font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10"
+             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="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="requires_restart_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="meta7" width="480">
       meta 7
@@ -24,40 +49,40 @@
     </radio_item>
   </radio_group>
   
-  <button left="130" bottom="-125" width="216" height="95" name="meta7_preview" 
+  <button left="150" bottom="-130" width="216" height="95" name="meta7_preview" 
           scale_image="true" label="" image_selected="skin_thumbnail_meta7.png" 
-          image_unselected="skin_thumbnail_meta7.png" image_hover_selected="skin_thumbnail_meta7.png"
+          image_hover_selected="skin_thumbnail_meta7.png" image_unselected="skin_thumbnail_meta7.png" 
           image_hover_unselected="skin_thumbnail_meta7.png" follows="left|top" />
-  <button left="130" bottom_delta="-100" width="216" height="95" name="m7white_preview" 
-          scale_image="true" label="" image_selected="skin_thumbnail_white_meta7.png" 
-          image_hover_selected="skin_thumbnail_white_meta7.png" image_unselected="skin_thumbnail_white_meta7.png" 
+  <button left="150" bottom_delta="-100" width="216" height="95" name="m7white_preview"
+          scale_image="true" label="" image_selected="skin_thumbnail_white_meta7.png"
+          image_hover_selected="skin_thumbnail_white_meta7.png" image_unselected="skin_thumbnail_white_meta7.png"
           image_hover_unselected="skin_thumbnail_white_meta7.png" follows="left|top" />
-  <button left="130" bottom_delta="-100" width="216" height="95" name="pslpurple_preview"
-          scale_image="true" label="" image_selected="skin_thumbnail_pslpurple.png"
-          image_hover_selected="skin_thumbnail_pslpurple.png" image_unselected="skin_thumbnail_pslpurple.png"
+  <button left="150" bottom_delta="-100" width="216" height="95" name="pslpurple_preview" 
+          scale_image="true" label="" image_selected="skin_thumbnail_pslpurple.png" 
+          image_hover_selected="skin_thumbnail_pslpurple.png" image_unselected="skin_thumbnail_pslpurple.png" 
           image_hover_unselected="skin_thumbnail_pslpurple.png" follows="left|top" />
-  <button left="130" bottom_delta="-100" width="216" height="95" name="classic_preview" 
+  <button left="150" bottom_delta="-100" width="216" height="95" name="classic_preview" 
           scale_image="true" label="" image_selected="skin_thumbnail_default.png" 
           image_hover_selected="skin_thumbnail_default.png" image_unselected="skin_thumbnail_default.png" 
           image_hover_unselected="skin_thumbnail_default.png" follows="left|top" />
-  <text name="skin_current_text"
-              left="10" bottom="5" halign="left" height="12"
+  <text name="skin_current_text" font-style="BOLD|SHADOW"
+              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">
-    Other Skin Name:
+              font="SansSerifSmall" mouse_opaque="true">
+    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"
-          follows="left|center" font="SansSerif" halign="center"
+          bottom_delta="-2" left_delta="165" height="20" width="110"
+          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"
-             left_delta="8" max_length="65535" mouse_opaque="true"
-             name="voice_unavailable" tab_stop="false" width="450" word_wrap="true">
-                Voice Chat Is Not Available
-        </text_editor>
-        <check_box bottom_delta="0" enabled="true"
-             follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-             label="Enable voice chat" left="8" mouse_opaque="true"
-             name="enable_voice_check" radio_style="false" width="200" />
+
+  
+  <text_editor type="string" length="1" allow_html="false" bg_readonly_color="0 0 0 0" bottom="-30"
+     embedded_items="false" enabled="false" follows="left|top"
+     font="SansSerifSmall" height="20" hide_border="true" hide_scrollbar="true"
+     left="20" max_length="65535" mouse_opaque="true"
+     name="voice_unavailable" tab_stop="false" width="450" word_wrap="true">
+    Voice Chat Is Not Available
+  </text_editor>
+  <check_box bottom="-26" enabled="true"
+     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" />
-        <button bottom_delta="-25" follows="left|top" font="SansSerif" halign="center"
+             width="320" />
+        <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" />
-        <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center" height="20"
-             label="Middle Mouse Button" left_delta="120" mouse_opaque="true"
+             name="set_voice_hotkey_button" width="160" />
+        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" halign="center" height="20"
+             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"
-             left_delta="20" mouse_opaque="true" name="voice_call_friends_only_check"
+             label="Only accept calls from my friends"
+             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="0" follows="left|top" font="SansSerif" halign="center" height="20"
-                label="Reconnect to Voice" left_delta="160" mouse_opaque="true"
-                name="reset_voice" width="160" />
+  
+  
+        <button bottom_delta="-40" follows="left|top" font="SansSerifSmall" height="20"
+             label="Device Settings" left="30" mouse_opaque="true"
+             name="device_settings_btn" 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 b4dbbb5..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 the viewer.">
-                        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>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_region_estate.xml b/linden/indra/newview/skins/default/xui/en-us/panel_region_estate.xml
index 5dd738a..bcbff32 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_region_estate.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_region_estate.xml
@@ -25,7 +25,7 @@ regions in the estate.
                 (unknown)
         </text>
         <view_border bevel_style="in" border="true" border_thickness="1" bottom_delta="-295"
-             follows="top|left" height="350" left="6" width="250" />
+             follows="top|left" height="290" left="6" width="250" />
         <check_box bottom_delta="265" follows="left|top" height="20" label="Use Global Time"
              left="12" name="use_global_time_check" width="200" />
         <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_about.xml b/linden/indra/newview/skins/default/xui/zh/floater_about.xml
index b14f06f..bb975e0 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_about.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_about.xml
@@ -1,6 +1,14 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="floater_about" title="关于第二人生">
+  <tab_container name="about_tab">
+    <panel label="版本" name="support_panel">
+      <button label="�制到剪贴�"         name="copy_btn" />
+    </panel>
+    <panel label="工作人员" name="credits_panel" />
+  </tab_container>
+
         <string name="you_are_at">
                 您现在�于 [POSITION]
         </string>
+
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_about_land.xml b/linden/indra/newview/skins/default/xui/zh/floater_about_land.xml
index d9c52a2..c83cb24 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_about_land.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_about_land.xml
@@ -2,10 +2,10 @@
 <floater name="floaterland" title="关于土地">
         <tab_container name="landtab">
                 <panel label="一般" name="land_general_panel">
-                        <text length="1" name="Name:" type="string">
+                        <text  name="Name:" type="string">
                                 �字:
                         </text>
-                        <text length="1" name="Description:" type="string">
+                        <text  name="Description:" type="string">
                                 �述:
                         </text>
                         <text name="LandType">
@@ -20,56 +20,56 @@
                         <text name="ContentRatingText">
                                 Adult
                         </text>
-                        <text length="1" name="Owner:" type="string">
+                        <text  name="Owner:" type="string">
                                 主人:
                         </text>
-                        <text length="1" name="OwnerText" type="string">
+                        <text  name="OwnerText" type="string">
                                 Leyla Linden
                         </text>
                         <button label="档案..." label_selected="档案..." name="Profile..."/>
-                        <text length="1" name="Group:" type="string">
+                        <text  name="Group:" type="string">
                                 社团:
                         </text>
                         <button label="更改..." label_selected="更改..." name="Set..."/>
                         <check_box label="�许转让给社团" name="check deed" tool_tip="一个社团官员�以转让这�土地至社团，使其被社团的土地��支�。"/>
                         <button label="转让..." label_selected="转让..." name="Deed..." tool_tip="�有你是所选社团官员的时候�能转让土地。"/>
-                        <check_box label="土地拥有者通过转让土地�贡献" name="check contrib" tool_tip="当土地转让到社团，原土地拥有者将需贡献足够的土地�支�。"/>
-                        <text length="1" name="For Sale:" type="string">
+                        <check_box label="拥有者在转让�时给出贡献" name="check contrib" tool_tip="当土地被转让给社团时, �一个主人贡献足够的土地��以支�土地的�行。"/>
+                        <text  name="For Sale:" type="string">
                                 出售:
                         </text>
-                        <text length="1" name="Not for sale." type="string">
+                        <text  name="Not for sale." type="string">
                                 ��状�。
                         </text>
-                        <text length="1" name="For Sale: Price L$[PRICE]." type="string">
-                                价格: L$[PRICE]（L$[PRICE_PER_SQM]/m²）。
+                        <text  name="For Sale: Price L$[PRICE]." type="string">
+                                价格: [CURRENCY][PRICE] ([CURRENCY][PRICE_PER_SQM]/m²)。
                         </text>
                         <button label="出售土地..." label_selected="出售土地..." name="Sell Land..."/>
-                        <text length="1" name="For sale to" type="string">
+                        <text  name="For sale to" type="string">
                                 出售给: [BUYER]
                         </text>
-                        <text length="1" name="Sell with landowners objects in parcel." type="string">
+                        <text  name="Sell with landowners objects in parcel." type="string">
                                 出售中包括物体。
                         </text>
-                        <text length="1" name="Selling with no objects in parcel." type="string">
+                        <text  name="Selling with no objects in parcel." type="string">
                                 出售中�包括物体。
                         </text>
                         <button label="�消土地出售" label_selected="�消土地出售" name="Cancel Land Sale"/>
-                        <text length="1" name="Claimed:" type="string">
+                        <text  name="Claimed:" type="string">
                                 认购时间:
                         </text>
-                        <text length="1" name="DateClaimText" type="string">
+                        <text  name="DateClaimText" type="string">
                                 星期二 八月15日 13:47:25 2006年
                         </text>
-                        <text length="1" name="PriceLabel" type="string">
+                        <text  name="PriceLabel" type="string">
                                 �积：
                         </text>
-                        <text length="1" name="PriceText" type="string">
+                        <text  name="PriceText" type="string">
                                 4048m²
                         </text>
-                        <text length="1" name="Traffic:" type="string">
+                        <text  name="Traffic:" type="string">
                                 ��:
                         </text>
-                        <text length="1" name="DwellText" type="string">
+                        <text  name="DwellText" type="string">
                                 0
                         </text>
                         <button label="购买土地..." label_selected="购买土地..." name="Buy Land..."/>
@@ -123,31 +123,31 @@
                         <text name="estate_section_lbl">
                                 地产：
                         </text>
-                        <text length="1" name="estate_name_lbl" type="string">
+                        <text  name="estate_name_lbl" type="string">
                                 �称：
                         </text>
-                        <text length="1" name="estate_name_text" type="string">
+                        <text  name="estate_name_text" type="string">
                                 大陆
                         </text>
-                        <text length="1" name="estate_owner_lbl" type="string">
+                        <text  name="estate_owner_lbl" type="string">
                                 拥有者：
                         </text>
-                        <text length="1" name="estate_owner_text" type="string">
+                        <text  name="estate_owner_text" type="string">
                                 (æ— )
                         </text>
-                        <text_editor length="1" name="covenant_editor" type="string">
+                        <text_editor  name="covenant_editor" type="string">
                                 这�地产没有�供任何契约��。
                         </text_editor>
-                        <text length="1" name="covenant_timestamp_text" type="string">
+                        <text  name="covenant_timestamp_text" type="string">
                                 上次修改时间 星期三12 月3 1日 16:00:00 1969年
                         </text>
                         <text name="region_section_lbl">
                                 地区：
                         </text>
-                        <text length="1" name="region_name_lbl" type="string">
+                        <text  name="region_name_lbl" type="string">
                                 �称：
                         </text>
-                        <text length="1" name="region_name_text" type="string">
+                        <text  name="region_name_text" type="string">
                                 leyla
                         </text>
                         <text name="region_landtype_lbl">
@@ -165,13 +165,13 @@
                         <text name="resellable_lbl">
                                 转售：
                         </text>
-                        <text length="1" name="resellable_clause" type="string">
+                        <text  name="resellable_clause" type="string">
                                 此地区内购买的土地�能被�新出售。
                         </text>
                         <text name="changeable_lbl">
                                 划分：
                         </text>
-                        <text length="1" name="changeable_clause" type="string">
+                        <text  name="changeable_clause" type="string">
                                 此地区内购买的土地�能被�并或划分。
                         </text>
                         <string name="can_resell">
@@ -191,7 +191,7 @@
                         <text name="parcel_object_bonus">
                                 区域�外物体因数: [BONUS]
                         </text>
-                        <text length="1" name="Simulator primitive usage:" type="string">
+                        <text  name="Simulator primitive usage:" type="string">
                                 模拟器元件使用情况:
                         </text>
                         <text left="146" name="objects_available">
@@ -203,53 +203,53 @@
                         <string name="objects_deleted_text">
                                 [COUNT] 个, 最多 [MAX] 个 ([DELETED] 个将会被删除)
                         </string>
-                        <text length="1" name="Primitives parcel supports:" type="string">
+                        <text  name="Primitives parcel supports:" type="string">
                                 地�支�元件数:
                         </text>
-                        <text left="146" length="1" name="object_contrib_text" type="string" width="222">
+                        <text left="146"  name="object_contrib_text" type="string" width="222">
                                 [COUNT] 个
                         </text>
-                        <text length="1" name="Primitives on parcel:" type="string">
+                        <text  name="Primitives on parcel:" type="string">
                                 地�上的元件数:
                         </text>
-                        <text left="146" length="1" name="total_objects_text" type="string" width="58">
+                        <text left="146"  name="total_objects_text" type="string" width="58">
                                 [COUNT] 个
                         </text>
-                        <text length="1" name="Owned by parcel owner:" type="string">
+                        <text  name="Owned by parcel owner:" type="string">
                                 土地拥有者所有:
                         </text>
-                        <text left="146" length="1" name="owner_objects_text" type="string" width="58">
+                        <text left="146"  name="owner_objects_text" type="string" width="58">
                                 [COUNT] 个
                         </text>
                         <button label="显示" label_selected="显示" name="ShowOwner"/>
                         <button label="归还..." label_selected="归还..." name="ReturnOwner..." tool_tip="将物体归还其主人。"/>
-                        <text length="1" name="Set to group:" type="string">
+                        <text  name="Set to group:" type="string">
                                 设为社团的元件数:
                         </text>
-                        <text left="146" length="1" name="group_objects_text" type="string" width="58">
+                        <text left="146"  name="group_objects_text" type="string" width="58">
                                 [COUNT] 个
                         </text>
                         <button label="显示" label_selected="显示" name="ShowGroup"/>
                         <button label="归还..." label_selected="归还..." name="ReturnGroup..." tool_tip="将物体归还其主人。"/>
-                        <text length="1" name="Owned by others:" type="string">
+                        <text  name="Owned by others:" type="string">
                                 为其他人所有:
                         </text>
-                        <text left="146" length="1" name="other_objects_text" type="string" width="58">
+                        <text left="146"  name="other_objects_text" type="string" width="58">
                                 [COUNT] 个
                         </text>
                         <button label="显示" label_selected="显示" name="ShowOther"/>
                         <button label="归还..." label_selected="归还..." name="ReturnOther..." tool_tip="将物体归还其主人。"/>
-                        <text length="1" name="Selected / sat upon:" type="string">
+                        <text  name="Selected / sat upon:" type="string">
                                 被选择 / 被�上的:
                         </text>
-                        <text left="146" length="1" name="selected_objects_text" type="string" width="58">
+                        <text left="146"  name="selected_objects_text" type="string" width="58">
                                 [COUNT] 个
                         </text>
-                        <text length="1" name="Autoreturn" type="string">
+                        <text  name="Autoreturn" type="string">
                                 自动归还其他居民的物体 (分钟, 0为关闭):
                         </text>
                         <line_editor name="clean other time" right="-170"/>
-                        <text length="1" name="Object Owners:" type="string">
+                        <text  name="Object Owners:" type="string">
                                 物体主人:
                         </text>
                         <button label="更新��" label_selected="更新��" left="78" name="Refresh List"/>
@@ -263,7 +263,7 @@
                         </name_list>
                 </panel>
                 <panel label="选项" name="land_options_panel">
-                        <text length="1" name="allow_label" type="string">
+                        <text  name="allow_label" type="string">
                                 �许其他居民:
                         </text>
                         <check_box label="编辑地形" name="edit land check" tool_tip="如果选中的�，�都能编辑您的土地地形。最好是��选中这项，因为您总�以编辑您自己的土地。"/>
@@ -284,7 +284,7 @@
                         </text>
                         <check_box label="所有居民" name="check other scripts"/>
                         <check_box label="社团" name="check group scripts"/>
-                        <text length="1" name="land_options_label" type="string">
+                        <text  name="land_options_label" type="string">
                                 土地选项:
                         </text>
                         <check_box label="安全 (�会�伤)" name="check safe" tool_tip="如果选中的�，土地设置为安全，�用格斗伤害。�选中的�，�用格斗伤害。"/>
@@ -392,11 +392,11 @@
                         <string name="mature_check_adult_tooltip">
                                 您的地�信�或其内容被认为是adult内容。
                         </string>
-                        <text length="1" name="Snapshot:" type="string">
+                        <text  name="Snapshot:" type="string">
                                 å¿«ç…§:
                         </text>
                         <texture_picker label="" name="snapshot_ctrl" tool_tip="点击这里�选择图片"/>
-                        <text length="1" name="landing_point" type="string">
+                        <text  name="landing_point" type="string">
                                 �陆点: [LANDING]
                         </text>
                         <string name="landing_point_none">
@@ -404,17 +404,17 @@
                         </string>
                         <button label="设置" label_selected="设置" name="Set" tool_tip="设置访问者抵达时的�陆点。将会设置到您化身在该地�内的�置。"/>
                         <button label="清除" label_selected="清除" name="Clear" tool_tip="清除�陆点"/>
-                        <text length="1" name="Teleport Routing: " type="string">
+                        <text  name="Teleport Routing: " type="string">
                                 瞬间移动传�路线:
                         </text>
                         <combo_box name="landing type" tool_tip="Teleport Routing -- 选择如何应对到你的土地的瞬间移动。">
-                                <combo_item length="1" name="Blocked" type="string">
+                                <combo_item  name="Blocked" type="string">
                                         ��许
                                 </combo_item>
-                                <combo_item length="1" name="LandingPoint" type="string">
+                                <combo_item  name="LandingPoint" type="string">
                                         �陆点
                                 </combo_item>
-                                <combo_item length="1" name="Anywhere" type="string">
+                                <combo_item  name="Anywhere" type="string">
                                         任��置
                                 </combo_item>
                         </combo_box>
@@ -434,12 +434,43 @@
                                 媒体 URL:
                         </text>
                         <button label="设置..." label_selected="设置..." name="set_media_url"/>
+                        <text
+                                 name="Current URL:">
+                                当� URL:
+                        </text>
+
+                        <button
+                                 label="�置..."
+                                 label_selected="�置..."
+                                 name="reset_media_url"
+                                 right="-12" />
+                        <check_box label="��媒体 URL" name="hide_media_url" tool_tip="选中该项将会对未被授�的查看该地�信�的人��媒体 URL 。注�对 HTML 类型，此项��用。"/>
+                        <text
+                                 font="SansSerifSmall"
+                                 name="media_reset"
+                                 right="-264"
+                                 tool_tip="地�在该时间之�，将自动返回�始 URL (0 为�返回)"
+                                 type="string"
+                                 width="185">
+                                在
+                        </text>
+                        <spinner
+                                 name="media_reset_time"
+                                 right="-195"
+                                 tool_tip="地�在该时间之�，将自动返回�始 URL (0 为�返回)" />
+                        <text
+
+                                 name="minutes"
+                                 tool_tip="地�在该时间之�，将自动返回�始 URL (0 为�返回)"
+                                 right="-90">
+                                分钟�回到�始 URL
+                        </text>
                         <text name="Description:">
                                 �述:
                         </text>
                         <line_editor name="url_description" tool_tip="在播放/加载按钮�显示的文字"/>
-                        <text length="1" name="Media texture:" type="string">
-                                媒体 �质:
+                        <text  name="Media texture:" type="string">
+                                �质:
                         </text>
                         <texture_picker label="" name="media texture" tool_tip="点击这里�选择图片"/>
                         <text name="replace_texture_help">
@@ -447,38 +478,98 @@
 显示选择的动画或网页。)
                         </text>
                         <text name="Options:">
-                                媒体 选项:
+                                选项:
                         </text>
                         <check_box label="自动调整内容大� " name="media_auto_scale" tool_tip="打开此项将自动缩放该地�上的内容。其速度和质��能会���低，但�会需�任何其他的�质缩放或对�。"/>
                         <check_box label="循环播放" name="media_loop" tool_tip="循环播放媒体。当媒体播放完毕时，它将从开始处�新播放。"/>
-                        <check_box label="��媒体 URL" name="hide_media_url" tool_tip="打开该选项将对未��许的土地信�察看者��媒体 URL。请注�该选项�适用于 HTML 类型。"/>
-                        <check_box label="��音� URL" name="hide_music_url" tool_tip="打开该选项将对未��许的土地信�察看者��音� URL。"/>
                         <text name="media_size" tool_tip="渲染媒体的尺寸，设为 0 使用默认值">
                                 媒体尺寸:
                         </text>
-                        <spinner name="media_size_width" tool_tip="渲染媒体的尺寸，设为 0 使用默认值"/>
-                        <spinner name="media_size_height" tool_tip="渲染媒体的尺寸，设为 0 使用默认值"/>
-                        <text name="pixels" right="-10">
+                
+        <spinner name="media_size_width" tool_tip="渲染媒体的尺寸，设为 0 使用默认值"/>
+                        <text
+                                 name="pixels">
                                 �素
                         </text>
+                        <text
+                                 name="Interaction:">
+                                交互:
+                        </text>
+                        <radio_group
+                                 name="radio_navigate_allow">
+                                <radio_item
+                                         name="Anyone"
+                                         tool_tip="任何居民都�以和媒体交互。">
+                                        任何人
+                                </radio_item>
+                                <radio_item
+                                         name="Group"
+                                         tool_tip="社团��控制��以与媒体交互。">
+                                        社团
+                                </radio_item>
+                        </radio_group>
+                        <check_box
+                                 label="仅�许�览这些域:"
+                                 name="check navigate filter" />
+                        <line_editor
+                                 name="navigate_filter_domain" />
+                        <button
+                                 label="添加..."
+                                 label_selected="添加..."
+                                 name="add_navigate_filter" />
+                        <scroll_list
+                                 name="filter_list">
+                                <column
+                                         label="域�"
+                                         name="domain" />
+                        </scroll_list>
+                        <button
+                                 label="移除"
+                                 label_selected="移除"
+                                 name="remove_navigate_filter" />
+                </panel>
+                <panel
+                         label="音频"
+                         layout="topleft"
+                         name="land_audio_panel"
+                         top_delta="1">
                         <text name="MusicURL:">
                                 音� URL:
                         </text>
-                        <line_editor name="music_url" right="-15"/>
+                        <check_box label="��音� URL" name="hide_music_url" tool_tip="选中该项将会对未被授�的查看该地�信�的人��媒体 URL 。"/>                      
+
                         <text name="Sound:">
                                 声音:
                         </text>
-                        <check_box label="动作和物�的声音�存在于此地�。" name="check sound local"/>
+                        <check_box label="�制动作和物�的声音到此地�。" name="check_sound_local"/>
                         <button label="?" label_selected="?" name="?"/>
-                        <text name="Voice settings:">
+                        <text name="Voice:">
                                 语音:
                         </text>
+<radio_group
+         name="parcel_voice_channel">
+                                <radio_item
+                 name="Estate"
+                 tool_tip="使用地产语音频�。">
+                                        地产频�
+                                </radio_item>
+                                <radio_item
+                 name="Parcel"
+                 tool_tip="�制语音到该地�。">
+                                        地�频�
+                                </radio_item>
+                                <radio_item
+                 name="Disabled"
+                 tool_tip="在此地�上�用语音。">
+                                        �用
+                                </radio_item>
+                        </radio_group>
                         <check_box label="使用语音功能" name="parcel_enable_voice_channel"/>
                         <check_box label="�许使用地产声音频�（由地产所创建）" name="parcel_enable_voice_channel_is_estate_disabled"/>
                         <check_box label="�制声音于地��有频�" name="parcel_enable_voice_channel_parcel"/>
                 </panel>
                 <panel label="访问" name="land_access_panel">
-                        <text length="1" name="Limit access to this parcel to:" type="string">
+                        <text  name="Limit access to this parcel to:" type="string">
                                 对该地�的访问
                         </text>
                         <check_box label="�许公众访问" name="public_access"/>
@@ -500,7 +591,7 @@
                                         社团
                                 </combo_item>
                         </combo_box>
-                        <spinner label="L$ 标价:" name="PriceSpin"/>
+                        <spinner label="[CURRENCY] 标价:" name="PriceSpin"/>
                         <spinner label="访问时间:" name="HoursSpin"/>
                         <text label="总是�许" name="AllowedText">
                                 被�许的居民
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_animation_list.xml b/linden/indra/newview/skins/default/xui/zh/floater_animation_list.xml
new file mode 100644
index 0000000..43f528a
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/zh/floater_animation_list.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+         name="animation list"
+         title="动画列表">
+        <scroll_list
+                 name="animation_list"
+                 tool_tip="按Shift或Ctrl�选择多个�目">
+                <!-- Icons relating to the avatar, currently: tracking, and marked -->
+                <column
+                         name="Anim Name"
+                         label="动画�称" />
+    <column
+                         name="Animation UUID"
+                         label="动画 UUID" />
+    <!--<column name="object_name" label="Distance" dynamicwidth="true"/>-->
+                <column
+                         name="Source Object UUID"
+                         label="�物体 UUID" />
+    <column
+                         name="Source Owner"
+                         label="�拥有者" />
+    <!-- What the avatar is doing: producing sounds, rezzing, particles, etc -->
+        </scroll_list>
+ 
+  <button
+                 label="�止选中项"
+                 name="Stop Selected"
+                 tool_tip="�止选中的动画" />
+  <button
+                 label="撤回选中项"
+                 name="Revoke Selected"
+                 tool_tip="撤回选中物体的动画许�" />
+  <button
+                 label="�止+撤回选中项"
+                 name="Stop+Revoke Selected"
+                 tool_tip="撤回选中物体的动画许�，并且�止选中的动画" />
+  <button
+                 label="打开拥有者档案"
+                 name="Open Owner Profile"
+                 tool_tip="打开选中物体拥有者的档案" />
+  <button
+                 label="归还物体"
+                 name="Return Object"
+                 tool_tip="归还选中物体，如果你有相关土地�力的�" />
+ 
+</floater>
\ No newline at end of file
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_animation_preview.xml b/linden/indra/newview/skins/default/xui/zh/floater_animation_preview.xml
index 9e28bf6..4fa2db3 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_animation_preview.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_animation_preview.xml
@@ -59,7 +59,7 @@
         </text>
         <combo_box label="" name="emote_combo" tool_tip="控制在动画中的表情">
                 <combo_item name="[None]">
-                        [None]
+                        [æ— ]
                 </combo_item>
                 <combo_item name="Aaaaah">
                         å•Šå•Šå•Š
@@ -147,7 +147,7 @@
 我们推�从Poser 4软件中导出的BVH文件
         </text>
         <button label="�消" name="cancel_btn"/>
-        <button label="上传(L$[AMOUNT])" name="ok_btn"/>
+        <button label="上传 ([UPLOADFEE])" name="ok_btn"/>
         <string name="failed_to_initialize">
                 �始化动作失败。
         </string>
@@ -161,4 +161,7 @@
 
 [STATUS]
         </string>
+        <string name="in_world">
+                动画预览将在你的化身上播放。
+        </string>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_ao.xml b/linden/indra/newview/skins/default/xui/zh/floater_ao.xml
new file mode 100644
index 0000000..df83b85
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/zh/floater_ao.xml
@@ -0,0 +1,150 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+         name="geminifloater"
+         title="动画覆盖">
+ 
+  <text
+                 name="Give inventory"
+                 tool_tip="拖动 ZHAO II 记事�到这里。动画必须和记事�在�一个文件夹中。">
+    拖动 ZHAO II 记事�到这里
+  </text>
+  <text
+                 name="ao_nc_text"
+                 tool_tip="">
+    目�设置到: ITEM
+  </text>
+ 
+  <button
+                 name="opencard"
+                 label="打开记事�" />
+  <button
+                 name="reloadcard"
+                 label="啥信" />
+ 
+  <check_box
+                 label="�用动画覆盖"
+                 name="AOEnabled" />
+  <check_box
+                 label="�用�姿覆盖"
+                 name="AOSitsEnabled" />
+ 
+  <text
+                 name="buttons_desc">
+    站立:
+  </text>
+  <combo_box
+                 name="stands"
+                 label="" />
+  <button
+                 name="prevstand"
+                 tool_tip="上一个站立动画"
+                 label="&lt;&lt;" />
+  <button
+                 name="nextstand"
+                 tool_tip="下一个站立动画"
+                 label="&gt;&gt;" />
+  <check_box
+                 label="站立动画顺��机"
+                 name="AOStandRandomize" />
+  <check_box
+                 label="第一人称视角中�用站立"
+                 name="AONoStandsInMouselook" />
+  <check_box
+                 label="显示动画覆盖工具�"
+                 name="ao_remote_checkbox" />
+  <spinner
+                 name="standtime"
+                 label="站立切�时间:"
+                 tool_tip="切�站立动画播放的时间。" />
+ 
+  <button
+                 name="newcard"
+                 label="新建记事�模�" />
+ 
+  <button
+                 label="展开 &gt;&gt;"
+                 name="more_btn"
+                 tool_tip="高级选项" />
+  <button
+                 label="&lt;&lt; 折�"
+                 name="less_btn"
+                 tool_tip="高级选项" />
+ 
+  <tab_container
+                 label="默认"
+                 name="tabcontainer"
+                 tab_min_width="50">
+    <panel
+                         label="默认动画"
+                         name="tabdefaultanims">
+ 
+      <text
+                                 name="textdefaultwalk">
+        èµ°è·¯:
+      </text>
+      <text
+                                 name="textdefaultrun">
+        è·‘æ­¥:
+      </text>
+      <text
+                                 name="textdefaultjump">
+        跳跃:
+      </text>
+      <text
+                                 name="textdefaultsit">
+        �下:
+      </text>
+      <text
+                                 name="textdefaultgsit">
+        �在地上:
+      </text>
+      <text
+                                 name="textdefaultcrouch">
+        蹲下:
+      </text>
+      <text
+                                 name="textdefaultcrouchwalk">
+        蹲走:
+      </text>
+      <text
+                                 name="textdefaultfall">
+        下�:
+      </text>
+      <text
+                                 name="textdefaulthover">
+        浮空:
+      </text>
+      <combo_box
+                                 name="hovers"
+                                 label="" />
+      <text
+                                 name="textdefaultfly">
+        飞行:
+      </text>
+      <text
+                                 name="textdefaultflyslow">
+        慢速飞行:
+      </text>
+      <text
+                                 name="textdefaultflyup">
+        �上飞行:
+      </text>
+      <text
+                                 name="textdefaultflydown">
+        �下飞行:
+      </text>
+      <text
+                                 name="textdefaultland">
+        �陆:
+      </text>
+      <text
+                                 name="textdefaultstandup">
+        起身:
+      </text>
+      <text
+                                 name="textdefaultprejump">
+        预跳跃:
+      </text>
+  </panel>
+</tab_container>
+</floater>
\ No newline at end of file
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_area_search.xml b/linden/indra/newview/skins/default/xui/zh/floater_area_search.xml
new file mode 100644
index 0000000..7a8a4d8
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/zh/floater_area_search.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+         name="area search"
+         title="区域物体�索">
+        <text
+                 name="name_label">
+                �称�索字符串:
+        </text>
+        <text
+                 name="desc_label">
+                �述�索字符串:
+        </text>
+
+        <text
+                 name="owner_label">
+                拥有者�索字符串:
+        </text>
+        <text
+                 name="group_label">
+                社团�索字符串:
+        </text>
+        <scroll_list
+                 name="result_list">
+                <column
+                         name="Name"
+                         label="�称"
+                         tool_tip="�击任何项目在物体的�置显示信标" />
+          <column
+                         name="Description"
+                         label="�述"
+                         tool_tip="�击任何项目在物体的�置显示信标" />
+          <column
+                         name="Owner"
+                         label="拥有者"
+                         tool_tip="�击任何项目在物体的�置显示信标" />
+                <column
+                         name="Group"
+                         label="社团"
+                         tool_tip="�击任何项目在物体的�置显示信标" />
+        </scroll_list>
+        <button
+                 name="Refresh"
+                 label="刷新" />
+        <button
+                 name="Stop"
+                 label="�止" />
+        <text
+                 name="counter">
+                已列出/等待中/总计
+        </text>
+</floater>
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_asset_browser.xml b/linden/indra/newview/skins/default/xui/zh/floater_asset_browser.xml
new file mode 100644
index 0000000..32292f5
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/zh/floater_asset_browser.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+         name="asset browser"
+         title="�质�览器">
+
+        <button
+                 label="下一页 &gt;&gt;"
+                 name="button next" />
+ 
+        <button
+                 label="&lt;&lt; 上一页"
+                 name="button previous" />
+ 
+        <button
+                 label="刷新"
+                 name="button refresh" />
+ 
+</floater>
\ No newline at end of file
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_autocorrect.xml b/linden/indra/newview/skins/default/xui/zh/floater_autocorrect.xml
new file mode 100644
index 0000000..f616163
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/zh/floater_autocorrect.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+         name="em_ac_floater"
+         title="自动更正设置">
+  <check_box
+         font="SansSerif"
+                 label="�用自动更正"
+                 name="em_ac_enable"
+                 tool_tip="你必须选中这个框�能使用这些设置，他将会�索你的所有�写的文本输入，并用替�项替�任何�索�目" />
+  <button
+                 name="em_ac_loadlist"
+                 label="读�列表.."
+                 tool_tip="点击这里从文件导入之�导出的列表" />
+  <text
+                 name="em_ac_notecard">
+         
+    拖动�读�的
+    记事�到这里。
+  </text>
+  <text  
+         font="SansSerif"
+                 name="em_ac_text1">列表�称                                                          列表项目</text>
+  <text
+         font="SansSerif"
+                 name="em_ac_text_name">列表�称</text>
+  <text
+         font="SansSerif"
+                 name="em_ac_text2">作者:</text>
+  <view_border
+                 name="em_ac_box2" />
+  <text
+         font="SansSerif"
+                 name="em_ac_text_author">作者�</text>
+  <check_box
+         font="SansSerif"
+                 label="�用，优先级:"
+                 name="em_ac_list_enabled"
+                 tool_tip="你是�希望使用该列表" />
+  <spinner
+                 label=""
+                 name="em_ac_priority"
+                 tool_tip="决定列表使用的顺�。高优先级的列表将在低优先级列表之�用�替�文字。" />
+  <check_box
+                 label="显示�示"
+                 name="em_ac_list_show"
+                 tool_tip="�当一个��被替�时，弹出�示" />
+  <check_box
+                 label="匹�整个��"
+                 name="em_ac_list_style"
+                 tool_tip="仅当整个��完全匹�时�进行替�。�选中的�，将在��内部替�文字。" />
+                 <!--Only replace when matches a whole word. If unselected, will replace inside words.-->
+  <button
+                 name="em_ac_deletelist"
+                 label="删除列表"
+                 tool_tip="这将删除整个��和替�项列表。此动作�能撤销。" />
+  <button
+                 name="em_ac_exportlist"
+                 label="导出列表"
+                 tool_tip="这将�存你的当�列表到文件供共享或编辑。" />
+  <button
+                 name="em_ac_addentry"
+                 label="添加�目" />
+  <button
+                 name="em_ac_rementry"
+                 label="移除�目" />
+  <text
+                 name="em_ac_text3">已自动更正的�数:</text>
+  <text
+                 name="em_ac_stats">计数</text>
+ 
+ 
+</floater>
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_avatar_picker.xml b/linden/indra/newview/skins/default/xui/zh/floater_avatar_picker.xml
index d5dcc23..c99401e 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_avatar_picker.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_avatar_picker.xml
@@ -24,7 +24,7 @@
                 </panel>
         </tab_container>
         <button label="选择" label_selected="选择" name="Select"/>
-        <button label="�消" label_selected="�消" name="Cancel"/>
+        <button label="关闭" label_selected="关闭" name="Cancel"/>
         <string name="not_found">
                 没有找到“[TEXT]�
         </string>
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_build_options.xml b/linden/indra/newview/skins/default/xui/zh/floater_build_options.xml
index ece9941..5727508 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_build_options.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_build_options.xml
@@ -1,14 +1,84 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="build options floater" title="网格选项">
-        <spinner label="网格�� (米)" name="GridResolution" />
-        <spinner label="网格宽度 (米)" name="GridDrawSize" />
+<floater
+         name="build options floater"
+         title="高级建造选项">
+  <text name="text_box7">        网格选项:</text>
+  <spinner
+                 label="网格�� (米):"
+                 name="GridResolution" />
+        <spinner
+                 label="网格范围 (米):"
+                 name="GridDrawSize" />
         <check_box
-                 
                  label="�用���对�"
                  name="GridSubUnit" />
         <check_box
-                 
                  label="显示剖�"
                  name="GridCrossSection" />
-        <slider label="格���明度" name="GridOpacity" />
+        <slider
+                 label="网格��明度:"
+                 name="GridOpacity"
+                 value="0.7" />
+ 
+  <text
+                 name="text_box3">        物体大�:</text>
+ 
+  <spinner
+                 label="X 尺寸:"
+                 name="X size" />
+  <spinner
+                 label="Y 尺寸:"
+                 name="Y size" />
+  <spinner
+                 label="Z 尺寸:"
+                 name="Z size" />
+ 
+  <text
+                 name="text_box6">旋转中心:</text>
+  <spinner
+                 label="X �置:"
+                 name="X pos" />
+  <spinner
+                 label="Y �置:"
+                 name="Y pos" />
+  <spinner
+                 label="Z �置:"
+                 name="Z pos" />
+  <check_box
+                 label="值为百分比"
+                 tool_tip="默认设置为百分比，�个轴都设置为 50"
+                 name="PivotPercToggle" />
+ 
+  <check_box
+                 label="显示选中项轮廓"
+                 name="BuildPrefsRenderHighlight_toggle" />
+  <check_box
+                 label="�制选择�离"
+                 tooltip=""
+                 name="limit_select_dist_check" />
+  <check_box
+                 label="显示轴于根元件�置"
+                 tool_tip="默认行为是在链接组的�心�置显示轴。选中该项将在根元件�置显示轴。"
+                 name="BuildPrefsActualRoot_toggle" />
+  <check_box
+                 label="以地�社团创建物体"
+                 tooltip="创建物体时使用地�社团的身份 (如果�能)"
+                 name="grouplandrez" />
+  <spinner
+                 tool_tip="设置移动�旋转和缩放的�数精度"
+                 label="物体编辑�数�:"
+                 name="spinner_decimal" />
+ 
+  <button
+                 label="应用"
+                 name="btn_apply" />
+  <button
+                 label="�消"
+                 name="btn_cancel" />
+  <button
+                 label="确定"
+                 name="btn_ok" />
+  <button
+                 label="�置为默认值"
+                 name="btn_reset" />
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_busy.xml b/linden/indra/newview/skins/default/xui/zh/floater_busy.xml
new file mode 100644
index 0000000..eb5a9b2
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/zh/floater_busy.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+         name="busy"
+         title="IM Response Options"
+         can_tear_off="false">
+ 
+  <check_box
+                 label="自动回�收到的�时消�"
+                 name="InstantMessageResponseEnabled" />
+  <check_box
+                 label="Announce 收到的�时消�"
+                 name="InstantMessageAnnounceIncoming" />
+  <check_box
+                 label="�走焦点 (Steal focus)/自动回�通告在顶端弹出"
+                 name="InstantMessageAnnounceStealFocus" />
+  <check_box
+                 label="自动回��好�"
+                 name="InstantMessageResponseFriends" />
+  <check_box
+                 label="自动回��蔽的人"
+                 name="InstantMessageResponseMuted" />
+  <check_box
+                 label="自动回�任何人"
+                 name="InstantMessageResponseAnyone" />
+  <check_box
+                 label="对方一开始打字就自动回�"
+                 name="InstantMessageShowOnTyping" />
+  <check_box
+                 label="如果信�被自动回�就��显示"
+                 name="InstantMessageShowResponded" />
+  <check_box
+                 label="自动回�所有信�" name="InstantMessageResponseRepeat" />
+ 
+  <text
+                 name="text_box1">
+    回�文字:
+  </text>
+  <text
+                 name="text_box_a">
+    使用‘#f’代替收件人的�
+  </text>
+  <text
+                 name="text_box_b">
+    使用‘#l’代替收件人的姓
+  </text>
+  <text
+                 name="text_box_c">
+    使用‘#t’代替当�时间
+  </text>
+ 
+  <check_box
+                 label="回�时�时�出物体"
+                 name="InstantMessageResponseItem" />
+ 
+  <text
+                 name="Give inventory"
+                 tool_tip="拖动到这里的库存�目将会被在自动回�时�出。">
+    拖动库存�目到这里
+  </text>
+ 
+  <text
+                 name="im_give_disp_rect_txt"
+                 tool_tip="">
+    目�设置到: ITEM
+  </text>
+ 
+  <button
+                 label="�消"
+                 name="btn_cancel"
+                 tool_tip=""/>
+  <button
+                 label="确定"
+                 name="btn_ok"
+                 tool_tip="" />
+ 
+</floater>
\ No newline at end of file
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_buy_contents.xml b/linden/indra/newview/skins/default/xui/zh/floater_buy_contents.xml
index 2ce722e..7f1d106 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_buy_contents.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_buy_contents.xml
@@ -4,7 +4,7 @@
                 [NAME] 包括:
         </text>
         <text name="buy_text">
-                以 L$[AMOUNT] 从 [NAME] 处购买?
+                以 [CURRENCY][AMOUNT] 从 [NAME] 处购买?
         </text>
         <button label="�消" label_selected="�消" name="cancel_btn" />
         <button label="è´­ä¹°" label_selected="è´­ä¹°" name="buy_btn" />
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_buy_currency.xml b/linden/indra/newview/skins/default/xui/zh/floater_buy_currency.xml
index f4ce5b6..78fc763 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_buy_currency.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_buy_currency.xml
@@ -17,19 +17,19 @@
                 正在连接 LindeX...
         </text>
         <text name="buy_action_unknown">
-                在 LindeX 货�交�所购买 L$
+                在 货�交�所购买 [CURRENCY]
         </text>
         <text name="buy_action">
-                [NAME] L$ [PRICE]
+                [NAME] [CURRENCY] [PRICE]
         </text>
         <text name="currency_action">
-                è´­ä¹°L$
+                è´­ä¹°[CURRENCY]
         </text>
         <line_editor name="currency_amt">
                 1234
         </line_editor>
         <text name="currency_est">
-                需�大概 US$ [USD]
+                需�大概 [REALCURRENCY] [USD]
         </text>
         <text name="getting_data">
                 获�数�...
@@ -38,22 +38,22 @@
                 你目�有
         </text>
         <text name="balance_amount">
-                L$ [AMT]
+                [CURRENCY] [AMT]
         </text>
         <text name="buying_label">
                 你正在购买
         </text>
         <text name="buying_amount">
-                L$ [AMT]
+                [CURRENCY] [AMT]
         </text>
         <text name="total_label">
                 你的�户结余是
         </text>
         <text name="total_amount">
-                L$ [AMT]
+                [CURRENCY] [AMT]
         </text>
         <text name="purchase_warning_repurchase">
-                确认此次�作�会购买现钞。
+                确认此次�作�会购买货�。
 你需��试该�作。
         </text>
         <text name="purchase_warning_notenough">
@@ -62,6 +62,6 @@
         <button label="�消" name="cancel_btn"/>
         <button label="è´­ä¹°" name="buy_btn"/>
         <string name="buy_currency">
-                以大约 US$ [USD] 购买 L$ [LINDENS]
+                以大约 [REALCURRENCY] [USD] 购买 [CURRENCY] [LINDENS]
         </string>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_buy_land.xml b/linden/indra/newview/skins/default/xui/zh/floater_buy_land.xml
index 45c5832..2474ed3 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_buy_land.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_buy_land.xml
@@ -97,7 +97,7 @@
                 你有L$2,100.
         </text>
         <text name="currency_action">
-                购买�外的 L$
+                购买�外的 [CURRENCY]
         </text>
         <line_editor name="currency_amt">
                 1000
@@ -186,10 +186,10 @@
                 你拥有[BUYER]平方米的土地。
         </string>
         <string name="pay_to_for_land">
-                支付L$ [AMOUNT] 至 [SELLER] 购买这�土地
+                支付[CURRENCY] [AMOUNT] 至 [SELLER] 购买这�土地
         </string>
         <string name="buy_for_US">
-                以大约US$[AMOUNT2]购买L$[AMOUNT]，
+                以大约US$[AMOUNT2]购买[CURRENCY][AMOUNT]，
         </string>
         <string name="parcel_meters">
                 这�土地的�积为[AMOUNT]平方米。
@@ -210,30 +210,31 @@
         <string name="sold_without_objects">
                 物��包括在其中
         </string>
+<!--Does not appear to be using [CURRENCY]-->
         <string name="info_price_string">
-                L$[PRICE]
-（L$[PRICE_PER_SQM]/m²）
+                [CURRENCY][PRICE]
+（[CURRENCY][PRICE_PER_SQM]/m²）
 [SOLD_WITH_OBJECTS]
         </string>
         <string name="insufficient_land_credits">
                 在这次购买完�之�，社团[GROUP]将需�足够的被贡献的土地所用的信用�度，�覆盖这片土地。
         </string>
         <string name="have_enough_lindens">
-                你有L$ [AMOUNT], 这些钱足够购买这�土地。
+                你有[CURRENCY] [AMOUNT], 这些钱足够购买这�土地。
         </string>
         <string name="not_enough_lindens">
-                你�有L$ [AMOUNT], 你还需� L$ [AMOUNT2]。
+                你�有[CURRENCY] [AMOUNT], 你还需� [CURRENCY] [AMOUNT2]。
         </string>
         <string name="balance_left">
-                此项消费�, 你还会有L$ [AMOUNT]结余.
+                此项消费�, 你还会有[CURRENCY] [AMOUNT]结余.
         </string>
         <string name="balance_needed">
-                你需�购买至少 L$ [AMOUNT]�购买这�土地。
+                你需�购买至少 [CURRENCY] [AMOUNT]�购买这�土地。
         </string>
         <string name="no_parcel_selected">
                 (没有选择地�)
         </string>
         <string name="buy_currency">
-                以大约 US$ [USD] 购买 L$ [LINDENS]
+                以大约 US$ [USD] 购买 [CURRENCY] [LINDENS]
         </string>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_buy_object.xml b/linden/indra/newview/skins/default/xui/zh/floater_buy_object.xml
index b7c977c..b32286c 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_buy_object.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_buy_object.xml
@@ -4,7 +4,7 @@
                 以�它的内容：
         </text>
         <text name="buy_text">
-                以 L$[AMOUNT] 从 [NAME] 处购买?
+                以 [CURRENCY][AMOUNT] 从 [NAME] 处购买?
         </text>
         <button label="�消" label_selected="�消" name="cancel_btn" />
         <button label="è´­ä¹°" label_selected="è´­ä¹°" name="buy_btn" />
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_chat_history.xml b/linden/indra/newview/skins/default/xui/zh/floater_chat_history.xml
index 7dcd40d..2fdc1bf 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_chat_history.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_chat_history.xml
@@ -19,13 +19,13 @@
                 -- 日志结� --
         </string>
   <string name="ScriptQuestionCautionChatGranted">
-        ‘[OBJECTNAME]’, 主人为 ‘[OWNERNAME]’ 的物体, �于 [REGIONNAME] 地区  [REGIONPOS], 已被授予以下�利： [PERMISSIONS]。
+        ‘[OBJECTNAME]’, ‘[OWNERNAME]’ 所拥有的物体, �于 [REGIONNAME] 地区 [REGIONPOS], 已被授予以下�利： [PERMISSIONS]。
   </string>
   <string name="ScriptQuestionCautionChatDenied">
-        ‘[OBJECTNAME]’, 主人为 ‘[OWNERNAME]’ 的物体, �于 [REGIONNAME] 地区  [REGIONPOS], 已被拒�以下�利： [PERMISSIONS]。
+        ‘[OBJECTNAME]’, ‘[OWNERNAME]’ 所拥有的物体, �于 [REGIONNAME] 地区 [REGIONPOS], 已被拒�以下�利： [PERMISSIONS]。
   </string>
   <string name="ScriptTakeMoney">
-        从您那里�走林登�(L$)
+        从您那里�走货�
   </string>
   <string name="ActOnControlInputs">
         对您的控制输入�出�应
@@ -65,6 +65,9 @@
                                 </combo_item>
                         </combo_box>
                         <check_box label="显示�蔽的文字" name="show mutes"/>
+                        <check_box
+                                 label="翻译�天 (由 Google 强力驱动)"
+                                 name="translate chat" />
                         <button label="&lt; &lt;" label_selected="&gt; &gt;" name="toggle_active_speakers_btn" tool_tip="显示在该�时通信会�中活动的�与者。"/>
                         <panel name="chat_panel">
                                 <string name="gesture_label">
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_chatterbox.xml b/linden/indra/newview/skins/default/xui/zh/floater_chatterbox.xml
index 6d30952..d8735d8 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_chatterbox.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_chatterbox.xml
@@ -1,3 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <multi_floater name="floater_chatterbox" title="交�">
+  <string name="unread_count_string_singular">
+    �未读消�
+  </string>
+  <string name="unread_count_string_plural">
+    �未读消�
+  </string>
 </multi_floater>
\ No newline at end of file
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_chatterbox_vertical.xml b/linden/indra/newview/skins/default/xui/zh/floater_chatterbox_vertical.xml
new file mode 100644
index 0000000..c7a4a1e
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/zh/floater_chatterbox_vertical.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<multi_floater
+         name="floater_chatterbox"
+         title="交�">
+  <string name="unread_count_string_singular">
+    �未读消�
+  </string>
+  <string name="unread_count_string_plural">
+    �未读消�
+  </string>
+</multi_floater>
\ No newline at end of file
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_choose_group.xml b/linden/indra/newview/skins/default/xui/zh/floater_choose_group.xml
index f43eddd..75d94e1 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_choose_group.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_choose_group.xml
@@ -5,4 +5,7 @@
         </text>
         <button label="OK" label_selected="OK" name="OK" />
         <button label="�消" label_selected="�消" name="Cancel" />
+  <string name="none">
+    æ— 
+  </string>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_command_line.xml b/linden/indra/newview/skins/default/xui/zh/floater_command_line.xml
new file mode 100644
index 0000000..97bb8b5
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/zh/floater_command_line.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+         name="busy"
+         title="�天�命令"
+         can_tear_off="false">
+  <text
+                 name="loltxt2">        区域内瞬间移动 (用法: 命令 x y z)</text>
+  <text
+                 name="loltxt3">        瞬间移动到地� (用法: 命令)</text>
+  <text
+                 name="loltxt4">        瞬间移动到高度 (用法: 命令 z)</text>
+  <text
+                 name="loltxt5">        瞬间移动回家 (用法: 命令)</text>
+  <text
+                 name="loltxt6">        创建一个平� (用法: 命令 0 - 30)</text>
+  <slider
+                 name="CmdLineChatbarPlatformSize"
+                 label="宽度"
+                 tool_tip="您想�多大的平�？" />
+  <text
+                 name="loltxt7">        瞬间移动到其他区域 (用法: 命令 区域�称)</text>
+  <check_box
+                 label="瞬间移动时���置"
+                 name="toggle" />
+  <text
+                 name="loltxt8">        计算表达� (用法: 命令 SIN(2+2))</text>
+  <text
+                 name="add_autokorrect">添加自动更正�汇(命令 列表|原�|更正)</text>
+  <text
+                 name="loltxt9">        改��绘�离 (用法: 命令 �离)</text>
+  <text
+                 name="loltxt10">        瞬间移动到摄�机�置 (用法: 命令)</text>
+  <text
+                 name="loltxt11">        获�键值相对应的化身�字 (用法: 命令 键值)</text>
+  <text
+                 name="loltxt12">        邀请化身瞬间移动 (用法: 命令 键值)</text>
+  <text
+                 name="loltxt13">        瞬间移动到化身�置 (用法: 命令 �字)</text>
+  <line_editor
+                 tool_tip="�字大�写���，�键入�字的一部分也�以。打开�地图的�，效果更佳。"
+                 name="CmdLineChatbarTP2" />
+  <text
+                 name="loltxt14">        打开(on)/关闭(off)动作覆盖器 (用法: 命令 on/off)</text>
+  <text
+                 name="loltxt15">        清除�天记录 (用法: 命令)</text>
+  <line_editor
+                 tool_tip="清除�天记录防止�机。"
+                 name="CmdLineChatbarClearChat" />
+
+  <text
+                 name="set_media_url_text">        设置媒体 URL(用法: 命令 url 类型)</text>
+  <line_editor
+                 tool_tip="设置媒体��置到指定的 URL 并播放"
+                 name="CmdLineChatbarMedia" />
+  <text
+                 name="set_music_url_text">        设置音�� URL (用法: 命令 url)</text>
+
+  <line_editor
+                 tool_tip="设置音���置到指定的 URL 并播放"
+                 name="CmdLineChatbarMusic" />
+  <button
+                 label="?"
+                 name="Help_CmdLine"
+                 tool_tip="点击这里获�该页�设置的帮助。" />
+</floater>
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_customize.xml b/linden/indra/newview/skins/default/xui/zh/floater_customize.xml
index ef14187..d6d1384 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_customize.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_customize.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater customize" title="外表">
+<floater name="floater customize" title="外观">
         <tab_container name="customize tab container">
                 <panel label="身体部�" name="body_parts_placeholder"/>
                 <panel label="体型" name="Shape">
@@ -465,8 +465,92 @@
                         <button label="�存为..." label_selected="�存为..." name="Save As"/>
                         <button label="��" label_selected="��" name="Revert"/>
                 </panel>
+                <panel label="纹身" name="Tattoo">
+                        <text length="1" name="title">
+                                [DESC]
+                        </text>
+                        <text length="1" name="title_no_modify">
+                                [DESC]: 无法修改
+                        </text>
+                        <text length="1" name="title_loading" type="string">
+                                [DESC]: 载入中...
+                        </text>
+                        <text length="1" name="title_not_worn" type="string">
+                                [DESC]: 没有被穿�
+                        </text>
+                        <text length="1" name="path" type="string">
+                                �于[PATH]
+                        </text>
+                        <text length="1" name="not worn instructions" type="string">
+                                �使用新的纹身，需从你的库存中拖拽一个新的纹身至你的化身上。
+或者，你也�以从新创建一个，并穿上它。
+                        </text>
+                        <text length="1" name="no modify instructions" type="string">
+                                你没有修改这件�饰的�利。
+                        </text>
+                        <text name="Item Action Label">
+                                纹身：
+                        </text>
+                        <texture_picker label="头部纹身" name="Head Tattoo" tool_tip="点击这里�选择图片"/>
+                        <texture_picker label="上身的纹身" name="Upper Tattoo" tool_tip="点击这里�选择图片"/>
+                        <texture_picker label="下身纹身" name="Lower Tattoo" tool_tip="点击这里�选择图片"/>
+                        <color_swatch label="颜色" name="Color/Tint" tool_tip="点击这里�打开色彩选择器"/>
+                        <button label="创建新的纹身" label_selected="创建新的纹身" name="Create New"/>
+                        <button label="脱掉" label_selected="脱掉" name="Take Off"/>
+                        <button label="存储" label_selected="存储" name="Save"/>
+                        <button label="�存为..." label_selected="�存为..." name="Save As"/>
+                        <button label="��" label_selected="��" name="Revert"/>
+                </panel>
+                <panel label="�明度" name="Alpha">
+                        <text length="1" name="title">
+                                [DESC]
+                        </text>
+                        <text length="1" name="title_no_modify">
+                                [DESC]: 无法修改
+                        </text>
+                        <text length="1" name="title_loading" type="string">
+                                [DESC]: 载入中...
+                        </text>
+                        <text length="1" name="title_not_worn" type="string">
+                                [DESC]: 没有被穿�
+                        </text>
+                        <text length="1" name="path" type="string">
+                                �于[PATH]
+                        </text>
+                        <text length="1" name="not worn instructions" type="string">
+                                �使用新的�明度蒙�，需从你的库存中拖拽一个新的�明度蒙�至你的化身上。
+或者，你也�以从新创建一个，并穿上它。
+                        </text>
+                        <text length="1" name="no modify instructions" type="string">
+                                你没有修改这件�饰的�利。
+                        </text>
+                        <text name="Item Action Label">
+                                �明度蒙�：
+                        </text>
+                        <texture_picker label="头部�明度" name="Head Alpha" tool_tip="点击这里�选择图片"/>
+                        <texture_picker label="上身�明度" name="Upper Alpha" tool_tip="点击这里�选择图片"/>
+                        <texture_picker label="下身�明度" name="Lower Alpha" tool_tip="点击这里�选择图片"/>
+                        <texture_picker label="头��明度" name="Hair Alpha" tool_tip="点击这里�选择图片"/>
+                        <texture_picker label="眼��明度" name="Eye Alpha" tool_tip="点击这里�选择图片"/>
+                        <button label="创建新的�明度蒙�" label_selected="创建新的�明度蒙�" name="Create New"/>
+                        <button label="脱掉" label_selected="脱掉" name="Take Off"/>
+                        <button label="存储" label_selected="存储" name="Save"/>
+                        <button label="�存为..." label_selected="�存为..." name="Save As"/>
+                        <button label="��" label_selected="��" name="Revert"/>
+                </panel>
         </tab_container>
+        <text
+                 name="AvatarHeightText">
+    化身高度:
+  </text>
+  <text name="includes_shoes">
+    (包括鞋)
+  </text>
+ 
+    <button name="Import" label="导入" />
+    <button name="Export" label="导出" />
+ 
+        <button label="�存为装�" label_selected="�存为装�" name="Make Outfit" />
         <button label="�消" label_selected="�消" name="Cancel"/>
         <button label="确定" label_selected="确定" name="Ok"/>
-        <button label="Make Outfit..." label_selected="制作装�..." name="Make Outfit"/>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_dictionaries.xml b/linden/indra/newview/skins/default/xui/zh/floater_dictionaries.xml
new file mode 100644
index 0000000..0964d75
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/zh/floater_dictionaries.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+         name="EmeraldIRC_dictionaries"
+         title="下载新�典">
+     <text
+                 name="EmDics_txt">
+以下是�以从 Imprudence 网站下载的附加�典的列表。
+
+请选择您想下载的�典，然�按下载按钮。</text>
+        <combo_box
+                 allow_text_entry="false"
+                 max_chars="255"
+                 name="Emerald_combo_dics"
+                 tool_tip="" />
+     <button
+                 label="下载"
+                 name="Emerald_dic_download" />
+</floater>
\ No newline at end of file
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_directory.xml b/linden/indra/newview/skins/default/xui/zh/floater_directory.xml
index 063676a..0850f58 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_directory.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_directory.xml
@@ -1,7 +1,67 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="directory" title="�索">
         <tab_container name="Directory Tabs">
-                <panel label="All" name="find_all_panel">
+                <panel
+                         label="全部"
+                         name="find_all_old_panel">
+                        <text name="find">
+                                查找:
+                        </text>
+                        <button label="�索" label_selected="�索" name="Search" />
+                        <string name="searching_text">
+                                查找中……
+                        </string>
+                        <string name="not_found_text">
+                                什么也没找到。
+                        </string>                       <button
+                                 label="�退"
+                                 name="back_btn" />
+                        <button
+                                 label="�进"
+                                 name="forward_btn" />
+                        <line_editor
+                                 label="�索"
+                                 name="search_editor"
+                                 tool_tip="�索第二人生" />
+                        <check_box label="PG 内容" name="incpg"/>
+                        <check_box label="Mature 内容" name="incmature"/>
+                        <check_box label="Adult 内容" name="incadult"/>
+                        <scroll_list
+                                 fg_disable_color="1, 1, 1, 1"
+                                 name="results">
+                                <column
+                                         label=""
+                                         name="icon" />
+                                <column
+                                         label="�称"
+                                         name="name" />
+                                <column
+                                         label="ä»·æ ¼"
+                                         name="price" />
+                                <column
+                                         label="时间 (PT)"
+                                         name="date" />
+                                <column
+                                         label="时间"
+                                         name="time" />
+                                <column
+                                         label="��"
+                                         name="dwell" />
+                                <column
+                                         label="�积"
+                                         name="area" />
+                                <column
+                                         label="[CURRENCY]/m²"
+                                         name="per_meter" />
+                                <column
+                                         label="在线"
+                                         name="online" />
+                                <column
+                                         label="团员"
+                                         name="members" />
+                        </scroll_list>
+                </panel>
+                <panel label="全部 (Web)" name="find_all_panel">
                         <string name="searching_text">
                                 查找中……
                         </string>
@@ -9,7 +69,7 @@
                                 什么也没找到。
                         </string>
                         <text name="find">
-                                寻找：
+                                查找：
                         </text>
                         <line_editor label="�索" name="search_editor" tool_tip="�索第二人生"/>
                         <button label="�退" name="back_btn"/>
@@ -35,9 +95,9 @@
                                         Wiki
                                 </combo_item>
                         </combo_box>
-                        <check_box label="PG内容" name="incpg"/>
-                        <check_box label="Mature内容" name="incmature"/>
-                        <check_box label="Adult内容" name="incadult"/>
+                        <check_box label="PG 内容" name="incpg"/>
+                        <check_box label="Mature 内容" name="incmature"/>
+                        <check_box label="Adult 内容" name="incadult"/>
                         <button label="?" label_selected="?" name="?"/>
                         <string name="loading_text">
                                 加载中...
@@ -56,9 +116,9 @@
                         <text name="find">
                                 寻找:
                         </text>
-                        <check_box label="PG内容" name="incpg"/>
-                        <check_box label="Mature内容" name="incmature"/>
-                        <check_box label="Adult内容" name="incadult"/>
+                        <check_box label="PG 内容" name="incpg"/>
+                        <check_box label="Mature 内容" name="incmature"/>
+                        <check_box label="Adult 内容" name="incadult"/>
                         <combo_box name="Category">
                                 <combo_item name="AnyCategory">
                                         任�分类
@@ -98,8 +158,8 @@
                         <scroll_list name="results">
                                 <column label="" name="icon"/>
                                 <column label="" name="type"/>
-                                <column label="Name" name="name"/>
-                                <column label="Price" name="price"/>
+                                <column label="�称" name="name"/>
+                                <column label="ä»·æ ¼" name="price"/>
                         </scroll_list>
                         <button label="下一页 &gt;" label_selected="下一页 &gt;" name="Next &gt;"/>
                         <button label="&lt; 上一页" label_selected="&lt; 上一页" name="&lt; Prev"/>
@@ -169,9 +229,9 @@
                                         其他
                                 </combo_item>
                         </combo_box>
-                        <check_box label="PG内容" name="incpg"/>
-                        <check_box label="Mature内容" name="incmature"/>
-                        <check_box label="Adult内容" name="incadult"/>
+                        <check_box label="PG 内容" name="incpg"/>
+                        <check_box label="Mature 内容" name="incmature"/>
+                        <check_box label="Adult 内容" name="incadult"/>
                         <button label="�索" label_selected="�索" name="Search" tool_tip="�索"/>
                         <button label="删除" label_selected="删除" name="Delete"/>
                         <scroll_list name="results">
@@ -185,7 +245,7 @@
                         <button label="下一页 &gt;" label_selected="下一页 &gt;" name="Next &gt;"/>
                         <button label="&lt; 上一页" label_selected="&lt; 上一页" name="&lt; Prev"/>
                 </panel>
-                <panel label="热门地点" name="showcase_panel">
+                <panel label="特色介�" name="showcase_panel">
                         <string name="searching_text">
                                 查找中……
                         </string>
@@ -209,15 +269,15 @@
                                 什么也没找到。
                         </string>
                         <string name="land_help_text">
-                                土地�以直接用林登元购买（L$），也�以用林登元或美元��。
+                                土地�以直接用世界中的货�购买，也�以用世界中的货�或真实货���。
 �直接购买, 进入该地�，然�点击���上的地点�称。
                         </string>
                         <text name="find">
                                 寻找：
                         </text>
-                        <check_box label="PG内容" name="incpg"/>
-                        <check_box label="Mature内容" name="incmature"/>
-                        <check_box label="Adult内容" name="incadult"/>
+                        <check_box label="PG 内容" name="incpg"/>
+                        <check_box label="Mature 内容" name="incmature"/>
+                        <check_box label="Adult 内容" name="incadult"/>
                         <combo_box bottom="-64" left="224" name="type" width="168">
                                 <combo_item name="AllTypes">
                                         所有类型
@@ -234,7 +294,7 @@
                         </combo_box>
                         <check_box label="标价 &#8804; " name="pricecheck"/>
                         <text name="pricecheck_symbol">
-                                L$
+                            [CURRENCY]
                         </text>
                         <check_box label="地区 &#8805; " name="areacheck"/>
                         <text left="190" name="areacheck_symbol" width="75">
@@ -248,9 +308,9 @@
                                 <column label="" name="type"/>
                                 <column label="�称" name="name"/>
                                 <column label="类型" name="landtype"/>
-                                <column label="L$ ä»·æ ¼" name="price"/>
+                                <column label="[CURRENCY] ä»·æ ¼" name="price"/>
                                 <column label="�积" name="area"/>
-                                <column label="L$/m²" name="per_meter"/>
+                                <column label="[CURRENCY]/m²" name="per_meter"/>
                         </scroll_list>
                         <button label="下一页&gt;" label_selected="下一页&gt;" name="Next &gt;"/>
                         <button label="&lt; 之�" label_selected="&lt; 之�" name="&lt; Prev"/>
@@ -265,9 +325,9 @@
                         <text name="find">
                                 查找:
                         </text>
-                        <check_box label="PG内容" name="incpg"/>
-                        <check_box label="Mature内容" name="incmature"/>
-                        <check_box label="Adult内容" name="incadult"/>
+                        <check_box label="PG 内容" name="incpg"/>
+                        <check_box label="Mature 内容" name="incmature"/>
+                        <check_box label="Adult 内容" name="incadult"/>
                         <combo_box name="Category">
                                 <combo_item name="AnyCategory">
                                         任�分类
@@ -389,16 +449,41 @@
                         <line_editor label="查找" name="search_editor" tool_tip="�索第二人生"/>
                         <button label="�退" name="back_btn"/>
                         <button label="�进" name="forward_btn"/>
-                        <button label="�索" label_selected="�索" name="search_btn"/>
-                        <check_box label="PG内容" name="incpg"/>
-                        <check_box label="Mature内容" name="incmature"/>
-                        <check_box label="Adult内容" name="incadult"/>
+                        <button label="�索" label_selected="�索" name="Search"/>
+                        <check_box label="PG 内容" name="incpg"/>
+                        <check_box label="Mature 内容" name="incmature"/>
+                        <check_box label="Adult 内容" name="incadult"/>
+                                 name="incadult" />
+                        <scroll_list
+                                 name="results">
+                                <column
+                                         label=""
+                                         name="icon"
+                                         sort_ascending="false" />
+                                <column
+                                         label=""
+                                         name="type" />
+                                <column
+                                         label="�称"
+                                         name="name" />
+                                <column
+                                         label="团员"
+                                         name="members"
+                                         sort_ascending="false" />
+                                <column
+                                         label=""
+                                         name="score" />
+                        </scroll_list>
                         <string name="loading_text">
                                 加载中...
                         </string>
                         <string name="done_text">
                                 完�
                         </string>
+
                 </panel>
         </tab_container>
+        <check_box
+         name="save_results_check"
+         label="�存�索结果">
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_display_name.xml b/linden/indra/newview/skins/default/xui/zh/floater_display_name.xml
new file mode 100644
index 0000000..142f446
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/zh/floater_display_name.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+         name="Display Name"
+         title="更改显示�称">
+        <text
+                 name="info_text1"
+                 wrap="true">
+                您给化身的�称��显示�称。
+        </text>
+        <text
+                 name="info_text2"
+                 wrap="true">
+                您�个星期�以更改一次。
+        </text>
+        <text
+                 name="now_ok_text">
+                如果您愿�的�，现在就�以更改它。
+        </text>
+        <text
+                 name="lockout_text"
+                 visible="false">
+                您必须等到 [TIME] 之��能更改它。
+        </text>
+        <text
+                 name="set_name_label">
+                新的显示�称:
+        </text>
+        <line_editor
+                 name="display_name_editor" />
+        <text
+                 name="name_confirm_label">
+                �键入一次你的新�字以确认:
+        </text>
+        <line_editor
+                 name="display_name_confirm" />
+    <button
+                 name="save_btn"
+                 label="�存"
+                 tool_tip="�存您的新显示�称" />
+    <button
+                 name="reset_btn"
+                 label="�置"
+                 tool_tip="将显示�称�置为用户�" />
+    <button
+                 name="cancel_btn"
+                 label="�消" />
+</floater>
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_god_tools.xml b/linden/indra/newview/skins/default/xui/zh/floater_god_tools.xml
index b5db758..bf16b7f 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_god_tools.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_god_tools.xml
@@ -38,7 +38,7 @@
                                 地产ID:
                         </text>
                         <text name="parent id">
-                                �区域ID:
+                                上级ID:
                         </text>
                         <line_editor name="parentestate" tool_tip="这是这�区域的�区域。" />
                         <text name="Grid Pos: ">
@@ -53,7 +53,7 @@
                                 ��明细:
                         </text>
                         <text name="land cost text">
-                                L$�平方米:
+                                [CURRENCY] �平方米:
                         </text>
                         <button label="æ›´æ–°" label_selected="æ›´æ–°" name="Refresh"
                              tool_tip="点击这里�更新以上信�." />
@@ -88,12 +88,12 @@
                              label_selected="删除目标于他人土地上有脚本的物体"
                              name="Delete Target&apos;s Scripted Objects On Others Land"
                              tool_tip="删除他人土地上目标所有有脚本的物体。(���制)的物体将被返还。" />
-                        <button label="删除*任何*土地上选中的脚本东东"
-                             label_selected="删除*任何*土地上选中的脚本东东"
+                        <button label="删除目标于*任何*土地上选中的脚本物体"
+                             label_selected="删除目标于*任何*土地上选中的脚本物体"
                              name="Delete Target&apos;s Scripted Objects On *Any* Land"
                              tool_tip="删除该区域中目标所有有脚本的物体。(���制)的物体将被返还。" />
-                        <button label="删除*所有*选中的东东"
-                             label_selected="删除*所有*选中的东东"
+                        <button label="删除*所有*选中的物体"
+                             label_selected="删除*所有*选中的物体"
                              name="Delete *ALL* Of Target&apos;s Objects"
                              tool_tip="删除该区域中目标所有的物体。(���制)的物体将被返还。" />
                         <button label="获�首�碰撞�" label_selected="�最首�碰撞�"
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_grid_default_selector.xml b/linden/indra/newview/skins/default/xui/zh/floater_grid_default_selector.xml
new file mode 100644
index 0000000..9921ad2
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/zh/floater_grid_default_selector.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+         name="default_grid"
+         title="选择默认网格">
+  <text
+                 name="select_label">
+        或者使用网格管�器添加新的网格
+  </text>
+  <button
+                 label="�消"
+                 name="btn_cancel" />
+  <button
+                 label="确定"
+                 name="btn_ok" />
+</floater>
\ No newline at end of file
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_grid_manager.xml b/linden/indra/newview/skins/default/xui/zh/floater_grid_manager.xml
new file mode 100644
index 0000000..7342567
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/zh/floater_grid_manager.xml
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+         name="floater_login"
+         title="网格管�器">
+ 
+  <!-- Grid Selector -->
+  <text
+                 name="grid_selector_label">
+    选择网格:
+  </text>
+ 
+  <scroll_list
+                 name="grid_selector">
+    <column
+                         label="网格列表"
+                         name="grid" />
+  </scroll_list>
+ 
+  <!-- Grid Selector Buttons -->
+  <button
+                 label="添加新网格"
+                 name="btn_add" />
+  <button
+                 label="创建网格副本"
+                 name="btn_copy" />
+  <button
+                 label="删除网格"
+                 name="btn_delete" />
+ 
+  <!-- Grid Details -->
+  <text
+                 name="gridnick_text">
+    网格昵称 (唯一):
+  </text>
+  <line_editor
+        name="gridnick"
+        label="必须填写" />
+  <text
+                 name="gridname_text">
+    网格�称:
+  </text>
+  <line_editor
+                 name="gridname"
+                 label="必须填写" />
+  <text
+                 name="first_name_text">
+    �:
+  </text>
+  <text
+                 name="username_text">
+    用户�:
+  </text>
+  <text
+                 name="last_name_text">
+    姓:
+  </text>
+  <text
+                 name="avatar_password_text">
+    密�:
+  </text>
+  <text
+                 name="loginuri_text">
+    登入 URI:
+  </text>
+  <line_editor
+                 name="loginuri"
+                 label="必须填写" />
+  <button
+                 label="获�网格信�"
+                 name="btn_gridinfo" />
+  <button
+                 label="清除信�"
+                 name="btn_clear" />
+  <text
+                 name="loginpage_text">
+    网格信� URL:
+  </text>
+  <text
+                 name="loginpage_text">
+    登入页�:
+  </text>
+  <text
+                 name="helperuri_text">
+    辅助 URI:
+  </text>
+  <text
+                 name="website_text">
+    网站:
+  </text>
+  <text
+                 name="support_text">
+    支�:
+  </text>
+   <text
+                 name="register_text">
+    账户:
+  </text>
+  <text
+                 name="password_text">
+    密�:
+  </text>
+  <text
+                 name="search_text">
+    �索网页:
+  </text>
+  <button
+                 label="应用"
+                 label_selected="应用"
+                 name="btn_apply" />
+  <button
+                 label="�消"
+                 label_selected="�消"
+                 name="btn_cancel" />
+  <button
+                 label="确定"
+                 label_selected="确定"
+                 name="btn_ok" />
+</floater>
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_group_titles.xml b/linden/indra/newview/skins/default/xui/zh/floater_group_titles.xml
new file mode 100644
index 0000000..5c24f84
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/zh/floater_group_titles.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+         name="goup titles"
+         title="社团头衔">
+        <scroll_list
+                 name="titles_list">
+                <column
+                         name="title"
+                         label="头衔" />
+                <column
+                         name="group_name"
+                         label="社团" />
+                <!--��字段，用于存储 UUID，请��宽度为 0-->
+        </scroll_list>
+        <button
+                 name="activate"
+                 label="激活"
+                 tool_tip="激活选中的社团头衔" />
+</floater>
\ No newline at end of file
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_image_preview.xml b/linden/indra/newview/skins/default/xui/zh/floater_image_preview.xml
index d3bf113..02a76a6 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_image_preview.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_image_preview.xml
@@ -50,6 +50,10 @@
                 <check_box
                  label="使用无�压缩"
                  name="lossless_check" />
+        <check_box
+                 label="临时图� (�费)"
+                 name="temp_check"
+                 tooltip="设置资产为临时的，这�味�它是�费的，但是作为代价，仅在一段时间内有效，之�它就消失了。" />
         <button label="�消" name="cancel_btn" />
-        <button label="上传(L$[AMOUNT])" name="ok_btn" />
+        <button label="上传 ([UPLOADFEE])" name="ok_btn" />
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_inspect.xml b/linden/indra/newview/skins/default/xui/zh/floater_inspect.xml
index fff47d5..5288300 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_inspect.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_inspect.xml
@@ -4,11 +4,19 @@
              tool_tip="从这份列表中选择一项物体�在世界中�出显示它">
                 <column label="物体�称" name="object_name" />
                 <column label="主人�字" name="owner_name" />
+                <column label="上个拥有者�字" name="last_owner_name" />
                 <column label="创建者�字" name="creator_name" />
+                <column label="�" name="face_num" width="48"/>
+                <column label="顶点" name="vertex_num" width="48" />
+                <column label="脚本" name="script_num" width="48" />
+                <column label="库存总计" name="inv_num" />
                 <column label="创建时间" name="creation_date" />
         </scroll_list>
         <button label="查看主人档案..." name="button owner"
              tool_tip="查看�出显示物体的主人的档案" />
+        <button
+                 label="查看上个拥有者档案" name="button_last_owner"
+                 tool_tip="查看�出显示物体的创建者的档案" />
         <button label="查看创建者档案..." name="button creator"
              tool_tip="查看�出显示物体的创建者的档案" />
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_instant_message.xml b/linden/indra/newview/skins/default/xui/zh/floater_instant_message.xml
index a59000c..14af4f9 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_instant_message.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_instant_message.xml
@@ -33,7 +33,27 @@
         <string name="add_friend_string">
                 添加为好�
         </string>
-        <flyout_button label="档案..." name="profile_callee_btn"/>
+
+
+  <string
+                 name="add_friend_string">
+    添加好�
+  </string>
+        <flyout_button label="档案..." name="profile_callee_btn" >
+    <flyout_button_item name="history_entry">
+      查看对�历�
+    </flyout_button_item>
+    <flyout_button_item name="pay_entry">
+      付款
+    </flyout_button_item>
+    <flyout_button_item name="teleport_entry">
+     邀请瞬间移动
+    </flyout_button_item>
+  </flyout_button>
+  <text
+                 name="inventory_send">
+    拖动库存�目到这里�出
+  </text>
         <button label="呼�" name="start_call_btn"/>
         <button label="结�呼�" name="end_call_btn" pad_right="10" visible="false"/>
         <panel name="speaker_controls">
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_instant_message_group.xml b/linden/indra/newview/skins/default/xui/zh/floater_instant_message_group.xml
index 2171bd1..1c35524 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_instant_message_group.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_instant_message_group.xml
@@ -54,6 +54,13 @@
                         <button
                                  label="社团信�"
                                  name="group_info_btn" />
+                <flyout_button
+                         label="社团信�"
+                         name="group_info_btn">
+                                <flyout_button_item name="history_entry">
+                                  查看�天历�
+                                </flyout_button_item>
+                          </flyout_button>
                         <button
                                  image_overlay_alignment="left"
                                  label="加入通�"
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_inventory.xml b/linden/indra/newview/skins/default/xui/zh/floater_inventory.xml
index 1f90496..65f2463 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_inventory.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_inventory.xml
@@ -2,9 +2,51 @@
 <floater name="Inventory" title="库存">
         <search_editor label="在这里输入�查找的物体" name="inventory search editor"/>
         <tab_container name="inventory filter tabs">
-                <inventory_panel label="所有物体" name="All Items"/>
-                <inventory_panel label="最近使用的物体" name="Recent Items"/>
+                <inventory_panel label="所有物�" name="All Items"/>
+                <inventory_panel label="最近使用的物�" name="Recent Items"/>
+                <inventory_panel label="穿�的物�" name="Worn Items" />
         </tab_container>
+        <text
+                 name="group_titles_textbox">
+                快速过滤:
+        </text>
+ 
+        <!-- Inventory Type Filter Labels -->
+        <string name="filter_type_all">所有类型</string>
+        <string name="filter_type_animation">动画</string>
+        <string name="filter_type_bodypart">身体部�</string>
+        <string name="filter_type_callingcard">�片</string>
+        <string name="filter_type_clothing">衣物</string>
+        <string name="filter_type_gesture">动作</string>
+        <string name="filter_type_landmark">地标</string>
+        <string name="filter_type_notecard">记事�</string>
+        <string name="filter_type_object">物体</string>
+        <string name="filter_type_script">脚本</string>
+        <string name="filter_type_sound">声音</string>
+        <string name="filter_type_texture">�质</string>
+        <string name="filter_type_snapshot">å¿«ç…§</string>
+        <string name="filter_type_custom">自定义...</string>
+ 
+        <combo_box
+                 name="Quick Filter"
+                 label="快速过滤">
+ 
+                <combo_item name="filter_type_all">所有类型</combo_item>
+                <combo_item name="filter_type_animation">动画</combo_item>
+                <combo_item name="filter_type_bodypart">身体部�</combo_item>
+                <combo_item name="filter_type_callingcard">�片</combo_item>
+                <combo_item name="filter_type_clothing">衣物</combo_item>
+                <combo_item name="filter_type_gesture">动作</combo_item>
+                <combo_item name="filter_type_landmark">地标</combo_item>
+                <combo_item name="filter_type_notecard">记事�</combo_item>
+                <combo_item name="filter_type_object">物体</combo_item>
+                <combo_item name="filter_type_script">脚本</combo_item>
+                <combo_item name="filter_type_sound">声音</combo_item>
+                <combo_item name="filter_type_texture">�质</combo_item>
+                <combo_item name="filter_type_snapshot">å¿«ç…§</combo_item>
+                <combo_item name="filter_type_custom">自定义...</combo_item>
+ 
+        </combo_box>
         <menu_bar name="Inventory Menu">
                 <menu label="文件 " name="File">
                         <menu_item_call label="打开" name="Open"/>
@@ -19,7 +61,7 @@
                         <menu_item_call label="新的脚本" name="New Script"/>
                         <menu_item_call label="新的记事�" name="New Note"/>
                         <menu_item_call label="新的动作" name="New Gesture"/>
-                        <menu name="New Clothes">
+                        <menu name="New Clothes" label="新建衣物">
                                 <menu_item_call label="新建衬衫" name="New Shirt"/>
                                 <menu_item_call label="新建裤�" name="New Pants"/>
                                 <menu_item_call label="新建鞋�" name="New Shoes"/>
@@ -27,10 +69,12 @@
                                 <menu_item_call label="新建夹克" name="New Jacket"/>
                                 <menu_item_call label="新建裙�" name="New Skirt"/>
                                 <menu_item_call label="新建手套" name="New Gloves"/>
-                                <menu_item_call label="新建汗衫" name="New Undershirt"/>
-                                <menu_item_call label="新�内衣" name="New Underpants"/>
+                                <menu_item_call label="新建内衣" name="New Undershirt"/>
+                                <menu_item_call label="新建内裤" name="New Underpants"/>
+                                <menu_item_call label="新建纹身"     name="New Tattoo" />
+                                <menu_item_call label="新建�明度蒙�"  name="New Alpha" />
                         </menu>
-                        <menu name="New Body Parts">
+                        <menu name="New Body Parts" label="新建身体部�">
                                 <menu_item_call label="新建外形" name="New Shape"/>
                                 <menu_item_call label="新建皮肤" name="New Skin"/>
                                 <menu_item_call label="新建头�" name="New Hair"/>
@@ -43,5 +87,11 @@
                         <menu_item_check label="文件夹总是按�称排列" name="Folders Always By Name"/>
                         <menu_item_check label="系统文件夹置顶" name="System Folders To Top"/>
                 </menu>
+    <menu label="查找选项" name="Search">
+      <menu_item_check label="按�称" name="By Name" />
+      <menu_item_check label="按创建者" name="By Creator" />
+      <menu_item_check label="按�述" name="By Description" />
+      <menu_item_check label="按全部" name="By All" />
+    </menu>
         </menu_bar>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_inventory_item_properties.xml b/linden/indra/newview/skins/default/xui/zh/floater_inventory_item_properties.xml
index 34ccc79..b6c9a6c 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_inventory_item_properties.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_inventory_item_properties.xml
@@ -68,7 +68,7 @@
                 </radio_item>
         </radio_group>
         <text name="TextPrice">
-                价格：L$
+                价格：[CURRENCY]
         </text>
         <string name="unknown">
                 (未知)
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_inventory_view_finder.xml b/linden/indra/newview/skins/default/xui/zh/floater_inventory_view_finder.xml
index 95a0808..089de84 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_inventory_view_finder.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_inventory_view_finder.xml
@@ -2,6 +2,7 @@
 <floater name="Inventory Finder" title="inventory_recent_items">
         <check_box label="动画" name="check_animation" />
         <check_box label="通��" name="check_calling_card" />
+        <check_box label="身体部�" name="check_bodypart" />
         <check_box label="衣物" name="check_clothing" />
         <check_box label="动作" name="check_gesture" />
         <check_box label="地标" name="check_landmark" />
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_joystick.xml b/linden/indra/newview/skins/default/xui/zh/floater_joystick.xml
index de512aa..7db5b59 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_joystick.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_joystick.xml
@@ -1,5 +1,205 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Joystick" title="Joystick Configuration">
-        <button label="确定" label_selected="确定" name="ok_btn"/>
-        <button label="�消" label_selected="�消" name="cancel_btn"/>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+         name="Joystick"
+         title="游�控制器设置">
+ 
+        <check_box
+                 name="enable_joystick">�用手柄:</check_box>
+        <check_box
+                 name="auto_enable_joystick">自动�用手柄</check_box>
+        <spinner
+                 name="JoystickAxis1"
+                 label="X 轴映射" />
+        <spinner
+                 name="JoystickAxis2"
+                 label="Y 轴映射" />
+        <spinner
+                 name="JoystickAxis0"
+                 label="Z 轴映射" />
+ 
+        <spinner
+                 name="JoystickAxis4"
+                 label="俯仰映射" />
+        <spinner
+                 name="JoystickAxis5"
+                 label="�航映射" />
+        <spinner
+                 name="JoystickAxis3"
+                 label="滚转映射" />
+ 
+        <spinner
+                 name="JoystickAxis6"
+                 label="缩放映射" />
+        <check_box
+                 label="直接缩放"
+                 name="ZoomDirect" />
+        <check_box
+                 label="三维光标"
+                 name="Cursor3D" />
+        <check_box
+                 label="自动平衡"
+                 name="AutoLeveling" />
+ 
+        <text
+                 name="Control Modes:">
+                控制模�:
+        </text>
+ 
+        <check_box
+                 name="JoystickAvatarEnabled">化身</check_box>
+        <check_box
+                 name="JoystickBuildEnabled">建造</check_box>
+        <check_box
+                 name="JoystickFlycamEnabled">�览</check_box>
+ 
+        <text
+                 name="XScale">X Scale</text>
+        <spinner
+                 name="AvatarAxisScale1" />
+        <spinner
+                 name="BuildAxisScale1" />
+        <spinner
+                 name="FlycamAxisScale1" />
+ 
+        <text
+                 name="YScale">Y Scale</text>
+        <spinner
+                 name="AvatarAxisScale2" />
+        <spinner
+                 name="BuildAxisScale2" />
+        <spinner
+                 name="FlycamAxisScale2" />
+ 
+        <text
+                 name="ZScale">Z Scale</text>
+        <spinner
+                 name="AvatarAxisScale0" />
+        <spinner
+                 name="BuildAxisScale0" />
+        <spinner
+                 name="FlycamAxisScale0" />
+ 
+        <text
+                 name="PitchScale">Pitch Scale</text>
+        <spinner
+                 name="AvatarAxisScale4" />
+        <spinner
+                 name="BuildAxisScale4" />
+        <spinner
+                 name="FlycamAxisScale4" />
+ 
+        <text
+                 name="YawScale">Yaw Scale</text>
+        <spinner
+                 name="AvatarAxisScale5" />
+        <spinner
+                 name="BuildAxisScale5" />
+        <spinner
+                 name="FlycamAxisScale5" />
+ 
+        <text
+                 name="RollScale">Roll Scale</text>
+        <spinner
+                 name="BuildAxisScale3" />
+        <spinner
+                 name="FlycamAxisScale3" />
+ 
+ 
+        <text
+                 name="XDeadZone">X Dead Zone</text>
+        <spinner
+                 name="AvatarAxisDeadZone1" />
+        <spinner
+                 name="BuildAxisDeadZone1" />
+        <spinner
+                 name="FlycamAxisDeadZone1" />
+ 
+        <text
+                 name="YDeadZone">Y Dead Zone</text>
+        <spinner
+                 name="AvatarAxisDeadZone2" />
+        <spinner
+                 name="BuildAxisDeadZone2" />
+        <spinner
+                 name="FlycamAxisDeadZone2" />
+ 
+        <text
+                 name="ZDeadZone">Z Dead Zone</text>
+        <spinner
+                 name="AvatarAxisDeadZone0" />
+        <spinner
+                 name="BuildAxisDeadZone0" />
+        <spinner
+                 name="FlycamAxisDeadZone0" />
+ 
+        <text
+                 name="PitchDeadZone">Pitch Dead Zone</text>
+        <spinner
+                 name="AvatarAxisDeadZone4" />
+        <spinner
+                 name="BuildAxisDeadZone4" />
+        <spinner
+                 name="FlycamAxisDeadZone4" />
+ 
+        <text
+                 name="YawDeadZone">Yaw Dead Zone</text>
+        <spinner
+                 name="AvatarAxisDeadZone5" />
+        <spinner
+                 name="BuildAxisDeadZone5" />
+        <spinner
+                 name="FlycamAxisDeadZone5" />
+ 
+        <text
+                 name="RollDeadZone">Roll Dead Zone</text>
+        <spinner
+                 name="BuildAxisDeadZone3" />
+        <spinner
+                 name="FlycamAxisDeadZone3" />
+ 
+        <text
+                 name="Feathering">Feathering</text>
+        <slider
+                 label=""
+                 name="AvatarFeathering"
+                 value="0.7" />
+        <slider
+                 label=""
+                 name="BuildFeathering"
+                 value="0.7" />
+        <slider
+                 label=""
+                 name="FlycamFeathering"
+                 value="0.7" />
+ 
+        <text
+                 name="ZoomScale2">Zoom Scale</text>
+        <spinner
+                 name="FlycamAxisScale6"
+                 label="" />
+        <text
+                 name="ZoomDeadZone">Zoom Dead Zone</text>
+        <spinner
+                 name="FlycamAxisDeadZone6"
+                 label="" />
+ 
+        <button
+                 label="SpaceNavigator 默认值"
+                 name="SpaceNavigatorDefaults" />
+ 
+        <button
+                 label="确定"
+                 label_selected="确定"
+                 name="ok_btn" />
+        <button
+                 label="�消"
+                 label_selected="�消"
+                 name="cancel_btn" />
+ 
+        <string
+                 name="JoystickMonitor">游�控制器监视器</string>
+        <string
+                 name="Axis">è½´ [NUM]</string>
+        <string
+                 name="NoDevice">没有检测到设备</string>
+</floater>
\ No newline at end of file
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_local_asset_browse.xml b/linden/indra/newview/skins/default/xui/zh/floater_local_asset_browse.xml
new file mode 100644
index 0000000..45f2ea1
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/zh/floater_local_asset_browse.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<!-- Local Asset Browser: xui --><!-- floater definition start --><floater
+         name="local_bitmap_browser_floater"
+         title="本地�质属性">
+ 
+  <button
+                 name="add_btn"
+                 label="添加" />
+  <button
+                 name="del_btn"
+                 label="移除" />
+  <button
+                 name="upload_btn"
+                 label="上传图� ([UPLOADFEE])..." />
+    <column
+                         name="bitmap_name"
+                         label="�称" />
+    <column
+                         name="bitmap_uuid"
+                         label="UUID" />
+  </scroll_list>
+  <text
+                 name="path_caption_text"
+                 visible="true">
+    本地路径:
+  </text>
+  <text
+                 name="uuid_caption_text"
+                 visible="true">
+    本地 UUID:
+  </text>
+ 
+  <texture_picker
+                 label="�质"
+                 name="texture_view"/>
+ 
+  <check_box
+                 label="��更新"
+                 name="keep_updating_checkbox"
+                 tool_tip="�用定时检查硬盘上的�图是�已更新"/>
+ 
+  <combo_box
+                 visible="true"
+                 allow_text_entry="false"
+                 max_chars="20"
+                 name="type_combobox">
+ 
+    <combo_item
+                         name="type_texture"
+                         value="type_texture">
+      �质
+    </combo_item>
+ 
+    <combo_item
+                         name="type_sculptie"
+                         value="type_sculptie">
+      雕塑�质
+    </combo_item>
+ 
+    <combo_item
+                         name="type_layer"
+                         value="type_layer">
+      衣物
+    </combo_item>
+ 
+  </combo_box>
+ 
+  <text
+                 name="time_caption_text"
+                 visible="true">
+    时间:
+  </text>
+ 
+  <text
+                 name="time_text"
+                 visible="true">
+    (date here)
+  </text>
+ 
+  <text
+                 name="link_caption_text"
+                 visible="true">
+    链接:
+  </text>
+ 
+  <text
+                 name="link_text"
+                 visible="true">
+    (link status)
+  </text>
+ 
+  <text
+                 name="name_caption_text"
+                 visible="true">
+    �称:
+  </text>
+ 
+</floater>
\ No newline at end of file
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_media_browser.xml b/linden/indra/newview/skins/default/xui/zh/floater_media_browser.xml
index d10c3e0..1ae48ea 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_media_browser.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_media_browser.xml
@@ -10,18 +10,33 @@
                 <layout_panel
                          name="nav_controls">
                         <button
-                                 label="�退"
                                  name="back" />
                         <button
-                                 label="�进"
                                  name="forward" />
                         <button
-                                 label="刷新"
                                  name="reload" />
                         <button
                                  label="转到"
                                  name="go" />
                 </layout_panel>
+    <layout_panel
+                         name="time_controls">
+      <button
+                                 label="快退"
+                                 name="rewind" />
+      <button
+                                 label=""
+                                 name="play" />
+      <button
+                                 label=""
+                                 name="pause" />
+      <button
+                                 label="�止"
+                                 name="stop" />
+      <button
+                                 label="å¿«è¿›"
+                                 name="seek" />
+    </layout_panel>
                 <layout_panel
                          name="parcel_owner_controls">
                         <button
@@ -39,8 +54,9 @@
                         <button
                                  label="关闭"
                                  name="close" />
+                        <button label="设置为主页" name="set_home"/>
                 </layout_panel>
         </layout_stack>
 </floater>
 
-<!--Translated for Second Life 1.19.1 RC3 -->
\ No newline at end of file
+<!--Translated for Second Life 1.19.1 RC3 -->
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_media_filter.xml b/linden/indra/newview/skins/default/xui/zh/floater_media_filter.xml
new file mode 100644
index 0000000..c4d63ab
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/zh/floater_media_filter.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+         name="floatermediafilter"
+         title="媒体过滤">
+ 
+        <check_box
+                 name="enable_mediafilter"
+                 label="�用媒体过滤"
+                 tool_tip="根�域�过滤媒体 URL。" />
+ 
+        <check_box
+                 name="filter_only_remote"
+                 label="仅过滤脚本�动的媒体� (较�安全)"
+                 tool_tip="这将防止弹出窗�询问�蔽地�上永久设置的URL。仅脚本对媒体URL的更改以�脚本请求播放媒体�会被过滤。" />
+ 
+        <text
+                 name="info1">
+                粗体显示的域��于�续列表中 (�列于白��或黑��中).
+        </text>
+        <text
+                 name="info2">
+                斜体显示的域��于会�列表中 (�临时被�许或被�止).
+        </text>
+ 
+        <scroll_list
+                 name="whitelist_list">
+                <column
+                         name="whitelist_col"
+                         label="�许的域�或�务器对象" />
+        </scroll_list>
+ 
+        <scroll_list
+                 name="blacklist_list">
+                <column
+                         name="blacklist_col"
+                         label="阻止的域�或�务器对象" />
+        </scroll_list>
+ 
+        <button
+                 name="add_whitelist"
+                 label="添加..."
+                 tool_tip="添加�务器到�许列表" />
+ 
+        <button
+                 name="remove_whitelist"
+                 label="移除"
+                 tool_tip="从�许列表中清除选中的�务器" />
+ 
+        <button
+                 name="clear_lists"
+                 label="清除列表"
+                 tool_tip="清除所有列表" />
+ 
+        <button
+                 name="show_ips"
+                 label="显示 IP"
+                 tool_tip="显示域�所对应的IP地� (由于DNS查询，列表刷新时将会使客户端�止)" />
+ 
+        <button
+                 name="add_blacklist"
+                 label="添加..."
+                 tool_tip="添加�务器到" />
+ 
+        <button
+                 name="remove_blacklist"
+                 label="移除"
+                 tool_tip="从�止列表中清除选中的�务器" />
+ 
+        <text
+                 name="add_text">
+                新域�:
+        </text>
+ 
+        <check_box
+                 name="match_ip"
+                 label="添加/删除相关的 IP"
+                 tool_tip="添加或删除域�时�时添加或删除其 IP 地�" />
+ 
+        <line_editor
+                 name="input_domain"
+                 tool_tip="键入新的URL，域�，IP 地�或脚本对象 HTTP �务器路径" />
+ 
+        <button
+                 name="cancel_domain"
+                 label="�消" />
+        <button
+                 name="commit_domain"
+                 label="添加"
+                 tool_tip="添加到列表中" />
+</floater>
+
+
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_message_builder.xml b/linden/indra/newview/skins/default/xui/zh/floater_message_builder.xml
new file mode 100644
index 0000000..efceead
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/zh/floater_message_builder.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+         name="Message Builder"
+         title="消�建造器">
+        <scroll_list
+                 name="net_list">
+        </scroll_list>
+        <combo_box
+                 name="untrusted_message_combo"
+                 tool_tip="��信">
+        </combo_box>
+        <combo_box
+                 name="trusted_message_combo"
+                 tool_tip="�信">
+        </combo_box>
+        <button
+                 name="send_btn"
+                 label="��"
+                 tool_tip="�� (Ctrl-Enter)" />
+</floater>
\ No newline at end of file
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_mini_map.xml b/linden/indra/newview/skins/default/xui/zh/floater_mini_map.xml
index 430dd05..50e89c4 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_mini_map.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_mini_map.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="minimap">
-        <panel label="微型地图" name="mini_mapview" tool_tip="（�击打开地图）"/>
+        <panel label="微型地图" name="mini_mapview"/>
+        <button name="toggle_radar" tool_tip="显示或��雷达" />
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_name_description.xml b/linden/indra/newview/skins/default/xui/zh/floater_name_description.xml
index 55beb81..1f7fc32 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_name_description.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_name_description.xml
@@ -7,5 +7,5 @@
                 �述:
         </text>
         <button label="�消" name="cancel_btn" />
-        <button label="上传 (L$[AMOUNT])" name="ok_btn" />
+        <button label="上传 ([UPLOADFEE])" name="ok_btn" />
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_new_outfit_dialog.xml b/linden/indra/newview/skins/default/xui/zh/floater_new_outfit_dialog.xml
index 8fbbf92..2edaa33 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_new_outfit_dialog.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_new_outfit_dialog.xml
@@ -16,6 +16,8 @@
         <check_box label="内衣" name="checkbox_Undershirt" />
         <check_box label="内裤" name="checkbox_Underpants" />
         <check_box label="裙�" name="checkbox_Skirt" />
+        <check_box       label="纹身" name="checkbox_Tattoo" />
+        <check_box       label="�明度" name="checkbox_Alpha" />
         <check_box label="胸部" name="checkbox_Chest" />
         <check_box label="头部" name="checkbox_Skull" />
         <check_box label="左肩" name="checkbox_Left Shoulder" />
@@ -70,6 +72,8 @@
         <text type="string" length="1" name="Items to include in outfit:">
                 装�中包括的物�:
         </text>
+  <button label="全部选中" name="Check All" />
+  <button label="全部�选" name="Uncheck All" />
         <text type="string" length="1" name="Body Parts:">
                 体形
         </text>
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_notification.xml b/linden/indra/newview/skins/default/xui/zh/floater_notification.xml
new file mode 100644
index 0000000..d24a0fe
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/zh/floater_notification.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+         title="�示控制�"
+         name="notification">
+  <combo_box
+                 label="回�"
+                 name="response">
+  </combo_box>
+</floater>
\ No newline at end of file
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_pay.xml b/linden/indra/newview/skins/default/xui/zh/floater_pay.xml
index ac30075..85ce2f3 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_pay.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_pay.xml
@@ -6,9 +6,11 @@
         </text>
 
         <text name="amount text">
-                数�:
+                �度:
+        </text>
+        <text name="message text">
+          备注:
         </text>
-
         <button name="pay btn"    label="支付" />
         <button name="cancel btn" label="�消" />
 
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_postcard.xml b/linden/indra/newview/skins/default/xui/zh/floater_postcard.xml
index 656d75b..2e54772 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_postcard.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_postcard.xml
@@ -20,12 +20,11 @@
                 在这里键入你的信�。
         </text_editor>
         <text name="fine_print">
-                如果你的收件人加入SL，你会得到一份介�奖励。
         </text>
         <button label="�消" name="cancel_btn"/>
         <button label="��" name="send_btn"/>
         <string name="default_subject">
-                �自第二人生的明信片
+                �自 [GRID_NAME] 的明信片
         </string>
         <string name="default_message">
                 瞧瞧这个!
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_preferences.xml b/linden/indra/newview/skins/default/xui/zh/floater_preferences.xml
index 0af9120..61267ef 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_preferences.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_preferences.xml
@@ -5,5 +5,7 @@
         <button label="�消" label_selected="�消" name="Cancel" />
         <button label="应用" label_selected="应用" name="Apply" />
         <button label="帮助" label_selected="帮助" name="Help" />
-
+        <button label="支�"                      name="Support" />
+        <button label="全部�置为默认值"                         name="reset_btn"
+                tooltip="将所有选项��到默认值 (需���动)"/>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_preview_gesture.xml b/linden/indra/newview/skins/default/xui/zh/floater_preview_gesture.xml
index af229f1..a27d210 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_preview_gesture.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_preview_gesture.xml
@@ -28,7 +28,7 @@
                 库:
         </text>
         <text name="steps_label">
-                阶段：
+                步骤：
         </text>
         <scroll_list name="library_list">
                 动画
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_preview_notecard.xml b/linden/indra/newview/skins/default/xui/zh/floater_preview_notecard.xml
index 60ef174..be9daf5 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_preview_notecard.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_preview_notecard.xml
@@ -4,6 +4,56 @@
         <text type="string" length="1" name="desc txt">
                 �述:
         </text>
+        <menu_bar
+                 name="motecard_menu">
+    <menu
+                         name="File"
+                         label="文件">
+      <menu_item_call
+                                 label="�存"
+                                 name="Save Menu"/>
+      <menu_item_call
+                                 label="导出文字..."
+                                 name="Export Text..." />
+      <menu_item_call
+                                 label="导入文字..."
+                                 name="Import Text..." />
+    </menu>
+                <menu
+                         label="编辑"
+                        name="Edit">
+                        <menu_item_call
+                                 label="撤销"
+                                 name="Undo" />
+                        <menu_item_call
+                                 label="��"
+                                 name="Redo" />
+                        <menu_item_separator
+                                 label="-----------"
+                                 name="separator1" />
+                        <menu_item_call
+                                 label="剪切"
+                                 name="Cut" />
+                        <menu_item_call
+                                 label="�制"
+                                 name="Copy" />
+                        <menu_item_call
+                                 label="粘贴"
+                                 name="Paste" />
+                        <menu_item_call
+                                 label="全选"
+                                 name="Select All" />
+                        <menu_item_call
+                                 label="全�选"
+                                 name="Deselect" />
+                        <menu_item_separator
+                                 label="-----------"
+                                 name="separator3" />
+                        <menu_item_call
+                                 label="查找 / 替�..."
+                                 name="Search / Replace..." />
+                </menu>
+        </menu_bar>
         <text_editor type="string" length="1" name="Notecard Editor">
                 请等待...
         </text_editor>
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_preview_notecard_keep_discard.xml b/linden/indra/newview/skins/default/xui/zh/floater_preview_notecard_keep_discard.xml
index 3853f05..f8d2327 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_preview_notecard_keep_discard.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_preview_notecard_keep_discard.xml
@@ -6,6 +6,56 @@
         <text type="string" length="1" name="desc txt">
                 �述:
         </text>
+        <menu_bar
+                 name="motecard_menu">
+    <menu
+                         name="File"
+                         label="文件">
+      <menu_item_call
+                                 label="�存"
+                                 name="Save Menu"/>
+      <menu_item_call
+                                 label="导出文字..."
+                                 name="Export Text..." />
+      <menu_item_call
+                                 label="导入文字..."
+                                 name="Import Text..." />
+    </menu>
+                <menu
+                         label="编辑"
+                        name="Edit">
+                        <menu_item_call
+                                 label="撤销"
+                                 name="Undo" />
+                        <menu_item_call
+                                 label="��"
+                                 name="Redo" />
+                        <menu_item_separator
+                                 label="-----------"
+                                 name="separator1" />
+                        <menu_item_call
+                                 label="剪切"
+                                 name="Cut" />
+                        <menu_item_call
+                                 label="�制"
+                                 name="Copy" />
+                        <menu_item_call
+                                 label="粘贴"
+                                 name="Paste" />
+                        <menu_item_call
+                                 label="全选"
+                                 name="Select All" />
+                        <menu_item_call
+                                 label="全�选"
+                                 name="Deselect" />
+                        <menu_item_separator
+                                 label="-----------"
+                                 name="separator3" />
+                        <menu_item_call
+                                 label="查找 / 替�..."
+                                 name="Search / Replace..." />
+                </menu>
+        </menu_bar>
         <button label="�留" label_selected="�留" name="Keep" />
         <button label="放弃" label_selected="放弃" name="Discard" />
         <string
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_prim_import.xml b/linden/indra/newview/skins/default/xui/zh/floater_prim_import.xml
new file mode 100644
index 0000000..dfe1601
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/zh/floater_prim_import.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+         name="Import"
+         title="导入进度">
+  <text
+                 name="name_label"> 进度 </text>  
+</floater>
\ No newline at end of file
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_radar.xml b/linden/indra/newview/skins/default/xui/zh/floater_radar.xml
new file mode 100644
index 0000000..cdb6d0a
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/zh/floater_radar.xml
@@ -0,0 +1,191 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+         name="radar"
+         title="é›·è¾¾">
+ 
+        <scroll_list
+                 name="avatar_list"
+                 tool_tip="点击时按� Shift 或 Control 选择多�化身">
+                <column
+                         name="marked"
+                         label="标记"
+                         tool_tip="标记的化身" />
+                <column
+                         name="avatar_name"
+                         label="�字"
+                         tool_tip="点击时按� Shift 或 Control 选择多�化身" />
+                <column
+                         name="distance"
+                         label="�离"
+                         tool_tip="到您的化身的�离 (红色=�天�离内, 黄色=喊��离内, 绿色=�绘�离内)" />
+                <column
+                         name="position"
+                         label="�置"
+                         tool_tip="区域内的�置 (X, Y), 或区域外大致方�" />
+                <column
+                         name="altitude"
+                         label="高度"
+                         tool_tip="高度" />
+        </scroll_list>
+ 
+        <tab_container
+                 name="actions_tab_container">
+                <panel
+                         label="化身"
+                         name="actions_tab">
+                        <!-- upper row -->
+                        <button
+                                 name="profile_btn"
+                                 label="档案"
+                                 tool_tip="显示图片�社团和其他信�" />
+                        <button
+                                 name="track_btn"
+                                 label="追踪/�消"
+                                 tool_tip="切�追踪该化身的�置" />
+                        <button
+                                 name="get_key_btn"
+                                 label="获�键值"
+                                 tool_tip="�制化身的键值到剪贴�" />
+                        <!-- upper middle row -->
+                        <button
+                                 name="im_btn"
+                                 label="�时消�"
+                                 tool_tip="打开�时通信会�" />
+                        <button
+                                 name="offer_btn"
+                                 label="邀请瞬移"
+                                 tool_tip="邀请此人瞬间移动到你的�置" />
+                        <button
+                                 name="teleport_btn"
+                                 label="瞬移到"
+                                 tool_tip="瞬间移动到他人的�置" />                   
+                        <!-- lower middle row-->
+                        <button
+                                 name="mark_btn"
+                                 label="标记/�消"
+                                 tool_tip="在列表中标记或�消标记该化身" />
+                        <button
+                                 name="prev_marked_btn"
+                                 label="上个标记"
+                                 tool_tip="�焦摄�机于上个已标记的化身" />
+                        <button
+                                 name="next_marked_btn"
+                                 label="下个标记"
+                                 tool_tip="�焦摄�机于下个已标记的化身" />
+                        <!-- lower row-->
+                        <button
+                                 name="focus_btn"
+                                 label="�焦"
+                                 tool_tip="�焦摄�机于当�选中的化身" />
+                        <button
+                                 name="prev_in_list_btn"
+                                 label="上个"
+                                 tool_tip="�焦摄�机于列表中上一个化身" />
+                        <button
+                                 name="next_in_list_btn"
+                                 label="下个"
+                                 tool_tip="�焦摄�机于列表中下一个化身" />
+ 
+                </panel>
+ 
+                <panel
+                         label="�醒"
+                         name="alerts_tab">
+                        <check_box
+                                 label="�天中显示�醒"
+                                 name="radar_alerts"
+                                 tool_tip="在�天记录中显示进入和离开范围的化身" />
+ 
+                        <check_box
+                                 label="化身进入 / 离开区域"
+                                 name="alerts_sim"
+                                 tool_tip="报告进入或离开区域的化身" />
+ 
+                        <check_box
+                                 label="化身进入 / 离开�绘�离"
+                                 name="alerts_draw"
+                                 tool_tip="报告进入或离开�绘�离的化身" />
+ 
+                        <check_box
+                                 label="化身进入 / 离开喊��离"
+                                 name="alerts_shout"
+                                 tool_tip="报告进入或离开喊��离的化身" />
+ 
+                        <check_box
+                                 label="化身进入 / 离开�天�离"
+                                 name="alerts_chat"
+                                 tool_tip="报告进入或离开�天�离的化身" />
+                </panel>
+ 
+                <panel
+                         label="管�"
+                         name="land_tab">
+ 
+                        <!-- Upper row -->
+                        <button
+                                 name="mute_btn"
+                                 label="�蔽/解除"
+                                 tool_tip="�蔽或解除�蔽该化身 (�蔽的化身�字会在列表中以红色高亮显示)。" />
+                        <button
+                                 name="freeze_btn"
+                                 label="冻结"
+                                 tool_tip="冻结该化身，防止其移动" />
+                        <button
+                                 name="ar_btn"
+                                 label="报告"
+                                 tool_tip="报告该化身的�良行为。" />
+                        <!-- Lower row -->
+                        <button
+                                 name="eject_btn"
+                                 label="驱�"
+                                 tool_tip="从地�中驱�该化身。" />
+ 
+                        <button
+                                 name="estate_eject_btn"
+                                 label="从地产中驱�"
+                                 tool_tip="从地产中驱�该化身。" />
+                </panel>
+ 
+                <panel
+                         label="选项"
+                         name="options_tab">
+                        <check_box
+                                 label="æ›´æ–°"
+                                 name="update_enabled_cb"
+                                 tool_tip="选择化身列表应何时更新" />
+                        <text
+                                 name="rate">
+                                        速率:
+                        </text>
+                        <radio_group
+                                 name="update_rate"
+                                 tool_tip="雷达更新频率 (高频率将�低 FPS)">
+                                <radio_item
+                                         name="high">
+                                        高
+                                </radio_item>
+                                <radio_item
+                                         name="medium">
+                                        中
+                                </radio_item>
+                                <radio_item
+                                         name="low">
+                                        低
+                                </radio_item>
+                        </radio_group>
+                        <check_box
+                                 label="关闭时继续�醒"
+                                 name="keep_open"
+                                 tool_tip="��窗�而�关闭，以继续在�天记录中显示进入的化身" />
+                        <check_box
+                                 label="��键值到 HUD"
+                                 name="radar_chat_keys"
+                                 tool_tip="设置是�将化身的键值��给LSL脚本" />
+                        <button
+                                 name="send_keys_btn"
+                                 label="现在��"
+                                 tool_tip="立�将所有键值��到 HUD" />
+                </panel>
+        </tab_container>
+</floater>
+
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_rlv_behaviour.xml b/linden/indra/newview/skins/default/xui/zh/floater_rlv_behaviour.xml
new file mode 100644
index 0000000..8aefafd
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/zh/floater_rlv_behaviour.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+         name="rlvBehaviours"
+         title="激活的 RLV �制">
+  <scroll_list
+                 name="behaviour_list">
+    <column
+                         label="�制"
+                         name="behaviour" />
+    <column
+                         label="物体�称"
+                         name="name" />
+  </scroll_list>
+</floater>
\ No newline at end of file
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_script_ed_panel.xml b/linden/indra/newview/skins/default/xui/zh/floater_script_ed_panel.xml
index 27c97aa..28d80c5 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_script_ed_panel.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_script_ed_panel.xml
@@ -54,6 +54,7 @@
                         label="帮助"
                         name="Help">
                         <menu_item_call label="帮助..." name="Help..." />
+                        <menu_item_call label="打开 Autoscript"  name="Launch Autoscript..." width="112" />
                         <menu_item_call
                                  label="LSL Wiki 帮助..."
                                  name="LSL Wiki Help..." />
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_search_replace.xml b/linden/indra/newview/skins/default/xui/zh/floater_search_replace.xml
index d21b657..5a2d724 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_search_replace.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_search_replace.xml
@@ -4,10 +4,10 @@
         <button label="查找" label_selected="查找" name="search_btn" />
         <button label="替�" label_selected="替�" name="replace_btn" />
         <button label="全部替�" label_selected="全部替�" name="replace_all_btn" />
-        <text type="string" length="1" name="txt">
+        <text type="string" name="search_label">
                 查找
         </text>
-        <text type="string" length="1" name="txt2">
+        <text type="string" name="replace_label">
                 替�
         </text>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_sell_land.xml b/linden/indra/newview/skins/default/xui/zh/floater_sell_land.xml
index 7ecc330..499d4c4 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_sell_land.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_sell_land.xml
@@ -22,10 +22,10 @@
                 为这�土地选择一个�适的价�
         </text>
         <text name="price_ld">
-                L$
+                [CURRENCY]
         </text>
         <text name="price_per_m">
-                (L$[PER_METER]�平方米)
+                ([CURRENCY][PER_METER] �平方米)
         </text>
         <text name="sell_to_label">
                 把土地出售给:
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_snapshot.xml b/linden/indra/newview/skins/default/xui/zh/floater_snapshot.xml
index e0f9a17..ed90d9c 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_snapshot.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_snapshot.xml
@@ -8,7 +8,7 @@
                         通过电�邮件��
                 </radio_item>
                 <radio_item name="texture">
-                        �存至库存 (L$[AMOUNT])
+                        �存至库存 ([UPLOADFEE])
                 </radio_item>
                 <radio_item name="local">
                         �存至硬盘
@@ -19,7 +19,7 @@
         </text>
         <button label="刷新截图" name="new_snapshot_btn"/>
         <button label="��" name="send_btn"/>
-        <button label="上传 (L$[AMOUNT])" name="upload_btn"/>
+        <button label="上传 ([UPLOADFEE])" name="upload_btn"/>
         <flyout_button label="�存" list_position="below" name="save_btn" tool_tip="�存图�到文件">
                 <flyout_button_item name="save_item">
                         �存
@@ -42,13 +42,13 @@
                         当�窗�
                 </combo_item>
                 <combo_item name="640x480">
-                        640x480
+                        640×480
                 </combo_item>
                 <combo_item name="800x600">
-                        800x600
+                        800×600
                 </combo_item>
                 <combo_item name="1024x768">
-                        1024x768
+                        1024×768
                 </combo_item>
                 <combo_item name="Custom">
                         自定义
@@ -59,13 +59,13 @@
                         当�窗�
                 </combo_item>
                 <combo_item name="Small(128x128)">
-                        å°� (128x128)
+                        � (128×128)
                 </combo_item>
                 <combo_item name="Medium(256x256)">
-                        中 (256x256)
+                        中 (256×256)
                 </combo_item>
                 <combo_item name="Large(512x512)">
-                        大 (512x512)
+                        大 (512×512)
                 </combo_item>
                 <combo_item name="Custom">
                         自定义
@@ -76,22 +76,22 @@
                         当�窗�
                 </combo_item>
                 <combo_item name="320x240">
-                        320x240
+                        320×240
                 </combo_item>
                 <combo_item name="640x480">
-                        640x480
+                        640×480
                 </combo_item>
                 <combo_item name="800x600">
-                        800x600
+                        800×600
                 </combo_item>
                 <combo_item name="1024x768">
-                        1024x768
+                        1024×768
                 </combo_item>
                 <combo_item name="1280x1024">
-                        1280x1024
+                        1280×1024
                 </combo_item>
                 <combo_item name="1600x1200">
-                        1600x1200
+                        1600×1200
                 </combo_item>
                 <combo_item name="Custom">
                         自定义
@@ -104,6 +104,9 @@
                 <combo_item name="JPEG">
                         JPEG
                 </combo_item>
+                <combo_item name="TGA">
+                        TGA
+                </combo_item>
                 <combo_item name="BMP">
                         BMP
                 </combo_item>
@@ -112,8 +115,9 @@
         <spinner label="高度" name="snapshot_height"/>
         <check_box label="��画�宽高比" name="keep_aspect_check"/>
         <slider label="图�质�" name="image_quality_slider"/>
+        <check_box label="��解�度" name="high_res_check" />
         <text name="layer_type_label">
-                获�:
+                截�:
         </text>
         <combo_box label="画�图层" name="layer_types">
                 <combo_item name="Colors">
@@ -131,6 +135,8 @@
         <check_box label="�存���窗�开�" name="keep_open_check"/>
         <check_box label="冻结当�画�(全�预览)" name="freeze_frame_check"/>
         <check_box label="自动截图" name="auto_snapshot_check"/>
+        <check_box enabled="true" label="临时图� (�费)" 
+        tooltip="设置资产为临时的，这�味�它是�费的，但是作为代价，仅在一段时间内有效，之�它就消失了。" />
         <string name="unknown">
                 未知
         </string>
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_sound_preview.xml b/linden/indra/newview/skins/default/xui/zh/floater_sound_preview.xml
index ac9c149..40c564f 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_sound_preview.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_sound_preview.xml
@@ -7,5 +7,5 @@
                 �述:
         </text>
         <button label="�消" label_selected="�消" name="cancel_btn" />
-        <button label="上传 (L$[AMOUNT])" label_selected="上传 (L$[AMOUNT])" name="ok_btn" />
+        <button label="上传 ([UPLOADFEE])" label_selected="上传 ([UPLOADFEE])" name="ok_btn" />
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_teleport_history.xml b/linden/indra/newview/skins/default/xui/zh/floater_teleport_history.xml
new file mode 100644
index 0000000..b4dd5de
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/zh/floater_teleport_history.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+         name="teleporthistory"
+         title="瞬间移动历�">
+        <tab_container
+                 name="tplisttabs">
+                <panel
+                         label="瞬间移动到"
+                         name="TP-in">
+        <scroll_list
+                                 name="places_list_in">
+                <column
+                                         label="区域"
+                                         name="region" />
+                <column
+                                         label="�置"
+                                         name="position" />
+                <column
+                                         label="访问时间"
+                                         name="visited" />
+                <!--Hidden fields, used as storage for prebuilt strings, please keep at width 0-->
+                <column
+                                         label="SLURL"
+                                         name="slurl" />
+                <column
+                                         label="Sim String"
+                                         name="simstring" />
+        </scroll_list>
+                </panel>
+                <panel
+                         label="瞬间移动从"
+                         name="TP-out">
+                        <scroll_list
+                                 name="places_list_out">
+                                <column
+                                         label="区域"
+                                         name="region" />
+                                <column
+                                         label="�置"
+                                         name="position" />
+                                <column
+                                         label="访问时间"
+                                         name="visited" />
+                                <!--Hidden fields, used as storage for prebuilt strings, please keep at width 0-->
+                                <column
+                                         label="SLURL"
+                                         name="slurl" />
+                                <column
+                                         label="Sim String"
+                                         name="simstring" />
+                        </scroll_list>
+                </panel>
+        </tab_container>
+        <button
+                 label="瞬间移动"
+                 label_selected="瞬间移动"
+                 name="teleport"
+                 tool_tip="瞬间移动到所选�置" />
+        <button
+                 label="在地图上显示"
+                 label_selected="在地图上显示"
+                 name="show_on_map"
+                 tool_tip="居中显示该地点" />
+        <button
+                 label="清除历�"
+                 name="clear_history"
+                 tool_tip="清除�存的历�" />
+        <button
+                 label="�制 SLURL 到剪贴�"
+                 name="copy_slurl"
+                 tool_tip="�制当��置为 SLURL 供分享。" />
+</floater>
\ No newline at end of file
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_texture_ctrl.xml b/linden/indra/newview/skins/default/xui/zh/floater_texture_ctrl.xml
index bbca686..7e41a58 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_texture_ctrl.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_texture_ctrl.xml
@@ -15,6 +15,7 @@
         <button label="默认" label_selected="默认" name="Default" />
         <button label="无�质" label_selected="无�质" name="None" />
         <button label="空白" label_selected="空白" name="Blank" />
+        <button label="�明" label_selected="�明" name="Invisible" />
         <check_box label="显示文件夹" name="show_folders_check" />
         <check_box label="立�应用" name="apply_immediate_check" />
         <button label="" label_selected="" name="Pipette" />
@@ -23,4 +24,38 @@
         <string name="pick title">
                 选择:
         </string>
+ 
+        <tab_container name="actions_tab_container">
+    <panel       label="库存" name="server_tab">
+        <search_editor
+                                 label="在这里键入�查找的�质"
+                                 name="inventory search editor" />
+    </panel>
+    <panel
+                         label="我的电脑"
+                         name="local_tab">
+  <!-- tag: vaa emerald local_asset_browser [begin] -->
+      <text
+                                 name="select_local">
+                 选择你的电脑上的�质在世界内预览
+        Select texture on your computer to preview inworld
+      </text>
+      <button
+                                 label="添加"
+                                 name="Add" />
+      <button
+                                 label="移除"
+                                 name="Remove" />
+      <button
+                                 label="属性..."
+                                 name="Browser" />
+      <scroll_list
+                                 name="local_name_list">
+              <column
+                                         name="unit_name"
+                                         label="�称" />
+            </scroll_list>
+          <!-- tag: vaa emerald local_asset_browser [end] -->
+    </panel>
+  </tab_container>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_tools.xml b/linden/indra/newview/skins/default/xui/zh/floater_tools.xml
index 4f7bcf1..f608b78 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_tools.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_tools.xml
@@ -14,7 +14,12 @@
         <check_box label="�置" name="radio position"/>
         <check_box label="旋转(Ctrl)" name="radio rotate"/>
         <check_box label="拉伸(Ctrl-Shift)" name="radio stretch"/>
-        <check_box label="选择�质" name="radio select face"/>
+        <check_box label="选择表�添加�质" name="radio select face"/>
+        <check_box label="对� (按 Shift 堆砌)"
+             name="radio align"
+       tool_tip="Align aligns all selected prims' edges along an axis, Pack moves all selected prims' edges so they're touching" />
+  <button label="链接" label_selected="链接" name="link_btn" />
+  <button label="解除链接" label_selected="解除链接" name="unlink_btn"/>
         <check_box label="编辑连接部件" name="checkbox edit linked parts"/>
         <text name="text ruler mode">
                 标尺：
@@ -33,7 +38,7 @@
         <check_box label="�时拉伸两边" name="checkbox uniform"/>
         <check_box label="拉伸�质" name="checkbox stretch textures"/>
         <check_box label="使用网格" name="checkbox snap to grid"/>
-        <button label="选项..." label_selected="选项..." name="Options..."/>
+        <button label="建造选项..." label_selected="建造选项..." name="Options..."/>
         <text name="text status">
                 拖动�移动物体, 按� Shift 拖动��制
         </text>
@@ -74,11 +79,14 @@
                 强度
         </text>
         <text name="obj_count">
-                选择物�：[COUNT]
+                选择物体数：[COUNT]
         </text>
         <text name="prim_count">
-                元件：[COUNT]
+                元件数：[COUNT]
         </text>
+        <text name="link_num">
+        链接编�: [NUMBER]
+        </text>
         <tab_container name="Object Info Tabs">
                 <panel label="一般" name="General">
                         <text name="Name:">
@@ -98,7 +106,7 @@
                                 主人:
                         </text>
                         <text name="Owner Name">
-                                斯雷�斯·林登
+                                Kakurady Drakenar
                         </text>
                         <button label="档案..." label_selected="档案..." name="button owner profile"/>
                         <text name="Group:">
@@ -126,7 +134,7 @@
                         <check_box label="在�索中显示" name="search_check" tool_tip="让别人�以在�索结果中看到这件物体。"/>
                         <check_box label="出售" name="checkbox for sale"/>
                         <text name="Cost">
-                                ä»·æ ¼:   L$
+                                ä»·æ ¼:   [CURRENCY]
                         </text>
                         <radio_group name="sale type">
                                 <radio_item name="Original">
@@ -139,6 +147,21 @@
                                         内容
                                 </radio_item>
                         </radio_group>
+      <button
+                                 label="�制键值"
+                                 label_selected="�制键值"
+                                 name="button copy key"
+                                 tool_tip="�制物体的键值到剪贴�。" />
+      <text
+                                 name="Anyone can:">
+        任何人都�以:
+      </text>
+      <check_box
+                                 label="移动"
+                                 name="checkbox allow everyone move" />
+      <check_box
+                                 label="�制"
+                                 name="checkbox allow everyone copy" />
                         <text name="Next owner can:">
                                 下个拥有者�以:
                         </text>
@@ -205,24 +228,24 @@
                                 必须选择一个完整的物体�设置许�。
                         </string>
                         <string name="Cost Default">
-                                ä»·æ ¼:      L$
+                                ä»·æ ¼:      [CURRENCY]
                         </string>
                         <string name="Cost Total">
-                                总价格:     L$
+                                总价格:     [CURRENCY]
                         </string>
                         <string name="Cost Per Unit">
-                                �个的价格:  L$
+                                �价:      [CURRENCY]
                         </string>
                         <string name="Cost Mixed">
-                                混�价格
+                                价格�相�
                         </string>
                         <string name="Sale Mixed">
-                                混�销售
+                                部分�出售
                         </string>
                 </panel>
                 <panel label="物体" name="Object">
                         <text name="select_single">
-                                一次�能编辑一个元件的�数。请选择�个元件。
+                                �能�时编辑多个元件的�数。请选择�个元件。
                         </text>
                         <text name="edit_object">
                                 编辑物体�数:
@@ -237,15 +260,50 @@
                         <spinner label="X" name="Pos X"/>
                         <spinner label="Y" name="Pos Y"/>
                         <spinner label="Z" name="Pos Z"/>
+      <button
+                                 name="copypos"
+                                 tool_tip="�制�置" />
+      <button
+                                 name="pastepos"
+                                 tool_tip="粘贴�置" />
+      <button
+                                 label="p"
+                                 name="pasteposclip"
+                                 tool_tip="从剪贴�粘贴�置" />
                         <text name="label size">
                                 尺寸 (米)
                         </text>
                         <spinner label="X" name="Scale X"/>
                         <spinner label="Y" name="Scale Y"/>
                         <spinner label="Z" name="Scale Z"/>
+      <button
+                                 label="C"
+                                 name="copysize"
+                                 tool_tip="�制尺寸" />
+      <button
+                                 label="P"
+                                 name="pastesize"
+                                 tool_tip="粘贴尺寸" />
+      <button
+                                 label="p"
+                                 name="pastesizeclip"
+                                 tool_tip="从剪贴�粘贴尺寸" />
                         <text name="label rotation">
                                 旋转 (角度)
                         </text>
+      <button
+                                 label="C"
+                                 name="copyrot"
+                                 tool_tip="�制方�" />
+      <button
+                                 label="P"
+                                 name="pasterot"
+                                 tool_tip="粘贴方�" />
+      <button
+                                 label="p"
+                                 name="pasterotclip"
+                                 tool_tip="从剪贴�粘贴方�" />
+ 
                         <spinner label="X" name="Rot X"/>
                         <spinner label="Y" name="Rot Y"/>
                         <spinner label="Z" name="Rot Z"/>
@@ -518,6 +576,10 @@
                                         编织
                                 </combo_item>
                         </combo_box>
+                        <check_box
+                                 label="对�平��质"
+                                 name="checkbox planar align"
+                                 tool_tip="所有选中�的�质与最�选中�的�质对�。需�选择平��质映射。" />
                         <text name="tex scale">
                                 ����次数
                         </text>
@@ -556,10 +618,10 @@
         </tab_container>
         <panel name="land info panel">
                 <text name="label_parcel_info">
-                        土地信�
+                        土地信�:
                 </text>
                 <text name="label_area_price">
-                        价格: L$[PRICE] � [AREA]平方米.
+                        价格: [CURRENCY][PRICE] � [AREA]平方米.
                 </text>
                 <text name="label_area">
                         �积: [AREA] 平方米.
@@ -594,8 +656,11 @@
                 点击并拖动�更改视角
         </string>
         <string name="status_grab">
-                拖动以移动，按�Ctrl抬起，Ctrl+Shift旋转
+                拖动以移动，按� Ctrl 抬起，Ctrl+Shift 旋转
         </string>
+  <string name="status_align">
+    CTRL-A 以对�到轴, CTRL-Shift-A 堆砌
+  </string>
         <string name="status_place">
                 在世界中点击以创建
         </string>
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_tos.xml b/linden/indra/newview/skins/default/xui/zh/floater_tos.xml
index ed16075..29f7341 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_tos.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_tos.xml
@@ -9,8 +9,7 @@
                 �务�款�议
         </text>
         <text name="tos_heading">
-                登陆第二人生�请仔细阅读下列�务�款。�继续登录到第二人生，
-您必须接�该�议。
+                登陆�请仔细阅读下列�务�款。�继续登录，您必须接�该�议。
         </text>
         <web_browser name="tos_html"/>
 
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_voice_license.xml b/linden/indra/newview/skins/default/xui/zh/floater_voice_license.xml
new file mode 100644
index 0000000..06fc9c1
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/zh/floater_voice_license.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+         name="modal container"
+         title="">
+  <button
+                 label="继续"
+                 label_selected="继续"
+                 name="Continue" />
+  <button
+                 label="�消"
+                 label_selected="�消"
+                 name="Cancel" />
+  <check_box
+                 label="我接�Vivox使用�例。"
+                 name="agree_chk" />
+  <text
+                 name="license_heading">
+请仔细阅读以下的�例文本。
+�使用Vivox语音�天，您必须接��例款项。
+  </text>
+  <!-- Loading text says: "Loading Vivox Acceptable Use Policy..." URL encoded -->
+  <web_browser
+                 name="license_html"
+                 start_url="data:text/html,%3Chtml%3E%3Chead%3E%3C/head%3E%3Cbody text=%22000000%22%3E%3Ch2%3E Loading %3Ca%20target%3D%22_external%22%20href%3D%22http%3A//vivox.com/vivox_aup.html%22%3EVivox%20Acceptable%20Use%20Policy%3C/a%3E...%3C/h2%3E %3C/body%3E %3C/html%3E" />
+</floater>
\ No newline at end of file
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_water.xml b/linden/indra/newview/skins/default/xui/zh/floater_water.xml
index bc4091a..0defeb3 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_water.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_water.xml
@@ -5,7 +5,22 @@
         </text>
         <combo_box allow_text_entry="false" max_chars="20" name="WaterPresetsCombo"/>
         <button label="新建" label_selected="新建" name="WaterNewPreset"/>
-        <button label="�存" label_selected="�存" name="WaterSavePreset"/>
+        <flyout_button
+                label="�存到硬盘"
+                name="WaterSavePreset">
+                <flyout_button_item
+                        name="save_inventory_item">
+                        �存到库存
+                </flyout_button_item>
+                <flyout_button_item
+                        name="save_disk_item">
+                        �存到硬盘
+                </flyout_button_item>
+                <flyout_button_item
+                        name="send_to_server_item">
+                        ��到�务器
+                </flyout_button_item>
+        </flyout_button>
         <button label="删除" label_selected="Delete" name="WaterDeletePreset"/>
         <tab_container name="Water Tabs" tab_position="top">
                 <panel label="设置" name="Settings">
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_windlight_manager.xml b/linden/indra/newview/skins/default/xui/zh/floater_windlight_manager.xml
new file mode 100644
index 0000000..f69e94d
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/zh/floater_windlight_manager.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+         name="WindLight send to server floater"
+         title="WindLight 管�器">
+  <button
+                 label="当�地�"
+                 label_selected="当�地�"
+                 name="this_parcel" />
+  <button
+                 label="所有地�"
+                 label_selected="所有地�"
+                 name="all_parcels" />
+  <button
+                 label="当�区域"
+                 label_selected="当�区域"
+                 name="this_region" />
+  <text
+                 name="KeyFramePresetsText">
+    预设:
+  </text>
+  <button
+                 label="显示"
+                 label_selected="显示"
+                 name="show" />
+  <button
+                 label="设置为当�预设"
+                 label_selected="设置为当�预设"
+                 name="set_to_current" />
+  <button
+                 label="移除"
+                 label_selected="移除"
+                 name="remove" />
+</floater>
\ No newline at end of file
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_windlight_options.xml b/linden/indra/newview/skins/default/xui/zh/floater_windlight_options.xml
index e9c260d..bbce687 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_windlight_options.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_windlight_options.xml
@@ -4,7 +4,22 @@
                 天空预设:
         </text>
         <button label="新建" label_selected="新建" name="WLNewPreset"/>
-        <button label="�存" label_selected="�存" name="WLSavePreset"/>
+        <flyout_button
+                label="�存到硬盘"
+                name="WLSavePreset">
+                <flyout_button_item
+                        name="save_inventory_item">
+                        �存到库存
+                </flyout_button_item>
+                <flyout_button_item
+                        name="save_disk_item">
+                        �存到硬盘
+                </flyout_button_item>
+                <flyout_button_item
+                        name="send_to_server_item">
+                        ��到�务器
+                </flyout_button_item>
+        </flyout_button>
         <button label="删除" label_selected="删除" name="WLDeletePreset"/>
         <button label="日夜循环编辑器" label_selected="日夜循环编辑器" name="WLDayCycleMenuButton"/>
         <tab_container name="WindLight Tabs" tab_position="top">
@@ -64,6 +79,10 @@
                         </text>
                         <button label="?" name="WLMaxAltitudeHelp"/>
                         <slider label="" name="WLMaxAltitude" />
+                        <button 
+                                label="日夜周期编辑器" 
+                                label_selected="日夜周期编辑器" 
+                                name="WLDayCycleMenuButton" />
                 </panel>
                 <panel label="光照" name="Lighting">
                         <text name="SLCText">
@@ -181,6 +200,14 @@
                         <check_box label="Lock" name="WLCloudLockY"/>
                         <check_box label="渲染旧云层" name="DrawClassicClouds"/>
                         <button label="?" name="WLClassicCloudsHelp"/>
+                        <text
+                                         name="WLCloudHeightText">
+                        旧云层高度
+                        </text>
+                        <text
+                                         name="WLCloudClassicRangeText">
+                        旧云层范围
+                        </text>
                 </panel>
         </tab_container>
         <string name="WLDefaultSkyNames">
diff --git a/linden/indra/newview/skins/default/xui/zh/legacy_menu_pie_attachment.xml b/linden/indra/newview/skins/default/xui/zh/legacy_menu_pie_attachment.xml
new file mode 100644
index 0000000..a6204ea
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/zh/legacy_menu_pie_attachment.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

+<pie_menu name="Attachment Pie">

+        <menu_item_call label="丢下" name="Drop" />

+        <menu_item_call label="审查" name="Object Inspect" />

+        <menu_item_call label="�下" name="Detach" />

+        <menu_item_call label="编辑..." name="Edit" />

+</pie_menu>

diff --git a/linden/indra/newview/skins/default/xui/zh/legacy_menu_pie_avatar.xml b/linden/indra/newview/skins/default/xui/zh/legacy_menu_pie_avatar.xml
new file mode 100644
index 0000000..f23c2f4
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/zh/legacy_menu_pie_avatar.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<pie_menu name="Avatar Pie">
+        <menu_item_call label="档案..." name="Profile..." />
+        <menu_item_call label="�蔽" name="Avatar Mute" />
+        <!--TODO-->
+        <menu_item_call label="�往" name="Go To" />
+        <menu_item_call label="报告..." name="abuse"/>
+
+
+        <menu_item_call label="添加好�..." name="Add Friend" />
+        <menu_item_call label="付款..." name="Pay..." />
+        <pie_menu label="更多 &gt;" name="More &gt;">
+                <menu_item_call label="冻结..." name="Freeze..." />
+                <menu_item_call label="赠与�片" name="Give Card" />
+                <menu_item_call label="社团邀请..." name="Invite..." />
+                <menu_item_call label="驱�..." name="Eject..." />
+                <menu_item_call label="调试..." name="Debug..." />
+                <menu_item_call label="审查" name="Avatar Inspect"/>
+                <menu_item_call label="��" name="Derender" />
+        </pie_menu>
+        <menu_item_call label="��消�..." name="Send IM..." />
+</pie_menu>
diff --git a/linden/indra/newview/skins/default/xui/zh/legacy_menu_pie_land.xml b/linden/indra/newview/skins/default/xui/zh/legacy_menu_pie_land.xml
new file mode 100644
index 0000000..97241fd
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/zh/legacy_menu_pie_land.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<pie_menu name="Land Pie">
+        <menu_item_call label="关于土地..." name="About Land..." />
+        <menu_item_call label="建造" name="Create" />
+        <menu_item_call label="�往" name="Go Here" />
+        <menu_item_call label="�在这里" name="Sit Here" />
+        <menu_item_call label="购买通行�" name="Land Buy Pass" />
+        <menu_item_call label="编辑地形" name="Edit Terrain" />
+        <menu_item_call label="购买土地..." name="Land Buy" />
+        <menu_item_call label="添加地标" name="Add Landmark">
+</pie_menu>
+<!-- Translated for Second Life 1.19.0 (80267) -->
\ No newline at end of file
diff --git a/linden/indra/newview/skins/default/xui/zh/legacy_menu_pie_object.xml b/linden/indra/newview/skins/default/xui/zh/legacy_menu_pie_object.xml
new file mode 100644
index 0000000..bb9e8b1
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/zh/legacy_menu_pie_object.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<pie_menu name="Object Pie">
+        <menu_item_call label="打开" name="Open"/>
+        <menu_item_call label="触摸" name="Object Touch" />
+        <menu_item_call label="�在这里" name="Object Sit" />
+        <menu_item_call label="æ‹¿èµ°" name="Pie Object Take" />
+        <menu_item_call label="付款..." name="Pay..."/>
+        <menu_item_call label="创造" name="Create"/>
+        <pie_menu label="更多 &gt;" name="More &gt;">
+                <menu_item_call label="删除" name="Delete"/>
+                <menu_item_call label="穿上" name="Wear"/>
+                <menu_item_call label="拿走副本" name="Take Copy"/>
+                <pie_menu label="装上到HUD &gt;" name="Object Attach HUD"/>
+                <pie_menu label="装备到&gt;" name="Object Attach"/>
+                <menu_item_call label="归还..." name="Return..."/>
+                <pie_menu label="更多 &gt;" name="Rate Menu">
+                        <menu_item_call label="导出" name="Export" />
+                        <menu_item_call label="�蔽" name="Object Mute" />
+                        <menu_item_call label="报告..." name="Report Abuse..." />
+                        <menu_item_call label="�往" name="Go To" />
+                        <menu_item_call label="�蔽" name="Object Mute"/>
+                        <menu_item_call label="审查" name="Object Inspect"/>
+                        <menu_item_call label="��" name="Derender" />
+                        <menu_item_call name="链接" label="Link" />
+                        <menu_item_call name="解除链接" label="Unlink" />
+                </pie_menu>
+                <menu_item_call label="è´­ä¹°..." name="Buy..."/>       
+        </pie_menu>
+        <menu_item_call label="编辑..." name="Edit..."/>
+</pie_menu>
diff --git a/linden/indra/newview/skins/default/xui/zh/legacy_menu_pie_self.xml b/linden/indra/newview/skins/default/xui/zh/legacy_menu_pie_self.xml
new file mode 100644
index 0000000..2b79bf2
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/zh/legacy_menu_pie_self.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<pie_menu name="Self Pie">
+        <menu_item_call label="档案..." name="Profile..." />
+        <menu_item_call label="社团..." name="Groups..." />
+        <menu_item_call label="去往..." name="Go..." />
+        <menu_item_call label="起身" name="Stand Up" />
+        <menu_item_call label="朋�..." name="Friends..." />
+        <menu_item_call label="动作..." name="Gestures..." />
+        <pie_menu label="脱下 &gt;" name="Take Off &gt;">
+                <pie_menu label="�饰 &gt;" name="Clothes &gt;">
+                        <menu_item_call label="衬衣" name="Shirt" />
+                        <menu_item_call label="裤�" name="Pants" />
+                        <menu_item_call label="éž‹å­�" name="Shoes" />
+                        <menu_item_call label="袜�" name="Socks" />
+                        <menu_item_call label="夹克" name="Jacket" />
+                        <menu_item_call label="手套" name="Gloves" />
+                        <pie_menu label="更多 &gt;" name="More &gt;">
+                                <menu_item_call label="内衣" name="Self Undershirt" />
+                                <menu_item_call label="所有�饰" name="All Clothes" />
+                                <menu_item_call label="内裤" name="Self Underpants" />
+                        </pie_menu>
+                        <menu_item_call label="裙�" name="Skirt" />
+                </pie_menu>
+                <pie_menu label="HUD &gt;" name="Object Detach HUD" />
+                <pie_menu label="�下 &gt;" name="Object Detach" />
+                <menu_item_call label="分开全部" name="Detach All" />
+        </pie_menu>
+        <menu_item_call label="外观..." name="Appearance..." />
+</pie_menu>
diff --git a/linden/indra/newview/skins/default/xui/zh/menu_inventory.xml b/linden/indra/newview/skins/default/xui/zh/menu_inventory.xml
index fee52b9..4a1547e 100644
--- a/linden/indra/newview/skins/default/xui/zh/menu_inventory.xml
+++ b/linden/indra/newview/skins/default/xui/zh/menu_inventory.xml
@@ -22,6 +22,8 @@
                 <menu_item_call label="新建手套" name="New Gloves"/>
                 <menu_item_call label="新建内衣" name="New Undershirt"/>
                 <menu_item_call label="新建内裤" name="New Underpants"/>
+                <menu_item_call label="新建纹身"     name="New Tattoo" />
+                <menu_item_call label="新建�明度蒙�"  name="New Alpha" />
         </menu>
         <menu name="New Body Parts">
                 <menu_item_call label="新建体型" name="New Shape"/>
@@ -38,6 +40,7 @@
         <menu_item_call label="属性" name="Properties"/>
         <menu_item_call label="�命�" name="Rename"/>
         <menu_item_call label="�制资产UUID" name="Copy Asset UUID"/>
+        <menu_item_call label="剪切" name="Cut" />
         <menu_item_call label="�制" name="Copy"/>
         <menu_item_call label="粘贴" name="Paste"/>
         <menu_item_call label="删除" name="Delete"/>
@@ -55,12 +58,15 @@
         <menu_item_call label="激活" name="Activate"/>
         <menu_item_call label="解除激活" name="Deactivate"/>
         <menu_item_call label="从自己身上�下" name="Detach From Yourself"/>
-        <menu_item_call label="��至上一�置" name="Restore to Last Position"/>
+        <menu_item_call label="��至最��置" name="Restore to Last Position"/>
         <menu_item_call label="穿上" name="Object Wear"/>
         <menu label="装备至" name="Attach To"/>
         <menu label="装备到HUD" name="Attach To HUD"/>
         <menu_item_call label="编辑" name="Wearable Edit"/>
         <menu_item_call label="穿上" name="Wearable Wear"/>
         <menu_item_call label="脱掉" name="Take Off"/>
+        <menu_item_call label="使用 WindLight 设置" name="Use WindLight Settings" />
+        <menu_item_call label="使用水�设置" name="Use WaterLight Settings" />
+        <menu_item_call label="编辑 WindLight 设置" name="Edit WindLight Settings" />
         <menu_item_call label="--无�用选项--" name="--no options--"/>
 </menu>
diff --git a/linden/indra/newview/skins/default/xui/zh/menu_login.xml b/linden/indra/newview/skins/default/xui/zh/menu_login.xml
index a00ae90..8c70de2 100644
--- a/linden/indra/newview/skins/default/xui/zh/menu_login.xml
+++ b/linden/indra/newview/skins/default/xui/zh/menu_login.xml
@@ -32,5 +32,25 @@
                          name="About Second Life...">
                         <on_click />
                 </menu_item_call>
+                <menu_item_call
+                         label="Grid Help"
+                         name="Grid Help" />
+                <menu_item_call
+                         label="Imprudence 网络日志"
+                         name="Imprudence Blog" />
+                <menu_item_call
+                         label="Imprudence 论�"
+                         name="Imprudence Forums" />
+                <menu_item_call
+                         label="关于 Imprudence"
+                         name="About Imprudence" />
+        </menu>
+        <menu
+                 label="高级"
+                 name="Advanced">
+                <menu_item_call
+                         name="Debug Settings"
+                         label="调试设置" />
         </menu>
-</menu_bar>
\ No newline at end of file
+</menu_bar>
+
diff --git a/linden/indra/newview/skins/default/xui/zh/menu_pie_attachment.xml b/linden/indra/newview/skins/default/xui/zh/menu_pie_attachment.xml
index 7891fd1..321a652 100644
--- a/linden/indra/newview/skins/default/xui/zh/menu_pie_attachment.xml
+++ b/linden/indra/newview/skins/default/xui/zh/menu_pie_attachment.xml
@@ -1,15 +1,18 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <pie_menu name="Attachment Pie">
         <menu_item_call label="档案..." name="Profile..."/>
-        <menu_item_call label="丢下" name="Drop" />
-        <menu_item_call label="社团..." name="Groups..."/>
-        <menu_item_call label="触摸" name="Attachment Object Touch">
-                <on_enable userdata="触摸" name="EnableTouch"/>
-        </menu_item_call>
+        <menu_item_call label="社团..." name="Groups"/>
+        <menu_item_call label="触摸" name="Attachment Touch"/>
+
         <menu_item_call label="起身" name="Stand Up"/>
-        <menu_item_call label="�下" name="Detach" />
-        <menu_item_call label="好�..." name="Friends..."/>
+
+        <menu_item_call label="好�..." name="Friends"/>
         <menu_item_call label="动作..." name="Gestures..."/>
         <menu_item_call label="外观..." name="Appearance..."/>
         <menu_item_call label="编辑..." name="Edit..."/>
+        <pie_menu label="更多 &gt;" name="More &gt;">
+                <menu_item_call label="丢下" name="Drop" />
+                <menu_item_call label="�下" name="Detach" />
+                <menu_item_call label="审查" name="Object Inspect" />
+        </pie_menu>
 </pie_menu>
diff --git a/linden/indra/newview/skins/default/xui/zh/menu_pie_avatar.xml b/linden/indra/newview/skins/default/xui/zh/menu_pie_avatar.xml
index 684e9a3..8f983d6 100644
--- a/linden/indra/newview/skins/default/xui/zh/menu_pie_avatar.xml
+++ b/linden/indra/newview/skins/default/xui/zh/menu_pie_avatar.xml
@@ -1,19 +1,21 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <pie_menu name="Avatar Pie">
-        <menu_item_call label="档案..." name="Profile..." />
+        <menu_item_call label="档案" name="Profile" />
         <menu_item_call label="�蔽" name="Avatar Mute" />
         <!--TODO-->
-        <menu_item_call label="去往" name="Go To" />
-        <menu_item_call label="报告..." name="abuse"/>
+        <menu_item_call label="�往" name="Go To" />
+        <menu_item_call label="社团邀请..." name="Invite..." />
+
         <menu_item_call label="添加好�..." name="Add Friend" />
         <menu_item_call label="付款..." name="Pay..." />
         <pie_menu label="更多 &gt;" name="More &gt;">
-                <menu_item_call label="冻结..." name="Freeze..." />
+                <menu_item_call label="冻结..." name="Freeze" />
                 <menu_item_call label="赠与�片" name="Give Card" />
-                <menu_item_call label="社团邀请..." name="Invite..." />
-                <menu_item_call label="驱�..." name="Eject..." />
+                <menu_item_call label="报告..." name="abuse"/>
+                <menu_item_call label="驱�..." name="Eject" />
                 <menu_item_call label="调试..." name="Debug..." />
-                <menu_item_call label="审查" name="Object Inspect"/>
+                <menu_item_call label="审查" name="Avatar Inspect"/>
+                <menu_item_call label="��" name="Derender" />
         </pie_menu>
         <menu_item_call label="��消�..." name="Send IM..." />
 </pie_menu>
diff --git a/linden/indra/newview/skins/default/xui/zh/menu_pie_hud.xml b/linden/indra/newview/skins/default/xui/zh/menu_pie_hud.xml
new file mode 100644
index 0000000..773c5bd
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/zh/menu_pie_hud.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<pie_menu name="HUD Pie">
+  <menu_item_call        label="丢下" name="Drop" />
+  <menu_item_call        label="触摸" name="Attachment Touch" />
+  <menu_item_call label="审查" name="Object Inspect" />
+  <menu_item_call label="�下" name="Detach" />
+  <menu_item_call label="编辑..." name="Edit..." />
+</pie_menu>
\ No newline at end of file
diff --git a/linden/indra/newview/skins/default/xui/zh/menu_pie_land.xml b/linden/indra/newview/skins/default/xui/zh/menu_pie_land.xml
index fb420b8..97241fd 100644
--- a/linden/indra/newview/skins/default/xui/zh/menu_pie_land.xml
+++ b/linden/indra/newview/skins/default/xui/zh/menu_pie_land.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <pie_menu name="Land Pie">
         <menu_item_call label="关于土地..." name="About Land..." />
-        <menu_item_call label="创建" name="Create" />
-        <menu_item_call label="去这里" name="Go Here" />
+        <menu_item_call label="建造" name="Create" />
+        <menu_item_call label="�往" name="Go Here" />
         <menu_item_call label="�在这里" name="Sit Here" />
         <menu_item_call label="购买通行�" name="Land Buy Pass" />
         <menu_item_call label="编辑地形" name="Edit Terrain" />
         <menu_item_call label="购买土地..." name="Land Buy" />
+        <menu_item_call label="添加地标" name="Add Landmark">
 </pie_menu>
 <!-- Translated for Second Life 1.19.0 (80267) -->
\ No newline at end of file
diff --git a/linden/indra/newview/skins/default/xui/zh/menu_pie_object.xml b/linden/indra/newview/skins/default/xui/zh/menu_pie_object.xml
index 0a43667..5d28932 100644
--- a/linden/indra/newview/skins/default/xui/zh/menu_pie_object.xml
+++ b/linden/indra/newview/skins/default/xui/zh/menu_pie_object.xml
@@ -1,18 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <pie_menu name="Object Pie">
         <menu_item_call label="打开" name="Open"/>
-        <menu_item_call label="创造" name="Create"/>
-        <menu_item_call label="触摸" name="Object Touch">
-                <on_enable userdata="触摸" name="EnableTouch"/>
-        </menu_item_call>
-        <menu_item_call label="�在这里" name="Object Sit">
-                <on_enable userdata="�在这里,起身" name="EnableSitOrStand"/>
-        </menu_item_call>
-        <menu_item_call label="æ‹¿èµ°" name="Pie Object Take">
-                <on_enable userdata="è´­ä¹°,æ‹¿èµ°" name="EnableBuyOrTake"/>
-        </menu_item_call>
+        <menu_item_call label="è´­ä¹°..." name="Buy..."/>
+        <menu_item_call label="触摸" name="Object Touch" />
+        <menu_item_call label="�在这里" name="Object Sit" />
+        <menu_item_call label="æ‹¿èµ°" name="Pie Object Take" />
         <menu_item_call label="付款..." name="Pay..."/>
         <pie_menu label="更多 &gt;" name="More &gt;">
+                <menu_item_call label="建造" name="Create"/>
                 <menu_item_call label="删除" name="Delete"/>
                 <menu_item_call label="穿上" name="Wear"/>
                 <menu_item_call label="拿走副本" name="Take Copy"/>
@@ -20,11 +15,16 @@
                 <pie_menu label="装备到&gt;" name="Object Attach"/>
                 <menu_item_call label="归还..." name="Return..."/>
                 <pie_menu label="更多 &gt;" name="Rate Menu">
-                        <menu_item_call label="报告..." name="Report Abuse..."/>
+                        <menu_item_call label="导出" name="Export" />
+                        <menu_item_call label="�蔽" name="Object Mute" />
+                        <menu_item_call label="报告..." name="Report Abuse..." />
+                        <menu_item_call label="�往" name="Go To" />
                         <menu_item_call label="�蔽" name="Object Mute"/>
                         <menu_item_call label="审查" name="Object Inspect"/>
+                        <menu_item_call label="��" name="Derender" />
+                        <menu_item_call name="链接" label="Link" />
+                        <menu_item_call name="解除链接" label="Unlink" />
                 </pie_menu>
-                <menu_item_call label="è´­ä¹°..." name="Buy..."/>
         </pie_menu>
         <menu_item_call label="编辑..." name="Edit..."/>
 </pie_menu>
diff --git a/linden/indra/newview/skins/default/xui/zh/menu_pie_self.xml b/linden/indra/newview/skins/default/xui/zh/menu_pie_self.xml
index 2b79bf2..75bb349 100644
--- a/linden/indra/newview/skins/default/xui/zh/menu_pie_self.xml
+++ b/linden/indra/newview/skins/default/xui/zh/menu_pie_self.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <pie_menu name="Self Pie">
         <menu_item_call label="档案..." name="Profile..." />
-        <menu_item_call label="社团..." name="Groups..." />
-        <menu_item_call label="去往..." name="Go..." />
+        <menu_item_call label="社团" name="Groups" />
+        <menu_item_call label="�往..." name="Go..." />
         <menu_item_call label="起身" name="Stand Up" />
-        <menu_item_call label="朋�..." name="Friends..." />
+        <menu_item_call label="好�" name="Friends" />
         <menu_item_call label="动作..." name="Gestures..." />
         <pie_menu label="脱下 &gt;" name="Take Off &gt;">
                 <pie_menu label="�饰 &gt;" name="Clothes &gt;">
@@ -16,7 +16,9 @@
                         <menu_item_call label="手套" name="Gloves" />
                         <pie_menu label="更多 &gt;" name="More &gt;">
                                 <menu_item_call label="内衣" name="Self Undershirt" />
+                                <menu_item_call label="�明度蒙�" name="Self Alpha" />
                                 <menu_item_call label="所有�饰" name="All Clothes" />
+                                <menu_item_call label="纹身" name="Self Tattoo" />
                                 <menu_item_call label="内裤" name="Self Underpants" />
                         </pie_menu>
                         <menu_item_call label="裙�" name="Skirt" />
diff --git a/linden/indra/newview/skins/default/xui/zh/menu_rightclick_text.xml b/linden/indra/newview/skins/default/xui/zh/menu_rightclick_text.xml
index 36fa667..7282c5e 100644
--- a/linden/indra/newview/skins/default/xui/zh/menu_rightclick_text.xml
+++ b/linden/indra/newview/skins/default/xui/zh/menu_rightclick_text.xml
@@ -1,116 +1,30 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-
-<menu drop_shadow="true"
-     mouse_opaque="false" name="Text Edit Menu" opaque="true">
-        <menu_item_call label="Cut" mouse_opaque="true"
-             name="Cut Text">
-                <on_click function="textfield_cut" userdata="about" />
-                <on_enable function="textfield_cut_enable" />
-        </menu_item_call>
-        <menu_item_call label="Copy" mouse_opaque="true"
-                        name="Copy Text" >
-                <on_click function="textfield_copy" userdata="" />
-                <on_enable function="textfield_copy_enable"  />
-        </menu_item_call>
-        <menu_item_call label="Paste" mouse_opaque="true"
-                        name="Paste Text" >
-                <on_click function="textfield_paste" userdata="" />
-                <on_enable function="textfield_paste_enable" />
-        </menu_item_call>
-        <menu_item_call label="Delete" mouse_opaque="true"
-                        name="Delete Text" >
-                <on_click function="textfield_delete" userdata="" />
-                <on_enable function="textfield_delete_enable" />
-        </menu_item_call>
-                <menu_item_separator />
-        <menu_item_call label="Select All" mouse_opaque="true"
-                        name="Select All Text" >
-                <on_click function="textfield_selectall" userdata="" />
-                <on_enable function="textfield_selectall_enable" />
-        </menu_item_call>
-        <menu_item_separator name="Translate" />
-        <menu drop_shadow="true"
-              mouse_opaque="false" name="Translation Options"
-              bottom_delta="0" label="Translate To..." opaque="true" >
-          <menu_item_call label="English" mouse_opaque="true"
-                        name="Translate Text" >
-                <on_click function="textfield_translate" translate="true" userdata="en" />
-                <on_enable function="textfield_translate_enable" />
-          </menu_item_call>
-          <menu_item_call label="Danish" mouse_opaque="true"
-                        name="Translate Text" >
-                <on_click function="textfield_translate" translate="true" userdata="da" />
-                <on_enable function="textfield_translate_enable" />
-          </menu_item_call>
-          <menu_item_call label="Deutsch (German)" mouse_opaque="true"
-                        name="Translate Text" >
-                <on_click function="textfield_translate" translate="true" userdata="de" />
-                <on_enable function="textfield_translate_enable" />
-          </menu_item_call>
-          <menu_item_call label="Spanish" mouse_opaque="true"
-                        name="Translate Text" >
-                <on_click function="textfield_translate" translate="true" userdata="es" />
-                <on_enable function="textfield_translate_enable" />
-          </menu_item_call>
-          <menu_item_call label="French" mouse_opaque="true"
-                        name="Translate Text" >
-                <on_click function="textfield_translate" translate="true" userdata="fr" />
-                <on_enable function="textfield_translate_enable" />
-          </menu_item_call>
-          <menu_item_call label="Italian" mouse_opaque="true"
-                        name="Translate Text" >
-                <on_click function="textfield_translate" translate="true" userdata="it" />
-                <on_enable function="textfield_translate_enable" />
-          </menu_item_call>
-          <menu_item_call label="Hungarian" mouse_opaque="true"
-                        name="Translate Text" >
-                <on_click function="textfield_translate" translate="true" userdata="hu" />
-                <on_enable function="textfield_translate_enable" />
-          </menu_item_call>
-          <menu_item_call label="Dutch" mouse_opaque="true"
-                        name="Translate Text" >
-                <on_click function="textfield_translate" translate="true" userdata="nl" />
-                <on_enable function="textfield_translate_enable" />
-          </menu_item_call>
-          <menu_item_call label="Polish" mouse_opaque="true"
-                        name="Translate Text" >
-                <on_click function="textfield_translate" translate="true" userdata="pl" />
-                <on_enable function="textfield_translate_enable" />
-          </menu_item_call>
-          <menu_item_call label="Portugese" mouse_opaque="true"
-                        name="Translate Text" >
-                <on_click function="textfield_translate" translate="true" userdata="pt" />
-                <on_enable function="textfield_translate_enable" />
-          </menu_item_call>
-          <menu_item_call label="Russian" mouse_opaque="true"
-                        name="Translate Text" >
-                <on_click function="textfield_translate" translate="true" userdata="ru" />
-                <on_enable function="textfield_translate_enable" />
-          </menu_item_call>
-          <menu_item_call label="Turkish" mouse_opaque="true"
-                        name="Translate Text" >
-                <on_click function="textfield_translate" translate="true" userdata="tr" />
-                <on_enable function="textfield_translate_enable" />
-          </menu_item_call>
-          <menu_item_call label="Ukrainian" mouse_opaque="true"
-                        name="Translate Text" >
-                <on_click function="textfield_translate" translate="true" userdata="uk" />
-                <on_enable function="textfield_translate_enable" />
-          </menu_item_call>
-          <menu_item_call label="Chinese" mouse_opaque="true"
-                        name="Translate Text" >
-                <on_click function="textfield_translate" translate="true" userdata="zh" />
-                <on_enable function="textfield_translate_enable" />
-          </menu_item_call>
-          <menu_item_call label="Japanese" mouse_opaque="true"
-                        name="Translate Text" >
-                <on_click function="textfield_translate" translate="true" userdata="ja" />
-                <on_enable function="textfield_translate_enable" />
-          </menu_item_call>
-          <menu_item_call label="Korean" mouse_opaque="true"
-                        name="Translate Text" >
-                <on_click function="textfield_translate" translate="true" userdata="ko" />
-                <on_enable function="textfield_translate_enable" />
-          </menu_item_call>
-        </menu>
+<menu name="Text Edit Menu">
+  <menu_item_call label="剪切" name="Cut Text" />
+  <menu_item_call label="�制" name="Copy Text" />
+  <menu_item_call label="粘贴" name="Paste Text" />
+  <menu_item_call label="删除" name="Delete Text" />
+  <menu_item_call label="全选" name="Select All Text" />
+  <menu name="Translation Options" label="翻译为...">
+  <!--
+    <menu_item_call label="英语" name="Translate Text" />
+    <menu_item_call label="丹麦语" name="Translate Text" />
+    <menu_item_call label="德语"  name="Translate Text" />
+    <menu_item_call label="西�牙语" name="Translate Text" />
+    <menu_item_call label="法语" name="Translate Text" /> 
+    <menu_item_call label="�大利语" name="Translate Text" />
+    <menu_item_call label="匈牙利语 " name="Translate Text" />
+    <menu_item_call label="�兰语" name="Translate Text" />
+    <menu_item_call label="波兰语" name="Translate Text" />
+    <menu_item_call label="葡�牙语" name="Translate Text" />
+    <menu_item_call label="俄语" name="Translate Text" />
+    <menu_item_call label="土耳其语" name="Translate Text" />
+    <menu_item_call label="乌克兰语" name="Translate Text" />
+    <menu_item_call label="中文" name="Translate Text" />
+    <menu_item_call label="日语" name="Translate Text" />
+    <menu_item_call label="韩语/�鲜语" name="Translate Text" />
+  -->
+  </menu>
 </menu>
+
+
diff --git a/linden/indra/newview/skins/default/xui/zh/menu_viewer.xml b/linden/indra/newview/skins/default/xui/zh/menu_viewer.xml
index 0a2ea1b..b18bbde 100644
--- a/linden/indra/newview/skins/default/xui/zh/menu_viewer.xml
+++ b/linden/indra/newview/skins/default/xui/zh/menu_viewer.xml
@@ -2,15 +2,19 @@
 <menu_bar name="Main Menu">
         <menu label="文件" name="File">
                 <tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~"/>
-                <menu label="上传" name="upload">
-                        <menu_item_call label="图�（L$[COST]）..." name="Upload Image"/>
-                        <menu_item_call label="声音（L$[COST]）..." name="Upload Sound"/>
-                        <menu_item_call label="动画（L$[COST]）..." name="Upload Animation"/>
-                        <menu_item_call label="大宗（�份需付L$[COST]）..." name="Bulk Upload"/>
-                        <menu_item_separator label="-----------" name="separator"/>
+                <menu label="上传" name="Upload">
+                        <menu_item_call label="上传图� ([UPLOADFEE])..." name="Upload Image"/>
+                        <menu_item_call label="上传声音 ([UPLOADFEE])..." name="Upload Sound"/>
+                        <menu_item_call label="上传动画 ([UPLOADFEE])..." name="Upload Animation"/>
+                        <menu_item_call label="批�上传 (�个文件需 [UPLOADFEE])..." name="Bulk Upload"/>
                         <menu_item_call label="设置默认��..." name="perm prefs"/>
                 </menu>
-                <menu_item_separator label="-----------" name="separator"/>
+                <menu_item_call label="导入物体..." name="Import" />
+                <menu_item_call label="导入并上传... (�个�质 [UPLOADFEE])" name="ImportUpload" />
+                <menu_item_call label="导出所选物体..." name="Export" />
+                <menu_item_call
+                 name="Minimize All Windows"
+                 label="最�化所有窗�" />       
                 <menu_item_call label="关闭窗�" name="Close Window"/>
                 <menu_item_call label="关闭所有窗�" name="Close All Windows"/>
                 <menu_item_separator label="-----------" name="separator2"/>
@@ -49,15 +53,20 @@
                         <menu_item_call label="内衣" name="Menu Undershirt"/>
                         <menu_item_call label="内裤" name="Menu Underpants"/>
                         <menu_item_call label="裙�" name="Skirt"/>
+                        <menu_item_call label="纹身" name="Tattoo" />
+                        <menu_item_call label="�明度蒙�" name="Alpha" />
                         <menu_item_call label="所有�饰" name="All Clothes"/>
                 </menu>
                 <menu_item_separator label="-----------" name="separator6"/>
-                <menu_item_call label="动作..." name="Gestures..."/>
+                <menu_item_call label="动作..." name="Gestures"/>
                 <menu_item_call label="档案..." name="Profile..."/>
                 <menu_item_call label="外观..." name="Appearance..."/>
-                <menu_item_separator label="-----------" name="separator7"/>
-                <menu_item_check label="朋�..." name="Friends..."/>
-                <menu_item_call label="社团..." name="Groups..."/>
+                <menu_item_call label="显示�称..." name="Display Name..." />
+                <menu_item_call label="刷新外观" name="Refresh Appearance" />
+                <menu_item_separator label="-----------" name="separator7" />
+                <menu_item_check label="好�..." name="Friends"/>
+                <menu_item_call label="社团..." name="Groups"/>
+                <menu_item_check label="媒体过滤" name="Media Filter" />
                 <menu_item_separator label="-----------" name="separator8"/>
                 <menu_item_call label="�数设置..." name="Preferences..."/>
         </menu>
@@ -69,17 +78,20 @@
                 <menu_item_call label="�新设置视角" name="Reset View"/>
                 <menu_item_call label="查看最�一次�天者" name="Look at Last Chatter"/>
                 <menu_item_separator label="-----------" name="separator"/>
+                <menu_item_check label="网络�览器" name="Web Browser" />
                 <menu_item_check label="工具�" name="Toolbar"/>
                 <menu_item_check label="�天记录" name="Chat History"/>
                 <menu_item_check label="�时消�" name="Instant Message"/>
                 <menu_item_check label="库存" name="Inventory"/>
                 <menu_item_check label="活跃的说�人" name="Active Speakers"/>
                 <menu_item_check label="�蔽��" name="Mute List"/>
+                <menu_item_check label="瞬间移动历�" name="Teleport History" />
                 <menu_item_separator label="-----------" name="separator2"/>
                 <menu_item_check label="摄�头控制" name="Camera Controls"/>
                 <menu_item_check label="移动控制" name="Movement Controls"/>
                 <menu_item_check label="世界地图" name="World Map"/>
                 <menu_item_check label="迷你地图" name="Mini-Map"/>
+                <menu_item_check label="动画覆盖" name="AO" />
                 <menu_item_separator label="-----------" name="separator3"/>
                 <menu_item_check label="统计�" name="Statistics Bar"/>
                 <menu_item_check label="地�边线" name="Property Lines"/>
@@ -97,11 +109,14 @@
                 <menu_item_check label="��粒�" name="Hide Particles"/>
                 <menu_item_check label="显示界�附件" name="Show HUD Attachments"/>
                 <menu_item_separator label="-----------" name="separator5"/>
-                <menu_item_call label="缩�" name="Zoom In"/>
-                <menu_item_call label="默认缩放" name="Zoom Default"/>
-                <menu_item_call label="放大" name="Zoom Out"/>
                 <menu_item_separator label="-----------" name="separator6"/>
                 <menu_item_call label="切�全�状�" name="Toggle Fullscreen"/>
+                <menu label="缩放" name="Zoom Level">
+                        <menu_item_call label="缩�" name="Zoom In"/>
+                        <menu_item_call label="默认缩放" name="Zoom Default"/>
+                        <menu_item_call label="放大" name="Zoom Out"/>
+                </menu>
+                <menu_item_check name="Toggle Advanced Menu" label="高级��"/>
                 <menu_item_call label="设置用户界�尺寸为默认值" name="Set UI Size to Default"/>
         </menu>
         <menu label="世界" name="World">
@@ -115,18 +130,19 @@
                 <menu_item_call label="瞬间移动回家" name="Teleport Home"/>
                 <menu_item_separator label="-----------" name="separator3"/>
                 <menu_item_call label="设�离开状�" name="Set Away"/>
-                <menu_item_call label="设��忙状�" name="Set Busy"/>
+                <menu_item_call label="设�忙碌状�" name="Set Busy"/>
+                <menu_item_check label="自动回��时消�" name="Auto-Respond to IMs" />
                 <menu_item_call label="�止化身动画" name="Stop Animating My Avatar"/>
                 <menu_item_call label="释放按键" name="Release Keys"/>
                 <menu_item_separator label="-----------" name="separator4"/>
                 <menu_item_call label="�户历�纪录..." name="Account History..."/>
                 <menu_item_call label="管�我的�户..." name="Manage My Account..."/>
-                <menu_item_call label="è´­ä¹° L$..." name="Buy and Sell L$..."/>
+                <menu_item_call label="è´­ä¹° [CURRENCY]..." name="Buy and Sell L$..."/>
                 <menu_item_separator label="-----------" name="separator5"/>
-                <menu_item_call label="我的土地..." name="My Land..."/>
-                <menu_item_call label="关于土地..." name="About Land..."/>
+                <menu_item_call label="我的土地..." name="My Land"/>
+                <menu_item_call label="关于土地..." name="About Land"/>
                 <menu_item_call label="购买土地..." name="Buy Land..."/>
-                <menu_item_call label="地区/地产..." name="Region/Estate..."/>
+                <menu_item_call label="地区/地产..." name="Region/Estate"/>
                 <menu_item_separator label="-----------" name="separator6"/>
                 <menu label="环境设置" name="Environment Settings">
                         <menu_item_call label="日出" name="Sunrise"/>
@@ -146,28 +162,34 @@
                         <menu_item_call label="土地" name="Land"/>
                 </menu>
                 <menu_item_separator label="-----------" name="separator"/>
-                <menu_item_check label="�选择我的物体" name="Select Only My Objects"/>
-                <menu_item_check label="�选择�移动的物体" name="Select Only Movable Objects"/>
-                <menu_item_check label="选中包围区域" name="Select By Surrounding"/>
-                <menu_item_check label="显示��的选中项" name="Show Hidden Selection"/>
-                <menu_item_check label="显示选择项的光照�径" name="Show Light Radius for Selection"/>
-                <menu_item_check label="显示选择导引" name="Show Selection Beam"/>
+                <menu label="选择选项" name="Selection Options">
+                        <menu_item_check label="�选择我的物体" name="Select Only My Objects"/>
+                        <menu_item_check label="�选择�移动的物体" name="Select Only Movable Objects"/>
+                        <menu_item_check label="�选择��制的物体" name="Select Only Copyable Objects" />
+                        <menu_item_check label="包围选择" name="Select By Surrounding" />
+                        <menu_item_check label="显示��的选中项" name="Show Hidden Selection"/>
+                        <menu_item_check label="显示选中项轮廓" name="Show Selection Outlines" />
+                        <menu_item_check label="显示选中项的光照�径" name="Show Light Radius for Selection"/>
+                        <menu_item_check label="显示选择导引" name="Show Selection Beam"/>
+                </menu>
+
                 <menu_item_separator label="-----------" name="separator2"/>
                 <menu_item_check label="对�到网格" name="Snap to Grid"/>
                 <menu_item_call label="在 XY �上对�网格" name="Snap Object XY to Grid"/>
                 <menu_item_call label="以选项作为网格" name="Use Selection for Grid"/>
-                <menu_item_call label="网格选项..." name="Grid Options..."/>
+                <menu_item_call label="高级建造选项..." name="Advanced Build Options..."/>
                 <menu_item_separator label="-----------" name="separator3"/>
-                <menu_item_check label="编辑链接部件" name="Edit Linked Parts" shortcut=""/>
+                <menu_item_check label="编辑链接部件" name="Edit Linked Parts" />
+                <menu_item_check label="选择链接部件" name="Select Linked Parts" />
                 <menu_item_call label="链接" name="Link"/>
                 <menu_item_call label="解除链接" name="Unlink"/>
                 <menu_item_separator label="-----------" name="separator4"/>
                 <menu_item_call label="�焦于所选物体" name="Focus on Selection"/>
                 <menu_item_call label="缩放到所选物体" name="Zoom to Selection"/>
-                <menu_item_call label="购买物体" name="Menu Object Take">
-                        <on_enable userdata="è´­ä¹°,æ‹¿èµ°" name="EnableBuyOrTake"/>
-                </menu_item_call>
+                <menu_item_call label="创建副本" name="Duplicate" />
+                <menu_item_call label="购买物体" name="Menu Object Take" />
                 <menu_item_call label="拿走副本" name="Take Copy"/>
+                <menu_item_call label="归还物体" name="Return..." />
                 <menu_item_call label="将物体存回至物体内容" name="Save Object Back to Object Contents"/>
                 <menu_item_separator label="-----------" name="separator6"/>
                 <menu_item_call label="显示脚本警告/错误窗�" name="Show Script Warning/Error Window"/>
@@ -178,17 +200,30 @@
                 <menu_item_call label="�置所选项中脚本" name="Reset Scripts in Selection"/>
                 <menu_item_call label="设置所选项中脚本�行" name="Set Scripts to Running in Selection"/>
                 <menu_item_call label="设置所选项中脚本��行" name="Set Scripts to Not Running in Selection"/>
+                <menu_item_call
+                         name="Set permissions on selected task inventory"
+                         label="批�设置��"/>
         </menu>
         <menu label="帮助" name="Help">
                 <menu_item_call label="第二人生帮助" name="Second Life Help"/>
                 <menu_item_call label="教程" name="Tutorial"/>
                 <menu_item_separator label="-----------" name="separator"/>
-                <menu_item_call label="官方林登�客..." name="Official Linden Blog..."/>
+                <menu_item_call label="Imprudence 网络日志" name="Imprudence Blog" />
+                <menu_item_call label="Imprudence 论�" name="Imprudence Forums" />
+                <menu_item_call label="脚本�考首页" name="Scripting Portal">
+                        <!--
+                        <on_click 
+                                function="PromptShowURL" 
+                                name="ScriptingPortal_url"
+                                userdata="WebLaunchLSLWiki,http://wiki.secondlife.com/wiki/LSL_Portal/zh-Hans" />
+                        -->
+                </menu_item_call>
+
                 <menu_item_separator label="-----------" name="separator2"/>
                 <menu_item_call label="脚本 Wiki 门户..." name="Scripting Portal..."/>
                 <menu_item_separator label="-----------" name="separator3"/>
                 <menu_item_call label="报告�良行为..." name="Report Abuse..."/>
-                <menu_item_call label="颠簸，推动和碰撞..." name="Bumps, Pushes &amp;amp; Hits..."/>
+                <menu_item_call label="颠簸，推动和碰撞..." name="Bumps, Pushes &amp; Hits"/>
                 <menu_item_call label="延迟计�器" name="Lag Meter"/>
                 <menu create_jump_keys="true" drop_shadow="true" label="错误汇报" name="Bug Reporting" opaque="true" tear_off="true">
                         <menu_item_call label="公开 Issue Tracker..." name="Public Issue Tracker..."/>
@@ -199,6 +234,324 @@
                         <menu_item_call label="质��� Wiki..." name="QA Wiki..."/>
                         <menu_item_call label="汇报错误..." name="Report Bug..."/>
                 </menu>
-                <menu_item_call label="关于第二人生 meta-impy..." name="About meta-impy..."/>
         </menu>
+        
+        <menu label="高级" name="Advanced">
+                <!-- CONSOLES -->
+                <menu name="Consoles" label="控制�">
+                        <menu_item_check name="Frame Console" label="帧控制�" />
+                        <menu_item_check name="Texture Console" label="�质控制�" />
+                        <menu_item_check name="Debug Console" label="调试信�" />
+                        <menu_item_check name="Fast Timers" label="快速计时器" />
+                        <!-- Requires compiled-in support, I think?
+        <menu_item_check name="Memory" label="Memory"
+                                         shortcut="control|shift|0">
+                <on_click function="Advanced.ToggleConsole"
+                                userdata="memory" />
+                <on_check function="Advanced.CheckConsole"
+                                userdata="memory" />
+        </menu_item_check>
+        -->
+                        <menu_item_call name="Notifications Console" label="�示控制�" />
+                        <menu_item_call name="Message Log" label="消�日志" />
+                        <menu_item_call name="Message Builder" label="消�建筑器" />
+                        <menu_item_call name="Region Info to Debug Console" label="区域信�到调试控制�" />
+                        <menu_item_call name="Group Info to Debug Console" label="社团信�到调试控制�" />
+                        <menu_item_call name="Capabilities Info to Debug Console" label="Capabilities 信�到调试控制�" />
+                </menu>
+                <menu_item_call name="Reload personal setting overrides" label="�新载入个人设置" />
+                <!-- HUD INFO -->
+                <menu name="HUD Info" label="HUD 信�">
+                        <menu_item_check name="Velocity" label="速度" />
+                        <menu_item_check name="Camera" label="摄�机" />
+                        <menu_item_check name="Wind" label="风" />
+                        <!--Field of View-->
+                        <menu_item_check name="FOV" label="FOV" />
+                </menu>
+                <menu_item_call label="�在地上" name="Ground Sit" />
+                <menu_item_call name="Teleport to Ground" label="瞬间移动到地�" />
+                <menu_item_check label="幻影化身" name="Phantom" />
+                <menu_item_check label="动画列表" name="Animation List" />
+                <menu_item_check label="全功能雷达" name="Full Radar" />
+                <menu_item_check label="区域物体�索" name="Area Object Search" />
+                <menu_item_check label="资产�览器" name="asset browser" />
+                <!-- RENDERING -->
+                <menu name="Rendering" label="渲染">
+                        <!-- TYPES -->
+                        <menu name="Types" label="类型">
+                                <menu_item_check name="Simple" label="简�" />
+                                <menu_item_check name="Alpha" label="�明度" />
+                                <menu_item_check name="Tree" label="树木" />
+                                <menu_item_check name="Character" label="人物" />
+                                <menu_item_check name="SurfacePatch" label="SurfacePatch" />
+                                <menu_item_check name="Sky" label="天空" />
+                                <menu_item_check name="Water" label="水�" />
+                                <menu_item_check name="Ground" label="地�" />
+                                <menu_item_check name="Volume" label="体积" />
+                                <menu_item_check name="Grass" label="�木" />
+                                <menu_item_check name="Clouds" label="云层" />
+                                <menu_item_check name="Particles" label="ç²’å­�" />
+                                <menu_item_check name="Bump" label="凹凸贴图" />
+                        </menu>
+                        <!-- FEATURES -->
+                        <menu name="Features" label="特�">
+                                <menu_item_check name="UI" label="界�" />
+                                <menu_item_check name="Selected" label="选中项" />
+                                <menu_item_check name="Highlighted" label="高亮" />
+                                <menu_item_check name="Dynamic Textures" label="动��质" />
+                                <menu_item_check name="Foot Shadows" label="脚阴影" />
+                                <menu_item_check name="Fog" label="雾" />
+                                <menu_item_check name="Test FRInfo" label="测试 FRInfo" />
+                                <menu_item_check name="Flexible Objects" label="活动物体" />
+                        </menu>
+                        <!-- INFO DISPLAYS -->
+                        <menu name="Info Displays" label="信�显示">
+                                <menu_item_check name="Verify" label="验�" />
+                                <menu_item_check name="BBoxes" label="包围盒" />
+                                <menu_item_check name="Points" label="点" />
+                                <menu_item_check name="Octree" label="八�树" />
+                                <menu_item_check name="Occlusion" label="�蔽" />
+                                <menu_item_check name="Render Batches" label="渲染批次" />
+                                <menu_item_check name="Animated Textures" label="�质动画" />
+                                <menu_item_check name="Texture Priority" label="�质优先级" />
+                                <menu_item_check name="Avatar Rendering Cost" label="化身渲染开销" />
+                                <menu_item_check name="Texture Area (sqrt(A))" label="�质�积 (sqrt(A))" />
+                                <menu_item_check name="Face Area (sqrt(A))" label="表��积 (sqrt(A))" />
+                                <menu_item_check name="Pick Render" label="选�渲染" />
+                                <menu_item_check name="Lights" label="光�" />
+                                <menu_item_check name="Particles" label="ç²’å­�" />
+                                <menu_item_check name="Composition" label="Composition" />
+                                <menu_item_check name="Glow" label="�光" />
+                                <menu_item_check name="Raycasting" label="光线投射" />
+                                <menu_item_check name="Sculpt" label="雕塑元件" />
+                                <menu_item_check name="Vectorize Perf Test" label="��化性能测试" />
+                        </menu>
+                        <!-- RENDER TESTS -->
+                        <menu name="Render Tests" label="渲染测试">
+                                <menu_item_check name="Camera Offset" label="摄�机�移" />
+                                <menu_item_check name="Randomize Framerate" label="�机化帧率" />
+                                <menu_item_check name="Periodic Slow Frame" label="周期性�慢帧" />
+                                <menu_item_check name="Frame Test" label="帧测试" />
+                        </menu>
+                        <menu_item_check name="Axes" label="è½´" />
+                        <menu_item_check name="Hide Selected" label="��选中项" />
+                        <menu_item_check name="Tangent Basis" label="切�基础" />
+                        <menu_item_call name="Selected Texture Info" label="选中的�质信�" />
+                        <menu_item_check name="Wireframe" label="线框" />
+                        <menu_item_check name="Object-Object Occlusion" label="对象对对象�蔽" />
+                        <menu_item_check name="Debug GL" label="调试 GL" />
+                        <menu_item_check name="Debug Pipeline" label="调试�水线" />
+                        <menu_item_check name="Fast Alpha" label="快速�明度" />
+                        <menu_item_check name="Animate Trees" label="树木动画" />
+                        <menu_item_check name="Animate Textures" label="�质动画" />
+                        <menu_item_check name="Disable Textures" label="�用�质" />
+                        <!-- Disabled because it doesn't seem to be used anymore.
+        <menu_item_check name="HTTP Get Textures"
+                                         label="HTTP Get Textures">
+                <on_click function="ToggleControl"
+                                userdata="ImagePipelineUseHTTP" />
+                <on_check control="ImagePipelineUseHTTP" />
+        </menu_item_check>
+        -->
+                        <menu_item_check name="Run Multiple Threads" label="�行多个线程" />
+                        <!-- Disabled because it doesn't work very well?
+        <menu_item_check name="Dynamic Reflections"
+                                         label="Dynamic Reflections">
+                <on_click function="ToggleControl"
+                                userdata="RenderDynamicReflections" />
+                <on_check control="RenderDynamicReflections" />
+        </menu_item_check>
+        -->
+                        <menu_item_check name="Cheesy Beacon" label="给力的信标" />
+                        <menu_item_check name="Attached Lights" label="装备的光�" />
+                        <menu_item_check name="Attached Particles" label="装备的粒��" />
+                </menu>
+                <!-- WORLD -->
+                <menu name="World" label="世界">
+                        <!-- Disabled because you can't do this in Windlight.
+        <menu_item_check name="Mouse Moves Sun"
+                                         label="Mouse Moves Sun"
+                                         shortcut="control|alt|M">
+                <on_click function="ToggleControl" userdata="MouseSun" />
+                <on_check control="MouseSun" />
+        </menu_item_check>
+        -->
+                        <menu_item_check name="Sim Sun Override" label="模拟器太阳覆盖" />
+                        <menu_item_call name="Dump Scripted Camera" label="脚本摄�机控制转储" />
+                        <menu_item_check name="Fixed Weather" label="固定天气" />
+                        <menu_item_call name="Dump Region Object Cache" label="转储区域物体缓存" />
+                </menu>
+                <!-- RLVa -->
+                <menu name="RLVa">
+                        <menu name="Debug" label="调试">
+                                <menu_item_check name="Show Debug Messages" label="显示调试信�" />
+                                <menu_item_check name="Enable Legacy Naming" label="�用旧�命�" />
+                        </menu>
+                        <menu_item_check name="Enable Wear" label="�用穿�" />
+                        <menu_item_check name="Hide locked layers" label="���定的衣物层次" />
+                        <menu_item_check name="Hide locked attachments" label="���定的附件" />
+                        <!--
+        <menu_item_check name="Hide locked inventory"
+                                         label="Hide locked inventory">
+                <on_click function="ToggleControl"
+                                userdata="RLVaHideLockedInventory" />
+                <on_check control="RLVaHideLockedInventory" />
+        </menu_item_check>
+        -->
+                        <menu_item_check name="Forbid Give to #RLV" label="�止给与到 #RLV" />
+                        <menu_item_check name="Show Name Tags" label="显示姓�标签" />
+                        <menu_item_call name="Restrictions..." label="�制..." />
+                </menu>
+                <!-- UI -->
+                <menu name="UI" label="界�">
+                        <menu_item_check name="Use default system color picker" label="使用系统默认颜色选择器" />
+                        <menu_item_check name="Show search panel in overlay bar" label="覆盖�中显示�索��" />
+                        <menu_item_call name="Reload Balance" label="�新载入 [CURRENCY] 余�" />
+                        <menu_item_call name="Web Browser Test" label="网络�览器测试" />
+                        <!--
+                 *TODO: Make this a proper toggle item with the "X" indicator.
+                 1. Add a "Advanced.CheckEditableUI" function in llviewermenu.cpp.
+                 2. Change this surrounding menu_item_call to a menu_item_check.
+                 3. Uncomment the "on_check" line below.
+                -->
+                        <menu_item_call name="Editable UI" label="�编辑的用户界�">
+                                <!--
+                <on_check function="Advanced.CheckEditableUI" userdata="" />
+                -->
+                        </menu_item_call>
+                        <menu_item_call name="Dump SelectMgr" label="转储 SelectMgr" />
+                        <menu_item_call name="Dump Inventory" label="转储库存" />
+                        <menu_item_call name="Dump Focus Holder" label="转储焦点�有者" />
+                        <menu_item_call name="Print Selected Object Info" label="打�选中物体信�" />
+                        <menu_item_call name="Print Agent Info" label="打� Agent 信�" />
+                        <menu_item_call name="Memory Stats" label="内存状�" />
+                        <menu_item_call name="Clear Cached Group Info" label="清除缓存的社团信�" />
+                        <menu_item_check name="Debug SelectMgr" label="调试 SelectMgr" />
+                        <menu_item_check name="Debug Clicks" label="调试点击" />
+                        <menu_item_check name="Debug Views" label="调试视图" />
+                        <menu_item_check name="Show Name Tooltips" label="显示�称�示" />
+                        <menu_item_check name="Debug Mouse Events" label="调试鼠标事件" />
+                        <menu_item_check name="Debug Keys" label="调试键盘" />
+                        <menu_item_check name="Debug WindowProc" label="调试 WindowProc" />
+                        <menu_item_check name="Debug Text Editor Tips" label="调试文本编辑器�示" />
+                        <menu_item_check name="Show Time" label="显示时间" />
+                        <menu_item_check name="Show Render Info" label="显示渲染信�" />
+                        <menu_item_check name="Show Matrices" label="显示矩阵" />
+                        <menu_item_check name="Show Color Under Cursor" label="显示指针之下的颜色" />
+                </menu>
+                <!-- XUI -->
+                <menu name="XUI">
+                        <menu_item_call name="Floater Test" label="浮动框测试" />
+                        <menu_item_call name="Font Test" label="字体测试" />
+                        <menu_item_call name="Export Menus to XML..." label="导出��到 XML..." />
+                        <menu_item_call name="Edit UI..." label="编辑界�..." />
+                        <menu_item_call name="Load from XML..." label="从 XML 读�..." />
+                        <menu_item_call name="Save to XML..." label="�存到 XML..." />
+                        <menu_item_check name="Show XUI Names" label="显示 XUI �称" />
+                </menu>
+                <!-- CHARACTER -->
+                <menu name="Character" label="人物">
+                        <menu name="Grab Baked Texture" label="获�烘烤�质">
+                                <menu_item_call name="Iris" label="瞳孔" />
+                                <menu_item_call name="Head" label="头部" />
+                                <menu_item_call name="Upper Body" label="上身" />
+                                <menu_item_call name="Lower Body" label="下身" />
+                                <menu_item_call name="Skirt" label="裙�" />
+                        </menu>
+                        <!-- CHARACTER TESTS -->
+                        <menu name="Character Tests" label="人物测试">
+                                <menu_item_call name="Appearance To XML" label="外观到 XML" />
+                                <menu_item_call name="Toggle Character Geometry" label="切�角色几何" />
+                                <menu_item_call name="Test Male" label="测试男性" />
+                                <menu_item_call name="Test Female" label="测试女性" />
+                                <menu_item_call name="Toggle PG" label="测试未�年模�" />
+                                <menu_item_check name="Allow Select Avatar" label="�许选择化身" />
+                        </menu>
+                        <menu_item_check name="Enable Lip Sync (Beta)" label="�用�型�步 (测试)" />
+                        <menu_item_check name="Tap-Tap-Hold To Run" label="�敲并按�跑步" />
+                        <menu_item_call name="Force Params to Default" label="强制�数到默认值" />
+                        <menu_item_call name="Reload Vertex Shader" label="�新载入顶点�色器" />
+                        <menu_item_check label="Animation Info" name="动画信�" />
+                        <!--
+                 *TODO: Make this a proper toggle item with the "X" indicator.
+                 1. Add a "Advanced.CheckSlowmotionAnimation" function in
+                 llviewermenu.cpp.
+                 2. Change this surrounding menu_item_call to a menu_item_check.
+                 3. Uncomment the "on_check" line below.
+        -->
+                        <menu_item_call name="Slow Motion Animations" label="慢动作动画" />
+                        <menu_item_check name="Show Look At" label="显示视线目标" />
+                        <menu_item_check name="Show Point At" label="显示指�目标" />
+                        <menu_item_check name="Private Look At" label="对他人��视线目标" />
+                        <menu_item_check name="Private Point At" label="对他人��指�目标" />
+                        <menu_item_check name="Debug Joint Updates" label="调试关节更新" />
+                        <menu_item_check name="Disable LOD" label="�用 LOD" />
+                        <menu_item_check name="Debug Character Vis" label="调试人物��性" />
+                        <!--  Disabled. See DEV-14477
+        <menu_item_check name="Show Collision Plane"
+                                         label="Show Collision Plane">
+                <on_click function="Advanced.ToggleShowCollisionPlane"
+                                userdata="" />
+                <on_check function="Advanced.CheckShowCollisionPlane"
+                                userdata="" />
+        </menu_item_check>
+        -->
+                        <menu_item_check name="Show Collision Skeleton" label="显示碰撞骨骼" />
+                        <menu_item_check name="Display Agent Target" label="显示 Agent 目标" />
+                        <menu_item_check name="Debug Rotation" label="调试旋转" />
+                        <menu_item_call name="Dump Attachments" label="打�附件" />
+                        <menu_item_call label="Reload Avatar Cloud Particle" name="�新加载化身云粒�" />
+                </menu>
+                <!-- CRASH -->
+                <menu name="Crash" label="崩溃">
+                        <menu_item_call name="Force Bad Memory Access" label="强制无效内存访问" />
+                        <menu_item_call name="Force LLError And Crash" label="强制 LLError 并崩溃" />
+                        <menu_item_call name="Force Infinite Loop" label="强制无�循环" />
+                        <menu_item_call name="Force Driver Crash" label="强制驱动程�崩溃" />
+                        <menu_item_call name="Force Disconnect Viewer" label="强制断开连接" />
+                        <menu_item_check name="Output Debug Minidump" label="输出调试�转储" />
+                </menu>
+                <!-- NETWORK -->
+                <menu name="Network" label="网络">
+                        <menu_item_call name="Enable Message Log" label="�用消�日志" />
+                        <menu_item_call name="Disable Message Log" label="�用消�日志" />
+                        <menu_item_check name="Velocity Interpolate Objects" label="物体速度�值" />
+                        <menu_item_check name="Ping Interpolate Object Positions" label="Ping Interpolate Object Positions" />
+                        <menu_item_call name="Drop a Packet" label="丢弃一个�包" />
+                </menu>
+                <!-- RECORDER -->
+                <menu name="Recorder" label="记录器">
+                        <menu_item_check name="Full Session Logging" label="录制整个会�" />
+                        <menu_item_call name="Start Logging" label="开始记录" />
+                        <menu_item_call name="Stop Logging" label="�止记录" />
+                        <menu_item_call name="Log 10 Seconds" label="记录 10 秒" />
+                        <menu_item_call name="Log 30 Seconds" label="记录 30 秒" />
+                        <menu_item_call name="Log 60 Seconds" label="记录 60 秒" />
+                        <menu_item_call name="Start Playback" label="开始播放" />
+                        <menu_item_call name="Stop Playback" label="�止播放" />
+                        <menu_item_check name="Loop Playback" label="循环播放" />
+                        <menu_item_call name="Start Record" label="开始录制" />
+                        <menu_item_call name="Stop Record" label="�止录制" />
+                </menu>
+                <!-- ADMIN OPTIONS -->
+                <menu name="Admin Options" label="管�员选项">
+                        <menu_item_check name="View Admin Options" label="显示管�员选项" />
+                        <menu_item_call name="Request Admin Status" label="请求管�员状�" />
+                        <menu_item_call name="Leave Admin Status" label="离开管�员状�" />
+                </menu>
+                <menu_item_check name="Show Updates" label="显示更新" />
+                <menu_item_check name="Quiet Snapshots to Disk" label="无声快照到�盘" />
+                <menu_item_call name="Compress Image..." label="压缩图�..." />
+                <menu_item_check name="Disable Max Build Constraints" label="�用建造尺寸最大�制" />
+                <menu_item_check name="Debug Permissions" label="调试��" />
+                <menu_item_check name="Mouse Smoothing" label="鼠标平滑" />
+                <menu_item_check name="Show Mouselook Crosshairs" label="显示第一人称视角准星" />
+                <menu_item_check name="Console Window" label="控制�窗�" />
+                <menu_item_check name="Restrained Love Support" label="Restrained Love 支�" />
+                <menu_item_check name="Allow Multiple Instances" label="�许多个实例" />
+                <menu_item_call name="Logout" label="登出 (�稳定)" />
+                <menu_item_call name="Debug Settings" label="调试设置" />
+        </menu>
+        
+        
 </menu_bar>
diff --git a/linden/indra/newview/skins/default/xui/zh/mime_types_linux.xml b/linden/indra/newview/skins/default/xui/zh/mime_types_linux.xml
new file mode 100644
index 0000000..3fedf28
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/zh/mime_types_linux.xml
@@ -0,0 +1,236 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<mimetypes name="default">
+        <widgetset name="web">
+                <label name="web_label">
+                        网页内容
+                </label>
+                <tooltip name="web_tooltip">
+                        该区域有网页内容
+                </tooltip>
+                <playtip name="web_playtip">
+                        显示网页内容
+                </playtip>
+        </widgetset>
+        <widgetset name="movie">
+                <label name="movie_label">
+                        影片
+                </label>
+                <tooltip name="movie_tooltip">
+                        这里�以播放影片
+                </tooltip>
+                <playtip name="movie_playtip">
+                        播放影片
+                </playtip>
+        </widgetset>
+        <widgetset name="none">
+                <label name="none_label">
+                        无内容
+                </label>
+                <tooltip name="none_tooltip">
+                        这里没有媒体
+                </tooltip>
+                <playtip name="none_playtip" />
+        </widgetset>
+        <widgetset name="image">
+                <label name="image_label">
+                        图�
+                </label>
+                <tooltip name="image_tooltip">
+                        这里有图�
+                </tooltip>
+                <playtip name="image_playtip">
+                        显示该�置的图�
+                </playtip>
+        </widgetset>
+        <widgetset name="audio">
+                <label name="audio_label">
+                        音频
+                </label>
+                <tooltip name="audio_tooltip">
+                        这里�以播放音频
+                </tooltip>
+                <playtip name="audio_playtip">
+                        播放该�置的音频
+                </playtip>
+        </widgetset>
+        <scheme name="rtsp">
+                <label name="rtsp_label">
+                        实时�媒体 (RTSP)
+                </label>
+        </scheme>
+        <mimetype name="blank">
+                <label name="blank_label">
+                        - æ—  -
+                </label>
+        </mimetype>
+        <mimetype name="none/none">
+                <label name="none/none_label">
+                        - æ—  -
+                </label>
+        </mimetype>
+        <mimetype name="audio/*">
+                <label name="audio2_label">
+                        音频
+                </label>
+        </mimetype>
+        <mimetype name="video/*">
+                <label name="video2_label">
+                        视频
+                </label>
+        </mimetype>
+        <mimetype name="image/*">
+                <label name="image2_label">
+                        图�
+                </label>
+        </mimetype>
+        <mimetype name="video/vnd.secondlife.qt.legacy">
+                <label name="vnd.secondlife.qt.legacy_label">
+                        影片 (QuickTime)
+                </label>
+        </mimetype>
+        <mimetype name="application/javascript">
+                <label name="application/javascript_label">
+                        Javascript
+                </label>
+        </mimetype>
+        <mimetype name="application/ogg">
+                <label name="application/ogg_label">
+                        Ogg 音频/视频
+                </label>
+        </mimetype>
+        <mimetype name="application/pdf">
+                <label name="application/pdf_label">
+                        PDF 文档
+                </label>
+        </mimetype>
+        <mimetype name="application/postscript">
+                <label name="application/postscript_label">
+                        Postscript 文档
+                </label>
+        </mimetype>
+        <mimetype name="application/rtf">
+                <label name="application/rtf_label">
+                        带格�化的文本 (RTF)
+                </label>
+        </mimetype>
+        <mimetype name="application/smil">
+                <label name="application/smil_label">
+                    �步多媒体集�语言 (SMIL)
+                </label>
+        </mimetype>
+        <mimetype name="application/xhtml+xml">
+                <label name="application/xhtml+xml_label">
+                        网页 (XHTML)
+                </label>
+        </mimetype>
+        <mimetype name="application/x-director">
+                <label name="application/x-director_label">
+                        Macromedia Director
+                </label>
+        </mimetype>
+        <mimetype name="application/x-shockwave-flash">
+                <label name="application/x-shockwave-flash_label">
+                        Flash
+                </label>
+        </mimetype>
+        <mimetype name="audio/mid">
+                <label name="audio/mid_label">
+                        音频 (MIDI)
+                </label>
+        </mimetype>
+        <mimetype name="audio/mpeg">
+                <label name="audio/mpeg_label">
+                        音频 (MP3)
+                </label>
+        </mimetype>
+        <mimetype name="audio/x-aiff">
+                <label name="audio/x-aiff_label">
+                        音频 (AIFF)
+                </label>
+        </mimetype>
+        <mimetype name="audio/x-wav">
+                <label name="audio/x-wav_label">
+                        音频 (WAV)
+                </label>
+        </mimetype>
+        <mimetype name="image/bmp">
+                <label name="image/bmp_label">
+                        图� (BMP)
+                </label>
+        </mimetype>
+        <mimetype name="image/gif">
+                <label name="image/gif_label">
+                        图� (GIF)
+                </label>
+        </mimetype>
+        <mimetype name="image/jpeg">
+                <label name="image/jpeg_label">
+                        图� (JPEG)
+                </label>
+        </mimetype>
+        <mimetype name="image/png">
+                <label name="image/png_label">
+                        图� (PNG)
+                </label>
+        </mimetype>
+        <mimetype name="image/svg+xml">
+                <label name="image/svg+xml_label">
+                        图� (SVG)
+                </label>
+        </mimetype>
+        <mimetype name="image/tiff">
+                <label name="image/tiff_label">
+                        图� (TIFF)
+                </label>
+        </mimetype>
+        <mimetype name="text/html">
+                <label name="text/html_label">
+                        网页
+                </label>
+        </mimetype>
+        <mimetype name="text/plain">
+                <label name="text/plain_label">
+                        文本
+                </label>
+        </mimetype>
+        <mimetype name="text/xml">
+                <label name="text/xml_label">
+                        XML
+                </label>
+        </mimetype>
+        <mimetype name="video/mpeg">
+                <label name="video/mpeg_label">
+                        影片 (MPEG)
+                </label>
+        </mimetype>
+        <mimetype name="video/mp4">
+                <label name="video/mp4_label">
+                        影片 (MP4)
+                </label>
+        </mimetype>
+        <mimetype name="video/x-m4v">
+                <label name="video/m4v_label">
+                        影片 (M4V)
+                </label>
+        </mimetype>
+        <mimetype name="video/quicktime">
+                <label name="video/quicktime_label">
+                        影片 (QuickTime)
+                </label>
+        </mimetype>
+        <mimetype name="video/x-ms-asf">
+                <label name="video/x-ms-asf_label">
+                        影片 (Windows Media ASF)
+                </label>
+        </mimetype>
+        <mimetype name="video/x-ms-wmv">
+                <label name="video/x-ms-wmv_label">
+                        影片 (Windows Media WMV)
+                </label>
+        </mimetype>
+        <mimetype name="video/x-msvideo">
+                <label name="video/x-msvideo_label">
+                        影片 (AVI)
+                </label>
+        </mimetype>
+</mimetypes>
diff --git a/linden/indra/newview/skins/default/xui/zh/mime_types_mac.xml b/linden/indra/newview/skins/default/xui/zh/mime_types_mac.xml
new file mode 100644
index 0000000..3fedf28
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/zh/mime_types_mac.xml
@@ -0,0 +1,236 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<mimetypes name="default">
+        <widgetset name="web">
+                <label name="web_label">
+                        网页内容
+                </label>
+                <tooltip name="web_tooltip">
+                        该区域有网页内容
+                </tooltip>
+                <playtip name="web_playtip">
+                        显示网页内容
+                </playtip>
+        </widgetset>
+        <widgetset name="movie">
+                <label name="movie_label">
+                        影片
+                </label>
+                <tooltip name="movie_tooltip">
+                        这里�以播放影片
+                </tooltip>
+                <playtip name="movie_playtip">
+                        播放影片
+                </playtip>
+        </widgetset>
+        <widgetset name="none">
+                <label name="none_label">
+                        无内容
+                </label>
+                <tooltip name="none_tooltip">
+                        这里没有媒体
+                </tooltip>
+                <playtip name="none_playtip" />
+        </widgetset>
+        <widgetset name="image">
+                <label name="image_label">
+                        图�
+                </label>
+                <tooltip name="image_tooltip">
+                        这里有图�
+                </tooltip>
+                <playtip name="image_playtip">
+                        显示该�置的图�
+                </playtip>
+        </widgetset>
+        <widgetset name="audio">
+                <label name="audio_label">
+                        音频
+                </label>
+                <tooltip name="audio_tooltip">
+                        这里�以播放音频
+                </tooltip>
+                <playtip name="audio_playtip">
+                        播放该�置的音频
+                </playtip>
+        </widgetset>
+        <scheme name="rtsp">
+                <label name="rtsp_label">
+                        实时�媒体 (RTSP)
+                </label>
+        </scheme>
+        <mimetype name="blank">
+                <label name="blank_label">
+                        - æ—  -
+                </label>
+        </mimetype>
+        <mimetype name="none/none">
+                <label name="none/none_label">
+                        - æ—  -
+                </label>
+        </mimetype>
+        <mimetype name="audio/*">
+                <label name="audio2_label">
+                        音频
+                </label>
+        </mimetype>
+        <mimetype name="video/*">
+                <label name="video2_label">
+                        视频
+                </label>
+        </mimetype>
+        <mimetype name="image/*">
+                <label name="image2_label">
+                        图�
+                </label>
+        </mimetype>
+        <mimetype name="video/vnd.secondlife.qt.legacy">
+                <label name="vnd.secondlife.qt.legacy_label">
+                        影片 (QuickTime)
+                </label>
+        </mimetype>
+        <mimetype name="application/javascript">
+                <label name="application/javascript_label">
+                        Javascript
+                </label>
+        </mimetype>
+        <mimetype name="application/ogg">
+                <label name="application/ogg_label">
+                        Ogg 音频/视频
+                </label>
+        </mimetype>
+        <mimetype name="application/pdf">
+                <label name="application/pdf_label">
+                        PDF 文档
+                </label>
+        </mimetype>
+        <mimetype name="application/postscript">
+                <label name="application/postscript_label">
+                        Postscript 文档
+                </label>
+        </mimetype>
+        <mimetype name="application/rtf">
+                <label name="application/rtf_label">
+                        带格�化的文本 (RTF)
+                </label>
+        </mimetype>
+        <mimetype name="application/smil">
+                <label name="application/smil_label">
+                    �步多媒体集�语言 (SMIL)
+                </label>
+        </mimetype>
+        <mimetype name="application/xhtml+xml">
+                <label name="application/xhtml+xml_label">
+                        网页 (XHTML)
+                </label>
+        </mimetype>
+        <mimetype name="application/x-director">
+                <label name="application/x-director_label">
+                        Macromedia Director
+                </label>
+        </mimetype>
+        <mimetype name="application/x-shockwave-flash">
+                <label name="application/x-shockwave-flash_label">
+                        Flash
+                </label>
+        </mimetype>
+        <mimetype name="audio/mid">
+                <label name="audio/mid_label">
+                        音频 (MIDI)
+                </label>
+        </mimetype>
+        <mimetype name="audio/mpeg">
+                <label name="audio/mpeg_label">
+                        音频 (MP3)
+                </label>
+        </mimetype>
+        <mimetype name="audio/x-aiff">
+                <label name="audio/x-aiff_label">
+                        音频 (AIFF)
+                </label>
+        </mimetype>
+        <mimetype name="audio/x-wav">
+                <label name="audio/x-wav_label">
+                        音频 (WAV)
+                </label>
+        </mimetype>
+        <mimetype name="image/bmp">
+                <label name="image/bmp_label">
+                        图� (BMP)
+                </label>
+        </mimetype>
+        <mimetype name="image/gif">
+                <label name="image/gif_label">
+                        图� (GIF)
+                </label>
+        </mimetype>
+        <mimetype name="image/jpeg">
+                <label name="image/jpeg_label">
+                        图� (JPEG)
+                </label>
+        </mimetype>
+        <mimetype name="image/png">
+                <label name="image/png_label">
+                        图� (PNG)
+                </label>
+        </mimetype>
+        <mimetype name="image/svg+xml">
+                <label name="image/svg+xml_label">
+                        图� (SVG)
+                </label>
+        </mimetype>
+        <mimetype name="image/tiff">
+                <label name="image/tiff_label">
+                        图� (TIFF)
+                </label>
+        </mimetype>
+        <mimetype name="text/html">
+                <label name="text/html_label">
+                        网页
+                </label>
+        </mimetype>
+        <mimetype name="text/plain">
+                <label name="text/plain_label">
+                        文本
+                </label>
+        </mimetype>
+        <mimetype name="text/xml">
+                <label name="text/xml_label">
+                        XML
+                </label>
+        </mimetype>
+        <mimetype name="video/mpeg">
+                <label name="video/mpeg_label">
+                        影片 (MPEG)
+                </label>
+        </mimetype>
+        <mimetype name="video/mp4">
+                <label name="video/mp4_label">
+                        影片 (MP4)
+                </label>
+        </mimetype>
+        <mimetype name="video/x-m4v">
+                <label name="video/m4v_label">
+                        影片 (M4V)
+                </label>
+        </mimetype>
+        <mimetype name="video/quicktime">
+                <label name="video/quicktime_label">
+                        影片 (QuickTime)
+                </label>
+        </mimetype>
+        <mimetype name="video/x-ms-asf">
+                <label name="video/x-ms-asf_label">
+                        影片 (Windows Media ASF)
+                </label>
+        </mimetype>
+        <mimetype name="video/x-ms-wmv">
+                <label name="video/x-ms-wmv_label">
+                        影片 (Windows Media WMV)
+                </label>
+        </mimetype>
+        <mimetype name="video/x-msvideo">
+                <label name="video/x-msvideo_label">
+                        影片 (AVI)
+                </label>
+        </mimetype>
+</mimetypes>
diff --git a/linden/indra/newview/skins/default/xui/zh/mime_types_windows.xml b/linden/indra/newview/skins/default/xui/zh/mime_types_windows.xml
new file mode 100644
index 0000000..3fedf28
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/zh/mime_types_windows.xml
@@ -0,0 +1,236 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<mimetypes name="default">
+        <widgetset name="web">
+                <label name="web_label">
+                        网页内容
+                </label>
+                <tooltip name="web_tooltip">
+                        该区域有网页内容
+                </tooltip>
+                <playtip name="web_playtip">
+                        显示网页内容
+                </playtip>
+        </widgetset>
+        <widgetset name="movie">
+                <label name="movie_label">
+                        影片
+                </label>
+                <tooltip name="movie_tooltip">
+                        这里�以播放影片
+                </tooltip>
+                <playtip name="movie_playtip">
+                        播放影片
+                </playtip>
+        </widgetset>
+        <widgetset name="none">
+                <label name="none_label">
+                        无内容
+                </label>
+                <tooltip name="none_tooltip">
+                        这里没有媒体
+                </tooltip>
+                <playtip name="none_playtip" />
+        </widgetset>
+        <widgetset name="image">
+                <label name="image_label">
+                        图�
+                </label>
+                <tooltip name="image_tooltip">
+                        这里有图�
+                </tooltip>
+                <playtip name="image_playtip">
+                        显示该�置的图�
+                </playtip>
+        </widgetset>
+        <widgetset name="audio">
+                <label name="audio_label">
+                        音频
+                </label>
+                <tooltip name="audio_tooltip">
+                        这里�以播放音频
+                </tooltip>
+                <playtip name="audio_playtip">
+                        播放该�置的音频
+                </playtip>
+        </widgetset>
+        <scheme name="rtsp">
+                <label name="rtsp_label">
+                        实时�媒体 (RTSP)
+                </label>
+        </scheme>
+        <mimetype name="blank">
+                <label name="blank_label">
+                        - æ—  -
+                </label>
+        </mimetype>
+        <mimetype name="none/none">
+                <label name="none/none_label">
+                        - æ—  -
+                </label>
+        </mimetype>
+        <mimetype name="audio/*">
+                <label name="audio2_label">
+                        音频
+                </label>
+        </mimetype>
+        <mimetype name="video/*">
+                <label name="video2_label">
+                        视频
+                </label>
+        </mimetype>
+        <mimetype name="image/*">
+                <label name="image2_label">
+                        图�
+                </label>
+        </mimetype>
+        <mimetype name="video/vnd.secondlife.qt.legacy">
+                <label name="vnd.secondlife.qt.legacy_label">
+                        影片 (QuickTime)
+                </label>
+        </mimetype>
+        <mimetype name="application/javascript">
+                <label name="application/javascript_label">
+                        Javascript
+                </label>
+        </mimetype>
+        <mimetype name="application/ogg">
+                <label name="application/ogg_label">
+                        Ogg 音频/视频
+                </label>
+        </mimetype>
+        <mimetype name="application/pdf">
+                <label name="application/pdf_label">
+                        PDF 文档
+                </label>
+        </mimetype>
+        <mimetype name="application/postscript">
+                <label name="application/postscript_label">
+                        Postscript 文档
+                </label>
+        </mimetype>
+        <mimetype name="application/rtf">
+                <label name="application/rtf_label">
+                        带格�化的文本 (RTF)
+                </label>
+        </mimetype>
+        <mimetype name="application/smil">
+                <label name="application/smil_label">
+                    �步多媒体集�语言 (SMIL)
+                </label>
+        </mimetype>
+        <mimetype name="application/xhtml+xml">
+                <label name="application/xhtml+xml_label">
+                        网页 (XHTML)
+                </label>
+        </mimetype>
+        <mimetype name="application/x-director">
+                <label name="application/x-director_label">
+                        Macromedia Director
+                </label>
+        </mimetype>
+        <mimetype name="application/x-shockwave-flash">
+                <label name="application/x-shockwave-flash_label">
+                        Flash
+                </label>
+        </mimetype>
+        <mimetype name="audio/mid">
+                <label name="audio/mid_label">
+                        音频 (MIDI)
+                </label>
+        </mimetype>
+        <mimetype name="audio/mpeg">
+                <label name="audio/mpeg_label">
+                        音频 (MP3)
+                </label>
+        </mimetype>
+        <mimetype name="audio/x-aiff">
+                <label name="audio/x-aiff_label">
+                        音频 (AIFF)
+                </label>
+        </mimetype>
+        <mimetype name="audio/x-wav">
+                <label name="audio/x-wav_label">
+                        音频 (WAV)
+                </label>
+        </mimetype>
+        <mimetype name="image/bmp">
+                <label name="image/bmp_label">
+                        图� (BMP)
+                </label>
+        </mimetype>
+        <mimetype name="image/gif">
+                <label name="image/gif_label">
+                        图� (GIF)
+                </label>
+        </mimetype>
+        <mimetype name="image/jpeg">
+                <label name="image/jpeg_label">
+                        图� (JPEG)
+                </label>
+        </mimetype>
+        <mimetype name="image/png">
+                <label name="image/png_label">
+                        图� (PNG)
+                </label>
+        </mimetype>
+        <mimetype name="image/svg+xml">
+                <label name="image/svg+xml_label">
+                        图� (SVG)
+                </label>
+        </mimetype>
+        <mimetype name="image/tiff">
+                <label name="image/tiff_label">
+                        图� (TIFF)
+                </label>
+        </mimetype>
+        <mimetype name="text/html">
+                <label name="text/html_label">
+                        网页
+                </label>
+        </mimetype>
+        <mimetype name="text/plain">
+                <label name="text/plain_label">
+                        文本
+                </label>
+        </mimetype>
+        <mimetype name="text/xml">
+                <label name="text/xml_label">
+                        XML
+                </label>
+        </mimetype>
+        <mimetype name="video/mpeg">
+                <label name="video/mpeg_label">
+                        影片 (MPEG)
+                </label>
+        </mimetype>
+        <mimetype name="video/mp4">
+                <label name="video/mp4_label">
+                        影片 (MP4)
+                </label>
+        </mimetype>
+        <mimetype name="video/x-m4v">
+                <label name="video/m4v_label">
+                        影片 (M4V)
+                </label>
+        </mimetype>
+        <mimetype name="video/quicktime">
+                <label name="video/quicktime_label">
+                        影片 (QuickTime)
+                </label>
+        </mimetype>
+        <mimetype name="video/x-ms-asf">
+                <label name="video/x-ms-asf_label">
+                        影片 (Windows Media ASF)
+                </label>
+        </mimetype>
+        <mimetype name="video/x-ms-wmv">
+                <label name="video/x-ms-wmv_label">
+                        影片 (Windows Media WMV)
+                </label>
+        </mimetype>
+        <mimetype name="video/x-msvideo">
+                <label name="video/x-msvideo_label">
+                        影片 (AVI)
+                </label>
+        </mimetype>
+</mimetypes>
diff --git a/linden/indra/newview/skins/default/xui/zh/notifications.xml b/linden/indra/newview/skins/default/xui/zh/notifications.xml
index 415e5e7..0596e76 100644
--- a/linden/indra/newview/skins/default/xui/zh/notifications.xml
+++ b/linden/indra/newview/skins/default/xui/zh/notifications.xml
@@ -4,12 +4,18 @@
   <!-- I think "Second Life" should not be localized, actually. -Jacek -->
   <!--
   <global name="SECOND_LIFE">
-    二人生
+    第二人生
   </global>
   -->
+  
+  <!-- *警告* *警告* *警告* -->
+
+  <!-- 在 Visual Studio 中自动缩进打开�编辑该文件将会导致界�排版错误� -->
+
+  <!-- *警告* *警告* *警告* -->
 
         <global name="skipnexttime">
-                下次���让我看这个了
+                下次��显示。
         </global>
         <global name="alwayschoose">
                 总是选择该选项
@@ -37,7 +43,7 @@
        name="OK"
        text="$yestext"/>
       <button
-       name="Cancel"
+       name="�消"
        text="$notext"/>
     </form>
   </template>
@@ -49,7 +55,7 @@
        text="$yestext"/>
       <button
        
-       name="Cancel"
+       name="�消"
        text="$notext"/>
       <ignore text="$ignoretext"/>
     </form>
@@ -61,7 +67,7 @@
        name="OK"
        text="$yestext"/>
       <button
-       name="Help"
+       name="帮助"
        text="$helptext"/>
     </form>
   </template>
@@ -69,18 +75,18 @@
   <template name="yesnocancelbuttons">
     <form>
       <button
-       name="Yes"
+       name="是"
        text="$yestext"/>
       <button
-       name="No"
+       name="�"
        text="$notext"/>
       <button
-       name="Cancel"
+       name="�消"
        text="$canceltext"/>
     </form>
   </template>
         <notification functor="GenericAcknowledge" label="未知警报" name="MissingAlert">
-                您的第[VIEWER_NAME]版本无法显示所接收到的讯�。
+                您的 [VIEWER_NAME] 版本无法显示所接收到的讯�。
 
 错误详情：无法在notifications.xml中找到‘[_NAME]’。
                 <usetemplate name="okbutton" yestext="确定"/>
@@ -103,7 +109,7 @@
                 <usetemplate name="okcancelbuttons" notext="�消" yestext="是"/>
         </notification>
         <notification name="BadInstallation">
-                第[VIEWER_NAME]�级错误。请从[VIEWER_SITE]�新下载安装最新版本。
+                 [VIEWER_NAME] �级错误。请从[VIEWER_SITE]�新下载安装最新版本。
     <usetemplate
      name="okbutton"
      yestext="确定"/>
@@ -262,33 +268,33 @@
 其他居民在观看你的档案的时候�以访问你所指定的URL。
         </notification>
         <notification name="JoinGroupCanAfford">
-                加入该社团需花费L$[COST]。
+                加入该社团需花费[CURRENCY][COST]。
 你愿�继续�？
                 <usetemplate name="okcancelbuttons" notext="�消" yestext="加入"/>
         </notification>
         <notification name="JoinGroupCannotAfford">
-                加入该社团需花费 L$[COST]。
-您拥有的 L$ �够。
+                加入该社团需花费 [CURRENCY][COST]。
+您拥有的 [CURRENCY] �够。
         </notification>
         <notification name="LandBuyPass">
-                花费 L$[COST] 你就�以进入这�土地(‘[PARCEL_NAME]’)
+                花费 [CURRENCY][COST] 你就�以进入这�土地(‘[PARCEL_NAME]’)
 [TIME]�时。是�购买通行�？
                 <usetemplate name="okcancelbuttons" notext="�消" yestext="购买"/>
         </notification>
         <notification name="SalePriceRestriction">
-                如果出售给任何人，出售价格必须 &gt; L$0。
-如果售价为L$0，请选定一个用户�售出。
+                如果出售给任何人，出售价格必须 &gt; [CURRENCY]0。
+如果售价为[CURRENCY]0，请选定一个用户�售出。
         </notification>
         <notification name="ConfirmLandSaleChange">
                 所选的 [LAND_SIZE]平方米土地正被设置为代售。
-你的售价将是为 L$[SALE_PRICE]并将被授�售给[NAME]。
+你的售价将是为 [CURRENCY][SALE_PRICE]并将被授�售给[NAME]。
                 <usetemplate name="okcancelbuttons" notext="�消" yestext="确定"/>
         </notification>
         <notification name="ConfirmLandSaleToAnyoneChange">
-                请注�： 点击 ‘售出给任何人’ 将使你的土地对整个第[GRID_NAME]社区开放，包括当��在这个地区中的人。
+                请注�： 点击 ‘售出给任何人’ 将使你的土地对整个 [GRID_NAME] 社区开放，包括当��在这个地区中的人。
 
 所选的 [LAND_SIZE]平方米土地正被设置为代售。
-你的售价将是为 L$[SALE_PRICE]并将被授�售给[NAME]。
+你的售价将是为 [CURRENCY][SALE_PRICE]并将被授�售给[NAME]。
                 <usetemplate name="okcancelbuttons" notext="�消" yestext="确定"/>
         </notification>
         <notification name="ReturnObjectsDeededToGroup">
@@ -512,7 +518,7 @@
                 无法写入文件 [[FILE]]
         </notification>
         <notification name="UnsupportedHardware">
-                警告： 您的系统没有满足第[VIEWER_NAME]的最低系统需求。如果您继续使用第[VIEWER_NAME]，您�能会得到糟糕的性能体验。�幸的是，我们无法为�支�的系统�备�供技术支�。
+                警告： 您的系统没有满足 [VIEWER_NAME] 的最低系统需求。如果您继续使用 [VIEWER_NAME] ，您�能会得到糟糕的性能体验。�幸的是，我们无法为�支�的系统�备�供技术支�。
 
 MINSPECS
 您希望访问 [_URL] 得到更多信��？
@@ -524,7 +530,7 @@ MINSPECS
         <notification name="UnknownGPU">
                 您的系统中安装了一个我们所�知�的显�。
 这�常�生于我们还没有�得�测试的新硬件上。
-第[VIEWER_NAME]将很�能正常�行，但您也许�
+ [VIEWER_NAME] 将很�能正常�行，但您也许�
 调节您的图形设定到更�适的水平上。
 (编辑 &gt; 首选项 &gt; 图�)。
                 <form name="form">
@@ -678,19 +684,24 @@ MINSPECS
 [FILE]
         </notification>
         <notification name="UnknownVorbisEncodeFailure">
-                对文件进行 Vorbis 编�时�生错误： [FILE]
+                对文件进行 Vorbis 编�时�生错误： 
+[FILE]
         </notification>
         <notification name="CannotEncodeFile">
-                无法编�文件[FILE]
+                无法编�文件
+[FILE]
         </notification>
         <notification name="CorruptResourceFile">
-                崩�的的资�文件： [FILE]
+                崩�的的资�文件： 
+[FILE]
         </notification>
         <notification name="UnknownResourceFileVersion">
-                未知的林登资�文件版本�现于文件： [FILE]
+                未知的林登资�文件版本�现于文件： 
+[FILE]
         </notification>
         <notification name="UnableToCreateOutputFile">
-                无法创建输出文件： [FILE]
+                无法创建输出文件： 
+[FILE]
         </notification>
         <notification name="DoNotSupportBulkAnimationUpload">
                 我们现在�支�大宗上传动画文件。
@@ -832,8 +843,13 @@ www.secondlife.com/support
                 无法购买土地：
 无法找到该土地所在区域。
         </notification>
+        <notification name="CannotBuyLandMaturity">
+                无法购买土地：
+
+你所能访问的/选择的�制级别��许你购买该土地。你�能首先需�在�数设定中更改你的�制级别。
+</notification>
         <notification name="CannotCloseFloaterBuyLand">
-                在第[GRID_NAME]完�对这次交易的估价�，
+                在 [GRID_NAME] 完�对这次交易的估价�，
 你�能关闭“购买土地�窗�。
         </notification>
         <notification name="CannotDeedLandNothingSelected">
@@ -908,8 +924,9 @@ www.secondlife.com/support
         </notification>
         <notification name="ReleaseLandWarning">
                 你将放弃�积为 [AREA] 平方米的土地。
-放弃该土地会将他从你拥有的土地中
-移走, �会兑��任何 L$。
+
+放弃该土地会将它从你�有的土地中
+去除, 但�会退还任何 [CURRENCY]。
 
 是�放弃土地？
                 <usetemplate name="okcancelbuttons" notext="�消" yestext="确定"/>
@@ -1001,6 +1018,7 @@ www.secondlife.com/support
         </notification>
         <notification name="CannotSaveToAssetStore">
                 无法储存 [NAME] 至中央资料�务器。
+                
 这通常�是临时的问题。请自定义��次�存。
 
 如果问题�然存在，请点击
@@ -1008,7 +1026,7 @@ www.secondlife.com/support
 您的网络设置的具体信�。
         </notification>
         <notification name="YouHaveBeenLoggedOut">
-                你已�退出[GRID_NAME]：
+                你已�被退出[GRID_NAME]：
 
 [MESSAGE]
 
@@ -1031,7 +1049,7 @@ www.secondlife.com/support
         <notification label="添加好�" name="AddFriendWithMessage">
                 好�间�以相互授�查看�自在地图上的�置和在线状�。
 
-加 [NAME] 为好��？
+是��议 [NAME] �为好�？
                 <form name="form">
                         <input name="message" type="text">
                                 您想�为我的好�么？
@@ -1069,7 +1087,7 @@ www.secondlife.com/support
                 你必须给分类广告设定一个�字。
         </notification>
         <notification name="MinClassifiedPrice">
-                广告刊登出价必须大于 L$[MIN_PRICE]。
+                广告刊登出价必须大于 [CURRENCY][MIN_PRICE]。
 
 请输入一个更高的价格。
         </notification>
@@ -1192,8 +1210,7 @@ www.secondlife.com/support
         </notification>
         <notification name="ClothingLoading">
                 你的装��在下载中。
-你现在�以按正常的使用这个世界，
-其他用户也�以看�你。
+你现在�以按正常地使用 [GRID_NAME]，其他用户也�以看�你。
                 <form name="form">
                         <ignore name="ignore" text="装�下载时间太长"/>
                 </form>
@@ -1208,7 +1225,7 @@ www.secondlife.com/support
                 <usetemplate name="okcancelbuttons" notext="继续" yestext="新�户..."/>
         </notification>
         <notification name="LoginPacketNeverReceived">
-                我们�到了一些连接上的麻烦。问题�能出在您的互�网连接，也�能出在第[GRID_NAME]的�务器。
+                我们�到了一些连接上的麻烦。问题�能出在您的互�网连接，也�能出在 [GRID_NAME] 的�务器。
 
 请几分钟��试, 或点击帮助连接我们的支�页�，或选择 “瞬间移动� ��试瞬间移动回家。
                 <form name="form">
@@ -1227,7 +1244,7 @@ www.secondlife.com/support
                 <usetemplate name="okcancelbuttons" notext="女性" yestext="男性"/>
         </notification>
         <notification name="NotEnoughCurrency">
-                [NAME] L$ [PRICE] 您没有足够的 L$ �这样�。
+                [NAME] [CURRENCY] [PRICE] 您没有足够的 [CURRENCY] �这样�。
         </notification>
         <notification name="GrantedModifyRights">
                 你已�被授予特�，你�以任�修改[FIRST_NAME] [LAST_NAME]的物体。
@@ -1282,17 +1299,17 @@ www.secondlife.com/support
                 <usetemplate name="okcancelbuttons" notext="�消" yestext="烘烤"/>
         </notification>
         <notification name="MaxAllowedAgentOnRegion">
-                你最多�能列出 [MAX_AGENTS]��许的居民。
+                你最多�能列出 [MAX_AGENTS] ��许的居民。
         </notification>
         <notification name="MaxBannedAgentsOnRegion">
                 你最多�能列出 [MAX_BANNED] ��止的居民。
         </notification>
         <notification name="MaxAgentOnRegionBatch">
                 �试添加 [NUM_ADDED] �代表时失败：
-超出 [LIST_TYPE] [MAX_AGENTS]�的�制 [NUM_EXCESS]�。
+超出 [LIST_TYPE] [MAX_AGENTS] �的�制 [NUM_EXCESS] �。
         </notification>
         <notification name="MaxAllowedGroupsOnRegion">
-                你�能有[MAX_GROUPS]个�许的社团。
+                你�能有 [MAX_GROUPS] 个�许的社团。
                 <usetemplate name="okcancelbuttons" notext="�消" yestext="烘烤"/>
         </notification>
         <notification name="MaxManagersOnRegion">
@@ -1330,7 +1347,7 @@ www.secondlife.com/support
                 <usetemplate name="okcancelbuttons" notext="继续" yestext="下载"/>
         </notification>
         <notification name="DownloadWindowsReleaseForDownload">
-                [VIEWER_NAME] 有新版本�用。
+                [VIEWER_NAME] 有新版本�用。     
 [MESSAGE]
 
 这个更新�是必须的，但我们建议下载并安装此更新，以改善性能和稳定性。
@@ -1364,7 +1381,7 @@ www.secondlife.com/support
         </notification>
         <notification name="DeedObjectToGroup">
                 转让此物体会导致社团：
-* 收到付给该物体的L$。
+* 收到付给该物体的 [CURRENCY]。
                 <usetemplate ignoretext="转让物体到社团" name="okcancelignore" notext="�消" yestext="转让"/>
         </notification>
         <notification name="WebLaunchExternalTarget">
@@ -1462,7 +1479,9 @@ www.secondlife.com/support
 一个旧社团, 或者拒�新社团邀请。
 离开社团请选择‘编辑’��下的
 ‘我的社团...’选项。
+
 [NAME]邀请你�为该社团�员。
+
 [INVITE]
                 <usetemplate name="okcancelbuttons" notext="谢�" yestext="加入"/>
         </notification>
@@ -1581,7 +1600,7 @@ www.secondlife.com/support
         <notification name="RegionEntryAccessBlocked">
                 您的�制级��许您访问此地区。这�能是由于您的年龄还没有被验�。
 
-请检查您的第[VIEWER_NAME]是�是最新版本并到知识库去了解有关区访问��和�制级的关系。
+请检查您的 [VIEWER_NAME] 是�是最新版本并到知识库去了解有关区访问��和�制级的关系。
     <usetemplate
      name="okbutton"
      yestext="确定"/>
@@ -1619,7 +1638,7 @@ www.secondlife.com/support
         <notification name="LandClaimAccessBlocked">
                 您的�制级��许您申请此地的产�。这�能是由于您还没有通过年龄验�。
 
-请检查您的第[VIEWER_NAME]是�是最新版本并到知识库去了解有关区访问��和�制级的关系。
+请检查您的 [VIEWER_NAME] 是�是最新版本并到知识库去了解有关区访问��和�制级的关系。
     <usetemplate
      name="okbutton"
      yestext="确定"/>
@@ -1653,7 +1672,7 @@ www.secondlife.com/support
         <notification name="LandBuyAccessBlocked">
                 您的�制级��许您购买此土地。这�能是由于您还没有通过年龄验�。
 
-请检查您的第[VIEWER_NAME]是�是最新版本并到知识库去了解有关区访问��和�制级的关系。
+请检查您的 [VIEWER_NAME] 是�是最新版本并到知识库去了解有关区访问��和�制级的关系。
     <usetemplate
      name="okbutton"
      yestext="确定"/>
@@ -1709,7 +1728,7 @@ www.secondlife.com/support
         <notification name="PublishClassified">
                 请�记： 分类广告费用�会退还。
 
-是�以L$[AMOUNT]�布广告？
+是�以 [CURRENCY][AMOUNT] �布广告？
                 <usetemplate name="okcancelbuttons" notext="�消" yestext="�布"/>
         </notification>
         <notification name="SetClassifiedMature">
@@ -1746,6 +1765,14 @@ www.secondlife.com/support
 
 默认： 关
         </notification>
+        <notification
+        label="最�年龄"
+ name="HelpRegionMinimumAge"
+ type="alertmodal">
+进入该地区的用户其账户必须至少已建立这么多天�能进入。
+
+默认: 0 (�用)
+</notification>
         <notification label="�定飞翔" name="HelpRegionBlockFly">
                 如果选择此项,无论�个地�设置如何，
 人们都�能在此区域内飞行。
@@ -1783,7 +1810,7 @@ www.secondlife.com/support
         <notification label="�制推动" name="HelpRegionRestrictPushObject">
                 设定所有区域为�制推动区。居民�能推动自己，或者由土地主人的脚本代�推动。
 
-(推动功能和llPushObject() LSL函数有关。)
+(推动指的是llPushObject() LSL函数。)
 
 默认： 关
         </notification>
@@ -1800,11 +1827,11 @@ www.secondlife.com/support
 
 默认： 选择
         </notification>
-        <notification label="Do Not Show In Search" name="HelpRegionSearch">
+        <notification label="�在�索中显示" name="HelpRegionSearch">
                 打开该选项将阻止地�拥有者在�索中列出他们的地�。
 默认：关
         </notification>
-        <notification label="更改区域的�人指数设定" name="RegionMaturityChange">
+        <notification label="更改区域的设定" name="RegionMaturityChange">
                 此区域内的�人内容等级已�更新。
 
 但是，世界地图更新时间需�大约5分钟，
@@ -1947,8 +1974,8 @@ www.secondlife.com/support
                 地产��是你委派的负责区域控制
 和地产调节的居民。 地产��
 有�改�控制�内任何调节项, 除了上传,
-下载, 和压缩地形。特别的, 他们有��许
-或�止居民进入你的地产。
+下载, 和压缩地形。值得指出的一点是
+他们有��许或�止居民进入你的地产。
 
 地产���能被地产主人雇佣或辞退
 , �能互相之间委派。请选择你信任的
@@ -2005,8 +2032,8 @@ www.secondlife.com/support
 默认：关
         </notification>
         <notification label="语音�天版本�符�" name="VoiceVersionMismatch">
-                该版本的第[VIEWER_NAME]与该地区的语音�天�兼容。
-为了正常使用语音�天你需�更新第[VIEWER_NAME]。
+                该版本的 [VIEWER_NAME] 与该地区的语音�天�兼容。
+为了正常使用语音�天你需�更新 [VIEWER_NAME] 。
         </notification>
         <notification label="�动产契约��" name="HelpEstateCovenant">
                 设置�动产的契约��使你�以出售地产中的土地。如果�动产契约��没有设置，你则�能出售土地。如果在买主购买之�，你�想在土地上设置任何相关的给买主的��和规定，你的契约��的注释��以是空的。
@@ -2028,48 +2055,50 @@ www.secondlife.com/support
 请仅选择一件物体，�试一次。
         </notification>
         <notification name="BuyOriginal">
-                是�以 L$[PRICE] 购买原物体？
+                是�以 [CURRENCY][PRICE] 购买原物体？
 你将�为物体的主人。
 你将�以：
- 修改： [MODIFYPERM]
- �制： [COPYPERM]
- 转�或赠�： [RESELLPERM]
+• 修改： [MODIFYPERM]
+• �制： [COPYPERM]
+• 转�或赠�： [RESELLPERM]
                 <usetemplate name="okcancelbuttons" notext="�消" yestext="购买"/>
         </notification>
         <notification name="BuyOriginalNoOwner">
-                是�以 L$[PRICE] 购买原物体？
+                是�以 [CURRENCY][PRICE] 购买原物体？
 你将�为物体的主人。
 你将�以：
- 修改： [MODIFYPERM]
- �制： [COPYPERM]
- 转�或赠�： [RESELLPERM]
+• 修改： [MODIFYPERM]
+• �制： [COPYPERM]
+• 转�或赠�： [RESELLPERM]
                 <usetemplate name="okcancelbuttons" notext="�消" yestext="购买"/>
         </notification>
         <notification name="BuyCopy">
-                是�以 L$[PRICE] 从 [OWNER] 购买物体的副本？
+                是�以 [CURRENCY][PRICE] 从 [OWNER] 购买物体的副本？
 这件物体将被�制到你的库存。
 你将�以：
- 修改： [MODIFYPERM]
- �制： [COPYPERM]
- 转�或赠�： [RESELLPERM]
+• 修改： [MODIFYPERM]
+• �制： [COPYPERM]
+• 转�或赠�： [RESELLPERM]
                 <usetemplate name="okcancelbuttons" notext="�消" yestext="购买"/>
         </notification>
         <notification name="BuyCopyNoOwner">
-                是�以 L$[PRICE] 购买物体的副本？
+                是�以 [CURRENCY][PRICE] 购买物体的副本？
 这件物体将被�制到你的库存。
 你将�以：
- 修改： [MODIFYPERM]
- �制： [COPYPERM]
- 转�或赠�： [RESELLPERM]
+• 修改： [MODIFYPERM]
+• �制： [COPYPERM]
+• 转�或赠�： [RESELLPERM]
                 <usetemplate name="okcancelbuttons" notext="�消" yestext="购买"/>
         </notification>
         <notification name="BuyContents">
-                是�以 L$[PRICE] 从 [OWNER] 购买内容？
+                是�以 [CURRENCY][PRICE] 从 [OWNER] 购买内容？
+
 它们将被�制到你的库存。
                 <usetemplate name="okcancelbuttons" notext="�消" yestext="购买"/>
         </notification>
         <notification name="BuyContentsNoOwner">
-                是�以 L$[PRICE] 购买内容？
+                是�以 [CURRENCY][PRICE] 购买内容？
+
 它们将被�制到你的库存。
                 <usetemplate name="okcancelbuttons" notext="�消" yestext="购买"/>
         </notification>
@@ -2082,6 +2111,7 @@ www.secondlife.com/support
         </notification>
         <notification name="ConfirmPurchasePassword" type="password">
                 此项交易将：
+
  [ACTION]
 
 你确定�继续购买�？
@@ -2127,16 +2157,19 @@ www.secondlife.com/support
                 这个物体中没有你能够�制的项目。
         </notification>
         <notification name="WebLaunchAccountHistory">
-                是��往第[SECOND_LIFE]网站查看你的�户记录？
+                是��往 [SECOND_LIFE] 网站查看你的�户记录？
                 <usetemplate ignoretext="打开�览器查看�户记录" name="okcancelignore" notext="�消" yestext="打开网页"/>
         </notification>
         <notification name="ClickOpenF1Help">
-                访问第[SECOND_LIFE]帮助网站�？
-                <usetemplate ignoretext="访问第[SECOND_LIFE]帮助网站时" name="okcancelignore" notext="�消" yestext="打开页�"/>
+                访问 [SECOND_LIFE] 帮助网站�？
+                <usetemplate ignoretext="访问 [SECOND_LIFE] 帮助网站时" name="okcancelignore" notext="�消" yestext="打开页�"/>
+        </notification>
+        <notification name="NoSupportUrl">
+                [GRID_NAME] 没有支�网页的链接。
         </notification>
         <notification name="ConfirmQuit">
                 确定退出？
-                <usetemplate ignoretext="退出第[VIEWER_NAME]时" name="okcancelignore" notext="继续" yestext="退出"/>
+                <usetemplate ignoretext="退出 [VIEWER_NAME] 时" name="okcancelignore" notext="继续" yestext="退出"/>
         </notification>
         <notification name="HelpReportAbuseEmailLL">
                 使用该工具�报告���务�款和社区标准。 请访问：
@@ -2157,9 +2190,9 @@ www.secondlife.com/support
 这�区域的主人将�守基于土地契约所概述的当地规则，解决报告。
 (你�以从世界��中选择 “关于土地� �查看契约。)
 
-该报告的解决结果仅对该区域有效；居民对第[GRID_NAME]其他地方的使用
+该报告的解决结果仅对该区域有效；居民对 [GRID_NAME] 其他地方的使用
 将�会�该报告结果的影�。<!-- �有林登实验室能够�制访问整个
-第[GRID_NAME]。-->
+[GRID_NAME]。-->
         </notification>
         <notification name="HelpReportBug">
                 这个工具�用�报告与�述或预期工作�一致的技术功能。请尽能�供详细资料。
@@ -2187,17 +2220,14 @@ http://secondlife.com/community/support.php
         </notification>
         <notification name="HelpReportAbuseAbuserLocationEmpty">
                 请输入�良行为�生的地�。
-
 输入正确的�述�以帮助我们归档和处��良行为报告。
         </notification>
         <notification name="HelpReportAbuseSummaryEmpty">
                 请输入�良行为的概况。
-
 输入对事件的正确�述�以帮助我们归档和处��良行为报告。
         </notification>
         <notification name="HelpReportBugSummaryEmpty">
                 请输入错误概况。
-
 输入对事件的正确�述�以帮助我们归档和处�错误报告。
         </notification>
         <notification name="HelpReportAbuseDetailsEmpty">
@@ -2215,9 +2245,9 @@ http://secondlife.com/community/support.php
                 亲爱的居民,
 如果您将�报告知识产�侵犯，请确认您通过正确的方�报告：
 
-(1) �良行为报告手续。您�以�交一份�良行为报告，如果您相信��居民正在利用第[SECOND_LIFE]许�系统的�洞，例如使用 CopyBot 或者类似的�制工具，�侵犯知识产�。�良行为调查�组负责对于��第[SECOND_LIFE]社区标准或�务�款的行为进行调查以�实行相应的惩罚措施。但是，�良行为调查�组�负责从世界中移除内容，并且�会对这类请求作出回应。
+(1) �良行为报告手续。您�以�交一份�良行为报告，如果您相信��居民正在利用 [SECOND_LIFE] 许�系统的�洞，例如使用 CopyBot 或者类似的�制工具，�侵犯知识产�。�良行为调查�组负责对于�� [SECOND_LIFE] 社区标准或�务�款的行为进行调查以�实行相应的惩罚措施。但是，�良行为调查�组�负责从世界中移除内容，并且�会对这类请求作出回应。
 
-(2) DMCA (数字�年版��定) 或者说内容移除手续。 �请求从第[SECOND_LIFE]中去除内容，您*必须*�交一份按我们 DMCA �例 http://secondlife.com/corporate/dmca.php 中所指出的，有效的侵�通知。
+(2) DMCA (数字�年版��定) 或者说内容移除手续。 �请求从 [SECOND_LIFE] 中去除内容，您*必须*�交一份按我们 DMCA �例 http://secondlife.com/corporate/dmca.php 中所指出的，有效的侵�通知。
 
 如果您�希望继续�良行为的报告，请关闭此窗�，并完��交您的报告。
 您�能需�选择 ‘CopyBot 或利用�洞’ 这一特定分类。
@@ -2228,10 +2258,12 @@ http://secondlife.com/community/support.php
         </notification>
         <notification name="FailedRequirementsCheck">
                 以下必须的部件丢失于 [FLOATER]：
+                
 [COMPONENTS]
         </notification>
         <notification label="替�已�存在的附件" name="ReplaceAttachment">
                 已�有一个物体附在身体的这个部�上了。
+                
 你是��用所选物体替代它？
                 <form name="form">
                         <ignore name="ignore" save_option="true" text="替�已有的附件时"/>
@@ -2345,7 +2377,7 @@ http://secondlife.com/community/support.php
 点击 ‘高级水�选项’ �打开较高级水�设置的编辑器。
         </notification>
         <notification name="HelpDayCycle">
-                日夜周期编辑器给予你对第[GRID_NAME]日夜循环中天空的控制。这也是基础环境编辑器的时间滑�所使用的周期。
+                日夜周期编辑器给予你对 [GRID_NAME] 日夜循环中天空的控制。这也是基础环境编辑器的时间滑�所使用的周期。
 
 日夜周期编辑器的基础是关键帧。它们是带有天空预设的节点 (在时间图上以�色的点表示)。当时间��，WindLight 的天空 也会通过过在这些关键帧之间�值而产生�化。
 
@@ -2427,7 +2459,7 @@ http://secondlife.com/community/support.php
                 控制云层在 Y 轴移动的速度。
         </notification>
         <notification name="HelpClassicClouds">
-                选�该框以在渲染 WindLight 的云层�时渲染第[SECOND_LIFE]的旧云层。
+                选�该框以在渲染 WindLight 的云层�时渲染 [SECOND_LIFE] 的旧云层。
         </notification>
         <notification name="HelpWaterFogColor">
                 控制水雾颜色。
@@ -2515,8 +2547,8 @@ http://secondlife.com/community/support.php
         <notification name="Cannot_Purchase_an_Attachment">
                 物�作为附件时无法购买。
         </notification>
-        <notification label="About Requests for the Debit Permission" name="DebitPermissionDetails">
-                授予该请求将给予脚本�续的从您的�户中��林登� (L$) 的许�。��消这项许�，物体的拥有者必须删除物体或�置物体中的脚本。
+        <notification label="关于�款��请求" name="DebitPermissionDetails">
+                授予该请求将给予脚本�续的从您的�户中�� [CURRENCY] 的许�。��消这项许�，物体的拥有者必须删除物体或�置物体中的脚本。
                 <usetemplate name="okbutton" yestext="确定"/>
         </notification>
         <notification name="AutoWearNewClothing">
@@ -2525,17 +2557,17 @@ http://secondlife.com/community/support.php
         </notification>
         <notification name="NotAgeVerified">
                 您需�验�年龄�能进入这个地�。
-您希望访问第[SECOND_LIFE]网站验�您的年龄�？
+您希望访问 [SECOND_LIFE] 网站验�您的年龄�？
 
 [_URL]
                 <url name="url" option="0">
                         https://secondlife.com/account/verification.php
                 </url>
-                <usetemplate ignoretext="警告没有验�年龄时" name="okcancelignore" notext="�" yestext="是"/>
+                <usetemplate ignoretext="没有验�年龄时警告" name="okcancelignore" notext="�" yestext="是"/>
         </notification>
         <notification name="Cannot enter parcel: no payment info on file">
                 在您访问该土地�，您的�户需�付款信�。
-您�到[SECOND_LIFE]网站�设置么？
+您�到 [SECOND_LIFE] 网站�设置么？
 
 [_URL]
                 <url name="url" option="0">
@@ -2549,6 +2581,68 @@ http://secondlife.com/community/support.php
         <notification name="SystemMessageTip">
                 [MESSAGE]
         </notification>
+        <notification name="SetDisplayNameSuccess">
+        你好 [DISPLAY_NAME]!
+
+        和真实生活中一样，大家认识新�字�有一段时间。所以若新的显示�称没有立�在物体�脚本��索等等中更新的�，请�待几天。
+        </notification>
+
+        <notification name="SetDisplayNameBlocked">
+        抱歉，你�能更改你的显示�称。若你觉得这�应该�生，请�系支�人员。
+        </notification>
+
+        <notification name="SetDisplayNameFailedLength">
+        抱歉，那个�字太长了。显示�称最长�以有 [LENGTH] 个字符。
+
+        请�试短一点的�字。
+        </notification>
+
+        <notification name="SetDisplayNameFailedGeneric">
+        抱歉，我们�能设置你的显示�称。请�候�试。
+        </notification>
+
+        <notification
+                 icon="alertmodal.tga"
+                 name="SetDisplayNameMismatch">
+        你键入的显示�称�一致。请�新输入。
+        </notification>
+
+        <!-- *NOTE: This should never happen -->
+        <notification name="AgentDisplayNameUpdateThresholdExceeded">
+        抱歉，你�多等一段时间�能更改你的显示�称。
+
+        �� http://wiki.secondlife.com/wiki/Setting_your_display_name
+
+        请�候�试。
+        </notification>
+
+        <notification
+                 icon="alertmodal.tga"
+                 name="AgentDisplayNameSetBlocked">
+        抱歉，我们�能设置你所希望的显示�称，因为其中�有�止用�。
+
+        请�试别的�字。
+        </notification>
+
+        <notification
+                 icon="alertmodal.tga"
+                 name="AgentDisplayNameSetInvalidUnicode">
+        你所希望设置的显示�称包�无效字符。
+        </notification>
+
+        <notification
+                 icon="alertmodal.tga"
+                 name="AgentDisplayNameSetOnlyPunctuation">
+        你的显示�称必须�有�是标点符�的字。
+        </notification>
+
+
+        <notification
+                 icon="notifytip.tga"
+                 name="DisplayNameUpdate">
+        [OLD_NAME] ([SLID]) 已改�为 [NEW_NAME].
+        </notification>
+
         <notification name="Cancelled">
                 已�消
         </notification>
@@ -2578,7 +2672,7 @@ http://secondlife.com/community/support.php
 (大概� 5 分钟)
         </notification>
         <notification name="UploadPayment">
-                您为了上传付出了 L$[AMOUNT]。
+                您为了上传付出了 [CURRENCY][AMOUNT]。
         </notification>
         <notification name="UploadWebSnapshotDone">
                 快照已�被上传至网页。
@@ -2603,6 +2697,7 @@ http://secondlife.com/community/support.php
         </notification>
         <notification name="CapsKeyOn">
                 大写�定处于开�状�。
+
 因为这会影�您键入的密�，
 也许您会想把它关掉。
         </notification>
@@ -2730,12 +2825,26 @@ http://secondlife.com/community/support.php
         </notification>
         <notification name="DeactivatedGesturesTrigger">
                 �消激活了触�器相�的动作：
+
 [NAMES]
         </notification>
         <notification name="NoQuickTime">
                 Apple 公�的 QuickTime 没有安装在你的�作系统中。如果你希望观看在支�的地�中播放的媒体�，则需�从
 QuickTime网站 (http://www.apple.com/quicktime) 安装 QuickTime Player。
         </notification>
+        <notification name="NoPlugin">
+        没有找到能处� “[MIME_TYPE]� MIME 类型的�件。此类媒体将��用。
+        </notification>
+        <notification name="MediaPluginFailed">
+        以下的媒体�件已崩溃：
+        [PLUGIN]
+
+        请�新安装或如果�续�到问题，清�系供应商。
+                <form name="form">
+                  <ignore name="ignore"
+                   text="媒体�件崩溃时"/>
+                </form>
+        </notification>
         <notification name="OwnedObjectsReturned">
                 在所选地�上你所拥有的物体已�被归还至你的库存中。
         </notification>
@@ -2749,7 +2858,9 @@ QuickTime网站 (http://www.apple.com/quicktime) 安装 QuickTime Player。
         </notification>
         <notification name="GroupObjectsReturned">
                 在所选地�上，与社团 [GROUPNAME] 分享的物体已�被归还至它们的主人的库存里。
+                
 �转让的转让到社团的物体已�被归还至它们先�主人处。
+
 ��转让的转让到社团的物体已�删除。
         </notification>
         <notification name="UnOwnedObjectsReturned">
@@ -2757,14 +2868,17 @@ QuickTime网站 (http://www.apple.com/quicktime) 安装 QuickTime Player。
         </notification>
         <notification name="NotSafe">
                 这�土地打开了伤害选项 (‘�安全’)。
+
 您在这里�能会�伤。如果您死了，您将会被瞬间移动至您的家�置。
         </notification>
         <notification name="NoFly">
                 这�土地关闭了飞行 (‘�能飞行’)。
+
 您�能在这里飞行。
         </notification>
         <notification name="PushRestricted">
                 这�土地 ‘��许推动’。
+
 您�能推动这里的任何物体，除�您拥有这�土地。
         </notification>
         <notification name="NoVoice">
@@ -2772,6 +2886,7 @@ QuickTime网站 (http://www.apple.com/quicktime) 安装 QuickTime Player。
         </notification>
         <notification name="NoBuild">
                 这�土地上关闭了建造 (‘�能建造’)。
+
 您�能在此创建物体。
         </notification>
         <notification name="ScriptsStopped">
@@ -2782,13 +2897,14 @@ QuickTime网站 (http://www.apple.com/quicktime) 安装 QuickTime Player。
         </notification>
         <notification name="NoOutsideScripts">
                 这�土地关闭了外部脚本 (‘没有外部脚本’)。
+
 除了属于土地主人的脚本，任何脚本在这里都�会�行。
         </notification>
         <notification name="ClaimPublicLand">
                 �能对您所在的公共土地上申请产�。
         </notification>
         <notification name="RegionTPAccessBlocked">
-                您的�制级��许您进入此地。您�能需�下载并安装最新的第[VIEWER_NAME]软件或�得年龄验�。
+                您的�制级��许您进入此地。您�能需�下载并安装最新的 [VIEWER_NAME] 软件或�得年龄验�。
 
 请去知识库了解更多关于访问��与�制级的关系。
         </notification>
@@ -2799,8 +2915,8 @@ QuickTime网站 (http://www.apple.com/quicktime) 安装 QuickTime Player。
                 您的账��能连接到该“少年专属区�。
         </notification>
         <notification name="NoHelpIslandTP">
-                您�能瞬间转移回“�助岛�。
-去“公共�助岛���您的教程。
+                您�能瞬间移动回 “Help Island�。
+去 “Help Island Public� ��您的教程。
         </notification>
         <notification name="ImproperPaymentStatus">
                 您没有适当的付款信�，�能进入此区。
@@ -2848,19 +2964,19 @@ QuickTime网站 (http://www.apple.com/quicktime) 安装 QuickTime Player。
                 没有有效的回路
         </notification>
         <notification name="NoValidTimestamp">
-                没有有效的时间标记
+                没有有效的时间戳
         </notification>
         <notification name="NoPendingConnection">
                 无法建立连接。
         </notification>
         <notification name="InternalUsherError">
-                瞬间转移的传�过程导致了一个�务器错误。第[GRID_NAME]�务器�能存在异常。
+                瞬间转移的传�过程导致了一个�务器错误。 [GRID_NAME] �务器�能存在异常。
         </notification>
         <notification name="NoGoodTPDestination">
                 在此地区中无法找到一个�适的传�点。
         </notification>
         <notification name="InternalErrorRegionResolver">
-                您的瞬间转移请求在解释全局�标时导致了一个�务器错误。第[GRID_NAME]�务器�能存在异常。
+                您的瞬间转移请求在解释全局�标时导致了一个�务器错误。 [GRID_NAME] �务器�能存在异常。
         </notification>
         <notification name="NoValidLanding">
                 找�到一个有效的��点
@@ -2894,6 +3010,7 @@ QuickTime网站 (http://www.apple.com/quicktime) 安装 QuickTime Player。
         </notification>
         <notification name="GodMessage">
                 [NAME]
+
 [MESSAGE]
         </notification>
         <notification name="JoinGroup">
@@ -2915,6 +3032,7 @@ QuickTime网站 (http://www.apple.com/quicktime) 安装 QuickTime Player。
         </notification>
         <notification name="GotoURL">
                 [MESSAGE]
+
 [URL]
                 <form name="form">
                         <button name="Later" text="��"/>
@@ -2930,6 +3048,8 @@ QuickTime网站 (http://www.apple.com/quicktime) 安装 QuickTime Player。
                 <form name="form">
                         <button name="Accept" text="接�"/>
                         <button name="Decline" text="谢�"/>
+                        <button name="Profile" text="档案"/>
+                        <button name="Ignore" text="忽略"/>
                 </form>
         </notification>
         <notification name="OfferFriendshipNoMessage">
@@ -2938,6 +3058,8 @@ QuickTime网站 (http://www.apple.com/quicktime) 安装 QuickTime Player。
                 <form name="form">
                         <button name="Accept" text="接�"/>
                         <button name="Decline" text="谢�"/>
+                        <button name="Profile" text="档案"/>
+                        <button name="Ignore" text="忽略"/>
                 </form>
         </notification>
         <notification name="FriendshipAccepted">
@@ -2947,19 +3069,24 @@ QuickTime网站 (http://www.apple.com/quicktime) 安装 QuickTime Player。
                 [NAME] 谢�了您的好�邀请。
         </notification>
         <notification name="OfferCallingCard">
-                [FIRST] [LAST] �给你他的通��。这将在你的库存中添加一个书签，这样你就�以快速的通过�时消��系这�居民。
+                [FIRST] [LAST] �给你他的通��。
+                
+这将在你的库存中添加一个书签，这样你就�以快速的通过�时消��系这�居民。
                 <form name="form">
                         <button name="Accept" text="接�"/>
                         <button name="Decline" text="谢�"/>
+                        <button name="Ignore" text="忽略"/>
                 </form>
         </notification>
         <notification name="RegionRestartMinutes">
-                地区将在 [MINUTES]分钟��新�动。
-如果�留在此地区内，您将会被登出。
+                区域将在 [MINUTES]分钟��新�动。
+
+如果�留在此区域内，您将会被登出。
         </notification>
         <notification name="RegionRestartSeconds">
                 区域将在 [MINUTES]秒��新�动。
-如果�留在此地区内，您将会被登出。
+
+如果�留在此区域内，您将会被登出。
         </notification>
         <notification name="LoadWebPage">
                 是�载入网页[URL]？
@@ -2979,12 +3106,13 @@ QuickTime网站 (http://www.apple.com/quicktime) 安装 QuickTime Player。
                 在数�库中没能找到�为 [DESC] 的[TYPE]。
         </notification>
         <notification name="InvalidWearable">
-                您所�穿戴的物�使用了一�当�客户端无法处�的功能。请�级您的第[VIEWER_NAME]版本以正确穿戴此物�。
+                您所�穿戴的物�使用了一�当�客户端无法处�的功能。请�级您的 [VIEWER_NAME] 版本以正确穿戴此物�。
         </notification>
         <notification name="ScriptQuestion">
                 ‘[OBJECTNAME]’, 一件 ‘[NAME]’ 拥有的物体, 想�：
 
 [QUESTIONS]
+
 这样�以�？
                 <form name="form">
                         <button name="Yes" text="�许"/>
@@ -2996,6 +3124,7 @@ QuickTime网站 (http://www.apple.com/quicktime) 安装 QuickTime Player。
                 ‘[OBJECTNAME]’, 一件 ‘[NAME]’ 拥有的物体, 想�：
 
 [QUESTIONS]
+
 如果您�信任该物体和它的创建者，您应该拒�这请求。点击细节按钮察看详细资料。
 
 是�授予许�？
@@ -3020,17 +3149,22 @@ QuickTime网站 (http://www.apple.com/quicktime) 安装 QuickTime Player。
                 </form>
         </notification>
         <notification name="FirstBalanceIncrease">
-                您刚收到了 L$[AMOUNT]。
-物体和其他用户�以�您支付L$。
+                您刚收到了 [CURRENCY][AMOUNT]。
+
+物体和其他用户�以�您支付 [CURRENCY]。
+
 您的�户余�显示在�幕的�上角。
         </notification>
         <notification name="FirstBalanceDecrease">
-                您刚支付了 L$[AMOUNT]。
+                您刚支付了 [CURRENCY][AMOUNT]。
+
 您的�户余�显示在�幕的�上角。
         </notification>
         <notification name="FirstSit">
                 您正在��。
+
 使用方�键 (或者AWSD) �改�视角。
+
 点击 ‘站起�’ 按钮起身。
         </notification>
         <notification name="FirstMap">
@@ -3038,6 +3172,12 @@ QuickTime网站 (http://www.apple.com/quicktime) 安装 QuickTime Player。
 �击以瞬间移动。
 使用�边的控件查找信�，并显示��的背景。
         </notification>
+        <notification
+         icon="notify.tga"
+         name="FirstMiniMap"
+         type="notify">
+                �键�击迷你地图查看更多选项。
+        </notification>
         <notification name="FirstBuild">
                 您�以在 [GRID_NAME] 的�些区域中创建新物体。
 使用左上角的工具建造，也试一试按下 Ctrl 或者 Alt 键快速地切�工具。
@@ -3064,9 +3204,9 @@ QuickTime网站 (http://www.apple.com/quicktime) 安装 QuickTime Player。
         </notification>
         <notification name="FirstInventory">
                 这是您的库存，是存放物体�记事��衣�和您拥有的其他东西的地方。
-* �穿上物体或装备文件夹，将它拖动到您自己身上。
-* �将物体带入世界中，将它拖动到地上。
-* �阅读记事�，�击它。
+• �穿上物体或装备文件夹，将它拖动到您自己身上。
+• �将物体带入世界中，将它拖动到地上。
+• �阅读记事�，�击它。
         </notification>
         <notification name="FirstSandbox">
                 这是一�沙盒区域。
@@ -3080,17 +3220,41 @@ QuickTime网站 (http://www.apple.com/quicktime) 安装 QuickTime Player。
         </notification>
         <notification name="FirstDebugMenus">
                 您已�用了高级��。
-该��包�对调试第[VIEWER_NAME]的开�者有用的功能。
+该��包�对调试 [VIEWER_NAME] 的开�者有用的功能。
 �切�该��，在 Windows 中按 Ctrl-Alt-D。 在 Mac 中按 Cmd-Opt-Shift-D。
         </notification>
         <notification name="FirstSculptedPrim">
-                您正在编辑 sculpted 元件。
-Sculpted 元件需�特殊的�质�指定其形状。
-您�以在库存库中找到示范 sculpted �质。
+                您正在编辑雕塑元件。
+雕塑元件需�特殊的�质�指定其形状。
+您�以在库存中找到示范雕塑�质。
         </notification>
         <notification name="FirstMedia">
                 您已�开始播放媒体。媒体�以在�数设置的音频和视频一�中设置为自动播放。请注�这对于您�信任的媒体站点�能会有安全�患。
         </notification>
+<notification name="FirstRLVDetach">
+您的一个或多个附件已被 Restrained Life 设置为���下。
+请注�这�时会�用所有附件的‘穿上’选项，除�它们被正确地命�。
+
+详细资料请在 SL Wiki 上�索‘Restrained Life’。
+</notification>
+
+<notification name="FirstRLVFartouch">
+您已被�离触摸�制: 您将�能触摸离您的化身1.5米以外的物体，直到�制解除。
+
+�示: �离外的物体在鼠标划过时将�会改�指针，并且如果您�试�键点击的�将会�到错误�示音。
+</notification>
+
+<notification name="FirstRLVGiveToRLV">
+接�物�时，�称以 &apos;#RLV/~&apos; 开始的文件夹�以被自动放置在您的 #RLV 共享文件夹下。 
+
+请注�，一旦�用，接�的物�将会立��供脚本使用，并�以调用 RLV API 的所有功能，这�能导致�想�到的或令人�快的情况�生。
+
+您是�希望�用这个功能?
+  <usetemplate
+   name="okcancelbuttonscanceldefault"
+   notext="�"
+   yestext="是"/>
+</notification>
         <notification name="MaxListSelectMessage">
                 您从该列表中最多�能选择[MAX_SELECT] 个项目。
         </notification>
@@ -3184,11 +3348,483 @@ Sculpted 元件需�特殊的�质�指定其形状。
         <notification name="UnableToOpenCommandURL">
                 您点击的URL�能从该�览器中打开。
         </notification>
+        <notification name="QueryClientTags">
+        您是�希望从 kokuaviewer.org 自动更新客户端标识数�库？
+
+这将确�您关于其它客户端的资料是最新的。
+                <form name="form">
+                  <button
+                         name="Yes"
+                         text="是"/>
+                  <button
+                         name="No"
+                         text="�"/>
+                </form>
+        </notification>
+<!--Begin Imprudence notifications-->
+
+<notification name="ClickBuildConstants">
+本标签页中�以使用以下常数: 
+
+PX  —  X 轴�置
+PY  —  Y 轴�置
+PZ  —  Z 轴�置
+SX  —  X 轴尺寸
+SY  —  Y 轴尺寸
+SZ  —  Z 轴尺寸
+RX  —  X 轴角度
+RY  —  Y 轴角度
+RZ  —  Z 轴角度
+CB  —  路径截断开始
+CE  —  路径截断结�
+HLW  —  窟窿大�
+SKW  —  倾斜
+PB  —  切片/凹陷/剖�截断开始
+PE  —  切片/凹陷/剖�截断结�
+TB  —  扭曲开始
+TE  —  扭曲结�
+SHX  —  X 轴顶�倾斜
+SHY  —  Y 轴顶�倾斜
+HLX  —  X 轴洞的尺寸
+HLY  —  Y 轴洞的尺寸
+TPX  —  X 轴锥形
+TPY  —  Y 轴锥形
+ROF  —  �径�化
+REV  —  旋转次数
+
+PI  —  π
+TWO_PI  —  2π
+PI_BY_TWO  —  π/2
+SQRT2  —  2的平方根
+DEG_TO_RAD  —  角度到弧度转� (π/180)
+RAD_TO_DEG  —  弧度到角度转� (180/π)
+GRAVITY  —  -9.8
+
+*  —  乘
+\  —  除
++  —  加
+-  —  �
+
+更多信�请点击 “更多信��。
+  <usetemplate
+   name="okhelpbuttons"
+   yestext="确定"
+   helptext="更多信�"/>
+</notification>
+
+<notification name="ClickTextureConstants" type="alert">
+本标签页中�以使用以下常数: 
+
+TSU  —  ����次数 (水平)
+TSV  —  ����次数 (垂直)
+TOU  —  �移 (水平)
+TOV  —  �移 (垂直)
+TRNS —  �明度
+TROT —  �质旋转角度
+GLOW —  �光
+
+*  —  乘
+\  —  除
++  —  加
+-  —  �
+
+更多信�请点击 “更多信��。
+  <usetemplate
+   name="okhelpbuttons"
+   yestext="确定"
+   helptext="更多信�"/>
+</notification>
+
+<notification name="ConfirmAutoPilot">
+你确定��往这里�?
+  <usetemplate
+   ignoretext="使用自动寻路时"
+   name="okcancelignore"
+   notext="�消"
+   yestext="�往"/>
+</notification>
+
+<!--looks like a singular they - not much I can do about it - Kaku -->
+<notification name="ConfirmDerender">
+您确定��� [NAME]?
+
+[NAME] 将��被渲染，直到您离开区域或他们更�装�。
+  <usetemplate
+    ignoretext="��物体或化身时"
+    name="okcancelignore"
+    notext="�消"
+    yestext="��"/>
+</notification>
+
+<notification name="ConfirmDoubleClickTP">
+您确定�瞬间移动到这里�？
+  <usetemplate
+   ignoretext="�击瞬间移动时"
+   name="okcancelignore"
+   notext="�消"
+   yestext="瞬间移动"/>
+</notification>
+
+<notification name="ConfirmMuteAgent">
+您确定��蔽 [NAME] (居民)�?
+  <usetemplate
+    ignoretext="�蔽居民时"
+    name="okcancelignore"
+    notext="�消"
+    yestext="�蔽"/>
+</notification>
+
+<notification name="ConfirmMuteObject">
+您确定��蔽 [NAME] (物体)�?
+   <usetemplate
+    ignoretext="�蔽物体时"
+    name="okcancelignore"
+    notext="�消"
+    yestext="�蔽"/>
+</notification>
+
+<notification name="ConfirmToggleFullscreen">
+您确定�切�全�模��?
+  <usetemplate
+   name="okcancelbuttons"
+   notext="�消"
+   yestext="切�"/>
+</notification>
+
+<notification name="ConfirmRemoveAllClothes">
+您确定�脱下所有衣物�?
+  <usetemplate
+   ignoretext="脱下所有衣物时"
+   name="okcancelignore"
+   notext="�消"
+   yestext="脱下"/>
+</notification>
+
+<notification name="ConfirmResetAllPreferences">
+您确定��置所有设置�?
+
+设置将在 [VIEWER_NAME] �新�动时清除。
+  <usetemplate
+   ignoretext="�置设置时"
+   name="okcancelignore"
+   notext="�消"
+   yestext="�置"/>
+</notification>
+
+<notification name="ConfirmRestoreToWorld">
+您确定���该物体到其最�的�置�?
+
+警告: 如果你�确定物体会��到哪里, ��执行��!
+
+更多信�请点击 “更多信��。
+  <usetemplate
+   name="okcancelhelpignore"
+   yestext="��"
+   helptext="更多信�"
+   notext="�消"
+   ignoretext="��物体到其最��置时" />
+</notification>
+
+<notification name="ConfirmTeleportHome">
+您确定�瞬间移动回家�?
+  <usetemplate
+   ignoretext="瞬间移动回家时"
+   name="okcancelignore"
+   notext="�消"
+   yestext="瞬间移动"/>
+</notification>
+
+<notification name="ConnectingToRegionError">
+无法连接到当�区域。请�试登入到其他区域。
+
+默认登录区域�以在�数设置的一般选项�中设置。
+</notification>
+
+<notification name="DisconnectedFromRegion">
+您与所在的区域的链接已被断开。无法继续。
+</notification>
+
+<notification name="GridsNoNick">
+�能�存新的网格信�。
+
+您必须指定一个唯一的网格昵称。
+</notification>
+
+<notification name="GridsNoLoginUri">
+�能�存新网格 ‘[NAME]’.
+
+您必须指定登入 URI 。
+</notification>
+
+<notification name="GridInfoDirty">
+您有未�存的更改，将会丢失。继续？
+  <usetemplate
+   ignoretext="创建新网格时"
+   name="okcancelignore"
+   notext="�消"
+   yestext="继续"/>
+</notification>
+
+<notification name="GridExists">
+�能�存新网格 ‘[NAME]’.
+
+昵称相�的网格已�存在。
+</notification>
+
+<notification
+  icon="alertmodal.tga"
+  name="GridInfoNoLoginUri"
+  type="alertmodal">
+  获�网格信�需�其登入 URI.
+</notification>
+
+<notification name="GridInfoNoLoginUri">
+获�网格的信�需�网格登入 URI。
+</notification>
+
+<notification name="GridInfoError">
+无法从�务器获�网格信�。
+</notification>
+  
+<notification name="IMLogNotFound">
+找�到与 [NAME] 的�时�天记录。
+  <usetemplate
+   name="okbutton"
+   yestext="确定"/>
+</notification>
+
+<notification name="InvalidLogInSecondLife">
+哎呀! 您所输入的登入�称格��对�
+
+[SECOND_LIFE] 接�以下登入�格�:
+
+ - 用户�
+ - 用户�.Resident
+ - �.姓
+
+如果您没有账户的�，���现在创建一个？
+  <usetemplate
+   name="okcancelbuttons"
+   notext="�试一次"
+   yestext="创建账户"/>
+</notification>
+
+<notification name="InvalidPassword">
+您已输入了无效的密��请�试。
+</notification>
+  
+<notification name="IncompleteInventoryItem">
+您正访问的物�尚未在本地�用。请�候�试。
+</notification>
+
+<notification name="ShowLookAtInfo">
+显示视线目标是一个调试功能，�以显示化身的头部在看什么东西。请注�: 这项功能并*�会*显示化身的摄�机视角实际��哪个方�。请���赖该功能�护任何��!
+  <usetemplate
+   ignoretext="设置显示视线目标时"
+   name="okignore"
+   yestext="OK"/>
+</notification>
+  
+<notification name="WebLaunchImprudenceBlog">
+�往 Imprudence 官方日志阅读最新的新闻和信�。
+  <usetemplate
+   ignoretext="打开网络�览器阅读网络日志时"
+   name="okcancelignore"
+   notext="�消"
+   yestext="打开网页"/>
+</notification>
+
+<notification name="WebLaunchImprudenceForums">
+�往 Imprudence 官方论�讨论 Imprudence 工程。
+  <usetemplate
+   ignoretext="打开网络�览器阅读论�时"
+   name="okcancelignore"
+   notext="�消"
+   yestext="打开网页"/>
+</notification>
+
+<notification
+ icon="alert.tga"
+ name="WebLaunchAutoscript"
+ type="alert">
+打开 Autoscript 生�器 (由 3greeneggs.com 制作)?
+  <usetemplate
+   ignoretext="打开 Autoscript 生�器"
+   name="okcancelignore"
+   notext="�消"
+   yestext="确定"/>
+</notification>
+
+<notification
+ icon="notify.tga"
+ name="FirstAO"
+ type="notify">
+使用方法�以在新建记事�模�中找到。使用工具�打开或关闭动画覆盖。
+</notification>
+
+<notification
+ icon="notifytip.tga"
+ name="NoShadows"
+ type="notifytip">
+�能�用阴影，因为您的图形设置过低。请确定您的图�设置为 “�高� 并已�用了基本和大气�色器。
+</notification>
+
+<notification name="NoTextureExportSL">
+为了�守 Second Life �务�议, Imprudence 没有下载导出物体的任何�质。
+</notification>
+
+<notification
+ icon="alert.tga"
+ name="Help_CmdLine"
+ type="alert">
+��命令行功能的选项。
+
+�使用�一�命令, 在�天� (本地�天) 中键入命令并按回车键。
+</notification>
+  
+<notification label="拼写检查帮助" name="EmeraldHelp_SpellCheck">
+�拼写检查�个��, �键点击它, 然�选择正确的�替�。
+您�以选择一个基本辞典, 该辞典储存语�和基本�汇。
+您也�以选择安装其他�汇列表, ��从列表中选中然� “安装�。
+</notification>
+
+<notification
+ name="ConfirmLightShare"
+ type="notify"
+ icon="notify.tga">
+该区域正在广播自定义天空和水�设置。
+应用该区域的设定？ (&quot;忽略&quot; 将会忽略所有区域设置，直到你离开这个区域。)
+  <form name="form">
+    <button name="apply"  text="应用"/>
+    <button name="temp"   text="现在��"/>
+    <button name="region" text="忽略"/>
+  </form>
+</notification>
+
+<notification
+ name="ChangeFont"
+ icon="notify.tga"
+ type="notify">
+新字体将在您�新�动 [VIEWER_NAME] �使用。
+</notification>
+
+<notification name="FirstPrivacy">
+注�: Second Life �务�款�求所有客户端，包括 Imprudence 查看器, 连接到 Second Life 时� 5 分钟�林登实验室��一个 “统计数��包�。
+
+该�包包括关于您的计算机以�您使用 Second Life 的情况的一些�个人识别性的信�, 例如您的计算机硬件和�作系统，平�帧率，访问的区域数，附近化身数�，以�其他信�。请阅读 Second Life ��政策了解林登实验室如何使用此项以�其他信�。
+
+该�包仅��给林登实验室; Imprudence 开�者并�接收或采集任何此类信�。
+
+Second Life �务�款��许您选择���此信�。登入 Second Life 代表您��采集这些数�。
+  <usetemplate
+   name="okcancelbuttons"
+   yestext="登入"   notext="�消"/>
+</notification>
+
+<notification
+   icon="alert.tga"
+   name="MediaAlert"
+   type="alert">
+该地�的拥有者已请求查看器加载以下 [TYPE] URL:
+
+[URL]
+
+您�以选择�许或�止对应的域�或世界内物体�务器:
+
+[DOMAIN]
+
+“�许� 和 “�止� 仅对该会�有效，而 “黑��� 和 “白��� 永久有效。
+   <form name="form">
+    <button
+         name="Allow"
+         text="�许"/>
+        <button
+         name="Deny"
+         text="�止"/>
+        <button
+         name="Blacklist"
+         text="黑��"/>
+        <button
+         name="Whitelist"
+         text="白��"/>
+   </form>
+  </notification>
+
+  <notification
+   name="MediaListed">
+[DOMAIN] 的媒体/音频 URL 已�被 [LISTED]
+  </notification>
+
+  <notification  name="MediaBlocked">
+�蔽了�自 [DOMAIN] 的媒体/音频。
+  </notification>
+
+  <notification  name="MediaFiltersCleared">
+媒体过滤列表已�清除
+  </notification>
+
+  <notification name="ProxyNeedRestart">
+Socks 代��务器设置将在您�新�动 [VIEWER_NAME] �生效.
+  </notification>
+
+  <notification name="SOCKS_CONNECT_OK">
+�功连接 Socks5 代��务器 [PROXY]。
+  </notification>
+
+  <notification name="SOCKS_NOT_PERMITTED">
+Socks5 代��务器 [PROXY] 拒�了连接，连接未被规则�许
+  </notification>
+
+  <notification name="SOCKS_CONNECT_ERROR">
+Socks5 代��务器 [PROXY] 拒�了连接, 无法打开 TCP 连接
+  </notification>
+
+  <notification name="SOCKS_NOT_ACCEPTABLE">
+Socks5 代��务器 [PROXY] 拒�了选中的身份验�系统
+  </notification>
+
+  <notification name="SOCKS_AUTH_FAIL">
+Socks5 代��务器 [PROXY] 报告您的身份验�信�无效
+  </notification>
+
+  <notification name="SOCKS_UDP_FWD_NOT_GRANTED">
+Socks5 代��务器 [PROXY] 拒�了 UDP 关�请求
+  </notification>
+
+  <notification name="SOCKS_HOST_CONNECT_FAILED">
+无法连接到 Socks5 代��务器 [PROXY]
+  </notification>
+
+<!--End Imprudence notifications-->
+ <!-- [KITTY VIEWER] -->
+  <notification
+   icon="alertmodal.tga"
+   name="KittyInvalidWaterlightNotecard"
+   type="alert">
+[NAME] �是有效的水�设定资产。
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="KittyInvalidWindlightNotecard"
+   type="alert">
+[NAME] �是有效的 WindLight 设定资产。
+  </notification>
+
+  <notification
+   name="KittyWLSaveNotecardAlert">
+您是��覆盖已��存的预设?
+    <usetemplate
+     name="okcancelbuttons"
+     notext="�"
+     yestext="是"/>
+  </notification>
+ <!-- [/KITTY VIEWER] -->
         <global name="UnsupportedCPU">
                 - 您的 CPU(中央处�器)速度没有达到最低需求。
         </global>
         <global name="UnsupportedGLRequirements">
-                您似乎没有满足第[VIEWER_NAME]的系统需求的硬件。第[VIEWER_NAME]需�支�多��质 (multitexture)
+                您似乎没有满足 [VIEWER_NAME] 的系统需求的硬件。 [VIEWER_NAME] 需�支�多��质 (multitexture)
 的 OpenGL 显示�。如果您满足这个�件的�，也许您需�确认已�
 安装了您的显示�的最新驱动程��以��作系统的 Service Pack 和补�。
 
diff --git a/linden/indra/newview/skins/default/xui/zh/panel_ao_remote_controls.xml b/linden/indra/newview/skins/default/xui/zh/panel_ao_remote_controls.xml
new file mode 100644
index 0000000..75d01fe
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/zh/panel_ao_remote_controls.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="ao_controls">
+  <button label="动画覆盖" label_selected="动画覆盖" name="ao_btn" 
+                tool_tip="点击这里切�动画覆盖器" />
+  <button name="popup_btn" tool_tip="更多选项" width="22" />
+</panel>
diff --git a/linden/indra/newview/skins/default/xui/zh/panel_ao_remote_expanded.xml b/linden/indra/newview/skins/default/xui/zh/panel_ao_remote_expanded.xml
new file mode 100644
index 0000000..283d7cf
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/zh/panel_ao_remote_expanded.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+         name="ao_remote">
+  <button
+                 label="�姿覆盖关闭"
+                 label_selected="�姿覆盖打开"
+                 name="ao_sit_btn" />
+</panel>
\ No newline at end of file
diff --git a/linden/indra/newview/skins/default/xui/zh/panel_audio.xml b/linden/indra/newview/skins/default/xui/zh/panel_audio.xml
index a537046..182b184 100644
--- a/linden/indra/newview/skins/default/xui/zh/panel_audio.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_audio.xml
@@ -23,6 +23,9 @@
         <slider 
                  name="Wind Volume" 
              label="环境"  />
+        <slider
+                 label="动作"
+                 name="Gestures Volume" />
         <slider name="UI Volume"
              label="界�" />
                  
diff --git a/linden/indra/newview/skins/default/xui/zh/panel_avatar.xml b/linden/indra/newview/skins/default/xui/zh/panel_avatar.xml
index a1ed123..1d1848d 100644
--- a/linden/indra/newview/skins/default/xui/zh/panel_avatar.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_avatar.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="Panel Avatar">
         <tab_container name="tab">
-                <panel label="Avatar" name="2nd Life">
+                <panel label="档案" name="2nd Life">
+                        <button label="�制键值" label_selected="�制键值" name="btn_copy_uuid" />
+           
+        
                         <string name="CaptionTextAcctInfo">
 [ACCTTYPE]
 [PAYMENTINFO]
@@ -14,7 +17,7 @@
                                 试用者
                         </string>
                         <string name="AcctTypeCharterMember">
-                                宪章制定委员会�员
+                                终身会员
                         </string>
                         <string name="AcctTypeEmployee">
                                 林登实验室雇员
@@ -40,11 +43,23 @@
                         <text name="online_yes">
                                 当�在线
                         </text>
+                        <text name="online_no">
+                                �在线
+                        </text>
+                        <text name="online_unknown">
+                                在线状�未知
+                        </text>
                         <text name="label">
                                 出生:
                         </text>
+                        <string name="copy_key_info">
+                                已将 [AVATAR] 的键值�制到剪贴�: [KEY]
+                        </string>
+                        <string name="days_old_text">
+                                ([DAYS] 天)
+                        </string>
                         <text name="label2">
-                                账户:
+                                账户信�:
                         </text>
                         <text name="partner_label" tool_tip="第二人生�档。�获�更多关于如何设置此项功能， 请登陆www.secondlife.com/partner">
                                 �档:
@@ -61,7 +76,7 @@
                                 社团:
                         </text>
                         <text name="About:">
-                                关于:
+                                关于: (8196个字)
                         </text>
                         <text name="(500 chars)">
                                 (500 个字)
@@ -69,8 +84,11 @@
                         <text name="Give item:">
                                 给与物�:
                         </text>
-                        <text name="Give inventory" tool_tip="�把库存中的物体赠与这个人，将其拖动到这里。">
-                                放置库存物�于此。
+                        <text name="drop target" tool_tip="�把库存中的物体赠与这个人，将其拖动到这里。">
+                                拖动库存�目
+                        </text>
+                        <text name="Give inventory 2" tool_tip="�把库存中的物体赠与这个人，将其拖动到这里。">
+                                到这里赠与居民
                         </text>
                         <check_box label="在�索结果中显示" name="allow_publish" tool_tip="在�索中显示�外信�，例如�述和照片。"/>
                         <button label="?" label_selected="?" name="?"/>
@@ -78,17 +96,18 @@
                         <button label="邀请瞬间移动..." label_selected="邀请瞬间移动..." name="Offer Teleport..."/>
                         <button label="添加为好�..." label_selected="添加为好�..." name="Add Friend..."/>
                         <button label="付款..." label_selected="付款..." name="Pay..."/>
-                        <button label="�时消�..." label_selected="�时消�..." name="Instant Message..." tool_tip="�时通信"/>
+                        <button label="�时消�..." label_selected="�时消�..." name="Instant Message..." tool_tip="�时消� (IM)"/>
                         <button label="�蔽" label_selected="�蔽" name="Mute"/>
+                        <button label="邀请加入社团..."    label_selected="邀请加入社团..." name="Invite to Group..." />
                 </panel>
                 <panel label="Web" name="WebProfile">
                         <line_editor is_unicode="false" name="url_edit"/>
                         <flyout_button label="加载" label_selected="加载" name="load" tool_tip="用内部�览器打开这个档案页�。">
                                 <flyout_button_item name="open_item">
-                                        在外部�览器中
+                                        在外部�览器中打开
                                 </flyout_button_item>
                                 <flyout_button_item name="home_item">
-                                        家连接
+                                        返回起始页�
                                 </flyout_button_item>
                         </flyout_button>
                         <button label="?" label_selected="?" name="web_profile_help"/>
@@ -122,31 +141,31 @@
                 </panel>
                 <panel label="收�" name="Picks">
                         <text name="Tell everyone about your favorite places in Second Life.">
-                                告诉大家你在第二人生中最喜欢的地点。
+                                告诉大家你最喜欢的地点。
                         </text>
                         <button label="新建..." label_selected="新建..." name="New..."/>
                         <button label="删除..." label_selected="删除..." name="Delete..."/>
                         <text name="loading_text">
-                                加载...
+                                载入中...
                         </text>
                 </panel>
                 <panel label="分类广告" name="Classified">
                         <text name="Place an ad in Second Life&apos;s classified listings.">
-                                在第二人生的分类�中刊登广告。
+                                在分类广告�中刊登广告。
                         </text>
                         <button label="新建..." label_selected="新建..." name="New..."/>
                         <button label="删除..." label_selected="删除..." name="Delete..."/>
                         <text name="loading_text">
-                                加载...
+                                载入中...
                         </text>
                 </panel>
-                <panel label="第一人生" name="1st Life">
+                <panel label="真实生活" name="1st Life">
                         <text name="Photo:">
                                 照片：
                         </text>
                         <texture_picker label="" name="img" tool_tip="点击这里�选择图片"/>
                         <text name="Info:">
-                                消�:
+                                消� (8196 个字):
                         </text>
                         <text name="(250 chars)">
                                 (250个字)
@@ -154,7 +173,7 @@
                 </panel>
                 <panel label="我的备注" name="My Notes">
                         <string name="Loading">
-                                加载...
+                                载入中...
                         </string>
                         <text name="label">
                                 使用这�空间�记录你关于这个人的笔记。 追踪交易
@@ -171,7 +190,7 @@
         <button label="CSR" label_selected="CSR" name="csr_btn" tool_tip="对此�居民开�顾客�务工具。"/>
         <string name="ShowOnMapNonFriend">
                 在地图上显示�置。
-由于你和它们之间没有�谊关系，所以刚�的�作无效。
+由于你和对方之间没有�谊关系，所以刚�的�作无效。
         </string>
         <string name="ShowOnMapFriendOffline">
                 在地图上显示�置。
@@ -190,6 +209,9 @@
                 邀请瞬间移动到你所在的�置。
         </string>
         <string name="Loading">
-                加载...
+                载入中...
+        </string>
+        <string name="HiddenLabel">
+                (��)
         </string>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/zh/panel_avatar_classified.xml b/linden/indra/newview/skins/default/xui/zh/panel_avatar_classified.xml
index f70eef3..761d58a 100644
--- a/linden/indra/newview/skins/default/xui/zh/panel_avatar_classified.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_avatar_classified.xml
@@ -26,7 +26,7 @@
         <button label="�布..." name="classified_update_btn"/>
         <check_box label="�周自动更新" name="auto_renew_check"/>
         <string name="ad_placed_paid">
-                广告�布: [DATE]，为此付出了 L$[AMT]。
+                广告�布: [DATE]，为此付出了 [CURRENCY][AMT]。
         </string>
         <string name="update_txt">
                 æ›´æ–°
diff --git a/linden/indra/newview/skins/default/xui/zh/panel_classified.xml b/linden/indra/newview/skins/default/xui/zh/panel_classified.xml
index 09ded10..7646245 100644
--- a/linden/indra/newview/skins/default/xui/zh/panel_classified.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_classified.xml
@@ -6,21 +6,21 @@
         <button label="瞬间移动" name="classified_teleport_btn"/>
         <button label="在地图中显示" name="classified_map_btn"/>
         <button label="档案" name="classified_profile_btn"/>
-        <combo_box name="classified_mature_check">
+        <combo_box label="" name="classified_mature_check">
                 <combo_item name="select_mature">
-                        -选择�制级-
+                        - 选择�制级 -
                 </combo_item>
                 <combo_item name="mature">
-                        Mature Content
+                        Mature内容
                 </combo_item>
                 <combo_item name="pg">
-                        PG Content
+                        PG内容
                 </combo_item>
         </combo_box>
         <combo_box label="" name="classified_category_combo"/>
         <button label="æ›´æ–°" name="classified_update_btn"/>
         <string name="ad_placed_paid">
-                广告地�：[DATE],�布付款 L$[AMT]
+                广告�布: [DATE]，为此付出了 [CURRENCY][AMT]。
         </string>
         <string name="update_txt">
                 æ›´æ–°
diff --git a/linden/indra/newview/skins/default/xui/zh/panel_friends.xml b/linden/indra/newview/skins/default/xui/zh/panel_friends.xml
index fafb6e8..16b16fc 100644
--- a/linden/indra/newview/skins/default/xui/zh/panel_friends.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_friends.xml
@@ -9,12 +9,16 @@
                 <column name="icon_visible_online" tool_tip="好��以看�你是�在线"/>
                 <column name="icon_visible_map" tool_tip="好��以在地图上找到你"/>
                 <column name="icon_edit_mine" tool_tip="好��以编辑你的物体"/>
+                <column name="icon_visible_map" tool_tip="你�以在地图上找到这�好�"/>
                 <column name="icon_edit_theirs" tool_tip="你�以编辑这�好�的物体"/>
         </scroll_list>
         <button label="�天/呼�" name="im_btn" tool_tip="打开�时通信会�"/>
         <button label="档案" name="profile_btn" tool_tip="显示图片�社团和其他信�"/>
         <button label="瞬间移动..." name="offer_teleport_btn" tool_tip="邀请该好�瞬间移动到你的当��置"/>
-        <button label="付款..." name="pay_btn" tool_tip="给这�好�林登� (L$)"/>
+        <button label="付款..." name="pay_btn" tool_tip="给这�好�货�"/>
         <button label="移除..." name="remove_btn" tool_tip="将这个人从你的好�列表中去除"/>
         <button label="添加..." name="add_btn" tool_tip="邀请其他居民�为你的好�"/>
+  <search_editor bottom="-24" enabled="true" follows="left|right|top" font="SansSerif"
+       height="18" left="10" right="-100" name="buddy_search"
+       label="在这里打字查找好�" width="130" />
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/zh/panel_group_general.xml b/linden/indra/newview/skins/default/xui/zh/panel_group_general.xml
index 43d6d3e..cddaac2 100644
--- a/linden/indra/newview/skins/default/xui/zh/panel_group_general.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_group_general.xml
@@ -26,7 +26,7 @@
         <text_editor name="charter">
                 社团宪章
         </text_editor>
-        <button label="加入(L$0)" label_selected="加入(L$0)" name="join_button"/>
+        <button label="加入 (�费)" label_selected="加入 (�费)" name="join_button"/>
         <button label="详细视图" label_selected="详细察看" name="info_button"/>
         <text name="text_owners_and_visible_members">
                 拥有者和��的会员
@@ -45,7 +45,7 @@
         <panel name="preferences_container">
                 <check_box label="在�索中显示" name="show_in_group_list" tool_tip="让别人在�索结果中看到这个社团。"/>
                 <check_box label="公开注册" name="open_enrollement" tool_tip="设置该社团是��许新会员加入而�需�被邀请。"/>
-                <check_box label="注册费用: L$" name="check_enrollment_fee" tool_tip="设定是�收将�社团入会费。"/>
+                <check_box label="注册费用: [CURRENCY]" name="check_enrollment_fee" tool_tip="设定是�收将�社团入会费。"/>
                 <spinner name="spin_enrollment_fee" tool_tip="如果选择了注册费用的�，新会员加入社团时必须付出这笔费用。"/>
                 <combo_box name="group_mature_check" tool_tip="设置是�应将社团信�看作Mature内容。">
                         <combo_item name="select_mature">
@@ -65,12 +65,16 @@
                         <combo_box name="active_title" tool_tip="设置当该社团激活时，在化身姓�标签中显示的头衔。"/>
                 </panel>
                 <check_box label="接�社团通知" name="receive_notices" tool_tip="设置您是�想�从该社团接�通知。如果这个社团�您乱�垃圾信�，那就�消选择这项。"/>
+                <check_box
+                         label="加入社团�天"
+                         name="receive_chat"
+                         tool_tip="设置是�想�加社团�天。如果这个社团�您乱�垃圾信�，那就�消选择这项。" />
                 <check_box label="在我的档案中列出该社团" name="list_groups_in_profile" tool_tip="设置您是�想�在档案中列出该社团"/>
         </panel>
         <string name="incomplete_member_data_str">
-                �新获�会员信�
+                获�团员信�中
         </string>
         <string name="confirm_group_create_str">
-你真的，真的，真----的----确定�花费M$0�创建这个社团�?
+你真的，真的，真----的----确定�花费[GROUPCREATEFEE]�创建这个社团�?
         </string>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/zh/panel_group_land_money.xml b/linden/indra/newview/skins/default/xui/zh/panel_group_land_money.xml
index cf1866c..0c0a64a 100644
--- a/linden/indra/newview/skins/default/xui/zh/panel_group_land_money.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_group_land_money.xml
@@ -11,7 +11,7 @@
                 你没有查看这个社团账户信�的��。
         </string>
         <string name="loading_txt">
-                载入...
+                载入中...
         </string>
         <text name="group_land_heading">
                 社团所�有土地
@@ -55,7 +55,7 @@
                 社团�员必须贡献更多的土地�度，�支�土地的使用。
         </text>
         <text name="group_money_heading">
-                社团资产 L$
+                社团 [CURRENCY]
         </text>
         <tab_container name="group_money_tab_container">
                 <panel label="计划" name="group_money_planning_tab">
diff --git a/linden/indra/newview/skins/default/xui/zh/panel_groups.xml b/linden/indra/newview/skins/default/xui/zh/panel_groups.xml
index cb658cb..a67c585 100644
--- a/linden/indra/newview/skins/default/xui/zh/panel_groups.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_groups.xml
@@ -1,5 +1,24 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel name="groups">
+        <scroll_list
+                         name="group list">
+                <column
+                                 label="社团�称"
+                                 name="name" />
+                <column
+                                 label="通知"
+                                 name="receive_notices"
+                                 tool_tip="接�该社团的通知" />
+                <column
+                                 label="�天"
+                                 name="join_group_chat"
+                                 tool_tip="�加该社团的社团�天" />
+                <column
+                                 label="公开"
+                                 name="list_in_profile"
+                                 image="ff_visible_online_button.tga"
+                                 tool_tip="在你的档案中列出该社团" />
+        </scroll_list>
         <text name="groupdesc" >
                 您当�激活的社团以粗体表示。
         </text>
@@ -17,6 +36,12 @@
                  label="激活"
                  name="Activate" />
         <button
+                 label="头衔..."
+                 name="Titles..." />
+        <button
+                 label="邀请..."
+                 name="Invite..." />
+        <button
                  label="离开"
                  name="Leave" />
         <button
@@ -25,5 +50,8 @@
         <button
                  label="�索..."
                  name="Search..." />
+        <search_editor 
+                name="group_search"
+                label="�索你的社团" />
 </panel>
 <!--Translated for Second Life 1.19.0 (79185)-->
\ No newline at end of file
diff --git a/linden/indra/newview/skins/default/xui/zh/panel_login.xml b/linden/indra/newview/skins/default/xui/zh/panel_login.xml
index a10df47..b43d441 100644
--- a/linden/indra/newview/skins/default/xui/zh/panel_login.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_login.xml
@@ -1,11 +1,32 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel name="panel_login">
+  <web_browser name="login_html" 
+                         bottom="102" top="-1" left="0" right="-1"
+                         border_visible="false" follows="top|left|bottom|right"
+                         start_url="data:text/html,
+                         %3Chtml%3E
+                         %3Chead%3E %3C/head%3E
+                         %3Cbody bgcolor=%22#5a2d65%22 text=%22ffffff%22%3E
+                         %3Ctable width=%22100%%22 height=%22100%%22 border=%220%22%3E
+                           %3Ctr%3E
+                                 %3Ctd align=%22center%22 valign=%22middle%22 style=%22font-size:0.8em;%22%3E
+                                   %3Cimg src=%22imprudence_loading.png%22 align=%22absmiddle%22%3E
+                                   %3Cbr/%3E
+                                   %3CH1%3E请�候...%3C/H1%3E
+                                 %3C/td%3E
+                           %3C/tr%3C
+                         %3C/table%3E
+                         %3C/body%3E
+                         %3C/html%3E" />
         <text name="first_name_text">
                 �:
         </text>
         <text name="last_name_text">
                 姓:
         </text>
+        <text name="username_text">
+                登入�称:
+        </text>
         <text name="password_text">
                 密�:
         </text>
@@ -27,6 +48,10 @@
         <text name="full_screen_text">
                 登陆�显示器会采用全�显示。
         </text>
+        <text name="grid_text">
+                网格:
+        </text>
+        <button name="grid_btn" label="网格管�器" />
         <button label="新�户..." label_selected="新�户..." name="new_account_btn" />
         <button label="登入" label_selected="登入" name="connect_btn" />
         <button label="�数选择..." label_selected="�数选择..." name="preferences_btn" />
diff --git a/linden/indra/newview/skins/default/xui/zh/panel_mini_map.xml b/linden/indra/newview/skins/default/xui/zh/panel_mini_map.xml
index cc55e26..655d866 100644
--- a/linden/indra/newview/skins/default/xui/zh/panel_mini_map.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_mini_map.xml
@@ -24,4 +24,13 @@
         <text name="nw_label" width="40">
                 西北
         </text>
+        <string name="tooltip_tp">
+                �击瞬间移动
+        </string>
+        <string name="tooltip_pan">
+                按� Shift 拖动平移
+        </string>
+        <string name="tooltip_map">
+                �击打开地图
+        </string>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/zh/panel_overlaybar.xml b/linden/indra/newview/skins/default/xui/zh/panel_overlaybar.xml
index 6e5424d..98ccab6 100644
--- a/linden/indra/newview/skins/default/xui/zh/panel_overlaybar.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_overlaybar.xml
@@ -4,13 +4,16 @@
                 <layout_panel min_width="420" name="main_panel">
                         <layout_stack name="chatbar_and_buttons">
                                 <layout_panel name="state_buttons">
-                                        <button label="已收到�时消�" label_selected="已收到�时消�" name="IM Received" tool_tip="你有一个未察看的�时消�。请点击察看"/>
-                                        <button label="�消忙碌状�" label_selected="�消忙碌状�" name="Set Not Busy" tool_tip="�天与�时消�模�已对你��。 点击这里�设定你�在忙碌模�下"/>
-                                        <button label="三维�览" label_selected="三维�览" name="Flycam" tool_tip="你的手柄当�被手柄所控制，点击这里释放。"/>
+                                        <button label="�未读消�" label_selected="�未读消�" name="IM Received" tool_tip="你有一�未察看的�时消�。请点击察看"/>
+                                        <button label="�消忙碌状�" label_selected="�消忙碌状�" name="Set Not Busy" tool_tip="�天与�时消�模�已对你��。 点击这里离开忙碌模�"/>
+                                        <button label="三维�览" label_selected="三维�览" name="Flycam" tool_tip="你的视角当�被手柄所控制，点击这里释放。"/>
                                         <button label="第一人称视角" label_selected="第一人称视角" name="Mouselook" tool_tip="使用鼠标控制�幕。如果你有枪，点击则�以射击。"/>
                                         <button label="起身" label_selected="起身" name="Stand Up" tool_tip="点击这里�站立"/>
                                 </layout_panel>
                         </layout_stack>
                 </layout_panel>
         </layout_stack>
+        <string name="unread_count_string_plural">
+                �未读消�
+        </string>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/zh/panel_particle_settings.xml b/linden/indra/newview/skins/default/xui/zh/panel_particle_settings.xml
new file mode 100644
index 0000000..5bc7ca6
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/zh/panel_particle_settings.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+         label="粒�设置"
+         name="ParticleSettings">
+ 
+        <text
+                 name="part_start_color_textbox">
+                起始颜色:
+        </text>
+        <color_swatch
+                 name="part_start_color_swatch"
+                 tool_tip="点击这里�打开色彩选择器" />
+        <text
+                 name="part_end_color_textbox">
+                结�颜色:
+        </text>
+        <color_swatch
+                 label=""
+                 name="part_end_color_swatch"
+                 tool_tip="点击这里�打开色彩选择器" />
+        <text
+                 name="part_texture_textbox">
+                �质:
+        </text>
+ 
+        <texture_picker
+                 label=""
+                 name="part_texture_picker"
+                 tool_tip="点击这里�选择图片" />
+        <button
+                 name="reset_cloud_this_account"
+                 label="�置该账户"
+                 tool_tip="�置该账户的化身粒�云到默认值" />
+        <button
+                 name="save_cloud_this_account"
+                 label="�存该账户"
+                 tool_tip="�存该账户的化身粒�云" />
+        <button
+                 name="save_cloud_any_account"
+                 label="�存所有账户"
+                 tool_tip="�存化身粒�云设置到所有账户" />
+</panel>
+
+
diff --git a/linden/indra/newview/skins/default/xui/zh/panel_place.xml b/linden/indra/newview/skins/default/xui/zh/panel_place.xml
index 91512d9..b2c5492 100644
--- a/linden/indra/newview/skins/default/xui/zh/panel_place.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_place.xml
@@ -37,7 +37,7 @@
         </string>
         <string
                  name="forsale_text">
-                以L$[PRICE]的价格出售
+                以 [CURRENCY][PRICE] 的价格出售
         </string>
         <string
                  name="auction_text">
diff --git a/linden/indra/newview/skins/default/xui/zh/panel_place_small.xml b/linden/indra/newview/skins/default/xui/zh/panel_place_small.xml
index bbda749..1e978d0 100644
--- a/linden/indra/newview/skins/default/xui/zh/panel_place_small.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_place_small.xml
@@ -25,7 +25,7 @@
                 �积：[AREA]平方米。
         </string>
         <string name="forsale_text">
-                以L$[PRICE]出售
+                以 [CURRENCY][PRICE] 出售
         </string>
         <string name="auction_text">
                 �� ID [ID]。
diff --git a/linden/indra/newview/skins/default/xui/zh/panel_preferences_advanced.xml b/linden/indra/newview/skins/default/xui/zh/panel_preferences_advanced.xml
index f3ce87e..65cfee8 100644
--- a/linden/indra/newview/skins/default/xui/zh/panel_preferences_advanced.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_preferences_advanced.xml
@@ -1,4 +1,164 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="advanced_panel">
-        <check_box label="与物体共享语言" name="language_is_public" tool_tip="这使得世界内的物体�以知�你�好的语言。"/>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+         label="高级"
+         name="advanced_panel">
+  <!-- Start organizing these when we get enough of 'em - MC -->
+  <tab_container
+                 label="第 2 页"
+                 name="tab2"
+                 tab_min_width="50">
+ 
+    <panel
+                         label="主�"
+                         name="main_panel">
+      <text name="user_interface_text">
+        用户界�:
+      </text>
+
+      <check_box
+                                 label="�用登入 / 登出�幕"
+                                 name="disable_log_screen_check" />
+      <check_box
+                                 label="�用瞬间移动�幕"
+                                 name="disable_tp_screen_check" />
+      <check_box
+                                 label="显示 WindLight 工具�"
+                                 name="toggle_windlight_control" />
+      <check_box
+                                 label="使用旧���"
+                                 name="legacy_pie_menu_checkbox" />
+      <text     name="avatar_text">
+        化身:
+      </text>
+      
+      <check_box
+                                 label="在姓�标签中显示客户端�称"
+                                 name="client_name_tag_check" />
+      <check_box
+                                 label="用颜色显示客户端�称"
+                                 name="client_name_color_check" />
+      <check_box
+                                 label="悬��示中显示客户端�称"
+                                 name="client_name_hover_check" />
+      <check_box
+                                 label="对他人显示你的客户端�称"
+                                 name="client_name_tag_broadcast_check" />
+      <check_box
+                                 tool_tip="切�编辑外观时是�起立转身。"
+                                 label="编辑外观时播放化身动画"
+                                 name="appearance_anim_check" />
+      <check_box label="头部跟�鼠标" tooltip="如果您的化身头部跟�您的鼠标动作" name="head_follows_mouse_checkbox" />
+      <check_box label="起飞/�陆通过键盘上/下键控制" name="automatic_fly"/>
+      <check_box label="�天时箭头键总是移动你的化身"
+             name="arrow_keys_move_avatar_check" />
+
+      <text name="chat_text">
+        �天:
+      </text>
+      <check_box label="以�天形�显示脚本错误和警告" name="script_errors_as_chat" />
+      <check_box label="显示收到消�的时间" name="show_timestamps_check" />
+      <check_box
+                                 label="�天和�时通信中使用 MU* 风格动作"
+                                 name="allow_mupose"
+                                 tool_tip="�天和�时通信中使用 MU* 风格动作 (':' �以用�代替 '/me ')。" />
+      <check_box
+                                 label="自动关闭 OOC (( )) �言"
+                                 name="auto_close_ooc"
+                                 tool_tip="自动关闭脱离角色的�言 (�是， 如果键入了 (( 但没有 )) 就添加 )) )." />
+
+      <text
+                                 name="textbox">
+        世界:
+      </text>
+      <check_box
+                                 label="�用阴影 (警告: �稳定并需�图�设置为最高)"
+                                 name="shadows_check" />
+      <text name="lightshare_text">
+          �用区域  WindLight 设置 (LightShare):
+      </text>
+      <combo_box
+                                 name="lightshare_combo"
+                                 allow_text_entry="false">
+        <combo_item
+                                         name="never"
+                                         value="0">
+          从�
+        </combo_item>
+        <combo_item
+                                         name="ask"
+                                         value="1">
+          �次都询问我
+        </combo_item>
+        <combo_item
+                                         name="always"
+                                         value="2">
+          总是
+        </combo_item>
+      </combo_box>
+
+      <check_box label="用颜色区别客户端" name="client_name_color_check" />
+
+
+      <check_box
+                                 label="使用 HTTP 获��质 (实验性)"
+                                 name="http_texture_check" />
+      <check_box
+                                 label="通过��增加�绘�离加速载入"
+                                 name="speed_rez_check" />
+      <spinner
+                                 tool_tip="�绘�离增加之间的将�"
+                                 label="步进间隔:"
+                                 name="speed_rez_interval_spinner" />
+      <text
+                                 name="speed_rez_seconds_text">
+        seconds
+      </text>
+
+
+      <check_box label="与物体共享语言" name="language_is_public" tool_tip="这使得世界内的物体�以知�你�好的语言。"/>
+
+
+ 
+  <!-- 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"
+       bottom_delta="-30" drop_shadow_visible="true" enabled="true" follows="left|top"
+       font="SansSerifSmall" h_pad="0" halign="left" height="18" left="12"
+       mouse_opaque="true" name="crash_report_textbox" v_pad="0" width="394">
+    崩溃报告:
+  </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="crash_behavior_combobox" width="146">
+    <combo_item type="string" length="1" enabled="true" name="Askbeforesending" value="Ask before sending">
+      Ask before sending
+    </combo_item>
+    <combo_item type="string" length="1" enabled="true" name="Alwayssend" value="Always send">
+      Always send
+    </combo_item>
+    <combo_item type="string" length="1" enabled="true" name="Neversend" value="Never send">
+      Never send
+    </combo_item>
+  </combo_box>-->
+ 
+    <button
+                                 label="�置所有选项到默认值"
+                                 name="reset_btn"
+                                 tool_tip="�置所有选项到默认值 (需���动)" />
+    </panel>
+ 
+
+  <panel
+                   label="化身粒�设置"
+                   name="AvatarCloud">
+  <text
+                           name="must_be_logged_in_textbox">
+          必须登入��能更改
+  </text>
+  <check_box
+                           label="预览化身为云"
+                           name="preview_cloud"
+                           tool_tip="预览化身为云，�使已� rezzed" />
+  </panel>
+  </tab_container>
+
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/zh/panel_preferences_audio.xml b/linden/indra/newview/skins/default/xui/zh/panel_preferences_audio.xml
index 3b505b7..8c61f4f 100644
--- a/linden/indra/newview/skins/default/xui/zh/panel_preferences_audio.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_preferences_audio.xml
@@ -4,19 +4,30 @@
                 音�:
         </text>
         <text name="streaming_prefs_text">
-                �媒体首选项:
+                �媒体:
         </text>
         <text name="audio_prefs_text">
-                音频首选项:
+                音频:
         </text>
         <panel label="音�" name="Volume Panel"/>
         <check_box label="当音��用时播放音��(会�用更多带宽)" name="streaming_music"/>
+        <check_box label="�天记录中显示�信�" name="show_stream_title" />
         <check_box label="当视频�用时播放视频�(会�用更多带宽)" name="streaming_video"/>
         <check_box label="自动播放媒体" name="auto_streaming_video"/>
+        <check_box label="媒体控制�工具" name="media_helper_widget" />  
+        <check_box label="过滤媒体 URL" name="enable_media_filter" />
+        <button
+                 name="show_media_filter"
+                 label="媒体过滤设置"
+                 tool_tip="编辑媒体过滤器的设置和�许和�止列表。" />
         <check_box label="当窗�最�化时�蔽声音" name="mute_when_minimized"/>
         <slider label="多普勒效应" name="Doppler Effect" width="250"/>
         <slider label="�离系数" name="Distance Factor"/>
         <slider label="衰�系数:" name="Rolloff Factor"/>
-        <spinner label="L$ �化阈值" name="L$ Change Threshold"/>
-        <spinner label="生命值�化阈值" name="Health Change Threshold"/>
+        <spinner label="[CURRENCY] �化阈值" name="L$ Change Threshold"/>
+        <spinner label="生命值�化阈值" name="Health change threshold"/>
+  <text name="ambient_prefs_text">
+    环境:
+  </text>
+  <check_box label="�用风声" name="mute_wind_check" />
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/zh/panel_preferences_chat.xml b/linden/indra/newview/skins/default/xui/zh/panel_preferences_chat.xml
index 143821d..e2df77f 100644
--- a/linden/indra/newview/skins/default/xui/zh/panel_preferences_chat.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_preferences_chat.xml
@@ -1,72 +1,253 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel label="�天" name="chat">
-        <text type="string" length="1" name="text_box">
-                �天字体大�:
-        </text>
-        <radio_group name="chat_font_size">
-                <radio_item type="string" length="1" name="radio">
-                        ��
-                </radio_item>
-                <radio_item type="string" length="1" name="radio2">
-                        中�
-                </radio_item>
-                <radio_item type="string" length="1" name="radio3">
-                        大�
-                </radio_item>
-        </radio_group>
-        <text type="string" length="1" name="text_box2">
-                �天颜色:
-        </text>
-        <!--Geneko Nemeth: 最多�能写三个字。/Maximum 3 Chinese characters.-->
-        <color_swatch
-                 label="您"
-                 name="user" />
-        <color_swatch
-                 label="其他人"
-                 name="agent" />
-        <color_swatch
-                 label="�时"
-                 name="im" />
-        <color_swatch label="系统" name="system" />
-        <color_swatch label="错误" name="script_error" />
-        <color_swatch label="用户" name="users" />
-        <color_swatch label="物体" name="objects" />
-        <color_swatch label="Owner" name="owner" />
-        <color_swatch label="气�" name="background" />
-        <color_swatch label="链接" name="links" />
-        <text type="string" length="1" name="text_box3">
-                �天控制�:
-        </text>
-        <spinner label="对�淡出时间" name="fade_chat_time" />
-        <text type="string" length="1" name="text_box4">
-                (秒)
-        </text>
-        <text type="string" length="1" name="text_box5">
-                (行)
-        </text>
-        <slider label="��明度" name="console_opacity" />
-        <check_box
-                 label="使用全�宽度  (需���动)"
-                 name="chat_full_width_check" />
-        <text type="string" length="1" name="text_box6">
-                �天选项:
-        </text>
-        <check_box label="用全�宽度�天 (需��)" name="chat_full_width_check" />
-        <check_box label="按回车键关闭�天�" name="close_chat_on_return_check" />
-        <check_box label="�天时箭头键总是移动你的化身"
-             name="arrow_keys_move_avatar_check" />
-        <check_box label="本地�天时显示时间戳" name="show_timestamps_check" />
-        <check_box
-                 label="�天时播放打字动画"
-                 name="play_typing_animation" />
-        <text type="string" length="1" name="text_box7">
-                �天气�:
-        </text>
-        <check_box label="使用气��天" name="bubble_text_chat" />
-        <slider label="��明度" name="bubble_chat_opacity" />
-        <text type="string" length="1" name="text_box8">
-                脚本错误:
-        </text>
-        <check_box label="以�天形�显示脚本错误和警告" name="script_errors_as_chat" />
+  <tab_container
+                 name="chattab2">
+    <panel
+                         label="�天和�时消�"
+                         name="chat_panel">
+                <text type="string" length="1" name="text_box">
+                        �天字体大�:
+                </text>
+                <combo_box
+                                 name="chat_font_size">
+                        <combo_item name="0">
+                          ��
+                        </combo_item>
+                        <combo_item name="1">
+                          中�
+                        </combo_item>
+                        <combo_item name="2">
+                          大�
+                        </combo_item>
+                </combo_box>
 
+                <text type="string" length="1" name="text_box2">
+                        �天颜色:
+                </text>
+                <color_swatch
+                         label="您"
+                         name="user" />
+                <color_swatch
+                         label="其他人"
+                         name="agent" />
+                <color_swatch
+                         label="�时消�"
+                         name="im" />
+                <color_swatch label="系统" name="system" />
+                <color_swatch label="错误" name="script_error" />
+                <color_swatch label="用户" name="users" />
+                <color_swatch label="物体" name="objects" />
+                <color_swatch label="Owner" name="owner" />
+                <color_swatch label="气�" name="background" />
+                <color_swatch label="链接" name="links" />
+                <text type="string" length="1" name="text_box3">
+                        �天控制�:
+                </text>
+                <spinner label="对�淡出时间" name="fade_chat_time" />
+                <text type="string" length="1" name="text_box4">
+                        (秒)
+                </text>
+                <text type="string" length="1" name="text_box5">
+                        (行)
+                </text>
+                <slider label="��明度" name="console_opacity" />
+                <check_box
+                         label="使用全�宽度  (需���动)"
+                         name="chat_full_width_check" />
+                <text type="string" length="1" name="text_box6">
+                        �天�:
+                </text>
+                <check_box label="用全�宽度�天 (需��)" name="chat_full_width_check" />
+                <check_box label="按回车键关闭�天�" name="close_chat_on_return_check" />
+                <check_box
+                         label="�天时播放打字动画"
+                         name="play_typing_animation" />
+        <check_box
+                         label="将�天�作为命令行使用"
+                         name="command_line_check" />
+        <button
+                         label="�天�命令"
+                         name="command_line_btn"
+                         tool_tip="Set specific chatbar command line commands here" />
+                <text type="string" length="1" name="text_box7">
+                        �天气�:
+                </text>
+                <check_box label="使用气��天" name="bubble_text_chat" />
+                <check_box
+                         label="�时显示本地�天和气�"
+                         name="local_bubble_text_chat" />
+                <slider label="��明度" name="bubble_chat_opacity" />
+                <text type="string" length="1" name="text_box8">
+                        脚本错误:
+                </text>
+                <check_box
+                         label="显示自定义�天频�"
+                         name="toggle_channel_control" />
+            <text
+                                 name="Instant Messages:">
+        �时消�:
+      </text>
+
+                <check_box label="���时消�至电�邮件([EMAIL])" name="send_im_to_email" />
+                <text
+                         name="show_ims_label">
+                        显示�时消�:
+                </text>
+                <check_box
+                         label="�天控制�"
+                         name="include_im_in_chat_console" />
+                <check_box
+                         label="本地�天窗�"
+                         name="include_im_in_chat_history" />
+                <check_box
+                         label="垂直�时消�标签页 (需���动)"
+                         name="vertical-imtabs-toggle" />
+        </panel>
+    <panel
+                         label="拼写检查"
+                         name="spell_check_tab">
+
+      <text name="text_box">
+        拼写检查:
+      </text>
+      <button
+                                 label="?"
+                                 name="EmeraldHelp_SpellCheck"
+                                 tool_tip="点击这里获�该页�设置的帮助。" />
+      <check_box
+                                 label="以红色显示拼错的�"
+                                 name="EmeraldSpellDisplay" />
+      <text
+                                 name="EmSpell_txt1">
+        当�语言 (�典):
+      </text>
+      <text
+                                 name="EmSpell_txt3">
+        下载语言 (�典):
+      </text>
+      <button
+                                 label="安装"
+                                 name="EmSpell_Add"
+                                 tool_tip="" />
+      <button
+                                 label="下载更多..."
+                                 name="EmSpell_GetMore"
+                                 tool_tip="在线获�更多�典" />
+      <text
+                                 name="EmSpell_txt2">
+        附加的自定义�典:
+      </text>
+      <button
+                                 label="移除"
+                                 name="EmSpell_Remove"
+                                 tool_tip="" />
+      <!--<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
+                                 name="EmSpell_txt4">
+                                 �使用拼写检查，�键�击拼错的�并选择正确的�替�。
+      </text>
+      <button
+                                 name="ac_button"
+                                 label="自动更正设定..."
+                                 tool_tip="更改自动更正�汇表和设置" />
+                <text
+                         name="text_translate">
+                        翻译�天:
+                </text>
+                <check_box
+                         label="机器翻译�天 (由 Google 强力驱动)"
+                         name="translate_chat" />
+                <text
+                         name="text_translate_chat">
+                        翻译为以下语言:
+                </text>
+                <combo_box
+                         name="translate_language_combobox">
+                        <combo_item
+                                         name="System Default Language">
+                          系统默认值
+                        </combo_item>
+                        <combo_item
+                                         name="English">
+                          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
+                                         name="Danish">
+                          Dansk (丹麦语)
+                        </combo_item>
+                        <combo_item
+                                         name="Deutsch(German)">
+                          Deutsch (德语)
+                        </combo_item>
+                        <combo_item
+                                         name="Spanish">
+                          Español (西�牙语)
+                        </combo_item>
+                        <combo_item
+                                         name="French">
+                          Français (法语)
+                        </combo_item>
+                        <combo_item
+                                         name="Italian">
+                          Italiano (�大利语)
+                        </combo_item>
+                        <combo_item
+                                         name="Hungarian">
+                          Magyar (匈牙利语)
+                        </combo_item>
+                        <combo_item
+                                         name="Dutch">
+                          Nederlands (�兰语)
+                        </combo_item>
+                        <combo_item
+                                         name="Polish">
+                          Polski (波兰语)
+                        </combo_item>
+                        <combo_item
+                                         name="Portugese">
+                          Portugués (葡�牙语)
+                        </combo_item>
+                        <combo_item
+                                         name="Russian">
+                          Ру��кий (俄语)
+                        </combo_item>
+                        <combo_item
+                                         name="Turkish">
+                          Türkçe (土耳其语)
+                        </combo_item>
+                        <combo_item
+                                         name="Ukrainian"
+                                         value="uk">
+                          Україн�ька (乌克兰语)
+                        </combo_item>
+                        <combo_item
+                                         name="Chinese"
+                                         value="zh">
+                          中文
+                        </combo_item>
+                        <combo_item
+                                         name="(Japanese)"
+                                         value="ja">
+                          日本語
+                        </combo_item>
+                        <combo_item
+                                         name="(Korean)"
+                                         value="ko">
+                          한국어 (韩语)
+                        </combo_item>
+                </combo_box>
+    </panel>
+
+ </tab_container>
+                <string name="log_in_to_change">
+                登陆�更改
+                </string>
+  <string
+                 name="default_email_used">
+    使用默认的电�邮件地�
+  </string>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/zh/panel_preferences_colors.xml b/linden/indra/newview/skins/default/xui/zh/panel_preferences_colors.xml
new file mode 100644
index 0000000..691e052
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/zh/panel_preferences_colors.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+         label="�天颜色"
+         name="colors">
+  <text
+                 name="text_box2">
+    �天颜色:
+  </text>
+  <text
+                 name="effects_color_textbox">
+    我的选择光�颜色:
+  </text>
+  <color_swatch
+                 name="effect_color_swatch"
+                 tool_tip="点击这里�打开色彩选择器" />
+
+  <text
+                 name="client_tag_color_textbox">
+    客户端标签颜色:
+  </text>
+  <check_box label="用颜色区别客户端" name="client_name_color_check" />
+  <color_swatch
+                 label="你的�天"
+                 name="user" />
+  <color_swatch
+                 label="他人的�天"
+                 name="agent" />
+  <color_swatch
+                 label="�时消�"
+                 name="im" />
+  <color_swatch
+                 label="系统"
+                 name="system" />
+  <color_swatch
+                 label="脚本错误"
+                 name="script_error" />
+  <color_swatch
+                 label="物体的�天"
+                 name="objects" />
+  <color_swatch
+                 label="物体�时消�"
+                 name="object_ims" />
+  <color_swatch
+                 label="物体对拥有者"
+                 name="owner" />
+  <color_swatch
+                 label="�天气�"
+                 name="background" />
+  <color_swatch
+                 label="链接"
+                 name="links" />
+ 
+  <text
+                 name="text_box3">
+    高亮:
+  </text>
+ 
+  <check_box
+                 label="高亮好�的�天"
+                 name="HighlightFriendsChat" />
+  <color_swatch
+                 label="好�"
+                 name="FriendsChatColor" />
+ 
+  <check_box
+                 label="高亮�有你的�字的本地�天"
+                 name="HighlightOwnNameInChat" />
+  <check_box
+                 label="高亮�有你的�字的社团�天"
+                 name="HighlightOwnNameInIM" />
+  <color_swatch
+                 label="你的�字"
+                 name="OwnNameChatColor" />
+ 
+  <line_editor label="高亮昵称 1:"
+                 name="nick01" />
+  <line_editor label="高亮昵称 2:"
+                 name="nick02" />
+  <line_editor label="高亮昵称 3:"
+                 name="nick03">
+</panel>
diff --git a/linden/indra/newview/skins/default/xui/zh/panel_preferences_fonts.xml b/linden/indra/newview/skins/default/xui/zh/panel_preferences_fonts.xml
new file mode 100644
index 0000000..ecb4e60
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/zh/panel_preferences_fonts.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+         name="fonts_panel"
+         label="字体">
+ 
+  <text name="fontselect">
+    用户界�字体:
+  </text>
+  <text name="(requires restart)">
+    (需���动)
+  </text>
+ 
+  <spinner
+                 name="font_mult"
+                 label="字体放大�数:"
+                 tool_tip="所有字体尺寸将被乘以这个数。" />
+ 
+  <check_box
+                 name="font_round"
+                 label="强制整数字体大� (也许能解决字体模糊问题)" />
+        <text name="UI Size:">
+                界�尺寸:
+        </text>
+   <button
+                 label="�置"
+                 label_selected="�置"
+                 name="reset_ui_size" />
+        <check_box label="使用分辨率无关尺寸" name="ui_auto_scale"/>
+</panel>
diff --git a/linden/indra/newview/skins/default/xui/zh/panel_preferences_general.xml b/linden/indra/newview/skins/default/xui/zh/panel_preferences_general.xml
index 926231c..429bff3 100644
--- a/linden/indra/newview/skins/default/xui/zh/panel_preferences_general.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_preferences_general.xml
@@ -1,30 +1,74 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="一般选项" name="general_panel">
-        <radio_group draw_border="false" name="default_start_location">
-                <radio_item name="MyHome" tool_tip="默认登录到我的家。">
-                        我的家
-                </radio_item>
-                <radio_item name="MyLastLocation" tool_tip="默认登录到我最�的�置。">
-                        我最�在的�置
-                </radio_item>
-        </radio_group>
-        <check_box label="在登陆界�上显示起始�置" name="show_location_checkbox"/>
+        <combo_box
+                 name="default_location_combo"
+                 allow_text_entry="true"
+                 max_chars="128">
+                <combo_item
+                         name="MyHome"
+                         value="My Home">
+                  我的家
+                </combo_item>
+                <combo_item
+                         name="MyLastLocation"
+                         value="My Last Location">
+                  我最�在的�置
+                </combo_item>
+                <combo_item
+                         name="Typeregionname"
+                         value="&lt;Type region name&gt;">
+                  &lt;输入地域�&gt;
+                </combo_item>
+        </combo_box>
+        <check_box label="在登陆界�上显示" name="show_location_checkbox"/>
+        <button
+                 name="grid_btn"
+                 label="网格管�器" />
         <combo_box name="fade_out_combobox">
                 <combo_item name="Never">
                         从�显示
                 </combo_item>
                 <combo_item name="Show Temporarily">
-                        暂时显示
+                        短暂地显示
                 </combo_item>
                 <combo_item name="Always">
                         总是显示
                 </combo_item>
         </combo_box>
-        <check_box label="化身�字使用��字体" name="small_avatar_names_checkbox"/>
+        <check_box label="放大姓�标签" name="large_avatar_names_checkbox"/>
         <check_box label="在我的�幕上��我的�字" name="show_my_name_checkbox"/>
+        <check_box
+                 label="粗体显示好�的姓�标签"
+                 name="highlight_friends_checkbox" />
+        <text
+                 name="Display_Names_textbox">
+                显示�称:
+        </text>
+        <radio_group
+                 name="displaynames">
+                <radio_item
+                         name="0">
+                �典�字
+                </radio_item>
+                <radio_item
+                         name="1">
+                显示�称
+                </radio_item>
+                <radio_item
+                         name="2">
+                两者都显示
+                </radio_item>
+        </radio_group>
+        <check_box
+                 label="显示好�的�典�字"
+                 name="legacy_friends_checkbox" />
         <text name="group_titles_textbox">
                 社团头衔:
         </text>
+        <text
+                 name="show_names_textbox">
+                姓�标签:
+        </text>
         <check_box label="��所有社团头衔" name="show_all_title_checkbox"/>
         <check_box label="��我的社团头衔" name="show_my_title_checkbox"/>
         <color_swatch label="" name="effect_color_swatch" tool_tip="点击这里�打开色彩选择器"/>
@@ -32,39 +76,75 @@
                 界�尺寸:
         </text>
         <check_box bottom="-236" label="使用分辨率无关尺寸" left="148" name="ui_auto_scale" width="256"/>
+  <button
+                 label="�置"
+                 label_selected="�置"
+                 name="reset_ui_size" />
+ <text
+                 name="afk_textbox">
+    空闲时离开:
+  </text>
         <spinner label="离开休�计时:" name="afk_timeout_spinner"/>
-        <check_box label="在付出或收到林登� (L$) 时�醒我" name="notify_money_change_checkbox"/>
+        <check_box
+                 label="空闲时进入离开状�"
+                 name="afk_timeout_checkbox" />
+
+        <text
+                 name="Mini-Map Notify:">
+        迷你地图�醒:
+        </text>
         <text name="maturity_desired_label">
                 分级：
         </text>
         <text name="maturity_desired_prompt">
-                我希望获的土地访问��：
+                我希望访问以下级别的内容：
         </text>
         <combo_box name="maturity_desired_combobox">
                 <combo_item name="Desired_Adult">
-                        PG，Mature和Adult
+                        PG�Mature 和 Adult
                 </combo_item>
                 <combo_item name="Desired_Mature">
-                        PGå’ŒMature
+                        PG 和 Mature
                 </combo_item>
                 <combo_item name="Desired_PG">
-                        仅�PG
+                        仅� PG
                 </combo_item>
         </combo_box>
         <text name="maturity_desired_textbox">
-                仅�PG
+                仅� PG
         </text>
+        <text
+                name="time_textbox">
+        时钟:
+        </text>
+        <combo_box
+                 allow_text_entry="false"
+                 max_chars="20"
+                 name="time_combobox">
+                <combo_item
+                         name="12HourTime"
+                         value="PST 12">
+                        12�时 太平洋标准/�令时
+                </combo_item>
+                <combo_item
+                         name="24HourTime"
+                         value="PST 24">
+                        24�时 太平洋标准/�令时
+                </combo_item>
+                <combo_item
+                         name="UTCTime"
+                         value="UTC">
+                        �调世界时
+                </combo_item>
+        </combo_box>
         <text length="1" name="start_location_textbox" type="string">
                 起始�置:
         </text>
-        <text length="1" name="show_names_textbox" type="string">
-                显示�字:
-        </text>
         <text length="1" name="effects_color_textbox" type="string">
                 我的效果颜色:
         </text>
-        <text length="1" name="seconds_textbox" type="string">
-                秒
+        <text length="1" name="minutes_textbox" type="string">
+                分钟
         </text>
         <text length="1" name="crash_report_textbox" type="string">
                 崩溃报告:
diff --git a/linden/indra/newview/skins/default/xui/zh/panel_preferences_graphics1.xml b/linden/indra/newview/skins/default/xui/zh/panel_preferences_graphics1.xml
index b2c2863..4a2c365 100644
--- a/linden/indra/newview/skins/default/xui/zh/panel_preferences_graphics1.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_preferences_graphics1.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="图�" name="Display panel">
+        <text name="Display_textbox">
+                显示模�:
+        </text>
         <button label="?" name="GraphicsPreferencesHelpButton"/>
         <check_box label="在窗�中�行" name="windowed mode"/>
         <text_editor name="FullScreenInfo">
@@ -10,19 +13,28 @@
         </text>
         <combo_box name="windowsize combo">
                 <combo_item name="640x480">
-                        640x480
+                        640 × 480
                 </combo_item>
                 <combo_item name="800x600">
-                        800x600
+                        800 × 600
                 </combo_item>
                 <combo_item name="720x480">
-                        720x480 (NTSC)
+                        720 × 480 (NTSC)
                 </combo_item>
                 <combo_item name="768x576">
-                        768x576 (PAL)
+                        768 × 576 (PAL)
                 </combo_item>
                 <combo_item name="1024x768">
-                        1024x768
+                        1024 × 768
+                </combo_item>
+                <combo_item name="1280x720">
+                        1280 × 720 (HDV720)
+                </combo_item>
+                <combo_item name="1440x1080">
+                        1440 × 1080 (HDV1080)
+                </combo_item>
+                <combo_item     name="1920x1080">
+                        1920 × 1080 (HD1080)
                 </combo_item>
         </combo_box>
         <text name="DisplayResLabel">
@@ -40,20 +52,20 @@
                         5:4 (1280x1024 液晶显示器)
                 </combo_item>
                 <combo_item name="8:5(Widescreen)">
-                        8:5 (宽�)
+                        8:5 (宽�幕)
                 </combo_item>
                 <combo_item name="16:9(Widescreen)">
                         16:9 (宽�幕)
                 </combo_item>
         </combo_box>
         <check_box label="自动检测" name="aspect_auto_detect"/>
-        <text name="HigherText">
-                质�和
+        <text name="textbox">
+                性能
         </text>
-        <text name="QualityText" width="95">
-                性能:
+        <text name="HigherText2">
+                图�质�
         </text>
-        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" bottom="-86" drop_shadow_visible="true" enabled="true" follows="left|top" font="SansSerifSmall" h_pad="0" halign="left" height="12" hidden="false" left="115" length="1" mouse_opaque="true" name="FasterText" type="string" v_pad="0" width="80">
+        <text name="FasterText">
                 æ›´å¿«
         </text>
         <text name="ShadersPrefText">
@@ -68,9 +80,6 @@
         <text name="ShadersPrefText4">
                 最高
         </text>
-        <text name="HigherText2">
-                更高
-        </text>
         <text name="QualityText2">
                 质�
         </text>
@@ -87,26 +96,31 @@
         <text name="ReflectionDetailText">
                 �射细节:
         </text>
-        <radio_group name="ReflectionDetailRadio">
-                <radio_item name="0">
+        <combo_box name="ReflectionDetailCombo">
+                <combo_item name="0">
                         地�和树木
-                </radio_item>
-                <radio_item name="1">
+                </combo_item>
+                <combo_item name="1">
                         所有��物体
-                </radio_item>
-                <radio_item name="2">
+                </combo_item>
+                <combo_item name="2">
                         所有化身和物体
-                </radio_item>
-                <radio_item name="3">
+                </combo_item>
+                <combo_item name="3">
                         一切东西
-                </radio_item>
-        </radio_group>
+                </combo_item>
+        </combo_box>
+
         <text name="AvatarRenderingText" width="128">
                 化身渲染:
         </text>
         <check_box label="化身替身" name="AvatarImpostors" width="256"/>
         <check_box label="硬件 Skinning" name="AvatarVertexProgram" width="256"/>
         <check_box label="化身衣物效果" name="AvatarCloth" width="256"/>
+        <slider name="AvatarMaxVisible" label="�替身最多 (�)：" />
+        <text name="LimitsText">
+                �制:
+        </text>
         <text name="DrawDistanceMeterText1" width="128">
                 m
         </text>
@@ -149,29 +163,30 @@
         <text name="LightingDetailText">
                 光照细节:
         </text>
-        <radio_group name="LightingDetailRadio">
-                <radio_item name="SunMoon">
+        <combo_box name="LightingDetailCombo">
+                <combo_item name="0">
                         仅有日月光效
-                </radio_item>
-                <radio_item name="LocalLights">
+                </combo_item>
+                <combo_item name="1">
                         附近的�光
-                </radio_item>
-        </radio_group>
+                </combo_item>
+        </combo_box>
         <text name="TerrainDetailText">
                 地�细节:
         </text>
-        <radio_group name="TerrainDetailRadio">
-                <radio_item name="0">
+        <combo_box name="TerrainDetailCombo">
+                <combo_item name="0">
                         低
-                </radio_item>
-                <radio_item name="2">
+                </combo_item>
+                <combo_item name="1">
                         高
-                </radio_item>
-        </radio_group>
+                </combo_item>
+        </combo_box>
+
         <button label="建议设置" name="Defaults"/>
         <button label="硬件选项" label_selected="硬件选项" name="GraphicsHardwareButton"/>
         <string hidden="true" name="resolution_format">
-                [RES_X] x [RES_Y]
+                [RES_X] × [RES_Y]
         </string>
         <string hidden="true" name="aspect_ratio_text">
                 [NUM]:[DEN]
diff --git a/linden/indra/newview/skins/default/xui/zh/panel_preferences_im.xml b/linden/indra/newview/skins/default/xui/zh/panel_preferences_im.xml
index 8fd8054..45d6e78 100644
--- a/linden/indra/newview/skins/default/xui/zh/panel_preferences_im.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_preferences_im.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel label="�时消�" name="im">
+<panel label="�天记录和��" name="im">
+        <text name="Logging:">
+                �天记录:
+        </text>
         <text type="string" length="1" name="text_box">
                 我的在线状�: 
         </text>
@@ -11,8 +14,6 @@
         <text name="log_in_to_change">
                 登陆�更改
         </text>
-        <check_box label="���时消�至电�邮件([EMAIL])" name="send_im_to_email" />
-        <check_box label="本地�天中包��时通信�" name="include_im_in_chat_console" />
         <check_box label="在�时消�中显示时间" name="show_timestamps_check" />
     <check_box
                  label="显示好�上线通知"
@@ -20,11 +21,21 @@
         <check_box label="�存�时通信记录到我的电脑上" name="log_instant_messages" />
         <check_box label="�存对�记录到我的电脑上" name="log_chat" />
         <check_box label="显示上次�时通信的结尾" name="log_show_history" />
-        <button label="更改路径" label_selected="更改路径" name="log_path_button" />
+        <text name="Log location:">
+        记录�置:
+        </text>
+        <button label="更改�置" name="log_path_button" />
+        <text name="Privacy:">
+                ��:
+        </text>
         <text
                  name="text_box3">
                 忙碌模�的自动回�:
         </text>
+        <button
+                 label="�时消�自动回�选项"
+                 name="busy_adv_btn"
+                 tool_tip="�时消�自动回�选项" />
         <text
                  name="text_box4">
                 �天记录选项:
@@ -48,5 +59,4 @@
                  label="显示时间时包括日期"
                  name="log_date_timestamp" />
 
-
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/zh/panel_preferences_input.xml b/linden/indra/newview/skins/default/xui/zh/panel_preferences_input.xml
index 19d060f..74e38b2 100644
--- a/linden/indra/newview/skins/default/xui/zh/panel_preferences_input.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_preferences_input.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="输入和摄�头" name="Input panel">
+<panel label="输入和摄�机" name="Input panel">
         <text length="1" name=" Mouselook Options:" type="string">
                 第一人称视角选项设置:
         </text>
@@ -11,7 +11,7 @@
                 自动飞翔选项:
         </text>
         <check_box label="起飞/�陆通过键盘上/下键控制" name="automatic_fly"/>
-        <text length="1" name=" Camera Options:" type="string">
+        <text length="1" name="Camera Options:" type="string">
                 摄�机选项:
         </text>
         <text name="camera_fov_label">
@@ -20,11 +20,52 @@
         <text name="Camera Follow Distance:">
                 摄�机跟��离:
         </text>
-        <check_box label="编辑物体时使用自动视角" name="edit_camera_movement" tool_tip="当进入和离开编辑模�时，自动移动摄�头"/>
-        <check_box label="编辑外观时使用自动视角" name="appearance_camera_movement" tool_tip="在编辑外观时，摄�头自动定�"/>
+        <text
+                 name="Camera Transition Time:">
+                摄�机过渡时间:
+        </text>
+        <text
+                 name="Camera Smoothing:">
+                摄�机平滑:
+        </text>
+        <check_box label="编辑物体时使用自动视角" name="edit_camera_movement" tool_tip="当进入和离开编辑模�时，自动移动摄�机"/>
+        <check_box label="编辑外观时使用自动视角" name="appearance_camera_movement" tool_tip="在编辑外观时，摄�机自动定�"/>
+        <check_box
+                 label="�用摄�机�制"
+                 name="Disable camera constraints"
+                 tool_tip="�用摄�机�制，例如�离�制和地��制" />
+        <check_box
+                 label="�用最�放大�离"
+                 name="disable_min_zoom_check"
+                 tool_tip="�焦元件或化身并拉近视角时，�用最��离" />
         <text name="text2">
                 化身显示选项:
         </text>
         <check_box label="第一人称视角中，显示自己的化身" name="first_person_avatar_visible"/>
         <button label="游��设置" name="joystick_setup_button"/>
+        
+        <text name="double_click_action_label">
+                �击动作:
+        </text>
+        <combo_box
+                 name="double_click_action">
+                <combo_item     name="None">
+                        æ— 
+                </combo_item>
+                <combo_item name="Go">
+                        <!--�往-->自动寻路
+                </combo_item>
+        </combo_box>
+
+        <text name="go_action_label">
+                自动寻路方�:
+        </text>
+        <combo_box name="go_action">
+                <combo_item     name="Move">
+                        移动
+                </combo_item>
+                <combo_item name="Teleport">
+                        瞬间移动
+                </combo_item>
+        </combo_box>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/zh/panel_preferences_network.xml b/linden/indra/newview/skins/default/xui/zh/panel_preferences_network.xml
index ccaf9a6..14184cd 100644
--- a/linden/indra/newview/skins/default/xui/zh/panel_preferences_network.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_preferences_network.xml
@@ -1,23 +1,252 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="网络" name="network">
+        <tab_container
+                 name="networktab2"
+                 tab_min_width="50">
+
+        <panel
+                         label="性能"
+                         name="bandwidth_panel">
         <text name="text_box">
                 最大带宽:
         </text>
+        <text name="Speed:">
+        </text>
         <text name="text_box2">
-                kbps (�秒kb数)
+                kbps (���秒)
+        </text>
+        <text name="Texture Fetching:">
+                �质下载:
         </text>
+        <check_box
+                                 label="使用 HTTP 获��质 (实验性)"
+                                 name="http_texture_check" />
+        <check_box
+                                 label="通过��增加�绘�离加速载入"
+                                 name="speed_rez_check" />
+                <spinner
+                                 tool_tip="�绘�离增加之间的将�"
+                                 label="步进间隔:"
+                                 name="speed_rez_interval_spinner" />
+                <text
+                                 name="speed_rez_seconds_text">
+                秒
+                </text>
+                <text
+                                 name="Disk Cache:">
+                �盘高速缓存:
+                </text>
         <text name="cache_size_label_l">
-                �盘高速缓存大�:
+                大�:
         </text>
         <text name="text_box5">
                 兆字节
         </text>
-        <button label="清除缓存" name="clear_cache"/>
+        <button label="清除缓存" name="clear_disk_cache"/>
         <text name="cache_location_label">
                 �盘缓存�置:
         </text>
-        <button label="设置" label_selected="设置" name="set_cache"/>
-        <button label="�置" label_selected="设置" name="reset_cache"/>
-        <check_box label="自定义连接端�" name="connection_port_enabled"/>
+        <button label="设置" label_selected="设置" name="set_disk_cache"/>
+        <button label="�置" label_selected="设置" name="reset_disk_cache"/>
+        </panel>
+
+
+        <!-- PROXY SETTINGS PANEL -->
+
+
+        <panel
+                         label="代��务器设置"
+                         name="proxies">
+        <check_box
+                 label="�用 XMLRPC 代��务器 (登入�土地�以�购买货�)"
+                 name="xmlrpc_proxy_enabled" />
+        <text
+                 name="xmlrpc_proxy_text_label">
+                地�:
+        </text>
+        <line_editor
+                 name="xmlrpc_proxy_editor"
+                 tool_tip="希望使用的代��务器�称或 IP 地�" />
+        <spinner
+                 label="端��:"
+                 name="xmlrpc_proxy_port" />
+
+        <!-- SOCKS 5 PROXY -->
+
+        <check_box
+                 label="�用 SOCKS 5 代��务器"
+                 name="socks5_proxy_enabled" />
+        <text
+                 name="socks5_host_label">
+                SOCKS 5 主机:
+        </text>
+        <line_editor
+                 name="socks5_proxy_host"
+                 tool_tip="希望使用的 SOCKS 5 代��务器�称或 IP 地�e" />
+        <spinner
+                 label="端��:"
+                 name="socks5_proxy_port" />
+        <text
+                 name="socks5_auth_label">
+                SOCKS 5 身份验�:
+        </text>
+        <radio_group
+                 name="socks5_auth">
+                <radio_item
+                         name="None"
+                         tool_tip="�使用身份验�">
+                        æ— 
+                </radio_item>
+                <radio_item
+                         name="UserPass"
+                         tool_tip="用户� / 密�身份验�">
+                        用户� / 密�
+                </radio_item>
+        </radio_group>
+        <text
+                 name="socks5_username_label">
+                用户�:
+        </text>
+        <line_editor
+                 name="socks5_proxy_username"
+                 tool_tip="Socks 5代��务器的用户�" />
+
+        <text
+                 name="socks5_password_label">
+                密�:
+        </text>
+        <line_editor
+                 name="socks5_proxy_password"
+                 tool_tip="Socks 5代��务器的密�" />
+
+        <text
+                 name="http_proxy_label">
+                HTTP 代��务器:
+        </text>
+        <radio_group
+                 name="socks5_http_proxy_type">
+                <radio_item
+                         name="None"
+                         tool_tip="�使用代��务器">
+                        �使用
+                </radio_item>
+                <radio_item
+                         name="Socks"
+                         tool_tip="HTTP 连接使用 Socks 5 代��务器">
+                        SOCKS 5
+                </radio_item>
+                <radio_item
+                         name="Web"
+                         tool_tip="HTTP 连接使用 Web 代��务器">
+                        Web
+                </radio_item>
+        </radio_group>
+        <text name="port_label">
+                传出连接:
+        </text>
+        <check_box label="自定义传出连接端�" name="connection_port_enabled"
+                tool_tip="对传出连接使用自定义端�"/>
         <spinner label="端��:" name="connection_port"/>
+        </panel>
+
+
+        <!-- WEB BROWSER PANEL -->
+
+
+        <panel
+                         label="Web �览器"
+                         name="web_browser">
+        <text name="internal_browser_label">
+                内建�览器:
+        </text>
+        <button
+                 label="清除内部�览器缓存"
+                 name="clear_web_cache" />
+        <text type="string" name="cookie_label" >
+                Cookie:
+        </text>
+        <check_box label="从网站接� cookie"
+                         name="cookies_enabled" />
+        <button
+                 label="清除 Cookie"
+                 name="clear_ookies" />
+        <text name="proxy_label">
+                代��务器:
+        </text>
+        <check_box
+                 label="�用网页代��务器"
+                 name="web_proxy_enabled" />
+        <text name="proxy_text_label">
+                地�:
+        </text>
+        <line_editor
+                 name="web_proxy_editor"
+                 tool_tip="你想使用的代��务器的�称或者 IP 地�" />
+        <spinner
+                         label="端��:"
+                         name="web_proxy_port" />
+        <text name="open_links_label">
+                 打开链接:
+        </text>
+        <radio_group name="use_external_browser">
+                 <radio_item
+                         name="external"
+                         tool_tip="使用系统默认网络�览器打开帮助�网页链接, 等等。\n若全�显示则�推�使用。">
+                        使用外部�览器(Firefox, Safari, Internet Explorer)
+                </radio_item>
+                <radio_item
+                         name="internal"
+                         tool_tip="使用内部�览器打开帮助�网页链接, 等等。这个�览器会在 Imprudence 中打开一个新窗�。">
+                        使用内建�览器
+                </radio_item>
+        </radio_group>
+        <text>
+                �览器主页:
+        </text>
+        <line_editor name="home_page" tool_tip="首次打开第二人生�览器时的�览页�" />
+        <text>
+                代��务器�置:
+        </text>
+        <check_box label="内部�览器使用代��务器" name="proxy_enabled"
+                 tool_tip="请为因特网网络�览器指定代��务器�置。" />
+        <text>
+                代��务器:
+        </text>
+        <line_editor name="proxy_address" tool_tip="请输入代��务器的�称或IP地�" />
+        <text>
+                端�：
+        </text>
+        <line_editor name="proxy_port" />
+        <text>
+                对以下内容�使用代�:
+        </text>
+        <line_editor name="proxy_exclusions"
+                 tool_tip="请输入�想使用代��务器替�的�称或IP地�" />
+        <check_box label="在元件上显示网页 (实验性功能, 需���)"
+                 name="web_pages_on_prims_check" />
+        <text>
+                安全地�：
+（登陆察看）
+        </text>
+        <button label="添加" name="add_trusted" />
+        <line_editor name="trusted_site_entry" tool_tip="添加到安全��中的网络地�" />
+        <button label="移除" name="rem_trusted" />
+        <text name="search_url_label">
+                全部 (Web) �索标签 URL:
+        </text>
+        <line_editor
+                 name="world_search_editor"
+                 tool_tip="您想使用的世界�索引擎" />
+        <button
+                 label="�置"
+                 tool_tip="�置为默认值"
+                 name="world_search_reset_default" />
+        <button
+                 label="清除"
+                 tool_tip="清除字段"
+                 name="world_search_clear" />
+        </panel>
+        </tab_container>
+
+</panel>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/zh/panel_preferences_popups.xml b/linden/indra/newview/skins/default/xui/zh/panel_preferences_popups.xml
index eeeaf87..48a3e4c 100644
--- a/linden/indra/newview/skins/default/xui/zh/panel_preferences_popups.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_preferences_popups.xml
@@ -4,15 +4,15 @@
          name="popups"
          title="弹出窗�">
         <text name="dont_show_label">
-                �显示这些弹出窗�:
+                �显示这些�示:
         </text>
         <scroll_list
                  name="disabled_popups" />
         <button
-                 label="�用该弹出窗�"
+                 label="�用该�示"
                  name="enable_popup" />
         <text name="show_label">
-                显示这些弹出窗�:
+                显示这些�示:
         </text>
         <scroll_list
                  name="enabled_popups" />
@@ -26,14 +26,33 @@
         <check_box
                  label="接��自动打开"
                  name="show_new_inventory" />
-        <check_box label="在库存中自动显示新接收的物体" 
+        <check_box label="在库存中自动显示新接收的物�" 
              name="show_in_inventory" />
         <button  width="225"
-                 label="显示所有的“下次��显示�对�框..."
+                 label="显示所有的�示"
                  name="reset_dialogs_btn"
                  tool_tip="�用所有�选的弹出窗��“首次使用��示。" />
         <button  width="225"
-                 label="��所有的“下次��显示�对�框..."
+                 label="��所有的�示"
                  name="skip_dialogs_btn"
                  tool_tip="�用所有�选的弹出窗��“首次使用��示。" />
+  <text  name="radar_text">
+    �天通知:
+  </text>
+  <text
+                 name="When an avatar enters:">
+    当其他化身:
+  </text>
+        <check_box
+                 label="进入�天范围时"
+                 name="mini_map_notify_chat" />
+        <check_box
+                 label="进入区域时"
+                 name="mini_map_notify_sim" />
+    <check_box
+                 label="显示好�上线通知"
+                 name="friends_online_notify_checkbox" />
+<check_box
+                 label="收到或付出 [CURRENCY] 时�示"
+                 name="notify_money_change_checkbox" />
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/zh/panel_preferences_skins.xml b/linden/indra/newview/skins/default/xui/zh/panel_preferences_skins.xml
index 70e0bc2..69b214c 100644
--- a/linden/indra/newview/skins/default/xui/zh/panel_preferences_skins.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_preferences_skins.xml
@@ -1,12 +1,22 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel label="皮肤" name="Skins panel">
         <text name="muting_text">
-                选择皮肤 (需���动)：
+                选择皮肤：
         </text>
-  <radio_group  name="skin_selection">
-    <radio_item name="default">默认</radio_item>
-    <radio_item name="silver">Silver</radio_item>
-  </radio_group>
+        <text
+                 name="requires_restart_text">
+                (需���动; 信�与作者资料请��皮肤文件夹)
+        </text>
+        <radio_group  name="skin_selection">
+                <radio_item name="default">默认</radio_item>
+        </radio_group>
+        <text
+                 name="skin_current_text">
+        其他皮肤:
+        </text>
+        <button
+                name="save_skin"
+                label="�存" />
 </panel>
 
 
diff --git a/linden/indra/newview/skins/default/xui/zh/panel_preferences_voice.xml b/linden/indra/newview/skins/default/xui/zh/panel_preferences_voice.xml
index a41be19..9691aa6 100644
--- a/linden/indra/newview/skins/default/xui/zh/panel_preferences_voice.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_preferences_voice.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel border="true" bottom="-409" enabled="true" follows="left|top|right|bottom" height="408" hidden="false" label="语音�天" left="102" mouse_opaque="true" name="chat" width="517">
+<panel label="语音�天" name="voice_chat">
         <text_editor name="voice_unavailable">
                 语音�天��用。
         </text_editor>
@@ -13,14 +13,14 @@
                 </radio_item>
         </radio_group>
         <text name="push_to_talk_heading">
-                �按�说
+                按键通�
         </text>
         <text_editor name="voice_chat_description" width="465">
-                �按�说�许你控制什么时候传�声音。在切�模�中，按下并释放�按�说键�切�麦克风开关。�在切�模�的时候，麦克风仅在�按�说键按下时�有效。
+                按键通��许你控制什么时候传�声音。在切�模�中，按下并释放�按�说键�切�麦克风开关。�在切�模�的时候，麦克风仅在�按�说键按下时�有效。
         </text_editor>
-        <check_box label="以切�模�使用�按�说" name="push_to_talk_toggle_check"/>
+        <check_box label="以切�模�使用按键通�" name="push_to_talk_toggle_check"/>
         <text name="push_to_talk_label" type="string">
-                �按�说切�键:
+                按键通�切�键:
         </text>
         <line_editor name="modifier_combo"/>
         <button label="设置按键" name="set_voice_hotkey_button"/>
@@ -34,4 +34,5 @@
         <text_editor bottom_delta="-45" height="48" name="device_settings_text">
                 *注�*: �行设备选项或语音设置�导将临时将您从语音�天断开，并且所作的更改将立�生效。
         </text_editor>
+        <button label="�新连接到语音�天" name="reset_voice" />
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/zh/panel_preferences_web.xml b/linden/indra/newview/skins/default/xui/zh/panel_preferences_web.xml
index e965534..ca07b20 100644
--- a/linden/indra/newview/skins/default/xui/zh/panel_preferences_web.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_preferences_web.xml
@@ -2,20 +2,17 @@
 <panel border="true" bottom="-409" enabled="true" follows="left|top|right|bottom"
      height="408" hidden="false" label="Web" left="102" mouse_opaque="true"
      name="web" width="517">
-        <text name="cache_size_label_l">
-                �览器缓存:
-        </text>
         <button 
-             label="现在清除"
+             label="清除内部�览器缓存"
              name="clear_cache" />
         <text type="string" name="cookie_label" >
                 Cookie:
         </text>
         <check_box label="从网站接� cookie"
-             name="cookies_enabled" /> 
-        <button 
-             label="现在清除" 
-             name="clear_cookies" />
+             name="cookies_enabled" />
+        <button
+             label="清除 Cookie"
+             name="clear_ookies" />
         <text name="proxy_label">
                 代��务器:
         </text>
@@ -39,7 +36,7 @@
                 </radio_item>
                 <radio_item
                          name="internal"
-                         tool_tip="使用内部�览器打开帮助�网页链接, 等等。这个�览器会在第二人生中打开一个新窗�。">
+                         tool_tip="使用内部�览器打开帮助�网页链接, 等等。这个�览器会在 Imprudence 中打开一个新窗�。">
                         使用内建�览器
                 </radio_item>
         </radio_group>
@@ -85,4 +82,19 @@
         <button label="添加" name="add_trusted" />
         <line_editor name="trusted_site_entry" tool_tip="添加到安全��中的网络地�" />
         <button label="移除" name="rem_trusted" />
+        <text name="cache_size_label_l">
+                全部 (Web) �索标签 URL:
+        </text>
+        <line_editor
+                 name="world_search_editor"
+                 tool_tip="您想使用的世界�索引擎" />
+        <button
+                 label="�置"
+                 tool_tip="�置为默认值"
+                 name="world_search_reset_default" />
+        <button
+                 label="清除"
+                 tool_tip="清除字段"
+                 name="world_search_clear" />
+        
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/zh/panel_radar.xml b/linden/indra/newview/skins/default/xui/zh/panel_radar.xml
new file mode 100644
index 0000000..db4fc89
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/zh/panel_radar.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<!-- Note: panel rect (size) is specified in floater_mini_map.xml --><panel
+         name="RadarPanel"
+         label="Radar">
+        <string name="no_one_near">
+                范围内无化身
+        </string>
+        <string name="is_muted">
+                (已�蔽)
+        </string>
+        <string name="is_typing">
+                (打字中)
+        </string>
+        <string name="entering_chat_range">
+                [NAME] 进入了�天范围 ([DISTANCE]m)
+        </string>
+        <string name="entering_sim_range">
+                [NAME] 进入了当�区域 ([DISTANCE]m)
+        </string>
+        <string name="avatars_in_singular">
+                [COUNT] �化身于
+        </string>
+        <string name="avatars_in_plural">
+                [COUNT] �化身于
+        </string>
+        <string name="unknown_avatar">
+                (未知)
+        </string>
+        <text name="avatar_count" left="5">
+                0 �化身于
+        </text>
+        <text name="meters" left_delta="100">
+                m内
+        </text>
+        <tab_container name="radar_tab_container">
+                <panel
+                         name="avatar_tab"
+                         label="化身">
+                        <button
+                                 name="im_btn"
+                                 label="�天/呼�"
+                                 tool_tip="打开�时通信会�" />
+                        <button
+                                 name="profile_btn"
+                                 label="档案"
+                                 tool_tip="显示图片�社团和其他信�" />
+                        <button
+                                 name="offer_teleport_btn"
+                                 label="邀请瞬移"
+                                 tool_tip="邀请此人瞬间移动到你的�置" />
+                        <button
+                                 name="teleport_btn"
+                                 label="瞬移到..."
+                                 tool_tip="瞬间移动到他人的�置" />
+                        <button
+                                 name="track_btn"
+                                 label="追踪"
+                                 tool_tip="创建信标追踪�以在地图上显示的好�" />
+                        <button
+                                 name="invite_btn"
+                                 label="邀请..."
+                                 tool_tip="邀请加入社团" />
+                        <button
+                                 name="add_btn"
+                                 label="添加..."
+                                 tool_tip="邀请其他居民�为你的好�" />
+                </panel>
+                <panel
+                         name="estate_tab"
+                         label="地产">
+                        <button
+                                 name="cam_btn"
+                                 label="�焦..." />
+                        <button
+                                 name="freeze_btn"
+                                 label="冻结..." />
+                        <button
+                                 name="eject_btn"
+                                 label="驱�..." />
+                        <button
+                                 name="ban_btn"
+                                 label="��..." />
+                        <button
+                                 name="mute_btn"
+                                 label="�蔽..." />
+                        <button
+                                 name="unmute_btn"
+                                 label="解除�蔽..." />
+                        <button
+                                 name="ar_btn"
+                                 label="报告..." />
+                </panel>
+        </tab_container>
+
+        <scroll_list name="RadarList">
+                <column
+                         name="avatar_name"
+                         label="�称" />
+                <column
+                         name="avatar_distance"
+                         label="�离" />
+        </scroll_list>
+</panel>
+
diff --git a/linden/indra/newview/skins/default/xui/zh/panel_region_general.xml b/linden/indra/newview/skins/default/xui/zh/panel_region_general.xml
index 186d27e..146c1f9 100644
--- a/linden/indra/newview/skins/default/xui/zh/panel_region_general.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_region_general.xml
@@ -36,6 +36,7 @@
         <button label="?" name="agent_limit_help"/>
         <spinner label="�外物体因数" name="object_bonus_spin"/>
         <button label="?" name="object_bonus_help"/>
+    <spinner label="最�账户年龄" name="minimum_agent_age"/>
         <text label="�人内容" name="access_text">
                 分级：
         </text>
diff --git a/linden/indra/newview/skins/default/xui/zh/panel_region_open_region_settings.xml b/linden/indra/newview/skins/default/xui/zh/panel_region_open_region_settings.xml
new file mode 100644
index 0000000..0c63782
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/zh/panel_region_open_region_settings.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+         label="区域设置"
+         name="RegionSettings">
+        <spinner
+                 label="默认�绘�离"
+                 name="draw_distance" />
+  <check_box
+                 label="强制�绘�离"
+                 name="force_draw_distance" />
+  <spinner
+                 label="最大拖动�离"
+                 name="max_drag_distance" />
+  <spinner
+                 label="最大元件尺寸"
+                 name="max_prim_scale" />
+  <spinner
+                 label="最�元件尺寸"
+                 name="min_prim_scale" />
+  <spinner
+                 label="最大物�元件尺寸"
+                 name="max_phys_prim_scale" />
+  <spinner
+                 label="最大窟窿尺寸"
+                 name="max_hollow_size" />
+  <spinner
+                 label="最�窟窿尺寸"
+                 name="min_hole_size" />
+  <spinner
+                 label="最大链接数"
+                 name="max_link_count" />
+  <spinner
+                 label="最大物�链接数"
+                 name="max_link_count_phys" />
+  <spinner
+                 label="最大库存物�转让数"
+                 name="max_inventory_items_transfer" />
+  <spinner
+                 label="显示标签"
+                 name="show_tags" />
+  <spinner
+                 label="最大社团数"
+                 name="max_groups" />
+  <check_box
+                 label="渲染水�"
+                 name="render_water" />
+        <check_box
+                 label="�许迷你地图"
+                 name="allow_minimap" />
+        <check_box
+                 label="�许物�元件"
+                 name="allow_physical_prims" />
+        <check_box
+                 label="�用未�年模�"
+                 name="enable_teen_mode" />
+  <check_box
+                 label="�用建造尺寸�制"
+                 name="enforce_max_build" />
+        <check_box
+                 label="�许地� WindLight 设置"
+                 name="allow_parcel_windlight" />
+  <button
+                 label="应用"
+                 name="apply_ors_btn" />
+</panel>
+
+
diff --git a/linden/indra/newview/skins/default/xui/zh/panel_speaker_controls.xml b/linden/indra/newview/skins/default/xui/zh/panel_speaker_controls.xml
index 0dce0f2..7e39b42 100644
--- a/linden/indra/newview/skins/default/xui/zh/panel_speaker_controls.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_speaker_controls.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="active_speakers_panel">
         <string name="moderator_label">
-                (管�员)
+                (主�人)
         </string>
         <layout_stack name="panels">
                 <layout_panel name="moderation_mode_panel">
                         <combo_box name="moderation_mode">
                                 <combo_item name="OpenVoice">
-                                        声音 缺� 开
+                                        语音默认开放
                                 </combo_item>
                                 <combo_item name="ModeratedVoice">
-                                        声音 缺� 关
+                                        语音默认关闭
                                 </combo_item>
                         </combo_box>
                 </layout_panel>
@@ -34,7 +34,7 @@
                                 �许语音�天
                         </check_box>
                         <check_box name="moderator_allow_text">
-                                �许文本�天
+                                �许文字�天
                         </check_box>
                 </layout_panel>
         </layout_stack>
diff --git a/linden/indra/newview/skins/default/xui/zh/panel_status_bar.xml b/linden/indra/newview/skins/default/xui/zh/panel_status_bar.xml
index 0f65852..d79feb0 100644
--- a/linden/indra/newview/skins/default/xui/zh/panel_status_bar.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_status_bar.xml
@@ -21,8 +21,8 @@
         <button label="" label_selected="" name="restrictpush" tool_tip="��许推动"/>
         <button label="" label_selected="" name="status_no_voice" tool_tip="此处语音��用"/>
         <button label="" label_selected="" name="buyland" tool_tip="购买这�土地"/>
-        <line_editor label="�索" name="search_editor" tool_tip="�索 Second Life"/>
-        <button label="" label_selected="" name="search_btn" tool_tip="�索 Second Life"/>
+        <line_editor label="�索" name="search_editor" tool_tip="�索世界"/>
+        <button label="" label_selected="" name="search_btn" tool_tip="�索世界"/>
         <string name="packet_loss_tooltip">
                 �包丢失率
         </string>
diff --git a/linden/indra/newview/skins/default/xui/zh/panel_toolbar.xml b/linden/indra/newview/skins/default/xui/zh/panel_toolbar.xml
index e9c381d..154d6f5 100644
--- a/linden/indra/newview/skins/default/xui/zh/panel_toolbar.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_toolbar.xml
@@ -4,7 +4,7 @@
                 ����窗�
         </string>
         <layout_stack name="toolbar_stack">
-                <button label="�时通" name="im_btn" tool_tip="用�时通�系你的朋�。" />
+                <button label="�时消�" name="im_btn" tool_tip="用�时消��系你的朋�。" />
                 <button label="" name="chat_btn" tool_tip="显示�天�。(回车键)" />
                 <flyout_button label="交�" name="communicate_btn"
                      tool_tip="查找并与你的好�和社团交�。" />
diff --git a/linden/indra/newview/skins/default/xui/zh/panel_voice_options.xml b/linden/indra/newview/skins/default/xui/zh/panel_voice_options.xml
index 6f98195..c082004 100644
--- a/linden/indra/newview/skins/default/xui/zh/panel_voice_options.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_voice_options.xml
@@ -11,7 +11,7 @@
                         从化身的�置�语音�天。
                 </radio_item>
         </radio_group>
-        <check_box label="仅好���我�起语�请求" name="friends_only_check"/>
+        <check_box label="仅好���我�起语音呼�请求" name="friends_only_check"/>
         <check_box label="以切�模�使用�按�说" name="push_to_talk_toggle_check"/>
         <text name="push_to_talk_label" word_wrap="true">
                 �按�说切�键:
diff --git a/linden/indra/newview/skins/default/xui/zh/panel_windlight_controls.xml b/linden/indra/newview/skins/default/xui/zh/panel_windlight_controls.xml
new file mode 100644
index 0000000..3ecb259
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/zh/panel_windlight_controls.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+         name="windlight_controls">
+  <button
+                 label="编辑器"
+                 name="Environment"
+                 tool_tip="点击这里调节世界环境" />
+  <flyout_button
+                 label="天空"
+                 name="Presets"
+                 tool_tip="Windlight 预设">
+  </flyout_button>
+  <button
+                 toggle="true"
+                 label=""
+                 name="Popup"
+                 tool_tip="点击这里调节�绘�离" />
+</panel>
+
diff --git a/linden/indra/newview/skins/default/xui/zh/strings.xml b/linden/indra/newview/skins/default/xui/zh/strings.xml
index 3eb0014..5b541cd 100644
--- a/linden/indra/newview/skins/default/xui/zh/strings.xml
+++ b/linden/indra/newview/skins/default/xui/zh/strings.xml
@@ -6,12 +6,29 @@
 <strings>
 
         <!-- Imprudence-specific strings -->
+  <string name="landmark_created">你创建了一个地标�于</string>
+  <string name="new_home_page">你的新主页是</string>
+  <string name="server_version_changed_chat">你进入的区域正在�行��的模拟器版本:[SERVER_VERSION_INFO]</string>
+  <string name="hippo_label_free">free</string>
+  <string name="hippo_label_week">周</string>
         <string name="StatBarDaysOfWeek">
                 星期日:星期一:星期二:星期三:星期四:星期五:星期六
         </string>
         <string name="StatBarMonthsOfYear">
                 一月:二月:三月:四月:五月:六月:七月:八月:�月:�月:�一月:�二月
         </string>
+  <string name="TitleBarMultiple">
+    [FIRST_NAME] [LAST_NAME] 于 [GRID_NAME]
+  </string>
+  <string name="copy_obj_key_info">
+    �制了键为了:
+  </string>
+  <string name="TeleportOfferMaturity">
+    [NAME] 邀请你瞬间移动到 [DESTINATION]
+  </string>
+  <string name="TeleportLureMaturity">
+    [NAME] 邀请你瞬间移动到 [DESTINATION]
+  </string>
         
         <string name="LoginInProgress">
                 正在登录。 [APP_NAME] �能会看上去没有�应。 请�候。
@@ -110,7 +127,7 @@
                 �任��制
         </string>
         <string name="TooltipForSaleL$">
-                å¾…å”®: L$[AMOUNT]
+                å¾…å”®: [CURRENCY][AMOUNT]
         </string>
         <string name="TooltipForSaleMsg">
                 å¾…å”®: [MESSAGE]
@@ -281,7 +298,7 @@
                 摇手指
         </string>
         <string name="anim_fist_pump">
-                Fist Pump
+                冲拳
         </string>
         <string name="anim_yoga_float">
                 浮空瑜伽
@@ -350,10 +367,10 @@
                 RPS 剪刀
         </string>
         <string name="anim_express_repulsed">
-                Repulsed
+                排斥
         </string>
         <string name="anim_kick_roundhouse_r">
-                Roundhouse Kick
+                扫堂腿
         </string>
         <string name="anim_express_sad">
                 伤心
diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py
index 61a266a..6f85311 100755
--- a/linden/indra/newview/viewer_manifest.py
+++ b/linden/indra/newview/viewer_manifest.py
@@ -585,7 +585,8 @@ class DarwinManifest(ViewerManifest):
 
         if self.prefix(src="", dst="Contents"):  # everything goes in Contents
             
-            self.path("Info-meta-impy.plist", dst="Info.plist")
+            # Info.plist goes directly in Contents
+            self.path("packaging/mac/Info.plist", dst="Info.plist")
 
             # copy additional libs in <bundle>/Contents/MacOS/
             if (not self.standalone()) and self.prefix(src="../../libraries/universal-darwin/lib_release", dst="MacOS/"):
@@ -666,27 +667,27 @@ class DarwinManifest(ViewerManifest):
                 self.gather_documents()
 
                 self.path("featuretable_mac.txt")
-                self.path("SecondLife.nib")
-
                 self.path("viewer.icns")
                 
-                # Translations
-                self.path("English.lproj")
-                self.path("German.lproj")
-                self.path("Japanese.lproj")
-                self.path("Korean.lproj")
-                self.path("da.lproj")
-                self.path("es.lproj")
-                self.path("fr.lproj")
-                self.path("hu.lproj")
-                self.path("it.lproj")
-                self.path("nl.lproj")
-                self.path("pl.lproj")
-                self.path("pt.lproj")
-                self.path("ru.lproj")
-                self.path("tr.lproj")
-                self.path("uk.lproj")
-                self.path("zh-Hans.lproj")
+                if self.prefix(src="packaging/mac", dst=""):
+                    self.path("SecondLife.nib")
+                    self.path("English.lproj")
+                    self.path("German.lproj")
+                    self.path("Japanese.lproj")
+                    self.path("Korean.lproj")
+                    self.path("da.lproj")
+                    self.path("es.lproj")
+                    self.path("fr.lproj")
+                    self.path("hu.lproj")
+                    self.path("it.lproj")
+                    self.path("nl.lproj")
+                    self.path("pl.lproj")
+                    self.path("pt.lproj")
+                    self.path("ru.lproj")
+                    self.path("tr.lproj")
+                    self.path("uk.lproj")
+                    self.path("zh-Hans.lproj")
+                    self.end_prefix("packaging/mac")
 
 
                 # if (not self.standalone()) and self.prefix(src="../../libraries/universal-darwin/lib_release/gstreamer-plugins", dst="lib/gstreamer-plugins"):
diff --git a/linden/indra/newview/viewerinfo.cpp b/linden/indra/newview/viewerinfo.cpp
new file mode 100644
index 0000000..59e35d4
--- /dev/null
+++ b/linden/indra/newview/viewerinfo.cpp
@@ -0,0 +1,148 @@
+/**
+ * @file viewerinfo.cpp
+ * @brief Functions for querying the viewer name, version, and other info.
+ * @author Jacek Antonelli
+ *
+ * Copyright (c) 2010-2011, Jacek Antonelli
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA  02110-1301  USA
+ */
+
+#include "llviewerprecompiledheaders.h"
+
+#include "viewerinfo.h"
+
+namespace ViewerInfo
+{
+
+        // These are intentionally defined here instead of in the header,
+        // because they should NOT be read directly. Use the functions.
+        const std::string NAME  = "meta-impy";
+        const std::string VARNT = "";
+        const S32         MAJOR = 1;
+        const S32         MINOR = 4;
+        const S32         PATCH = 1;
+        const S32         RLEAS = 1; // increment for each beta/RC/release
+        const std::string EXTRA = "beta 1";
+
+        // Mac OS X bundle identifier. Should match the one in Info.plist.
+        const std::string BUNDLE_ID = "org.imprudenceviewer.viewer";
+
+
+        const std::string& viewerName()
+        {
+                return NAME;
+        }
+
+        const std::string& viewerVariant()
+        {
+                return VARNT;
+        }
+
+        const std::string& nameWithVariant()
+        {
+                static std::string s;
+                if (!s.empty())
+                {
+                        return s;
+                }
+
+                if (VARNT.empty())
+                {
+                        s = NAME;
+                }
+                else
+                {
+                        s = NAME + " " + VARNT;
+                }
+
+                return s;
+        }
+
+        S32 versionMajor()
+        {
+                return MAJOR;
+        }
+
+        S32 versionMinor()
+        {
+                return MINOR;
+        }
+
+        S32 versionPatch()
+        {
+                return PATCH;
+        }
+
+        S32 versionRelease()
+        {
+                return RLEAS;
+        }
+
+        const std::string& versionExtra()
+        {
+                return EXTRA;
+        }
+
+        const std::string& versionNumbers3()
+        {
+                static std::string s = llformat("%d.%d.%d", MAJOR, MINOR, PATCH);
+                return s;
+        }
+
+        const std::string& versionNumbers4()
+        {
+                static std::string s = llformat("%d.%d.%d.%d",
+                                                MAJOR, MINOR, PATCH, RLEAS);
+                return s;
+        }
+
+        const std::string& prettyVersion()
+        {
+                static std::string s;
+                if (s.length() > 0)
+                {
+                        return s;
+                }
+
+                s = versionNumbers3();
+
+                if (EXTRA.length() > 0)
+                {
+                        s += " " + EXTRA;
+                }
+
+                return s;
+        }
+
+        const std::string& prettyInfo()
+        {
+                static std::string s = nameWithVariant() + " " + prettyVersion();
+                return s;
+        }
+
+        const std::string& terseInfo()
+        {
+                static std::string s = nameWithVariant() + " " + versionNumbers4();
+                return s;
+        }
+
+        const std::string& bundleID()
+        {
+                return BUNDLE_ID;
+        }
+
+}
diff --git a/linden/indra/newview/viewerinfo.h b/linden/indra/newview/viewerinfo.h
new file mode 100644
index 0000000..fe2e829
--- /dev/null
+++ b/linden/indra/newview/viewerinfo.h
@@ -0,0 +1,93 @@
+/**
+ * @file viewerinfo.h
+ * @brief Functions for querying the viewer name, version, and other info.
+ * @author Jacek Antonelli
+ *
+ * Copyright (c) 2010-2011, Jacek Antonelli
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA  02110-1301  USA
+ */
+
+#ifndef VERSIONINFO_H
+#define VERSIONINFO_H
+
+#include "linden_common.h"
+
+namespace ViewerInfo
+{
+        /// Returns the name of the viewer.
+        const std::string& viewerName();
+
+        /// Returns the viewer variant (e.g. "Experimental").
+        /// May be empty, if no variant string was set.
+        const std::string& viewerVariant();
+
+        /// Returns a string with the viewer name and variant
+        /// (if it has one).
+        const std::string& nameWithVariant();
+
+        /// Returns the major (first) version number.
+        /// This number increases for each major release, and the
+        /// minor, patch, and release numbers are reset to zero.
+        S32 versionMajor();
+
+        /// Returns the minor (second) version number.
+        /// This number increases for each minor release, and the
+        /// patch and release numbers are reset to zero.
+        S32 versionMinor();
+
+        /// Returns the patch (third) version number.
+        /// This number increases for each patch (bugfix) release,
+        /// and the release number is reset to zero.
+        S32 versionPatch();
+
+        /// Returns the release (fourth) version number.
+        /// This number increases for each beta, release candidate,
+        /// and final release.
+        S32 versionRelease();
+
+        /// Returns the extra version string (e.g. "beta 1", "RC1").
+        /// May be empty, if no extra string was set.
+        const std::string& versionExtra();
+
+        /// Returns a three-segment dot-separated version string
+  /// ("major.minor.patch"). Intended for human reading.
+        const std::string& versionNumbers3();
+
+        /// Returns a four-segment dot-separated version string
+  /// ("major.minor.patch.release"). Intended for computer use, e.g.
+  /// login channel or version number comparison.
+        const std::string& versionNumbers4();
+
+        /// Returns the three-segment version number with extra version
+        /// string (if not empty). Intended for human reading.
+        const std::string& prettyVersion();
+
+        /// Returns the viewer name, variant (if not empty), and pretty
+        /// version. Intended for human reading.
+        const std::string& prettyInfo();
+
+        /// Returns the the viewer name, variant (if not empty), and
+        /// 4-segment version. Intended for computer use, e.g. login channel
+        /// or version number comparison.
+        const std::string& terseInfo();
+
+        /// Returns a string with the viewer's Mac OS X bundle identifier.
+        const std::string& bundleID();
+
+}
+
+#endif // VERSIONINFO_H
diff --git a/linden/indra/newview/viewerversion.cpp b/linden/indra/newview/viewerversion.cpp
deleted file mode 100644
index 3678cb4..0000000
--- a/linden/indra/newview/viewerversion.cpp
+++ /dev/null
@@ -1,89 +0,0 @@
-/**
-* @file viewerversion.cpp
-* @brief set the viewer version in xml
-*
-* $LicenseInfo:firstyear=2009&license=viewergpl$
-*
-* Copyright (c) 2010, McCabe Maxsted
-*
-* Imprudence Viewer Source Code
-* The source code in this file ("Source Code") is provided to you
-* under the terms of the GNU General Public License, version 2.0
-* ("GPL"). 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 SOURCE CODE IS PROVIDED "AS IS." THE AUTHOR MAKES NO
-* WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
-* COMPLETENESS OR PERFORMANCE.
-* $/LicenseInfo$
-*/
-
-#include "llviewerprecompiledheaders.h"
-
-#include "lldir.h"
-#include "llxmltree.h"
-#include "viewerversion.h"
-
-
-S32 ViewerVersion::sVersionMajor = 0;
-S32 ViewerVersion::sVersionMinor = 0;
-S32 ViewerVersion::sVersionPatch = 0;
-std::string ViewerVersion::sVersionTest = "";
-
-const std::string ViewerVersion::sViewerName = "meta-impy";
-
-ViewerVersion::ViewerVersion()
-{
-}
-
-bool ViewerVersion::initViewerVersion()
-{
-        std::string file_path = gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "viewerversion.xml");
-
-        if (!gDirUtilp->fileExists(file_path))
-        {
-                llwarns << "Unable to find viewerversion.xml in app_settings folder" << llendl;
-                return false;
-        }
-        else
-        {
-                LLXMLNodePtr root;
-
-                if (!LLXMLNode::parseFile(file_path, root, NULL))
-                {
-                        llwarns << "Unable to parse version file: " << file_path << llendl;
-                        return false;
-                }
-                
-                if (root.isNull()) // shouldn't ever happen
-                {
-                        llwarns << "Error while trying to read viewerversion.xml" << llendl;
-                        return false;
-                }
-
-                LLXMLNodePtr child_nodep = root->getFirstChild();
-                while (child_nodep.notNull())
-                {
-                        child_nodep->getAttributeS32("version_major", sVersionMajor);
-                        child_nodep->getAttributeS32("version_minor", sVersionMinor);
-                        child_nodep->getAttributeS32("version_patch", sVersionPatch);
-                        child_nodep->getAttributeString("version_test", sVersionTest);
-
-                        child_nodep = child_nodep->getNextSibling();
-                }
-
-                llinfos << "Version set to: " << sVersionMajor << "." << sVersionMinor << "." << sVersionPatch << " " << sVersionTest << llendl;
-
-                return true;
-        }
-}
diff --git a/linden/indra/newview/viewerversion.h b/linden/indra/newview/viewerversion.h
deleted file mode 100644
index a517f9f..0000000
--- a/linden/indra/newview/viewerversion.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/**
-* @file viewerversion.h
-* @brief set the viewer version in xml
-*
-* $LicenseInfo:firstyear=2009&license=viewergpl$
-*
-* Copyright (c) 2010, McCabe Maxsted
-*
-* Imprudence Viewer Source Code
-* The source code in this file ("Source Code") is provided to you
-* under the terms of the GNU General Public License, version 2.0
-* ("GPL"). 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 SOURCE CODE IS PROVIDED "AS IS." THE AUTHOR MAKES NO
-* WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
-* COMPLETENESS OR PERFORMANCE.
-* $/LicenseInfo$
-*/
-
-#ifndef VIEWERVERSION_H
-#define VIEWERVERSION_H
-
-#include "llversionviewer.h" // for LL versioning only
-
-class ViewerVersion
-{
-public:
-        ViewerVersion();
-        /*virtual*/ ~ViewerVersion();
-
-        static bool initViewerVersion();
-
-        // Returns the major version of Imprudence
-        static S32                      getImpMajorVersion() { return sVersionMajor; }
-        // Returns the minor version of Imprudence
-        static S32                      getImpMinorVersion() { return sVersionMinor; }
-        // Returns the patch version of Imprudence
-        static S32                      getImpPatchVersion() { return sVersionPatch; }
-        // Returns the test version of Imprudence
-        static std::string  getImpTestVersion() { return sVersionTest; }
-        // Returns the name of the viewer. Currently always "Imprudence"
-        static std::string      getImpViewerName() { return sViewerName; }
-
-        // Returns the major version of the viewer
-        static S32                      getLLMajorVersion() { return LL_VERSION_MAJOR; }
-        // Returns the minor version of the viewer
-        static S32                      getLLMinorVersion() { return LL_VERSION_MINOR; }
-        // Returns the patch version of the viewer
-        static S32                      getLLPatchVersion() { return LL_VERSION_PATCH; }
-        // Returns the build version of the viewer
-        static S32                  getLLBuildVersion() { return LL_VERSION_BUILD; }
-        // Returns the name of the viewer ("meta-impy")
-        static std::string      getLLViewerName() { return LL_VIEWER_NAME; }
-
-        // Note that the viewer channel is set in settings.xml
-        // as VersionChannelName. LL_VIEWER_CHANNEL is not 
-        // used in Imprudence
-
-private:
-        static S32                      sVersionMajor;
-        static S32                      sVersionMinor;
-        static S32                      sVersionPatch;
-        static std::string      sVersionTest;
-        
-        static const std::string  sViewerName;
-};
-
-#endif // VIEWERVERSION_H
diff --git a/linden/install.xml b/linden/install.xml
index 8d71435..d25636d 100755
--- a/linden/install.xml
+++ b/linden/install.xml
@@ -1092,9 +1092,9 @@ Copyright (C) 2004-2005 Vladimir Berezniker @ http://public.xdi.org/=vmpn
       <key>ogg-vorbis</key>
       <map>
         <key>copyright</key>
-        <string>Copyright (C) 2008 Xiph.org Foundation</string>
+        <string>Copyright (C) Xiph.org Foundation</string>
         <key>description</key>
-        <string>Ogg: container format Vorbis: audio compression scheme</string>
+        <string>Ogg: container format; Vorbis: audio compression scheme</string>
         <key>license</key>
         <string>xiph-bsd</string>
         <key>packages</key>
@@ -1102,30 +1102,30 @@ Copyright (C) 2004-2005 Vladimir Berezniker @ http://public.xdi.org/=vmpn
           <key>darwin</key>
           <map>
             <key>md5sum</key>
-            <string>88eec3965fc2384436192faef1db2629</string>
+            <string>30c75ce29c2ce2f6e8063067db31989d</string>
             <key>url</key>
-            <uri>http://imprudenceviewer.org/download/libs/ogg-vorbis-darwin-20100620.tar.bz2</uri>
+            <uri>http://download.kokuaviewer.org/files/libs/ogg-vorbis-darwin-1.2.2-1.3.2-20110517.tar.bz2</uri>
           </map>
           <key>linux</key>
           <map>
             <key>md5sum</key>
-            <string>72bde567859934024c8a4a70b97b24f5</string>
+            <string>a132634c28f0d7fb0e7e4f62c82a0579</string>
             <key>url</key>
-            <uri>http://imprudenceviewer.org/download/libs/ogg-vorbis-linux-20091115.tar.bz2</uri>
+            <uri>http://download.kokuaviewer.org/files/libs/ogg-vorbis-linux-1.2.2-1.3.2-20110514.tar.bz2</uri>
           </map>
           <key>linux64</key>
           <map>
             <key>md5sum</key>
-            <string>83c72b57a95e8c42560fb67955169f19</string>
+            <string>dded849d4d46fb5d94f088c86407ec98</string>
             <key>url</key>
-            <uri>http://imprudenceviewer.org/download/libs/ogg-vorbis-linux64-20091202.tar.bz2</uri>
+            <uri>http://download.kokuaviewer.org/files/libs/ogg-vorbis-linux64-1.2.2-1.3.2-20110514.tar.bz2</uri>
           </map>
           <key>windows</key>
           <map>
             <key>md5sum</key>
-            <string>9bf1fea65e66b2cd3075e6ffd7eb57ad</string>
+            <string>946bab72f6774220eaf139ce378ba671</string>
             <key>url</key>
-            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/ogg-vorbis-1.1.3-1.2.0-windows-20080723.tar.bz2</uri>
+            <uri>http://download.kokuaviewer.org/files/libs/ogg-vorbis-windows-1.2.2-1.3.2-20110511.tar.bz2</uri>
           </map>
         </map>
       </map>
diff --git a/linden/scripts/build_version.py b/linden/scripts/build_version.py
deleted file mode 100755
index f6b88a9..0000000
--- a/linden/scripts/build_version.py
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/usr/bin/env python
-#
-# Print the build information embedded in a header file.
-#
-# Expects to be invoked from the command line with a file name and a
-# list of directories to search.  The file name will be one of the
-# following:
-#
-#   llversionserver.h
-#   llversionviewer.h
-#
-# The directory list that follows will include indra/llcommon, where
-# these files live.
-
-import errno, os, re
-
-def get_version(filename):
-    fp = open(filename)
-    data = fp.read()
-    fp.close()
-
-    vals = {}
-    m = re.search('<viewer version_major="(\d+)" />', data)
-    vals['major'] = m.group(1)
-    m = re.search('<viewer version_minor="(\d+)" />', data)
-    vals['minor'] = m.group(1)
-    m = re.search('<viewer version_patch="(\d+)" />', data)
-    vals['patch'] = m.group(1)
-    m = re.search('<viewer version_test="(.*)" />', data)
-    vals['test'] = m.group(1)
-
-    version = "%(major)s.%(minor)s.%(patch)s" % vals
-
-    if len(vals['test']) > 0:
-        # Replace some puncuation and spaces with '-' in the test version
-        vals['test'] = re.sub('[ \t:;,+/\\"\'`]+', '-', vals['test'])
-        version += "-%(test)s" % vals
-
-    return version
-
-
-if __name__ == '__main__':
-    import sys
-
-    try:
-        for path in sys.argv[2:]:
-            name = os.path.join(path, sys.argv[1])
-            try:
-                print get_version(name)
-                break
-            except OSError, err:
-                if err.errno != errno.ENOENT:
-                    raise
-        else:
-            print >> sys.stderr, 'File not found:', sys.argv[1]
-            sys.exit(1)
-    except AttributeError:
-        print >> sys.stderr, 'Error: malformatted file: ', name
-        sys.exit(1)
-    except IndexError:
-        print >> sys.stderr, ('Usage: %s llversion[...].h [directories]' %
-                              sys.argv[0])
diff --git a/linden/scripts/package.py b/linden/scripts/package.py
new file mode 100755
index 0000000..e02a9cc
--- /dev/null
+++ b/linden/scripts/package.py
@@ -0,0 +1,334 @@
+#!/usr/bin/env python
+#
+# @file package.py
+# @author Jacek Antonelli
+# @brief Script for generating viewer installer packages.
+#
+# Usage:  package.py --build-dir=PATH [options]
+#
+# Copyright (c) 2007-2009, Linden Research, Inc.
+# Copyright (c) 2010-2011, Jacek Antonelli
+#
+# Permission is hereby granted, free of charge, to any person
+# obtaining a copy of this software and associated documentation files
+# (the "Software"), to deal in the Software without restriction,
+# including without limitation the rights to use, copy, modify, merge,
+# publish, distribute, sublicense, and/or sell copies of the Software,
+# and to permit persons to whom the Software is furnished to do so,
+# subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+#
+
+import os, sys
+from viewer_info import ViewerInfo
+
+
+SCRIPTS_DIR = sys.path[0] # directory containing this script
+TOP_DIR = os.path.abspath(os.path.join(SCRIPTS_DIR,'..'))
+SOURCE_DIR = os.path.abspath(os.path.join(TOP_DIR,'indra'))
+BUILD_TYPE = "RelWithDebInfo"
+
+
+class PackagerError(Exception): pass
+
+class BadDir(PackagerError): pass
+
+class WeirdPlatform(PackagerError): pass
+
+class CmdFailed(PackagerError): pass
+
+
+def indent(text, amount=4):
+    import string
+    lines = [(' '*amount + line) for line in string.split(text, '\n')]
+    return string.join(lines, '\n')
+
+def message(*args):
+    """Prints an informational message with a leading '#'."""
+    print '# ' + ' '.join([str(arg) for arg in args])
+
+def error(*args):
+    """Prints an error message to stderr."""
+    print >> sys.stderr, 'Error: ' + ' '.join([str(arg) for arg in args])
+
+
+class Packager:
+
+    def __init__(self, build_dir, opts={}):
+        options = {'source_dir': SOURCE_DIR,
+                   'build_type': BUILD_TYPE,
+                   'verbose': False,
+                   }
+        options.update(opts)
+
+        self.build_dir = os.path.abspath(build_dir)
+        self.__check_build_dir()
+
+        # Package results go in the top build directory.
+        self.dest_dir = build_dir
+
+        self.source_dir = os.path.abspath(options['source_dir'])
+        self.__check_source_dir()
+
+        self.build_type = options['build_type']
+        self.platform = self.__get_platform()
+        self.verbose = options['verbose']
+        self.viewer_info = ViewerInfo()
+
+
+    def make(self):
+        plat = self.platform
+        if   plat == 'linux':    self.make_linux()
+        elif plat == 'mac':      self.make_mac()
+        elif plat == 'windows':  self.make_windows()
+
+
+    #########
+    # LINUX #
+    #########
+
+    def make_linux(self):
+        import shutil
+
+        packaged_dir = os.path.join(self.build_dir, 'newview', 'packaged')
+
+        if not os.path.exists(packaged_dir):
+            raise BadDir("invalid build dir, has no 'newview/packaged/' "
+                         'subdirectory: %(d)r'%{'d': self.build_dir})
+
+        self.__run_command( 'Checking/fixing file permissions...',
+"""find %(d)r -type d | xargs --no-run-if-empty chmod 755;
+find %(d)r -type f -perm 0700 | xargs --no-run-if-empty chmod 0755;
+find %(d)r -type f -perm 0500 | xargs --no-run-if-empty chmod 0555;
+find %(d)r -type f -perm 0600 | xargs --no-run-if-empty chmod 0644;
+find %(d)r -type f -perm 0400 | xargs --no-run-if-empty chmod 0444;
+true""" % {'d': packaged_dir})
+
+        plat = 'Linux'
+        from platform import architecture
+        if architecture()[0] == '64bit':
+            plat += '-x86_64'
+        elif architecture()[0] == '32bit':
+            plat += '-x86'
+
+        inst_name = self.viewer_info.combined + '-' + plat
+        dest_file = os.path.join(self.dest_dir, inst_name + '.tar.bz2')
+
+        if (os.path.exists(dest_file)):
+            bkp = dest_file + ".bkp"
+            message("Renaming existing package to %r..." % bkp)
+            shutil.move(dest_file, bkp)
+
+        self.__run_command(
+            'Creating package %r (this takes a while)...'%dest_file,
+            'tar -C %(dir)s --numeric-owner '
+            '--transform "s,^./,%(inst_name)s/," '
+            #'--verbose --show-transformed-names '
+            '-cjf %(dest_file)s .' % { 'dir': packaged_dir,
+                                       'inst_name': inst_name,
+                                       'dest_file': dest_file})
+
+        message('Package complete: %r' % dest_file)
+
+
+    #######
+    # MAC #
+    #######
+
+    def make_mac(self):
+        import shutil
+
+        volname = self.viewer_info.name + " Installer"
+
+        # Where the DMG files (background image, etc.) come from.
+        dmg_src = os.path.join(self.source_dir, 'newview', 'packaging', 'mac')
+
+        # Everything that will be in the package is copied to here.
+        dmg_dst = os.path.join('/Volumes', volname)
+
+        if (os.path.exists(dmg_dst)):
+            error('%r is currently attached. Eject it and try again.' % dmg_dst)
+            sys.exit(1)
+
+        app_name = self.viewer_info.name + ".app"
+        app_orig = os.path.join(self.build_dir, 'newview', self.build_type, app_name)
+        app_dst = os.path.join(dmg_dst, app_name)
+
+        if (not os.path.exists(app_orig)):
+            error("App does not exist: %r" % app_orig)
+            sys.exit(1)
+
+        dmg_name = "%s-Mac"%(self.viewer_info.combined)
+        temp_dmg = os.path.join(self.build_dir, dmg_name+".sparseimage")
+        final_dmg = os.path.join(self.dest_dir, dmg_name+".dmg")
+
+        if (os.path.exists(temp_dmg)):
+            message("Removing stale temp disk image...")
+            os.remove(temp_dmg)
+
+        self.__run_command(
+            'Creating temp disk image...',
+            'hdiutil create %(temp)r -volname %(volname)r -fs HFS+ '
+            '-layout SPUD -type SPARSE' %
+            {'temp': temp_dmg, 'volname': volname, 'src': dmg_dst})
+
+        self.__run_command(
+            'Mounting temp disk image...',
+            'hdiutil attach %r -readwrite -noautoopen' % temp_dmg)
+
+        # Move the .app to the staging area (temporarily).
+        message("Copying %r (this takes a while)..."%(app_name))
+        shutil.copytree(app_orig, app_dst, symlinks=True)
+
+        message("Copying background.png...")
+        shutil.copy2( os.path.join(dmg_src, 'background.png'),
+                      os.path.join(dmg_dst, 'background.png'))
+
+        config_script = os.path.join(self.source_dir, 'newview',
+                                     'packaging', 'mac', 'ConfigureDMG.scpt')
+
+        self.__run_command(
+            "Configuring temp disk image's view options...",
+            'osascript %(script)r %(volname)r %(app_name)r' %
+            {'script': config_script, 'volname': volname, 'app_name': app_name})
+
+        self.__run_command(
+            'Unmounting temp disk image...',
+            'hdiutil detach %r' % dmg_dst)
+
+        if (os.path.exists(final_dmg)):
+            bkp = final_dmg + ".bkp"
+            message("Renaming existing final disk image to %r..." % bkp)
+            shutil.move(final_dmg, bkp)
+
+        self.__run_command(
+            'Creating compressed final disk image (this takes a while)...',
+            'hdiutil convert %(temp)r -format UDBZ -o %(final)r' %
+            {'temp':temp_dmg, 'final':final_dmg})
+
+        message("Removing temp disk image...")
+        os.remove(temp_dmg)
+
+        message('Package complete: %r'%final_dmg)
+
+
+    ###########
+    # WINDOWS #
+    ###########
+
+    def make_windows(self):
+        print "Packaging for Windows is not supported yet."
+
+
+    ###################
+    # PRIVATE METHODS #
+    ###################
+
+    def __check_build_dir(self):
+        if not os.path.exists(self.build_dir):
+            raise BadDir('build dir %(dir)r does not exist.' %
+                         {'dir': self.build_dir})
+        if not os.path.isdir(self.build_dir):
+            raise BadDir('build dir %(dir)r is not a directory.' %
+                         {'dir': self.build_dir})
+
+    def __check_source_dir(self):
+        if not os.path.exists(self.source_dir):
+            raise BadDir('source dir %(dir)r does not exist.' %
+                         {'dir': self.source_dir})
+        if not os.path.isdir(self.source_dir):
+            raise BadDir('source dir %(dir)r is not a directory.' %
+                         {'dir': self.source_dir})
+
+    def __get_platform(self):
+        platform = sys.platform
+        try:
+            return {'linux2':'linux',
+                    'linux1':'linux',
+                    'cygwin':'windows',
+                    'win32' :'windows',
+                    'darwin':'mac',
+                    }[platform]
+        except KeyError:
+            raise WeirdPlatform(
+                "Unrecognized platform/operating system: %r" % platform)
+
+    def __run_command(self, summary=None, command=None):
+        if summary: message(summary)
+
+        if not command: return
+
+        import subprocess
+
+        out = subprocess.PIPE # = intercept command's output
+        if self.verbose:
+            print indent(command)
+            out = None # = don't intercept
+
+        child = subprocess.Popen(command, shell=True, stdout=out, stderr=None)
+        status = child.wait()
+
+        if status:
+            raise CmdFailed('A command returned non-zero status (%s):\n%s'%
+                            (status, indent(command)))
+
+
+
+def main(args=sys.argv[1:]):
+    from optparse import OptionParser
+
+    op = OptionParser(usage='%prog --build-dir=PATH [options]')
+
+    op.add_option('--build-dir', dest='build_dir', nargs=1, metavar='PATH',
+                  help='path to the \'build\' directory, which contains '
+                  'CMakeCache.txt and the compile result subdirectories')
+
+    op.add_option('--source-dir', dest='source_dir', nargs=1, metavar='PATH',
+                  default=SOURCE_DIR,
+                  help='optional path to an alternate source directory, '
+                  'i.e. \'indra\'. Default: %(SOURCE_DIR)r'
+                  %{ 'SOURCE_DIR': SOURCE_DIR } )
+
+    op.add_option('--build-type', dest='build_type', nargs=1, metavar='TYPE',
+                  default=BUILD_TYPE,
+                  help='\'Debug\', \'RelWithDebInfo\', or \'Release\'. '
+                  'Default: %(BUILD_TYPE)r'
+                  %{ 'BUILD_TYPE': BUILD_TYPE } )
+
+    op.add_option('-v', '--verbose', action='store_true', default=False,
+                  help='print all shell commands as they are run')
+
+    if not args:
+        op.print_help()
+        return
+
+    options = op.parse_args(args)[0]
+
+    if not options.build_dir:
+        error('--build-dir=PATH is required.')
+        sys.exit(1)
+
+    opts_dict = {'source_dir': options.source_dir,
+                 'build_type': options.build_type,
+                 'verbose':  options.verbose}
+
+    try:
+        Packager(options.build_dir, opts_dict).make()
+    except PackagerError, err:
+        error(err.args[0])
+        sys.exit(1)
+
+
+if __name__ == '__main__':
+    main()
diff --git a/linden/scripts/viewer_info.py b/linden/scripts/viewer_info.py
new file mode 100755
index 0000000..53ea432
--- /dev/null
+++ b/linden/scripts/viewer_info.py
@@ -0,0 +1,101 @@
+#!/usr/bin/env python
+#
+# @file viewer_info.py
+# @author Jacek Antonelli
+# @brief Scans and prints the viewer name and/or version.
+# 
+# Copyright (c) 2010, Jacek Antonelli
+# 
+# Permission is hereby granted, free of charge, to any person
+# obtaining a copy of this software and associated documentation files
+# (the "Software"), to deal in the Software without restriction,
+# including without limitation the rights to use, copy, modify, merge,
+# publish, distribute, sublicense, and/or sell copies of the Software,
+# and to permit persons to whom the Software is furnished to do so,
+# subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+# 
+# 
+# Usage:
+# 
+#   viewer_info.py --name      # viewer name (e.g. "Kokua")
+#   viewer_info.py --version   # viewer version (e.g. "1.0.0-RC1"
+#   viewer_info.py --combined  # name + version (e.g. "Kokua-1.0.0-RC1")
+# 
+# You can pass multiple flags to print each thing on a separate line.
+# E.g. `viewer_info.py --name --version' will print 2 lines, e.g.:
+# 
+#   Kokua
+#   1.0.0-RC1
+# 
+
+import errno, os, re, string, sys
+
+
+class ViewerInfo:
+
+    def __init__(self, filepath=None):
+        f = open(filepath or self.default_file())
+        data = f.read()
+        f.close()
+
+        self.name  = re.search('NAME\s*=\s*"([^"]*)"',  data).group(1)
+        self.major = re.search('MAJOR\s*=\s*(\d+)',     data).group(1)
+        self.minor = re.search('MINOR\s*=\s*(\d+)',     data).group(1)
+        self.patch = re.search('PATCH\s*=\s*(\d+)',     data).group(1)
+        self.extra = re.search('EXTRA\s*=\s*"([^"]*)"', data).group(1)
+        self.bundle_id = re.search('BUNDLE_ID\s*=\s*"([^"]*)"', data).group(1)
+
+        self.version = "%s.%s.%s"%(self.major, self.minor, self.patch)
+        if len(self.extra) > 0:
+            # Replace spaces and some puncuation with '-' in extra
+            extra = re.sub('[- \t:;,!+/\\"\'`]+', '-', self.extra)
+            # Strip any leading or trailing "-"s
+            extra = string.strip(extra, '-')
+            self.version += "-" + extra
+
+        self.combined = self.name + "-" + self.version
+
+    @classmethod
+    def default_file(klass):
+        scripts_dir = sys.path[0] # directory containing this script
+        viewerinfo = os.path.join('indra', 'newview', 'viewerinfo.cpp')
+        filepath = os.path.join(scripts_dir, '..', viewerinfo)
+        return os.path.abspath(filepath)
+
+
+if __name__ == '__main__':
+
+    try:
+        info = ViewerInfo()
+    except IOError, err:
+        if err.errno == errno.ENOENT:
+            print >> sys.stderr, 'File not found:', ViewerInfo.default_file()
+            sys.exit(1)
+        else:
+            raise
+
+    args = sys.argv[1:]
+
+    if not args:
+        print "Usage: %s [--name] [--version] [--combined]"%(sys.argv[0])
+    for arg in args:
+        if '--name' == arg:
+            print info.name
+        elif '--version' == arg:
+            print info.version
+        elif '--combined' == arg:
+            print info.combined
+        elif '--bundle-id' == arg:
+            print info.bundle_id