106 files changed, 1577 insertions, 3254 deletions

diff --git a/linden/indra/cmake/CopyWinLibs.cmake b/linden/indra/cmake/CopyWinLibs.cmake
index add94dd..8767980 100644
--- a/linden/indra/cmake/CopyWinLibs.cmake
+++ b/linden/indra/cmake/CopyWinLibs.cmake
@@ -62,6 +62,7 @@ set(debug_files
         libogg-0.dll
         liboil-0.3-0.dll
         libopenjpeg-2.dll
+        libpng12-0.dll
         libschroedinger-1.0-0.dll
         libspeex-1.dll
         libtheora-0.dll
@@ -136,6 +137,7 @@ set(release_files
         libogg-0.dll
         liboil-0.3-0.dll
         libopenjpeg-2.dll
+        libpng12-0.dll
         libschroedinger-1.0-0.dll
         libspeex-1.dll
         libtheora-0.dll
@@ -165,103 +167,102 @@ set(all_targets ${all_targets} ${out_targets})
 
 
 # Copy MS C runtime dlls, required for packaging.
+# We always need the VS 2005 redist.
 # *TODO - Adapt this to support VC9
-if (MSVC80)
-    FIND_PATH(debug_msvc8_redist_path msvcr80d.dll
-        PATHS
-         [HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\8.0\\Setup\\VC;ProductDir]/redist/Debug_NonRedist/x86/Microsoft.VC80.DebugCRT
-        NO_DEFAULT_PATH
-        NO_DEFAULT_PATH
+FIND_PATH(debug_msvc8_redist_path msvcr80d.dll
+    PATHS
+     [HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\8.0\\Setup\\VC;ProductDir]/redist/Debug_NonRedist/x86/Microsoft.VC80.DebugCRT
+    NO_DEFAULT_PATH
+    NO_DEFAULT_PATH
+    )
+
+if(EXISTS ${debug_msvc8_redist_path})
+    set(debug_msvc8_files
+        msvcr80d.dll
+        msvcp80d.dll
+        Microsoft.VC80.DebugCRT.manifest
         )
 
-    if(EXISTS ${debug_msvc8_redist_path})
-        set(debug_msvc8_files
-            msvcr80d.dll
-            msvcp80d.dll
-            Microsoft.VC80.DebugCRT.manifest
-            )
+    copy_if_different(
+        ${debug_msvc8_redist_path} 
+        "${CMAKE_CURRENT_BINARY_DIR}/Debug"
+        out_targets 
+        ${debug_msvc8_files}
+        )
+    set(all_targets ${all_targets} ${out_targets})
 
-        copy_if_different(
-            ${debug_msvc8_redist_path} 
-            "${CMAKE_CURRENT_BINARY_DIR}/Debug"
-            out_targets 
-            ${debug_msvc8_files}
-            )
-        set(all_targets ${all_targets} ${out_targets})
+    set(debug_appconfig_file ${CMAKE_CURRENT_BINARY_DIR}/Debug/${VIEWER_BINARY_NAME}.exe.config)
+    add_custom_command(
+        OUTPUT ${debug_appconfig_file}
+        COMMAND ${PYTHON_EXECUTABLE}
+        ARGS
+          ${CMAKE_CURRENT_SOURCE_DIR}/build_win32_appConfig.py
+          ${CMAKE_CURRENT_BINARY_DIR}/Debug/Microsoft.VC80.DebugCRT.manifest
+          ${CMAKE_CURRENT_SOURCE_DIR}/ImprudenceDebug.exe.config
+          ${debug_appconfig_file}
+        DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/Debug/Microsoft.VC80.DebugCRT.manifest
+        COMMENT "Creating debug app config file"
+        )
 
-        set(debug_appconfig_file ${CMAKE_CURRENT_BINARY_DIR}/Debug/${VIEWER_BINARY_NAME}.exe.config)
-        add_custom_command(
-            OUTPUT ${debug_appconfig_file}
-            COMMAND ${PYTHON_EXECUTABLE}
-            ARGS
-              ${CMAKE_CURRENT_SOURCE_DIR}/build_win32_appConfig.py
-              ${CMAKE_CURRENT_BINARY_DIR}/Debug/Microsoft.VC80.DebugCRT.manifest
-              ${CMAKE_CURRENT_SOURCE_DIR}/ImprudenceDebug.exe.config
-              ${debug_appconfig_file}
-            DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/Debug/Microsoft.VC80.DebugCRT.manifest
-            COMMENT "Creating debug app config file"
-            )
+endif (EXISTS ${debug_msvc8_redist_path})
 
-    endif (EXISTS ${debug_msvc8_redist_path})
+FIND_PATH(release_msvc8_redist_path msvcr80.dll
+    PATHS
+     [HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\8.0\\Setup\\VC;ProductDir]/redist/x86/Microsoft.VC80.CRT
+    NO_DEFAULT_PATH
+    NO_DEFAULT_PATH
+    )
 
-    FIND_PATH(release_msvc8_redist_path msvcr80.dll
-        PATHS
-         [HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\8.0\\Setup\\VC;ProductDir]/redist/x86/Microsoft.VC80.CRT
-        NO_DEFAULT_PATH
-        NO_DEFAULT_PATH
+if(EXISTS ${release_msvc8_redist_path})
+    set(release_msvc8_files
+        msvcr80.dll
+        msvcp80.dll
+        Microsoft.VC80.CRT.manifest
         )
 
-    if(EXISTS ${release_msvc8_redist_path})
-        set(release_msvc8_files
-            msvcr80.dll
-            msvcp80.dll
-            Microsoft.VC80.CRT.manifest
-            )
-
-        copy_if_different(
-            ${release_msvc8_redist_path} 
-            "${CMAKE_CURRENT_BINARY_DIR}/Release"
-            out_targets 
-            ${release_msvc8_files}
-            )
-        set(all_targets ${all_targets} ${out_targets})
+    copy_if_different(
+        ${release_msvc8_redist_path} 
+        "${CMAKE_CURRENT_BINARY_DIR}/Release"
+        out_targets 
+        ${release_msvc8_files}
+        )
+    set(all_targets ${all_targets} ${out_targets})
 
-        copy_if_different(
-            ${release_msvc8_redist_path} 
-            "${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo"
-            out_targets 
-            ${release_msvc8_files}
-            )
-        set(all_targets ${all_targets} ${out_targets})
+    copy_if_different(
+        ${release_msvc8_redist_path} 
+        "${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo"
+        out_targets 
+        ${release_msvc8_files}
+        )
+    set(all_targets ${all_targets} ${out_targets})
 
-        set(release_appconfig_file ${CMAKE_CURRENT_BINARY_DIR}/Release/${VIEWER_BINARY_NAME}.exe.config)
-        add_custom_command(
-            OUTPUT ${release_appconfig_file}
-            COMMAND ${PYTHON_EXECUTABLE}
-            ARGS
-              ${CMAKE_CURRENT_SOURCE_DIR}/build_win32_appConfig.py
-              ${CMAKE_CURRENT_BINARY_DIR}/Release/Microsoft.VC80.CRT.manifest
-              ${CMAKE_CURRENT_SOURCE_DIR}/Imprudence.exe.config
-              ${release_appconfig_file}
-            DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/Release/Microsoft.VC80.CRT.manifest
-            COMMENT "Creating release app config file"
-            )
+    set(release_appconfig_file ${CMAKE_CURRENT_BINARY_DIR}/Release/${VIEWER_BINARY_NAME}.exe.config)
+    add_custom_command(
+        OUTPUT ${release_appconfig_file}
+        COMMAND ${PYTHON_EXECUTABLE}
+        ARGS
+          ${CMAKE_CURRENT_SOURCE_DIR}/build_win32_appConfig.py
+          ${CMAKE_CURRENT_BINARY_DIR}/Release/Microsoft.VC80.CRT.manifest
+          ${CMAKE_CURRENT_SOURCE_DIR}/Imprudence.exe.config
+          ${release_appconfig_file}
+        DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/Release/Microsoft.VC80.CRT.manifest
+        COMMENT "Creating release app config file"
+        )
 
-        set(relwithdebinfo_appconfig_file ${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/${VIEWER_BINARY_NAME}.exe.config)
-        add_custom_command(
-            OUTPUT ${relwithdebinfo_appconfig_file}
-            COMMAND ${PYTHON_EXECUTABLE}
-            ARGS
-              ${CMAKE_CURRENT_SOURCE_DIR}/build_win32_appConfig.py
-              ${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/Microsoft.VC80.CRT.manifest
-              ${CMAKE_CURRENT_SOURCE_DIR}/Imprudence.exe.config
-              ${relwithdebinfo_appconfig_file}
-            DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/Microsoft.VC80.CRT.manifest
-            COMMENT "Creating relwithdebinfo app config file"
-            )
-          
-    endif (EXISTS ${release_msvc8_redist_path})
-endif (MSVC80)
+    set(relwithdebinfo_appconfig_file ${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/${VIEWER_BINARY_NAME}.exe.config)
+    add_custom_command(
+        OUTPUT ${relwithdebinfo_appconfig_file}
+        COMMAND ${PYTHON_EXECUTABLE}
+        ARGS
+          ${CMAKE_CURRENT_SOURCE_DIR}/build_win32_appConfig.py
+          ${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/Microsoft.VC80.CRT.manifest
+          ${CMAKE_CURRENT_SOURCE_DIR}/Imprudence.exe.config
+          ${relwithdebinfo_appconfig_file}
+        DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/Microsoft.VC80.CRT.manifest
+        COMMENT "Creating relwithdebinfo app config file"
+        )
+      
+endif (EXISTS ${release_msvc8_redist_path})
 
 add_custom_target(copy_win_libs ALL
   DEPENDS 
diff --git a/linden/indra/cmake/OPENAL.cmake b/linden/indra/cmake/OPENAL.cmake
index 71cbd67..60abef3 100644
--- a/linden/indra/cmake/OPENAL.cmake
+++ b/linden/indra/cmake/OPENAL.cmake
@@ -14,10 +14,11 @@ if (OPENAL)
   use_prebuilt_binary(openal)
   
   if (WINDOWS)
-    find_library(OPENAL_LIB
-      NAMES openal32
-      PATHS ${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release
+    set(OPENAL_LIB
+          optimized ${ARCH_PREBUILT_DIRS_RELEASE}/openal32.lib
+          debug ${ARCH_PREBUILT_DIRS_DEBUG}/openal32.lib
       )
+  
   elseif (DARWIN)
     # Look for for system's OpenAL.framework
     find_library(OPENAL_LIB
@@ -59,9 +60,9 @@ if (OPENAL)
   # ALUT_LIB
 
   if (WINDOWS)
-   find_library(ALUT_LIB
-     NAMES alut freealut
-     PATHS ${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release
+   set(ALUT_LIB
+         optimized ${ARCH_PREBUILT_DIRS_RELEASE}/alut.lib
+         debug ${ARCH_PREBUILT_DIRS_DEBUG}/alut.lib
      )
   elseif (DARWIN)
     find_library( ALUT_LIB
diff --git a/linden/indra/cmake/ViewerMiscLibs.cmake b/linden/indra/cmake/ViewerMiscLibs.cmake
index 2a8abda..7bd306b 100644
--- a/linden/indra/cmake/ViewerMiscLibs.cmake
+++ b/linden/indra/cmake/ViewerMiscLibs.cmake
@@ -7,3 +7,7 @@ if (NOT STANDALONE)
   use_prebuilt_binary(fontconfig)
 endif(NOT STANDALONE)
 
+if (WINDOWS)
+  use_prebuilt_binary(dbghelp)
+endif (WINDOWS)
+
diff --git a/linden/indra/develop.py b/linden/indra/develop.py
index 8ea435c..31dcb6a 100755
--- a/linden/indra/develop.py
+++ b/linden/indra/develop.py
@@ -520,12 +520,14 @@ class WindowsSetup(PlatformSetup):
             unattended=self.unattended,
             project_name=self.project_name
             )
-        #if simple:
+        # default to packaging enabled
+        # if simple:
         #    return 'cmake %(opts)s "%(dir)s"' % args
         return ('cmake -G "%(generator)s" '
                 '-DSTANDALONE:BOOL=%(standalone)s '
                 '-DUNATTENDED:BOOL=%(unattended)s '
                 '-DROOT_PROJECT_NAME:STRING=%(project_name)s '
+                '-DPACKAGE:BOOL=ON '
                 '%(opts)s "%(dir)s"' % args)
 
     def find_visual_studio(self, gen=None):
diff --git a/linden/indra/lib/python/indra/util/llmanifest.py b/linden/indra/lib/python/indra/util/llmanifest.py
index 59c84e5..369cc81 100644
--- a/linden/indra/lib/python/indra/util/llmanifest.py
+++ b/linden/indra/lib/python/indra/util/llmanifest.py
@@ -81,10 +81,11 @@ def get_default_version(srctree):
     for p in paths:
         if os.path.exists(p):
             contents = open(p, 'r').read()
-            major = re.search("LL_VERSION_MAJOR\s=\s([0-9]+)", contents).group(1)
-            minor = re.search("LL_VERSION_MINOR\s=\s([0-9]+)", contents).group(1)
-            patch = re.search("LL_VERSION_PATCH\s=\s([0-9]+)", contents).group(1)
-            build = re.search("LL_VERSION_BUILD\s=\s([0-9]+)", contents).group(1)
+            major = re.search("IMP_VERSION_MAJOR\s=\s([0-9]+)", contents).group(1)
+            minor = re.search("IMP_VERSION_MINOR\s=\s([0-9]+)", contents).group(1)
+            patch = re.search("IMP_VERSION_PATCH\s=\s([0-9]+)", contents).group(1)
+            #build = re.search("LL_VERSION_BUILD\s=\s([0-9]+)", contents).group(1)
+            build = re.search('const char \* const IMP_VERSION_TEST = "(.*)";', contents).group(1)
             return major, minor, patch, build
 
 def get_channel(srctree):
@@ -98,7 +99,7 @@ def get_channel(srctree):
     
 
 DEFAULT_SRCTREE = os.path.dirname(sys.argv[0])
-DEFAULT_CHANNEL = 'Second Life Release'
+DEFAULT_CHANNEL = 'Imprudence'
 
 ARGUMENTS=[
     dict(name='actions',
@@ -156,7 +157,7 @@ ARGUMENTS=[
         for use by a .bat file.""",
          default=None),
     dict(name='version',
-         description="""This specifies the version of Second Life that is
+         description="""This specifies the version of Imprudence that is
         being packaged up.""",
          default=get_default_version)
     ]
diff --git a/linden/indra/llprimitive/llprimitive.cpp b/linden/indra/llprimitive/llprimitive.cpp
index 6fc0a55..fb3b540 100644
--- a/linden/indra/llprimitive/llprimitive.cpp
+++ b/linden/indra/llprimitive/llprimitive.cpp
@@ -958,16 +958,213 @@ BOOL LLPrimitive::setVolume(const LLVolumeParams &volume_params, const S32 detai
 
         U32 old_face_mask = mVolumep->mFaceMask;
 
+        S32 face_bit = 0;
+        S32 cur_mask = 0;
+
+        // grab copies of the old faces so we can determine the TE mappings...
+        std::vector<LLProfile::Face> old_faces; // list of old faces for remapping texture entries
+        LLTextureEntry old_tes[9];
+
+        for (S32 face = 0; face < mVolumep->getNumFaces(); face++)
+        {
+                old_faces.push_back(mVolumep->getProfile().mFaces[face]);
+        }
+
+        for (face_bit = 0; face_bit < 9; face_bit++)
+        {
+                cur_mask = 0x1 << face_bit;
+                if (old_face_mask & cur_mask)
+                {
+                        S32 te_index = face_index_from_id(cur_mask, old_faces);
+                        old_tes[face_bit] = *getTE(te_index);
+                        //llinfos << face_bit << ":" << te_index << ":" << old_tes[face_bit].getID() << llendl;
+                }
+        }
+
+
         // build the new object
         sVolumeManager->unrefVolume(mVolumep);
         mVolumep = volumep;
         
-        U32 new_face_mask = mVolumep->mFaceMask;        
-        if (old_face_mask != new_face_mask) 
+        U32 new_face_mask = mVolumep->mFaceMask;
+        S32 i;
+
+        /*
+        std::string old_mask_string;
+        for (i = 0; i < 9; i++)
+        {
+                if (old_face_mask & (1 << i))
+                {
+                        old_mask_string.append("1");
+                }
+                else
+                {
+                        old_mask_string.append("0");
+                }
+        }
+        std::string new_mask_string;
+        for (i = 0; i < 9; i++)
+        {
+                if (new_face_mask & (1 << i))
+                {
+                        new_mask_string.append("1");
+                }
+                else
+                {
+                        new_mask_string.append("0");
+                }
+        }
+
+        llinfos << "old mask: " << old_mask_string << llendl;
+        llinfos << "new mask: " << new_mask_string << llendl;
+        */
+
+
+        if (old_face_mask == new_face_mask) 
         {
+                // nothing to do
+                return TRUE;
+        }
+
+        if (mVolumep->getNumFaces() == 0 && new_face_mask != 0)
+        {
+                llwarns << "Object with 0 faces found...INCORRECT!" << llendl;
                 setNumTEs(mVolumep->getNumFaces());
-        }       
-        
+                return TRUE;
+        }
+
+
+        S32 face_mapping[9];
+        for (face_bit = 0; face_bit < 9; face_bit++)
+        {
+                face_mapping[face_bit] = face_bit;
+        }
+
+        // Generate the face-type mappings
+        for (face_bit = 0; face_bit < 9; face_bit++)
+        {
+                cur_mask = 0x1 << face_bit;
+                if (!(new_face_mask & cur_mask))
+                {
+                        // Face doesn't exist in new map.
+                        face_mapping[face_bit] = -1;
+                        continue;
+                }
+                else if (old_face_mask & cur_mask)
+                {
+                        // Face exists in new and old map.
+                        face_mapping[face_bit] = face_bit;
+                        continue;
+                }
+
+                // OK, how we've got a mismatch, where we have to fill a new face with one from
+                // the old face.
+                if (cur_mask & (LL_FACE_PATH_BEGIN | LL_FACE_PATH_END | LL_FACE_INNER_SIDE))
+                {
+                        // It's a top/bottom/hollow interior face.
+                        if (old_face_mask & LL_FACE_PATH_END)
+                        {
+                                face_mapping[face_bit] = 1;
+                                continue;
+                        }
+                        else
+                        {
+                                S32 cur_outer_mask = LL_FACE_OUTER_SIDE_0;
+                                for (i = 0; i < 4; i++)
+                                {
+                                        if (old_face_mask & cur_outer_mask)
+                                        {
+                                                face_mapping[face_bit] = 5 + i;
+                                                break;
+                                        }
+                                        cur_outer_mask <<= 1;
+                                }
+                                if (i == 4)
+                                {
+                                        llwarns << "No path end or outer face in volume!" << llendl;
+                                }
+                                continue;
+                        }
+                }
+
+                if (cur_mask & (LL_FACE_PROFILE_BEGIN | LL_FACE_PROFILE_END))
+                {
+                        // A cut slice.  Use the hollow interior if we have it.
+                        if (old_face_mask & LL_FACE_INNER_SIDE)
+                        {
+                                face_mapping[face_bit] = 2;
+                                continue;
+                        }
+
+                        // No interior, use the bottom face.
+                        // Could figure out which of the outer faces was nearest, but that would be harder.
+                        if (old_face_mask & LL_FACE_PATH_END)
+                        {
+                                face_mapping[face_bit] = 1;
+                                continue;
+                        }
+                        else
+                        {
+                                S32 cur_outer_mask = LL_FACE_OUTER_SIDE_0;
+                                for (i = 0; i < 4; i++)
+                                {
+                                        if (old_face_mask & cur_outer_mask)
+                                        {
+                                                face_mapping[face_bit] = 5 + i;
+                                                break;
+                                        }
+                                        cur_outer_mask <<= 1;
+                                }
+                                if (i == 4)
+                                {
+                                        llwarns << "No path end or outer face in volume!" << llendl;
+                                }
+                                continue;
+                        }
+                }
+
+                // OK, the face that's missing is an outer face...
+                // Pull from the nearest adjacent outer face (there's always guaranteed to be one...
+                S32 cur_outer = face_bit - 5;
+                S32 min_dist = 5;
+                S32 min_outer_bit = -1;
+                S32 i;
+                for (i = 0; i < 4; i++)
+                {
+                        if (old_face_mask & (LL_FACE_OUTER_SIDE_0 << i))
+                        {
+                                S32 dist = abs(i - cur_outer);
+                                if (dist < min_dist)
+                                {
+                                        min_dist = dist;
+                                        min_outer_bit = i + 5;
+                                }
+                        }
+                }
+                if (-1 == min_outer_bit)
+                {
+                        llinfos << (LLVolume *)mVolumep << llendl;
+                        llwarns << "Bad!  No outer faces, impossible!" << llendl;
+                }
+                face_mapping[face_bit] = min_outer_bit;
+        }
+
+
+        setNumTEs(mVolumep->getNumFaces());
+        for (face_bit = 0; face_bit < 9; face_bit++)
+        {
+                cur_mask = 0x1 << face_bit;
+                if (new_face_mask & cur_mask)
+                {
+                        if (-1 == face_mapping[face_bit])
+                        {
+                                llwarns << "No mapping from old face to new face!" << llendl;
+                        }
+
+                        S32 te_num = face_index_from_id(cur_mask, mVolumep->getProfile().mFaces);
+                        setTE(te_num, old_tes[face_mapping[face_bit]]);
+                }
+        }
         return TRUE;
 }
 
@@ -1135,7 +1332,7 @@ S32 LLPrimitive::unpackTEField(U8 *cur_ptr, U8 *buffer_end, U8 *data_ptr, U8 dat
 // Pack information about all texture entries into container:
 // { TextureEntry Variable 2 }
 // Includes information about image ID, color, scale S,T, offset S,T and rotation
-BOOL LLPrimitive::packTEMessage(LLMessageSystem *mesgsys) const
+BOOL LLPrimitive::packTEMessage(LLMessageSystem *mesgsys, bool shield) const
 {
         const U32 MAX_TES = 32;
 
@@ -1164,7 +1361,17 @@ BOOL LLPrimitive::packTEMessage(LLMessageSystem *mesgsys) const
                 for (face_index = 0; face_index <= last_face_index; face_index++)
                 {
                         // Directly sending image_ids is not safe!
-                        memcpy(&image_ids[face_index*16],getTE(face_index)->getID().mData,16);  /* Flawfinder: ignore */ 
+                        if(shield && !(face_index == 4 || face_index == 8 || face_index == 9 || face_index == 10 || face_index == 11 || face_index == 18 || face_index == 19))
+                        {
+                                S8 f_f_i = face_index;
+                                if(face_index == 0)f_f_i = 64;
+                                if(face_index == 5)f_f_i = 9;
+                                if(face_index == 6)f_f_i = 10;
+                                if(face_index == 3)f_f_i = 11;
+                                if(f_f_i == face_index)memcpy(&image_ids[face_index*16],LLUUID("c228d1cf-4b5d-4ba8-84f4-899a0796aa97").mData,16);
+                                else if(f_f_i == 64)memcpy(&image_ids[face_index*16],LLUUID("cc7a030f-282f-c165-44d2-b5ee572e72bf").mData,16);
+                                else memcpy(&image_ids[face_index*16],LLUUID("4934f1bf-3b1f-cf4f-dbdf-a72550d05bc6").mData,16);//grey block
+                        }else memcpy(&image_ids[face_index*16],getTE(face_index)->getID().mData,16);    /* Flawfinder: ignore */ 
 
                         // Cast LLColor4 to LLColor4U
                         coloru.setVec( getTE(face_index)->getColor() );
diff --git a/linden/indra/llprimitive/llprimitive.h b/linden/indra/llprimitive/llprimitive.h
index cc86f5b..cf9ff0f 100644
--- a/linden/indra/llprimitive/llprimitive.h
+++ b/linden/indra/llprimitive/llprimitive.h
@@ -339,7 +339,7 @@ public:
         void copyTEs(const LLPrimitive *primitive);
         S32 packTEField(U8 *cur_ptr, U8 *data_ptr, U8 data_size, U8 last_face_index, EMsgVariableType type) const;
         S32 unpackTEField(U8 *cur_ptr, U8 *buffer_end, U8 *data_ptr, U8 data_size, U8 face_count, EMsgVariableType type);
-        BOOL packTEMessage(LLMessageSystem *mesgsys) const;
+        BOOL packTEMessage(LLMessageSystem *mesgsys, bool shield = false) const;
         BOOL packTEMessage(LLDataPacker &dp) const;
         S32 unpackTEMessage(LLMessageSystem *mesgsys, char *block_name);
         S32 unpackTEMessage(LLMessageSystem *mesgsys, char *block_name, const S32 block_num); // Variable num of blocks
diff --git a/linden/indra/llui/llbutton.cpp b/linden/indra/llui/llbutton.cpp
index 2c2c1c2..1a6c705 100644
--- a/linden/indra/llui/llbutton.cpp
+++ b/linden/indra/llui/llbutton.cpp
@@ -980,6 +980,8 @@ LLXMLNodePtr LLButton::getXML(bool save_children) const
 {
         LLXMLNodePtr node = LLUICtrl::getXML();
 
+        node->setName(LL_BUTTON_TAG);
+
         node->createChild("label", TRUE)->setStringValue(getLabelUnselected());
         node->createChild("label_selected", TRUE)->setStringValue(getLabelSelected());
         node->createChild("font", TRUE)->setStringValue(LLFontGL::nameFromFont(mGLFont));
diff --git a/linden/indra/llui/llcheckboxctrl.cpp b/linden/indra/llui/llcheckboxctrl.cpp
index eda9467..c1daee7 100644
--- a/linden/indra/llui/llcheckboxctrl.cpp
+++ b/linden/indra/llui/llcheckboxctrl.cpp
@@ -298,12 +298,13 @@ void	LLCheckBoxCtrl::resetDirty()
 }
 
 
-
 // virtual
 LLXMLNodePtr LLCheckBoxCtrl::getXML(bool save_children) const
 {
         LLXMLNodePtr node = LLUICtrl::getXML();
 
+        node->setName(LL_CHECK_BOX_CTRL_TAG);
+
         node->createChild("label", TRUE)->setStringValue(mLabel->getText());
 
         std::string control_name = mButton->getControlName();
diff --git a/linden/indra/llui/llcombobox.cpp b/linden/indra/llui/llcombobox.cpp
index cbc67fe..ce75f03 100644
--- a/linden/indra/llui/llcombobox.cpp
+++ b/linden/indra/llui/llcombobox.cpp
@@ -120,6 +120,8 @@ LLXMLNodePtr LLComboBox::getXML(bool save_children) const
 {
         LLXMLNodePtr node = LLUICtrl::getXML();
 
+        node->setName(LL_COMBO_BOX_TAG);
+
         // Attributes
 
         node->createChild("allow_text_entry", TRUE)->setBoolValue(mAllowTextEntry);
@@ -1172,6 +1174,33 @@ LLFlyoutButton::LLFlyoutButton(
         updateLayout();
 }
 
+// virtual
+LLXMLNodePtr LLFlyoutButton::getXML(bool save_children) const
+{
+        LLXMLNodePtr node = LLComboBox::getXML();
+
+        node->setName(LL_FLYOUT_BUTTON_TAG);
+
+        LLXMLNodePtr child;
+
+        for (child = node->getFirstChild(); child.notNull();)
+        {
+                if (child->hasName("combo_item"))
+                {
+                        child->setName(LL_FLYOUT_BUTTON_ITEM_TAG);
+
+                        //setName does a delete and add, so we have to start over
+                        child = node->getFirstChild();
+                }
+                else
+                {
+                        child = child->getNextSibling();
+                }
+        }
+
+        return node;
+}
+
 //static 
 LLView* LLFlyoutButton::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory)
 {
diff --git a/linden/indra/llui/llcombobox.h b/linden/indra/llui/llcombobox.h
index 33e1baa..95ad17a 100644
--- a/linden/indra/llui/llcombobox.h
+++ b/linden/indra/llui/llcombobox.h
@@ -217,6 +217,7 @@ public:
 
         void setToggleState(BOOL state);
 
+        virtual LLXMLNodePtr getXML(bool save_children = true) const;
         static LLView* fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory);
         static void             onActionButtonClick(void *userdata);
         static void             onSelectAction(LLUICtrl* ctrl, void *userdata);
diff --git a/linden/indra/llui/llfloater.cpp b/linden/indra/llui/llfloater.cpp
index e667bd4..5c46d54 100644
--- a/linden/indra/llui/llfloater.cpp
+++ b/linden/indra/llui/llfloater.cpp
@@ -2527,6 +2527,15 @@ LLMultiFloater::LLMultiFloater(
         
 }
 
+// virtual
+LLXMLNodePtr LLMultiFloater::getXML(bool save_children) const
+{
+        LLXMLNodePtr node = LLFloater::getXML();
+
+        node->setName(LL_MULTI_FLOATER_TAG);
+
+        return node;
+}
 
 void LLMultiFloater::open()     /* Flawfinder: ignore */
 {
@@ -2950,6 +2959,8 @@ LLXMLNodePtr LLFloater::getXML(bool save_children) const
 {
         LLXMLNodePtr node = LLPanel::getXML();
 
+        node->setName(LL_FLOATER_TAG);
+
         node->createChild("title", TRUE)->setStringValue(getCurrentTitle());
 
         node->createChild("can_resize", TRUE)->setBoolValue(isResizable());
diff --git a/linden/indra/llui/llfloater.h b/linden/indra/llui/llfloater.h
index 4906e85..fa69258 100644
--- a/linden/indra/llui/llfloater.h
+++ b/linden/indra/llui/llfloater.h
@@ -400,6 +400,7 @@ public:
         virtual ~LLMultiFloater() {};
 
         virtual BOOL postBuild();
+        virtual LLXMLNodePtr getXML(bool save_children = true) const;
         /*virtual*/ void open();        /* Flawfinder: ignore */
         /*virtual*/ void onClose(bool app_quitting);
         /*virtual*/ void draw();
diff --git a/linden/indra/llui/lliconctrl.cpp b/linden/indra/llui/lliconctrl.cpp
index cb3b2a3..e73c8fe 100644
--- a/linden/indra/llui/lliconctrl.cpp
+++ b/linden/indra/llui/lliconctrl.cpp
@@ -137,6 +137,8 @@ LLXMLNodePtr LLIconCtrl::getXML(bool save_children) const
 {
         LLXMLNodePtr node = LLUICtrl::getXML();
 
+        node->setName(LL_ICON_CTRL_TAG);
+
         if (mImageName != "")
         {
                 node->createChild("image_name", TRUE)->setStringValue(mImageName);
diff --git a/linden/indra/llui/lllineeditor.cpp b/linden/indra/llui/lllineeditor.cpp
index fc33dcf..e5e193f 100644
--- a/linden/indra/llui/lllineeditor.cpp
+++ b/linden/indra/llui/lllineeditor.cpp
@@ -135,18 +135,14 @@ LLLineEditor::LLLineEditor(const std::string& name, const LLRect& rect,
                 mSelectAllonCommit( TRUE ),
                 mPassDelete(FALSE),
                 mReadOnly(FALSE),
+                mHaveHistory(FALSE),
                 mImage( sImage ),
                 mReplaceNewlinesWithSpaces( TRUE )
 {
         llassert( max_length_bytes > 0 );
 
-        // line history support:
-        // - initialize line history list
-        mLineHistory.insert( mLineHistory.end(), "" );
-        // - disable line history by default
-        mHaveHistory = FALSE;
-        // - reset current history line pointer
-        mCurrentHistoryLine = 0;
+        // Initialize current history line iterator
+        mCurrentHistoryLine = mLineHistory.begin();
 
         if (font)
         {
@@ -244,16 +240,31 @@ void LLLineEditor::updateHistory()
         // reset current history line number.
         // Be sure only to remember lines that are not empty and that are
         // different from the last on the list.
-        if( mHaveHistory && mText.length() && ( mLineHistory.empty() || getText() != mLineHistory.back() ) )
+        if( mHaveHistory && getLength() )
         {
-                // discard possible empty line at the end of the history
-                // inserted by setText()
-                if( !mLineHistory.back().length() )
+                if( !mLineHistory.empty() )
                 {
-                        mLineHistory.pop_back();
+                        // When not empty, last line of history should always be blank.
+                        if( mLineHistory.back().empty() )
+                        {
+                                // discard the empty line
+                                mLineHistory.pop_back();
+                        }
+                        else
+                        {
+                                LL_WARNS("") << "Last line of history was not blank." << LL_ENDL;
+                        }
                 }
-                mLineHistory.insert( mLineHistory.end(), getText() );
-                mCurrentHistoryLine = mLineHistory.size() - 1;
+
+                // Add text to history, ignoring duplicates
+                if( mLineHistory.empty() || getText() != mLineHistory.back() )
+                {
+                        mLineHistory.push_back( getText() );
+                }
+
+                // Restore the blank line and set mCurrentHistoryLine to point at it
+                mLineHistory.push_back( "" );
+                mCurrentHistoryLine = mLineHistory.end() - 1;
         }
 }
 
@@ -324,11 +335,8 @@ void LLLineEditor::setText(const LLStringExplicit &new_text)
         }
         setCursor(llmin((S32)mText.length(), getCursor()));
 
-        // Newly set text goes always in the last line of history.
-        // Possible empty strings (as with chat line) will be deleted later.
-        mLineHistory.insert( mLineHistory.end(), new_text );
         // Set current history line to end of history.
-        mCurrentHistoryLine = mLineHistory.size() - 1;
+        mCurrentHistoryLine = mLineHistory.end() - 1;
 
         mPrevText = mText;
 }
@@ -1200,9 +1208,9 @@ BOOL LLLineEditor::handleSpecialKey(KEY key, MASK mask)
         case KEY_UP:
                 if( mHaveHistory && ( MASK_CONTROL == mask ) )
                 {
-                        if( mCurrentHistoryLine > 0 )
+                        if( mCurrentHistoryLine > mLineHistory.begin() )
                         {
-                                mText.assign( mLineHistory[ --mCurrentHistoryLine ] );
+                                mText.assign( *(--mCurrentHistoryLine) );
                                 setCursor(llmin((S32)mText.length(), getCursor()));
                         }
                         else
@@ -1217,9 +1225,9 @@ BOOL LLLineEditor::handleSpecialKey(KEY key, MASK mask)
         case KEY_DOWN:
                 if( mHaveHistory  && ( MASK_CONTROL == mask ) )
                 {
-                        if( !mLineHistory.empty() && mCurrentHistoryLine < mLineHistory.size() - 1 )
+                        if( !mLineHistory.empty() && mCurrentHistoryLine < mLineHistory.end() - 1 )
                         {
-                                mText.assign( mLineHistory[ ++mCurrentHistoryLine ] );
+                                mText.assign( *(++mCurrentHistoryLine) );
                                 setCursor(llmin((S32)mText.length(), getCursor()));
                         }
                         else
@@ -2202,6 +2210,8 @@ LLXMLNodePtr LLLineEditor::getXML(bool save_children) const
 {
         LLXMLNodePtr node = LLUICtrl::getXML();
 
+        node->setName(LL_LINE_EDITOR_TAG);
+
         node->createChild("max_length", TRUE)->setIntValue(mMaxLengthBytes);
 
         node->createChild("font", TRUE)->setStringValue(LLFontGL::nameFromFont(mGLFont));
@@ -2791,6 +2801,16 @@ void LLSearchEditor::onClearSearch(void* user_data)
         }
 }
 
+// virtual
+LLXMLNodePtr LLSearchEditor::getXML(bool save_children) const
+{
+        LLXMLNodePtr node = LLUICtrl::getXML();
+
+        node->setName(LL_SEARCH_EDITOR_TAG);
+
+        return node;
+}
+
 // static
 LLView* LLSearchEditor::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory)
 {
diff --git a/linden/indra/llui/lllineeditor.h b/linden/indra/llui/lllineeditor.h
index a670b21..fc1b75f 100644
--- a/linden/indra/llui/lllineeditor.h
+++ b/linden/indra/llui/lllineeditor.h
@@ -259,8 +259,9 @@ protected:
 
         // line history support:
         BOOL            mHaveHistory;                           // flag for enabled line history
-        std::vector<std::string> mLineHistory;          // line history storage
-        U32                     mCurrentHistoryLine;            // currently browsed history line
+        typedef std::vector<std::string>        line_history_t;
+        line_history_t                          mLineHistory;                   // line history storage
+        line_history_t::iterator        mCurrentHistoryLine;    // currently browsed history line
 
         LLViewBorder* mBorder;
         const LLFontGL* mGLFont;
@@ -385,6 +386,7 @@ public:
 
         /*virtual*/ void        draw();
 
+        virtual LLXMLNodePtr getXML(bool save_children = true) const;
         static LLView* fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory);
 
         void setText(const LLStringExplicit &new_text) { mSearchEdit->setText(new_text); }
diff --git a/linden/indra/llui/llmenugl.cpp b/linden/indra/llui/llmenugl.cpp
index 175bf07..b70f98b 100644
--- a/linden/indra/llui/llmenugl.cpp
+++ b/linden/indra/llui/llmenugl.cpp
@@ -154,6 +154,8 @@ LLXMLNodePtr LLMenuItemGL::getXML(bool save_children) const
 {
         LLXMLNodePtr node = LLView::getXML();
 
+        node->setName(LL_MENU_ITEM_TAG);
+
         node->createChild("type", TRUE)->setStringValue(getType());
 
         node->createChild("label", TRUE)->setStringValue(mLabel);
@@ -526,6 +528,8 @@ class LLMenuItemSeparatorGL : public LLMenuItemGL
 public:
         LLMenuItemSeparatorGL( const std::string &name = SEPARATOR_NAME );
 
+        virtual LLXMLNodePtr getXML(bool save_children = true) const;
+
         virtual std::string getType() const     { return "separator"; }
 
         // doIt() - do the primary funcationality of the menu item.
@@ -544,6 +548,16 @@ LLMenuItemSeparatorGL::LLMenuItemSeparatorGL( const std::string &name ) :
 {
 }
 
+
+LLXMLNodePtr LLMenuItemSeparatorGL::getXML(bool save_children) const
+{
+        LLXMLNodePtr node = LLMenuItemGL::getXML();
+
+        node->setName(LL_MENU_ITEM_SEPARATOR_GL_TAG);
+
+        return node;
+}
+
 void LLMenuItemSeparatorGL::draw( void )
 {
         gGL.color4fv( getDisabledColor().mV );
@@ -624,6 +638,15 @@ LLMenuItemTearOffGL::LLMenuItemTearOffGL(LLHandle<LLFloater> parent_floater_hand
 }
 
 
+LLXMLNodePtr LLMenuItemTearOffGL::getXML(bool save_children) const
+{
+        LLXMLNodePtr node = LLMenuItemGL::getXML();
+
+        node->setName(LL_MENU_ITEM_TEAR_OFF_GL_TAG);
+
+        return node;
+}
+
 void LLMenuItemTearOffGL::doIt()
 {
         if (getMenu()->getTornOff())
@@ -821,6 +844,8 @@ LLXMLNodePtr LLMenuItemCallGL::getXML(bool save_children) const
 {
         LLXMLNodePtr node = LLMenuItemGL::getXML();
 
+        node->setName(LL_MENU_ITEM_CALL_GL_TAG);
+
         // Contents
 
         std::vector<LLListenerEntry> listeners = mDispatcher->getListeners();
@@ -830,6 +855,9 @@ LLXMLNodePtr LLMenuItemCallGL::getXML(bool save_children) const
                 std::string listener_name = findEventListener((LLSimpleListener*)itor->listener);
                 if (!listener_name.empty())
                 {
+                        // *FIX:  It's not always on_click.      It could be on_check, on_enable or on_visible,
+                        // but there's no way to get that from the data that is stored.
+
                         LLXMLNodePtr child_node = node->createChild("on_click", FALSE);
                         child_node->createChild("function", TRUE)->setStringValue(listener_name);
                         child_node->createChild("filter", TRUE)->setStringValue(itor->filter.asString());
@@ -971,6 +999,9 @@ void LLMenuItemCheckGL::setCheckedControl(std::string checked_control, LLView *c
 LLXMLNodePtr LLMenuItemCheckGL::getXML(bool save_children) const
 {
         LLXMLNodePtr node = LLMenuItemCallGL::getXML();
+
+        node->setName(LL_MENU_ITEM_CHECK_GL_TAG);
+
         return node;
 }
 
@@ -1734,6 +1765,8 @@ LLXMLNodePtr LLMenuGL::getXML(bool save_children) const
 {
         LLXMLNodePtr node = LLView::getXML();
 
+        node->setName(LL_MENU_GL_TAG);
+
         // Attributes
 
         node->createChild("opaque", TRUE)->setBoolValue(mBgVisible);
@@ -1904,7 +1937,11 @@ void LLMenuGL::parseChildXML(LLXMLNodePtr child, LLView *parent, LLUICtrlFactory
 
                                                                 LLSimpleListener* callback = parent->getListenerByName(callback_name);
 
-                                                                if (!callback) continue;
+                                                                if (!callback)
+                                                                {
+                                                                        lldebugs << "Ignoring \"on_check\" \"" << item_name << "\" because \"" << callback_name << "\" is not registered" << llendl;
+                                                                        continue;
+                                                                }
 
                                                                 new_item->addListener(callback, "on_build", userdata);
                                                         }
@@ -1945,7 +1982,11 @@ void LLMenuGL::parseChildXML(LLXMLNodePtr child, LLView *parent, LLUICtrlFactory
 
                                                 LLSimpleListener* callback = parent->getListenerByName(callback_name);
 
-                                                if (!callback) continue;
+                                                if (!callback)
+                                                {
+                                                        lldebugs << "Ignoring \"on_click\" \"" << item_name << "\" because \"" << callback_name << "\" is not registered" << llendl;
+                                                        continue;
+                                                }
 
                                                 new_item->addListener(callback, "on_click", callback_data);
                                         }
@@ -1975,7 +2016,11 @@ void LLMenuGL::parseChildXML(LLXMLNodePtr child, LLView *parent, LLUICtrlFactory
 
                                                         LLSimpleListener* callback = parent->getListenerByName(callback_name);
 
-                                                        if (!callback) continue;
+                                                        if (!callback)
+                                                        {
+                                                                lldebugs << "Ignoring \"on_enable\" \"" << item_name << "\" because \"" << callback_name << "\" is not registered" << llendl;
+                                                                continue;
+                                                        }
 
                                                         new_item->addListener(callback, "on_build", userdata);
                                                 }
@@ -2015,7 +2060,11 @@ void LLMenuGL::parseChildXML(LLXMLNodePtr child, LLView *parent, LLUICtrlFactory
 
                                                         LLSimpleListener* callback = parent->getListenerByName(callback_name);
 
-                                                        if (!callback) continue;
+                                                        if (!callback)
+                                                        {
+                                                                lldebugs << "Ignoring \"on_visible\" \"" << item_name << "\" because \"" << callback_name << "\" is not registered" << llendl;
+                                                                continue;
+                                                        }
 
                                                         new_item->addListener(callback, "on_build", userdata);
                                                 }
@@ -3033,6 +3082,8 @@ class LLPieMenuBranch : public LLMenuItemGL
 public:
         LLPieMenuBranch(const std::string& name, const std::string& label, LLPieMenu* branch);
 
+        virtual LLXMLNodePtr getXML(bool save_children = true) const;
+
         // called to rebuild the draw label
         virtual void buildDrawLabel( void );
 
@@ -3055,6 +3106,17 @@ LLPieMenuBranch::LLPieMenuBranch(const std::string& name,
         mBranch->setParentMenuItem(this);
 }
 
+// virtual
+LLXMLNodePtr LLPieMenuBranch::getXML(bool save_children) const
+{
+        if (mBranch)
+        {
+                return mBranch->getXML();
+        }
+
+        return LLMenuItemGL::getXML();
+}
+
 // called to rebuild the draw label
 void LLPieMenuBranch::buildDrawLabel( void )
 {
@@ -3136,6 +3198,16 @@ LLPieMenu::LLPieMenu(const std::string& name)
 }
 
 
+// virtual
+LLXMLNodePtr LLPieMenu::getXML(bool save_children) const
+{
+        LLXMLNodePtr node = LLMenuGL::getXML();
+
+        node->setName(LL_PIE_MENU_TAG);
+
+        return node;
+}
+
 void LLPieMenu::initXML(LLXMLNodePtr node, LLView *context, LLUICtrlFactory *factory)
 {
         LLXMLNodePtr child;
@@ -3837,6 +3909,8 @@ LLXMLNodePtr LLMenuBarGL::getXML(bool save_children) const
 
         LLXMLNodePtr node = LLMenuGL::getXML();
 
+        node->setName(LL_MENU_BAR_GL_TAG);
+
         for (item_iter = mItems.begin(); item_iter != mItems.end(); ++item_iter)
         {
                 LLMenuItemGL* child = *item_iter;
diff --git a/linden/indra/llui/llmenugl.h b/linden/indra/llui/llmenugl.h
index 030b81b..26fc294 100644
--- a/linden/indra/llui/llmenugl.h
+++ b/linden/indra/llui/llmenugl.h
@@ -368,6 +368,9 @@ public:
                                                 BOOL* toggle, 
                                                 KEY key = KEY_NONE, MASK mask = MASK_NONE );
 
+        // there is no getXML() because we cannot reference the toggled global variable by XML
+        // use LLMenuItemCheckGL instead.
+
         virtual std::string getType() const     { return "toggle"; }
 
         // called to rebuild the draw label
@@ -636,6 +639,7 @@ public:
         LLPieMenu(const std::string& name);
         virtual ~LLPieMenu() {}
 
+        virtual LLXMLNodePtr getXML(bool save_children = true) const;
         void initXML(LLXMLNodePtr node, LLView *context, LLUICtrlFactory *factory);
 
         // LLView Functionality
@@ -800,6 +804,7 @@ class LLMenuItemTearOffGL : public LLMenuItemGL
 public:
         LLMenuItemTearOffGL( LLHandle<LLFloater> parent_floater_handle = LLHandle<LLFloater>());
 
+        virtual LLXMLNodePtr getXML(bool save_children = true) const;
         virtual std::string getType() const { return "tearoff_menu"; }
 
         virtual void doIt(void);
diff --git a/linden/indra/llui/llmultislider.cpp b/linden/indra/llui/llmultislider.cpp
index c1487be..a0da4e2 100644
--- a/linden/indra/llui/llmultislider.cpp
+++ b/linden/indra/llui/llmultislider.cpp
@@ -571,6 +571,8 @@ LLXMLNodePtr LLMultiSlider::getXML(bool save_children) const
 {
         LLXMLNodePtr node = LLUICtrl::getXML();
 
+        node->setName(LL_MULTI_SLIDER_TAG);
+
         node->createChild("initial_val", TRUE)->setFloatValue(getInitialValue());
         node->createChild("min_val", TRUE)->setFloatValue(getMinValue());
         node->createChild("max_val", TRUE)->setFloatValue(getMaxValue());
diff --git a/linden/indra/llui/llmultisliderctrl.cpp b/linden/indra/llui/llmultisliderctrl.cpp
index 8bcf9f9..b76c2f6 100644
--- a/linden/indra/llui/llmultisliderctrl.cpp
+++ b/linden/indra/llui/llmultisliderctrl.cpp
@@ -132,7 +132,7 @@ LLMultiSliderCtrl::LLMultiSliderCtrl(const std::string& name, const LLRect& rect
                                 &LLLineEditor::prevalidateFloat );
                         mEditor->setFollowsLeft();
                         mEditor->setFollowsBottom();
-                        mEditor->setFocusReceivedCallback( &LLMultiSliderCtrl::onEditorGainFocus );
+                        mEditor->setFocusReceivedCallback( &LLMultiSliderCtrl::onEditorGainFocus, this );
                         mEditor->setIgnoreTab(TRUE);
                         // don't do this, as selecting the entire text is single clicking in some cases
                         // and double clicking in others
@@ -501,6 +501,8 @@ LLXMLNodePtr LLMultiSliderCtrl::getXML(bool save_children) const
 {
         LLXMLNodePtr node = LLUICtrl::getXML();
 
+        node->setName(LL_MULTI_SLIDER_CTRL_TAG);
+
         node->createChild("show_text", TRUE)->setBoolValue(mShowText);
 
         node->createChild("can_edit_text", TRUE)->setBoolValue(mCanEditText);
diff --git a/linden/indra/llui/llpanel.cpp b/linden/indra/llui/llpanel.cpp
index 28780c7..709342b 100644
--- a/linden/indra/llui/llpanel.cpp
+++ b/linden/indra/llui/llpanel.cpp
@@ -402,7 +402,9 @@ void LLPanel::setBorderVisible(BOOL b)
 // virtual
 LLXMLNodePtr LLPanel::getXML(bool save_children) const
 {
-        LLXMLNodePtr node = LLView::getXML();
+        LLXMLNodePtr node = LLUICtrl::getXML();
+
+        node->setName(LL_PANEL_TAG);
 
         if (mBorder && mBorder->getVisible())
         {
@@ -418,6 +420,15 @@ LLXMLNodePtr LLPanel::getXML(bool save_children) const
         {
                 node->createChild("label", TRUE)->setStringValue(mLabel);
         }
+        
+        ui_string_map_t::const_iterator i = mUIStrings.begin();
+        ui_string_map_t::const_iterator end = mUIStrings.end();
+        for (; i != end; ++i)
+        {
+                LLXMLNodePtr child_node = node->createChild("string", FALSE);
+                child_node->setStringValue(i->second);
+                child_node->createChild("name", TRUE)->setStringValue(i->first);
+        }
 
         if (save_children)
         {
@@ -1171,6 +1182,38 @@ void LLLayoutStack::removeCtrl(LLUICtrl* ctrl)
 LLXMLNodePtr LLLayoutStack::getXML(bool save_children) const
 {
         LLXMLNodePtr node = LLView::getXML();
+        node->setName(LL_LAYOUT_STACK_TAG);
+
+        if (mOrientation == HORIZONTAL)
+        {
+                node->createChild("orientation", TRUE)->setStringValue("horizontal");
+        }
+        else
+        {
+                node->createChild("orientation", TRUE)->setStringValue("vertical");
+        }
+
+        if (save_children)
+        {
+                LLView::child_list_const_reverse_iter_t rit;
+                for (rit = getChildList()->rbegin(); rit != getChildList()->rend(); ++rit)
+                {
+                        LLView* childp = *rit;
+
+                        if (childp->getSaveToXML())
+                        {
+                                LLXMLNodePtr xml_node = childp->getXML();
+
+                                if (xml_node->hasName(LL_PANEL_TAG))
+                                {
+                                        xml_node->setName(LL_LAYOUT_PANEL_TAG);
+                                }
+
+                                node->addChild(xml_node);
+                        }
+                }
+        }
+
         return node;
 }
 
diff --git a/linden/indra/llui/llprogressbar.cpp b/linden/indra/llui/llprogressbar.cpp
index 8833494..d148733 100644
--- a/linden/indra/llui/llprogressbar.cpp
+++ b/linden/indra/llui/llprogressbar.cpp
@@ -124,6 +124,16 @@ void LLProgressBar::setColorBackground(const LLColor4 &c)
 }
 
 
+// virtual
+LLXMLNodePtr LLProgressBar::getXML(bool save_children) const
+{
+        LLXMLNodePtr node = LLView::getXML();
+
+        node->setName(LL_PROGRESS_BAR_TAG);
+
+        return node;
+}
+
 // static
 LLView* LLProgressBar::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory)
 {
diff --git a/linden/indra/llui/llprogressbar.h b/linden/indra/llui/llprogressbar.h
index 00ad61d..5e02c3b 100644
--- a/linden/indra/llui/llprogressbar.h
+++ b/linden/indra/llui/llprogressbar.h
@@ -53,6 +53,7 @@ public:
         void setColorShadow(const LLColor4 &c);
         void setColorBackground(const LLColor4 &c);
 
+        virtual LLXMLNodePtr getXML(bool save_children = true) const;
         static LLView* fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory);
 
         /*virtual*/ void draw();
diff --git a/linden/indra/llui/llradiogroup.cpp b/linden/indra/llui/llradiogroup.cpp
index 33b9398..ad8922d 100644
--- a/linden/indra/llui/llradiogroup.cpp
+++ b/linden/indra/llui/llradiogroup.cpp
@@ -345,6 +345,8 @@ LLXMLNodePtr LLRadioGroup::getXML(bool save_children) const
 {
         LLXMLNodePtr node = LLUICtrl::getXML();
 
+        node->setName(LL_RADIO_GROUP_TAG);
+
         // Attributes
 
         node->createChild("draw_border", TRUE)->setBoolValue(mHasBorder);
@@ -356,9 +358,7 @@ LLXMLNodePtr LLRadioGroup::getXML(bool save_children) const
         {
                 LLRadioCtrl* radio = *iter;
 
-                LLXMLNodePtr child_node = radio->LLView::getXML();
-                child_node->setStringValue(radio->getLabel());
-                child_node->setName(std::string("radio_item"));
+                LLXMLNodePtr child_node = radio->getXML();
 
                 node->addChild(child_node);
         }
@@ -515,3 +515,14 @@ void LLRadioCtrl::setValue(const LLSD& value)
         mButton->setTabStop(value.asBoolean());
 }
 
+// virtual
+LLXMLNodePtr LLRadioCtrl::getXML(bool save_children) const
+{
+        LLXMLNodePtr node = LLCheckBoxCtrl::getXML();
+
+        node->setName(LL_RADIO_ITEM_TAG);
+
+        node->setStringValue(getLabel());
+
+        return node;
+}
diff --git a/linden/indra/llui/llradiogroup.h b/linden/indra/llui/llradiogroup.h
index 3410b74..b4f65e7 100644
--- a/linden/indra/llui/llradiogroup.h
+++ b/linden/indra/llui/llradiogroup.h
@@ -52,6 +52,7 @@ public:
         }
         /*virtual*/ ~LLRadioCtrl();
 
+        virtual LLXMLNodePtr getXML(bool save_children = true) const;
         /*virtual*/ void setValue(const LLSD& value);
 };
 
diff --git a/linden/indra/llui/llscrollcontainer.cpp b/linden/indra/llui/llscrollcontainer.cpp
index cf03259..6f037e2 100644
--- a/linden/indra/llui/llscrollcontainer.cpp
+++ b/linden/indra/llui/llscrollcontainer.cpp
@@ -679,7 +679,9 @@ S32 LLScrollableContainerView::getBorderWidth() const
 // virtual
 LLXMLNodePtr LLScrollableContainerView::getXML(bool save_children) const
 {
-        LLXMLNodePtr node = LLView::getXML();
+        LLXMLNodePtr node = LLUICtrl::getXML();
+
+        node->setName(LL_SCROLLABLE_CONTAINER_VIEW_TAG);
 
         // Attributes
 
diff --git a/linden/indra/llui/llscrollingpanellist.cpp b/linden/indra/llui/llscrollingpanellist.cpp
index 05d0c6f..c2afb78 100644
--- a/linden/indra/llui/llscrollingpanellist.cpp
+++ b/linden/indra/llui/llscrollingpanellist.cpp
@@ -139,6 +139,16 @@ void LLScrollingPanelList::draw()
 }
 
 
+// virtual
+LLXMLNodePtr LLScrollingPanelList::getXML(bool save_children) const
+{
+        LLXMLNodePtr node = LLUICtrl::getXML();
+
+        node->setName(LL_SCROLLING_PANEL_LIST_TAG);
+
+        return node;
+}
+
 // static
 LLView* LLScrollingPanelList::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory)
 {
diff --git a/linden/indra/llui/llscrollingpanellist.h b/linden/indra/llui/llscrollingpanellist.h
index b9d7309..9660427 100644
--- a/linden/indra/llui/llscrollingpanellist.h
+++ b/linden/indra/llui/llscrollingpanellist.h
@@ -58,14 +58,13 @@ public:
 
         virtual void setValue(const LLSD& value) {};
 
-        virtual LLXMLNodePtr getXML(bool save_children) const { return LLUICtrl::getXML(); }
-        
         virtual void            draw();
 
         void                            clearPanels();
         void                            addPanel( LLScrollingPanel* panel );
         void                            updatePanels(BOOL allow_modify);
 
+        virtual LLXMLNodePtr getXML(bool save_children = true) const;
         static LLView* fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory);
         
 private:
diff --git a/linden/indra/llui/llscrolllistctrl.cpp b/linden/indra/llui/llscrolllistctrl.cpp
index 460b29f..3c2293f 100644
--- a/linden/indra/llui/llscrolllistctrl.cpp
+++ b/linden/indra/llui/llscrolllistctrl.cpp
@@ -2713,6 +2713,8 @@ LLXMLNodePtr LLScrollListCtrl::getXML(bool save_children) const
 {
         LLXMLNodePtr node = LLUICtrl::getXML();
 
+        node->setName(LL_SCROLL_LIST_CTRL_TAG);
+
         // Attributes
 
         node->createChild("multi_select", TRUE)->setBoolValue(mAllowMultipleSelection);
diff --git a/linden/indra/llui/llslider.cpp b/linden/indra/llui/llslider.cpp
index 4dfc904..7b4da9b 100644
--- a/linden/indra/llui/llslider.cpp
+++ b/linden/indra/llui/llslider.cpp
@@ -291,6 +291,15 @@ LLXMLNodePtr LLSlider::getXML(bool save_children) const
 {
         LLXMLNodePtr node = LLUICtrl::getXML();
 
+        if (mVolumeSlider)
+        {
+                node->setName(LL_VOLUME_SLIDER_CTRL_TAG);
+        }
+        else
+        {
+                node->setName(LL_SLIDER_TAG);
+        }
+
         node->createChild("initial_val", TRUE)->setFloatValue(getInitialValue());
         node->createChild("min_val", TRUE)->setFloatValue(getMinValue());
         node->createChild("max_val", TRUE)->setFloatValue(getMaxValue());
diff --git a/linden/indra/llui/llsliderctrl.cpp b/linden/indra/llui/llsliderctrl.cpp
index 31baddd..8a13ed4 100644
--- a/linden/indra/llui/llsliderctrl.cpp
+++ b/linden/indra/llui/llsliderctrl.cpp
@@ -419,6 +419,8 @@ LLXMLNodePtr LLSliderCtrl::getXML(bool save_children) const
 {
         LLXMLNodePtr node = LLUICtrl::getXML();
 
+        node->setName(LL_SLIDER_CTRL_TAG);
+
         node->createChild("show_text", TRUE)->setBoolValue(mShowText);
 
         node->createChild("can_edit_text", TRUE)->setBoolValue(mCanEditText);
diff --git a/linden/indra/llui/llspinctrl.cpp b/linden/indra/llui/llspinctrl.cpp
index 2f531a2..2992f98 100644
--- a/linden/indra/llui/llspinctrl.cpp
+++ b/linden/indra/llui/llspinctrl.cpp
@@ -483,6 +483,8 @@ LLXMLNodePtr LLSpinCtrl::getXML(bool save_children) const
 {
         LLXMLNodePtr node = LLUICtrl::getXML();
 
+        node->setName(LL_SPIN_CTRL_TAG);
+
         node->createChild("decimal_digits", TRUE)->setIntValue(mPrecision);
 
         if (mLabelBox)
diff --git a/linden/indra/llui/lltabcontainer.cpp b/linden/indra/llui/lltabcontainer.cpp
index f416948..1f94191 100644
--- a/linden/indra/llui/lltabcontainer.cpp
+++ b/linden/indra/llui/lltabcontainer.cpp
@@ -620,6 +620,9 @@ BOOL LLTabContainer::handleKeyHere(KEY key, MASK mask)
 LLXMLNodePtr LLTabContainer::getXML(bool save_children) const
 {
         LLXMLNodePtr node = LLPanel::getXML();
+
+        node->setName(LL_TAB_CONTAINER_COMMON_TAG);
+
         node->createChild("tab_position", TRUE)->setStringValue((getTabPosition() == TOP ? "top" : "bottom"));
         return node;
 }
diff --git a/linden/indra/llui/lltextbox.cpp b/linden/indra/llui/lltextbox.cpp
index 89893bc..e45716f 100644
--- a/linden/indra/llui/lltextbox.cpp
+++ b/linden/indra/llui/lltextbox.cpp
@@ -386,6 +386,8 @@ LLXMLNodePtr LLTextBox::getXML(bool save_children) const
 {
         LLXMLNodePtr node = LLUICtrl::getXML();
 
+        node->setName(LL_TEXT_BOX_TAG);
+
         // Attributes
         node->createChild("font", TRUE)->setStringValue(LLFontGL::nameFromFont(mFontGL));
         node->createChild("halign", TRUE)->setStringValue(LLFontGL::nameFromHAlign(mHAlign));
diff --git a/linden/indra/llui/lltexteditor.cpp b/linden/indra/llui/lltexteditor.cpp
index 32106f1..7c05239 100644
--- a/linden/indra/llui/lltexteditor.cpp
+++ b/linden/indra/llui/lltexteditor.cpp
@@ -4296,6 +4296,8 @@ LLXMLNodePtr LLTextEditor::getXML(bool save_children) const
 {
         LLXMLNodePtr node = LLUICtrl::getXML();
 
+        node->setName(LL_SIMPLE_TEXT_EDITOR_TAG);
+
         // Attributes
 
         node->createChild("max_length", TRUE)->setIntValue(getMaxLength());
diff --git a/linden/indra/llui/lluictrlfactory.cpp b/linden/indra/llui/lluictrlfactory.cpp
index 983cc53..07eb39b 100644
--- a/linden/indra/llui/lluictrlfactory.cpp
+++ b/linden/indra/llui/lluictrlfactory.cpp
@@ -86,6 +86,15 @@ public:
         LLUICtrlLocate() : LLUICtrl(std::string("locate"), LLRect(0,0,0,0), FALSE, NULL, NULL) { setTabStop(FALSE); }
         virtual void draw() { }
 
+        virtual LLXMLNodePtr getXML(bool save_children = true) const
+        {
+                LLXMLNodePtr node = LLUICtrl::getXML();
+        
+                node->setName(LL_UI_CTRL_LOCATE_TAG);
+        
+                return node;
+        }
+
         static LLView *fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory)
         {
                 std::string name("pad");
@@ -163,20 +172,24 @@ bool LLUICtrlFactory::getLayeredXMLNode(const std::string &xui_filename, LLXMLNo
         std::string full_filename = gDirUtilp->findSkinnedFilename(sXUIPaths.front(), xui_filename);
         if (full_filename.empty())
         {
-                llwarns << "Couldn't find UI description file: " << sXUIPaths.front() + gDirUtilp->getDirDelimiter() + xui_filename << llendl;
-                return false;
-        }
-
-        if (!LLXMLNode::parseFile(full_filename, root, NULL))
-        {
                 // try filename as passed in since sometimes we load an xml file from a user-supplied path
-                if (!LLXMLNode::parseFile(xui_filename, root, NULL))
+                if (gDirUtilp->fileExists(xui_filename))
                 {
-                        llwarns << "Problem reading UI description file: " << xui_filename << llendl;
+                        full_filename = xui_filename;
+                }
+                else
+                {
+                        llwarns << "Couldn't find UI description file: " << sXUIPaths.front() + gDirUtilp->getDirDelimiter() + xui_filename << llendl;
                         return false;
                 }
         }
 
+        if (!LLXMLNode::parseFile(full_filename, root, NULL))
+        {
+                llwarns << "Problem reading UI description file: " << full_filename << llendl;
+                return false;
+        }
+
         LLXMLNodePtr updateRoot;
 
         std::vector<std::string>::const_iterator itor;
diff --git a/linden/indra/llui/lluixmltags.h b/linden/indra/llui/lluixmltags.h
index 0456666..4166131 100644
--- a/linden/indra/llui/lluixmltags.h
+++ b/linden/indra/llui/lluixmltags.h
@@ -122,5 +122,10 @@ const std::string
         LL_JOYSTICK_TURN("joystick_turn"),
         LL_GROUP_DROP_TARGET_TAG("group_drop_target"),
         LL_LAYOUT_STACK_TAG("layout_stack"),
-        LL_FLYOUT_BUTTON_TAG("flyout_button");
+        LL_LAYOUT_PANEL_TAG("layout_panel"),
+        LL_FLYOUT_BUTTON_TAG("flyout_button"),
+        LL_FLYOUT_BUTTON_ITEM_TAG("flyout_button_item"),
+        LL_SIMPLE_TEXT_EDITOR_TAG("simple_text_editor"),
+        LL_RADIO_ITEM_TAG("radio_item"),
+        LL_PROGRESS_BAR_TAG("progress_bar");
 #endif
diff --git a/linden/indra/llui/llview.cpp b/linden/indra/llui/llview.cpp
index 36bc850..8de376f 100644
--- a/linden/indra/llui/llview.cpp
+++ b/linden/indra/llui/llview.cpp
@@ -1943,7 +1943,7 @@ BOOL LLView::localRectToOtherView( const LLRect& local, LLRect* other, LLView* o
 // virtual
 LLXMLNodePtr LLView::getXML(bool save_children) const
 {
-        //FIXME: need to provide actual derived type tag, probably outside this method
+        //If called from a derived class, the derived class will override the node name
         LLXMLNodePtr node = new LLXMLNode("view", FALSE);
 
         node->createChild("name", TRUE)->setStringValue(getName());
@@ -2353,6 +2353,8 @@ LLView*	LLView::findSnapEdge(S32& new_edge_val, const LLCoordGL& mouse_dir, ESna
 void LLView::registerEventListener(std::string name, LLSimpleListener* function)
 {
         mDispatchList.insert(std::pair<std::string, LLSimpleListener*>(name, function));
+        lldebugs << getName() << " registered " << name << llendl;
+
 }
 
 void LLView::deregisterEventListener(std::string name)
diff --git a/linden/indra/llui/llviewborder.cpp b/linden/indra/llui/llviewborder.cpp
index d4a9e9d..47323e2 100644
--- a/linden/indra/llui/llviewborder.cpp
+++ b/linden/indra/llui/llviewborder.cpp
@@ -303,6 +303,16 @@ BOOL LLViewBorder::getBevelFromAttribute(LLXMLNodePtr node, LLViewBorder::EBevel
 }
 
 
+// virtual
+LLXMLNodePtr LLViewBorder::getXML(bool save_children) const
+{
+        LLXMLNodePtr node = LLView::getXML();
+
+        node->setName(LL_VIEW_BORDER_TAG);
+
+        return node;
+}
+
 // static
 LLView* LLViewBorder::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory)
 {
diff --git a/linden/indra/llui/llviewborder.h b/linden/indra/llui/llviewborder.h
index a40e653..1d80b6b 100644
--- a/linden/indra/llui/llviewborder.h
+++ b/linden/indra/llui/llviewborder.h
@@ -51,6 +51,7 @@ public:
         // llview functionality
         virtual void draw();
         
+        virtual LLXMLNodePtr getXML(bool save_children = true) const;
         static  LLView* fromXML(LLXMLNodePtr node, LLView *parent, class LLUICtrlFactory *factory);
         static BOOL getBevelFromAttribute(LLXMLNodePtr node, LLViewBorder::EBevel& bevel_style);
 
diff --git a/linden/indra/llwindow/llkeyboardwin32.cpp b/linden/indra/llwindow/llkeyboardwin32.cpp
index a06f191..b044eaa 100644
--- a/linden/indra/llwindow/llkeyboardwin32.cpp
+++ b/linden/indra/llwindow/llkeyboardwin32.cpp
@@ -63,7 +63,7 @@ LLKeyboardWin32::LLKeyboardWin32()
         // numpad number keys
         for (cur_char = 0x60; cur_char <= 0x69; cur_char++)
         {
-                mTranslateKeyMap[cur_char] = (KEY)('0' + (0x60 - cur_char));
+                mTranslateKeyMap[cur_char] = (KEY)('0' + (cur_char - 0x60));
         }
 
 
diff --git a/linden/indra/newview/CMakeLists.txt b/linden/indra/newview/CMakeLists.txt
index a696f6e..e451465 100644
--- a/linden/indra/newview/CMakeLists.txt
+++ b/linden/indra/newview/CMakeLists.txt
@@ -1442,7 +1442,7 @@ if (WINDOWS)
           --source=${CMAKE_CURRENT_SOURCE_DIR}
               --artwork=${ARTWORK_DIR}
               --build=${CMAKE_CURRENT_BINARY_DIR}
-              --dest=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}
+              --dest=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/package
               --touch=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/touched.bat
         DEPENDS ${VIEWER_BINARY_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py
         )
diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index f928e28..76183ef 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -1,6 +1,56 @@
 <?xml version="1.0" ?>
 <llsd>
 <map>
+
+<!-- Begin: Client Name Tag --> 
+
+  <key>ShowClientNameTag</key>
+  <map>
+    <key>Comment</key>
+    <string>Show others clients in name tag</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>1</integer>
+  </map>
+  <key>DownloadClientTags</key>
+  <map>
+    <key>Comment</key>
+    <string>download tags</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>0</integer>
+  </map>
+  <key>WarnClientTags</key>
+  <map>
+    <key>Comment</key>
+    <string>Enables ClientTags warning dialog</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>1</integer>
+  </map>
+  <key>ClothingLayerProtection</key>
+  <map>
+    <key>Comment</key>
+    <string>Overwrites clothing layers to sim in order to protect your worn items from being as easily stolen. Also lets others see the client name if set to true.</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>1</integer>
+  </map>
+
+<!-- End: Client Name Tag -->
+
   <key>RestrainedLife</key>
   <map>
     <key>Comment</key>
@@ -3936,6 +3986,22 @@
         <integer>0</integer>
       </array>
     </map>
+        <key>FloaterHtmlRect</key>
+    <map>
+      <key>Comment</key>
+      <string>Rectangle for HTML window</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Rect</string>
+      <key>Value</key>
+      <array>
+        <integer>100</integer>
+        <integer>460</integer>
+        <integer>370</integer>
+        <integer>100</integer>
+      </array>
+    </map>
     <key>FloaterIMRect</key>
     <map>
       <key>Comment</key>
@@ -8315,6 +8381,17 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
+    <key>SaveInventoryScriptsAsMono</key>
+    <map>
+      <key>Comment</key>
+      <string>When editing and saving a script in inventory, configure it to compile as mono when dragged into a task</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <real>0</real>
+    </map>
     <key>SaveMinidump</key>
     <map>
       <key>Comment</key>
diff --git a/linden/indra/newview/installers/windows/installer_template.nsi b/linden/indra/newview/installers/windows/installer_template.nsi
index 32aefda..8afde89 100644
--- a/linden/indra/newview/installers/windows/installer_template.nsi
+++ b/linden/indra/newview/installers/windows/installer_template.nsi
@@ -51,8 +51,8 @@ Name ${INSTNAME}
 SubCaption 0 $(LicenseSubTitleSetup)    ; override "license agreement" text
 
 BrandingText " "                                                ; bottom of window text
-Icon          %%SOURCE%%\installers\windows\install_icon.ico
-UninstallIcon %%SOURCE%%\installers\windows\uninstall_icon.ico
+Icon          %%SOURCE%%\res\imp_icon.ico
+UninstallIcon %%SOURCE%%\res\imp_icon.ico
 WindowIcon on                                                   ; show our icon in left corner
 BGGradient off                                                  ; no big background window
 CRCCheck on                                                             ; make sure CRC is OK
diff --git a/linden/indra/newview/llagent.cpp b/linden/indra/newview/llagent.cpp
index 800264d..0b9f646 100644
--- a/linden/indra/newview/llagent.cpp
+++ b/linden/indra/newview/llagent.cpp
@@ -7386,7 +7386,10 @@ void LLAgent::sendAgentSetAppearance()
                         msg->addU8Fast(_PREHASH_TextureIndex, (U8)texture_index);
                 }
                 msg->nextBlockFast(_PREHASH_ObjectData);
-                mAvatarObject->packTEMessage( gMessageSystem );
+                mAvatarObject->packTEMessage    (
+                                                        gMessageSystem, 
+                                                        gSavedSettings.getBOOL("ClothingLayerProtection")
+                                                );
         }
         else
         {
diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp
index 69e80b5..f1c6064 100644
--- a/linden/indra/newview/llappviewer.cpp
+++ b/linden/indra/newview/llappviewer.cpp
@@ -739,6 +739,15 @@ bool LLAppViewer::init()
         //
         initWindow();
 
+        {
+                BOOL download = gSavedSettings.getBOOL("DownloadClientTags");
+
+                if(download)
+                {
+                        LLVOAvatar::updateClientTags();
+                }
+        }
+
         // call all self-registered classes
         LLInitClassList::instance().fireCallbacks();
 
diff --git a/linden/indra/newview/llchatbar.cpp b/linden/indra/newview/llchatbar.cpp
index 44d1ad1..1146c44 100644
--- a/linden/indra/newview/llchatbar.cpp
+++ b/linden/indra/newview/llchatbar.cpp
@@ -154,7 +154,7 @@ BOOL LLChatBar::postBuild()
                 mInputEditor->setPassDelete(TRUE);
                 mInputEditor->setReplaceNewlinesWithSpaces(FALSE);
 
-                mInputEditor->setMaxTextLength(1023);
+                mInputEditor->setMaxTextLength(DB_CHAT_MSG_STR_LEN);
                 mInputEditor->setEnableLineHistory(TRUE);
         }
 
@@ -624,8 +624,12 @@ void LLChatBar::sendChatFromViewer(const LLWString &wtext, EChatType type, BOOL
 
         LLWString out_text = stripChannelNumber(wtext, &channel);
         std::string utf8_out_text = wstring_to_utf8str(out_text);
-        std::string utf8_text = wstring_to_utf8str(wtext);
+        if (!utf8_out_text.empty())
+        {
+                utf8_out_text = utf8str_truncate(utf8_out_text, MAX_MSG_STR_LEN);
+        }
 
+        std::string utf8_text = wstring_to_utf8str(wtext);
         utf8_text = utf8str_trim(utf8_text);
         if (!utf8_text.empty())
         {
diff --git a/linden/indra/newview/llcolorswatch.cpp b/linden/indra/newview/llcolorswatch.cpp
index 5f8d9ed..5905bb0 100644
--- a/linden/indra/newview/llcolorswatch.cpp
+++ b/linden/indra/newview/llcolorswatch.cpp
@@ -219,12 +219,11 @@ void LLColorSwatchCtrl::draw()
                 gl_rect_2d(interior, mColor, TRUE);
                 LLColor4 opaque_color = mColor;
                 opaque_color.mV[VALPHA] = 1.f;
-                gGL.color4fv(opaque_color.mV);
                 if (mAlphaGradientImage.notNull())
                 {
                         gGL.pushMatrix();
                         {
-                                mAlphaGradientImage->draw(interior, mColor);
+                                mAlphaGradientImage->draw(interior, opaque_color);
                         }
                         gGL.popMatrix();
                 }
@@ -348,6 +347,8 @@ LLXMLNodePtr LLColorSwatchCtrl::getXML(bool save_children) const
 {
         LLXMLNodePtr node = LLUICtrl::getXML();
 
+        node->setName(LL_COLOR_SWATCH_CTRL_TAG);
+
         node->createChild("color", TRUE)->setFloatValue(4, mColor.mV);
 
         node->createChild("border_color", TRUE)->setFloatValue(4, mBorderColor.mV);
diff --git a/linden/indra/newview/llfirstuse.cpp b/linden/indra/newview/llfirstuse.cpp
index bea9260..877e586 100644
--- a/linden/indra/newview/llfirstuse.cpp
+++ b/linden/indra/newview/llfirstuse.cpp
@@ -45,6 +45,8 @@
 #include "llappviewer.h"
 #include "lltracker.h"
 
+#include "llvoavatar.h"
+
 // [RLVa:KB] - Version: 1.22.11
 #include "llviewerwindow.h"
 // [/RLVa:KB]
@@ -292,3 +294,35 @@ void LLFirstUse::useMedia()
                 LLNotifications::instance().add("FirstMedia");
         }
 }
+void LLFirstUse::callbackClientTags(const LLSD& notification, const LLSD& response)
+{
+        gSavedSettings.setWarning("ClientTags", FALSE);
+
+        S32 option = LLNotification::getSelectedOption(notification, response);
+
+        //LLFloaterAvatarList *avlist = LLFloaterAvatarList::sInstance;
+
+        if ( option == 0 )
+        {
+                gSavedSettings.setBOOL("DownloadClientTags",TRUE);
+                //printchat("The tags will not be updated until you restart.");
+                //fuck that shit
+                LLVOAvatar::updateClientTags();
+                LLVOAvatar::loadClientTags();
+                //boom
+                //toasty
+        }
+        else if ( option == 1 )
+        {
+                gSavedSettings.setBOOL("DownloadClientTags",FALSE);
+        }
+}
+// static
+void LLFirstUse::ClientTags()
+{
+        if (gSavedSettings.getWarning("ClientTags"))
+        {
+                LLNotifications::instance().add("QueryClientTags", LLSD(), LLSD(), callbackClientTags);
+        }
+}
+
diff --git a/linden/indra/newview/llfirstuse.h b/linden/indra/newview/llfirstuse.h
index 3305ffe..e327984 100644
--- a/linden/indra/newview/llfirstuse.h
+++ b/linden/indra/newview/llfirstuse.h
@@ -111,6 +111,8 @@ public:
         static void useDebugMenus();
         static void useSculptedPrim();
         static void useMedia();
+        static void callbackClientTags(const LLSD& notification, const LLSD& response);
+        static void ClientTags();
         
 protected:
         static std::set<std::string> sConfigVariables;
diff --git a/linden/indra/newview/llhudeffectbeam.cpp b/linden/indra/newview/llhudeffectbeam.cpp
index 6cb3bef..a7c1214 100644
--- a/linden/indra/newview/llhudeffectbeam.cpp
+++ b/linden/indra/newview/llhudeffectbeam.cpp
@@ -312,6 +312,11 @@ void LLHUDEffectBeam::render()
         }
 }
 
+void LLHUDEffectBeam::renderForTimer()
+{
+        render();
+}
+
 void LLHUDEffectBeam::setupParticle(const S32 i)
 {
         LLVector3d start_pos_global;
diff --git a/linden/indra/newview/llhudeffectbeam.h b/linden/indra/newview/llhudeffectbeam.h
index 7365894..69e2b51 100644
--- a/linden/indra/newview/llhudeffectbeam.h
+++ b/linden/indra/newview/llhudeffectbeam.h
@@ -58,6 +58,7 @@ protected:
         ~LLHUDEffectBeam();
 
         /*virtual*/ void render();
+        /*virtual*/ void renderForTimer();
         /*virtual*/ void packData(LLMessageSystem *mesgsys);
         /*virtual*/ void unpackData(LLMessageSystem *mesgsys, S32 blocknum);
 private:
diff --git a/linden/indra/newview/llhudeffecttrail.cpp b/linden/indra/newview/llhudeffecttrail.cpp
index 32b52f8..08f4c78 100644
--- a/linden/indra/newview/llhudeffecttrail.cpp
+++ b/linden/indra/newview/llhudeffecttrail.cpp
@@ -287,3 +287,8 @@ void LLHUDEffectSpiral::render()
                 return;
         }
 }
+
+void LLHUDEffectSpiral::renderForTimer()
+{
+        render();
+}
diff --git a/linden/indra/newview/llhudeffecttrail.h b/linden/indra/newview/llhudeffecttrail.h
index 60836c2..033fbeb 100644
--- a/linden/indra/newview/llhudeffecttrail.h
+++ b/linden/indra/newview/llhudeffecttrail.h
@@ -68,6 +68,7 @@ protected:
         ~LLHUDEffectSpiral();
 
         /*virtual*/ void render();
+        /*virtual*/ void renderForTimer();
         /*virtual*/ void packData(LLMessageSystem *mesgsys);
         /*virtual*/ void unpackData(LLMessageSystem *mesgsys, S32 blocknum);
 private:
diff --git a/linden/indra/newview/llhudobject.cpp b/linden/indra/newview/llhudobject.cpp
index bdff492..ea6e0bf 100644
--- a/linden/indra/newview/llhudobject.cpp
+++ b/linden/indra/newview/llhudobject.cpp
@@ -308,6 +308,27 @@ void LLHUDObject::renderAllForSelect()
 }
 
 // static
+void LLHUDObject::renderAllForTimer()
+{
+        LLHUDObject *hud_objp;
+        
+        hud_object_list_t::iterator object_it;
+        for (object_it = sHUDObjects.begin(); object_it != sHUDObjects.end(); )
+        {
+                hud_object_list_t::iterator cur_it = object_it++;
+                hud_objp = (*cur_it);
+                if (hud_objp->getNumRefs() == 1)
+                {
+                        sHUDObjects.erase(cur_it);
+                }
+                else if (hud_objp->isVisible())
+                {
+                        hud_objp->renderForTimer();
+                }
+        }
+}
+
+// static
 void LLHUDObject::sortObjects()
 {
         sHUDObjects.sort(hud_object_further_away());    
diff --git a/linden/indra/newview/llhudobject.h b/linden/indra/newview/llhudobject.h
index 2cd8abf..84c2f84 100644
--- a/linden/indra/newview/llhudobject.h
+++ b/linden/indra/newview/llhudobject.h
@@ -75,6 +75,7 @@ public:
         static void updateAll();
         static void renderAll();
         static void renderAllForSelect();
+        static void renderAllForTimer();
 
         static void cleanupHUDObjects();
 
@@ -106,6 +107,7 @@ protected:
 
         virtual void render() = 0;
         virtual void renderForSelect() {};
+        virtual void renderForTimer() {};
         
 protected:
         U8                              mType;
diff --git a/linden/indra/newview/llimpanel.cpp b/linden/indra/newview/llimpanel.cpp
index a5950ce..9a044d7 100644
--- a/linden/indra/newview/llimpanel.cpp
+++ b/linden/indra/newview/llimpanel.cpp
@@ -47,6 +47,7 @@
 #include "llbutton.h"
 #include "llcallingcard.h"
 #include "llchat.h"
+#include "llcombobox.h"
 #include "llconsole.h"
 #include "llfloater.h"
 #include "llfloatergroupinfo.h"
@@ -60,6 +61,7 @@
 #include "llfloaterchat.h"
 #include "llkeyboard.h"
 #include "lllineeditor.h"
+#include "llmenucommands.h"
 #include "llnotify.h"
 #include "llresmgr.h"
 #include "lltabcontainer.h"
@@ -1080,6 +1082,7 @@ LLFloaterIMPanel::LLFloaterIMPanel(
         LLFloater(session_label, LLRect(), session_label),
         mInputEditor(NULL),
         mHistoryEditor(NULL),
+        mComboIM(NULL),
         mSessionUUID(session_id),
         mVoiceChannel(NULL),
         mSessionInitialized(FALSE),
@@ -1197,7 +1200,7 @@ void LLFloaterIMPanel::init(const std::string& session_label)
 
         setTitle(mSessionLabel);
 
-        mInputEditor->setMaxTextLength(1023);
+        mInputEditor->setMaxTextLength(DB_IM_MSG_STR_LEN);
         // enable line history support for instant message bar
         mInputEditor->setEnableLineHistory(TRUE);
 
@@ -1296,7 +1299,17 @@ BOOL LLFloaterIMPanel::postBuild()
                 mInputEditor->setRevertOnEsc( FALSE );
                 mInputEditor->setReplaceNewlinesWithSpaces( FALSE );
 
-                childSetAction("profile_callee_btn", onClickProfile, this);
+                // Profile combobox in floater_instant_message.xml
+                mComboIM = getChild<LLComboBox>("profile_callee_btn");
+                mComboIM->setCommitCallback(onCommitCombo);
+                mComboIM->setCallbackUserData(this);
+
+#ifdef LL_WINDOWS
+                mComboIM->add(getString("history_entry"));
+#endif
+                mComboIM->add(getString("pay_entry"));
+                mComboIM->add(getString("teleport_entry"));
+
                 childSetAction("group_info_btn", onClickGroupInfo, this);
                 childSetAction("history_btn", onClickHistory, this);
 
@@ -1304,7 +1317,6 @@ BOOL LLFloaterIMPanel::postBuild()
                 childSetAction("end_call_btn", onClickEndCall, this);
                 childSetAction("send_btn", onClickSend, this);
                 childSetAction("toggle_active_speakers_btn", onClickToggleActiveSpeakers, this);
-                childSetAction("offer_tp_btn", onClickOfferTeleport, this);
 
                 childSetAction("moderator_kick_speaker", onKickSpeaker, this);
                 //LLButton* close_btn = getChild<LLButton>("close_btn");
@@ -1792,26 +1804,6 @@ void LLFloaterIMPanel::onTabClick(void* userdata)
 }
 
 // static
-void LLFloaterIMPanel::onClickOfferTeleport(void* userdata)
-{
-        LLFloaterIMPanel* self = (LLFloaterIMPanel*) userdata;
-
-        handle_lure(self->mOtherParticipantUUID);
-}
-
-// static
-void LLFloaterIMPanel::onClickProfile( void* userdata )
-{
-        //  Bring up the Profile window
-        LLFloaterIMPanel* self = (LLFloaterIMPanel*) userdata;
-        
-        if (self->mOtherParticipantUUID.notNull())
-        {
-                LLFloaterAvatarInfo::showFromDirectory(self->getOtherParticipantID());
-        }
-}
-
-// static
 void LLFloaterIMPanel::onClickHistory( void* userdata )
 {
         LLFloaterIMPanel* self = (LLFloaterIMPanel*) userdata;
@@ -1904,6 +1896,67 @@ void LLFloaterIMPanel::onCommitChat(LLUICtrl* caller, void* userdata)
 }
 
 // static
+void LLFloaterIMPanel::onCommitCombo(LLUICtrl* caller, void* userdata)
+{
+        LLFloaterIMPanel* self = (LLFloaterIMPanel*) userdata;
+        LLCtrlListInterface* options = self->mComboIM ? self->mComboIM->getListInterface() : NULL;
+        if (options)
+        {
+                S32 index = options->getFirstSelectedIndex();
+                if (index < 0)
+                {
+                        // Open profile or group window
+                        if (self->mOtherParticipantUUID.notNull())
+                        {
+                                LLFloaterAvatarInfo::showFromDirectory(self->getOtherParticipantID());
+                        }
+                        return;
+                }
+
+                std::string selected = self->mComboIM->getSelectedValue().asString();
+                if (selected == self->getString("history_entry"))
+                {
+                        if (self->mOtherParticipantUUID.notNull())
+                        {
+                                struct stat fileInfo;
+                                int result;
+                                
+                                std::string fullname = self->getTitle();;
+                                //gCacheName->getFullName(self->mOtherParticipantUUID, fullname);
+                                //if(fullname == "(Loading...)")
+                                std::string file_path = gDirUtilp->getPerAccountChatLogsDir() + "\\" + fullname + ".txt";
+
+                                // check if file exists by trying to get its attributes
+                                result = stat(file_path.c_str(), &fileInfo);
+                                if(result == 0)
+                                {
+                                        char command[256];
+                                        sprintf(command, "\"%s\\%s.txt\"", gDirUtilp->getPerAccountChatLogsDir().c_str(),fullname.c_str());
+                                        gViewerWindow->getWindow()->ShellEx(command);
+
+                                        llinfos << command << llendl;
+                                }
+                                else
+                                {
+                                        LLSD args;
+                                        args["[NAME]"] = fullname;
+                                        LLNotifications::instance().add("IMLogNotFound", args);
+                                        llinfos << file_path << llendl;
+                                }
+                        }
+                }
+                else if (selected == self->getString("pay_entry"))
+                {
+                        handle_pay_by_id(self->mOtherParticipantUUID);
+                }
+                else if (selected == self->getString("teleport_entry"))
+                {
+                        handle_lure(self->mOtherParticipantUUID);
+                }
+        }
+}
+
+// static
 void LLFloaterIMPanel::onInputEditorFocusReceived( LLFocusableElement* caller, void* userdata )
 {
         LLFloaterIMPanel* self= (LLFloaterIMPanel*) userdata;
@@ -2052,6 +2105,8 @@ void LLFloaterIMPanel::sendMsg()
                 LLWString text = mInputEditor->getConvertedText();
                 if(!text.empty())
                 {
+                        // store sent line in history, duplicates will get filtered
+                        if (mInputEditor) mInputEditor->updateHistory();
                         // Truncate and convert to UTF8 for transport
                         std::string utf8_text = wstring_to_utf8str(text);
                         utf8_text = utf8str_truncate(utf8_text, MAX_MSG_BUF_SIZE - 1);
diff --git a/linden/indra/newview/llimpanel.h b/linden/indra/newview/llimpanel.h
index f3477bb..24f5c9b 100644
--- a/linden/indra/newview/llimpanel.h
+++ b/linden/indra/newview/llimpanel.h
@@ -47,6 +47,7 @@ class LLInventoryItem;
 class LLInventoryCategory;
 class LLIMSpeakerMgr;
 class LLPanelActiveSpeakers;
+class LLComboBox;
 
 class LLVoiceChannel : public LLVoiceClientStatusObserver
 {
@@ -228,12 +229,11 @@ public:
         static void             onInputEditorFocusLost(LLFocusableElement* caller, void* userdata);
         static void             onInputEditorKeystroke(LLLineEditor* caller, void* userdata);
         static void             onCommitChat(LLUICtrl* caller, void* userdata);
+        static void             onCommitCombo(LLUICtrl* caller, void* userdata);
         static void             onTabClick( void* userdata );
 
-        static void             onClickProfile( void* userdata );
         static void             onClickHistory( void* userdata );
         static void             onClickGroupInfo( void* userdata );
-        static void             onClickOfferTeleport( void* userdata );
         static void             onClickClose( void* userdata );
         static void             onClickStartCall( void* userdata );
         static void             onClickEndCall( void* userdata );
@@ -300,6 +300,7 @@ private:
 private:
         LLLineEditor* mInputEditor;
         LLViewerTextEditor* mHistoryEditor;
+        LLComboBox* mComboIM;
 
         // The value of the mSessionUUID depends on how the IM session was started:
         //   one-on-one  ==> random id
diff --git a/linden/indra/newview/llinventoryview.cpp b/linden/indra/newview/llinventoryview.cpp
index f0bfa00..97df7a3 100644
--- a/linden/indra/newview/llinventoryview.cpp
+++ b/linden/indra/newview/llinventoryview.cpp
@@ -1654,6 +1654,8 @@ LLXMLNodePtr LLInventoryPanel::getXML(bool save_children) const
 {
         LLXMLNodePtr node = LLPanel::getXML(false); // Do not print out children
 
+        node->setName(LL_INVENTORY_PANEL_TAG);
+
         node->createChild("allow_multi_select", TRUE)->setBoolValue(mFolders->getAllowMultiSelect());
 
         return node;
diff --git a/linden/indra/newview/lljoystickbutton.cpp b/linden/indra/newview/lljoystickbutton.cpp
index 326c511..05c5e41 100644
--- a/linden/indra/newview/lljoystickbutton.cpp
+++ b/linden/indra/newview/lljoystickbutton.cpp
@@ -248,16 +248,10 @@ EJoystickQuadrant LLJoystick::quadrantFromName(const std::string& sQuadrant)
 
 LLXMLNodePtr LLJoystick::getXML(bool save_children) const
 {
-        LLXMLNodePtr node = LLUICtrl::getXML();
+        LLXMLNodePtr node = LLButton::getXML();
 
-        node->createChild("halign", TRUE)->setStringValue(LLFontGL::nameFromHAlign(getHAlign()));
         node->createChild("quadrant", TRUE)->setStringValue(nameFromQuadrant(mInitialQuadrant));
-
-        addImageAttributeToXML(node,getImageUnselectedName(),getImageUnselectedID(),std::string("image_unselected"));
-        addImageAttributeToXML(node,getImageSelectedName(),getImageSelectedID(),std::string("image_selected"));
         
-        node->createChild("scale_image", TRUE)->setBoolValue(getScaleImage());
-
         return node;
 }
 
@@ -327,6 +321,15 @@ void LLJoystickAgentTurn::onHeldDown()
         }
 }
 
+LLXMLNodePtr LLJoystickAgentTurn::getXML(bool save_children) const
+{
+        LLXMLNodePtr node = LLJoystick::getXML();
+
+        node->setName(LL_JOYSTICK_TURN);
+
+        return node;
+}
+
 LLView* LLJoystickAgentTurn::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory)
 {
         std::string name("button");
@@ -435,6 +438,15 @@ void LLJoystickAgentSlide::onHeldDown()
 }
 
 
+LLXMLNodePtr LLJoystickAgentSlide::getXML(bool save_children) const
+{
+        LLXMLNodePtr node = LLJoystick::getXML();
+
+        node->setName(LL_JOYSTICK_SLIDE);
+
+        return node;
+}
+
 // static
 LLView* LLJoystickAgentSlide::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory)
 {
diff --git a/linden/indra/newview/lljoystickbutton.h b/linden/indra/newview/lljoystickbutton.h
index 076a506..b26851f 100644
--- a/linden/indra/newview/lljoystickbutton.h
+++ b/linden/indra/newview/lljoystickbutton.h
@@ -97,6 +97,7 @@ public:
 
         virtual void    onHeldDown();
 
+        virtual LLXMLNodePtr getXML(bool save_children = true) const;
         static LLView* fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory);
 
 };
@@ -114,6 +115,7 @@ public:
         virtual void    onHeldDown();
         virtual void    onMouseUp();
 
+        virtual LLXMLNodePtr getXML(bool save_children = true) const;
         static LLView* fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory);
 };
 
diff --git a/linden/indra/newview/llnameeditor.cpp b/linden/indra/newview/llnameeditor.cpp
index e4a6573..5997369 100644
--- a/linden/indra/newview/llnameeditor.cpp
+++ b/linden/indra/newview/llnameeditor.cpp
@@ -141,6 +141,16 @@ LLSD LLNameEditor::getValue() const
         return LLSD(mNameID);
 }
 
+// virtual
+LLXMLNodePtr LLNameEditor::getXML(bool save_children) const
+{
+        LLXMLNodePtr node = LLLineEditor::getXML();
+
+        node->setName(LL_NAME_EDITOR_TAG);
+
+        return node;
+}
+
 LLView* LLNameEditor::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory)
 {
         std::string name("name_editor");
diff --git a/linden/indra/newview/llnameeditor.h b/linden/indra/newview/llnameeditor.h
index bc5a678..964682c 100644
--- a/linden/indra/newview/llnameeditor.h
+++ b/linden/indra/newview/llnameeditor.h
@@ -62,6 +62,7 @@ public:
 
         virtual ~LLNameEditor();
 
+        virtual LLXMLNodePtr getXML(bool save_children = true) const;
         static LLView* fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory);
 
         void setNameID(const LLUUID& name_id, BOOL is_group);
diff --git a/linden/indra/newview/llnamelistctrl.cpp b/linden/indra/newview/llnamelistctrl.cpp
index baf0656..453cf7f 100644
--- a/linden/indra/newview/llnamelistctrl.cpp
+++ b/linden/indra/newview/llnamelistctrl.cpp
@@ -288,6 +288,8 @@ LLXMLNodePtr LLNameListCtrl::getXML(bool save_children) const
 {
         LLXMLNodePtr node = LLScrollListCtrl::getXML();
 
+        node->setName(LL_NAME_LIST_CTRL_TAG);
+
         node->createChild("allow_calling_card_drop", TRUE)->setBoolValue(mAllowCallingCardDrop);
 
         if (mNameColumnIndex != 0)
diff --git a/linden/indra/newview/llpanelinput.cpp b/linden/indra/newview/llpanelinput.cpp
index 4b94435..d530d67 100644
--- a/linden/indra/newview/llpanelinput.cpp
+++ b/linden/indra/newview/llpanelinput.cpp
@@ -64,6 +64,8 @@ BOOL LLPanelInput::postBuild()
         childSetValue("invert_mouse", gSavedSettings.getBOOL("InvertMouse"));
         childSetValue("edit_camera_movement", gSavedSettings.getBOOL("EditCameraMovement"));
         childSetValue("appearance_camera_movement", gSavedSettings.getBOOL("AppearanceCameraMovement"));
+        childSetValue("zoom_time", gSavedSettings.getF32("ZoomTime"));
+        childSetValue("camera_position_smoothing", gSavedSettings.getF32("CameraPositionSmoothing"));
         childSetValue("first_person_avatar_visible", gSavedSettings.getBOOL("FirstPersonAvatarVisible"));
 
         LLSliderCtrl* fov_slider = getChild<LLSliderCtrl>("camera_fov");
@@ -95,6 +97,8 @@ void LLPanelInput::apply()
         gSavedSettings.setBOOL("EditCameraMovement", childGetValue("edit_camera_movement"));
         gSavedSettings.setBOOL("AppearanceCameraMovement", childGetValue("appearance_camera_movement"));
         gSavedSettings.setF32("CameraAngle", mPreAdjustFOV);
+        gSavedSettings.setF32("ZoomTime", childGetValue("zoom_time").asReal());
+        gSavedSettings.setF32("CameraPositionSmoothing", childGetValue("camera_position_smoothing").asReal());
         gSavedSettings.setBOOL("FirstPersonAvatarVisible", childGetValue("first_person_avatar_visible"));
 
         gSavedSettings.setString("DoubleClickAction", childGetValue("double_click_action"));
diff --git a/linden/indra/newview/llpreviewscript.cpp b/linden/indra/newview/llpreviewscript.cpp
index ccec75b..2718c2f 100644
--- a/linden/indra/newview/llpreviewscript.cpp
+++ b/linden/indra/newview/llpreviewscript.cpp
@@ -1418,7 +1418,14 @@ void LLPreviewLSL::uploadAssetViaCaps(const std::string& url,
         llinfos << "Update Agent Inventory via capability" << llendl;
         LLSD body;
         body["item_id"] = item_id;
-        body["target"] = "lsl2";
+        if (gSavedSettings.getBOOL("SaveInventoryScriptsAsMono"))
+        {
+                body["target"] = "mono";
+        }
+        else
+        {
+                body["target"] = "lsl2";
+        }
         LLHTTPClient::post(url, body, new LLUpdateAgentInventoryResponder(body, filename, LLAssetType::AT_LSL_TEXT));
 }
 
diff --git a/linden/indra/newview/llstartup.cpp b/linden/indra/newview/llstartup.cpp
index c5bf2c7..143aa34 100644
--- a/linden/indra/newview/llstartup.cpp
+++ b/linden/indra/newview/llstartup.cpp
@@ -2582,6 +2582,8 @@ bool idle_startup()
         {
                 set_startup_status(1.0, "", "");
 
+                LLFirstUse::ClientTags();
+
                 // Let the map know about the inventory.
                 if(gFloaterWorldMap)
                 {
diff --git a/linden/indra/newview/lltexturectrl.cpp b/linden/indra/newview/lltexturectrl.cpp
index c4ea71e..5500973 100644
--- a/linden/indra/newview/lltexturectrl.cpp
+++ b/linden/indra/newview/lltexturectrl.cpp
@@ -969,6 +969,8 @@ LLXMLNodePtr LLTextureCtrl::getXML(bool save_children) const
 {
         LLXMLNodePtr node = LLUICtrl::getXML();
 
+        node->setName(LL_TEXTURE_CTRL_TAG);
+
         node->createChild("label", TRUE)->setStringValue(getLabel());
 
         node->createChild("default_image_name", TRUE)->setStringValue(getDefaultImageName());
diff --git a/linden/indra/newview/llviewertexteditor.cpp b/linden/indra/newview/llviewertexteditor.cpp
index 296c540..e5e2cd6 100644
--- a/linden/indra/newview/llviewertexteditor.cpp
+++ b/linden/indra/newview/llviewertexteditor.cpp
@@ -1555,6 +1555,16 @@ BOOL LLViewerTextEditor::exportBuffer( std::string& buffer )
         return TRUE;
 }
 
+// virtual
+LLXMLNodePtr LLViewerTextEditor::getXML(bool save_children) const
+{
+        LLXMLNodePtr node = LLTextEditor::getXML();
+
+        node->setName(LL_TEXT_EDITOR_TAG);
+
+        return node;
+}
+
 LLView* LLViewerTextEditor::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory)
 {
         std::string name("text_editor");
diff --git a/linden/indra/newview/llviewertexteditor.h b/linden/indra/newview/llviewertexteditor.h
index f29caee..c69b3f0 100644
--- a/linden/indra/newview/llviewertexteditor.h
+++ b/linden/indra/newview/llviewertexteditor.h
@@ -54,6 +54,7 @@ public:
 
         virtual void makePristine();
         
+        virtual LLXMLNodePtr getXML(bool save_children = true) const;
         static LLView* fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory);
 
         // mousehandler overrides
diff --git a/linden/indra/newview/llvoavatar.cpp b/linden/indra/newview/llvoavatar.cpp
index 7e1c6ca..c361f49 100644
--- a/linden/indra/newview/llvoavatar.cpp
+++ b/linden/indra/newview/llvoavatar.cpp
@@ -83,6 +83,8 @@
 #include "llvoiceclient.h"
 #include "llvoicevisualizer.h" // Ventrella
 
+#include "llsdserialize.h" // client resolver
+
 #if LL_WINDOWS
         // Disable warning for unreachable code in boost/lexical_cast.hpp for Boost 1.36 -- McCabe
         #pragma warning(disable : 4702)
@@ -169,7 +171,7 @@ const F32 TIME_BEFORE_MESH_CLEANUP = 5.f; // seconds
 const S32 AVATAR_RELEASE_THRESHOLD = 10; // number of avatar instances before releasing memory
 const F32 FOOT_GROUND_COLLISION_TOLERANCE = 0.25f;
 const F32 AVATAR_LOD_TWEAK_RANGE = 0.7f;
-const S32 MAX_BUBBLE_CHAT_LENGTH = 1023;
+const S32 MAX_BUBBLE_CHAT_LENGTH = DB_CHAT_MSG_STR_LEN;
 const S32 MAX_BUBBLE_CHAT_UTTERANCES = 12;
 const F32 CHAT_FADE_TIME = 8.0;
 const F32 BUBBLE_CHAT_TIME = CHAT_FADE_TIME * 3.f;
@@ -678,6 +680,7 @@ S32 LLVOAvatar::sScratchTexBytes = 0;
 F32 LLVOAvatar::sRenderDistance = 256.f;
 S32     LLVOAvatar::sNumVisibleAvatars = 0;
 S32     LLVOAvatar::sNumLODChangesThisFrame = 0;
+LLSD LLVOAvatar::sClientResolutionList;
 
 const LLUUID LLVOAvatar::sStepSoundOnLand = LLUUID("e8af4a28-aa83-4310-a7c4-c047e15ea0df");
 const LLUUID LLVOAvatar::sStepSounds[LL_MCODE_END] =
@@ -1402,6 +1405,9 @@ void LLVOAvatar::initClass()
                 llerrs << "Error parsing skeleton node in avatar XML file: " << skeleton_path << llendl;
         }
 
+        {
+                loadClientTags();
+        }
 }
 
 
@@ -2971,6 +2977,228 @@ void LLVOAvatar::idleUpdateWindEffect()
                 }
         }
 }
+bool LLVOAvatar::updateClientTags()
+{
+        std::string client_list_filename = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, "client_list.xml");
+        LLSD response = LLHTTPClient::blockingGet("http://www.imprudenceviewer.org/app/client_list/client_list.xml");
+        if(response.has("body"))
+        {
+                const LLSD &client_list = response["body"];
+
+                if(client_list.has("isComplete"))
+                {
+                        llofstream export_file;
+                        export_file.open(client_list_filename);
+                        LLSDSerialize::toPrettyXML(client_list, export_file);
+                        export_file.close();
+                        return true;
+                }
+        }
+        return false;
+}
+
+bool LLVOAvatar::loadClientTags()
+{
+        std::string client_list_filename = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, "client_list.xml");
+
+        if(!LLFile::isfile(client_list_filename))
+        {
+                client_list_filename = gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "client_list.xml");
+        }
+
+        if(LLFile::isfile(client_list_filename))
+        {
+                LLSD client_list;
+
+                llifstream importer(client_list_filename);
+                LLSDSerialize::fromXMLDocument(client_list, importer);
+                if(client_list.has("isComplete"))
+                {
+                        sClientResolutionList = client_list;
+                }else
+                {
+                        return false;
+                }
+        }else
+        {
+                return false;
+        }
+
+        for (std::vector<LLCharacter*>::iterator iter = LLCharacter::sInstances.begin();
+        iter != LLCharacter::sInstances.end(); ++iter)
+        {
+                LLVOAvatar* avatarp = (LLVOAvatar*) *iter;
+                if(avatarp)
+                {
+                        LLVector3 root_pos_last = avatarp->mRoot.getWorldPosition();
+                        avatarp->idleUpdateNameTag(root_pos_last);
+                }
+        }
+        return true;
+}
+
+void LLVOAvatar::resolveClient(LLColor4& avatar_name_color, std::string& client, LLVOAvatar* avatar)
+{
+        LLUUID idx = avatar->getTE(0)->getID();
+        if(LLVOAvatar::sClientResolutionList.has("isComplete") 
+                && LLVOAvatar::sClientResolutionList.has(idx.asString()))
+        {
+                LLSD cllsd = LLVOAvatar::sClientResolutionList[idx.asString()];
+                client = cllsd["name"].asString();
+                LLColor4 colour;
+                colour.setValue(cllsd["color"]);
+                avatar_name_color += colour;
+                avatar_name_color *= 1.0/(cllsd["multiple"].asReal()+1.0f);
+        }
+        else
+        {       
+
+                if(idx == LLUUID("cc7a030f-282f-c165-44d2-b5ee572e72bf"))
+                {
+                        avatar_name_color += LLColor4(0.6f,0.8f,1.0f);//Imprudence
+                        avatar_name_color = avatar_name_color * (F32)0.333333333333;
+                        client = "Imprudence";
+
+                } else  if(idx == LLUUID("2a9a406c-f448-68f2-4e38-878f8c46c190"))
+                {
+                        avatar_name_color += LLColor4(1.0f,0.9f,0.7f);//Meerkat
+                        avatar_name_color = avatar_name_color * (F32)0.333333333333;
+                        client = "Meerkat";
+                }else if(idx == LLUUID("ccda2b3b-e72c-a112-e126-fee238b67218"))
+                {
+                        avatar_name_color += LLColor4::green;//emerald
+                        avatar_name_color += LLColor4::green;
+                        avatar_name_color = avatar_name_color * (F32)0.333333333333;
+                        client = "Emerald";
+                }else if(idx == LLUUID("c252d89d-6f7c-7d90-f430-d140d2e3fbbe"))
+                {
+                        avatar_name_color += LLColor4::red;//vlife jcool410
+                        avatar_name_color = avatar_name_color * 0.5;
+                        client = "VLife";
+                }else if(idx == LLUUID("adcbe893-7643-fd12-f61c-0b39717e2e32"))
+                {
+                        avatar_name_color += LLColor4::pink;//tyk3n
+                        avatar_name_color = avatar_name_color * 0.5;
+                        client = "tyk3n";
+                }else if(idx == LLUUID("f3fd74a6-fee7-4b2f-93ae-ddcb5991da04") || idx == LLUUID("77662f23-c77a-9b4d-5558-26b757b2144c"))
+                {
+                        avatar_name_color += (LLColor4::purple);//psl
+                        avatar_name_color = avatar_name_color * 0.5;
+                        client = "PSL";
+                }else if(idx == LLUUID("5aa5c70d-d787-571b-0495-4fc1bdef1500"))
+                {
+                        avatar_name_color += LLColor4::red;//lordgreg
+                        avatar_name_color += LLColor4::red;
+                        avatar_name_color = avatar_name_color * (F32)0.333333333333;
+                        client = "LGG proxy";
+                }else if(idx == LLUUID("8183e823-c443-2142-6eb6-2ab763d4f81c"))
+                {
+                        avatar_name_color += LLColor4::blue;//day oh
+                        avatar_name_color = avatar_name_color * 0.5;
+                        client = "Day Oh proxy";
+                }else if(idx == LLUUID("e52d21f7-3c8b-819f-a3db-65c432295dac") || idx == LLUUID("0f6723d2-5b23-6b58-08ab-308112b33786"))
+                {
+                        avatar_name_color += LLColor4::cyan;//cryolife
+                        avatar_name_color += LLColor4::cyan;
+                        avatar_name_color = avatar_name_color * 0.5;
+                        client = "CryoLife";
+                }else if(idx == LLUUID("0bcd5f5d-a4ce-9ea4-f9e8-15132653b3d8"))
+                {
+                        avatar_name_color += LLColor4::pink;//moy
+                        avatar_name_color += LLColor4::pink;//moy
+                        avatar_name_color = avatar_name_color * (F32)0.333333333333;
+                        client = "MoyMix";
+                }else if(idx == LLUUID("f5a48821-9a98-d09e-8d6a-50cc08ba9a47"))
+                {
+                        avatar_name_color += LLColor4::yellow;//neil
+                        avatar_name_color += LLColor4::yellow;//neil
+                        avatar_name_color = avatar_name_color * (F32)0.333333333333;
+                        client = "NeilLife";
+                }else if(idx == LLUUID("2c9c1e0b-e5d1-263e-16b1-7fc6d169f3d6"))
+                {
+                        avatar_name_color += LLColor4(0.0f,1.0f,1.0f);
+                        avatar_name_color = avatar_name_color * 0.5;//phox
+                        client = "PhoxSL";
+                }else if(idx == LLUUID("c5b570ca-bb7e-3c81-afd1-f62646b20014") || idx == LLUUID("7c4d47a3-0c51-04d1-fa47-e4f3ac12f59b"))
+                {
+                        avatar_name_color += LLColor4::white;
+                        avatar_name_color += LLColor4::white;
+                        avatar_name_color = avatar_name_color * (F32)0.333333333333;
+                        client = "Kung Fu";
+                }else if(idx == LLUUID("9422e9d7-7b11-83e4-6262-4a8db4716a3b"))
+                {
+                        avatar_name_color += LLColor4::magenta;
+                        avatar_name_color += LLColor4::magenta;
+                        avatar_name_color = avatar_name_color * (F32)0.333333333333;
+                        client = "BetaLife";
+                }else if(idx == LLUUID("872c0005-3095-0967-866d-11cd71115c22"))
+                {
+                        avatar_name_color += LLColor4::green;//SimFed Poland
+                        avatar_name_color += LLColor4::blue;//SimFed Poland
+                        avatar_name_color += LLColor4::blue;//SimFed Poland
+                        avatar_name_color = avatar_name_color * 0.5;
+                        client = "CryoLife";
+                }else if(idx == LLUUID("3ab7e2fa-9572-ef36-1a30-d855dbea4f92") || //wat
+                                        idx == LLUUID("11ad2452-ce54-8d65-7c23-05589b59f516") ||//wat.
+                                        idx == LLUUID("e734563e-1c31-2a35-3ed5-8552c807439f") ||//wat.
+                                        idx == LLUUID("58a8b7ec-1455-7162-5d96-d3c3ead2ed71") ||//wat
+                                        idx == LLUUID("841ef25b-3b90-caf9-ea3d-5649e755db65")//wat -.-
+                                        )
+                {
+                        avatar_name_color += LLColor4(0.0f,0.5f,1.0f); 
+                        avatar_name_color = avatar_name_color * 0.5;   
+                        client = "VerticalLife";
+                }else if(idx == LLUUID("4e8dcf80-336b-b1d8-ef3e-08dacf015a0f"))
+                {
+                        avatar_name_color += LLColor4::blue; //Sapphire
+                        avatar_name_color += LLColor4::blue; //Sapphire
+                        avatar_name_color = avatar_name_color * (F32)0.333333333333;
+                        client = "Sapphire";
+                }else if(idx == LLUUID("ffce04ff-5303-4909-a044-d37af7ab0b0e"))
+                {
+                        avatar_name_color += LLColor4::orange; //corgiVision
+                        avatar_name_color = avatar_name_color * (F32)0.75;
+                        client = "Corgi";
+                }else if(idx == LLUUID("ccb509cf-cc69-e569-38f1-5086c687afd1"))
+                {
+                        avatar_name_color += LLColor4::red; //Ruby
+                        avatar_name_color += LLColor4::purple; //Ruby
+                        avatar_name_color = avatar_name_color * (F32)0.333333333333;
+                        client = "Ruby";
+                }else if(idx == LLUUID("1c29480c-c608-df87-28bb-964fb64c5366"))
+                {
+                        avatar_name_color += LLColor4::yellow9;
+                        avatar_name_color += LLColor4::yellow9;
+                        avatar_name_color *= (F32)0.333333333333;
+                        client = "Gemini";
+                }
+        }
+        if(client.empty())
+        {
+                LLPointer<LLViewerImage> image_point = gImageList.getImage(idx, MIPMAP_YES, IMMEDIATE_NO);
+                if(image_point.notNull() && image_point->isMissingAsset())
+                {
+                        avatar_name_color += LLColor4::grey;//anomalous
+                        avatar_name_color = avatar_name_color * 0.5;
+                        client = "Invalid";
+                }
+        }
+        if(avatar->getTE(5)->getID() != avatar->getTE(6)->getID() && !client.empty())
+        {
+                client = "Failure";
+                avatar_name_color = LLColor4::grey;
+        }
+        if(client.empty() && LLVOAvatar::sClientResolutionList.has("default"))
+        {
+                LLSD cllsd = LLVOAvatar::sClientResolutionList["default"];
+                client = cllsd["name"].asString();
+                LLColor4 colour;
+                colour.setValue(cllsd["color"]);
+                avatar_name_color += colour;
+                avatar_name_color *= 1.0/(cllsd["multiple"].asReal()+1.0f);
+        }
+        
+}
 
 void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last)
 {
@@ -3032,7 +3260,7 @@ void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last)
                         mRenderGroupTitles = sRenderGroupTitles;
                         new_name = TRUE;
                 }
-
+                std::string client;
                 // First Calculate Alpha
                 // If alpha > 0, create mNameText if necessary, otherwise delete it
                 {
@@ -3073,6 +3301,11 @@ void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last)
                                 }
                                 
                                 LLColor4 avatar_name_color = gColors.getColor( "AvatarNameColor" );
+                                if(!mIsSelf) //don't know your own client ?
+                                {
+                                        new_name = TRUE; //lol or see the last client used 
+                                        resolveClient(avatar_name_color,client, this);
+                                }
                                 avatar_name_color.setAlpha(alpha);
                                 mNameText->setColor(avatar_name_color);
                                 
@@ -3129,7 +3362,7 @@ void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last)
                                 (!title && !mTitle.empty()) ||
                                 (title && mTitle != title->getString()) ||
                                 (is_away != mNameAway || is_busy != mNameBusy || is_muted != mNameMute)
-                                || is_appearance != mNameAppearance)
+                                || is_appearance != mNameAppearance || client.length() != 0)
                         {
                                 std::string line;
 
@@ -3158,7 +3391,8 @@ void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last)
 
                                 BOOL need_comma = FALSE;
 
-                                if (is_away || is_muted || is_busy)
+                                bool show_client = client.length() != 0 && gSavedSettings.getBOOL("ShowClientNameTag");
+                                if (is_away || is_muted || is_busy || show_client)
                                 {
                                         line += " (";
                                         if (is_away)
@@ -3184,6 +3418,15 @@ void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last)
                                                 line += "Muted";
                                                 need_comma = TRUE;
                                         }
+                                        if (show_client)
+                                        {
+                                                if (need_comma)
+                                                {
+                                                        line += ", ";
+                                                }
+                                                line += client;
+                                                need_comma = TRUE;
+                                        }
                                         line += ")";
                                 }
                                 if (is_appearance)
@@ -7438,6 +7681,8 @@ void LLVOAvatar::releaseUnnecessaryTextures()
         {
                 const LLVOAvatarDictionary::BakedDictionaryEntry * bakedDicEntry = LLVOAvatarDictionary::getInstance()->getBakedTexture((EBakedTextureIndex)baked_index);
                 // skip if this is a skirt and av is not wearing one, or if we don't have a baked texture UUID
+                if(baked_index == BAKED_HEAD)//for client detection
+                        continue;
                 if (!isTextureDefined(bakedDicEntry->mTextureIndex)
                         && ( (baked_index != BAKED_SKIRT) || isWearingWearableType(WT_SKIRT) ))
                 {
diff --git a/linden/indra/newview/llvoavatar.h b/linden/indra/newview/llvoavatar.h
index f6d5e27..f759e15 100644
--- a/linden/indra/newview/llvoavatar.h
+++ b/linden/indra/newview/llvoavatar.h
@@ -534,6 +534,8 @@ public:
         LLViewerJoint mRoot; // avatar skeleton
         BOOL mIsSitting; // sitting state
 
+        static bool updateClientTags();
+        static bool loadClientTags();
         //--------------------------------------------------------------------
         // Private member variables.
         //--------------------------------------------------------------------
@@ -590,12 +592,19 @@ private:
         
         // Animation timer
         LLTimer         mAnimTimer;
-        F32                     mTimeLast;      
+        F32                     mTimeLast;
+
 
         // Send selection beam info to scripts
         static int              sPartsNow;
         static LLVector3d sBeamLastAt;
+        static LLSD sClientResolutionList;
+
+        static void resolveClient(LLColor4& avatar_name_color, std::string& client, LLVOAvatar* avatar);
+//Imprudence FIXME
+//      friend class LLFloaterAvatarList;
 
+protected:
         LLPointer<LLHUDEffectSpiral> mBeam;
         LLFrameTimer mBeamTimer;
 
diff --git a/linden/indra/newview/llwebbrowserctrl.cpp b/linden/indra/newview/llwebbrowserctrl.cpp
index 89cb62b..453b9d2 100644
--- a/linden/indra/newview/llwebbrowserctrl.cpp
+++ b/linden/indra/newview/llwebbrowserctrl.cpp
@@ -1012,6 +1012,16 @@ void LLWebBrowserTexture::resize( S32 new_width, S32 new_height )
         mLastBrowserDepth = media_depth;
 }
 
+// virtual
+LLXMLNodePtr LLWebBrowserCtrl::getXML(bool save_children) const
+{
+        LLXMLNodePtr node = LLUICtrl::getXML();
+
+        node->setName(LL_WEB_BROWSER_CTRL_TAG);
+
+        return node;
+}
+
 LLView* LLWebBrowserCtrl::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory)
 {
         std::string name("web_browser");
diff --git a/linden/indra/newview/llwebbrowserctrl.h b/linden/indra/newview/llwebbrowserctrl.h
index 0f46aa1..0100807 100644
--- a/linden/indra/newview/llwebbrowserctrl.h
+++ b/linden/indra/newview/llwebbrowserctrl.h
@@ -191,6 +191,7 @@ class LLWebBrowserCtrl :
                 // Defaults to true.
                 void setTakeFocusOnClick( bool take_focus );
 
+                virtual LLXMLNodePtr getXML(bool save_children = true) const;
                 static LLView* fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory);
 
                 // handle mouse related methods
diff --git a/linden/indra/newview/pipeline.cpp b/linden/indra/newview/pipeline.cpp
index 4ea9e41..d3ee8b6 100644
--- a/linden/indra/newview/pipeline.cpp
+++ b/linden/indra/newview/pipeline.cpp
@@ -2724,12 +2724,20 @@ void LLPipeline::renderGeom(LLCamera& camera, BOOL forceVBOUpdate)
 
         LLVertexBuffer::unbind();
         
-        if (!LLPipeline::sReflectionRender && !LLPipeline::sRenderDeferred && gPipeline.hasRenderDebugFeatureMask(LLPipeline::RENDER_DEBUG_FEATURE_UI))
+        if (!LLPipeline::sReflectionRender && !LLPipeline::sRenderDeferred)
         {
-                // Render debugging beacons.
-                gObjectList.renderObjectBeacons();
-                LLHUDObject::renderAll();
-                gObjectList.resetObjectBeacons();
+                if (gPipeline.hasRenderDebugFeatureMask(LLPipeline::RENDER_DEBUG_FEATURE_UI))
+                {
+                        // Render debugging beacons.
+                        gObjectList.renderObjectBeacons();
+                        LLHUDObject::renderAll();
+                        gObjectList.resetObjectBeacons();
+                }
+                else
+                {
+                        // Make sure particle effects disappear
+                        LLHUDObject::renderAllForTimer();
+                }
         }
 
         LLAppViewer::instance()->pingMainloopTimeout("Pipeline:RenderGeomEnd");
@@ -2954,6 +2962,11 @@ void LLPipeline::renderGeomPostDeferred(LLCamera& camera)
                 LLHUDObject::renderAll();
                 gObjectList.resetObjectBeacons();
         }
+        else
+        {
+                // Make sure particle effects disappear
+                LLHUDObject::renderAllForTimer();
+        }
 
         if (occlude)
         {
diff --git a/linden/indra/newview/skins/default/xui/da/floater_instant_message.xml b/linden/indra/newview/skins/default/xui/da/floater_instant_message.xml
index 13a7adf..9b695b5 100644
--- a/linden/indra/newview/skins/default/xui/da/floater_instant_message.xml
+++ b/linden/indra/newview/skins/default/xui/da/floater_instant_message.xml
@@ -33,7 +33,7 @@
         <string name="unavailable_text_label">
                 Tekst chat er ikke tilgængeligt i dette opkald.
         </string>
-        <button label="Profil..." name="profile_callee_btn"/>
+        <flyout_button label="Profil..." name="profile_callee_btn"/>
         <button label="Opkald" name="start_call_btn" pad_right="7" width="120"/>
         <button halign="right" label="Afbryd" name="end_call_btn" width="120"/>
         <panel left_delta="116" name="speaker_controls">
diff --git a/linden/indra/newview/skins/default/xui/de/floater_instant_message.xml b/linden/indra/newview/skins/default/xui/de/floater_instant_message.xml
index 667be04..1e926c4 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_instant_message.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_instant_message.xml
@@ -33,7 +33,7 @@
         <string name="unavailable_text_label">
                 Für diese Verbindung ist kein Text-Chat verfügbar.
         </string>
-        <button label="Profil..." name="profile_callee_btn"/>
+        <flyout_button label="Profil..." name="profile_callee_btn"/>
         <button label="Anrufen" name="start_call_btn" pad_right="7" width="115"/>
         <button halign="right" label="Anruf beenden" name="end_call_btn" width="115"/>
         <panel left_delta="111" name="speaker_controls">
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 d31357f..569e421 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
@@ -726,7 +726,7 @@ Only large parcels can be listed in search.
                         </combo_box>
                         <button bottom="-140" enabled="true" follows="left|top" font="SansSerif"
                              halign="center" height="18" label="?" label_selected="?" left="400"
-                             mouse_opaque="true" name="?" width="18" />
+                             mouse_opaque="true" name="?" width="20" />
                         <check_box bottom="-160" enabled="true" follows="left|top" font="SansSerifSmall"
                              height="16" initial_value="false" label="Mature Content" left="14"
                              mouse_opaque="true" name="MatureCheck" radio_style="false"
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_env_settings.xml b/linden/indra/newview/skins/default/xui/en-us/floater_env_settings.xml
index 68443c5..e2bafbf 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_env_settings.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_env_settings.xml
@@ -62,5 +62,5 @@
         <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="20"
              label="Advanced Water" left="300" name="EnvAdvancedWaterButton" width="137" />
         <button bottom="-40" follows="left|top" font="SansSerif" height="18" label="?"
-             left="570" name="EnvSettingsHelpButton" width="18" />
+             left="570" name="EnvSettingsHelpButton" width="22" />
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_instant_message.xml b/linden/indra/newview/skins/default/xui/en-us/floater_instant_message.xml
index be8508f..c8ec0fd 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_instant_message.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_instant_message.xml
@@ -37,20 +37,25 @@
         <string name="unavailable_text_label">
                 Text chat is not available for this call.
         </string>
-        <button bottom="-40" follows="left|top" height="20" label="Profile..." left="5"
-             name="profile_callee_btn" width="80" />
-        <button bottom_delta="0" follows="left|top" font="SansSerif"
-             halign="center" bottom ="-40" height="20" label="Offer Teleport" left_delta="85"
-             mouse_opaque="true" name="offer_tp_btn" scale_image="true" width="102" />
+  <string name="history_entry">
+    History
+  </string>
+  <string name="pay_entry">
+    Pay
+  </string>
+  <string name="teleport_entry">
+    Offer Teleport
+  </string>
+  <flyout_button bottom="-40" follows="left|top" height="20" label="Profile" left="5" width="90"
+       list_position="below" mouse_opaque="true" name="profile_callee_btn">
+  </flyout_button>
         <button bottom="-40" follows="left|top" halign="center" height="20"
              image_overlay="icn_voice-call-start.tga" image_overlay_alignment="left"
-             label="Call" left_delta="107" name="start_call_btn" width="100" />
+             label="Call" left_delta="95" name="start_call_btn" width="100" />
         <button bottom="-40" follows="left|top" halign="center" height="20"
              image_overlay="icn_voice-call-end.tga" image_overlay_alignment="left"
              label="End Call" left_delta="0" name="end_call_btn" pad_right="10"
              visible="false" width="100" />
-  <button bottom="-40" follows="left|top" halign="center" height="20" label="History" left_delta="105"
-          name="history_btn" visible="true" width="85" />
   <text bottom_delta="0" left="-240" height="14" width="230" name="inventory_send" halign="right" 
         text_color="LabelTextColor" follows="right|top" drop_shadow_visible="true"
         bg_visible="false" border_drop_shadow_visible="false" border_visible="false">
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_instant_message_group.xml b/linden/indra/newview/skins/default/xui/en-us/floater_instant_message_group.xml
index 2e97d64..fd63221 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_instant_message_group.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_instant_message_group.xml
@@ -45,10 +45,10 @@
                 <layout_panel border="false" bottom="0" default_tab_group="1" follows="left|top|bottom|right"
                      height="130" left="0" min_width="210" name="im_contents_panel" width="175">
                         <button bottom="-20" follows="left|top" height="20" label="Group Info" left="5"
-                             name="group_info_btn" tab_group="0" width="80" />
+                             name="group_info_btn" tab_group="0" width="90" />
                         <button bottom_delta="0" enabled="false" follows="left|top" halign="right" height="20"
                              image_overlay="icn_voice-call-start.tga" image_overlay_alignment="left"
-                             label="Join Call" left_delta="85" name="start_call_btn" pad_right="12"
+                             label="Join Call" left_delta="95" name="start_call_btn" pad_right="12"
                              width="92" />
                         <button bottom_delta="0" follows="left|top" halign="right" height="20"
                              image_overlay="icn_voice-call-end.tga" image_overlay_alignment="left"
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 bc1a6fc..ccc348d 100644
--- a/linden/indra/newview/skins/default/xui/en-us/notifications.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/notifications.xml
@@ -6384,6 +6384,24 @@ Add this Ability to &apos;[ROLE_NAME]&apos;?
   </notification>
 
   <notification
+               icon="notify.tga"
+               name="QueryClientTags"
+               type="notify">
+          Would you like to have the client tag database automatically updated from imprudenceviewer.org?
+          This ensures that you have the latest information available regarding other clients.
+          <form name="form">
+                  <button
+                         index="0"
+                         name="Yes"
+                         text="Yes"/>
+                  <button
+                         index="1"
+                         name="No"
+                         text="No"/>
+          </form>
+  </notification>
+
+  <notification
    icon="notifytip.tga"
    name="UnableToOpenCommandURL"
    priority="high"
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 6415402..e334f78 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
@@ -99,7 +99,7 @@
                select_all_on_focus_received="true" />
         <check_box name="remember_check" label="Remember password"
              bottom_delta="-24" left_delta="0" height="16" width="140"
-             follows="left|bottom" font="SansSerifSmall" 
+             follows="left|bottom" font="SansSerifSmall" control_name="RememberPassword" 
                    initial_value="false" mouse_opaque="true"  />
 
 
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 e9ab27c..547b547 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
@@ -32,7 +32,7 @@
         </text>
         <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-108"
              can_apply_immediately="true" color="1 1 1 1" control_name="UserChatColor"
-             enabled="true" follows="left|top" height="47" label="You" left="148"
+             enabled="true" follows="left|top" height="56" label="You" left="148"
              mouse_opaque="true" name="user" width="54" />
         <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-108"
              can_apply_immediately="true" color="1 1 1 1" control_name="AgentChatColor"
@@ -55,7 +55,7 @@
         <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-165"
              can_apply_immediately="true" color="0.7 0.9 0.7 1"
              control_name="ObjectChatColor" enabled="true" follows="left|top"
-             height="47"  label="Objects" left="148" mouse_opaque="true"
+             height="56" label="Objects" left="148" mouse_opaque="true"
              name="objects" width="54" />
         <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-165"
              can_apply_immediately="true" color="0.7 0.9 0.7 1"
@@ -77,7 +77,7 @@
              enabled="true" follows="left|top" height="56"
              label="URLs" left_delta="68" mouse_opaque="true" name="links" width="54" />
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom_delta="-28" drop_shadow_visible="true" enabled="true" follows="left|top"
+             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="text_box3" v_pad="0" width="135">
                 Chat Console:
@@ -116,7 +116,7 @@
              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="-25" drop_shadow_visible="true" enabled="true" follows="left|top"
+              bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12"
              mouse_opaque="false" name="text_box6" v_pad="0" width="135">
                 Chat Options:
@@ -134,20 +134,18 @@
              follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
              label="Show timestamps in Local Chat" left="148" mouse_opaque="true"
              name="show_timestamps_check" radio_style="false" width="237" />
-        <check_box bottom_delta="-20" enabled="true"
-  <check_box bottom_delta="-20" control_name="ScriptErrorsAsChat" enabled="true"
+        <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="-20" enabled="true"
         <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"
+        <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"
+             label="Show custom chat channel" left="148" mouse_opaque="true"
              name="toggle_channel_control" radio_style="false" width="237" />
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom="-379" drop_shadow_visible="true" enabled="true" follows="left|top"
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 79f775b..fa4f3a5 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
@@ -47,7 +47,7 @@
              increment=".025" initial_val="1.57" left="276" 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="-14" drop_shadow_visible="true" enabled="true" follows="left|top"
+             bottom_delta="-18" drop_shadow_visible="true" enabled="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="10" left="148"
              mouse_opaque="true" name="Camera Follow Distance:" v_pad="0" width="128">
                 Camera Follow Distance:
@@ -57,6 +57,27 @@
              increment=".025" initial_val="1" left="276" min_val=".5" max_val="3"
              mouse_opaque="true" name="camera_offset_scale" show_text="false" value="1"
              width="128" />
+  <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"
+       mouse_opaque="true" name="Camera Transition Time:" v_pad="0" width="128">
+    Camera 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" />
+  <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"
+             mouse_opaque="true" name="Camera Smoothing:" v_pad="0" width="128">
+    Camera 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"
+             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"
diff --git a/linden/indra/newview/skins/default/xui/es/floater_instant_message.xml b/linden/indra/newview/skins/default/xui/es/floater_instant_message.xml
index 0ba63fc..30b23d1 100644
--- a/linden/indra/newview/skins/default/xui/es/floater_instant_message.xml
+++ b/linden/indra/newview/skins/default/xui/es/floater_instant_message.xml
@@ -1,50 +1,50 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>

-<floater label="(desconocido)" name="im_floater" title="(desconocido)">

-        <string name="ringing">

-                Llamando...

-        </string>

-        <string name="answering">

-                Conectando...

-        </string>

-        <string name="connected">

-                Conectado, pulse Colgar para acabar

-        </string>

-        <string name="hang_up">

-                Llamada finalizada

-        </string>

-        <string name="inventory_item_offered">

-                Ofrecido un ítem del inventario

-        </string>

-        <string name="voice_icon">

-                icn_voice-pvtfocus.tga

-        </string>

-        <string name="title_string">

-                Mensaje instantáneo a [NAME]

-        </string>

-        <string name="typing_start_string">

-                [NAME] está escribiendo...

-        </string>

-        <string name="session_start_string">

-                Iniciando una sesión con [NAME]; por favor, espere.

-        </string>

-        <string name="default_text_label">

-                Pulse aquí para enviar un mensaje instantáneo.

-        </string>

-        <string name="unavailable_text_label">

-                Para esta llamada no está disponible el chat de texto.

-        </string>

-        <button label="Perfil..." name="profile_callee_btn"/>

-        <button label="Llamar" name="start_call_btn"/>

-        <button label="Colgar" name="end_call_btn"/>

-        <panel name="speaker_controls">

-                <button label="" name="mute_btn" tool_tip="Silenciar la voz"/>

-        </panel>

-        <line_editor label="Pulse aquí para enviar un mensaje instantáneo" name="chat_editor"/>

-        <button label="Enviar" name="send_btn"/>

-        <string name="live_help_dialog">

-                *** Bienvenido a la Petición de Ayuda *** 

-Por favor, en primer lugar revise nuestras páginas de ayuda de SL pulsando F1, o acceda a la Knowledge Base http://secondlife.com/knowledgebase/ 

-Si no encuentra allí la respuesta que busca, por favor, empiece el proceso escribiendo su pregunta, y espere unos momentos a que responda algún ayudante que esté disponible.

--=-=- El tiempo de respuesta puede variar, especialmente durante las horas punta -=-=-

-        </string>

-</floater>

+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater label="(desconocido)" name="im_floater" title="(desconocido)">
+        <string name="ringing">
+                Llamando...
+        </string>
+        <string name="answering">
+                Conectando...
+        </string>
+        <string name="connected">
+                Conectado, pulse Colgar para acabar
+        </string>
+        <string name="hang_up">
+                Llamada finalizada
+        </string>
+        <string name="inventory_item_offered">
+                Ofrecido un ítem del inventario
+        </string>
+        <string name="voice_icon">
+                icn_voice-pvtfocus.tga
+        </string>
+        <string name="title_string">
+                Mensaje instantáneo a [NAME]
+        </string>
+        <string name="typing_start_string">
+                [NAME] está escribiendo...
+        </string>
+        <string name="session_start_string">
+                Iniciando una sesión con [NAME]; por favor, espere.
+        </string>
+        <string name="default_text_label">
+                Pulse aquí para enviar un mensaje instantáneo.
+        </string>
+        <string name="unavailable_text_label">
+                Para esta llamada no está disponible el chat de texto.
+        </string>
+        <flyout_button label="Perfil..." name="profile_callee_btn"/>
+        <button label="Llamar" name="start_call_btn"/>
+        <button label="Colgar" name="end_call_btn"/>
+        <panel name="speaker_controls">
+                <button label="" name="mute_btn" tool_tip="Silenciar la voz"/>
+        </panel>
+        <line_editor label="Pulse aquí para enviar un mensaje instantáneo" name="chat_editor"/>
+        <button label="Enviar" name="send_btn"/>
+        <string name="live_help_dialog">
+                *** Bienvenido a la Petición de Ayuda *** 
+Por favor, en primer lugar revise nuestras páginas de ayuda de SL pulsando F1, o acceda a la Knowledge Base http://secondlife.com/knowledgebase/ 
+Si no encuentra allí la respuesta que busca, por favor, empiece el proceso escribiendo su pregunta, y espere unos momentos a que responda algún ayudante que esté disponible.
+-=-=- El tiempo de respuesta puede variar, especialmente durante las horas punta -=-=-
+        </string>
+</floater>
diff --git a/linden/indra/newview/skins/default/xui/fr/floater_instant_message.xml b/linden/indra/newview/skins/default/xui/fr/floater_instant_message.xml
index 15539bc..926483b 100644
--- a/linden/indra/newview/skins/default/xui/fr/floater_instant_message.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_instant_message.xml
@@ -1,50 +1,50 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>

-<floater label="(inconnue)" name="im_floater" title="(inconnue)">

-        <string name="ringing">

-                Appel en cours...

-        </string>

-        <string name="answering">

-                Connexion en cours...

-        </string>

-        <string name="connected">

-                Connecté(e), cliquez sur Raccrocher pour terminer l&apos;appel

-        </string>

-        <string name="hang_up">

-                Appel terminé

-        </string>

-        <string name="inventory_item_offered">

-                Objet de l&apos;inventaire offert

-        </string>

-        <string name="voice_icon">

-                icn_voice-pvtfocus.tga

-        </string>

-        <string name="title_string">

-                Envoyer un message instantané à [NAME]

-        </string>

-        <string name="typing_start_string">

-                [NAME] est en train d&apos;écrire…

-        </string>

-        <string name="session_start_string">

-                Début de la session avec [NAME], veuillez patienter.

-        </string>

-        <string name="default_text_label">

-                Cliquez ici pour envoyer un message instantané.

-        </string>

-        <string name="unavailable_text_label">

-                Le chat écrit n&apos;est pas disponible pour cet appel.

-        </string>

-        <button label="Profil..." name="profile_callee_btn"/>

-        <button label="Appeler" name="start_call_btn"/>

-        <button label="Raccrocher" name="end_call_btn"/>

-        <panel name="speaker_controls">

-                <button label="" name="mute_btn" tool_tip="Ignorez"/>

-        </panel>

-        <line_editor label="Cliquez ici pour envoyer un message instantané" name="chat_editor"/>

-        <button label="Envoyer" name="send_btn"/>

-        <string name="live_help_dialog">

-                *** Bienvenue sur la page Demande d&apos;aide *** 

-Veuillez au préalable consulter les pages d&apos;aide de Second Life en appuyant sur la touche F1, ou en accédant à la base de connaissances http://secondlife.com/knowledgebase/ 

-Si vous ne trouvez pas ce que vous cherchez, saisissez votre question et attendez quelques instants pour que quelqu&apos;un vous réponde. 

--=-=- Les temps de réponse varient, surtout pendant les périodes de pointe -=-=-

-        </string>

-</floater>

+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater label="(inconnue)" name="im_floater" title="(inconnue)">
+        <string name="ringing">
+                Appel en cours...
+        </string>
+        <string name="answering">
+                Connexion en cours...
+        </string>
+        <string name="connected">
+                Connecté(e), cliquez sur Raccrocher pour terminer l&apos;appel
+        </string>
+        <string name="hang_up">
+                Appel terminé
+        </string>
+        <string name="inventory_item_offered">
+                Objet de l&apos;inventaire offert
+        </string>
+        <string name="voice_icon">
+                icn_voice-pvtfocus.tga
+        </string>
+        <string name="title_string">
+                Envoyer un message instantané à [NAME]
+        </string>
+        <string name="typing_start_string">
+                [NAME] est en train d&apos;écrire…
+        </string>
+        <string name="session_start_string">
+                Début de la session avec [NAME], veuillez patienter.
+        </string>
+        <string name="default_text_label">
+                Cliquez ici pour envoyer un message instantané.
+        </string>
+        <string name="unavailable_text_label">
+                Le chat écrit n&apos;est pas disponible pour cet appel.
+        </string>
+        <flyout_button label="Profil..." name="profile_callee_btn"/>
+        <button label="Appeler" name="start_call_btn"/>
+        <button label="Raccrocher" name="end_call_btn"/>
+        <panel name="speaker_controls">
+                <button label="" name="mute_btn" tool_tip="Ignorez"/>
+        </panel>
+        <line_editor label="Cliquez ici pour envoyer un message instantané" name="chat_editor"/>
+        <button label="Envoyer" name="send_btn"/>
+        <string name="live_help_dialog">
+                *** Bienvenue sur la page Demande d&apos;aide *** 
+Veuillez au préalable consulter les pages d&apos;aide de Second Life en appuyant sur la touche F1, ou en accédant à la base de connaissances http://secondlife.com/knowledgebase/ 
+Si vous ne trouvez pas ce que vous cherchez, saisissez votre question et attendez quelques instants pour que quelqu&apos;un vous réponde. 
+-=-=- Les temps de réponse varient, surtout pendant les périodes de pointe -=-=-
+        </string>
+</floater>
diff --git a/linden/indra/newview/skins/default/xui/hu/floater_instant_message.xml b/linden/indra/newview/skins/default/xui/hu/floater_instant_message.xml
index e4f5892..3469323 100644
--- a/linden/indra/newview/skins/default/xui/hu/floater_instant_message.xml
+++ b/linden/indra/newview/skins/default/xui/hu/floater_instant_message.xml
@@ -33,7 +33,7 @@
         <string name="unavailable_text_label">
                 Szöveges üzenetküldés nem elérhető a jelenlegi hívás alatt.
         </string>
-        <button label="Adatlap" name="profile_callee_btn"/>
+        <flyout_button label="Adatlap" name="profile_callee_btn"/>
         <button label="Hívás" name="start_call_btn"/>
         <button label="Hívás vége" name="end_call_btn"/>
         <panel name="speaker_controls">
diff --git a/linden/indra/newview/skins/default/xui/it/floater_instant_message.xml b/linden/indra/newview/skins/default/xui/it/floater_instant_message.xml
index 58e043f..7bdc046 100644
--- a/linden/indra/newview/skins/default/xui/it/floater_instant_message.xml
+++ b/linden/indra/newview/skins/default/xui/it/floater_instant_message.xml
@@ -33,7 +33,7 @@
         <string name="unavailable_text_label">
                 La chat di testo non è disponibile in questa chiamata.
         </string>
-        <button label="Profilo..." name="profile_callee_btn"/>
+        <flyout_button label="Profilo..." name="profile_callee_btn"/>
         <button label="Chiama" name="start_call_btn"/>
         <button label="Termina" name="end_call_btn"/>
         <panel name="speaker_controls">
diff --git a/linden/indra/newview/skins/default/xui/ja/floater_instant_message.xml b/linden/indra/newview/skins/default/xui/ja/floater_instant_message.xml
index a8e91e1..c9de54e 100644
--- a/linden/indra/newview/skins/default/xui/ja/floater_instant_message.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_instant_message.xml
@@ -33,7 +33,7 @@
         <string name="unavailable_text_label">
                 このコールでは文字チャットが利用できません。
         </string>
-        <button label="プロフィール" name="profile_callee_btn" width="100"/>
+        <flyout_button label="プロフィール" name="profile_callee_btn" width="100"/>
         <button label="コール" left_delta="105" name="start_call_btn" width="100"/>
         <button label="呼出終了" name="end_call_btn" width="100"/>
         <panel left_delta="96" name="speaker_controls">
diff --git a/linden/indra/newview/skins/default/xui/ko/floater_instant_message.xml b/linden/indra/newview/skins/default/xui/ko/floater_instant_message.xml
index 1ad7d69..f1d0a48 100644
--- a/linden/indra/newview/skins/default/xui/ko/floater_instant_message.xml
+++ b/linden/indra/newview/skins/default/xui/ko/floater_instant_message.xml
@@ -21,7 +21,7 @@
         <string name="default_text_label">
                 메신저를 사용하려면 여기를 클릭하십시오.
         </string>
-        <button label="프로필" name="profile_callee_btn" />
+        <flyout_button label="프로필" name="profile_callee_btn" />
         <button label="음성연결" name="start_call_btn" />
         <button label="연결종료" name="end_call_btn" />
         <panel name="speaker_controls">
diff --git a/linden/indra/newview/skins/default/xui/pl/floater_instant_message.xml b/linden/indra/newview/skins/default/xui/pl/floater_instant_message.xml
index 2851356..1d918b8 100755
--- a/linden/indra/newview/skins/default/xui/pl/floater_instant_message.xml
+++ b/linden/indra/newview/skins/default/xui/pl/floater_instant_message.xml
@@ -33,7 +33,7 @@
         <string name="unavailable_text_label">
                 Czat nie jest dostępny dla tej rozmowy
         </string>
-        <button label="Profil..." name="profile_callee_btn"/>
+        <flyout_button label="Profil..." name="profile_callee_btn"/>
         <button label="Dzwoń" name="start_call_btn"/>
         <button label="Skończ" name="end_call_btn"/>
         <panel name="speaker_controls">
diff --git a/linden/indra/newview/skins/default/xui/pt/floater_instant_message.xml b/linden/indra/newview/skins/default/xui/pt/floater_instant_message.xml
index 0927cd3..983a13c 100644
--- a/linden/indra/newview/skins/default/xui/pt/floater_instant_message.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_instant_message.xml
@@ -1,50 +1,50 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>

-<floater label="(desconhecido)" name="im_floater" title="(desconhecido)">

-        <string name="ringing">

-                Chamando...

-        </string>

-        <string name="answering">

-                Conectando...

-        </string>

-        <string name="connected">

-                Conectado, clique Finalizar Chamada para deixar em espera

-        </string>

-        <string name="hang_up">

-                Chamada encerrada

-        </string>

-        <string name="inventory_item_offered">

-                Oferecido um item de Inventário

-        </string>

-        <string name="voice_icon">

-                icn_voice-pvtfocus.tga

-        </string>

-        <string name="title_string">

-                Mensagem Instantânea com [NAME]

-        </string>

-        <string name="typing_start_string">

-                [NAME] está digitando...

-        </string>

-        <string name="session_start_string">

-                Iniciando uma sessão com [NAME]. Por favor, aguarde.

-        </string>

-        <string name="default_text_label">

-                Clique aqui para uma mensagem instantânea.

-        </string>

-        <string name="unavailable_text_label">

-                Conversa por texto não está disponível para esta chamada.

-        </string>

-        <button label="Perfil..." name="profile_callee_btn"/>

-        <button label="Chamar" name="start_call_btn"/>

-        <button label="Terminar Chamada" name="end_call_btn"/>

-        <panel name="speaker_controls">

-                <button label="" name="mute_btn" tool_tip="Emudecer a voz para este residente"/>

-        </panel>

-        <line_editor label="Clique aqui para mensagens instantâneas" name="chat_editor"/>

-        <button label="Enviar" name="send_btn"/>

-        <string name="live_help_dialog">

-                *** Bem Vindo a Solicitação de Ajuda *** 

-Por favor, cheque primeiro nossas páginas de ajuda, pressionando F1 ou acessando a Base de Conhecimento em 

-http://secondlife.com/knowledgebase/ . Se sua resposta não está ali, por favor entre com sua pergunta e aguarde que um Ajudante responda.

--=-=- O tempo de resposta pode variar, especialmente em horários de pico -=-=-

-        </string>

-</floater>

+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater label="(desconhecido)" name="im_floater" title="(desconhecido)">
+        <string name="ringing">
+                Chamando...
+        </string>
+        <string name="answering">
+                Conectando...
+        </string>
+        <string name="connected">
+                Conectado, clique Finalizar Chamada para deixar em espera
+        </string>
+        <string name="hang_up">
+                Chamada encerrada
+        </string>
+        <string name="inventory_item_offered">
+                Oferecido um item de Inventário
+        </string>
+        <string name="voice_icon">
+                icn_voice-pvtfocus.tga
+        </string>
+        <string name="title_string">
+                Mensagem Instantânea com [NAME]
+        </string>
+        <string name="typing_start_string">
+                [NAME] está digitando...
+        </string>
+        <string name="session_start_string">
+                Iniciando uma sessão com [NAME]. Por favor, aguarde.
+        </string>
+        <string name="default_text_label">
+                Clique aqui para uma mensagem instantânea.
+        </string>
+        <string name="unavailable_text_label">
+                Conversa por texto não está disponível para esta chamada.
+        </string>
+        <flyout_button label="Perfil..." name="profile_callee_btn"/>
+        <button label="Chamar" name="start_call_btn"/>
+        <button label="Terminar Chamada" name="end_call_btn"/>
+        <panel name="speaker_controls">
+                <button label="" name="mute_btn" tool_tip="Emudecer a voz para este residente"/>
+        </panel>
+        <line_editor label="Clique aqui para mensagens instantâneas" name="chat_editor"/>
+        <button label="Enviar" name="send_btn"/>
+        <string name="live_help_dialog">
+                *** Bem Vindo a Solicitação de Ajuda *** 
+Por favor, cheque primeiro nossas páginas de ajuda, pressionando F1 ou acessando a Base de Conhecimento em 
+http://secondlife.com/knowledgebase/ . Se sua resposta não está ali, por favor entre com sua pergunta e aguarde que um Ajudante responda.
+-=-=- O tempo de resposta pode variar, especialmente em horários de pico -=-=-
+        </string>
+</floater>
diff --git a/linden/indra/newview/skins/default/xui/ru/floater_instant_message.xml b/linden/indra/newview/skins/default/xui/ru/floater_instant_message.xml
index db9e975..7aa1c19 100644
--- a/linden/indra/newview/skins/default/xui/ru/floater_instant_message.xml
+++ b/linden/indra/newview/skins/default/xui/ru/floater_instant_message.xml
@@ -33,7 +33,7 @@
         <string name="unavailable_text_label">
                 Текстовый чат недоступен для этого вызова.
         </string>
-        <button label="Профиль..." name="profile_callee_btn"/>
+        <flyout_button label="Профиль..." name="profile_callee_btn"/>
         <button label="Звонок" name="start_call_btn"/>
         <button label="Конец звонка" name="end_call_btn"/>
         <panel name="speaker_controls">
diff --git a/linden/indra/newview/skins/default/xui/tr/floater_instant_message.xml b/linden/indra/newview/skins/default/xui/tr/floater_instant_message.xml
index d804a70..b627271 100644
--- a/linden/indra/newview/skins/default/xui/tr/floater_instant_message.xml
+++ b/linden/indra/newview/skins/default/xui/tr/floater_instant_message.xml
@@ -33,7 +33,7 @@
         <string name="unavailable_text_label">
                 Bu arama için yazılı sohbet mevcut değil.
         </string>
-        <button label="Profil..." name="profile_callee_btn"/>
+        <flyout_button label="Profil..." name="profile_callee_btn"/>
         <button label="Ara" name="start_call_btn"/>
         <button label="Kapat" name="end_call_btn"/>
         <panel name="speaker_controls">
diff --git a/linden/indra/newview/skins/default/xui/uk/floater_instant_message.xml b/linden/indra/newview/skins/default/xui/uk/floater_instant_message.xml
index bdd51fe..60ac3b8 100644
--- a/linden/indra/newview/skins/default/xui/uk/floater_instant_message.xml
+++ b/linden/indra/newview/skins/default/xui/uk/floater_instant_message.xml
@@ -33,7 +33,7 @@
         <string name="unavailable_text_label">
                 Текстовий чат недоступний для цього виклику.
         </string>
-        <button label="Профіль..." name="profile_callee_btn"/>
+        <flyout_button label="Профіль..." name="profile_callee_btn"/>
         <button label="Дзвінок" name="start_call_btn"/>
         <button label="Кінець дзвінка" name="end_call_btn"/>
         <panel name="speaker_controls">
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 70433c1..ace6d8c 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
@@ -30,7 +30,7 @@
         <string name="unavailable_text_label">
                 本次通话不可以文字聊天。
         </string>
-        <button label="档案..." name="profile_callee_btn"/>
+  <flyout_button label="档案..." name="profile_callee_btn"/>
         <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/silver/xui/en-us/floater_about_land.xml b/linden/indra/newview/skins/silver/xui/en-us/floater_about_land.xml
deleted file mode 100644
index 300d7ba..0000000
--- a/linden/indra/newview/skins/silver/xui/en-us/floater_about_land.xml
+++ /dev/null
@@ -1,1040 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater bottom="-554" can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="false" can_tear_off="false" enabled="true" height="420"
-     left="367" min_height="420" min_width="460" mouse_opaque="true"
-     name="floaterland" rect_control="FloaterLandRect5" title="About Land"
-     width="460">
-        <tab_container bottom="-420" enabled="true" follows="left|top|right|bottom" height="400"
-             left="1" mouse_opaque="false" name="landtab" tab_position="top" width="459">
-                <panel border="true" bottom="-349" enabled="true" follows="left|top|right|bottom"
-                     height="333" label="General" left="1" mouse_opaque="true"
-                     name="land_general_panel" width="458">
-                        <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="16" left="4"
-                             mouse_opaque="true" name="Name:" v_pad="0" width="92">
-                                Name:
-                        </text>
-                        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-20"
-                             enabled="true" follows="left|top|right" font="SansSerifSmall"
-                             handle_edit_keys_directly="false" height="16" left="98"
-                             max_length="63" mouse_opaque="true" name="Name"
-                             select_all_on_focus_received="false" select_on_focus="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="16" left="4"
-                             mouse_opaque="true" name="Description:" v_pad="0" width="100">
-                                Description:
-                        </text>
-                        <text_editor type="string" bevel_style="in" border_style="line" border_thickness="1" bottom="-76"
-                             embedded_items="false" enabled="true" follows="left|top|right"
-                             font="SansSerifSmall" handle_edit_keys_directly="false" height="52"
-                             left="96" max_length="255" mouse_opaque="true" name="Description"
-                             select_all_on_focus_received="false" select_on_focus="false"
-                             width="350" word_wrap="true" />
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-100" drop_shadow_visible="true" enabled="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
-                             mouse_opaque="true" name="LandType" v_pad="0" width="92">
-                                Type:
-                        </text>
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-100" drop_shadow_visible="true" enabled="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="96"
-                             mouse_opaque="true" name="LandTypeText" v_pad="0" width="250">
-                                Mainland / Homestead
-                        </text>
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-120" drop_shadow_visible="true" enabled="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
-                             mouse_opaque="true" name="ContentRating" v_pad="0" width="92">
-                                Rating:
-                        </text>
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-120" drop_shadow_visible="true" enabled="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="96"
-                             mouse_opaque="true" name="ContentRatingText" v_pad="0" width="250">
-                                Adult
-                        </text>
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-140" drop_shadow_visible="true" enabled="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
-                             mouse_opaque="true" name="Owner:" v_pad="0" width="92">
-                                Owner:
-                        </text>
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-140" drop_shadow_visible="true" enabled="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="96"
-                             mouse_opaque="true" name="OwnerText" v_pad="0" width="250">
-                                Leyla Linden
-                        </text>
-                        <button bottom="-140" enabled="true" follows="left|top" font="SansSerifSmall"
-                             halign="center" height="16" label="Profile..." label_selected="Profile..."
-                             left="350" mouse_opaque="true" name="Profile..." scale_image="true"
-                             width="90" />
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-160" drop_shadow_visible="true" enabled="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
-                             mouse_opaque="true" name="Group:" v_pad="0" width="92">
-                                Group:
-                        </text>
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-162" drop_shadow_visible="true" enabled="false" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="96"
-                             mouse_opaque="true" name="GroupText" v_pad="0" width="250" />
-                        <button bottom="-160" enabled="true" follows="left|top" font="SansSerifSmall"
-                             halign="center" height="16" label="Set..." label_selected="Set..."
-                             left="350" mouse_opaque="true" name="Set..." scale_image="true" width="90" />
-                        <check_box bottom="-180" enabled="false" follows="left|top" font="SansSerifSmall"
-                             height="16" initial_value="false" label="Allow Deed to Group" left="96"
-                             mouse_opaque="true" name="check deed" radio_style="false"
-                             tool_tip="A group officer can deed this land to the group, so it will be supported by the group&amp;apos;s land allocation."
-                             width="116" />
-                        <button bottom="-180" enabled="false" follows="left|top" font="SansSerifSmall"
-                             halign="center" height="16" label="Deed..." label_selected="Deed..."
-                             left="350" mouse_opaque="true" name="Deed..." scale_image="true"
-                             tool_tip="You may only deed land if you are an officer in the selected group."
-                             width="90" />
-                        <check_box bottom="-200" enabled="false" follows="left|top" font="SansSerifSmall"
-                             height="16" initial_value="false"
-                             label="Owner Makes Contribution With Deed" left="96" mouse_opaque="true"
-                             name="check contrib" radio_style="false"
-                             tool_tip="When the land is deeded to the group, the former owner contributes enough land allocation to support it."
-                             width="199" />
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-220" drop_shadow_visible="true" enabled="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
-                             mouse_opaque="true" name="For Sale:" v_pad="0" width="92">
-                                For Sale:
-                        </text>
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-220" drop_shadow_visible="true" enabled="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="96"
-                             mouse_opaque="true" name="Not for sale." v_pad="0" width="186">
-                                Not for sale.
-                        </text>
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-220" drop_shadow_visible="true" enabled="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="96"
-                             mouse_opaque="true" name="For Sale: Price L$[PRICE]." v_pad="0" width="226">
-                                Price: L$[PRICE] (L$[PRICE_PER_SQM]/sq.m.).
-                        </text>
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-240" drop_shadow_visible="true" enabled="false" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="96"
-                             mouse_opaque="true" name="SalePending" v_pad="0" width="344" />
-                        <button bottom="-244" enabled="true" follows="left|top" font="SansSerif"
-                             halign="center" height="20" label="Sell Land..."
-                             label_selected="Sell Land..." left="295" mouse_opaque="true"
-                             name="Sell Land..." scale_image="true" width="145" />
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-240" drop_shadow_visible="true" enabled="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="96"
-                             mouse_opaque="true" name="For sale to" v_pad="0" width="186">
-                                For sale to: [BUYER]
-                        </text>
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-260" drop_shadow_visible="true" enabled="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="96"
-                             mouse_opaque="true" name="Sell with landowners objects in parcel."
-                             v_pad="0" width="186">
-                                Objects included in sale.
-                        </text>
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-260" drop_shadow_visible="true" enabled="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="96"
-                             mouse_opaque="true" name="Selling with no objects in parcel." v_pad="0"
-                             width="186">
-                                Objects not included in sale.
-                        </text>
-                        <button bottom="-248" enabled="true" follows="left|top" font="SansSerif"
-                             halign="center" height="20" label="Cancel Land Sale"
-                             label_selected="Cancel Land Sale" left="295" mouse_opaque="true"
-                             name="Cancel Land Sale" scale_image="true" width="145" />
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-284" drop_shadow_visible="true" enabled="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
-                             mouse_opaque="true" name="Claimed:" v_pad="0" width="92">
-                                Claimed:
-                        </text>
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-284" drop_shadow_visible="true" enabled="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="96"
-                             mouse_opaque="true" name="DateClaimText" v_pad="0" width="186">
-                                Tue Aug 15 13:47:25 2006
-                        </text>
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-304" drop_shadow_visible="true" enabled="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
-                             mouse_opaque="true" name="PriceLabel" v_pad="0" width="92">
-                                Area:
-                        </text>
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-304" drop_shadow_visible="true" enabled="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="96"
-                             mouse_opaque="true" name="PriceText" v_pad="0" width="186">
-                                4048 sq.m.
-                        </text>
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-324" drop_shadow_visible="true" enabled="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
-                             mouse_opaque="true" name="Traffic:" v_pad="0" width="92">
-                                Traffic:
-                        </text>
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-324" drop_shadow_visible="true" enabled="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="96"
-                             mouse_opaque="true" name="DwellText" v_pad="0" width="186">
-                                0
-                        </text>
-                        <button bottom="-348" enabled="false" follows="left|top" font="SansSerif"
-                             halign="center" height="20" label="Buy Land..."
-                             label_selected="Buy Land..." left="155" mouse_opaque="true"
-                             name="Buy Land..." scale_image="true" width="100" />
-                        <button bottom="-372" enabled="false" follows="left|top" font="SansSerif"
-                             halign="center" height="20" label="Buy For Group..."
-                             label_selected="Buy For Group..." left="260" mouse_opaque="true"
-                             name="Buy For Group..." scale_image="true" width="180" />
-                        <button bottom="-372" enabled="false" follows="left|top" font="SansSerif"
-                             halign="center" height="20" label="Buy Pass..."
-                             label_selected="Buy Pass..." left="155" mouse_opaque="true"
-                             name="Buy Pass..." scale_image="true"
-                             tool_tip="A pass gives you temporary access to this land." width="100" />
-                        <button bottom="-348" enabled="true" follows="left|top" font="SansSerif"
-                             halign="center" height="20" label="Abandon Land..."
-                             label_selected="Abandon Land..." left="260" mouse_opaque="true"
-                             name="Abandon Land..." scale_image="true" width="180" />
-                        <button bottom="-300" enabled="true" follows="left|top" font="SansSerif"
-                             halign="center" height="20" label="Reclaim Land..."
-                             label_selected="Reclaim Land..." left="260" mouse_opaque="true"
-                             name="Reclaim Land..." scale_image="true" width="180" />
-                        <button bottom="-324" enabled="false" follows="left|top" font="SansSerif"
-                             halign="center" height="20" label="Linden Sale..."
-                             label_selected="Linden Sale..." left="260" mouse_opaque="true"
-                             name="Linden Sale..." scale_image="true"
-                             tool_tip="Land must be owned, set content, and not already for auction."
-                             width="180" />
-                        <string name="new users only">
-                                New users only
-                        </string>
-                        <string name="anyone">
-                                Anyone
-                        </string>
-                        <string name="area_text">
-                                Area
-                        </string>
-                        <string name="area_size_text">
-                                [AREA] sq.m.
-                        </string>
-                        <string name="auction_id_text">
-                                Auction ID: [ID]
-                        </string>
-                        <string name="need_tier_to_modify">
-                                You must approve your purchase to modify this land.
-                        </string>
-                        <string name="group_owned_text">
-                                (Group Owned)
-                        </string>
-                        <string name="profile_text">
-                                Profile...
-                        </string>
-                        <string name="info_text">
-                                Info...
-                        </string>
-                        <string name="public_text">
-                                (public)
-                        </string>
-                        <string name="none_text">
-                                (none)
-                        </string>
-                        <string name="sale_pending_text">
-                                (Sale Pending)
-                        </string>
-                        <string name="no_selection_text">
-                        No parcel selected.
-Go to World menu > About Land or select another parcel to show its details.
-                        </string>
-                </panel>
-                <panel border="true" bottom="-349" enabled="true" follows="left|top|right|bottom"
-                     height="333" label="Covenant" left="0" mouse_opaque="true"
-                     name="land_covenant_panel" width="458">
-                        <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="SansSerif" h_pad="0" halign="left" height="20" left="5"
-                             mouse_opaque="false" name="estate_section_lbl" v_pad="0" width="100">
-                                Estate:
-                        </text>
-                        <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="20" left="10"
-                             mouse_opaque="false" name="estate_name_lbl" v_pad="0" width="100">
-                                Name:
-                        </text>
-                        <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="20" left="120"
-                             mouse_opaque="false" name="estate_name_text" v_pad="0" width="150">
-                                mainland
-                        </text>
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-60" drop_shadow_visible="true" enabled="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="20" left="10"
-                             mouse_opaque="false" name="estate_owner_lbl" v_pad="0" width="100">
-                                Owner:
-                        </text>
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-60" drop_shadow_visible="true" enabled="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="20" left="120"
-                             mouse_opaque="false" name="estate_owner_text" v_pad="0" width="150">
-                                (none)
-                        </text>
-                        <text_editor type="string" length="1" bottom="-175" embedded_items="false" enabled="false"
-                             follows="left|top|right|bottom" font="SansSerifSmall" height="115"
-                             left="120" max_length="65535" mouse_opaque="true" name="covenant_editor"
-                             width="330" word_wrap="true">
-                                There is no Covenant provided for this Estate.
-                        </text_editor>
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-250" drop_shadow_visible="true" enabled="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="20" left="120"
-                             mouse_opaque="false" name="covenant_timestamp_text" v_pad="0" width="250">
-                                Last Modified Wed Dec 31 16:00:00 1969
-                        </text>
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-270" drop_shadow_visible="true" enabled="true" follows="left|top"
-                             font="SansSerif" h_pad="0" halign="left" height="20" left="5"
-                             mouse_opaque="false" name="region_section_lbl" v_pad="0" width="100">
-                                Region:
-                        </text>
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-290" drop_shadow_visible="true" enabled="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="20" left="10"
-                             mouse_opaque="false" name="region_name_lbl" v_pad="0" width="100">
-                                Name:
-                        </text>
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-290" drop_shadow_visible="true" enabled="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="20" left="120"
-                             mouse_opaque="false" name="region_name_text" v_pad="0" width="150">
-                                leyla
-                        </text>
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-310" drop_shadow_visible="true" enabled="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="20" left="10"
-                             mouse_opaque="false" name="region_landtype_lbl" v_pad="0" width="100">
-                                Type:
-                        </text>
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-310" drop_shadow_visible="true" enabled="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="20" left="120"
-                             mouse_opaque="false" name="region_landtype_text" v_pad="0" width="150">
-                                Mainland / Homestead
-                        </text>
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-330" drop_shadow_visible="true" enabled="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="20" left="10"
-                             mouse_opaque="false" name="region_maturity_lbl" v_pad="0" width="100">
-                                Rating:
-                        </text>
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-330" drop_shadow_visible="true" enabled="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="20" left="120"
-                             mouse_opaque="false" name="region_maturity_text" v_pad="0" width="150">
-                                Adult
-                        </text>
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-350" drop_shadow_visible="true" enabled="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="20" left="10"
-                             mouse_opaque="false" name="resellable_lbl" v_pad="0" width="100">
-                                Resale:
-                        </text>
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-350" drop_shadow_visible="true" enabled="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="20" left="120"
-                             mouse_opaque="false" name="resellable_clause" v_pad="0" width="330">
-                                Land in this region may not be resold.
-                        </text>
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-370" drop_shadow_visible="true" enabled="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="20" left="10"
-                             mouse_opaque="false" name="changeable_lbl" v_pad="0" width="100">
-                                Subdivide:
-                        </text>
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-380" drop_shadow_visible="true" enabled="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="30" left="120"
-                             mouse_opaque="false" name="changeable_clause" v_pad="0" width="330">
-                                Land in this region may not be joined/subdivided.
-                        </text>
-                        <string name="can_resell">
-                                Purchased land in this region may be resold.
-                        </string>
-                        <string name="can_not_resell">
-                                Purchased land in this region may not be resold.
-                        </string>
-                        <string name="can_change">
-                                Purchased land in this region may be joined or subdivided.
-                        </string>
-                        <string name="can_not_change">
-                                Purchased land in this region may not be joined or subdivided.
-                        </string>
-                </panel>
-                <panel border="true" bottom="-349" enabled="true" follows="left|top|right|bottom"
-                     height="333" label="Objects" left="1" mouse_opaque="true"
-                     name="land_objects_panel" width="458">
-                        <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="16" left="4"
-                             mouse_opaque="true" name="parcel_object_bonus" v_pad="0" visible="false"
-                             width="364">
-                                Region Object Bonus Factor: [BONUS]
-                        </text>
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-40" drop_shadow_visible="true" enabled="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
-                             mouse_opaque="true" name="Simulator primitive usage:" v_pad="0" width="364">
-                                Simulator primitive usage:
-                        </text>
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-40" drop_shadow_visible="true" enabled="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="156"
-                             mouse_opaque="true" name="objects_available" v_pad="0" width="212">
-                                [COUNT] out of [MAX] ([AVAILABLE] available)
-                        </text>
-                        <string name="objects_available_text">
-                                [COUNT] out of [MAX] ([AVAILABLE] available)
-                        </string>
-                        <string name="objects_deleted_text">
-                                [COUNT] out of [MAX] ([DELETED] will be deleted)
-                        </string>
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-60" drop_shadow_visible="true" enabled="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
-                             mouse_opaque="true" name="Primitives parcel supports:" v_pad="0"
-                             width="152">
-                                Primitives parcel supports:
-                        </text>
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-60" drop_shadow_visible="true" enabled="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="156"
-                             mouse_opaque="true" name="object_contrib_text" v_pad="0" width="212">
-                                [COUNT]
-                        </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="16" left="4"
-                             mouse_opaque="true" name="Primitives on parcel:" v_pad="0" width="152">
-                                Primitives on parcel:
-                        </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="16" left="156"
-                             mouse_opaque="true" name="total_objects_text" v_pad="0" width="48">
-                                [COUNT]
-                        </text>
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-100" drop_shadow_visible="true" enabled="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="28"
-                             mouse_opaque="true" name="Owned by parcel owner:" v_pad="0" width="128">
-                                Owned by parcel owner:
-                        </text>
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-100" drop_shadow_visible="true" enabled="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="156"
-                             mouse_opaque="true" name="owner_objects_text" v_pad="0" width="48">
-                                [COUNT]
-                        </text>
-                        <button bottom="-100" enabled="false" follows="left|top" font="SansSerifSmall"
-                             halign="center" height="16" label="Show" label_selected="Show"
-                             mouse_opaque="true" name="ShowOwner" right="-190" scale_image="true"
-                             width="60" />
-                        <button bottom="-100" enabled="false" follows="left|top" font="SansSerifSmall"
-                             halign="center" height="16" label="Return..." label_selected="Return..."
-                             mouse_opaque="true" name="ReturnOwner..." right="-60" scale_image="true"
-                             tool_tip="Return objects to their owners." width="119" />
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-120" drop_shadow_visible="true" enabled="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="28"
-                             mouse_opaque="true" name="Set to group:" v_pad="0" width="128">
-                                Set to group:
-                        </text>
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-120" drop_shadow_visible="true" enabled="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="156"
-                             mouse_opaque="true" name="group_objects_text" v_pad="0" width="48">
-                                [COUNT]
-                        </text>
-                        <button bottom="-120" enabled="false" follows="left|top" font="SansSerifSmall"
-                             halign="center" height="16" label="Show" label_selected="Show"
-                             mouse_opaque="true" name="ShowGroup" right="-190" scale_image="true"
-                             width="60" />
-                        <button bottom="-120" enabled="false" follows="left|top" font="SansSerifSmall"
-                             halign="center" height="16" label="Return..." label_selected="Return..."
-                             mouse_opaque="true" name="ReturnGroup..." right="-60" scale_image="true"
-                             tool_tip="Return objects to their owners." width="119" />
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-140" drop_shadow_visible="true" enabled="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="28"
-                             mouse_opaque="true" name="Owned by others:" v_pad="0" width="128">
-                                Owned by others:
-                        </text>
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-140" drop_shadow_visible="true" enabled="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="156"
-                             mouse_opaque="true" name="other_objects_text" v_pad="0" width="48">
-                                [COUNT]
-                        </text>
-                        <button bottom="-140" enabled="false" follows="left|top" font="SansSerifSmall"
-                             halign="center" height="16" label="Show" label_selected="Show"
-                             mouse_opaque="true" name="ShowOther" right="-190" scale_image="true"
-                             width="60" />
-                        <button bottom="-140" enabled="false" follows="left|top" font="SansSerifSmall"
-                             halign="center" height="16" label="Return..." label_selected="Return..."
-                             mouse_opaque="true" name="ReturnOther..." right="-60" scale_image="true"
-                             tool_tip="Return objects to their owners." width="119" />
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-160" drop_shadow_visible="true" enabled="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="28"
-                             mouse_opaque="true" name="Selected / sat upon:" v_pad="0" width="128">
-                                Selected / sat upon:
-                        </text>
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-160" drop_shadow_visible="true" enabled="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="156"
-                             mouse_opaque="true" name="selected_objects_text" v_pad="0" width="48">
-                                [COUNT]
-                        </text>
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-180" drop_shadow_visible="true" enabled="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
-                             mouse_opaque="true" name="Autoreturn" v_pad="0" width="294">
-                                Autoreturn other residents&apos; objects (minutes, 0 for off):
-                        </text>
-                        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-180"
-                             enabled="true" follows="left|top" font="SansSerifSmall"
-                             handle_edit_keys_directly="false" height="16" max_length="6"
-                             mouse_opaque="true" name="clean other time" right="-100"
-                             select_all_on_focus_received="false" select_on_focus="false" width="56" />
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-200" drop_shadow_visible="true" enabled="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
-                             mouse_opaque="true" name="Object Owners:" v_pad="0" width="104">
-                                Object Owners:
-                        </text>
-                        <button bottom="-200" enabled="true" follows="left|top" font="SansSerifSmall"
-                             halign="center" height="16" label="Refresh List"
-                             label_selected="Refresh List" left="108" mouse_opaque="true"
-                             name="Refresh List" width="106" />
-                        <button bottom="-200" enabled="false" follows="left|top" font="SansSerifSmall"
-                             halign="center" height="16" label="Return objects..."
-                             label_selected="Return objects..." left="220" mouse_opaque="true"
-                             name="Return objects..." width="164" />
-                        <name_list allow_calling_card_drop="false" background_visible="true" bottom="-329"
-                             column_padding="0" draw_border="true" draw_heading="true"
-                             draw_stripes="true" enabled="true" 
-                             follows="left|top|right|bottom" height="117" left="4" mouse_opaque="true"
-                             multi_select="false" name="owner list" name_column_index="2" width="450">
-                                <column name="type" label="Type" sort="online_status" width="24" />
-                                <column name="online_status" width="-1" />
-                                <column name="name" dynamicwidth="true" label="Name" />
-                                <column name="count" label="Count" width="70" />
-                                <column name="mostrecent" label="Most Recent" width="160" />
-                        </name_list>
-                </panel>
-                <panel border="true" bottom="-349" enabled="true" follows="left|top|right|bottom"
-                     height="333" label="Options" left="1" mouse_opaque="true"
-                     name="land_options_panel" width="458">
-                        <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="16" left="4"
-                             mouse_opaque="true" name="allow_label" v_pad="0" width="278">
-                                Allow other residents to:
-                        </text>
-                        <check_box bottom="-40" enabled="true" follows="left|top" font="SansSerifSmall"
-                             height="16" initial_value="false" label="Edit Terrain" left="14"
-                             mouse_opaque="true" name="edit land check" radio_style="false"
-                             tool_tip="If checked, anyone can terraform your land. It is best to leave this unchecked, as you can always edit your own land."
-                             width="268" />
-                        <check_box bottom="-60" enabled="true" follows="left|top" font="SansSerifSmall"
-                             height="16" initial_value="false" label="Create Landmarks" left="14"
-                             mouse_opaque="true" name="check landmark" radio_style="false" width="268" />
-                        <check_box bottom="-80" enabled="true" follows="left|top" font="SansSerifSmall"
-                             height="16" initial_value="false" label="Fly" left="14" mouse_opaque="true"
-                             name="check fly" radio_style="false"
-                             tool_tip="If checked, Residents can fly on your land. If unchecked, they can only fly into and over your land."
-                             width="268" />
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-40" drop_shadow_visible="true" enabled="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="178"
-                             mouse_opaque="true" name="allow_label2" v_pad="0" width="104">
-                                Create Objects:
-                        </text>
-                        <check_box bottom="-40" enabled="true" follows="left|top" font="SansSerifSmall"
-                             height="16" initial_value="false" label="All Residents" left="270"
-                             mouse_opaque="true" name="edit objects check" radio_style="false"
-                             width="104" />
-                        <check_box bottom="-40" enabled="true" follows="left|top" font="SansSerifSmall"
-                             height="16" initial_value="false" label="Group" left="370"
-                             mouse_opaque="true" name="edit group objects check" radio_style="false"
-                             width="70" />
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-60" drop_shadow_visible="true" enabled="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="178"
-                             mouse_opaque="true" name="allow_label3" v_pad="0" width="124">
-                                Object Entry:
-                        </text>
-                        <check_box bottom="-60" enabled="true" follows="left|top" font="SansSerifSmall"
-                             height="16" initial_value="false" label="All Residents" left="270"
-                             mouse_opaque="true" name="all object entry check" radio_style="false"
-                             width="120" />
-                        <check_box bottom="-60" enabled="true" follows="left|top" font="SansSerifSmall"
-                             height="16" initial_value="false" label="Group" left="370"
-                             mouse_opaque="true" name="group object entry check" radio_style="false"
-                             width="70" />
-                        <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="16" left="178"
-                             mouse_opaque="true" name="allow_label4" v_pad="0" width="124">
-                                Run Scripts:
-                        </text>
-                        <check_box bottom="-80" enabled="true" follows="left|top" font="SansSerifSmall"
-                             height="16" initial_value="false" label="All Residents" left="270"
-                             mouse_opaque="true" name="check other scripts" radio_style="false"
-                             width="120" />
-                        <check_box bottom="-80" enabled="true" follows="left|top" font="SansSerifSmall"
-                             height="16" initial_value="false" label="Group" left="370"
-                             mouse_opaque="true" name="check group scripts" radio_style="false"
-                             width="70" />
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-100" drop_shadow_visible="true" enabled="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
-                             mouse_opaque="true" name="land_options_label" v_pad="0" width="278">
-                                Land Options:
-                        </text>
-                        <check_box bottom="-120" enabled="true" follows="left|top" font="SansSerifSmall"
-                             height="16" initial_value="false" label="Safe (no damage)" left="14"
-                             mouse_opaque="true" name="check safe" radio_style="false"
-                             tool_tip="If checked, sets the land to Safe, disabling damage combat. If cleared, damage combat is enabled."
-                             width="268" />
-                        <check_box bottom="-120" enabled="true" follows="left|top" font="SansSerifSmall"
-                             height="16" initial_value="false" label="No Pushing" left="178"
-                             mouse_opaque="true" name="PushRestrictCheck" radio_style="false"
-                             tool_tip="Prevents scripts from pushing. Checking this option may be useful for preventing disruptive behavior on your land."
-                             width="119" />
-                        <check_box bottom="-140" enabled="true" follows="left|top" font="SansSerifSmall"
-                             height="16" initial_value="false"
-                             label="Show Place in Search (L$30/week) under" left="14"
-                             mouse_opaque="true" name="ShowDirectoryCheck" radio_style="false"
-                             tool_tip="Let people see this parcel in search results" width="268" />
-                        <string name="search_enabled_tooltip">
-                                Let people see this parcel in search results
-                        </string>
-                        <string name="search_disabled_small_tooltip">
-                                This option is disabled because this parcel&apos;s area is 128 sq.m. or smaller.
-Only large parcels can be listed in search.
-                        </string>
-                        <string name="search_disabled_permissions_tooltip">
-                                This option is disabled because you cannot modify this parcel&apos;s options.
-                        </string>
-                        <combo_box allow_text_entry="false" bottom="-140" enabled="false" follows="left|top"
-                             height="18" left="255" max_chars="20" mouse_opaque="true"
-                             name="land category with adult" width="130" visible="false">
-                                <combo_item name="AnyCategory" value="any">
-                                        Any Category
-                                </combo_item>
-                                <combo_item name="LindenLocation" value="linden">
-                                        Linden Location
-                                </combo_item>
-                                <combo_item name="Adult" value="adult">
-                                        Adult
-                                </combo_item>
-                                <combo_item name="Arts&amp;Culture" value="arts">
-                                        Arts &amp; Culture
-                                </combo_item>
-                                <combo_item name="Business" value="store">
-                                        Business
-                                </combo_item>
-                                <combo_item name="Educational" value="educational">
-                                        Educational
-                                </combo_item>
-                                <combo_item name="Gaming" value="game">
-                                        Gaming
-                                </combo_item>
-                                <combo_item name="Hangout" value="gather">
-                                        Hangout
-                                </combo_item>
-                                <combo_item name="NewcomerFriendly" value="newcomer">
-                                        Newcomer Friendly
-                                </combo_item>
-                                <combo_item name="Parks&amp;Nature" value="park">
-                                        Parks &amp; Nature
-                                </combo_item>
-                                <combo_item name="Residential" value="home">
-                                        Residential
-                                </combo_item>
-                                <combo_item name="Shopping" value="shopping">
-                                        Shopping
-                                </combo_item>
-                                <combo_item name="Other" value="other">
-                                        Other
-                                </combo_item>
-                        </combo_box>
-                        <!-- The following combo box is identical to the previous one, except for the
-                        fact that the Adult item is missing. This seems to be the only way to safely
-                        delete the adult item with our UI toolkit.
-                        Once we have completed the transition period, the one WITH adult can be deleted. -->
-                        <combo_box allow_text_entry="false" bottom="-140" enabled="false" follows="left|top"
-                             height="18" left="255" max_chars="20" mouse_opaque="true"
-                             name="land category" width="130" visible="false">
-                                <combo_item name="AnyCategory" value="any">
-                                        Any Category
-                                </combo_item>
-                                <combo_item name="LindenLocation" value="linden">
-                                        Linden Location
-                                </combo_item>
-                                <combo_item name="Arts&amp;Culture" value="arts">
-                                        Arts &amp; Culture
-                                </combo_item>
-                                <combo_item name="Business" value="store">
-                                        Business
-                                </combo_item>
-                                <combo_item name="Educational" value="educational">
-                                        Educational
-                                </combo_item>
-                                <combo_item name="Gaming" value="game">
-                                        Gaming
-                                </combo_item>
-                                <combo_item name="Hangout" value="gather">
-                                        Hangout
-                                </combo_item>
-                                <combo_item name="NewcomerFriendly" value="newcomer">
-                                        Newcomer Friendly
-                                </combo_item>
-                                <combo_item name="Parks&amp;Nature" value="park">
-                                        Parks &amp; Nature
-                                </combo_item>
-                                <combo_item name="Residential" value="home">
-                                        Residential
-                                </combo_item>
-                                <combo_item name="Shopping" value="shopping">
-                                        Shopping
-                                </combo_item>
-                                <combo_item name="Other" value="other">
-                                        Other
-                                </combo_item>
-                        </combo_box>
-                        <button bottom="-140" enabled="true" follows="left|top" font="SansSerif"
-                             halign="center" height="16" label="?" label_selected="?" left="400"
-                             mouse_opaque="true" name="?" width="20" />
-                        <check_box bottom="-160" enabled="true" follows="left|top" font="SansSerifSmall"
-                             height="16" initial_value="false" label="Mature Content" left="14"
-                             mouse_opaque="true" name="MatureCheck" radio_style="false"
-                             tool_tip=" "
-                             width="107" />
-                        <string name="mature_check_mature">
-                                Mature Content
-                        </string>
-                        <string name="mature_check_adult">
-                                Adult Content
-                        </string>
-                        <string name="mature_check_mature_tooltip">
-                                Your parcel information or content is considered mature.
-                        </string>
-                        <string name="mature_check_adult_tooltip">
-                                Your parcel information or content is considered adult.
-                        </string>
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-180" drop_shadow_visible="true" enabled="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
-                             mouse_opaque="true" name="Snapshot:" v_pad="0" width="278">
-                                Snapshot:
-                        </text>
-                        <texture_picker allow_no_texture="false" bottom="-299" can_apply_immediately="false"
-                             default_image_name="" enabled="true" follows="left|top" height="135"
-                             label="" left="76" mouse_opaque="true" name="snapshot_ctrl"
-                             tool_tip="Click to choose a picture" width="180" />
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-303" drop_shadow_visible="true" enabled="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
-                             mouse_opaque="true" name="landing_point" v_pad="0" width="278">
-                                Landing Point: [LANDING]
-                        </text>
-                        <string name="landing_point_none">
-                                (none)
-                        </string>
-                        <button bottom="-303" enabled="true" follows="left|top" font="SansSerifSmall"
-                             halign="center" height="16" label="Set" label_selected="Set" left="236"
-                             mouse_opaque="true" name="Set" scale_image="true"
-                             tool_tip="Sets the landing point where visitors arrive. Sets to your avatar&apos;s location inside this parcel."
-                             width="50" />
-                        <button bottom="-303" enabled="true" follows="left|top" font="SansSerifSmall"
-                             halign="center" height="16" label="Clear" label_selected="Clear" left="291"
-                             mouse_opaque="true" name="Clear" scale_image="true"
-                             tool_tip="Clear the landing point." width="50" />
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-323" drop_shadow_visible="true" enabled="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
-                             mouse_opaque="true" name="Teleport Routing: " v_pad="0" width="278">
-                                Teleport Routing:
-                        </text>
-                        <combo_box allow_text_entry="false" bottom="-325" enabled="true" follows="left|top"
-                             height="18" left="120" max_chars="20" mouse_opaque="true"
-                             name="landing type"
-                             tool_tip="Teleport Routing -- select how to handle teleports onto your land."
-                             width="120">
-                                <combo_item type="string" length="1" enabled="true" name="Blocked" value="Blocked">
-                                        Blocked
-                                </combo_item>
-                                <combo_item type="string" length="1" enabled="true" name="LandingPoint" value="Landing Point">
-                                        Landing Point
-                                </combo_item>
-                                <combo_item type="string" length="1" enabled="true" name="Anywhere" value="Anywhere">
-                                        Anywhere
-                                </combo_item>
-                        </combo_box>
-                        <string name="push_restrict_text">
-                                No Pushing
-                        </string>
-                        <string name="push_restrict_region_text">
-                                No Pushing (Region Override)
-                        </string>
-                </panel>
-                <panel border="true" bottom="-349" enabled="true" follows="left|top|right|bottom"
-                     height="363" label="Media" left="1" mouse_opaque="true"
-                     name="land_media_panel" width="458">
-                        <text type="string" length="1" bottom="-25" follows="left|top" font="SansSerifSmall" halign="left" height="16"
-                             left="10" mouse_opaque="true" name="with media:" width="65">
-                                Media Type:
-                        </text>
-                        <combo_box allow_text_entry="false" bottom_delta="0" follows="left|top" height="18"
-                             left="80" max_chars="20" name="media type"
-                             tool_tip="Specify if the URL is a movie, web page, or other media"
-                             width="120" />
-                        <text bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
-                             left_delta="130" name="mime_type" width="200" />
-                        <text type="string" length="1" bottom_delta="-20" follows="left|top" font="SansSerifSmall" halign="left"
-                             height="16" left="10" name="at URL:" width="65">
-                                Media URL:
-                        </text>
-                        <line_editor bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16" left="80"
-                             max_length="255" name="media_url" right="-80"
-                             select_all_on_focus_received="true" select_on_focus="true"
-                             text_readonly_color="0.576471 0.662745 0.835294 1" />
-                        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" halign="center"
-                             height="16" label="Set..." label_selected="Set..." mouse_opaque="true"
-                             name="set_media_url" right="-12" scale_image="true" width="60" />
-                        <text type="string" length="1" bottom_delta="-20" follows="left|top" font="SansSerifSmall" halign="left"
-                             height="16" left="10" name="Description:" width="364">
-                                Description:
-                        </text>
-                        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="0"
-                             follows="left|top" font="SansSerifSmall" height="16" left="80"
-                             max_length="255" name="url_description" right="-80"
-                             select_all_on_focus_received="true" select_on_focus="true"
-                             tool_tip="Text displayed next to play/load button" />
-                        <text type="string" length="1" bottom_delta="-20" follows="left|top" font="SansSerifSmall" halign="left"
-                             height="16" left="10" name="Media texture:" width="364">
-                                Replace
-Texture:
-                        </text>
-                        <texture_picker allow_no_texture="true" bottom_delta="-64" can_apply_immediately="false"
-                             default_image_name="Default" follows="left|top" height="80" label=""
-                             left="80" name="media texture" tool_tip="Click to choose a picture"
-                             width="64" />
-                        <text type="string" length="1" bottom_delta="48" follows="left|top" font="SansSerifSmall" halign="left"
-                             height="16" left_delta="75" name="replace_texture_help" width="270">
-                                (Objects using this texture will show the movie or
-web page after you click the play arrow.)
-                        </text>
-                        <text type="string" length="1" bottom_delta="-55" follows="left|top" font="SansSerifSmall" halign="left"
-                             height="16" left="10" mouse_opaque="true" name="Options:" width="292">
-                                Media
-Options:
-                        </text>
-                        <check_box bottom_delta="0" enabled="true" follows="left|top" font="SansSerifSmall"
-                             height="16" initial_value="false" label="Auto scale" left="80"
-                             mouse_opaque="true" name="media_auto_scale" radio_style="false"
-                             tool_tip="Checking this option will scale the content for this parcel automatically. It may be slightly slower and lower quality visually but no other texture scaling or alignment will be required."
-                             width="200" />
-                        <check_box bottom_delta="0" enabled="true" follows="left|top" font="SansSerifSmall"
-                             height="16" initial_value="false" label="Loop Media" left="250"
-                             mouse_opaque="true" name="media_loop" radio_style="false"
-                             tool_tip="Play media in a loop.  When the media has finished playing, it will restart from the beginning."
-                             width="200" />
-                        <check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall"
-                             height="16" initial_value="false" label="Hide Media URL" left="80"
-                             mouse_opaque="true" name="hide_media_url" radio_style="false"
-                             tool_tip="Checking this option will hide the media url to any non-authorized viewers of this parcel information. Note this is not available for HTML types."
-                             width="200" />
-                        <check_box bottom_delta="0" enabled="true" follows="left|top" font="SansSerifSmall"
-                             height="16" initial_value="false" label="Hide Music URL" left="250"
-                             mouse_opaque="true" name="hide_music_url" radio_style="false"
-                             tool_tip="Checking this option will hide the music url to any non-authorized viewers of this parcel information"
-                             width="200" />
-                        <text type="string" length="1" bottom_delta="-25" follows="left|top" font="SansSerifSmall" halign="left"
-                             height="16" left="85" name="media_size"
-                             tool_tip="Size to render Web media, leave 0 for default." width="85">
-                                Media size:
-                        </text>
-                        <spinner bottom_delta="0" decimal_digits="0" enabled="false" follows="left|top"
-                             halign="right" height="16" increment="1" initial_val="0" left_delta="65"
-                             max_val="1024" min_val="0" name="media_size_width"
-                             tool_tip="Size to render Web media, leave 0 for default." width="64" />
-                        <spinner bottom_delta="0" decimal_digits="0" enabled="false" follows="left|top"
-                             halign="right" height="16" increment="1" initial_val="0" left_delta="80"
-                             max_val="1024" min_val="0" name="media_size_height"
-                             tool_tip="Size to render Web media, leave 0 for default." width="64" />
-                        <text type="string" length="1" bottom_delta="0" follows="left|top" font="SansSerifSmall" halign="left"
-                             height="16" left_delta="70" name="pixels" right="-10">
-                                pixels
-                        </text>
-                        <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="16" left="10" mouse_opaque="true" name="MusicURL:" v_pad="0"
-                             width="364">
-                                Music URL:
-                        </text>
-                        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="0"
-                             enabled="true" follows="left|top" font="SansSerifSmall"
-                             handle_edit_keys_directly="false" height="16" left="80" max_length="255"
-                             mouse_opaque="true" name="music_url" right="-15"
-                             select_all_on_focus_received="true" select_on_focus="true"/>
-                        <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="16" left="10" mouse_opaque="true" name="Sound:" v_pad="0"
-                             width="364">
-                                Sound:
-                        </text>
-                        <check_box bottom_delta="0" enabled="true" follows="left|top" font="SansSerifSmall"
-                             height="16" initial_value="false"
-                             label="Restrict gesture and object sounds to this parcel" left="80"
-                             mouse_opaque="true" name="check sound local" radio_style="false"
-                             width="292" />
-                        <button bottom_delta="0" enabled="true" follows="left|top" font="SansSerif"
-                             halign="center" height="18" label="?" label_selected="?" left="372"
-                             mouse_opaque="true" name="?" width="18" />
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom_delta="-40" enabled="true" follows="left|top" font="SansSerifSmall"
-                             h_pad="0" halign="left" height="16" left="10" mouse_opaque="false"
-                             name="Voice settings:" tab_stop="false" v_pad="0" width="364">
-                                Voice:
-                        </text>
-                        <check_box bottom_delta="-0" enabled="true" follows="left|top"
-                             height="54" left="80" mouse_opaque="true" name="parcel_enable_voice_channel"
-                             tab_stop="true" width="463"
-                             label="Enable Voice"
-                        />
-                        <check_box bottom_delta="-0" enabled="false" follows="left|top"
-                             height="54" left="80" mouse_opaque="true" name="parcel_enable_voice_channel_is_estate_disabled"
-                             tab_stop="true" width="463"
-                             label="Enable Voice (established by the Estate)"
-                        />
-                        <check_box bottom_delta="-20" enabled="true" follows="left|top"
-                             height="54" left="100" mouse_opaque="true" name="parcel_enable_voice_channel_parcel"
-                             tab_stop="true" width="443"
-                             label="Restrict Voice to this parcel"
-                        />
-                </panel>
-                <panel border="true" bottom="-349" enabled="true" follows="left|top|right|bottom"
-                     height="333" label="Access" left="1" mouse_opaque="true"
-                     name="land_access_panel" width="458">
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-24" drop_shadow_visible="true" enabled="true" follows="left|top"
-                             font="SansSerif" h_pad="0" halign="left" height="20" left="8"
-                             mouse_opaque="true" name="Limit access to this parcel to:" v_pad="0"
-                             width="278">
-                                Access To This Parcel
-                        </text>
-                        <check_box bottom="-45" enabled="true" follows="top|left" font="SansSerifSmall"
-                             height="16" initial_value="false" label="Allow Public Access" left="8"
-                             mouse_opaque="true" name="public_access" radio_style="false" width="278" />
-                        <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="top|left" font="SansSerifSmall" h_pad="0" halign="left"
-                             height="16" left_delta="20" mouse_opaque="true" name="Only Allow" v_pad="0"
-                             width="278">
-                                Block Access By:
-                        </text>
-                        <check_box bottom_delta="-20" enabled="true" follows="top|left" font="SansSerifSmall"
-                             height="16" initial_value="false"
-                             label="Residents who have not given payment info to Linden Lab"
-                             left_delta="0" mouse_opaque="true" name="limit_payment" radio_style="false"
-                             tool_tip="Ban unidentified residents." width="278" />
-                        <check_box bottom_delta="-20" enabled="true" follows="top|left" font="SansSerifSmall"
-                             height="16" initial_value="false"
-                             label="Residents who are not age verified adults" left_delta="0"
-                             mouse_opaque="true" name="limit_age_verified" radio_style="false"
-                             tool_tip="Ban residents who have not verified their age. See support.secondlife.com for more information."
-                             width="278" />
-                        <string name="estate_override">
-                                One or more of these options is set at the estate level
-                        </string>
-                        <check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall"
-                             height="16" initial_value="false" label="Allow Group Access: [GROUP]"
-                             left="8" mouse_opaque="true" name="GroupCheck" radio_style="false"
-                             tool_tip="Set group in the General tab." width="278" />
-                        <check_box bottom_delta="-20" enabled="false" follows="left|top" font="SansSerifSmall"
-                             height="16" initial_value="false" label="Sell passes to:" left="8"
-                             mouse_opaque="true" name="PassCheck" radio_style="false"
-                             tool_tip="Allows temporary access to this parcel" width="120" />
-                        <combo_box allow_text_entry="false" bottom_delta="0" enabled="true" follows="left|top"
-                             height="16" left_delta="142" max_chars="20" mouse_opaque="true"
-                             name="pass_combo" width="100">
-                                <combo_item name="Anyone" value="anyone">
-                                        Anyone
-                                </combo_item>
-                                <combo_item name="Group" value="group">
-                                        Group
-                                </combo_item>
-                        </combo_box>
-                        <spinner bottom_delta="-20" enabled="false" follows="left|top" height="16" increment="1"
-                             initial_val="10" label="Price in L$:" label_width="120" left="28"
-                             max_val="500" min_val="1" mouse_opaque="true" name="PriceSpin" width="180" />
-                        <spinner bottom_delta="-20" enabled="false" follows="left|top" height="16"
-                             increment="0.25" initial_val="1" label="Hours of access:" label_width="120"
-                             left_delta="0" max_val="24" min_val="0.01" mouse_opaque="true"
-                             name="HoursSpin" width="180" />
-                        <text bottom="-220" enabled="true" follows="left|right|top" font="SansSerifSmall"
-                             height="16" initial_value="false" label="Always Allow" left="20"
-                             mouse_opaque="true" name="AllowedText" radio_style="false" width="195">
-                                Allowed Residents
-                        </text>
-                        <name_list allow_calling_card_drop="false" background_visible="true" bottom="-304"
-                             column_padding="0" draw_border="true" draw_heading="false" enabled="true"
-                             follows="top|bottom" heading_font="SansSerifSmall" heading_height="14"
-                             height="80" left="20" mouse_opaque="true" multi_select="true"
-                             name="AccessList" tool_tip="([LISTED] listed, [MAX] max)" width="195" />
-                        <button bottom_delta="-20" enabled="true" follows="bottom" font="SansSerifSmall"
-                             halign="center" height="16" label="Add..." label_selected="Add..."
-                             left_delta="5" mouse_opaque="true" name="add_allowed" scale_image="true"
-                             width="80" />
-                        <button bottom_delta="0" enabled="true" follows="bottom" font="SansSerifSmall"
-                             halign="center" height="16" label="Remove" label_selected="Remove"
-                             left_delta="100" mouse_opaque="true" name="remove_allowed"
-                             scale_image="true" width="80" />
-                        <text bottom="-220" enabled="true" follows="left|right|top" font="SansSerifSmall"
-                             height="16" initial_value="false"
-                             label="Ban" left="240" mouse_opaque="true"
-                             name="BanCheck" radio_style="false" width="195">
-                          Banned Residents
-                        </text>
-                        <name_list allow_calling_card_drop="false" background_visible="true" bottom="-304"
-                             column_padding="0" draw_border="true" draw_heading="false" enabled="true"
-                             follows="top|bottom" heading_font="SansSerifSmall"
-                             heading_height="14" height="80" left_delta="0" mouse_opaque="true"
-                             multi_select="true" name="BannedList"
-                             tool_tip="([LISTED] listed, [MAX] max)" width="195" />
-                        <button bottom_delta="-20" enabled="true" follows="bottom" font="SansSerifSmall"
-                             halign="center" height="16" label="Add..." label_selected="Add..."
-                             left_delta="5" mouse_opaque="true" name="add_banned" scale_image="true"
-                             width="80" />
-                        <button bottom_delta="0" enabled="false" follows="bottom" font="SansSerifSmall"
-                             halign="center" height="16" label="Remove" label_selected="Remove"
-                             left_delta="100" mouse_opaque="true" name="remove_banned"
-                             scale_image="true" width="80" />
-                </panel>
-        </tab_container>
-</floater>
diff --git a/linden/indra/newview/skins/silver/xui/en-us/floater_directory.xml b/linden/indra/newview/skins/silver/xui/en-us/floater_directory.xml
deleted file mode 100644
index af8db95..0000000
--- a/linden/indra/newview/skins/silver/xui/en-us/floater_directory.xml
+++ /dev/null
@@ -1,701 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="true" height="570" min_height="570" min_width="780"
-     name="directory" rect_control="FloaterFindRect2" title="Search Second Life"
-     width="780">
-        <tab_container bottom="-570" follows="left|top|right|bottom" height="550" left="0"
-             mouse_opaque="false" name="Directory Tabs" tab_position="top" width="780">
-                <panel border="true" bottom="-549" follows="left|top|right|bottom" height="533"
-                     label="All" left="1" mouse_opaque="false" name="find_all_panel" width="778">
-                        <string name="searching_text">
-                                Searching...
-                        </string>
-                        <string name="not_found_text">
-                                None Found.
-                        </string>
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-24" drop_shadow_visible="true" follows="left|top" font="SansSerif"
-                             h_pad="0" halign="left" height="16" left="4" mouse_opaque="true"
-                             name="find" v_pad="0" width="50">
-                                Find:
-                        </text>
-                        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-24"
-                             commit_on_focus_lost="false" enabled="true" follows="top|left|right"
-                             font="SansSerif" handle_edit_keys_directly="false" height="18"
-                             label="Search" left_delta="56" max_length="254" mouse_opaque="true"
-                             name="search_editor" select_all_on_focus_received="false"
-                             select_on_focus="false" tab_group="1" tool_tip="Search Second Life"
-                             width="160" />
-                        <button bottom="-26" follows="top|right" font="SansSerifSmall" height="20" label="Back"
-                             left="230" name="back_btn" width="70" />
-                        <button bottom="-26" follows="top|right" font="SansSerifSmall" height="20"
-                             label="Forward" left="304" name="forward_btn" width="70" />
-                        <button bottom="-48" follows="top|right" font="SansSerif" height="20"
-                             label="Search" left="121" name="search_btn" width="95" />
-                        <combo_box allow_text_entry="false" bottom="-46" follows="right|top" height="18"
-                             left="230" max_chars="20" mouse_opaque="true" name="Category"
-                             width="158">
-                                <combo_item name="AnyCategory" value="All">
-                                        Any Category
-                                </combo_item>
-                                <combo_item name="Events" value="Events">
-                                        Events
-                                </combo_item>
-                                <combo_item name="Groups" value="Groups">
-                                        Groups
-                                </combo_item>
-                                <combo_item name="People" value="People">
-                                        People
-                                </combo_item>
-                                <combo_item name="Places" value="Places">
-                                        Places
-                                </combo_item>
-                                <combo_item name="Wiki" value="Wiki">
-                                        Wiki
-                                </combo_item>
-                        </combo_box>
-                        <check_box bottom="-22" control_name="ShowPGSearchAll" follows="right|top"
-                             font="SansSerifSmall" height="16" initial_value="true"
-                             label="PG content" left="420" mouse_opaque="true"
-                             name="incpg" width="156" />
-                        <check_box bottom="-40" control_name="ShowMatureSearchAll" follows="right|top"
-                             font="SansSerifSmall" height="16" initial_value="true"
-                             label="Mature content" left="420" mouse_opaque="true"
-                             name="incmature" width="156" />
-                        <check_box bottom="-58" control_name="ShowAdultSearchAll" follows="right|top"
-                             font="SansSerifSmall" height="16" initial_value="false"
-                             label="Adult content" left="420" mouse_opaque="true"
-                             name="incadult" width="156" />
-                        <button bottom="-22" enabled="true" follows="right|top" font="SansSerif"
-                             halign="center" height="18" label="?" label_selected="?" left="-25"
-                             mouse_opaque="true" name="?" width="18" />
-                        <web_browser bottom="25" follows="top|left|bottom|right" font="SansSerifSmall" left="10"
-                             name="find_browser" right="-10" top="-60" />
-                        <text bottom="5" follows="bottom|left" halign="left" height="16" left="10"
-                             name="status_text" width="150" />
-                        <string name="loading_text">
-                                Loading...
-                        </string>
-                        <string name="done_text">
-                                Done
-                        </string>
-                        <string name="redirect_404_url">
-                                http://secondlife.com/app/search/notfound.html
-                        </string>
-      <string name="default_search_page">"http://secondlife.com/app/search/index.php?"</string>
-    </panel>
-                <panel border="true" bottom="-549" follows="left|top|right|bottom" height="533"
-                     label="Classifieds" left="1" left_delta="68" mouse_opaque="false"
-                     name="classified_panel" width="778">
-                        <string name="searching_text">
-                                Searching...
-                        </string>
-                        <string name="not_found_text">
-                                None Found.
-                        </string>
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-24" drop_shadow_visible="true" follows="left|top" font="SansSerif"
-                             h_pad="0" halign="left" height="16" left="4" mouse_opaque="true"
-                             name="find" v_pad="0" width="50">
-                                Find:
-                        </text>
-                        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-24"
-                             follows="left|right|top" font="SansSerif" height="18" left="56"
-                             max_length="63" mouse_opaque="true" name="name" width="160" />
-                        <check_box bottom="-22" control_name="ShowPGClassifieds" follows="right|top"
-                             font="SansSerifSmall" height="16" initial_value="true"
-                             label="PG content" left="420" mouse_opaque="true"
-                             name="incpg" width="156" />
-                        <check_box bottom="-40" control_name="ShowMatureClassifieds" follows="right|top"
-                             font="SansSerifSmall" height="16" initial_value="true"
-                             label="Mature content" left="420" mouse_opaque="true"
-                             name="incmature" width="156" />
-                        <check_box bottom="-58" control_name="ShowAdultClassifieds" follows="right|top"
-                             font="SansSerifSmall" height="16" initial_value="false"
-                             label="Adult content" left="420" mouse_opaque="true"
-                             name="incadult" width="156" />
-                        <combo_box allow_text_entry="false" bottom="-46" follows="right|top" height="18" left="230"
-                             max_chars="20" mouse_opaque="true" name="Category" width="158">
-                                <combo_item name="AnyCategory" value="0">
-                                        Any Category
-                                </combo_item>
-                                <combo_item name="Shopping" value="1">
-                                        Shopping
-                                </combo_item>
-                                <combo_item name="LandRental" value="2">
-                                        Land Rental
-                                </combo_item>
-                                <combo_item name="PropertyRental" value="3">
-                                        Property Rental
-                                </combo_item>
-                                <combo_item name="SpecialAttraction" value="4">
-                                        Special Attraction
-                                </combo_item>
-                                <combo_item name="NewProducts" value="5">
-                                        New Products
-                                </combo_item>
-                                <combo_item name="Employment" value="6">
-                                        Employment
-                                </combo_item>
-                                <combo_item name="Wanted" value="7">
-                                        Wanted
-                                </combo_item>
-                                <combo_item name="Service" value="8">
-                                        Service
-                                </combo_item>
-                                <combo_item name="Personal" value="9">
-                                        Personal
-                                </combo_item>
-                        </combo_box>
-                        <button bottom="-48" follows="right|top" font="SansSerif" halign="center" height="20"
-                             label="Browse" label_selected="Browse" left="121" mouse_opaque="true"
-                             name="Browse" width="95" />
-                        <button bottom="-48" follows="right|top" font="SansSerif" halign="center" height="20"
-                             label="Search" label_selected="Search" left="121" mouse_opaque="true" name="Search"
-                             visible="false" width="95" />
-                        <button bottom="-46" follows="right|top" font="SansSerif" halign="center" height="20"
-                             label="Place an Ad..." label_selected="Place an Ad..." left="630"
-                             mouse_opaque="true" name="Place an Ad..." width="145" />
-                        <button bottom="-533" follows="left|bottom" font="SansSerif" halign="center"
-                             height="20" label="Delete" label_selected="Delete" left="80"
-                             mouse_opaque="true" name="Delete" width="80" />
-                        <scroll_list background_visible="true" bottom="-510" column_padding="0" draw_border="true" 
-                                 draw_heading="true" follows="left|top|right|bottom" height="450" left="4" 
-                                 mouse_opaque="true" multi_select="false" name="results" search_column="2" width="339">
-                                <column label="" name="icon" width="24" />
-                                <column label="" name="type" width="-1" />
-                                <column label="Name" name="name" width="225" />
-                                <column label="Price" name="price" width="55" />
-                        </scroll_list>
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom_delta="-20" drop_shadow_visible="true" follows="left|bottom"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
-                             mouse_opaque="true" name="result_text" v_pad="0" width="80" />
-                        <button bottom="-533" follows="right|bottom" font="SansSerif" halign="center"
-                             height="20" label="Next &gt;" label_selected="Next &gt;"
-                             mouse_opaque="true" name="Next &gt;" right="344" width="80" />
-                        <button bottom_delta="0" follows="right|bottom" font="SansSerif" halign="center"
-                             height="20" label="&lt; Prev" label_selected="&lt; Prev"
-                             mouse_opaque="true" name="&lt; Prev" right="258" width="80" />
-                </panel>
-                <panel border="true" bottom="-549" default_tab_group="1"
-                     follows="left|top|right|bottom" height="533" label="Events" left="1"
-                     mouse_opaque="false" name="events_panel" width="778">
-                        <string name="searching_text">
-                                Searching...
-                        </string>
-                        <string name="not_found_text">
-                                None Found.
-                        </string>
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-24" drop_shadow_visible="true" follows="left|top" font="SansSerif"
-                             h_pad="0" halign="left" height="16" left="4" mouse_opaque="true"
-                             name="text2" v_pad="0" width="50">
-                                Find:
-                        </text>
-                        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-24"
-                             follows="left|right|top" font="SansSerif" height="18" left="56"
-                             max_length="63" mouse_opaque="true" name="event_search_text" width="160" />
-                        <radio_group bottom="-40" draw_border="false" follows="right|top" height="40" left="560"
-                             mouse_opaque="true" name="date_mode" width="300">
-                                <radio_item bottom="-20" follows="left|top" height="20" left="0" mouse_opaque="true"
-                                     name="current" width="174">
-                                        In-Progress and Upcoming
-                                </radio_item>
-                                <radio_item bottom_delta="-10" follows="left|top" height="20" left="0" mouse_opaque="true"
-                                     name="date" width="56">
-                                        Date
-                                </radio_item>
-                        </radio_group>
-                        <button bottom="-40" follows="right|top" font="SansSerif" halign="center" height="20"
-                             label="&lt;&lt;" label_selected="&lt;&lt;" left_delta="54"
-                             mouse_opaque="true" name="&lt;&lt;" tool_tip="Go back a day" width="24" />
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-36" drop_shadow_visible="true" follows="right|top" font="SansSerif"
-                             h_pad="0" halign="center" height="14" left_delta="22" mouse_opaque="true"
-                             name="date_text" v_pad="0" width="48">
-                                6/6
-                        </text>
-                        <button bottom="-40" follows="right|top" font="SansSerif" halign="center" height="20"
-                             label="&gt;&gt;" label_selected="&gt;&gt;" left_delta="50"
-                             mouse_opaque="true" name="&gt;&gt;" tool_tip="Go forward a day" width="24" />
-                        <button bottom="-40" follows="right|top" font="SansSerif" halign="center" height="20"
-                             label="Today" label_selected="Today" left_delta="28" mouse_opaque="true"
-                             name="Today" tool_tip="Show today&apos;s events" width="60" />
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-24" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="20" left="289"
-                             mouse_opaque="true" name="text" v_pad="0" width="90" visible="false">
-                                Category:
-                        </text>
-                        <combo_box allow_text_entry="false" bottom="-46" follows="right|top" height="18" left="230"
-                             max_chars="20" mouse_opaque="true" name="category combo" width="158">
-                                <combo_item name="All" value="0">
-                                        Any Category
-                                </combo_item>
-                                <combo_item name="Discussion" value="18">
-                                        Discussion
-                                </combo_item>
-                                <combo_item name="Sports" value="19">
-                                        Sports
-                                </combo_item>
-                                <combo_item name="LiveMusic" value="20">
-                                        Live Music
-                                </combo_item>
-                                <combo_item name="Commercial" value="22">
-                                        Commercial
-                                </combo_item>
-                                <combo_item name="Nightlife/Entertainment" value="23">
-                                        Nightlife/Entertainment
-                                </combo_item>
-                                <combo_item name="Games/Contests" value="24">
-                                        Games/Contests
-                                </combo_item>
-                                <combo_item name="Pageants" value="25">
-                                        Pageants
-                                </combo_item>
-                                <combo_item name="Education" value="26">
-                                        Education
-                                </combo_item>
-                                <combo_item name="ArtsandCulture" value="27">
-                                        Arts and Culture
-                                </combo_item>
-                                <combo_item name="Charity/SupportGroups" value="28">
-                                        Charity/Support Groups
-                                </combo_item>
-                                <combo_item name="Miscellaneous" value="29">
-                                        Miscellaneous
-                                </combo_item>
-                        </combo_box>
-                        <check_box bottom="-22" control_name="ShowPGEvents" follows="right|top"
-                             font="SansSerifSmall" height="16" initial_value="true"
-                             label="PG content" left="420" mouse_opaque="true"
-                             name="incpg" width="156" />
-                        <check_box bottom="-40" control_name="ShowMatureEvents" follows="right|top"
-                             font="SansSerifSmall" height="16" initial_value="true"
-                             label="Mature content" left="420" mouse_opaque="true"
-                             name="incmature" width="156" />
-                        <check_box bottom="-58" control_name="ShowAdultEvents" follows="right|top"
-                             font="SansSerifSmall" height="16" initial_value="false"
-                             label="Adult content" left="420" mouse_opaque="true"
-                             name="incadult" width="156" />
-                        <button bottom="-48" follows="right|top" font="SansSerif" halign="center" height="20"
-                             label="Search" label_selected="Search" left="121" mouse_opaque="true" name="Search"
-                             visible="true" width="95" />
-                        <button bottom="-533" follows="left|bottom" font="SansSerif" halign="center"
-                             height="20" label="Delete" label_selected="Delete" left="80"
-                             mouse_opaque="true" name="Delete" width="80" />
-                        <scroll_list background_visible="true" bottom="-510" column_padding="0" draw_border="true" draw_heading="true" 
-                             follows="left|top|right|bottom" height="450" left="4" mouse_opaque="true"
-                             multi_select="false" name="results" search_column="2" width="339">
-                                <column label="" name="icon" width="24" />
-                                <column label="" name="type" width="-1" />
-                                <column dynamicwidth="true" label="Name" name="name" />
-                                <column label="Time (PT)" name="date" sort="time" width="106" />
-                                <column label="" name="event_id" width="-1" />
-                                <column label="Time" name="time" width="-1" />
-                        </scroll_list>
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom_delta="-20" drop_shadow_visible="true" follows="left|bottom"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
-                             mouse_opaque="true" name="result_text" v_pad="0" width="80" />
-                        <button bottom="-533" follows="right|bottom" font="SansSerif" halign="center"
-                             height="20" label="Next &gt;" label_selected="Next &gt;"
-                             mouse_opaque="true" name="Next &gt;" right="344" width="80" />
-                        <button bottom_delta="0" follows="right|bottom" font="SansSerif" halign="center"
-                             height="20" label="&lt; Prev" label_selected="&lt; Prev"
-                             mouse_opaque="true" name="&lt; Prev" right="258" width="80" />
-                </panel>
-                <panel border="true" bottom="-549" follows="left|top|right|bottom" height="533"
-                     label="Showcase" left="1" mouse_opaque="false" name="showcase_panel"
-                     width="778">
-        <string name="searching_text">Searching...</string>
-        <string name="not_found_text">None Found.</string>
-        <button bottom="-30" follows="top|left" font="SansSerifSmall" height="20"
-          label="Back"
-          left="10"
-          name="back_btn" width="70" />
-        <button bottom_delta="0" follows="top|left" font="SansSerifSmall" height="20"
-          label="Forward" left_delta="75"
-          name="forward_btn" width="70" />
-        <!-- No mature content checkbox, showcase is all PG -->
-        <web_browser name="showcase_browser"
-          bottom="25"
-          follows="top|left|bottom|right"
-          font="SansSerifSmall"
-          left="10"
-          right="-10"
-          top="-40" />
-        <text bottom="5"
-          follows="bottom|left"
-          halign="left"
-          left="10"
-          width="150"
-          name="status_text"
-          height="16" />
-        <string name="loading_text">Loading...</string>
-        <string name="done_text">Done</string>
-        <string name="redirect_404_url">http://secondlife.com/app/search/notfound.html</string>
-        <string name="default_search_page">"http://secondlife.com/app/showcase/index.php?"</string>
-    </panel>
-                <panel border="true" bottom="-549" follows="left|top|right|bottom" height="533"
-                     label="Land Sales" left="1" mouse_opaque="false" name="land_sales_panel"
-                     width="778" default_tab_group="1">
-                        <string name="searching_text">
-                                Searching...
-                        </string>
-                        <string name="not_found_text">
-                                None Found.
-                        </string>
-                        <string name="land_help_text">
-                                Land can be bought direct for Linden Dollars (L$) or at auction for either L$ or US$.
-To buy direct, visit the land and click on the place name in the title bar.
-                        </string>
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-24" drop_shadow_visible="true" follows="left|top" font="SansSerif"
-                             h_pad="0" halign="left" height="16" left="4" mouse_opaque="true"
-                             name="find" v_pad="0" width="50">
-                                Find:
-                        </text>
-                        <check_box bottom="-22" control_name="ShowPGLand" follows="right|top"
-                             font="SansSerifSmall" height="16" initial_value="true"
-                             label="PG content" left="420" mouse_opaque="true"
-                             name="incpg" tab_group="7" width="156" />
-                        <check_box bottom="-40" control_name="ShowMatureLand" follows="right|top"
-                             font="SansSerifSmall" height="16" initial_value="true"
-                             label="Mature content" left="420" mouse_opaque="true"
-                             name="incmature" tab_group="8" width="156" />
-                        <check_box bottom="-58" control_name="ShowAdultLand" follows="right|top"
-                             font="SansSerifSmall" height="16" initial_value="false"
-                             label="Adult content" left="420" mouse_opaque="true"
-                             name="incadult" tab_group="9" width="156" />
-                        <combo_box allow_text_entry="false" bottom="-46" follows="left|top|right" height="18" left="282"
-                             max_chars="20" mouse_opaque="true" name="type" tab_group="6" width="128">
-                                <combo_item name="AllTypes" value="All Types">
-                                        All Types
-                                </combo_item>
-                                <combo_item name="Auction" value="Auction">
-                                        Auction
-                                </combo_item>
-                                <combo_item name="MainlandSales" value="Mainland Sales">
-                                        For Sale - Mainland
-                                </combo_item>
-                                <combo_item name="EstateSales" value="Estate Sales">
-                                        For Sale - Estate
-                                </combo_item>
-                        </combo_box>
-                        <check_box bottom="-24" control_name="FindLandPrice" follows="left|top"
-                             font="SansSerifSmall" height="16" initial_value="true"
-                             label="Price &#8804; " left="56" mouse_opaque="true" name="pricecheck"
-                             tab_group="1" width="88" />
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" follows="left|top"
-                             bottom="-24" font="SansSerifSmall" halign="left" height="16" left="116" mouse_opaque="true"
-                             name="pricecheck_symbol" width="15">
-                                L$
-                        </text>
-                        <check_box bottom_delta="-18" control_name="FindLandArea" follows="left|top"
-                             font="SansSerifSmall" height="16" initial_value="true"
-                             label="Area &#8805; " left="56" mouse_opaque="true" name="areacheck"
-                             tab_group="3" width="80" />
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" follows="left|top"
-                             bottom="-42" font="SansSerifSmall" halign="left" height="16" left="170" mouse_opaque="true"
-                             name="areacheck_symbol" width="15">
-                                m²
-                        </text>
-                        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-22"
-                             follows="left|top" font="SansSerifSmall" height="16" left="132"
-                             max_length="10" mouse_opaque="true" name="priceedit" tab_group="2" width="50" />
-                        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-18"
-                             follows="left|top" font="SansSerifSmall" height="16" left="117"
-                             max_length="10" mouse_opaque="true" name="areaedit" tab_group="4" width="50" />
-                        <button bottom="-48" follows="left|top" font="SansSerif" halign="center" height="20"
-                             label="Search" label_selected="Search" left="208" mouse_opaque="true"
-                             name="Search" tab_group="5" width="70" />
-                        <scroll_list background_visible="true" bottom="-510" column_padding="0" draw_border="true" draw_heading="true" 
-                             follows="left|top|right|bottom" height="450" left="4" mouse_opaque="true"
-                             multi_select="false" name="results" search_column="2" tab_group="10" width="387">
-                                <column label="" name="icon" width="24" />
-                                <column label="" name="type" width="-1" />
-                                <column dynamicwidth="true" label="Name" name="name" />
-                                <column label="Type" name="landtype" width="50" />
-                                <column label="L$ Price" name="price" width="65" />
-                                <column label="Area" name="area" width="50" />
-                                <column label="L$/m²" name="per_meter" width="65" />
-                        </scroll_list>
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom_delta="-20" drop_shadow_visible="true" follows="left|bottom"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
-                             mouse_opaque="true" name="result_text" v_pad="0" width="328" />
-                        <button bottom="-533" follows="right|bottom" font="SansSerif" halign="center"
-                             height="20" label="Next &gt;" label_selected="Next &gt;"
-                             mouse_opaque="true" name="Next &gt;" right="344" width="80" />
-                        <button bottom_delta="0" follows="right|bottom" font="SansSerif" halign="center"
-                             height="20" label="&lt; Prev" label_selected="&lt; Prev"
-                             mouse_opaque="true" name="&lt; Prev" right="258" width="80" />
-                </panel>
-                <panel border="true" bottom="-549" follows="left|top|right|bottom" height="533"
-                     label="Places" left="1" mouse_opaque="false" name="places_panel"
-                     width="778">
-                        <string name="searching_text">
-                                Searching...
-                        </string>
-                        <string name="not_found_text">
-                                None Found.
-                        </string>
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-24" drop_shadow_visible="true" follows="left|top" font="SansSerif"
-                             h_pad="0" halign="left" height="16" left="4" mouse_opaque="true"
-                             name="find" v_pad="0" width="50">
-                                Find:
-                        </text>
-                        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-24"
-                             follows="left|right|top" font="SansSerif" height="18" left="56"
-                             max_length="63" mouse_opaque="true" name="name" width="160" />
-                        <check_box bottom="-22" control_name="ShowPGSims" follows="right|top"
-                             font="SansSerifSmall" height="16" initial_value="true"
-                             label="PG content" left="420" mouse_opaque="true"
-                             name="incpg" width="156" />
-                        <check_box bottom="-40" control_name="ShowMatureSims" follows="right|top"
-                             font="SansSerifSmall" height="16" initial_value="true"
-                             label="Mature content" left="420" mouse_opaque="true"
-                             name="incmature" width="156" />
-                        <check_box bottom="-58" control_name="ShowAdultSims" follows="right|top"
-                             font="SansSerifSmall" height="16" initial_value="false"
-                             label="Adult content" left="420" mouse_opaque="true"
-                             name="incadult" width="156" />
-                        <combo_box allow_text_entry="false" bottom="-46" enabled="false" follows="right|top" height="18" left="230"
-                             max_chars="20" mouse_opaque="true" name="Category" width="128" visible="false">
-                                <combo_item name="AnyCategory" value="any">
-                                        Any Category
-                                </combo_item>
-                                <combo_item name="LindenLocation" value="linden">
-                                        Linden Location
-                                </combo_item>
-                                <combo_item name="Arts&amp;Culture" value="arts">
-                                        Arts &amp; Culture
-                                </combo_item>
-                                <combo_item name="Business" value="store">
-                                        Business
-                                </combo_item>
-                                <combo_item name="Educational" value="educational">
-                                        Educational
-                                </combo_item>
-                                <combo_item name="Gaming" value="game">
-                                        Gaming
-                                </combo_item>
-                                <combo_item name="Hangout" value="gather">
-                                        Hangout
-                                </combo_item>
-                                <combo_item name="NewcomerFriendly" value="newcomer">
-                                        Newcomer Friendly
-                                </combo_item>
-                                <combo_item name="Parks&amp;Nature" value="park">
-                                        Parks &amp; Nature
-                                </combo_item>
-                                <combo_item name="Residential" value="home">
-                                        Residential
-                                </combo_item>
-                                <combo_item name="Shopping" value="shopping">
-                                        Shopping
-                                </combo_item>
-                                <combo_item name="Other" value="other">
-                                        Other
-                                </combo_item>
-                        </combo_box>
-                        <!-- This is used only during the AO transition and can be deleted once the AO transition is
-                        complete. It is identical to the combo box above except that it has the Adult category. 
-                        You might also want to set it back to default visible and enabled. -->
-                        <combo_box allow_text_entry="false" bottom="-46" enabled="false" follows="right|top" height="18" left="230"
-                             max_chars="20" mouse_opaque="true" name="Category_Adult" width="128" visible="false">
-                                <combo_item name="AnyCategory" value="any">
-                                        Any Category
-                                </combo_item>
-                                <combo_item name="LindenLocation" value="linden">
-                                        Linden Location
-                                </combo_item>
-                                <combo_item name="Adult" value="adult">
-                                        Adult
-                                </combo_item>
-                                <combo_item name="Arts&amp;Culture" value="arts">
-                                        Arts &amp; Culture
-                                </combo_item>
-                                <combo_item name="Business" value="store">
-                                        Business
-                                </combo_item>
-                                <combo_item name="Educational" value="educational">
-                                        Educational
-                                </combo_item>
-                                <combo_item name="Gaming" value="game">
-                                        Gaming
-                                </combo_item>
-                                <combo_item name="Hangout" value="gather">
-                                        Hangout
-                                </combo_item>
-                                <combo_item name="NewcomerFriendly" value="newcomer">
-                                        Newcomer Friendly
-                                </combo_item>
-                                <combo_item name="Parks&amp;Nature" value="park">
-                                        Parks &amp; Nature
-                                </combo_item>
-                                <combo_item name="Residential" value="home">
-                                        Residential
-                                </combo_item>
-                                <combo_item name="Shopping" value="shopping">
-                                        Shopping
-                                </combo_item>
-                                <combo_item name="Other" value="other">
-                                        Other
-                                </combo_item>
-                        </combo_box>
-                        <button bottom="-48" follows="right|top" font="SansSerif" halign="center" height="20"
-                             label="Search" label_selected="Search" left="121" mouse_opaque="true"
-                             name="Search" width="95" />
-                        <scroll_list background_visible="true" bottom="-510" column_padding="0" draw_border="true"
-                             draw_heading="true" 
-                             
-                             follows="left|top|right|bottom" height="450" left="4" mouse_opaque="true"
-                             multi_select="false" name="results" search_column="2" width="339">
-                                <column label="" name="icon" width="24" />
-                                <column label="" name="type" width="-1" />
-                                <column dynamicwidth="true" label="Name" name="name" />
-                                <column label="Traffic" name="dwell" width="75" />
-                        </scroll_list>
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom_delta="-20" drop_shadow_visible="true" follows="left|bottom"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
-                             mouse_opaque="true" name="result_text" v_pad="0" width="328" />
-                        <button bottom="-533" follows="left|bottom" font="SansSerif" halign="center"
-                             height="20" label="Next &gt;" label_selected="Next &gt;"
-                             mouse_opaque="true" name="Next &gt;" right="344" width="80" />
-                        <button bottom_delta="0" follows="left|bottom" font="SansSerif" halign="center"
-                             height="20" label="&lt; Prev" label_selected="&lt; Prev"
-                             mouse_opaque="true" name="&lt; Prev" right="258" width="80" />
-                </panel>
-    <panel border="true" bottom="-549" follows="left|top|right|bottom" height="533"
-                     label="People" left="1" mouse_opaque="false" name="people_panel"
-                     width="778">
-                        <string name="searching_text">
-                                Searching...
-                        </string>
-                        <string name="not_found_text">
-                                None Found.
-                        </string>
-      <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-24" drop_shadow_visible="true" follows="left|top" font="SansSerif"
-                             h_pad="0" halign="left" height="16" left="4" mouse_opaque="true"
-                             name="find" v_pad="0" width="50">
-        Find:
-      </text>
-      <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-24"
-                             follows="left|right|top" font="SansSerif" height="18" left="56"
-                             max_length="63" mouse_opaque="true" name="name" width="160" />
-                <button bottom="-48" follows="right|top" font="SansSerif" halign="center" height="20"
-                             label="Search" label_selected="Search" left="121" mouse_opaque="true"
-                             name="Search" width="95" />
-      <scroll_list background_visible="true" bottom="-510" column_padding="0" draw_border="true"
-                             draw_heading="true"
-                               
-                             follows="left|top|right|bottom" height="450" left="4" mouse_opaque="true"
-                             multi_select="false" name="results" search_column="2" width="326">
-        <column label="" name="icon" width="24" />
-        <column label="" name="type" width="-1" />
-        <column label="Name" name="name" width="274" />
-      </scroll_list>
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom_delta="-20" drop_shadow_visible="true" follows="left|bottom"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
-                             mouse_opaque="true" name="result_text" v_pad="0" width="328" />
-                        <button bottom="-533" follows="left|bottom" font="SansSerif" halign="center"
-                             height="20" label="Next &gt;" label_selected="Next &gt;"
-                             mouse_opaque="true" name="Next &gt;" right="330" width="80" />
-                <button bottom_delta="0" follows="left|bottom" font="SansSerif" halign="center"
-                             height="20" label="&lt; Prev" label_selected="&lt; Prev"
-                             mouse_opaque="true" name="&lt; Prev" right="244" width="80" />
-                </panel>
-    <panel border="true" bottom="-549" follows="left|top|right|bottom" height="533"
-                     label="Groups" left="1" mouse_opaque="false"
-                     name="groups_panel"
-                     width="778">
-      <string name="searching_text">Searching...</string>
-      <string name="not_found_text">None Found.</string>
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-24" drop_shadow_visible="true" follows="left|top" font="SansSerif"
-                             h_pad="0" halign="left" height="16" left="4" mouse_opaque="true"
-                             name="find" v_pad="0" width="50">
-                                Find:
-                        </text>
-      <line_editor bevel_style="in"
-                                                border_style="line"
-                                                border_thickness="1"
-                                                bottom="-24"
-                                                enabled="true"
-                                                follows="top|left|right"
-                                                font="SansSerif"
-                                                handle_edit_keys_directly="false"
-                                                commit_on_focus_lost="false"
-                                                height="18"
-                                                hidden="false"
-                                                label="Search"
-                                                left_delta="56"
-                                                width="160"
-                                                max_length="254"
-                                                mouse_opaque="true"
-                                                name="search_editor"
-                                                select_all_on_focus_received="false"
-                                                select_on_focus="false"
-                                                tab_group="1"
-                                                tool_tip="Search Second Life" />
-                        <button bottom="-26" follows="top|right" font="SansSerifSmall" height="20" label="Back"
-                             left="230" name="back_btn" width="70" />
-                        <button bottom="-26" follows="top|right" font="SansSerifSmall" height="20"
-                             label="Forward" left="304" name="forward_btn" width="70" />
-                        <button bottom="-48" follows="top|right" font="SansSerif" height="20"
-                             label="Search" left="121" name="search_btn" width="95" />
-          <check_box bottom="-22" control_name="ShowPGGroups" follows="right|top"
-                     font="SansSerifSmall" height="16" initial_value="true"
-                     label="PG content" left="420" mouse_opaque="true"
-                     name="incpg" width="156" />
-          <check_box bottom="-40" control_name="ShowMatureGroups" follows="right|top"
-                     font="SansSerifSmall" height="16" initial_value="true"
-                     label="Mature content" left="420" mouse_opaque="true"
-                     name="incmature" width="156" />
-          <check_box bottom="-58" control_name="ShowAdultGroups" follows="right|top"
-                             font="SansSerifSmall" height="16" initial_value="false"
-                     label="Adult content" left="420" mouse_opaque="true"
-                     name="incadult" width="156" />
-      <web_browser name="groups_browser"
-                                bottom="25"
-                                follows="top|left|bottom|right"
-                                font="SansSerifSmall"
-                                left="10"
-                                right="-10"
-                                top="-60" />
-      <text bottom="5"
-                                follows="bottom|left"
-                                halign="left"
-                                left="10"
-                                width="150"
-                                name="status_text"
-                                height="16" />
-      <string name="loading_text">Loading...</string>
-      <string name="done_text">Done</string>
-      <string name="redirect_404_url">http://secondlife.com/app/search/notfound.html</string>
-      <string name="default_search_page">"http://secondlife.com/app/search/index_groups.php?"</string>
-    </panel>
-        </tab_container>
-        <panel bottom="-560" follows="right|top" height="470" left="340"
-             name="classified_details_panel" width="440" />
-        <panel bottom="-560" follows="right|top" height="486" left="350" name="Panel Avatar"
-             width="430" />
-        <panel bottom="-560" follows="right|top" height="470" left="340"
-             name="event_details_panel" width="440" />
-        <panel bottom="-580" follows="right|top" height="515" left="350"
-             name="group_details_panel_holder" width="430">
-                <panel bottom="0" follows="right|top" height="470" left="0" name="group_details_panel"
-                     width="430" />
-        </panel>
-        <panel bottom="5" follows="right|top" height="470" left="340"
-             name="place_details_panel" width="440" />
-        <panel bottom="0" follows="right|top" height="470" left="385"
-             name="place_details_small_panel" width="395" />
-</floater>
diff --git a/linden/indra/newview/skins/silver/xui/en-us/floater_env_settings.xml b/linden/indra/newview/skins/silver/xui/en-us/floater_env_settings.xml
deleted file mode 100644
index e2bafbf..0000000
--- a/linden/indra/newview/skins/silver/xui/en-us/floater_env_settings.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater bottom="-130" can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="false" height="150" left="50" min_height="150"
-     min_width="600" mouse_opaque="true" name="Environment Editor Floater"
-     rect_control="FloaterEnvRect" title="Environment Editor" width="600">
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-48" drop_shadow_visible="true" follows="left|top|right"
-             font="SansSerif" h_pad="0" halign="left" height="16" 
-             left="10" mouse_opaque="true" name="EnvTimeText" v_pad="0" width="140">
-                Time of Day
-        </text>
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom_delta="-30" drop_shadow_visible="true" follows="left|top|right"
-             font="SansSerifSmall" h_pad="0" halign="left" height="16" 
-             left="15" mouse_opaque="true" name="EnvTimeText2" v_pad="0" width="140">
-                12:00 PM
-        </text>
-        <icon bottom="-55" follows="left|top" height="25" image_name="icon_diurnal.tga"
-             left="85" name="EnvDayCycle" width="200" />
-        <slider bottom_delta="-20" can_edit_text="false" control_name="EnvTimeSlider"
-             decimal_digits="2" follows="left" height="10" increment="0.0069444"
-             initial_val="0.7" label="" left_delta="0" max_val="0.99" min_val="0"
-             mouse_opaque="true" name="EnvTimeSlider" show_text="false" value="0.0"
-             width="200" />
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-102" drop_shadow_visible="true" follows="left|top|right"
-             font="SansSerif" h_pad="0" halign="left" height="16" 
-             left="10" mouse_opaque="true" name="EnvCloudText" v_pad="0" width="140">
-                Cloud Cover
-        </text>
-        <slider bottom="-100" can_edit_text="false" control_name="EnvCloudSlider"
-             decimal_digits="2" follows="left" height="10" increment="0.01"
-             initial_val="0.7" label="" left="85" max_val="1" min_val="0"
-             mouse_opaque="true" name="EnvCloudSlider" show_text="true" value="0.7"
-             width="210" />
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-55" drop_shadow_visible="true" follows="left|top|right"
-             font="SansSerif" h_pad="0" halign="left" height="16" 
-             left="310" mouse_opaque="true" name="EnvWaterColorText" v_pad="0"
-             width="140">
-                Water Color
-        </text>
-        <color_swatch border_color="0.45098, 0.517647, 0.607843, 1" bottom="-80"
-             can_apply_immediately="true" color="0.5, 0.5, 0.5, 1" follows="left|top"
-             height="50" label="" left="390" mouse_opaque="true"
-             name="EnvWaterColor" tool_tip="Click to open Color Picker" width="40" />
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-102" drop_shadow_visible="true" follows="left|top|right"
-             font="SansSerif" h_pad="0" halign="left" height="16" 
-             left="310" mouse_opaque="true" name="EnvWaterFogText" v_pad="0" width="140">
-                Water Fog
-        </text>
-        <slider bottom="-100" can_edit_text="false" control_name="EnvWaterFogSlider"
-             decimal_digits="2" follows="left" height="10" increment="0.1"
-             initial_val="0" label="" left="385" max_val="10" min_val="0"
-             mouse_opaque="true" name="EnvWaterFogSlider" show_text="true" value="0"
-             width="210" />
-        <button bottom="-140" follows="left|top" font="SansSerifSmall" height="20"
-             label="Use Estate Time" left="8" name="EnvUseEstateTimeButton" width="137" />
-        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="20"
-             label="Advanced Sky" left="154" name="EnvAdvancedSkyButton" width="137" />
-        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="20"
-             label="Advanced Water" left="300" name="EnvAdvancedWaterButton" width="137" />
-        <button bottom="-40" follows="left|top" font="SansSerif" height="18" label="?"
-             left="570" name="EnvSettingsHelpButton" width="22" />
-</floater>
diff --git a/linden/indra/newview/skins/silver/xui/en-us/floater_live_lsleditor.xml b/linden/indra/newview/skins/silver/xui/en-us/floater_live_lsleditor.xml
deleted file mode 100644
index f50bb65..0000000
--- a/linden/indra/newview/skins/silver/xui/en-us/floater_live_lsleditor.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater bottom="-668" can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="true" enabled="true" follows="left|top" height="550" left="306"
-     min_height="271" min_width="290" mouse_opaque="true" name="script ed float"
-     rect_control="FloaterOpenObjectRect" title="Script: New Script" width="500">
-        <button bottom="-545" enabled="true" follows="right|bottom" font="SansSerif"
-             halign="center" height="20" label="Reset" label_selected="Reset" left="362"
-             mouse_opaque="true" name="Reset" width="128" />
-        <check_box bottom="-545" enabled="false" follows="left|bottom" font="SansSerif"
-             height="18" initial_value="true" label="Running" left="12"
-             mouse_opaque="true" name="running" radio_style="false" width="100" />
-        <panel bottom="-524" enabled="true" follows="left|top|right|bottom" height="506"
-             left="1" name="script ed panel" width="497" />
-        <check_box bottom="-545" enabled="false" follows="left|bottom" font="SansSerif"
-             height="18" hidden="false" initial_value="true" label="Mono" left="82"
-             mouse_opaque="true" name="mono" radio_style="false" width="100" />
-        <string name="not_allowed">
-                You are not allowed to view this script.
-        </string>
-        <string name="script_running">
-                Running
-        </string>
-</floater>
diff --git a/linden/indra/newview/skins/silver/xui/en-us/floater_water.xml b/linden/indra/newview/skins/silver/xui/en-us/floater_water.xml
deleted file mode 100644
index 5b65837..0000000
--- a/linden/indra/newview/skins/silver/xui/en-us/floater_water.xml
+++ /dev/null
@@ -1,260 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater bottom="-150" can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="false" height="240" left="50" min_height="200"
-     min_width="400" mouse_opaque="true" name="Water Floater"
-     rect_control="FloaterAdvancedWaterRect" title="Advanced Water Editor"
-     width="700">
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-50" drop_shadow_visible="true" follows="left|top|right"
-             font="SansSerif" h_pad="0" halign="left" height="16"
-             left="10" mouse_opaque="true" name="KeyFramePresetsText" v_pad="0"
-             width="110">
-                Water Presets:
-        </text>
-        <combo_box allow_text_entry="false" bottom="-50" follows="left|top" height="18"
-             left_delta="110" max_chars="20" mouse_opaque="true"
-             name="WaterPresetsCombo" width="150" />
-        <button bottom="-53" enabled="true" font="SansSerif" halign="center" height="20"
-             label="New" label_selected="New" left_delta="170"
-             mouse_opaque="true" name="WaterNewPreset" scale_image="true" width="70" />
-        <button bottom_delta="0" enabled="true" font="SansSerif" halign="center" height="20"
-             label="Save" label_selected="Save" left_delta="80"
-             mouse_opaque="true" name="WaterSavePreset" scale_image="true" width="70" />
-        <button bottom_delta="0" enabled="true" font="SansSerif" halign="center" height="20"
-             label="Delete" label_selected="Delete" left_delta="80"
-             mouse_opaque="true" name="WaterDeletePreset" scale_image="true" width="70" />
-        <tab_container bottom="-240" follows="left|top" height="180" left="0"
-             mouse_opaque="false" name="Water Tabs" tab_position="top" width="700">
-                <panel border="true" bottom="-240" follows="left|top|right|bottom" height="180"
-                     label="Settings" left="1" mouse_opaque="false"
-                     name="Settings" width="698">
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-20" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerif" h_pad="0" halign="left" height="16"
-                             left="10" mouse_opaque="true" name="BHText" v_pad="0" width="355">
-                                Water Fog Color
-                        </text>
-                        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="15" label="?"
-                             left="160" name="WaterFogColorHelp" width="18" />
-                        <color_swatch border_color="0.45098, 0.517647, 0.607843, 1" bottom="-80"
-                             can_apply_immediately="true" color="0.5, 0.5, 0.5, 1" follows="left|top"
-                             height="50" label="" left="40" mouse_opaque="true"
-                             name="WaterFogColor" tool_tip="Click to open Color Picker" width="40" />
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-90" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerif" h_pad="0" halign="left" height="16"
-                             left="10" mouse_opaque="true" name="WaterFogDensText" v_pad="0" width="355">
-                                Fog Density Exponent
-                        </text>
-                        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="15" label="?"
-                             left="160" name="WaterFogDensityHelp" width="18" />
-                        <slider bottom_delta="-30" can_edit_text="false" control_name="WaterFogDensity"
-                             decimal_digits="1" follows="left" height="10" increment=".1"
-                             initial_val="16" label="" left="24" max_val="10" min_val="0"
-                             mouse_opaque="true" name="WaterFogDensity" show_text="true" value="1.0"
-                             width="200" />
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-130" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerif" h_pad="0" halign="left" height="16"
-                             left="10" mouse_opaque="true" name="WaterUnderWaterFogModText" v_pad="0"
-                             width="355">
-                                Underwater Fog Modifier
-                        </text>
-                        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="15" label="?"
-                             left="160" name="WaterUnderWaterFogModHelp" width="18" />
-                        <slider bottom_delta="-30" can_edit_text="false" control_name="" decimal_digits="2"
-                             follows="left" height="10" increment=".01" initial_val="16" label=""
-                             left="24" max_val="2" min_val="0" mouse_opaque="true"
-                             name="WaterUnderWaterFogMod" show_text="true" value="0.25" width="200" />
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-20" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerif" h_pad="0" halign="left" height="16"
-                             left="245" mouse_opaque="true" name="BDensText" v_pad="0" width="355">
-                                Reflection Wavelet Scale
-                        </text>
-                        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="15" label="?"
-                             left="395" name="WaterNormalScaleHelp" width="18" />
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-37" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
-                             left="245" mouse_opaque="true" name="BHText2" v_pad="0" width="10">
-                                1
-                        </text>
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
-                             left_delta="0" mouse_opaque="true" name="BHText3" v_pad="0" width="10">
-                                2
-                        </text>
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
-                             left_delta="0" mouse_opaque="true" name="BHText4" v_pad="0" width="10">
-                                3
-                        </text>
-                        <slider bottom="-50" can_edit_text="false" control_name="WaterNormalScaleX"
-                             decimal_digits="1" follows="left" height="10" increment="0.1"
-                             initial_val="0.7" label="" left="259" max_val="10" min_val="0"
-                             mouse_opaque="true" name="WaterNormalScaleX" show_text="true" value="1.0"
-                             width="200" />
-                        <slider bottom_delta="-11" can_edit_text="false" control_name="WaterNormalScaleY"
-                             decimal_digits="1" follows="left" height="10" increment="0.1"
-                             initial_val="0.7" label="" left="259" max_val="10" min_val="0"
-                             mouse_opaque="true" name="WaterNormalScaleY" show_text="true" value="1.0"
-                             width="200" />
-                        <slider bottom_delta="-11" can_edit_text="false" control_name="WaterNormalScaleZ"
-                             decimal_digits="1" follows="left" height="10" increment="0.1"
-                             initial_val="0.7" label="" left="259" max_val="10" min_val="0"
-                             mouse_opaque="true" name="WaterNormalScaleZ" show_text="true" value="1.0"
-                             width="200" />
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-80" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerif" h_pad="0" halign="left" height="16"
-                             left="245" mouse_opaque="true" name="HDText" v_pad="0" width="355">
-                                Fresnel Scale
-                        </text>
-                        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="15" label="?"
-                             left="395" name="WaterFresnelScaleHelp" width="18" />
-                        <slider bottom_delta="-30" can_edit_text="false" control_name="WaterFresnelScale"
-                             decimal_digits="2" follows="left" height="10" increment="0.01"
-                             initial_val="0.7" label="" left="259" max_val="1" min_val="0"
-                             mouse_opaque="true" name="WaterFresnelScale" show_text="true" value="1.0"
-                             width="200" />
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-115" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerif" h_pad="0" halign="left" height="16"
-                             left="245" mouse_opaque="true" name="FresnelOffsetText" v_pad="0"
-                             width="355">
-                                Fresnel Offset
-                        </text>
-                        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="15" label="?"
-                             left="395" name="WaterFresnelOffsetHelp" width="18" />
-                        <slider bottom_delta="-30" can_edit_text="false" control_name="WaterFresnelOffset"
-                             decimal_digits="2" follows="left" height="10" increment="0.01"
-                             initial_val="0.7" label="" left="259" max_val="1" min_val="0"
-                             mouse_opaque="true" name="WaterFresnelOffset" show_text="true" value="1.0"
-                             width="200" />
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-20" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerif" h_pad="0" halign="left" height="16"
-                             left="480" mouse_opaque="true" name="DensMultText" v_pad="0" width="355">
-                                Refract Scale Above
-                        </text>
-                        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="15" label="?"
-                             left="630" name="WaterScaleAboveHelp" width="18" />
-                        <slider bottom_delta="-30" can_edit_text="false" control_name="WaterScaleAbove"
-                             decimal_digits="2" follows="left" height="10" increment="0.01"
-                             initial_val="0.1" label="" left="494" max_val="1" min_val="0"
-                             mouse_opaque="true" name="WaterScaleAbove" show_text="true" value="1.0"
-                             width="200" />
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-53" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerif" h_pad="0" halign="left" height="16"
-                             left="480" mouse_opaque="true" name="WaterScaleBelowText" v_pad="0"
-                             width="355">
-                                Refract Scale Below
-                        </text>
-                        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="15" label="?"
-                             left="630" name="WaterScaleBelowHelp" width="18" />
-                        <slider bottom_delta="-30" can_edit_text="false" control_name="WaterScaleBelow"
-                             decimal_digits="2" follows="left" height="10" increment="0.01"
-                             initial_val="0" label="" left="494" max_val="1" min_val="0"
-                             mouse_opaque="true" name="WaterScaleBelow" show_text="true" value="0.0"
-                             width="200" />
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-87" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerif" h_pad="0" halign="left" height="16"
-                             left="480" mouse_opaque="true" name="MaxAltText" v_pad="0" width="355">
-                                Blur Multiplier
-                        </text>
-                        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="15" label="?"
-                             left="630" name="WaterBlurMultiplierHelp" width="18" />
-                        <slider bottom_delta="-30" can_edit_text="false" control_name="WaterBlurMult"
-                             decimal_digits="3" follows="left" height="10" increment=".001"
-                             initial_val="0" label="" left="494" max_val=".16" min_val="0"
-                             mouse_opaque="true" name="WaterBlurMult" show_text="true" value="0"
-                             width="200" />
-                </panel>
-                <panel border="true" bottom="-240" follows="left|top|right|bottom" height="180"
-                     label="Image" left="1" mouse_opaque="false" name="Waves"
-                     width="698">
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-20" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerif" h_pad="0" halign="left" height="16"
-                             left="10" mouse_opaque="true" name="BHText" v_pad="0" width="355">
-                                Big Wave Direction
-                        </text>
-                        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="15" label="?"
-                             left="155" name="WaterWave1Help" width="18" />
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-37" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
-                             left="10" mouse_opaque="true" name="WaterWave1DirXText" v_pad="0"
-                             width="10">
-                                X
-                        </text>
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
-                             left_delta="0" mouse_opaque="true" name="WaterWave1DirYText" v_pad="0"
-                             width="10">
-                                Y
-                        </text>
-                        <slider bottom="-50" can_edit_text="false" control_name="WaterWave1DirX"
-                             decimal_digits="2" follows="left" height="10" increment="0.01"
-                             initial_val="0.7" label="" left="24" max_val="4" min_val="-4"
-                             mouse_opaque="true" name="WaterWave1DirX" show_text="true" value="0.7"
-                             width="200" />
-                        <slider bottom_delta="-11" can_edit_text="false" control_name="WaterWave1DirY"
-                             decimal_digits="2" follows="left" height="10" increment="0.01"
-                             initial_val="0.7" label="" left="24" max_val="4" min_val="-4"
-                             mouse_opaque="true" name="WaterWave1DirY" show_text="true" value="0.7"
-                             width="200" />
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-70" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerif" h_pad="0" halign="left" height="16"
-                             left="10" mouse_opaque="true" name="BHText2" v_pad="0" width="355">
-                                Little Wave Direction
-                        </text>
-                        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="15" label="?"
-                             left="155" name="WaterWave2Help" width="18" />
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-87" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
-                             left="10" mouse_opaque="true" name="WaterWave2DirXText" v_pad="0"
-                             width="10">
-                                X
-                        </text>
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
-                             left_delta="0" mouse_opaque="true" name="WaterWave2DirYText" v_pad="0"
-                             width="10">
-                                Y
-                        </text>
-                        <slider bottom="-100" can_edit_text="false" control_name="WaterWave2DirX"
-                             decimal_digits="2" follows="left" height="10" increment="0.01"
-                             initial_val="0.7" label="" left="24" max_val="4" min_val="-4"
-                             mouse_opaque="true" name="WaterWave2DirX" show_text="true" value="0.7"
-                             width="200" />
-                        <slider bottom_delta="-11" can_edit_text="false" control_name="WaterWave2DirY"
-                             decimal_digits="2" follows="left" height="10" increment="0.01"
-                             initial_val="0.7" label="" left="24" max_val="4" min_val="-4"
-                             mouse_opaque="true" name="WaterWave2DirY" show_text="true" value="0.7"
-                             width="200" />
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-20" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerif" h_pad="0" halign="left" height="16"
-                             left="240" mouse_opaque="true" name="BHText3" v_pad="0" width="355">
-                                Normal Map
-                        </text>
-                        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="15" label="?"
-                             left="365" name="WaterNormalMapHelp" width="18" />
-                        <texture_picker bottom="-165" height="143" label="" left="250" name="WaterNormalMap"
-                             width="128" />
-                </panel>
-        </tab_container>
-        <string name="WLDefaultWaterNames">
-                Default:Glassy:Pond:Murky:Second Plague:SNAKE!!!:Valdez
-        </string>
-</floater>
diff --git a/linden/indra/newview/skins/silver/xui/en-us/floater_windlight_options.xml b/linden/indra/newview/skins/silver/xui/en-us/floater_windlight_options.xml
deleted file mode 100644
index d801251..0000000
--- a/linden/indra/newview/skins/silver/xui/en-us/floater_windlight_options.xml
+++ /dev/null
@@ -1,599 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater bottom="-150" can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="false" height="220" left="50" min_height="180"
-     min_width="400" mouse_opaque="true" name="WindLight floater"
-     rect_control="FloaterAdvancedSkyRect" title="Advanced Sky Editor"
-     width="700">
-  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-50" drop_shadow_visible="true" follows="left|top|right"
-             font="SansSerif" h_pad="0" halign="left" height="16"
-             left="10" mouse_opaque="true" name="KeyFramePresetsText" v_pad="0"
-             width="110">
-    Sky Presets:
-  </text>
-  <combo_box allow_text_entry="false" bottom="-52" follows="left|top" height="18"
-             left_delta="110" max_chars="20" mouse_opaque="true" name="WLPresetsCombo"
-             width="150" />
-  <button bottom="-53" enabled="true" font="SansSerif" halign="center" height="20"
-             label="" label_selected="" left_delta="-25" image_overlay="arrow_left.tga"
-             mouse_opaque="true" name="prev" scale_image="true" width="20" />
-  <button bottom="-53" enabled="true" font="SansSerif" halign="center" height="20"
-             label="" label_selected="" left_delta="180" image_overlay="arrow_right.tga"
-             mouse_opaque="true" name="next" scale_image="true" width="20" />
-        <button bottom="-53" enabled="true" font="SansSerif" halign="center" height="20"
-             label="New" label_selected="New" left_delta="40"
-             mouse_opaque="true" name="WLNewPreset" scale_image="true" width="70" />
-        <button bottom_delta="0" enabled="true" font="SansSerif" halign="center" height="20"
-             label="Save" label_selected="Save" left_delta="70"
-             mouse_opaque="true" name="WLSavePreset" scale_image="true" width="70" />
-        <button bottom_delta="0" enabled="true" font="SansSerif" halign="center" height="20"
-             label="Delete" label_selected="Delete" left_delta="70"
-             mouse_opaque="true" name="WLDeletePreset" scale_image="true" width="70" />
-        <button bottom_delta="0" enabled="true" font="SansSerif" halign="center" height="20"
-             label="Day Cycle Editor" label_selected="Day Cycle Editor"
-             left_delta="100" mouse_opaque="true" name="WLDayCycleMenuButton"
-             scale_image="true" width="125" />
-        <tab_container bottom="-220" follows="left|top" height="160" left="0"
-             mouse_opaque="false" name="WindLight Tabs" tab_position="top" width="700">
-                <panel border="true" bottom="-220" follows="left|top|right|bottom" height="160"
-                     label="Atmosphere" left="1" mouse_opaque="false"
-                     name="Atmosphere" width="698">
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-20" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerif" h_pad="0" halign="left" height="16"
-                             left="10" mouse_opaque="true" name="BHText" v_pad="0" width="355">
-                                Blue Horizon
-                        </text>
-                        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="15" label="?"
-                             left="160" name="WLBlueHorizonHelp" width="18" />
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-37" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
-                             left="10" mouse_opaque="true" name="BHText2" v_pad="0" width="10">
-                                R
-                        </text>
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
-                             left_delta="0" mouse_opaque="true" name="BHText3" v_pad="0" width="10">
-                                G
-                        </text>
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
-                             left_delta="0" mouse_opaque="true" name="BHText4" v_pad="0" width="10">
-                                B
-                        </text>
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
-                             left_delta="0" mouse_opaque="true" name="BHText5" v_pad="0" width="10">
-                                I
-                        </text>
-                        <slider bottom="-50" can_edit_text="false" control_name="WLBlueHorizonR"
-                             decimal_digits="2" follows="left" height="10" increment="0.01"
-                             initial_val="0.7" label="" left="24" max_val="1" min_val="0"
-                             mouse_opaque="true" name="WLBlueHorizonR" show_text="true" value="0.7"
-                             width="200" />
-                        <slider bottom_delta="-11" can_edit_text="false" control_name="WLBlueHorizonG"
-                             decimal_digits="2" follows="left" height="10" increment="0.01"
-                             initial_val="0.7" label="" left="24" max_val="1" min_val="0"
-                             mouse_opaque="true" name="WLBlueHorizonG" show_text="true" value="0.7"
-                             width="200" />
-                        <slider bottom_delta="-11" can_edit_text="false" control_name="WLBlueHorizonB"
-                             decimal_digits="2" follows="left" height="10" increment="0.01"
-                             initial_val="0.7" label="" left="24" max_val="1" min_val="0"
-                             mouse_opaque="true" name="WLBlueHorizonB" show_text="true" value="0.7"
-                             width="200" />
-                        <slider bottom_delta="-11" can_edit_text="false" control_name="WLBlueHorizonI"
-                             decimal_digits="2" follows="left" height="10" increment="0.01"
-                             initial_val="1.0" label="" left="24" max_val="1" min_val="0"
-                             mouse_opaque="true" name="WLBlueHorizonI" show_text="true" value="1.0"
-                             width="200" />
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-87" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerif" h_pad="0" halign="left" height="16"
-                             left="10" mouse_opaque="true" name="BDensText" v_pad="0" width="355">
-                                Haze Horizon
-                        </text>
-                        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="15" label="?"
-                             left="160" name="WLHazeHorizonHelp" width="18" />
-                        <slider bottom_delta="-30" can_edit_text="false" control_name="WLHazeHorizon"
-                             decimal_digits="2" follows="left" height="10" increment="0.01"
-                             initial_val="0.25" label="" left="24" max_val="1.0" min_val="0"
-                             mouse_opaque="true" name="WLHazeHorizon" show_text="true" value="1.0"
-                             width="200" />
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-20" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerif" h_pad="0" halign="left" height="16"
-                             left="245" mouse_opaque="true" name="BDensText2" v_pad="0" width="355">
-                                Blue Density
-                        </text>
-                        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="15" label="?"
-                             left="395" name="WLBlueDensityHelp" width="18" />
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-37" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
-                             left="245" mouse_opaque="true" name="BHText6" v_pad="0" width="10">
-                                R
-                        </text>
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
-                             left_delta="0" mouse_opaque="true" name="BHText7" v_pad="0" width="10">
-                                G
-                        </text>
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
-                             left_delta="0" mouse_opaque="true" name="BHText8" v_pad="0" width="10">
-                                B
-                        </text>
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
-                             left_delta="0" mouse_opaque="true" name="BHText9" v_pad="0" width="10">
-                                I
-                        </text>
-                        <slider bottom="-50" can_edit_text="false" control_name="WLBlueDensityR"
-                             decimal_digits="2" follows="left" height="10" increment="0.01"
-                             initial_val="0.7" label="" left="259" max_val="1" min_val="0"
-                             mouse_opaque="true" name="WLBlueDensityR" show_text="true" value="1.0"
-                             width="200" />
-                        <slider bottom_delta="-11" can_edit_text="false" control_name="WLBlueDensityG"
-                             decimal_digits="2" follows="left" height="10" increment="0.01"
-                             initial_val="0.7" label="" left="259" max_val="1" min_val="0"
-                             mouse_opaque="true" name="WLBlueDensityG" show_text="true" value="1.0"
-                             width="200" />
-                        <slider bottom_delta="-11" can_edit_text="false" control_name="WLBlueDensityB"
-                             decimal_digits="2" follows="left" height="10" increment="0.01"
-                             initial_val="0.7" label="" left="259" max_val="1" min_val="0"
-                             mouse_opaque="true" name="WLBlueDensityB" show_text="true" value="1.0"
-                             width="200" />
-                        <slider bottom_delta="-11" can_edit_text="false" control_name="WLBlueDensityI"
-                             decimal_digits="2" follows="left" height="10" increment="0.01"
-                             initial_val="1" label="" left="259" max_val="1" min_val="0"
-                             mouse_opaque="true" name="WLBlueDensityI" show_text="true" value="1.0"
-                             width="200" />
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-87" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerif" h_pad="0" halign="left" height="16"
-                             left="245" mouse_opaque="true" name="HDText" v_pad="0" width="355">
-                                Haze Density
-                        </text>
-                        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="15" label="?"
-                             left="395" name="WLHazeDensityHelp" width="18" />
-                        <slider bottom_delta="-30" can_edit_text="false" control_name="WLHazeDensity"
-                             decimal_digits="2" follows="left" height="10" increment="0.01"
-                             initial_val="0.7" label="" left="259" max_val="4" min_val="0"
-                             mouse_opaque="true" name="WLHazeDensity" show_text="true" value="1.0"
-                             width="200" />
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-20" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerif" h_pad="0" halign="left" height="16"
-                             left="480" mouse_opaque="true" name="DensMultText" v_pad="0" width="355">
-                                Density Multiplier
-                        </text>
-                        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="15" label="?"
-                             left="630" name="WLDensityMultHelp" width="18" />
-                        <slider bottom_delta="-30" can_edit_text="false" control_name="WLDensityMult"
-                             decimal_digits="2" follows="left" height="10" increment="0.01"
-                             initial_val="0.1" label="" left="494" max_val="0.9" min_val="0"
-                             mouse_opaque="true" name="WLDensityMult" show_text="true" value="1.0"
-                             width="200" />
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-53" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerif" h_pad="0" halign="left" height="16"
-                             left="480" mouse_opaque="true" name="WLDistanceMultText" v_pad="0"
-                             width="355">
-                                Distance Multiplier
-                        </text>
-                        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="15" label="?"
-                             left="630" name="WLDistanceMultHelp" width="18" />
-                        <slider bottom_delta="-30" can_edit_text="false" control_name="WLDistancMult"
-                             decimal_digits="1" follows="left" height="10" increment="0.1"
-                             initial_val="1.0" label="" left="494" max_val="100" min_val="0"
-                             mouse_opaque="true" name="WLDistanceMult" show_text="true" value="0.0"
-                             width="207" />
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-87" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerif" h_pad="0" halign="left" height="16"
-                             left="480" mouse_opaque="true" name="MaxAltText" v_pad="0" width="355">
-                                Max Altitude
-                        </text>
-                        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="15" label="?"
-                             left="630" name="WLMaxAltitudeHelp" width="18" />
-                        <slider bottom_delta="-30" can_edit_text="false" control_name="WLMaxAltitude"
-                             decimal_digits="0" follows="left" height="10" increment="1"
-                             initial_val="500" label="" left="494" max_val="4000" min_val="0"
-                             mouse_opaque="true" name="WLMaxAltitude" show_text="true" value="4000"
-                             width="205" />
-                </panel>
-                <panel border="true" bottom="-180" follows="left|top|right|bottom" height="160"
-                     label="Lighting" left="1" mouse_opaque="true"
-                     name="Lighting" width="698">
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-20" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerif" h_pad="0" halign="left" height="16"
-                             left="10" mouse_opaque="true" name="SLCText" v_pad="0" width="355">
-                                Sun/Moon Color
-                        </text>
-                        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="15" label="?"
-                             left="160" name="WLSunlightColorHelp" width="18" />
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-37" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
-                             left="10" mouse_opaque="true" name="BHText" v_pad="0" width="10">
-                                R
-                        </text>
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
-                             left_delta="0" mouse_opaque="true" name="BHText2" v_pad="0" width="10">
-                                G
-                        </text>
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
-                             left_delta="0" mouse_opaque="true" name="BHText3" v_pad="0" width="10">
-                                B
-                        </text>
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
-                             left_delta="0" mouse_opaque="true" name="BHText4" v_pad="0" width="10">
-                                I
-                        </text>
-                        <slider bottom="-50" can_edit_text="false" control_name="WLSunlightR"
-                             decimal_digits="2" follows="left" height="10" increment="0.01"
-                             initial_val="0.7" label="" left="24" max_val="1" min_val="0"
-                             mouse_opaque="true" name="WLSunlightR" show_text="true" value="0.7"
-                             width="200" />
-                        <slider bottom_delta="-11" can_edit_text="false" control_name="WLSunlightG"
-                             decimal_digits="2" follows="left" height="10" increment="0.01"
-                             initial_val="0.7" label="" left="24" max_val="1" min_val="0"
-                             mouse_opaque="true" name="WLSunlightG" show_text="true" value="0.7"
-                             width="200" />
-                        <slider bottom_delta="-11" can_edit_text="false" control_name="WLSunlightB"
-                             decimal_digits="2" follows="left" height="10" increment="0.01"
-                             initial_val="0.7" label="" left="24" max_val="1" min_val="0"
-                             mouse_opaque="true" name="WLSunlightB" show_text="true" value="0.7"
-                             width="200" />
-                        <slider bottom_delta="-11" can_edit_text="false" control_name="WLSunlightI"
-                             decimal_digits="2" follows="left" height="10" increment="0.01"
-                             initial_val="1.0" label="" left="24" max_val="1" min_val="0"
-                             mouse_opaque="true" name="WLSunlightI" show_text="true" value="1.0"
-                             width="200" />
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-87" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerif" h_pad="0" halign="left" height="16"
-                             left="10" mouse_opaque="true" name="TODText" v_pad="0" width="355">
-                                Sun/Moon Position
-                        </text>
-                        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="15" label="?"
-                             left="160" name="WLTimeOfDayHelp" width="18" />
-                        <icon bottom_delta="-30" follows="left|top" height="20" image_name="icon_diurnal.tga"
-                             left="30" name="SkyDayCycle" width="148" />
-                        <slider bottom_delta="-30" can_edit_text="false" control_name="WLSunAngle"
-                             decimal_digits="3" follows="left" height="10" increment="0.001"
-                             initial_val="0.7" label="" left="24" max_val="1" min_val="0"
-                             mouse_opaque="true" name="WLSunAngle" show_text="true" value="1.0"
-                             width="204" />
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-20" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerif" h_pad="0" halign="left" height="16"
-                             left="245" mouse_opaque="true" name="WLAmbientText" v_pad="0" width="355">
-                                Ambient
-                        </text>
-                        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="15" label="?"
-                             left="395" name="WLAmbientHelp" width="18" />
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-37" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
-                             left="245" mouse_opaque="true" name="BHText5" v_pad="0" width="10">
-                                R
-                        </text>
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
-                             left_delta="0" mouse_opaque="true" name="BHText6" v_pad="0" width="10">
-                                G
-                        </text>
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
-                             left_delta="0" mouse_opaque="true" name="BHText7" v_pad="0" width="10">
-                                B
-                        </text>
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
-                             left_delta="0" mouse_opaque="true" name="BHText8" v_pad="0" width="10">
-                                I
-                        </text>
-                        <slider bottom="-50" can_edit_text="false" control_name="WLAmbientR" decimal_digits="2"
-                             follows="left" height="10" increment="0.01" initial_val="0.7" label=""
-                             left="259" max_val="1" min_val="0" mouse_opaque="true" name="WLAmbientR"
-                             show_text="true" value="1.0" width="200" />
-                        <slider bottom_delta="-11" can_edit_text="false" control_name="WLAmbientG"
-                             decimal_digits="2" follows="left" height="10" increment="0.01"
-                             initial_val="0.7" label="" left="259" max_val="1" min_val="0"
-                             mouse_opaque="true" name="WLAmbientG" show_text="true" value="1.0"
-                             width="200" />
-                        <slider bottom_delta="-11" can_edit_text="false" control_name="WLAmbientB"
-                             decimal_digits="2" follows="left" height="10" increment="0.01"
-                             initial_val="0.7" label="" left="259" max_val="1" min_val="0"
-                             mouse_opaque="true" name="WLAmbientB" show_text="true" value="1.0"
-                             width="200" />
-                        <slider bottom_delta="-11" can_edit_text="false" control_name="WLAmbientI"
-                             decimal_digits="2" follows="left" height="10" increment="0.01"
-                             initial_val="1" label="" left="259" max_val="1" min_val="0"
-                             mouse_opaque="true" name="WLAmbientI" show_text="true" value="1.0"
-                             width="200" />
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-87" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerif" h_pad="0" halign="left" height="16"
-                             left="245" mouse_opaque="true" name="WLEastAngleText" v_pad="0" width="355">
-                                East Angle
-                        </text>
-                        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="15" label="?"
-                             left="395" name="WLEastAngleHelp" width="18" />
-                        <slider bottom_delta="-30" can_edit_text="false" control_name="WLEastAngle"
-                             decimal_digits="2" follows="left" height="10" increment="0.01"
-                             initial_val="0.0" label="" left="259" max_val="1" min_val="0"
-                             mouse_opaque="true" name="WLEastAngle" show_text="true" value="1.0"
-                             width="200" />
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-20" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerif" h_pad="0" halign="left" height="16"
-                             left="480" mouse_opaque="true" name="SunGlowText" v_pad="0" width="355">
-                                Sun Glow
-                        </text>
-                        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="15" label="?"
-                             left="630" name="WLSunGlowHelp" width="18" />
-                        <slider bottom_delta="-30" can_edit_text="false" control_name="WLGlowB"
-                             decimal_digits="2" follows="left" height="10" increment="0.01"
-                             initial_val="0.1" label="Focus " left="494" max_val="0.5" min_val="0"
-                             mouse_opaque="true" name="WLGlowB" show_text="true" value="1.0" width="200" />
-                        <slider bottom_delta="-11" can_edit_text="false" control_name="WLGlowR"
-                             decimal_digits="2" follows="left" height="10" increment="0.01"
-                             initial_val="0.25" label="Size    " left="494" max_val="1.99" min_val="1"
-                             mouse_opaque="true" name="WLGlowR" show_text="true" value="1.0" width="200" />
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-67" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerif" h_pad="0" halign="left" height="16"
-                             left="480" mouse_opaque="true" name="SceneGammaText" v_pad="0" width="200">
-                                Scene Gamma
-                        </text>
-                        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="15" label="?"
-                             left="630" name="WLSceneGammaHelp" width="18" />
-                        <slider bottom_delta="-30" can_edit_text="false" control_name="WLGamma"
-                             decimal_digits="2" follows="bottom" height="10" increment="0.01"
-                             initial_val="2.0" label="" left="494" max_val="10.0" min_val="0"
-                             mouse_opaque="true" name="WLGamma" show_text="true" value="2.0" width="207" />
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-102" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerif" h_pad="0" halign="left" height="16"
-                             left="480" mouse_opaque="true" name="WLStarText" v_pad="0" width="355">
-                                Star Brightness
-                        </text>
-                        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="15" label="?"
-                             left="630" name="WLStarBrightnessHelp" width="18" />
-                        <slider bottom_delta="-30" can_edit_text="false" control_name="WLStarAlpha"
-                             decimal_digits="2" follows="bottom" height="10" increment="0.01"
-                             initial_val="0" label="" left="494" max_val="2" min_val="0"
-                             mouse_opaque="true" name="WLStarAlpha" show_text="true" value="0"
-                             width="200" />
-                </panel>
-                <panel border="true" bottom="-180" follows="left|top|right|bottom" height="160"
-                     label="Clouds" left="1" mouse_opaque="false" name="Clouds"
-                     width="698">
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-20" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerif" h_pad="0" halign="left" height="16"
-                             left="10" mouse_opaque="true" name="WLCloudColorText" v_pad="0" width="355">
-                                Cloud Color
-                        </text>
-                        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="15" label="?"
-                             left="160" name="WLCloudColorHelp" width="18" />
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-37" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
-                             left="10" mouse_opaque="true" name="BHText" v_pad="0" width="10">
-                                R
-                        </text>
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
-                             left_delta="0" mouse_opaque="true" name="BHText2" v_pad="0" width="10">
-                                G
-                        </text>
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
-                             left_delta="0" mouse_opaque="true" name="BHText3" v_pad="0" width="10">
-                                B
-                        </text>
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
-                             left_delta="0" mouse_opaque="true" name="BHText4" v_pad="0" width="10">
-                                I
-                        </text>
-                        <slider bottom="-50" can_edit_text="false" control_name="WLCloudColorR"
-                             decimal_digits="2" follows="left" height="10" increment="0.01"
-                             initial_val="0.7" label="" left="24" max_val="1" min_val="0"
-                             mouse_opaque="true" name="WLCloudColorR" show_text="true" value="0.7"
-                             width="200" />
-                        <slider bottom_delta="-11" can_edit_text="false" control_name="WLCloudColorG"
-                             decimal_digits="2" follows="left" height="10" increment="0.01"
-                             initial_val="0.7" label="" left="24" max_val="1" min_val="0"
-                             mouse_opaque="true" name="WLCloudColorG" show_text="true" value="0.7"
-                             width="200" />
-                        <slider bottom_delta="-11" can_edit_text="false" control_name="WLCloudColorB"
-                             decimal_digits="2" follows="left" height="10" increment="0.01"
-                             initial_val="0.7" label="" left="24" max_val="1" min_val="0"
-                             mouse_opaque="true" name="WLCloudColorB" show_text="true" value="0.7"
-                             width="200" />
-                        <slider bottom_delta="-11" can_edit_text="false" control_name="WLCloudColorI"
-                             decimal_digits="2" follows="left" height="10" increment="0.01"
-                             initial_val="1.0" label="" left="24" max_val="1" min_val="0"
-                             mouse_opaque="true" name="WLCloudColorI" show_text="true" value="1.0"
-                             width="200" />
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-87" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerif" h_pad="0" halign="left" height="16"
-                             left="10" mouse_opaque="true" name="WLCloudColorText2" v_pad="0"
-                             width="355">
-                                Cloud XY/Density
-                        </text>
-                        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="15" label="?"
-                             left="160" name="WLCloudDensityHelp" width="18" />
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-103" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
-                             left="10" mouse_opaque="true" name="BHText5" v_pad="0" width="10">
-                                X
-                        </text>
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
-                             left_delta="0" mouse_opaque="true" name="BHText6" v_pad="0" width="10">
-                                Y
-                        </text>
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
-                             left_delta="0" mouse_opaque="true" name="BHText7" v_pad="0" width="10">
-                                D
-                        </text>
-                        <slider bottom="-117" can_edit_text="false" control_name="WLCloudX" decimal_digits="2"
-                             follows="left" height="10" increment="0.01" initial_val="0.5" label=""
-                             left="24" max_val="1" min_val="0" mouse_opaque="true" name="WLCloudX"
-                             show_text="true" value="0.5" width="200" />
-                        <slider bottom_delta="-11" can_edit_text="false" control_name="WLCloudY"
-                             decimal_digits="2" follows="left" height="10" increment="0.01"
-                             initial_val="0.5" label="" left="24" max_val="1" min_val="0"
-                             mouse_opaque="true" name="WLCloudY" show_text="true" value="0.5"
-                             width="200" />
-                        <slider bottom_delta="-11" can_edit_text="false" control_name="WLCloudDensity"
-                             decimal_digits="2" follows="left" height="10" increment="0.01"
-                             initial_val="1.0" label="" left="24" max_val="1" min_val="0"
-                             mouse_opaque="true" name="WLCloudDensity" show_text="true" value="1.0"
-                             width="200" />
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-20" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerif" h_pad="0" halign="left" height="16"
-                             left="245" mouse_opaque="true" name="WLCloudCoverageText" v_pad="0"
-                             width="355">
-                                Cloud Coverage
-                        </text>
-                        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="15" label="?"
-                             left="395" name="WLCloudCoverageHelp" width="18" />
-                        <slider bottom_delta="-30" can_edit_text="false" control_name="WLCloudCoverage"
-                             decimal_digits="2" follows="left" height="10" increment="0.01"
-                             initial_val="0.5" label="" left="259" max_val="1" min_val="0"
-                             mouse_opaque="true" name="WLCloudCoverage" show_text="true" value="0.0"
-                             width="200" />
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-55" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerif" h_pad="0" halign="left" height="16"
-                             left="245" mouse_opaque="true" name="WLCloudScaleText" v_pad="0"
-                             width="355">
-                                Cloud Scale
-                        </text>
-                        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="15" label="?"
-                             left="395" name="WLCloudScaleHelp" width="18" />
-                        <slider bottom_delta="-30" can_edit_text="false" control_name="WLCloudScale"
-                             decimal_digits="2" follows="left" height="10" increment="0.01"
-                             initial_val="1.0" label="" left="259" max_val="1.0" min_val="0.01"
-                             mouse_opaque="true" name="WLCloudScale" show_text="true" value="1.0"
-                             width="200" />
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-87" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerif" h_pad="0" halign="left" height="16"
-                             left="245" mouse_opaque="true" name="WLCloudDetailText" v_pad="0"
-                             width="355">
-                                Cloud Detail (XY/Density)
-                        </text>
-                        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="15" label="?"
-                             left="395" name="WLCloudDetailHelp" width="18" />
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-103" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
-                             left="245" mouse_opaque="true" name="BHText8" v_pad="0" width="10">
-                                X
-                        </text>
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
-                             left_delta="0" mouse_opaque="true" name="BHText9" v_pad="0" width="10">
-                                Y
-                        </text>
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
-                             left_delta="0" mouse_opaque="true" name="BHText10" v_pad="0" width="10">
-                                D
-                        </text>
-                        <slider bottom="-117" can_edit_text="false" control_name="WLCloudDetailX"
-                             decimal_digits="2" follows="left" height="10" increment="0.01"
-                             initial_val="0.5" label="" left="259" max_val="1" min_val="0"
-                             mouse_opaque="true" name="WLCloudDetailX" show_text="true" value="0.5"
-                             width="200" />
-                        <slider bottom_delta="-11" can_edit_text="false" control_name="WLCloudDetailY"
-                             decimal_digits="2" follows="left" height="10" increment="0.01"
-                             initial_val="0.5" label="" left="259" max_val="1" min_val="0"
-                             mouse_opaque="true" name="WLCloudDetailY" show_text="true" value="0.5"
-                             width="200" />
-                        <slider bottom_delta="-11" can_edit_text="false" control_name="WLCloudDetailDensity"
-                             decimal_digits="2" follows="left" height="10" increment="0.01"
-                             initial_val="1.0" label="" left="259" max_val="1" min_val="0"
-                             mouse_opaque="true" name="WLCloudDetailDensity" show_text="true"
-                             value="1.0" width="200" />
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-20" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerif" h_pad="0" halign="left" height="16"
-                             left="480" mouse_opaque="true" name="WLCloudScrollXText" v_pad="0"
-                             width="355">
-                                Cloud Scroll X
-                        </text>
-                        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="15" label="?"
-                             left="605" name="WLCloudScrollXHelp" width="18" />
-                        <check_box control_name="WLCloudLockX" follows="left" font="SansSerifSmall" height="16"
-                             initial_value="false" label="Lock" left="625" mouse_opaque="true"
-                             name="WLCloudLockX" width="200" />
-                        <slider bottom_delta="-15" can_edit_text="false" control_name="WLCloudScrollX"
-                             decimal_digits="2" follows="left" height="10" increment="0.01"
-                             initial_val="0.5" label="" left="494" max_val="10" min_val="-10"
-                             mouse_opaque="true" name="WLCloudScrollX" show_text="true" value="0.0"
-                             width="200" />
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-60" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerif" h_pad="0" halign="left" height="16"
-                             left="480" mouse_opaque="true" name="WLCloudScrollYText" v_pad="0"
-                             width="355">
-                                Cloud Scroll Y
-                        </text>
-                        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="15" label="?"
-                             left="605" name="WLCloudScrollYHelp" width="18" />
-                        <check_box control_name="WLCloudLockY" follows="left" font="SansSerifSmall" height="16"
-                             initial_value="false" label="Lock" left="625" mouse_opaque="true"
-                             name="WLCloudLockY" width="200" />
-                        <slider bottom_delta="-15" can_edit_text="false" control_name="WLCloudScrollY"
-                             decimal_digits="2" follows="left" height="10" increment="0.01"
-                             initial_val="0.5" label="" left="494" max_val="10" min_val="-10"
-                             mouse_opaque="true" name="WLCloudScrollY" show_text="true" value="0.0"
-                             width="200" />
-                        <check_box bottom="-120" control_name="DrawClassicClouds" follows="left"
-                             font="SansSerifSmall" height="16" initial_value="false"
-                             label="Draw Classic Clouds" left="480" mouse_opaque="true"
-                             name="DrawClassicClouds" width="200" />
-                        <button bottom="-102" follows="left|top" font="SansSerifSmall" height="15" label="?"
-                             left="608" name="WLClassicCloudsHelp" width="18" />
-                </panel>
-        </tab_container>
-        <string name="WLDefaultSkyNames">
-                A-12AM:A-12PM:A-3AM:A-3PM:A-4.30PM:A-6AM:A-6PM:A-9AM:A-9PM:Barcelona:Blizzard:Blue Midday:Coastal Afternoon:Coastal Sunset:Default:Desert Sunset:Fine Day:Fluffy Big Clouds:Foggy:Funky Funky:Funky Funky Funky:Gelatto:Ghost:Incongruent Truths:Midday 1:Midday 2:Midday 3:Midday 4:Night:Pirate:Purple:Sailor&apos;s Delight:Sheer Sensuality
-        </string>
-</floater>
diff --git a/linden/indra/newview/skins/silver/xui/en-us/panel_status_bar.xml b/linden/indra/newview/skins/silver/xui/en-us/panel_status_bar.xml
deleted file mode 100644
index cef04fd..0000000
--- a/linden/indra/newview/skins/silver/xui/en-us/panel_status_bar.xml
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel background_opaque="true" background_visible="true"
-     bg_opaque_color="0.25 0.25 0.25 1.0" bottom="0" enabled="true"
-     follows="top|left|right" height="18" left="0" mouse_opaque="false"
-     name="status" width="1000">
-        <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|right|bottom" font="SansSerifSmall" h_pad="0" halign="left"
-             height="18" hover="true" left="561" mouse_opaque="true"
-             name="ParcelNameText" text_color="ParcelTextColor" hover_color="ParcelHoverColor"
-             tool_tip="Name of land parcel on which you are standing. Click for About Land."
-             v_pad="2" width="1039">
-                parcel name goes here
-        </text>
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-20" disabled_color="BalanceTextColor" drop_shadow_visible="true"
-             enabled="true" follows="right|bottom" font="SansSerifSmall" h_pad="0"
-             halign="right" height="18" left="-210" mouse_opaque="true"
-             name="BalanceText" text_color="BalanceTextColor" tool_tip="Account Balance"
-             v_pad="2" width="76">
-                Loading...
-        </text>
-        <button bottom="-17" enabled="true" follows="right|bottom" font="SansSerif"
-             halign="center" height="16"
-             image_selected="status_buy_currency_pressed.tga"
-             image_unselected="status_buy_currency.tga" label="" label_selected=""
-             left="-210" mouse_opaque="true" name="buycurrency" scale_image="true"
-             tool_tip="Buy currency" width="16" />
-        <text type="string" length="12" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-20" disabled_color="TimeTextColor" drop_shadow_visible="true"
-             enabled="true" follows="right|bottom" font="SansSerifSmall" h_pad="0"
-             halign="right" height="18" left="-300" mouse_opaque="true" name="TimeText"
-             text_color="TimeTextColor" tool_tip="Current Time (Pacific)" v_pad="2" width="80">
-                12:00 AM
-        </text>
-        <string name="StatBarDaysOfWeek">
-                Sunday:Monday:Tuesday:Wednesday:Thursday:Friday:Saturday
-        </string>
-        <string name="StatBarMonthsOfYear">
-                January:February:March:April:May:June:July:August:September:October:November:December
-        </string>
-        <button bottom="-18" enabled="true" follows="right|bottom" font="SansSerif"
-             halign="center" height="16" image_selected="status_script_debug.tga"
-             image_unselected="status_script_debug.tga" label="" label_selected=""
-             left="378" mouse_opaque="true" name="scriptout" scale_image="false"
-             tool_tip="Script Warnings and Errors" visible="false" width="16" />
-        <button bottom="-22" enabled="true" follows="right|bottom" font="SansSerif"
-             halign="center" height="18" image_selected="status_health.tga"
-             image_unselected="status_health.tga" label="" label_selected="" left="394"
-             mouse_opaque="true" name="health" scale_image="false" tool_tip="Health"
-             visible="false" width="24" />
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-18" disabled_color="HealthTextColor" drop_shadow_visible="true"
-             enabled="true" follows="rsight|bottom" font="SansSerifSmall" h_pad="0"
-             halign="left" height="18" left="418" mouse_opaque="true" name="HealthText"
-             text_color="HealthTextColor" tool_tip="Health" v_pad="2" visible="false" width="31">
-                100%
-        </text>
-        <button bottom="-22" enabled="true" follows="right|bottom" font="SansSerif"
-             halign="center" height="18" image_selected="status_no_fly.tga"
-             image_unselected="status_no_fly.tga" label="" label_selected="" left="449"
-             mouse_opaque="true" name="no_fly" scale_image="false"
-             tool_tip="Flying not allowed" visible="false" width="24" />
-        <button bottom="-22" enabled="true" follows="right|bottom" font="SansSerif"
-             halign="center" height="18" image_selected="status_no_build.tga"
-             image_unselected="status_no_build.tga" label="" label_selected=""
-             left="473" name="no_build" scale_image="false"
-             tool_tip="Building/Rezzing not allowed" visible="false" width="24" />
-        <button bottom="-22" enabled="true" follows="right|bottom" font="SansSerif"
-             halign="center" height="18" image_selected="status_no_scripts.tga"
-             image_unselected="status_no_scripts.tga" label="" label_selected=""
-             left="497" mouse_opaque="true" name="no_scripts" scale_image="false"
-             tool_tip="Scripts not allowed" visible="false" width="24" />
-        <button bottom="-22" enabled="true" follows="right|bottom" font="SansSerif"
-             halign="center" height="18" image_selected="status_no_push.tga"
-             image_unselected="status_no_push.tga" label="" label_selected="" left="521"
-             mouse_opaque="true" name="restrictpush" scale_image="false"
-             tool_tip="No Pushing" visible="false" width="24" />
-        <button bottom="-22" enabled="true" follows="right|bottom" font="SansSerif"
-             halign="center" height="18" image_selected="status_no_voice.tga"
-             image_unselected="status_no_voice.tga" label="" label_selected=""
-             left="545" mouse_opaque="true" name="status_no_voice" scale_image="false"
-             tool_tip="Voice not available here" visible="false" width="24" />
-        <button bottom="-17" enabled="true" follows="right|bottom" font="SansSerif"
-             halign="center" height="16" image_selected="status_buy_land_pressed.tga"
-             image_unselected="status_buy_land.tga" label="" label_selected=""
-             left="576" mouse_opaque="true" name="buyland" scale_image="true"
-             tool_tip="Buy this parcel" visible="false" width="16" />
-
-  <!-- Totally unsexy button hack to get a sexy bevel for sexy search bevel -brent -->
-  <button bottom="-17" height="16" left="-97" width="96" 
-          image_unselected="sm_rounded_corners_simple.tga"
-          image_selected="sm_rounded_corners_simple.tga"
-          image_hover_selected="sm_rounded_corners_simple.tga"
-          image_hover_unselected="sm_rounded_corners_simple.tga"
-          image_disabled_selected="sm_rounded_corners_simple.tga"
-          image_disabled="sm_rounded_corners_simple.tga"
-          label="" scale_image="true" enabled="true" mouse_opaque="false" name="menubar_search_bevel_bg" />
-
-  <line_editor bevel_style="none" border_style="line" border_thickness="0" bottom="-16"
-             commit_on_focus_lost="false" enabled="true" follows="right|bottom"
-             font="SansSerifSmall" handle_edit_keys_directly="false" height="13"
-             label="Search" left="-95" max_length="254" mouse_opaque="true"
-             name="search_editor" select_all_on_focus_received="false"
-             select_on_focus="false" tab_group="1" tool_tip="Search Second Life"
-             width="80" />
-        <button bottom="-16" enabled="true" follows="right|bottom" font="SansSerifSmall"
-             halign="center" height="12" image_disabled="status_search.tga"
-             image_disabled_selected="status_search.tga"
-             image_selected="status_search.tga" image_unselected="status_search.tga"
-             label="" label_selected="" left="-16" mouse_opaque="true" name="search_btn"
-             tool_tip="Search Second Life" width="12" scale_image="true"/>
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-16" enabled="false" follows="right|bottom" font="SansSerifSmall"
-             halign="center" height="12" left="-20" mouse_opaque="true"
-             name="stat_btn" width="20" />
-        <string name="packet_loss_tooltip">
-                Packet Loss
-        </string>
-        <string name="bandwidth_tooltip">
-                Bandwidth
-        </string>
-</panel>
diff --git a/linden/indra/newview/skins/silver/xui/en-us/panel_voice_controls.xml b/linden/indra/newview/skins/silver/xui/en-us/panel_voice_controls.xml
deleted file mode 100644
index 423564f..0000000
--- a/linden/indra/newview/skins/silver/xui/en-us/panel_voice_controls.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel bg_visible="false" border="false" border_visible="false" bottom="2"
-     enabled="true" follows="right|bottom" height="20" left="0"
-     mouse_opaque="true" name="voice_controls" width="130">
-        <button bottom="-21" height="20" image_overlay="active_speakers.tga" label="" left="3"
-             name="speakers_btn"
-             tool_tip="Show list of residents using voice chat around you" width="36" />
-        <button bottom="-21" height="20" label="Talk" left_delta="38" name="push_to_talk"
-             tab_stop="false" tool_tip="Hold the button to talk" width="63" />
-        <button bottom="-19" height="16" image_selected="ptt_lock_on.tga"
-             image_unselected="ptt_lock_off.tga" label="" left_delta="2" name="ptt_lock"
-             scale_image="false" toggle="true"
-             tool_tip="Click lock to switch to talk mode" width="16" />
-        <icon bottom="-19" height="16" image_name="icn_voice_ptt-off.tga" left_delta="42"
-             name="voice_volume" width="16" />
-        <button bottom="-21" control_name="ShowVoiceChannelPopup" height="20" label=""
-             left_delta="21" name="show_channel" scale_image="true" toggle="true"
-             tool_tip="Click to show current voice channel" width="20" />
-</panel>
diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py
index 8510dc4..d7acfea 100755
--- a/linden/indra/newview/viewer_manifest.py
+++ b/linden/indra/newview/viewer_manifest.py
@@ -30,6 +30,13 @@
 # WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
 # COMPLETENESS OR PERFORMANCE.
 # $/LicenseInfo$
+
+# DO NOT RUN THIS FILE DIRECTLY
+# Instead, run develop.py with "configure -DPACKAGE:BOOL=ON" e.g.:
+#   develop.py -G vc80 configure -DPACKAGE:BOOL=ON
+# to generate the "package" project in Visual Studio 2005
+# Note: as of Imprudence 1.3, this defaults to on for Windows
+
 import sys
 import os.path
 import re
@@ -68,37 +75,33 @@ class ViewerManifest(LLManifest):
 
         # Include our fonts
         if self.prefix(src="fonts"):
-            self.path("LiberationSans-Bold.ttf")
-            self.path("LiberationSans-Regular.ttf")
-            self.path("VeraMono.ttf")
+            self.path("*.ttf")
             self.path("*.txt")
             self.end_prefix("fonts")
 
         # skins
         if self.prefix(src="skins"):
-            self.path("paths.xml")
-            
-            # include the entire textures directory recursively
-            if self.prefix(src="*/textures"):
-                self.path("*.tga")
-                self.path("*.j2c")
-                self.path("*.jpg")
-                self.path("*.png")
-                self.path("textures.xml")
-                self.end_prefix("*/textures")
-
-            self.path("*/xui/*/*.xml")
-            self.path("*/*.xml")
-
-            # Local HTML files (e.g. loading screen)
-            if self.prefix(src="*/html"):
-                self.path("*.png")
-                self.path("*/*/*.html")
-                self.path("*/*/*.gif")
-                self.end_prefix("*/html")
+                self.path("paths.xml")
+                # include the entire textures directory recursively
+                if self.prefix(src="*/textures"):
+                        self.path("*.tga")
+                        self.path("*.j2c")
+                        self.path("*.jpg")
+                        self.path("*.png")
+                        self.path("textures.xml")
+                        self.end_prefix("*/textures")
+                self.path("*/xui/*/*.xml")
+                self.path("*/*.xml")
                 
-            self.end_prefix("skins")
-            
+                # Local HTML files (e.g. loading screen)
+                if self.prefix(src="*/html"):
+                        self.path("*.png")
+                        self.path("*/*/*.html")
+                        self.path("*/*/*.gif")
+                        self.end_prefix("*/html")
+                self.end_prefix("skins")
+        
+        # Files in the newview/ directory
         self.path("gpu_table.txt")
 
 
@@ -140,7 +143,7 @@ class ViewerManifest(LLManifest):
     def channel(self):
         return self.args['channel']
     def channel_unique(self):
-        return self.channel().replace("Second Life", "").strip()
+        return self.channel().replace("Imprudence", "").strip()
     def channel_oneword(self):
         return "".join(self.channel_unique().split())
     def channel_lowerword(self):
@@ -236,16 +239,16 @@ class WindowsManifest(ViewerManifest):
             self.end_prefix()
 
         # The config file name needs to match the exe's name.
-        self.path(src="%s/secondlife-bin.exe.config" % self.args['configuration'], dst=self.final_exe() + ".config")
+        self.path(src="%s/imprudence-bin.exe.config" % self.args['configuration'], dst=self.final_exe() + ".config")
 
         # We need this one too, so that llkdu loads at runtime - DEV-41194
-        self.path(src="%s/secondlife-bin.exe.config" % self.args['configuration'], dst="llkdu.dll.2.config")
+        self.path(src="%s/imprudence-bin.exe.config" % self.args['configuration'], dst="llkdu.dll.2.config")
 
         # We need this one too, so that win_crash_logger.exe loads at runtime - DEV-19004
-        self.path(src="%s/secondlife-bin.exe.config" % self.args['configuration'], dst="win_crash_logger.exe.config")
+        self.path(src="%s/imprudence-bin.exe.config" % self.args['configuration'], dst="win_crash_logger.exe.config")
 
         # same thing for auto-updater.
-        self.path(src="%s/secondlife-bin.exe.config" % self.args['configuration'], dst="updater.exe.config")
+        self.path(src="%s/imprudence-bin.exe.config" % self.args['configuration'], dst="updater.exe.config")
 
         # Mozilla runtime DLLs (CP)
         if self.prefix(src="../../libraries/i686-win32/lib/release", dst=""):
@@ -276,9 +279,9 @@ class WindowsManifest(ViewerManifest):
         # Mozilla hack to get it to accept newer versions of msvc*80.dll than are listed in manifest
         # necessary as llmozlib2-vc80.lib refers to an old version of msvc*80.dll - can be removed when new version of llmozlib is built - Nyx
         # Vivox runtimes
-        if self.prefix(src="vivox-runtime/i686-win32", dst=""):
+        #if self.prefix(src="vivox-runtime/i686-win32", dst=""):
         #    self.path("alut.dll")
-            self.path("wrap_oal.dll")
+        #    self.path("wrap_oal.dll")
 
         #    self.path("SLVoice.exe")
         #    self.path("SLVoiceAgent.exe")
@@ -289,8 +292,65 @@ class WindowsManifest(ViewerManifest):
         #    self.path("vivoxsdk.dll")
         #    self.path("ortp.dll")
 
+        #    self.end_prefix()
+
+        # Gstreamer plugins
+        if self.prefix(src="lib/gstreamer-plugins", dst=""):
+            self.path("*.dll", dst="lib/gstreamer-plugins/*.dll")
             self.end_prefix()
 
+        # Gstreamer libs
+        if self.prefix(src="../../libraries/i686-win32/lib/release", dst=""):
+            self.path("iconv.dll")
+            self.path("libxml2.dll")
+            self.path("libcairo-2.dll")
+            self.path("libgio-2.0-0.dll")
+            self.path("libglib-2.0-0.dll")
+            self.path("libgmodule-2.0-0.dll")
+            self.path("libgobject-2.0-0.dll")
+            self.path("libgthread-2.0-0.dll")
+            self.path("charset.dll")
+            self.path("intl.dll")
+            self.path("libgcrypt-11.dll")
+            self.path("libgnutls-26.dll")
+            self.path("libgpg-error-0.dll")
+            self.path("libgstapp.dll")
+            self.path("libgstaudio.dll")
+            self.path("libgstbase-0.10.dll")
+            self.path("libgstcdda.dll")
+            self.path("libgstcontroller-0.10.dll")
+            self.path("libgstdataprotocol-0.10.dll")
+            self.path("libgstdshow.dll")
+            self.path("libgstfft.dll")
+            self.path("libgstinterfaces.dll")
+            self.path("libgstnet-0.10.dll")
+            self.path("libgstnetbuffer.dll")
+            self.path("libgstpbutils.dll")
+            self.path("libgstreamer-0.10.dll")
+            self.path("libgstriff.dll")
+            self.path("libgstrtp.dll")
+            self.path("libgstrtsp.dll")
+            self.path("libgstsdp.dll")
+            self.path("libgsttag.dll")
+            self.path("libgstvideo.dll")
+            self.path("libjpeg.dll")
+            self.path("libmp3lame-0.dll")
+            self.path("libneon-27.dll")
+            self.path("libogg-0.dll")
+            self.path("liboil-0.3-0.dll")
+            self.path("libopenjpeg-2.dll")
+            self.path("libpng12-0.dll")
+            self.path("libschroedinger-1.0-0.dll")
+            self.path("libspeex-1.dll")
+            self.path("libtheora-0.dll")
+            self.path("libvorbis-0.dll")
+            self.path("libvorbisenc-2.dll")
+            self.path("libxml2-2.dll")
+            self.path("glew32.dll")
+            self.path("xvidcore.dll")
+            self.path("zlib1.dll")
+            self.end_prefix()            
+
 #        # pull in the crash logger and updater from other projects
 #        self.path(src=self.find_existing_file( # tag:"crash-logger" here as a cue to the exporter
 #                "../win_crash_logger/debug/windows-crash-logger.exe",
@@ -355,9 +415,9 @@ class WindowsManifest(ViewerManifest):
     def package_finish(self):
         # a standard map of strings for replacing in the templates
         substitution_strings = {
-            'version' : '.'.join(self.args['version']),
-            'version_short' : '.'.join(self.args['version'][:-1]),
-            'version_dashes' : '-'.join(self.args['version']),
+            'version' : '.'.join(self.args['version']).replace(' ', '_'),
+            'version_short' : '.'.join(self.args['version'][:-1]).replace(' ', '_'),
+            'version_dashes' : '-'.join(self.args['version']).replace(' ', '_'),
             'final_exe' : self.final_exe(),
             'grid':self.args['grid'],
             'grid_caps':self.args['grid'].upper(),