1331 files changed, 9013 insertions, 8308 deletions

diff --git a/linden/doc/contributions.txt b/linden/doc/contributions.txt
index 12bf2b7..da98604 100644
--- a/linden/doc/contributions.txt
+++ b/linden/doc/contributions.txt
@@ -195,6 +195,7 @@ Matthew Dowd
         VWR-1761
 McCabe Maxsted
         VWR-1318
+        VWR-7893
 Michelle2 Zenovka
         VWR-2652
         VWR-2834
diff --git a/linden/indra/llcommon/llversionviewer.h b/linden/indra/llcommon/llversionviewer.h
index df9c5cb..c93718a 100644
--- a/linden/indra/llcommon/llversionviewer.h
+++ b/linden/indra/llcommon/llversionviewer.h
@@ -34,7 +34,7 @@
 
 const S32 LL_VERSION_MAJOR = 1;
 const S32 LL_VERSION_MINOR = 20;
-const S32 LL_VERSION_PATCH = 12;
+const S32 LL_VERSION_PATCH = 13;
 const S32 LL_VERSION_BUILD = 0;
 
 const char * const LL_CHANNEL = "Second Life Release";
diff --git a/linden/indra/llimage/llimage.cpp b/linden/indra/llimage/llimage.cpp
index 508be01..52a210f 100644
--- a/linden/indra/llimage/llimage.cpp
+++ b/linden/indra/llimage/llimage.cpp
@@ -147,7 +147,6 @@ U8* LLImageBase::allocateData(S32 size)
                 mData = new U8[size];
                 if (!mData)
                 {
-                        //llerrs << "allocate image data: " << size << llendl;
                         llwarns << "allocate image data: " << size << llendl;
                         size = 0 ;
                         mWidth = mHeight = 0 ;
@@ -245,8 +244,10 @@ LLImageRaw::LLImageRaw(U8 *data, U16 width, U16 height, S8 components)
         : LLImageBase()
 {
         mMemType = LLMemType::MTYPE_IMAGERAW;
-        allocateDataSize(width, height, components);
-        memcpy(getData(), data, width*height*components);
+        if(allocateDataSize(width, height, components))
+        {
+                memcpy(getData(), data, width*height*components);
+        }
         ++sRawImageCount;
 }
 
@@ -797,7 +798,7 @@ void LLImageRaw::copyScaled( LLImageRaw* src )
 }
 
 
-void LLImageRaw::scale( S32 new_width, S32 new_height, BOOL scale_image_data )
+BOOL LLImageRaw::scale( S32 new_width, S32 new_height, BOOL scale_image_data )
 {
         LLMemType mt1((LLMemType::EMemType)mMemType);
         llassert((1 == getComponents()) || (3 == getComponents()) || (4 == getComponents()) );
@@ -807,7 +808,7 @@ void LLImageRaw::scale( S32 new_width, S32 new_height, BOOL scale_image_data )
         
         if( (old_width == new_width) && (old_height == new_height) )
         {
-                return;  // Nothing to do.
+                return TRUE;  // Nothing to do.
         }
 
         // Reallocate the data buffer.
@@ -842,8 +843,10 @@ void LLImageRaw::scale( S32 new_width, S32 new_height, BOOL scale_image_data )
                 U8*     temp_buffer     = new U8[ temp_data_size ];
                 if (!temp_buffer)
                 {
-                        llerrs << "Out of memory in LLImageRaw::scale: old (w, h, c) = (" << old_width << ", " << old_height << ", " << (S32)getComponents() << 
+                        llwarns << "Out of memory in LLImageRaw::scale: old (w, h, c) = (" << old_width << ", " << old_height << ", " << (S32)getComponents() << 
                                 ") ; new (w, h, c) = (" << new_width << ", " << new_height << ", " << (S32)getComponents() << ")" << llendl;                    
+
+                        return FALSE ;
                 }
                 memcpy(temp_buffer,     getData(), temp_data_size);     /* Flawfinder: ignore */
 
@@ -871,6 +874,8 @@ void LLImageRaw::scale( S32 new_width, S32 new_height, BOOL scale_image_data )
                 // Clean up
                 delete[] temp_buffer;
         }
+
+        return TRUE ;
 }
 
 void LLImageRaw::copyLineScaled( U8* in, U8* out, S32 in_pixel_len, S32 out_pixel_len, S32 in_pixel_step, S32 out_pixel_step )
diff --git a/linden/indra/llimage/llimage.h b/linden/indra/llimage/llimage.h
index 0393d13..0d97595 100644
--- a/linden/indra/llimage/llimage.h
+++ b/linden/indra/llimage/llimage.h
@@ -176,7 +176,7 @@ public:
         void expandToPowerOfTwo(S32 max_dim = MAX_IMAGE_SIZE, BOOL scale_image = TRUE);
         void contractToPowerOfTwo(S32 max_dim = MAX_IMAGE_SIZE, BOOL scale_image = TRUE);
         void biasedScaleToPowerOfTwo(S32 max_dim = MAX_IMAGE_SIZE);
-        void scale( S32 new_width, S32 new_height, BOOL scale_image = TRUE );
+        BOOL scale( S32 new_width, S32 new_height, BOOL scale_image = TRUE );
 
         // Fill the buffer with a constant color
         void fill( const LLColor4U& color );
diff --git a/linden/indra/llimage/llimagebmp.cpp b/linden/indra/llimage/llimagebmp.cpp
index 5d74c3e..8764dff 100644
--- a/linden/indra/llimage/llimagebmp.cpp
+++ b/linden/indra/llimage/llimagebmp.cpp
@@ -552,7 +552,10 @@ BOOL LLImageBMP::encode(const LLImageRaw* raw_image, F32 encode_time)
         int file_bytes = line_bytes*getHeight() + header_bytes;
 
         // Allocate the new buffer for the data.
-        allocateData(file_bytes);
+        if(!allocateData(file_bytes)) //memory allocation failed
+        {
+                return FALSE ;
+        }
 
         magic[0] = 'B'; magic[1] = 'M';
         magic[2] = (U8) file_bytes;
diff --git a/linden/indra/llmedia/llmediaimplllmozlib.cpp b/linden/indra/llmedia/llmediaimplllmozlib.cpp
index 9e2564a..b0d3eb5 100644
--- a/linden/indra/llmedia/llmediaimplllmozlib.cpp
+++ b/linden/indra/llmedia/llmediaimplllmozlib.cpp
@@ -103,9 +103,6 @@ bool LLMediaImplLLMozLib::startup( LLMediaManagerData* init_data )
                                                                                           init_data->getBrowserProfileDir(),
                                                                                                 init_data->getBrowserParentWindow() );
 
-        // append special string to the embedded browser user agent string
-        LLMozLib::getInstance()->setBrowserAgentId( init_data->getBrowserUserAgentId() );
-
 #if LL_LINUX
         setlocale(LC_ALL, saved_locale.c_str() );
 #endif // LL_LINUX
@@ -124,6 +121,15 @@ bool LLMediaImplLLMozLib::closedown()
 }
 
 ////////////////////////////////////////////////////////////////////////////////
+// (static)
+bool LLMediaImplLLMozLib::setBrowserUserAgent(std::string user_agent)
+{
+        // append special string to the embedded browser user agent string
+        LLMozLib::getInstance()->setBrowserAgentId(user_agent);
+        return true;
+}
+
+////////////////////////////////////////////////////////////////////////////////
 // virtual
 bool LLMediaImplLLMozLib::init()
 {
diff --git a/linden/indra/llmedia/llmediaimplllmozlib.h b/linden/indra/llmedia/llmediaimplllmozlib.h
index fc5d4e5..4f6b0b7 100644
--- a/linden/indra/llmedia/llmediaimplllmozlib.h
+++ b/linden/indra/llmedia/llmediaimplllmozlib.h
@@ -51,6 +51,12 @@ class LLMediaImplLLMozLib :
                 static bool startup( LLMediaManagerData* init_data );
                 static bool closedown();
 
+                // Update the user-agent string reported when the browser requests
+                // web page, because we need to include the Second Life version 
+                // and skin name (which can change without restarts).
+                // Must be called after startup().
+                static bool setBrowserUserAgent(std::string user_agent);
+
                 /* virtual */ bool init();
                 /* virtual */ std::string getVersion();
                 /* virtual */ bool set404RedirectUrl( std::string redirect_url );
diff --git a/linden/indra/llmedia/llmediamanager.cpp b/linden/indra/llmedia/llmediamanager.cpp
index c9b673d..8d637c0 100644
--- a/linden/indra/llmedia/llmediamanager.cpp
+++ b/linden/indra/llmedia/llmediamanager.cpp
@@ -134,6 +134,14 @@ LLMediaManager* LLMediaManager::getInstance()
 }
 
 ////////////////////////////////////////////////////////////////////////////////
+// (static)
+void LLMediaManager::setBrowserUserAgent(std::string user_agent)
+{
+        // *HACK: Breaks encapsulation model, as initClass does above. JC
+        LLMediaImplLLMozLib::setBrowserUserAgent(user_agent);
+}
+
+////////////////////////////////////////////////////////////////////////////////
 //
 LLMediaBase* LLMediaManager::createSourceFromMimeType( std::string scheme, std::string mime_type )
 {
diff --git a/linden/indra/llmedia/llmediamanager.h b/linden/indra/llmedia/llmediamanager.h
index 7a2c868..0dbcc4a 100644
--- a/linden/indra/llmedia/llmediamanager.h
+++ b/linden/indra/llmedia/llmediamanager.h
@@ -45,8 +45,7 @@ class LLMediaManagerData
                 LLMediaManagerData() :
                         mBrowserParentWindow( 0 ),
                         mBrowserProfileDir( "" ),
-                        mBrowserProfileName ( "" ),
-                        mBrowserUserAgentId( "" )
+                        mBrowserProfileName ( "" )
                 { };
 
                 void setBrowserApplicationDir( const std::string& browser_application_dir ) { mBrowserApplicationDir = browser_application_dir; };
@@ -64,16 +63,12 @@ class LLMediaManagerData
                 void setBrowserProfileName( const std::string& browser_profile_name ) { mBrowserProfileName = browser_profile_name; };
                 std::string& getBrowserProfileName() { return mBrowserProfileName; };
 
-                void setBrowserUserAgentId( const std::string& browser_user_agent_id ) { mBrowserUserAgentId = browser_user_agent_id; };
-                std::string& getBrowserUserAgentId() { return mBrowserUserAgentId; };
-
         private:
                 void* mBrowserParentWindow;
                 std::string mBrowserProfileDir;
                 std::string mBrowserProfileName;
                 std::string mBrowserApplicationDir;
                 std::string mBrowserComponentDir;
-                std::string mBrowserUserAgentId;
 };
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -87,6 +82,13 @@ class LLMediaManager
                 static void cleanupClass();
                 static LLMediaManager* getInstance();
 
+                // We append the skin name to the browser user agent string, so
+                // we need to change it while the app is running, not just at
+                // init time.
+                // Must be called after initClass() above.
+                // *HACK: Breaks encapsulation model. JC
+                static void setBrowserUserAgent(std::string user_agent);
+
                 // Calls update on all media sources
                 static void updateClass();
 
diff --git a/linden/indra/llmessage/llxfermanager.cpp b/linden/indra/llmessage/llxfermanager.cpp
index f7b83ec..8bf9813 100644
--- a/linden/indra/llmessage/llxfermanager.cpp
+++ b/linden/indra/llmessage/llxfermanager.cpp
@@ -736,7 +736,7 @@ void LLXferManager::processFileRequest (LLMessageSystem *mesgsys, void ** /*user
         
         U8 local_path_u8;
         mesgsys->getU8("XferID", "FilePath", local_path_u8);
-        if( local_path_u8 < (U8)LL_PATH_COUNT )
+        if( local_path_u8 < (U8)LL_PATH_LAST )
         {
                 local_path = (ELLPath)local_path_u8;
         }
diff --git a/linden/indra/llrender/llvertexbuffer.cpp b/linden/indra/llrender/llvertexbuffer.cpp
index 073fcbf..9635ae3 100644
--- a/linden/indra/llrender/llvertexbuffer.cpp
+++ b/linden/indra/llrender/llvertexbuffer.cpp
@@ -765,9 +765,17 @@ U8* LLVertexBuffer::mapBuffer(S32 access)
                 {
                         llerrs << "Mapped two VBOs at the same time!" << llendl;
                 }
-                sMapped = TRUE;*/
+                sMapped = TRUE;*/               
                 if (!mMappedData)
                 {
+                        //--------------------
+                        //print out more debug info before crash
+                        llinfos << "vertex buffer size: (num verts : num indices) = " << getNumVerts() << " : " << getNumIndices() << llendl ;
+                        GLint size ;
+                        glGetBufferParameterivARB(GL_ARRAY_BUFFER_ARB, GL_BUFFER_SIZE_ARB, &size) ;
+                        llinfos << "GL_ARRAY_BUFFER_ARB size is " << size << llendl ;
+                        //--------------------
+
                         GLint buff;
                         glGetIntegerv(GL_ARRAY_BUFFER_BINDING_ARB, &buff);
                         if (buff != mGLBuffer)
diff --git a/linden/indra/llui/llui.cpp b/linden/indra/llui/llui.cpp
index d2084e3..11889be 100644
--- a/linden/indra/llui/llui.cpp
+++ b/linden/indra/llui/llui.cpp
@@ -1671,13 +1671,13 @@ LLString LLUI::locateSkin(const LLString& filename)
                                 localization = sConfigGroup->getString("SystemLanguage");
                         }
                         LLString local_skin = "xui" + slash + localization + slash + filename;
-                        found_file = gDirUtilp->getExpandedFilename(LL_PATH_SKINS, local_skin);
+                        found_file = gDirUtilp->findSkinnedFilename(local_skin);
                 }
         }
         if (!gDirUtilp->fileExists(found_file))
         {
                 LLString local_skin = "xui" + slash + "en-us" + slash + filename;
-                found_file = gDirUtilp->getExpandedFilename(LL_PATH_SKINS, local_skin);
+                found_file = gDirUtilp->findSkinnedFilename(local_skin);
         }
         if (!gDirUtilp->fileExists(found_file))
         {
diff --git a/linden/indra/llui/lluictrlfactory.cpp b/linden/indra/llui/lluictrlfactory.cpp
index 7df6ebe..212c1c5 100644
--- a/linden/indra/llui/lluictrlfactory.cpp
+++ b/linden/indra/llui/lluictrlfactory.cpp
@@ -76,7 +76,7 @@ const S32 VPAD = 4;
 const S32 FLOATER_H_MARGIN = 15;
 const S32 MIN_WIDGET_HEIGHT = 10;
 
-std::vector<LLString> LLUICtrlFactory::mXUIPaths;
+std::vector<LLString> LLUICtrlFactory::sXUIPaths;
 
 // UI Ctrl class for padding
 class LLUICtrlLocate : public LLUICtrl
@@ -121,12 +121,11 @@ void LLUICtrlFactory::setupPaths()
 
         LLXMLNodePtr root;
         BOOL success  = LLXMLNode::parseFile(filename, root, NULL);
-        mXUIPaths.clear();
+        sXUIPaths.clear();
         
         if (success)
         {
                 LLXMLNodePtr path;
-                LLString app_dir = gDirUtilp->getAppRODataDir();
         
                 for (path = root->getFirstChild(); path.notNull(); path = path->getNextSibling())
                 {
@@ -140,21 +139,20 @@ void LLUICtrlFactory::setupPaths()
                                         language = LLUI::sConfigGroup->getString("SystemLanguage");
                                 }
                         }
-                        path_val_ui.setArg("[Language]", language);
-                        LLString fullpath = app_dir + path_val_ui.getString();
+                        path_val_ui.setArg("[LANGUAGE]", language);
 
-                        if (std::find(mXUIPaths.begin(), mXUIPaths.end(), fullpath) == mXUIPaths.end())
+                        if (std::find(sXUIPaths.begin(), sXUIPaths.end(), path_val_ui.getString()) == sXUIPaths.end())
                         {
-                                mXUIPaths.push_back(app_dir + path_val_ui.getString());
+                                sXUIPaths.push_back(path_val_ui.getString());
                         }
                 }
         }
         else // parsing failed
         {
                 LLString slash = gDirUtilp->getDirDelimiter();
-                LLString dir = gDirUtilp->getAppRODataDir() + slash + "skins" + slash + "xui" + slash + "en-us" + slash;
-                llwarns << "XUI::config file unable to open." << llendl;
-                mXUIPaths.push_back(dir);
+                LLString dir = "xui" + slash + "en-us";
+                llwarns << "XUI::config file unable to open: " << filename << llendl;
+                sXUIPaths.push_back(dir);
         }
 }
 
@@ -163,14 +161,22 @@ void LLUICtrlFactory::setupPaths()
 //-----------------------------------------------------------------------------
 // getLayeredXMLNode()
 //-----------------------------------------------------------------------------
-bool LLUICtrlFactory::getLayeredXMLNode(const LLString &filename, LLXMLNodePtr& root)
+bool LLUICtrlFactory::getLayeredXMLNode(const LLString &xui_filename, LLXMLNodePtr& root)
 {
-        if (!LLXMLNode::parseFile(mXUIPaths.front() + filename, root, NULL))
-        {       
-                if (!LLXMLNode::parseFile(filename, root, NULL))
+        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))
                 {
-                        llwarns << "Problem reading UI description file: " << mXUIPaths.front() + filename << llendl;
-                        return FALSE;
+                        llwarns << "Problem reading UI description file: " << xui_filename << llendl;
+                        return false;
                 }
         }
 
@@ -178,13 +184,24 @@ bool LLUICtrlFactory::getLayeredXMLNode(const LLString &filename, LLXMLNodePtr&
 
         std::vector<LLString>::const_iterator itor;
 
-        for (itor = mXUIPaths.begin(), ++itor; itor != mXUIPaths.end(); ++itor)
+        for (itor = sXUIPaths.begin(), ++itor; itor != sXUIPaths.end(); ++itor)
         {
                 LLString nodeName;
                 LLString updateName;
 
-                LLXMLNode::parseFile((*itor) + filename, updateRoot, NULL);
-        
+                std::string layer_filename = gDirUtilp->findSkinnedFilename((*itor), xui_filename);
+                if(layer_filename.empty())
+                {
+                        // no localized version of this file, that's ok, keep looking
+                        continue;
+                }
+
+                if (!LLXMLNode::parseFile(layer_filename, updateRoot, NULL))
+                {
+                        llwarns << "Problem reading localized UI description file: " << (*itor) + gDirUtilp->getDirDelimiter() + xui_filename << llendl;
+                        return false;
+                }
+
                 updateRoot->getAttributeString("name", updateName);
                 root->getAttributeString("name", nodeName);
 
@@ -194,7 +211,7 @@ bool LLUICtrlFactory::getLayeredXMLNode(const LLString &filename, LLXMLNodePtr&
                 }
         }
 
-        return TRUE;
+        return true;
 }
 
 
diff --git a/linden/indra/llui/lluictrlfactory.h b/linden/indra/llui/lluictrlfactory.h
index 0c1d9dd..16170ac 100644
--- a/linden/indra/llui/lluictrlfactory.h
+++ b/linden/indra/llui/lluictrlfactory.h
@@ -87,7 +87,7 @@ private:
 
         std::deque<const LLCallbackMap::map_t*> mFactoryStack;
 
-        static std::vector<LLString> mXUIPaths;
+        static std::vector<LLString> sXUIPaths;
 
         LLPanel* mDummyPanel;
 };
diff --git a/linden/indra/llvfs/lldir.cpp b/linden/indra/llvfs/lldir.cpp
index 084d3aa..246595a 100644
--- a/linden/indra/llvfs/lldir.cpp
+++ b/linden/indra/llvfs/lldir.cpp
@@ -59,18 +59,8 @@ LLDir_Linux gDirUtil;
 
 LLDir *gDirUtilp = (LLDir *)&gDirUtil;
 
-LLDir::LLDir()
-:       mAppName(""),
-        mExecutablePathAndName(""),
-        mExecutableFilename(""),
-        mExecutableDir(""),
-        mAppRODataDir(""),
-        mOSUserDir(""),
-        mOSUserAppDir(""),
-        mLindenUserDir(""),
-        mCAFile(""),
-        mTempDir(""),
-        mDirDelimiter("")
+LLDir::LLDir() 
+: mDirDelimiter("/") // fallback to forward slash if not overridden
 {
 }
 
@@ -125,7 +115,7 @@ S32 LLDir::deleteFilesInDir(const std::string &dirname, const std::string &mask)
 const std::string LLDir::findFile(const std::string &filename, 
                                                    const std::string searchPath1, 
                                                    const std::string searchPath2, 
-                                                   const std::string searchPath3)
+                                                   const std::string searchPath3) const
 {
         std::vector<std::string> search_paths;
         search_paths.push_back(searchPath1);
@@ -246,12 +236,37 @@ const std::string &LLDir::getSkinDir() const
         return mSkinDir;
 }
 
+const std::string &LLDir::getUserSkinDir() const
+{
+        return mUserSkinDir;
+}
+
+const std::string& LLDir::getDefaultSkinDir() const
+{
+        return mDefaultSkinDir;
+}
+
+const std::string LLDir::getSkinBaseDir() const
+{
+        std::string dir = getAppRODataDir();
+        dir += mDirDelimiter;
+        dir += "skins";
+
+        return dir;
+}
+
+
 std::string LLDir::getExpandedFilename(ELLPath location, const std::string& filename) const
 {
         return getExpandedFilename(location, "", filename);
 }
 
-std::string LLDir::getExpandedFilename(ELLPath location, const std::string& subdir, const std::string& in_filename) const
+std::string LLDir::getExpandedFilename(ELLPath location, const std::string& subdir, const std::string& filename) const
+{
+        return getExpandedFilename(location, "", subdir, filename);
+}
+
+std::string LLDir::getExpandedFilename(ELLPath location, const std::string& subdir1, const std::string& subdir2, const std::string& in_filename) const
 {
         std::string prefix;
         switch (location)
@@ -324,13 +339,11 @@ std::string LLDir::getExpandedFilename(ELLPath location, const std::string& subd
                 prefix += "skins";
                 break;
 
-        case LL_PATH_HTML:
-                prefix = getAppRODataDir();
-                prefix += mDirDelimiter;
-                prefix += "skins";
-                prefix += mDirDelimiter;
-                prefix += "html";
-                break;
+        //case LL_PATH_HTML:
+        //      prefix = getSkinDir();
+        //      prefix += mDirDelimiter;
+        //      prefix += "html";
+        //      break;
 
         case LL_PATH_MOZILLA_PROFILE:
                 prefix = getOSUserAppDir();
@@ -343,15 +356,16 @@ std::string LLDir::getExpandedFilename(ELLPath location, const std::string& subd
         }
 
         std::string filename = in_filename;
-        if (!subdir.empty())
+        if (!subdir2.empty())
         {
-                filename = subdir + mDirDelimiter + in_filename;
+                filename = subdir2 + mDirDelimiter + filename;
         }
-        else
+
+        if (!subdir1.empty())
         {
-                filename = in_filename;
+                filename = subdir1 + mDirDelimiter + filename;
         }
-        
+
         std::string expanded_filename;
         if (!filename.empty())
         {
@@ -381,6 +395,31 @@ std::string LLDir::getExpandedFilename(ELLPath location, const std::string& subd
         return expanded_filename;
 }
 
+std::string LLDir::findSkinnedFilename(const std::string &filename) const
+{
+        return findSkinnedFilename("", "", filename);
+}
+
+std::string LLDir::findSkinnedFilename(const std::string &subdir, const std::string &filename) const
+{
+        return findSkinnedFilename("", subdir, filename);
+}
+
+std::string LLDir::findSkinnedFilename(const std::string &subdir1, const std::string &subdir2, const std::string &filename) const
+{
+        // generate subdirectory path fragment, e.g. "/foo/bar", "/foo", ""
+        std::string subdirs = ((subdir1.empty() ? "" : mDirDelimiter) + subdir1)
+                                                 + ((subdir2.empty() ? "" : mDirDelimiter) + subdir2);
+
+        std::string found_file = findFile(filename,
+                getUserSkinDir() + subdirs,             // first look in user skin override
+                getSkinDir() + subdirs,                 // then in current skin
+                getDefaultSkinDir() + subdirs); // and last in default skin
+
+        return found_file;
+}
+
+
 std::string LLDir::getTempFilename() const
 {
         LLUUID random_uuid;
@@ -464,6 +503,22 @@ void LLDir::setSkinFolder(const std::string &skin_folder)
         mSkinDir += "skins";
         mSkinDir += mDirDelimiter;
         mSkinDir += skin_folder;
+
+        // user modifications to current skin
+        // e.g. c:\documents and settings\users\username\application data\second life\skins\dazzle
+        mUserSkinDir = getOSUserAppDir();
+        mUserSkinDir += mDirDelimiter;
+        mUserSkinDir += "skins";
+        mUserSkinDir += mDirDelimiter;  
+        mUserSkinDir += skin_folder;
+
+        // base skin which is used as fallback for all skinned files
+        // e.g. c:\program files\secondlife\skins\default
+        mDefaultSkinDir = getAppRODataDir();
+        mDefaultSkinDir += mDirDelimiter;
+        mDefaultSkinDir += "skins";
+        mDefaultSkinDir += mDirDelimiter;       
+        mDefaultSkinDir += "default";
 }
 
 bool LLDir::setCacheDir(const std::string &path)
diff --git a/linden/indra/llvfs/lldir.h b/linden/indra/llvfs/lldir.h
index c8eeaa2..8734c44 100644
--- a/linden/indra/llvfs/lldir.h
+++ b/linden/indra/llvfs/lldir.h
@@ -32,6 +32,7 @@
 #ifndef LL_LLDIR_H
 #define LL_LLDIR_H
 
+// these numbers *may* get serialized, so we need to be explicit
 typedef enum ELLPath
 {
         LL_PATH_NONE = 0,
@@ -49,8 +50,8 @@ typedef enum ELLPath
         LL_PATH_CHAT_LOGS = 12,
         LL_PATH_PER_ACCOUNT_CHAT_LOGS = 13,
         LL_PATH_MOZILLA_PROFILE = 14,
-        LL_PATH_HTML = 15,
-        LL_PATH_COUNT = 16
+//      LL_PATH_HTML = 15,
+        LL_PATH_LAST = 16
 } ELLPath;
 
 
@@ -69,9 +70,9 @@ class LLDir
          virtual BOOL getNextFileInDir(const std::string &dirname, const std::string &mask, std::string &fname, BOOL wrap) = 0;
          virtual void getRandomFileInDir(const std::string &dirname, const std::string &mask, std::string &fname) = 0;
         virtual std::string getCurPath() = 0;
-        virtual BOOL fileExists(const std::string &filename) = 0;
+        virtual BOOL fileExists(const std::string &filename) const = 0;
 
-        const std::string findFile(const std::string &filename, const std::string searchPath1 = "", const std::string searchPath2 = "", const std::string searchPath3 = "");
+        const std::string findFile(const std::string &filename, const std::string searchPath1 = "", const std::string searchPath2 = "", const std::string searchPath3 = "") const;
         const std::string &getExecutablePathAndName() const;    // Full pathname of the executable
         const std::string &getAppName() const;                  // install directory under progams/ ie "SecondLife"
         const std::string &getExecutableDir() const;    // Directory where the executable is located
@@ -88,10 +89,21 @@ class LLDir
         const std::string &getCAFile() const;                   // File containing TLS certificate authorities
         const std::string &getDirDelimiter() const;     // directory separator for platform (ie. '\' or '/' or ':')
         const std::string &getSkinDir() const;          // User-specified skin folder.
+        const std::string &getUserSkinDir() const;              // User-specified skin folder with user modifications. e.g. c:\documents and settings\username\application data\second life\skins\curskin
+        const std::string &getDefaultSkinDir() const;   // folder for default skin. e.g. c:\program files\second life\skins\default
+        const std::string getSkinBaseDir() const;               // folder that contains all installed skins (not user modifications). e.g. c:\program files\second life\skins
 
         // Expanded filename
         std::string getExpandedFilename(ELLPath location, const std::string &filename) const;
         std::string getExpandedFilename(ELLPath location, const std::string &subdir, const std::string &filename) const;
+        std::string getExpandedFilename(ELLPath location, const std::string &subdir1, const std::string &subdir2, const std::string &filename) const;
+
+        // these methods search the various skin paths for the specified file in the following order:
+        // getUserSkinDir(), getSkinDir(), getDefaultSkinDir()
+        std::string findSkinnedFilename(const std::string &filename) const;
+        std::string findSkinnedFilename(const std::string &subdir, const std::string &filename) const;
+        std::string findSkinnedFilename(const std::string &subdir1, const std::string &subdir2, const std::string &filename) const;
+
 
         // random filename in common temporary directory
         std::string getTempFilename() const;
@@ -120,7 +132,9 @@ protected:
         std::string mTempDir;
         std::string mCacheDir;
         std::string mDirDelimiter;
-        std::string mSkinDir;                   // Location for u ser-specified skin info.
+        std::string mSkinDir;                   // Location for current skin info.
+        std::string mDefaultSkinDir;                    // Location for default skin info.
+        std::string mUserSkinDir;                       // Location for user-modified skin info.
 };
 
 void dir_exists_or_crash(const std::string &dir_name);
diff --git a/linden/indra/llvfs/lldir_linux.cpp b/linden/indra/llvfs/lldir_linux.cpp
index 0e4e0a2..9aa4da3 100644
--- a/linden/indra/llvfs/lldir_linux.cpp
+++ b/linden/indra/llvfs/lldir_linux.cpp
@@ -349,7 +349,7 @@ std::string LLDir_Linux::getCurPath()
 }
 
 
-BOOL LLDir_Linux::fileExists(const std::string &filename)
+BOOL LLDir_Linux::fileExists(const std::string &filename) const
 {
         struct stat stat_data;
         // Check the age of the file
diff --git a/linden/indra/llvfs/lldir_linux.h b/linden/indra/llvfs/lldir_linux.h
index 4815fe9..99925c1 100644
--- a/linden/indra/llvfs/lldir_linux.h
+++ b/linden/indra/llvfs/lldir_linux.h
@@ -49,7 +49,7 @@ public:
         virtual U32 countFilesInDir(const std::string &dirname, const std::string &mask);
         virtual BOOL getNextFileInDir(const std::string &dirname, const std::string &mask, std::string &fname, BOOL wrap);
         virtual void getRandomFileInDir(const std::string &dirname, const std::string &mask, std::string &fname);
-        /*virtual*/ BOOL fileExists(const std::string &filename);
+        /*virtual*/ BOOL fileExists(const std::string &filename) const;
 
 private:
         DIR *mDirp;
diff --git a/linden/indra/llvfs/lldir_mac.cpp b/linden/indra/llvfs/lldir_mac.cpp
index f67a487..8b1be53 100644
--- a/linden/indra/llvfs/lldir_mac.cpp
+++ b/linden/indra/llvfs/lldir_mac.cpp
@@ -361,7 +361,7 @@ std::string LLDir_Mac::getCurPath()
 
 
 
-BOOL LLDir_Mac::fileExists(const std::string &filename)
+BOOL LLDir_Mac::fileExists(const std::string &filename) const
 {
         struct stat stat_data;
         // Check the age of the file
diff --git a/linden/indra/llvfs/lldir_mac.h b/linden/indra/llvfs/lldir_mac.h
index 73c964d..beb8c93 100644
--- a/linden/indra/llvfs/lldir_mac.h
+++ b/linden/indra/llvfs/lldir_mac.h
@@ -49,7 +49,7 @@ public:
         virtual U32 countFilesInDir(const std::string &dirname, const std::string &mask);
         virtual BOOL getNextFileInDir(const std::string &dirname, const std::string &mask, std::string &fname, BOOL wrap);
         virtual void getRandomFileInDir(const std::string &dirname, const std::string &ask, std::string &fname);
-        virtual BOOL fileExists(const std::string &filename);
+        virtual BOOL fileExists(const std::string &filename) const;
 
 private:
         int mCurrentDirIndex;
diff --git a/linden/indra/llvfs/lldir_win32.cpp b/linden/indra/llvfs/lldir_win32.cpp
index ae87aa1..8904dff 100644
--- a/linden/indra/llvfs/lldir_win32.cpp
+++ b/linden/indra/llvfs/lldir_win32.cpp
@@ -338,7 +338,7 @@ std::string LLDir_Win32::getCurPath()
 }
 
 
-BOOL LLDir_Win32::fileExists(const std::string &filename)
+BOOL LLDir_Win32::fileExists(const std::string &filename) const
 {
         llstat stat_data;
         // Check the age of the file
diff --git a/linden/indra/llvfs/lldir_win32.h b/linden/indra/llvfs/lldir_win32.h
index 2744ea2..e988d39 100644
--- a/linden/indra/llvfs/lldir_win32.h
+++ b/linden/indra/llvfs/lldir_win32.h
@@ -46,7 +46,7 @@ public:
         /*virtual*/ U32 countFilesInDir(const std::string &dirname, const std::string &mask);
         /*virtual*/ BOOL getNextFileInDir(const std::string &dirname, const std::string &mask, std::string &fname, BOOL wrap);
         /*virtual*/ void getRandomFileInDir(const std::string &dirname, const std::string &mask, std::string &fname);
-        /*virtual*/ BOOL fileExists(const std::string &filename);
+        /*virtual*/ BOOL fileExists(const std::string &filename) const;
 
 private:
         BOOL LLDir_Win32::getNextFileInDir(const llutf16string &dirname, const std::string &mask, std::string &fname, BOOL wrap);
diff --git a/linden/indra/llxml/llcontrol.cpp b/linden/indra/llxml/llcontrol.cpp
index 09719a5..f88ac69 100644
--- a/linden/indra/llxml/llcontrol.cpp
+++ b/linden/indra/llxml/llcontrol.cpp
@@ -101,7 +101,7 @@ bool LLControlVariable::llsd_compare(const LLSD& a, const LLSD & b)
 
 LLControlVariable::LLControlVariable(const LLString& name, eControlType type,
                                                          LLSD initial, const LLString& comment,
-                                                         BOOL persist)
+                                                         bool persist)
         : mName(name),
           mComment(comment),
           mType(type),
@@ -121,7 +121,7 @@ LLControlVariable::~LLControlVariable()
 {
 }
 
-void LLControlVariable::setValue(const LLSD& value, bool saved_value)
+LLSD LLControlVariable::getComparableValue(const LLSD& value)
 {
         // *FIX:MEP - The following is needed to make the LLSD::ImplString 
         // work with boolean controls...
@@ -131,11 +131,11 @@ void LLControlVariable::setValue(const LLSD& value, bool saved_value)
                 BOOL temp;
                 if(LLString::convertToBOOL(value.asString(), temp)) 
                 {
-                        storable_value = temp;
+                        storable_value = (bool)temp;
                 }
                 else
                 {
-                        storable_value = FALSE;
+                        storable_value = false;
                 }
         }
         else
@@ -143,6 +143,12 @@ void LLControlVariable::setValue(const LLSD& value, bool saved_value)
                 storable_value = value;
         }
 
+        return storable_value;
+}
+
+void LLControlVariable::setValue(const LLSD& value, bool saved_value)
+{
+        LLSD storable_value = getComparableValue(value);
         bool value_changed = llsd_compare(getValue(), storable_value) == FALSE;
         if(saved_value)
         {
@@ -184,12 +190,46 @@ void LLControlVariable::setValue(const LLSD& value, bool saved_value)
     }
 }
 
+void LLControlVariable::setDefaultValue(const LLSD& value)
+{
+        // Set the control variables value and make it 
+        // the default value. If the active value is changed,
+        // send the signal.
+        // *NOTE: Default values are not saved, only read.
+
+        LLSD comparable_value = getComparableValue(value);
+        bool value_changed = (llsd_compare(getValue(), comparable_value) == FALSE);
+        resetToDefault(false);
+        mValues[0] = comparable_value;
+        if(value_changed)
+        {
+                firePropertyChanged();
+        }
+}
+
+void LLControlVariable::setPersist(bool state)
+{
+        mPersist = state;
+}
+
+void LLControlVariable::setComment(const std::string& comment)
+{
+        mComment = comment;
+}
+
 void LLControlVariable::resetToDefault(bool fire_signal)
 {
         //The first setting is always the default
         //Pop to it and fire off the listener
-        while(mValues.size() > 1) mValues.pop_back();
-        if(fire_signal) firePropertyChanged();
+        while(mValues.size() > 1)
+        {
+                mValues.pop_back();
+        }
+        
+        if(fire_signal) 
+        {
+                firePropertyChanged();
+        }
 }
 
 bool LLControlVariable::isSaveValueDefault()
@@ -206,10 +246,10 @@ LLSD LLControlVariable::getSaveValue() const
         return mValues[0];
 }
 
-LLControlVariable*      LLControlGroup::getControl(const LLString& name)
+LLPointer<LLControlVariable> LLControlGroup::getControl(const LLString& name)
 {
         ctrl_name_table_t::iterator iter = mNameTable.find(name);
-        return iter == mNameTable.end() ? NULL : iter->second;
+        return iter == mNameTable.end() ? LLPointer<LLControlVariable>() : iter->second;
 }
 
 
@@ -238,7 +278,6 @@ LLControlGroup::~LLControlGroup()
 
 void LLControlGroup::cleanup()
 {
-        for_each(mNameTable.begin(), mNameTable.end(), DeletePairedPointer());
         mNameTable.clear();
 }
 
@@ -264,6 +303,7 @@ BOOL LLControlGroup::declareControl(const LLString& name, eControlType type, con
                 mNameTable[name]->setValue(initial_val);
                 return TRUE;
         }
+
         // if not, create the control and add it to the name table
         LLControlVariable* control = new LLControlVariable(name, type, initial_val, comment, persist);
         mNameTable[name] = control;     
@@ -983,7 +1023,7 @@ U32 LLControlGroup::saveToFile(const LLString& filename, BOOL nondefault_only)
         return num_saved;
 }
 
-U32 LLControlGroup::loadFromFile(const LLString& filename)
+U32 LLControlGroup::loadFromFile(const LLString& filename, bool set_default_values)
 {
         LLString name;
         LLSD settings;
@@ -1006,7 +1046,7 @@ U32 LLControlGroup::loadFromFile(const LLString& filename)
         }
 
         U32     validitems = 0;
-        int persist = 1;
+        bool persist = false;
         for(LLSD::map_const_iterator itr = settings.beginMap(); itr != settings.endMap(); ++itr)
         {
                 name = (*itr).first;
@@ -1021,11 +1061,31 @@ U32 LLControlGroup::loadFromFile(const LLString& filename)
                 LLControlVariable* existing_control = getControl(name);
                 if(existing_control)
                 {
-                        // Check persistence. If not persisted, we shouldn't be loading.
-                        if(existing_control->isPersisted())
+                        if(set_default_values)
                         {
+                                // Override all previously set properties of this control.
+                                // ... except for type. The types must match.
+                                eControlType new_type = typeStringToEnum(control_map["Type"].asString());
+                                if(existing_control->isType(new_type))
+                                {
+                                        existing_control->setDefaultValue(control_map["Value"]);
+                                        existing_control->setPersist(persist);
+                                        existing_control->setComment(control_map["Comment"].asString());
+                                }
+                                else
+                                {
+                                        llerrs << "Mismatched type of control variable '"
+                                                   << name << "' found while loading '"
+                                                   << filename << "'." << llendl;
+                                }
+                        }
+                        else if(existing_control->isPersisted())
+                        {
+                                
                                 existing_control->setValue(control_map["Value"]);
                         }
+                        // *NOTE: If not persisted and not setting defaults, 
+                        // the value should not get loaded.
                 }
                 else
                 {
diff --git a/linden/indra/llxml/llcontrol.h b/linden/indra/llxml/llcontrol.h
index 91545ce..2500ae0 100644
--- a/linden/indra/llxml/llcontrol.h
+++ b/linden/indra/llxml/llcontrol.h
@@ -83,7 +83,7 @@ typedef enum e_control_type
         TYPE_COUNT
 } eControlType;
 
-class LLControlVariable
+class LLControlVariable : public LLRefCount
 {
         friend class LLControlGroup;
         typedef boost::signal<void(const LLSD&)> signal_t;
@@ -92,7 +92,7 @@ private:
         LLString                mName;
         LLString                mComment;
         eControlType    mType;
-        BOOL                    mPersist;
+        bool mPersist;
         std::vector<LLSD> mValues;
         
         signal_t mSignal;
@@ -100,7 +100,7 @@ private:
 public:
         LLControlVariable(const LLString& name, eControlType type,
                                           LLSD initial, const LLString& comment,
-                                          BOOL persist = TRUE);
+                                          bool persist = true);
 
         virtual ~LLControlVariable();
         
@@ -108,33 +108,41 @@ public:
         const LLString& getComment() const { return mComment; }
 
         eControlType type()             { return mType; }
-        BOOL isType(eControlType tp) { return tp == mType; }
+        bool isType(eControlType tp) { return tp == mType; }
 
-        void resetToDefault(bool fire_signal = TRUE);
+        void resetToDefault(bool fire_signal = false);
 
         signal_t* getSignal() { return &mSignal; }
 
         bool isDefault() { return (mValues.size() == 1); }
         bool isSaveValueDefault();
         bool isPersisted() { return mPersist; }
-        void set(const LLSD& val)       { setValue(val); }
         LLSD get()                      const   { return getValue(); }
-        LLSD getDefault()       const   { return mValues.front(); }
         LLSD getValue()         const   { return mValues.back(); }
+        LLSD getDefault()       const   { return mValues.front(); }
         LLSD getSaveValue() const;
+
+        void set(const LLSD& val)       { setValue(val); }
         void setValue(const LLSD& value, bool saved_value = TRUE);
+        void setDefaultValue(const LLSD& value);
+        void setPersist(bool state);
+        void setComment(const std::string& comment);
+
         void firePropertyChanged()
         {
                 mSignal(mValues.back());
         }
-        bool llsd_compare(const LLSD& a, const LLSD& b);
+private:
+        LLSD getComparableValue(const LLSD& value);
+        bool llsd_compare(const LLSD& a, const LLSD & b);
+
 };
 
 //const U32 STRING_CACHE_SIZE = 10000;
 class LLControlGroup
 {
 protected:
-        typedef std::map<LLString, LLControlVariable* > ctrl_name_table_t;
+        typedef std::map<LLString, LLPointer<LLControlVariable> > ctrl_name_table_t;
         ctrl_name_table_t mNameTable;
         std::set<LLString> mWarnings;
         LLString mTypeString[TYPE_COUNT];
@@ -146,7 +154,7 @@ public:
         ~LLControlGroup();
         void cleanup();
         
-        LLControlVariable*      getControl(const LLString& name);
+        LLPointer<LLControlVariable> getControl(const LLString& name);
 
         struct ApplyFunctor
         {
@@ -213,7 +221,7 @@ public:
         // as the given type.
         U32     loadFromFileLegacy(const LLString& filename, BOOL require_declaration = TRUE, eControlType declare_as = TYPE_STRING);
         U32 saveToFile(const LLString& filename, BOOL nondefault_only);
-        U32     loadFromFile(const LLString& filename);
+        U32     loadFromFile(const LLString& filename, bool default_values = false);
         void    resetToDefaults();
 
         
diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index 18ca143..4957948 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -2868,7 +2868,7 @@
         <integer>0</integer>
       </array>
     </map>
-    <key>FloaterHUDRect</key>
+    <key>FloaterHUDRect2</key>
     <map>
       <key>Comment</key>
       <string>Rectangle for HUD Floater window</string>
@@ -2877,10 +2877,13 @@
       <key>Type</key>
       <string>Rect</string>
       <key>Value</key>
+<!-- NOTE: Height and width must match values in settings.xml for 
+     FloaterHUDRect because this floater is resized to those values
+     in LLViewerWindow initialization. JC -->
       <array>
         <integer>0</integer>
-        <integer>282</integer>
-        <integer>342</integer>
+        <integer>292</integer>
+        <integer>362</integer>
         <integer>0</integer>
       </array>
     </map>
@@ -7141,16 +7144,16 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
-    <key>SkinFolder</key>
+    <key>SkinCurrent</key>
     <map>
       <key>Comment</key>
-      <string>The skin folder to use.</string>
+      <string>The currently selected skin.</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
       <string>String</string>
       <key>Value</key>
-      <string />
+      <string>default</string>
     </map>
     <key>SkyAmbientScale</key>
     <map>
diff --git a/linden/indra/newview/app_settings/windlight/clouds2.tga b/linden/indra/newview/app_settings/windlight/clouds2.tga
deleted file mode 100644
index c95ce7f..0000000
--- a/linden/indra/newview/app_settings/windlight/clouds2.tga
+++ /dev/null
diff --git a/linden/indra/newview/app_settings/windlight/days/Default.xml b/linden/indra/newview/app_settings/windlight/days/Default.xml
deleted file mode 100644
index 3d3afd5..0000000
--- a/linden/indra/newview/app_settings/windlight/days/Default.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<llsd>
-    <array>
-        <array>
-            <real>0</real>
-            <string>A-12AM</string>
-        </array>
-        <array>
-            <real>0.125</real>
-            <string>A-3AM</string>
-        </array>
-        <array>
-            <real>0.25</real>
-            <string>A-6AM</string>
-        </array>
-        <array>
-            <real>0.375</real>
-            <string>A-9AM</string>
-        </array>
-        <array>
-            <real>0.5</real>
-            <string>A-12PM</string>
-        </array>
-        <array>
-            <real>0.625</real>
-            <string>A-3PM</string>
-        </array>
-        <array>
-            <real>0.75</real>
-            <string>A-6PM</string>
-        </array>
-        <array>
-            <real>0.875</real>
-            <string>A-9PM</string>
-        </array>
-    </array>
-</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/postprocesseffects.xml b/linden/indra/newview/app_settings/windlight/postprocesseffects.xml
deleted file mode 100644
index 4645215..0000000
--- a/linden/indra/newview/app_settings/windlight/postprocesseffects.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<llsd><map><key>Asi Weird</key><map><key>bloom_strength</key><real>4.5799999237060547</real><key>bloom_width</key><real>12.539999961853027</real><key>brightness</key><real>0.89999997615814209</real><key>brightness_multiplier</key><real>3</real><key>contrast</key><real>0.22999998927116394</real><key>contrast_base</key><array><real>1</real><real>1</real><real>1</real><real>0.5</real></array><key>enable_bloom</key><integer>1</integer><key>enable_color_filter</key><integer>1</integer><key>enable_night_vision</key><boolean>0</boolean><key>extract_high</key><real>1</real><key>extract_low</key><real>0.47999998927116394</real><key>noise_size</key><real>25</real><key>noise_strength</key><real>0.40000000000000002</real><key>saturation</key><real>-1</real></map><key>NegativeSaturation</key><map><key>bloom_strength</key><real>1.5</real><key>bloom_width</key><real>2.25</real><key>brightness</key><real>1</real><key>brightness_multiplier</key><real>3</real><key>contrast</key><real>1</real><key>contrast_base</key><array><real>1</real><real>1</real><real>1</real><real>0.5</real></array><key>enable_bloom</key><boolean>0</boolean><key>enable_color_filter</key><integer>1</integer><key>enable_night_vision</key><boolean>0</boolean><key>extract_high</key><real>1</real><key>extract_low</key><real>0.94999999999999996</real><key>noise_size</key><real>25</real><key>noise_strength</key><real>0.40000000000000002</real><key>saturation</key><real>-1</real></map><key>NightVision</key><map><key>bloom_strength</key><real>1.5</real><key>bloom_width</key><real>2.25</real><key>brightness</key><real>1</real><key>brightness_multiplier</key><real>3</real><key>contrast</key><real>1</real><key>contrast_base</key><array><real>1</real><real>1</real><real>1</real><real>0.5</real></array><key>enable_bloom</key><boolean>0</boolean><key>enable_color_filter</key><boolean>0</boolean><key>enable_night_vision</key><integer>1</integer><key>extract_high</key><real>1</real><key>extract_low</key><real>0.94999999999999996</real><key>noise_size</key><real>25</real><key>noise_strength</key><real>0.40000000000000002</real><key>saturation</key><real>1</real></map><key>WGhost</key><map><key>bloom_strength</key><real>2.0399999618530273</real><key>bloom_width</key><real>2.25</real><key>brightness</key><real>1</real><key>brightness_multiplier</key><real>3</real><key>contrast</key><real>1</real><key>contrast_base</key><array><real>1</real><real>1</real><real>1</real><real>0.5</real></array><key>enable_bloom</key><integer>1</integer><key>enable_color_filter</key><boolean>0</boolean><key>enable_night_vision</key><boolean>0</boolean><key>extract_high</key><real>1</real><key>extract_low</key><real>0.22999998927116394</real><key>noise_size</key><real>25</real><key>noise_strength</key><real>0.40000000000000002</real><key>saturation</key><real>1</real></map><key>default</key><map><key>bloom_strength</key><real>1.5</real><key>bloom_width</key><real>2.25</real><key>brightness</key><real>1</real><key>brightness_multiplier</key><real>3</real><key>contrast</key><real>1</real><key>contrast_base</key><array><real>1</real><real>1</real><real>1</real><real>0.5</real></array><key>enable_bloom</key><boolean>0</boolean><key>enable_color_filter</key><boolean>0</boolean><key>enable_night_vision</key><boolean>0</boolean><key>extract_high</key><real>1</real><key>extract_low</key><real>0.94999999999999996</real><key>noise_size</key><real>25</real><key>noise_strength</key><real>0.40000000000000002</real><key>saturation</key><real>1</real></map></map></llsd>
-><map><key>bloom_strength</key><real>1.5</real><key>bloom_width</key><real>2.25</real><key>brightness</key><real>1</real><key>brightness_multiplier</key><real>3</real><key>contrast</key><real>1</real><key>contrast_base</key><array><real>1</real><real>1</real><real>1</real><real>0.5</real></array><key>enable_bloom</key><boolean>0</boolean><key>enable_color_filter</key><boolean>0</boolean><key>enable_night_vision</key><boolean>0</boolean><key>extract_high</key><real>1</real><key>extract_low</key><real>0.94999999999999996</real><key>noise_size</key><real>25</real><key>noise_strength</key><real>0.40000000000000002</real><key>saturation</key><real>1</real></map></map></llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/A%2D12AM.xml b/linden/indra/newview/app_settings/windlight/skies/A%2D12AM.xml
deleted file mode 100644
index 0aba312..0000000
--- a/linden/indra/newview/app_settings/windlight/skies/A%2D12AM.xml
+++ /dev/null
@@ -1,141 +0,0 @@
-<llsd>
-    <map>
-    <key>ambient</key>
-        <array>
-            <real>0.20405027270317078</real>
-            <real>0.24246673285961151</real>
-            <real>0.32999998331069946</real>
-            <real>0.10999999940395355</real>
-        </array>
-    <key>blue_density</key>
-        <array>
-            <real>0.44999998807907104</real>
-            <real>0.44999998807907104</real>
-            <real>0.44999998807907104</real>
-            <real>1</real>
-        </array>
-    <key>blue_horizon</key>
-        <array>
-            <real>0.23999999463558197</real>
-            <real>0.23999999463558197</real>
-            <real>0.23999999463558197</real>
-            <real>1</real>
-        </array>
-    <key>cloud_color</key>
-        <array>
-            <real>0.22615399956703186</real>
-            <real>0.22615399956703186</real>
-            <real>0.22615399956703186</real>
-            <real>1</real>
-        </array>
-    <key>cloud_pos_density1</key>
-        <array>
-            <real>1.6884100437164307</real>
-            <real>0.52609699964523315</real>
-            <real>0.87999999523162842</real>
-            <real>1</real>
-        </array>
-    <key>cloud_pos_density2</key>
-        <array>
-            <real>1.6884100437164307</real>
-            <real>0.52609699964523315</real>
-            <real>0.125</real>
-            <real>1</real>
-        </array>
-    <key>cloud_scale</key>
-        <array>
-            <real>0.41999998688697815</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>cloud_scroll_rate</key>
-        <array>
-            <real>10.49940013885498</real>
-            <real>10.01099967956543</real>
-        </array>
-    <key>cloud_shadow</key>
-        <array>
-            <real>0.26999998092651367</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>density_multiplier</key>
-        <array>
-            <real>0.00030000001424923539</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>distance_multiplier</key>
-        <array>
-            <real>0</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>east_angle</key>
-        <real>0</real>
-    <key>enable_cloud_scroll</key>
-        <array>
-            <boolean>1</boolean>
-            <boolean>1</boolean>
-        </array>
-    <key>gamma</key>
-        <array>
-            <real>1</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>glow</key>
-        <array>
-            <real>5</real>
-            <real>0.0010000000474974513</real>
-            <real>-0.47999998927116394</real>
-            <real>1</real>
-        </array>
-    <key>haze_density</key>
-        <array>
-            <real>4</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>haze_horizon</key>
-        <array>
-            <real>0</real>
-            <real>0.19915600121021271</real>
-            <real>0.19915600121021271</real>
-            <real>1</real>
-        </array>
-    <key>lightnorm</key>
-        <array>
-            <real>0</real>
-            <real>1</real>
-            <real>-4.8876205482883961e-007</real>
-            <real>1</real>
-        </array>
-    <key>max_y</key>
-        <array>
-            <real>906.20001220703125</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>preset_num</key>
-        <integer>22</integer>
-    <key>star_brightness</key>
-        <real>2</real>
-    <key>sun_angle</key>
-        <real>4.7123894691467285</real>
-    <key>sunlight_color</key>
-        <array>
-            <real>0.34876692295074463</real>
-            <real>0.35574248433113098</real>
-            <real>0.65999996662139893</real>
-            <real>0.2199999988079071</real>
-        </array>
-    </map>
-</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/A%2D12PM.xml b/linden/indra/newview/app_settings/windlight/skies/A%2D12PM.xml
deleted file mode 100644
index 119b3e1..0000000
--- a/linden/indra/newview/app_settings/windlight/skies/A%2D12PM.xml
+++ /dev/null
@@ -1,141 +0,0 @@
-<llsd>
-    <map>
-    <key>ambient</key>
-        <array>
-            <real>1.0499999523162842</real>
-            <real>1.0499999523162842</real>
-            <real>1.0499999523162842</real>
-            <real>0.34999999403953552</real>
-        </array>
-    <key>blue_density</key>
-        <array>
-            <real>0.24475815892219543</real>
-            <real>0.44872328639030457</real>
-            <real>0.75999999046325684</real>
-            <real>0.37999999523162842</real>
-        </array>
-    <key>blue_horizon</key>
-        <array>
-            <real>0.49548381567001343</real>
-            <real>0.49548381567001343</real>
-            <real>0.63999998569488525</real>
-            <real>0.31999999284744263</real>
-        </array>
-    <key>cloud_color</key>
-        <array>
-            <real>0.40999999642372131</real>
-            <real>0.40999999642372131</real>
-            <real>0.40999999642372131</real>
-            <real>0.40999999642372131</real>
-        </array>
-    <key>cloud_pos_density1</key>
-        <array>
-            <real>1.6884100437164307</real>
-            <real>0.52609699964523315</real>
-            <real>1</real>
-            <real>1</real>
-        </array>
-    <key>cloud_pos_density2</key>
-        <array>
-            <real>1.6884100437164307</real>
-            <real>0.52609699964523315</real>
-            <real>0.125</real>
-            <real>1</real>
-        </array>
-    <key>cloud_scale</key>
-        <array>
-            <real>0.41999998688697815</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>cloud_scroll_rate</key>
-        <array>
-            <real>10.199999809265137</real>
-            <real>10.01099967956543</real>
-        </array>
-    <key>cloud_shadow</key>
-        <array>
-            <real>0.26999998092651367</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>density_multiplier</key>
-        <array>
-            <real>0.00017999998817685992</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>distance_multiplier</key>
-        <array>
-            <real>0.80000001192092896</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>east_angle</key>
-        <real>0</real>
-    <key>enable_cloud_scroll</key>
-        <array>
-            <boolean>1</boolean>
-            <boolean>1</boolean>
-        </array>
-    <key>gamma</key>
-        <array>
-            <real>1</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>glow</key>
-        <array>
-            <real>5</real>
-            <real>0.0010000000474974513</real>
-            <real>-0.47999998927116394</real>
-            <real>1</real>
-        </array>
-    <key>haze_density</key>
-        <array>
-            <real>0.69999998807907104</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>haze_horizon</key>
-        <array>
-            <real>0.18999999761581421</real>
-            <real>0.19915600121021271</real>
-            <real>0.19915600121021271</real>
-            <real>1</real>
-        </array>
-    <key>lightnorm</key>
-        <array>
-            <real>0</real>
-            <real>1</real>
-            <real>-4.3711388286737929e-008</real>
-            <real>0</real>
-        </array>
-    <key>max_y</key>
-        <array>
-            <real>1605</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>preset_num</key>
-        <integer>22</integer>
-    <key>star_brightness</key>
-        <real>0</real>
-    <key>sun_angle</key>
-        <real>1.5707963705062866</real>
-    <key>sunlight_color</key>
-        <array>
-            <real>0.7342105507850647</real>
-            <real>0.78157895803451538</real>
-            <real>0.89999997615814209</real>
-            <real>0.29999998211860657</real>
-        </array>
-    </map>
-</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/A%2D3AM.xml b/linden/indra/newview/app_settings/windlight/skies/A%2D3AM.xml
deleted file mode 100644
index f790d3d..0000000
--- a/linden/indra/newview/app_settings/windlight/skies/A%2D3AM.xml
+++ /dev/null
@@ -1,141 +0,0 @@
-<llsd>
-    <map>
-    <key>ambient</key>
-        <array>
-            <real>0.22259476780891418</real>
-            <real>0.26450252532958984</real>
-            <real>0.35999998450279236</real>
-            <real>0.11999999731779099</real>
-        </array>
-    <key>blue_density</key>
-        <array>
-            <real>0.44999116536295314</real>
-            <real>0.44999854555993368</real>
-            <real>0.45001013284446073</real>
-            <real>1</real>
-        </array>
-    <key>blue_horizon</key>
-        <array>
-            <real>0.23999616268583132</real>
-            <real>0.239999227803052</real>
-            <real>0.24000028550619668</real>
-            <real>1</real>
-        </array>
-    <key>cloud_color</key>
-        <array>
-            <real>0.22615400241566114</real>
-            <real>0.22615400241566114</real>
-            <real>0.22615400241566114</real>
-            <real>1</real>
-        </array>
-    <key>cloud_pos_density1</key>
-        <array>
-            <real>1.6884100437164307</real>
-            <real>0.52609699964523315</real>
-            <real>0.88000000953681223</real>
-            <real>1</real>
-        </array>
-    <key>cloud_pos_density2</key>
-        <array>
-            <real>1.6884100437164307</real>
-            <real>0.52609699964523315</real>
-            <real>0.125</real>
-            <real>1</real>
-        </array>
-    <key>cloud_scale</key>
-        <array>
-            <real>0.41999998688697815</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>cloud_scroll_rate</key>
-        <array>
-            <real>10.499400354105791</real>
-            <real>10.011000104419489</real>
-        </array>
-    <key>cloud_shadow</key>
-        <array>
-            <real>0.26999998092651367</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>density_multiplier</key>
-        <array>
-            <real>0.0003000046529240592</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>distance_multiplier</key>
-        <array>
-            <real>7.8213197608078763e-005</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>east_angle</key>
-        <real>0</real>
-    <key>enable_cloud_scroll</key>
-        <array>
-            <boolean>1</boolean>
-            <boolean>1</boolean>
-        </array>
-    <key>gamma</key>
-        <array>
-            <real>1</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>glow</key>
-        <array>
-            <real>5.0000000000023022</real>
-            <real>0.0010000000214220922</real>
-            <real>-0.47999999165507345</real>
-            <real>1</real>
-        </array>
-    <key>haze_density</key>
-        <array>
-            <real>3.9999044060931555</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>haze_horizon</key>
-        <array>
-            <real>4.6348559691012062e-006</real>
-            <real>0.19915600437461423</real>
-            <real>0.19915600437461423</real>
-            <real>1</real>
-        </array>
-    <key>lightnorm</key>
-        <array>
-            <real>0</real>
-            <real>0.70710653066635132</real>
-            <real>-0.70710700750350952</real>
-            <real>1</real>
-        </array>
-    <key>max_y</key>
-        <array>
-            <real>906.19008370909478</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>preset_num</key>
-        <integer>22</integer>
-    <key>star_brightness</key>
-        <real>1.9999420642852783</real>
-    <key>sun_angle</key>
-        <real>5.4977874755859375</real>
-    <key>sunlight_color</key>
-        <array>
-            <real>0.60242295265197754</real>
-            <real>0.61447036266326904</real>
-            <real>1.1399999856948853</real>
-            <real>0.37999999523162842</real>
-        </array>
-    </map>
-</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/A%2D3PM.xml b/linden/indra/newview/app_settings/windlight/skies/A%2D3PM.xml
deleted file mode 100644
index ec97067..0000000
--- a/linden/indra/newview/app_settings/windlight/skies/A%2D3PM.xml
+++ /dev/null
@@ -1,141 +0,0 @@
-<llsd>
-    <map>
-    <key>ambient</key>
-        <array>
-            <real>1.0499999523162842</real>
-            <real>1.0499999523162842</real>
-            <real>1.0499999523162842</real>
-            <real>0.34999999403953552</real>
-        </array>
-    <key>blue_density</key>
-        <array>
-            <real>0.2447581488182351</real>
-            <real>0.44872328639030457</real>
-            <real>0.75999999046325684</real>
-            <real>0.38000004053115788</real>
-        </array>
-    <key>blue_horizon</key>
-        <array>
-            <real>0.49548382097675159</real>
-            <real>0.49548381382419748</real>
-            <real>0.63999999284744291</real>
-            <real>0.31999999642372146</real>
-        </array>
-    <key>cloud_color</key>
-        <array>
-            <real>0.40999999165535073</real>
-            <real>0.40999999165535073</real>
-            <real>0.40999999165535073</real>
-            <real>0.40999999165535073</real>
-        </array>
-    <key>cloud_pos_density1</key>
-        <array>
-            <real>1.6884100437164307</real>
-            <real>0.52609699964523315</real>
-            <real>0.99999999999999289</real>
-            <real>1</real>
-        </array>
-    <key>cloud_pos_density2</key>
-        <array>
-            <real>1.6884100437164307</real>
-            <real>0.52609699964523315</real>
-            <real>0.125</real>
-            <real>1</real>
-        </array>
-    <key>cloud_scale</key>
-        <array>
-            <real>0.4199999868869746</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>cloud_scroll_rate</key>
-        <array>
-            <real>10.199999809265137</real>
-            <real>10.01099967956543</real>
-        </array>
-    <key>cloud_shadow</key>
-        <array>
-            <real>0.26999998092651367</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>density_multiplier</key>
-        <array>
-            <real>0.00017999998817685818</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>distance_multiplier</key>
-        <array>
-            <real>0.80000001192093606</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>east_angle</key>
-        <real>0</real>
-    <key>enable_cloud_scroll</key>
-        <array>
-            <boolean>1</boolean>
-            <boolean>1</boolean>
-        </array>
-    <key>gamma</key>
-        <array>
-            <real>1</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>glow</key>
-        <array>
-            <real>5</real>
-            <real>0.0010000000474974513</real>
-            <real>-0.47999998927116394</real>
-            <real>1</real>
-        </array>
-    <key>haze_density</key>
-        <array>
-            <real>0.69999998807907104</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>haze_horizon</key>
-        <array>
-            <real>0.18999999761581243</real>
-            <real>0.19915600121021271</real>
-            <real>0.19915600121021271</real>
-            <real>1</real>
-        </array>
-    <key>lightnorm</key>
-        <array>
-            <real>0</real>
-            <real>0.70710659027099609</real>
-            <real>-0.70710694789886475</real>
-            <real>0</real>
-        </array>
-    <key>max_y</key>
-        <array>
-            <real>1605</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>preset_num</key>
-        <integer>22</integer>
-    <key>star_brightness</key>
-        <real>0</real>
-    <key>sun_angle</key>
-        <real>2.3561947345733643</real>
-    <key>sunlight_color</key>
-        <array>
-            <real>0.73421055078505759</real>
-            <real>0.78157895803450828</real>
-            <real>0.89999997615813498</real>
-            <real>0.29999998211860301</real>
-        </array>
-    </map>
-</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/A%2D6AM.xml b/linden/indra/newview/app_settings/windlight/skies/A%2D6AM.xml
deleted file mode 100644
index bbc7aee..0000000
--- a/linden/indra/newview/app_settings/windlight/skies/A%2D6AM.xml
+++ /dev/null
@@ -1,141 +0,0 @@
-<llsd>
-    <map>
-    <key>ambient</key>
-        <array>
-            <real>0.80999994277954102</real>
-            <real>0.46289783716201782</real>
-            <real>0.62999993562698364</real>
-            <real>0.26999998092651367</real>
-        </array>
-    <key>blue_density</key>
-        <array>
-            <real>0.15793180465698242</real>
-            <real>0.43499568104743958</real>
-            <real>0.87000000476837158</real>
-            <real>0.87000000476837158</real>
-        </array>
-    <key>blue_horizon</key>
-        <array>
-            <real>0.20673196017742157</real>
-            <real>0.40988314151763916</real>
-            <real>0.47999998927116394</real>
-            <real>0.47999998927116394</real>
-        </array>
-    <key>cloud_color</key>
-        <array>
-            <real>0.22616604226328718</real>
-            <real>0.22616604226328718</real>
-            <real>0.22616604226328718</real>
-            <real>0.99997219085526012</real>
-        </array>
-    <key>cloud_pos_density1</key>
-        <array>
-            <real>1.6884100437164307</real>
-            <real>0.52609699964523315</real>
-            <real>0.88000025272481253</real>
-            <real>1</real>
-        </array>
-    <key>cloud_pos_density2</key>
-        <array>
-            <real>1.6884100437164307</real>
-            <real>0.52609699964523315</real>
-            <real>0.125</real>
-            <real>1</real>
-        </array>
-    <key>cloud_scale</key>
-        <array>
-            <real>0.41999998688697815</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>cloud_scroll_rate</key>
-        <array>
-            <real>10.49940013883861</real>
-            <real>10.010999679576344</real>
-        </array>
-    <key>cloud_shadow</key>
-        <array>
-            <real>0.26999998092651367</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>density_multiplier</key>
-        <array>
-            <real>0.00062000000616535544</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>distance_multiplier</key>
-        <array>
-            <real>2.6999279499073054</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>east_angle</key>
-        <real>0</real>
-    <key>enable_cloud_scroll</key>
-        <array>
-            <boolean>1</boolean>
-            <boolean>1</boolean>
-        </array>
-    <key>gamma</key>
-        <array>
-            <real>1</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>glow</key>
-        <array>
-            <real>5.0009990693069994</real>
-            <real>0.0010000000474963411</real>
-            <real>-0.48000101923815919</real>
-            <real>1</real>
-        </array>
-    <key>haze_density</key>
-        <array>
-            <real>0.53999996185302734</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>haze_horizon</key>
-        <array>
-            <real>0.15999999642372131</real>
-            <real>0.19915600121021271</real>
-            <real>0.19915600121021271</real>
-            <real>1</real>
-        </array>
-    <key>lightnorm</key>
-        <array>
-            <real>0</real>
-            <real>0.094108223915100098</real>
-            <real>0.99556195735931396</real>
-            <real>0</real>
-        </array>
-    <key>max_y</key>
-        <array>
-            <real>563</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>preset_num</key>
-        <integer>22</integer>
-    <key>star_brightness</key>
-        <real>0</real>
-    <key>sun_angle</key>
-        <real>0.094247691333293915</real>
-    <key>sunlight_color</key>
-        <array>
-            <real>2.369999885559082</real>
-            <real>2.369999885559082</real>
-            <real>2.369999885559082</real>
-            <real>0.78999996185302734</real>
-        </array>
-    </map>
-</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/A%2D6PM.xml b/linden/indra/newview/app_settings/windlight/skies/A%2D6PM.xml
deleted file mode 100644
index ebf08e1..0000000
--- a/linden/indra/newview/app_settings/windlight/skies/A%2D6PM.xml
+++ /dev/null
@@ -1,142 +0,0 @@
-<llsd>
-    <map>
-    <key>ambient</key>
-        <array>
-            <real>1.0199999809265137</real>
-            <real>0.80999994277954102</real>
-            <real>0.80999994277954102</real>
-            <real>1.0199999809265137</real>
-        </array>
-    <key>blue_density</key>
-        <array>
-            <real>0.14522500336170197</real>
-            <real>0.39999699592590332</real>
-            <real>0.80000197887420654</real>
-            <real>1</real>
-        </array>
-    <key>blue_horizon</key>
-        <array>
-            <real>0.10767599940299988</real>
-            <real>0.21348699927330017</real>
-            <real>0.25</real>
-            <real>1</real>
-        </array>
-    <key>cloud_color</key>
-        <array>
-            <real>0.22615399956703186</real>
-            <real>0.22615399956703186</real>
-            <real>0.22615399956703186</real>
-            <real>1</real>
-        </array>
-    <key>cloud_pos_density1</key>
-        <array>
-            <real>1.6884100437164307</real>
-            <real>0.52609699964523315</real>
-            <real>0.87999999523162842</real>
-            <real>1</real>
-        </array>
-    <key>cloud_pos_density2</key>
-        <array>
-            <real>1.6884100437164307</real>
-            <real>0.52609699964523315</real>
-            <real>0.125</real>
-            <real>1</real>
-        </array>
-    <key>cloud_scale</key>
-        <array>
-            <real>0.41999998688697815</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>cloud_scroll_rate</key>
-        <array>
-            <real>10.49940013885498</real>
-            <real>10.01099967956543</real>
-        </array>
-    <key>cloud_shadow</key>
-        <array>
-            <real>0.26999998092651367</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>density_multiplier</key>
-        <array>
-            <real>0.00046000001020729542</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>distance_multiplier</key>
-        <array>
-            <real>1</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>east_angle</key>
-        <real>0</real>
-    <key>enable_cloud_scroll</key>
-        <array>
-            <boolean>1</boolean>
-            <boolean>1</boolean>
-        </array>
-    <key>gamma</key>
-        <array>
-            <real>1</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>glow</key>
-        <array>
-            <real>5</real>
-            <real>0.0010000000474974513</real>
-            <real>-0.47999998927116394</real>
-            <real>1</real>
-        </array>
-    <key>haze_density</key>
-        <array>
-            <real>0.69999998807907104</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>haze_horizon</key>
-        <array>
-            <real>0.15999999642372131</real>
-            <real>0.19915600121021271</real>
-            <real>0.19915600121021271</real>
-            <real>1</real>
-        </array>
-    <key>lightnorm</key>
-        <array>
-            <real>0</real>
-            <real>0.07532646507024765</real>
-            <real>-0.99715894460678101</real>
-            <real>0</real>
-        </array>
-    <key>max_y</key>
-        <array>
-            <real>562.5</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>preset_num</key>
-        <integer>22</integer>
-    <key>star_brightness</key>
-        <real>0</real>
-    <key>sun_angle</key>
-        <real>3.0661947727203369</real>
-    <key>sunlight_color</key>
-        <array>
-            <real>2.8385701179504395</real>
-            <real>2.8385701179504395</real>
-            <real>2.8385701179504395</real>
-            <real>1</real>
-        </array>
-    </map>
-</llsd>
-
diff --git a/linden/indra/newview/app_settings/windlight/skies/A%2D9AM.xml b/linden/indra/newview/app_settings/windlight/skies/A%2D9AM.xml
deleted file mode 100644
index 413e3a2..0000000
--- a/linden/indra/newview/app_settings/windlight/skies/A%2D9AM.xml
+++ /dev/null
@@ -1,141 +0,0 @@
-<llsd>
-    <map>
-    <key>ambient</key>
-        <array>
-            <real>1.0499999949065426</real>
-            <real>1.0499999988079054</real>
-            <real>1.0499999988079054</real>
-            <real>0.3500000095367426</real>
-        </array>
-    <key>blue_density</key>
-        <array>
-            <real>0.15999999642372131</real>
-            <real>0.44872328639030457</real>
-            <real>0.75999999046325684</real>
-            <real>0.75999999046325684</real>
-        </array>
-    <key>blue_horizon</key>
-        <array>
-            <real>0.53999996185302734</real>
-            <real>0.47999998927116394</real>
-            <real>0.69999998807907104</real>
-            <real>0.34999999403953552</real>
-        </array>
-    <key>cloud_color</key>
-        <array>
-            <real>0.37000000476837158</real>
-            <real>0.37000000476837158</real>
-            <real>0.37000000476837158</real>
-            <real>0.37000000476837158</real>
-        </array>
-    <key>cloud_pos_density1</key>
-        <array>
-            <real>1.6884100437164307</real>
-            <real>0.52609699964523315</real>
-            <real>0.99999998569455784</real>
-            <real>1</real>
-        </array>
-    <key>cloud_pos_density2</key>
-        <array>
-            <real>1.6884100437164307</real>
-            <real>0.52609699964523315</real>
-            <real>0.125</real>
-            <real>1</real>
-        </array>
-    <key>cloud_scale</key>
-        <array>
-            <real>0.41999997615814166</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>cloud_scroll_rate</key>
-        <array>
-            <real>10.199999844956437</real>
-            <real>10.01099967956543</real>
-        </array>
-    <key>cloud_shadow</key>
-        <array>
-            <real>0.27333331108093262</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>density_multiplier</key>
-        <array>
-            <real>0.00017999998102430359</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>distance_multiplier</key>
-        <array>
-            <real>0.80000008344649842</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>east_angle</key>
-        <real>0</real>
-    <key>enable_cloud_scroll</key>
-        <array>
-            <boolean>1</boolean>
-            <boolean>1</boolean>
-        </array>
-    <key>gamma</key>
-        <array>
-            <real>1</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>glow</key>
-        <array>
-            <real>4.9999999284740397</real>
-            <real>0.0010000000474974513</real>
-            <real>-0.47999999046327346</real>
-            <real>1</real>
-        </array>
-    <key>haze_density</key>
-        <array>
-            <real>0.70000003576435432</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>haze_horizon</key>
-        <array>
-            <real>0.18999999284767277</real>
-            <real>0.19915600121021271</real>
-            <real>0.19915600121021271</real>
-            <real>1</real>
-        </array>
-    <key>lightnorm</key>
-        <array>
-            <real>0</real>
-            <real>0.70710676908493042</real>
-            <real>0.70710676908493042</real>
-            <real>0</real>
-        </array>
-    <key>max_y</key>
-        <array>
-            <real>1605</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>preset_num</key>
-        <integer>22</integer>
-    <key>star_brightness</key>
-        <real>0</real>
-    <key>sun_angle</key>
-        <real>0.78539818525314331</real>
-    <key>sunlight_color</key>
-        <array>
-            <real>0.73421054104441197</real>
-            <real>0.7815789463510896</real>
-            <real>0.89999995470046912</real>
-            <real>0.29999997496605069</real>
-        </array>
-    </map>
-</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/A%2D9PM.xml b/linden/indra/newview/app_settings/windlight/skies/A%2D9PM.xml
deleted file mode 100644
index 292f671..0000000
--- a/linden/indra/newview/app_settings/windlight/skies/A%2D9PM.xml
+++ /dev/null
@@ -1,141 +0,0 @@
-<llsd>
-    <map>
-    <key>ambient</key>
-        <array>
-            <real>0.20404692765200849</real>
-            <real>0.24246276689169122</real>
-            <real>0.33000383615406292</real>
-            <real>0.1100123608103587</real>
-        </array>
-    <key>blue_density</key>
-        <array>
-            <real>0.44999116536295314</real>
-            <real>0.44999854555993368</real>
-            <real>0.45001013284446073</real>
-            <real>1</real>
-        </array>
-    <key>blue_horizon</key>
-        <array>
-            <real>0.23999616268583132</real>
-            <real>0.239999227803052</real>
-            <real>0.24000028550619668</real>
-            <real>1</real>
-        </array>
-    <key>cloud_color</key>
-        <array>
-            <real>0.22615400241566114</real>
-            <real>0.22615400241566114</real>
-            <real>0.22615400241566114</real>
-            <real>1</real>
-        </array>
-    <key>cloud_pos_density1</key>
-        <array>
-            <real>1.6884100437164307</real>
-            <real>0.52609699964523315</real>
-            <real>0.88000000953681223</real>
-            <real>1</real>
-        </array>
-    <key>cloud_pos_density2</key>
-        <array>
-            <real>1.6884100437164307</real>
-            <real>0.52609699964523315</real>
-            <real>0.125</real>
-            <real>1</real>
-        </array>
-    <key>cloud_scale</key>
-        <array>
-            <real>0.41999998688697815</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>cloud_scroll_rate</key>
-        <array>
-            <real>10.499400354105791</real>
-            <real>10.011000104419489</real>
-        </array>
-    <key>cloud_shadow</key>
-        <array>
-            <real>0.26999998092651367</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>density_multiplier</key>
-        <array>
-            <real>0.0003000046529240592</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>distance_multiplier</key>
-        <array>
-            <real>7.8213197608078763e-005</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>east_angle</key>
-        <real>0</real>
-    <key>enable_cloud_scroll</key>
-        <array>
-            <boolean>1</boolean>
-            <boolean>1</boolean>
-        </array>
-    <key>gamma</key>
-        <array>
-            <real>1</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>glow</key>
-        <array>
-            <real>5.0000000000023022</real>
-            <real>0.0010000000214220922</real>
-            <real>-0.47999999165507345</real>
-            <real>1</real>
-        </array>
-    <key>haze_density</key>
-        <array>
-            <real>3.9999044060931555</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>haze_horizon</key>
-        <array>
-            <real>4.6348559691012062e-006</real>
-            <real>0.19915600437461423</real>
-            <real>0.19915600437461423</real>
-            <real>1</real>
-        </array>
-    <key>lightnorm</key>
-        <array>
-            <real>0</real>
-            <real>0.70710688829421997</real>
-            <real>0.70710664987564087</real>
-            <real>1</real>
-        </array>
-    <key>max_y</key>
-        <array>
-            <real>906.19008370909478</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>preset_num</key>
-        <integer>22</integer>
-    <key>star_brightness</key>
-        <real>1.9999420642852783</real>
-    <key>sun_angle</key>
-        <real>3.9269909858703613</real>
-    <key>sunlight_color</key>
-        <array>
-            <real>0.34878980098432066</real>
-            <real>0.35576509414380553</real>
-            <real>0.66003586768772493</real>
-            <real>0.22001197576412324</real>
-        </array>
-    </map>
-</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/Barcelona.xml b/linden/indra/newview/app_settings/windlight/skies/Barcelona.xml
deleted file mode 100644
index ea9cab8..0000000
--- a/linden/indra/newview/app_settings/windlight/skies/Barcelona.xml
+++ /dev/null
@@ -1,141 +0,0 @@
-<llsd>
-    <map>
-    <key>ambient</key>
-        <array>
-            <real>0.22260047495365143</real>
-            <real>0.26450866460800171</real>
-            <real>0.35999998450279236</real>
-            <real>0.11999999731779099</real>
-        </array>
-    <key>blue_density</key>
-        <array>
-            <real>0.14522500336170197</real>
-            <real>0.39999699592590332</real>
-            <real>0.80000197887420654</real>
-            <real>1</real>
-        </array>
-    <key>blue_horizon</key>
-        <array>
-            <real>0.15130999684333801</real>
-            <real>0.30000001192092896</real>
-            <real>0.35131001472473145</real>
-            <real>1</real>
-        </array>
-    <key>cloud_color</key>
-        <array>
-            <real>0.50999999046325684</real>
-            <real>0.50999999046325684</real>
-            <real>0.50999999046325684</real>
-            <real>1</real>
-        </array>
-    <key>cloud_pos_density1</key>
-        <array>
-            <real>0.5</real>
-            <real>0.5</real>
-            <real>1</real>
-            <real>1</real>
-        </array>
-    <key>cloud_pos_density2</key>
-        <array>
-            <real>0.5</real>
-            <real>0.5</real>
-            <real>0.125</real>
-            <real>1</real>
-        </array>
-    <key>cloud_scale</key>
-        <array>
-            <real>0.41999998688697815</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>cloud_scroll_rate</key>
-        <array>
-            <real>10.49940013885498</real>
-            <real>10.01099967956543</real>
-        </array>
-    <key>cloud_shadow</key>
-        <array>
-            <real>0.30000001192092896</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>density_multiplier</key>
-        <array>
-            <real>0.0003499999875202775</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>distance_multiplier</key>
-        <array>
-            <real>6</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>east_angle</key>
-        <real>0</real>
-    <key>enable_cloud_scroll</key>
-        <array>
-            <boolean>1</boolean>
-            <boolean>1</boolean>
-        </array>
-    <key>gamma</key>
-        <array>
-            <real>1</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>glow</key>
-        <array>
-            <real>5</real>
-            <real>0.0010000000474974513</real>
-            <real>-0.33000001311302185</real>
-            <real>1</real>
-        </array>
-    <key>haze_density</key>
-        <array>
-            <real>0.69999998807907104</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>haze_horizon</key>
-        <array>
-            <real>0.19915600121021271</real>
-            <real>0.19915600121021271</real>
-            <real>0.19915600121021271</real>
-            <real>1</real>
-        </array>
-    <key>lightnorm</key>
-        <array>
-            <real>0</real>
-            <real>0.062790460884571075</real>
-            <real>-0.99802672863006592</real>
-            <real>0</real>
-        </array>
-    <key>max_y</key>
-        <array>
-            <real>600</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>preset_num</key>
-        <integer>21</integer>
-    <key>star_brightness</key>
-        <real>0</real>
-    <key>sun_angle</key>
-        <real>3.0787608623504639</real>
-    <key>sunlight_color</key>
-        <array>
-            <real>1.1699999570846558</real>
-            <real>1.1699999570846558</real>
-            <real>1.1699999570846558</real>
-            <real>0.38999998569488525</real>
-        </array>
-    </map>
-</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/Blizzard.xml b/linden/indra/newview/app_settings/windlight/skies/Blizzard.xml
deleted file mode 100644
index d17d279..0000000
--- a/linden/indra/newview/app_settings/windlight/skies/Blizzard.xml
+++ /dev/null
@@ -1,141 +0,0 @@
-<llsd>
-    <map>
-    <key>ambient</key>
-        <array>
-            <real>0.4823022186756134</real>
-            <real>0.57310229539871216</real>
-            <real>0.77999997138977051</real>
-            <real>0.25999999046325684</real>
-        </array>
-    <key>blue_density</key>
-        <array>
-            <real>0.14522500336170197</real>
-            <real>0.39999699592590332</real>
-            <real>0.80000197887420654</real>
-            <real>1</real>
-        </array>
-    <key>blue_horizon</key>
-        <array>
-            <real>0.15130999684333801</real>
-            <real>0.30000001192092896</real>
-            <real>0.35131001472473145</real>
-            <real>1</real>
-        </array>
-    <key>cloud_color</key>
-        <array>
-            <real>0.12862999737262726</real>
-            <real>0.12862999737262726</real>
-            <real>0.12862999737262726</real>
-            <real>1</real>
-        </array>
-    <key>cloud_pos_density1</key>
-        <array>
-            <real>0.88419097661972046</real>
-            <real>0.53047597408294678</real>
-            <real>0.4270470142364502</real>
-            <real>1</real>
-        </array>
-    <key>cloud_pos_density2</key>
-        <array>
-            <real>0.38419300317764282</real>
-            <real>0.5</real>
-            <real>0.125</real>
-            <real>1</real>
-        </array>
-    <key>cloud_scale</key>
-        <array>
-            <real>0.41999998688697815</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>cloud_scroll_rate</key>
-        <array>
-            <real>10</real>
-            <real>10</real>
-        </array>
-    <key>cloud_shadow</key>
-        <array>
-            <real>0.61711597442626953</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>density_multiplier</key>
-        <array>
-            <real>0.0001250890054507181</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>distance_multiplier</key>
-        <array>
-            <real>11.40000057220459</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>east_angle</key>
-        <real>0</real>
-    <key>enable_cloud_scroll</key>
-        <array>
-            <boolean>1</boolean>
-            <boolean>1</boolean>
-        </array>
-    <key>gamma</key>
-        <array>
-            <real>1</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>glow</key>
-        <array>
-            <real>6.4079799652099609</real>
-            <real>0.0012815999798476696</real>
-            <real>-0.42292699217796326</real>
-            <real>1</real>
-        </array>
-    <key>haze_density</key>
-        <array>
-            <real>4</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>haze_horizon</key>
-        <array>
-            <real>0.21744099259376526</real>
-            <real>0.21744099259376526</real>
-            <real>0.21744099259376526</real>
-            <real>1</real>
-        </array>
-    <key>lightnorm</key>
-        <array>
-            <real>0</real>
-            <real>0.15643447637557983</real>
-            <real>0.98768836259841919</real>
-            <real>0</real>
-        </array>
-    <key>max_y</key>
-        <array>
-            <real>4000</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>preset_num</key>
-        <integer>2</integer>
-    <key>star_brightness</key>
-        <real>0</real>
-    <key>sun_angle</key>
-        <real>0.15707963705062866</real>
-    <key>sunlight_color</key>
-        <array>
-            <real>3</real>
-            <real>3</real>
-            <real>3</real>
-            <real>1</real>
-        </array>
-    </map>
-</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/Blue%20Midday.xml b/linden/indra/newview/app_settings/windlight/skies/Blue%20Midday.xml
deleted file mode 100644
index 570f059..0000000
--- a/linden/indra/newview/app_settings/windlight/skies/Blue%20Midday.xml
+++ /dev/null
@@ -1,141 +0,0 @@
-<llsd>
-    <map>
-    <key>ambient</key>
-        <array>
-            <real>0.14999999105930328</real>
-            <real>0.14999999105930328</real>
-            <real>0.14999999105930328</real>
-            <real>0.049999997019767761</real>
-        </array>
-    <key>blue_density</key>
-        <array>
-            <real>0.18153078854084015</real>
-            <real>0.49999505281448364</real>
-            <real>1</real>
-            <real>1</real>
-        </array>
-    <key>blue_horizon</key>
-        <array>
-            <real>0.43070217967033386</real>
-            <real>0.85394656658172607</real>
-            <real>1</real>
-            <real>1</real>
-        </array>
-    <key>cloud_color</key>
-        <array>
-            <real>0.53962135314941406</real>
-            <real>0.53962135314941406</real>
-            <real>0.53962135314941406</real>
-            <real>1</real>
-        </array>
-    <key>cloud_pos_density1</key>
-        <array>
-            <real>0.5</real>
-            <real>0.5</real>
-            <real>0.69569224119186401</real>
-            <real>1</real>
-        </array>
-    <key>cloud_pos_density2</key>
-        <array>
-            <real>0.5</real>
-            <real>0.5</real>
-            <real>0.125</real>
-            <real>1</real>
-        </array>
-    <key>cloud_scale</key>
-        <array>
-            <real>0.10999999195337296</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>cloud_scroll_rate</key>
-        <array>
-            <real>10.49940013885498</real>
-            <real>10.01099967956543</real>
-        </array>
-    <key>cloud_shadow</key>
-        <array>
-            <real>0.3765256404876709</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>density_multiplier</key>
-        <array>
-            <real>0.0003499999875202775</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>distance_multiplier</key>
-        <array>
-            <real>2.9846153259277344</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>east_angle</key>
-        <real>0</real>
-    <key>enable_cloud_scroll</key>
-        <array>
-            <boolean>1</boolean>
-            <boolean>1</boolean>
-        </array>
-    <key>gamma</key>
-        <array>
-            <real>1</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>glow</key>
-        <array>
-            <real>4.2061538696289062</real>
-            <real>0.0010000000474974513</real>
-            <real>-0.44246155023574829</real>
-            <real>1</real>
-        </array>
-    <key>haze_density</key>
-        <array>
-            <real>2.8830769062042236</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>haze_horizon</key>
-        <array>
-            <real>0.49740666151046753</real>
-            <real>0.19915600121021271</real>
-            <real>0.19915600121021271</real>
-            <real>1</real>
-        </array>
-    <key>lightnorm</key>
-        <array>
-            <real>0</real>
-            <real>0.86074197292327881</real>
-            <real>-0.50904154777526855</real>
-            <real>0</real>
-        </array>
-    <key>max_y</key>
-        <array>
-            <real>600</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>preset_num</key>
-        <integer>10</integer>
-    <key>star_brightness</key>
-        <real>0</real>
-    <key>sun_angle</key>
-        <real>2.1048672199249268</real>
-    <key>sunlight_color</key>
-        <array>
-            <real>0.88526362180709839</real>
-            <real>1.2300000190734863</real>
-            <real>1.2300000190734863</real>
-            <real>0.40999999642372131</real>
-        </array>
-    </map>
-</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/Coastal%20Afternoon.xml b/linden/indra/newview/app_settings/windlight/skies/Coastal%20Afternoon.xml
deleted file mode 100644
index 4925b29..0000000
--- a/linden/indra/newview/app_settings/windlight/skies/Coastal%20Afternoon.xml
+++ /dev/null
@@ -1,141 +0,0 @@
-<llsd>
-    <map>
-    <key>ambient</key>
-        <array>
-            <real>0.89040267467498779</real>
-            <real>1.0580335855484009</real>
-            <real>1.4399999380111694</real>
-            <real>0.47999998927116394</real>
-        </array>
-    <key>blue_density</key>
-        <array>
-            <real>0.14522500336170197</real>
-            <real>0.39999699592590332</real>
-            <real>0.80000197887420654</real>
-            <real>1</real>
-        </array>
-    <key>blue_horizon</key>
-        <array>
-            <real>0.15130999684333801</real>
-            <real>0.30000001192092896</real>
-            <real>0.35131001472473145</real>
-            <real>1</real>
-        </array>
-    <key>cloud_color</key>
-        <array>
-            <real>0.21396400034427643</real>
-            <real>0.21396400034427643</real>
-            <real>0.21396400034427643</real>
-            <real>1</real>
-        </array>
-    <key>cloud_pos_density1</key>
-        <array>
-            <real>0.16495099663734436</real>
-            <real>0.09771379828453064</real>
-            <real>1</real>
-            <real>1</real>
-        </array>
-    <key>cloud_pos_density2</key>
-        <array>
-            <real>0.5</real>
-            <real>0.5</real>
-            <real>0.079754598438739777</real>
-            <real>1</real>
-        </array>
-    <key>cloud_scale</key>
-        <array>
-            <real>0.41999998688697815</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>cloud_scroll_rate</key>
-        <array>
-            <real>9.644780158996582</real>
-            <real>10.423800468444824</real>
-        </array>
-    <key>cloud_shadow</key>
-        <array>
-            <real>0.30061298608779907</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>density_multiplier</key>
-        <array>
-            <real>0.00015800200344529003</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>distance_multiplier</key>
-        <array>
-            <real>1</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>east_angle</key>
-        <real>0</real>
-    <key>enable_cloud_scroll</key>
-        <array>
-            <boolean>1</boolean>
-            <boolean>1</boolean>
-        </array>
-    <key>gamma</key>
-        <array>
-            <real>1</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>glow</key>
-        <array>
-            <real>5</real>
-            <real>0.0010000000474974513</real>
-            <real>-0.33000001311302185</real>
-            <real>1</real>
-        </array>
-    <key>haze_density</key>
-        <array>
-            <real>0.69999998807907104</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>haze_horizon</key>
-        <array>
-            <real>0.13210900127887726</real>
-            <real>0.13210900127887726</real>
-            <real>0.13210900127887726</real>
-            <real>1</real>
-        </array>
-    <key>lightnorm</key>
-        <array>
-            <real>0</real>
-            <real>0.031410444527864456</real>
-            <real>-0.99950659275054932</real>
-            <real>0</real>
-        </array>
-    <key>max_y</key>
-        <array>
-            <real>600</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>preset_num</key>
-        <integer>3</integer>
-    <key>star_brightness</key>
-        <real>0</real>
-    <key>sun_angle</key>
-        <real>3.1101770401000977</real>
-    <key>sunlight_color</key>
-        <array>
-            <real>3</real>
-            <real>3</real>
-            <real>3</real>
-            <real>1</real>
-        </array>
-    </map>
-</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/Coastal%20Sunset.xml b/linden/indra/newview/app_settings/windlight/skies/Coastal%20Sunset.xml
deleted file mode 100644
index f4736cf..0000000
--- a/linden/indra/newview/app_settings/windlight/skies/Coastal%20Sunset.xml
+++ /dev/null
@@ -1,141 +0,0 @@
-<llsd>
-    <map>
-    <key>ambient</key>
-        <array>
-            <real>0.31535112857818604</real>
-            <real>0.37471914291381836</real>
-            <real>0.50999999046325684</real>
-            <real>0.17000000178813934</real>
-        </array>
-    <key>blue_density</key>
-        <array>
-            <real>0.11645399779081345</real>
-            <real>0.32075101137161255</real>
-            <real>0.64150899648666382</real>
-            <real>1</real>
-        </array>
-    <key>blue_horizon</key>
-        <array>
-            <real>0.054176401346921921</real>
-            <real>0.10741499811410904</real>
-            <real>0.12578600645065308</real>
-            <real>1</real>
-        </array>
-    <key>cloud_color</key>
-        <array>
-            <real>0.21396400034427643</real>
-            <real>0.21396400034427643</real>
-            <real>0.21396400034427643</real>
-            <real>1</real>
-        </array>
-    <key>cloud_pos_density1</key>
-        <array>
-            <real>0.27044001221656799</real>
-            <real>1</real>
-            <real>1</real>
-            <real>1</real>
-        </array>
-    <key>cloud_pos_density2</key>
-        <array>
-            <real>0.5</real>
-            <real>0.5</real>
-            <real>0.10062900185585022</real>
-            <real>1</real>
-        </array>
-    <key>cloud_scale</key>
-        <array>
-            <real>0.41999998688697815</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>cloud_scroll_rate</key>
-        <array>
-            <real>9.644780158996582</real>
-            <real>10.423800468444824</real>
-        </array>
-    <key>cloud_shadow</key>
-        <array>
-            <real>0.32704401016235352</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>density_multiplier</key>
-        <array>
-            <real>0.00015849100600462407</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>distance_multiplier</key>
-        <array>
-            <real>3.4000000953674316</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>east_angle</key>
-        <real>0</real>
-    <key>enable_cloud_scroll</key>
-        <array>
-            <boolean>1</boolean>
-            <boolean>1</boolean>
-        </array>
-    <key>gamma</key>
-        <array>
-            <real>1</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>glow</key>
-        <array>
-            <real>6.867919921875</real>
-            <real>0.0013735899701714516</real>
-            <real>-0.45328301191329956</real>
-            <real>1</real>
-        </array>
-    <key>haze_density</key>
-        <array>
-            <real>0.6792449951171875</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>haze_horizon</key>
-        <array>
-            <real>0.13210900127887726</real>
-            <real>0.13210900127887726</real>
-            <real>0.13210900127887726</real>
-            <real>1</real>
-        </array>
-    <key>lightnorm</key>
-        <array>
-            <real>0</real>
-            <real>0.031410444527864456</real>
-            <real>-0.99950659275054932</real>
-            <real>0</real>
-        </array>
-    <key>max_y</key>
-        <array>
-            <real>1308.1800537109375</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>preset_num</key>
-        <integer>5</integer>
-    <key>star_brightness</key>
-        <real>0</real>
-    <key>sun_angle</key>
-        <real>3.1101770401000977</real>
-    <key>sunlight_color</key>
-        <array>
-            <real>3</real>
-            <real>3</real>
-            <real>3</real>
-            <real>1</real>
-        </array>
-    </map>
-</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/Default.xml b/linden/indra/newview/app_settings/windlight/skies/Default.xml
deleted file mode 100644
index 13a2c75..0000000
--- a/linden/indra/newview/app_settings/windlight/skies/Default.xml
+++ /dev/null
@@ -1,141 +0,0 @@
-<llsd>
-    <map>
-    <key>ambient</key>
-        <array>
-            <real>1.0499999523162842</real>
-            <real>1.0499999523162842</real>
-            <real>1.0499999523162842</real>
-            <real>0.34999999403953552</real>
-        </array>
-    <key>blue_density</key>
-        <array>
-            <real>0.24475815892219543</real>
-            <real>0.44872328639030457</real>
-            <real>0.75999999046325684</real>
-            <real>0.37999999523162842</real>
-        </array>
-    <key>blue_horizon</key>
-        <array>
-            <real>0.49548381567001343</real>
-            <real>0.49548381567001343</real>
-            <real>0.63999998569488525</real>
-            <real>0.31999999284744263</real>
-        </array>
-    <key>cloud_color</key>
-        <array>
-            <real>0.40999999642372131</real>
-            <real>0.40999999642372131</real>
-            <real>0.40999999642372131</real>
-            <real>0.40999999642372131</real>
-        </array>
-    <key>cloud_pos_density1</key>
-        <array>
-            <real>1.6884100437164307</real>
-            <real>0.52609699964523315</real>
-            <real>1</real>
-            <real>1</real>
-        </array>
-    <key>cloud_pos_density2</key>
-        <array>
-            <real>1.6884100437164307</real>
-            <real>0.52609699964523315</real>
-            <real>0.125</real>
-            <real>1</real>
-        </array>
-    <key>cloud_scale</key>
-        <array>
-            <real>0.41999998688697815</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>cloud_scroll_rate</key>
-        <array>
-            <real>10.199999809265137</real>
-            <real>10.01099967956543</real>
-        </array>
-    <key>cloud_shadow</key>
-        <array>
-            <real>0.26999998092651367</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>density_multiplier</key>
-        <array>
-            <real>0.00017999998817685992</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>distance_multiplier</key>
-        <array>
-            <real>0.80000001192092896</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>east_angle</key>
-        <real>0</real>
-    <key>enable_cloud_scroll</key>
-        <array>
-            <boolean>1</boolean>
-            <boolean>1</boolean>
-        </array>
-    <key>gamma</key>
-        <array>
-            <real>1</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>glow</key>
-        <array>
-            <real>5</real>
-            <real>0.0010000000474974513</real>
-            <real>-0.47999998927116394</real>
-            <real>1</real>
-        </array>
-    <key>haze_density</key>
-        <array>
-            <real>0.69999998807907104</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>haze_horizon</key>
-        <array>
-            <real>0.18999999761581421</real>
-            <real>0.19915600121021271</real>
-            <real>0.19915600121021271</real>
-            <real>1</real>
-        </array>
-    <key>lightnorm</key>
-        <array>
-            <real>0</real>
-            <real>0.91269159317016602</real>
-            <real>-0.40864911675453186</real>
-            <real>0</real>
-        </array>
-    <key>max_y</key>
-        <array>
-            <real>1605</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>preset_num</key>
-        <integer>22</integer>
-    <key>star_brightness</key>
-        <real>0</real>
-    <key>sun_angle</key>
-        <real>1.9917697906494141</real>
-    <key>sunlight_color</key>
-        <array>
-            <real>0.7342105507850647</real>
-            <real>0.78157895803451538</real>
-            <real>0.89999997615814209</real>
-            <real>0.29999998211860657</real>
-        </array>
-    </map>
-</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/Desert%20Sunset.xml b/linden/indra/newview/app_settings/windlight/skies/Desert%20Sunset.xml
deleted file mode 100644
index b2a6111..0000000
--- a/linden/indra/newview/app_settings/windlight/skies/Desert%20Sunset.xml
+++ /dev/null
@@ -1,141 +0,0 @@
-<llsd>
-    <map>
-    <key>ambient</key>
-        <array>
-            <real>0.07420019805431366</real>
-            <real>0.088169597089290619</real>
-            <real>0.11999999731779099</real>
-            <real>1</real>
-        </array>
-    <key>blue_density</key>
-        <array>
-            <real>0.14522500336170197</real>
-            <real>0.39999699592590332</real>
-            <real>0.80000197887420654</real>
-            <real>1</real>
-        </array>
-    <key>blue_horizon</key>
-        <array>
-            <real>0.10767599940299988</real>
-            <real>0.21348699927330017</real>
-            <real>0.25</real>
-            <real>1</real>
-        </array>
-    <key>cloud_color</key>
-        <array>
-            <real>0.22615399956703186</real>
-            <real>0.22615399956703186</real>
-            <real>0.22615399956703186</real>
-            <real>1</real>
-        </array>
-    <key>cloud_pos_density1</key>
-        <array>
-            <real>1.6884100437164307</real>
-            <real>0.52609699964523315</real>
-            <real>1</real>
-            <real>1</real>
-        </array>
-    <key>cloud_pos_density2</key>
-        <array>
-            <real>1.6884100437164307</real>
-            <real>0.52609699964523315</real>
-            <real>0.125</real>
-            <real>1</real>
-        </array>
-    <key>cloud_scale</key>
-        <array>
-            <real>0.41999998688697815</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>cloud_scroll_rate</key>
-        <array>
-            <real>10.199999809265137</real>
-            <real>10.01099967956543</real>
-        </array>
-    <key>cloud_shadow</key>
-        <array>
-            <real>0.37999999523162842</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>density_multiplier</key>
-        <array>
-            <real>0.00046000001020729542</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>distance_multiplier</key>
-        <array>
-            <real>2</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>east_angle</key>
-        <real>0</real>
-    <key>enable_cloud_scroll</key>
-        <array>
-            <boolean>1</boolean>
-            <boolean>1</boolean>
-        </array>
-    <key>gamma</key>
-        <array>
-            <real>1.6100000143051147</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>glow</key>
-        <array>
-            <real>5</real>
-            <real>0.0010000000474974513</real>
-            <real>-0.47999998927116394</real>
-            <real>1</real>
-        </array>
-    <key>haze_density</key>
-        <array>
-            <real>0.69999998807907104</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>haze_horizon</key>
-        <array>
-            <real>0.15999999642372131</real>
-            <real>0.19915600121021271</real>
-            <real>0.19915600121021271</real>
-            <real>1</real>
-        </array>
-    <key>lightnorm</key>
-        <array>
-            <real>0</real>
-            <real>0.062790460884571075</real>
-            <real>-0.99802672863006592</real>
-            <real>0</real>
-        </array>
-    <key>max_y</key>
-        <array>
-            <real>562.5</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>preset_num</key>
-        <integer>22</integer>
-    <key>star_brightness</key>
-        <real>0</real>
-    <key>sun_angle</key>
-        <real>3.0787608623504639</real>
-    <key>sunlight_color</key>
-        <array>
-            <real>2.8385701179504395</real>
-            <real>2.8385701179504395</real>
-            <real>2.8385701179504395</real>
-            <real>1</real>
-        </array>
-    </map>
-</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/Fine%20Day.xml b/linden/indra/newview/app_settings/windlight/skies/Fine%20Day.xml
deleted file mode 100644
index e053815..0000000
--- a/linden/indra/newview/app_settings/windlight/skies/Fine%20Day.xml
+++ /dev/null
@@ -1,141 +0,0 @@
-<llsd>
-    <map>
-    <key>ambient</key>
-        <array>
-            <real>0.21194984018802643</real>
-            <real>0.25700280070304871</real>
-            <real>0.25999999046325684</real>
-            <real>0.25999999046325684</real>
-        </array>
-    <key>blue_density</key>
-        <array>
-            <real>0.10031381994485855</real>
-            <real>0.2849995493888855</real>
-            <real>0.56999999284744263</real>
-            <real>0.56999999284744263</real>
-        </array>
-    <key>blue_horizon</key>
-        <array>
-            <real>0.15806557238101959</real>
-            <real>0.31211116909980774</real>
-            <real>0.52999997138977051</real>
-            <real>0.52999997138977051</real>
-        </array>
-    <key>cloud_color</key>
-        <array>
-            <real>0.62000000476837158</real>
-            <real>0.72737622261047363</real>
-            <real>0.73626559972763062</real>
-            <real>1</real>
-        </array>
-    <key>cloud_pos_density1</key>
-        <array>
-            <real>0.89999997615814209</real>
-            <real>0.93999999761581421</real>
-            <real>0.74000000953674316</real>
-            <real>1</real>
-        </array>
-    <key>cloud_pos_density2</key>
-        <array>
-            <real>0.11999999731779099</real>
-            <real>0.20999999344348907</real>
-            <real>0.029999999329447746</real>
-            <real>1</real>
-        </array>
-    <key>cloud_scale</key>
-        <array>
-            <real>0.25999999046325684</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>cloud_scroll_rate</key>
-        <array>
-            <real>9.993240904292179</real>
-            <real>10.010000228881836</real>
-        </array>
-    <key>cloud_shadow</key>
-        <array>
-            <real>0.29999998211860657</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>density_multiplier</key>
-        <array>
-            <real>0.00013000000035390258</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>distance_multiplier</key>
-        <array>
-            <real>10.100000381469727</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>east_angle</key>
-        <real>3.8955750465393066</real>
-    <key>enable_cloud_scroll</key>
-        <array>
-            <boolean>1</boolean>
-            <boolean>1</boolean>
-        </array>
-    <key>gamma</key>
-        <array>
-            <real>1.4699999094009399</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>glow</key>
-        <array>
-            <real>11.200000762939453</real>
-            <real>0.0010000000474974513</real>
-            <real>-0.64999997615814209</real>
-            <real>1</real>
-        </array>
-    <key>haze_density</key>
-        <array>
-            <real>0.35999998450279236</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>haze_horizon</key>
-        <array>
-            <real>0.11999999731779099</real>
-            <real>0.19915600121021271</real>
-            <real>0.19915600121021271</real>
-            <real>1</real>
-        </array>
-    <key>lightnorm</key>
-        <array>
-            <real>0.66304093599319458</real>
-            <real>0.24868990480899811</real>
-            <real>-0.70606660842895508</real>
-            <real>0</real>
-        </array>
-    <key>max_y</key>
-        <array>
-            <real>789</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>preset_num</key>
-        <integer>24</integer>
-    <key>star_brightness</key>
-        <real>0.18999999761581421</real>
-    <key>sun_angle</key>
-        <real>0.25132742524147034</real>
-    <key>sunlight_color</key>
-        <array>
-            <real>2.25</real>
-            <real>1.2599999904632568</real>
-            <real>0.59999996423721313</real>
-            <real>2.25</real>
-        </array>
-    </map>
-</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/Fluffy%20Big%20Clouds.xml b/linden/indra/newview/app_settings/windlight/skies/Fluffy%20Big%20Clouds.xml
deleted file mode 100644
index 8576ec1..0000000
--- a/linden/indra/newview/app_settings/windlight/skies/Fluffy%20Big%20Clouds.xml
+++ /dev/null
@@ -1,141 +0,0 @@
-<llsd>
-    <map>
-    <key>ambient</key>
-        <array>
-            <real>0.029999999329447746</real>
-            <real>0</real>
-            <real>0</real>
-            <real>0.029999999329447746</real>
-        </array>
-    <key>blue_density</key>
-        <array>
-            <real>0.097999997437000275</real>
-            <real>0.2800000011920929</real>
-            <real>1</real>
-            <real>1</real>
-        </array>
-    <key>blue_horizon</key>
-        <array>
-            <real>0.11999999731779099</real>
-            <real>0.35094299912452698</real>
-            <real>1</real>
-            <real>1</real>
-        </array>
-    <key>cloud_color</key>
-        <array>
-            <real>0.48999997973442078</real>
-            <real>0.79000002145767212</real>
-            <real>0.80000001192092896</real>
-            <real>1</real>
-        </array>
-    <key>cloud_pos_density1</key>
-        <array>
-            <real>0.53999996185302734</real>
-            <real>0.5</real>
-            <real>0.75999999046325684</real>
-            <real>1</real>
-        </array>
-    <key>cloud_pos_density2</key>
-        <array>
-            <real>0.38999998569488525</real>
-            <real>0.5</real>
-            <real>0.039999999105930328</real>
-            <real>1</real>
-        </array>
-    <key>cloud_scale</key>
-        <array>
-            <real>0.43999999761581421</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>cloud_scroll_rate</key>
-        <array>
-            <real>11.809999465942383</real>
-            <real>12.799999237060547</real>
-        </array>
-    <key>cloud_shadow</key>
-        <array>
-            <real>0.32999998331069946</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>density_multiplier</key>
-        <array>
-            <real>0.00021999998716637492</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>distance_multiplier</key>
-        <array>
-            <real>4</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>east_angle</key>
-        <real>3.2044246196746826</real>
-    <key>enable_cloud_scroll</key>
-        <array>
-            <boolean>1</boolean>
-            <boolean>1</boolean>
-        </array>
-    <key>gamma</key>
-        <array>
-            <real>1.5399999618530273</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>glow</key>
-        <array>
-            <real>3.8000010331979865</real>
-            <real>0.001000000059761974</real>
-            <real>-0.49999996688498527</real>
-            <real>1</real>
-        </array>
-    <key>haze_density</key>
-        <array>
-            <real>0.20999999344348907</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>haze_horizon</key>
-        <array>
-            <real>0.049999997019767761</real>
-            <real>0.19915600121021271</real>
-            <real>0.19915600121021271</real>
-            <real>1</real>
-        </array>
-    <key>lightnorm</key>
-        <array>
-            <real>0.056814663112163544</real>
-            <real>0.42577928304672241</real>
-            <real>-0.90304160118103027</real>
-            <real>0</real>
-        </array>
-    <key>max_y</key>
-        <array>
-            <real>676.10003662109375</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>preset_num</key>
-        <integer>18</integer>
-    <key>star_brightness</key>
-        <real>0.44999998807907104</real>
-    <key>sun_angle</key>
-        <real>0.4398229718208313</real>
-    <key>sunlight_color</key>
-        <array>
-            <real>1.7999999523162842</real>
-            <real>1.4099999666213989</real>
-            <real>1.0199999809265137</real>
-            <real>1.7999999523162842</real>
-        </array>
-    </map>
-</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/Foggy.xml b/linden/indra/newview/app_settings/windlight/skies/Foggy.xml
deleted file mode 100644
index cb7395d..0000000
--- a/linden/indra/newview/app_settings/windlight/skies/Foggy.xml
+++ /dev/null
@@ -1,141 +0,0 @@
-<llsd>
-    <map>
-    <key>ambient</key>
-        <array>
-            <real>0.32999998331069946</real>
-            <real>0.32999998331069946</real>
-            <real>0.32999998331069946</real>
-            <real>0.10999999940395355</real>
-        </array>
-    <key>blue_density</key>
-        <array>
-            <real>0.14522500336170197</real>
-            <real>0.39999699592590332</real>
-            <real>0.80000197887420654</real>
-            <real>1</real>
-        </array>
-    <key>blue_horizon</key>
-        <array>
-            <real>0.43070214986801147</real>
-            <real>0.85394668579101563</real>
-            <real>1</real>
-            <real>1</real>
-        </array>
-    <key>cloud_color</key>
-        <array>
-            <real>0.69999998807907104</real>
-            <real>0.69999998807907104</real>
-            <real>0.69999998807907104</real>
-            <real>0.69999998807907104</real>
-        </array>
-    <key>cloud_pos_density1</key>
-        <array>
-            <real>0.5</real>
-            <real>0.5</real>
-            <real>0.53999996185302734</real>
-            <real>1</real>
-        </array>
-    <key>cloud_pos_density2</key>
-        <array>
-            <real>0.5</real>
-            <real>0.5</real>
-            <real>0.125</real>
-            <real>1</real>
-        </array>
-    <key>cloud_scale</key>
-        <array>
-            <real>0.29999998211860657</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>cloud_scroll_rate</key>
-        <array>
-            <real>10.49940013885498</real>
-            <real>10.01099967956543</real>
-        </array>
-    <key>cloud_shadow</key>
-        <array>
-            <real>0.39999997615814209</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>density_multiplier</key>
-        <array>
-            <real>0.0003499999875202775</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>distance_multiplier</key>
-        <array>
-            <real>4</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>east_angle</key>
-        <real>0</real>
-    <key>enable_cloud_scroll</key>
-        <array>
-            <boolean>1</boolean>
-            <boolean>1</boolean>
-        </array>
-    <key>gamma</key>
-        <array>
-            <real>1</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>glow</key>
-        <array>
-            <real>3.7999999523162842</real>
-            <real>0.0010000000474974513</real>
-            <real>-0.5</real>
-            <real>1</real>
-        </array>
-    <key>haze_density</key>
-        <array>
-            <real>4</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>haze_horizon</key>
-        <array>
-            <real>0.64999997615814209</real>
-            <real>0.19915600121021271</real>
-            <real>0.19915600121021271</real>
-            <real>1</real>
-        </array>
-    <key>lightnorm</key>
-        <array>
-            <real>0</real>
-            <real>1</real>
-            <real>-4.3711388286737929e-008</real>
-            <real>0</real>
-        </array>
-    <key>max_y</key>
-        <array>
-            <real>600</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>preset_num</key>
-        <integer>18</integer>
-    <key>star_brightness</key>
-        <real>0</real>
-    <key>sun_angle</key>
-        <real>1.5707963705062866</real>
-    <key>sunlight_color</key>
-        <array>
-            <real>0.53999996185302734</real>
-            <real>0.53999996185302734</real>
-            <real>0.53999996185302734</real>
-            <real>0.17999999225139618</real>
-        </array>
-    </map>
-</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/Funky%20Funky%20Funky.xml b/linden/indra/newview/app_settings/windlight/skies/Funky%20Funky%20Funky.xml
deleted file mode 100644
index 32be0d2..0000000
--- a/linden/indra/newview/app_settings/windlight/skies/Funky%20Funky%20Funky.xml
+++ /dev/null
@@ -1,141 +0,0 @@
-<llsd>
-    <map>
-    <key>ambient</key>
-        <array>
-            <real>0.29999998211860657</real>
-            <real>0.23511900007724762</real>
-            <real>0.31999999284744263</real>
-            <real>1</real>
-        </array>
-    <key>blue_density</key>
-        <array>
-            <real>0.13977900147438049</real>
-            <real>0.38499599695205688</real>
-            <real>0.76999998092651367</real>
-            <real>1</real>
-        </array>
-    <key>blue_horizon</key>
-        <array>
-            <real>0.18999999761581421</real>
-            <real>0.18999999761581421</real>
-            <real>0.18999999761581421</real>
-            <real>1</real>
-        </array>
-    <key>cloud_color</key>
-        <array>
-            <real>0.22615399956703186</real>
-            <real>0.22615399956703186</real>
-            <real>0.22615399956703186</real>
-            <real>1</real>
-        </array>
-    <key>cloud_pos_density1</key>
-        <array>
-            <real>5.3780298233032227</real>
-            <real>1.9675600528717041</real>
-            <real>1</real>
-            <real>1</real>
-        </array>
-    <key>cloud_pos_density2</key>
-        <array>
-            <real>5.3780298233032227</real>
-            <real>1.9675600528717041</real>
-            <real>0.125</real>
-            <real>1</real>
-        </array>
-    <key>cloud_scale</key>
-        <array>
-            <real>0.41999998688697815</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>cloud_scroll_rate</key>
-        <array>
-            <real>10.739999771118164</real>
-            <real>10.600000381469727</real>
-        </array>
-    <key>cloud_shadow</key>
-        <array>
-            <real>0.31000000238418579</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>density_multiplier</key>
-        <array>
-            <real>0.00052000000141561031</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>distance_multiplier</key>
-        <array>
-            <real>3.4000000953674316</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>east_angle</key>
-        <real>0</real>
-    <key>enable_cloud_scroll</key>
-        <array>
-            <boolean>1</boolean>
-            <boolean>1</boolean>
-        </array>
-    <key>gamma</key>
-        <array>
-            <real>0.77999997138977051</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>glow</key>
-        <array>
-            <real>5</real>
-            <real>0.0010000000474974513</real>
-            <real>-0.47999998927116394</real>
-            <real>1</real>
-        </array>
-    <key>haze_density</key>
-        <array>
-            <real>1.1000000238418579</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>haze_horizon</key>
-        <array>
-            <real>0.12999999523162842</real>
-            <real>0.19915600121021271</real>
-            <real>0.19915600121021271</real>
-            <real>1</real>
-        </array>
-    <key>lightnorm</key>
-        <array>
-            <real>0</real>
-            <real>0.53582650423049927</real>
-            <real>-0.84432810544967651</real>
-            <real>0</real>
-        </array>
-    <key>max_y</key>
-        <array>
-            <real>656.20001220703125</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>preset_num</key>
-        <integer>28</integer>
-    <key>star_brightness</key>
-        <real>0</real>
-    <key>sun_angle</key>
-        <real>2.5761063098907471</real>
-    <key>sunlight_color</key>
-        <array>
-            <real>2.1299998760223389</real>
-            <real>1.5299999713897705</real>
-            <real>2.8385701179504395</real>
-            <real>1</real>
-        </array>
-    </map>
-</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/Funky%20Funky.xml b/linden/indra/newview/app_settings/windlight/skies/Funky%20Funky.xml
deleted file mode 100644
index ae16b2d..0000000
--- a/linden/indra/newview/app_settings/windlight/skies/Funky%20Funky.xml
+++ /dev/null
@@ -1,141 +0,0 @@
-<llsd>
-    <map>
-    <key>ambient</key>
-        <array>
-            <real>0.32999998331069946</real>
-            <real>0.32999998331069946</real>
-            <real>0.32999998331069946</real>
-            <real>0.10999999940395355</real>
-        </array>
-    <key>blue_density</key>
-        <array>
-            <real>0.14522500336170197</real>
-            <real>0.39999699592590332</real>
-            <real>0.80000197887420654</real>
-            <real>1</real>
-        </array>
-    <key>blue_horizon</key>
-        <array>
-            <real>0.15130999684333801</real>
-            <real>0.30000001192092896</real>
-            <real>0.35131001472473145</real>
-            <real>1</real>
-        </array>
-    <key>cloud_color</key>
-        <array>
-            <real>0.22615399956703186</real>
-            <real>0.22615399956703186</real>
-            <real>0.22615399956703186</real>
-            <real>1</real>
-        </array>
-    <key>cloud_pos_density1</key>
-        <array>
-            <real>0.65280699729919434</real>
-            <real>0.50335597991943359</real>
-            <real>1</real>
-            <real>1</real>
-        </array>
-    <key>cloud_pos_density2</key>
-        <array>
-            <real>0.65280699729919434</real>
-            <real>0.50335597991943359</real>
-            <real>0.125</real>
-            <real>1</real>
-        </array>
-    <key>cloud_scale</key>
-        <array>
-            <real>0.41999998688697815</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>cloud_scroll_rate</key>
-        <array>
-            <real>10.49940013885498</real>
-            <real>10.01099967956543</real>
-        </array>
-    <key>cloud_shadow</key>
-        <array>
-            <real>0.33064401149749756</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>density_multiplier</key>
-        <array>
-            <real>0.0003499999875202775</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>distance_multiplier</key>
-        <array>
-            <real>1</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>east_angle</key>
-        <real>0</real>
-    <key>enable_cloud_scroll</key>
-        <array>
-            <boolean>1</boolean>
-            <boolean>1</boolean>
-        </array>
-    <key>gamma</key>
-        <array>
-            <real>1</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>glow</key>
-        <array>
-            <real>5</real>
-            <real>0.0010000000474974513</real>
-            <real>-0.33000001311302185</real>
-            <real>1</real>
-        </array>
-    <key>haze_density</key>
-        <array>
-            <real>0.69999998807907104</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>haze_horizon</key>
-        <array>
-            <real>0.19915600121021271</real>
-            <real>0.19915600121021271</real>
-            <real>0.19915600121021271</real>
-            <real>1</real>
-        </array>
-    <key>lightnorm</key>
-        <array>
-            <real>0</real>
-            <real>0.062790460884571075</real>
-            <real>-0.99802672863006592</real>
-            <real>0</real>
-        </array>
-    <key>max_y</key>
-        <array>
-            <real>600</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>preset_num</key>
-        <integer>11</integer>
-    <key>star_brightness</key>
-        <real>0</real>
-    <key>sun_angle</key>
-        <real>3.0787608623504639</real>
-    <key>sunlight_color</key>
-        <array>
-            <real>0.86811381578445435</real>
-            <real>2.2200000286102295</real>
-            <real>2.2200000286102295</real>
-            <real>0.74000000953674316</real>
-        </array>
-    </map>
-</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/Gelatto.xml b/linden/indra/newview/app_settings/windlight/skies/Gelatto.xml
deleted file mode 100644
index 66b3d31..0000000
--- a/linden/indra/newview/app_settings/windlight/skies/Gelatto.xml
+++ /dev/null
@@ -1,141 +0,0 @@
-<llsd>
-    <map>
-    <key>ambient</key>
-        <array>
-            <real>0</real>
-            <real>0.15999999642372131</real>
-            <real>0</real>
-            <real>0.15999999642372131</real>
-        </array>
-    <key>blue_density</key>
-        <array>
-            <real>0.019999999552965164</real>
-            <real>0.22999770939350128</real>
-            <real>0.45999997854232788</real>
-            <real>0.55000001192092896</real>
-        </array>
-    <key>blue_horizon</key>
-        <array>
-            <real>0</real>
-            <real>0.6319204568862915</real>
-            <real>0.74000000953674316</real>
-            <real>0.84999996423721313</real>
-        </array>
-    <key>cloud_color</key>
-        <array>
-            <real>1</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>cloud_pos_density1</key>
-        <array>
-            <real>0.53999996185302734</real>
-            <real>0.50999999046325684</real>
-            <real>0.23999999463558197</real>
-            <real>1</real>
-        </array>
-    <key>cloud_pos_density2</key>
-        <array>
-            <real>0.5</real>
-            <real>0.5</real>
-            <real>0.059999998658895493</real>
-            <real>1</real>
-        </array>
-    <key>cloud_scale</key>
-        <array>
-            <real>0.2800000011920929</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>cloud_scroll_rate</key>
-        <array>
-            <real>20</real>
-            <real>20</real>
-        </array>
-    <key>cloud_shadow</key>
-        <array>
-            <real>0.32999998331069946</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>density_multiplier</key>
-        <array>
-            <real>0.00016999999934341758</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>distance_multiplier</key>
-        <array>
-            <real>8.1000003814697266</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>east_angle</key>
-        <real>3.7699110507965088</real>
-    <key>enable_cloud_scroll</key>
-        <array>
-            <boolean>0</boolean>
-            <boolean>0</boolean>
-        </array>
-    <key>gamma</key>
-        <array>
-            <real>1.5399999618530273</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>glow</key>
-        <array>
-            <real>0.39999961853027344</real>
-            <real>0.0010000000474974513</real>
-            <real>-0.49999997019767761</real>
-            <real>1</real>
-        </array>
-    <key>haze_density</key>
-        <array>
-            <real>3.2599999904632568</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>haze_horizon</key>
-        <array>
-            <real>0.4699999988079071</real>
-            <real>0.19915600121021271</real>
-            <real>0.19915600121021271</real>
-            <real>1</real>
-        </array>
-    <key>lightnorm</key>
-        <array>
-            <real>0.58749508857727051</real>
-            <real>-0.031410761177539825</real>
-            <real>-0.80861783027648926</real>
-            <real>0</real>
-        </array>
-    <key>max_y</key>
-        <array>
-            <real>1267.5999755859375</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>preset_num</key>
-        <integer>18</integer>
-    <key>star_brightness</key>
-        <real>0</real>
-    <key>sun_angle</key>
-        <real>-0.031415928155183792</real>
-    <key>sunlight_color</key>
-        <array>
-            <real>0.75</real>
-            <real>0.71999996900558472</real>
-            <real>0.37800011038780212</real>
-            <real>0.80999994277954102</real>
-        </array>
-    </map>
-</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/Ghost.xml b/linden/indra/newview/app_settings/windlight/skies/Ghost.xml
deleted file mode 100644
index 447202e..0000000
--- a/linden/indra/newview/app_settings/windlight/skies/Ghost.xml
+++ /dev/null
@@ -1,141 +0,0 @@
-<llsd>
-    <map>
-    <key>ambient</key>
-        <array>
-            <real>0.23999999463558197</real>
-            <real>0.23999999463558197</real>
-            <real>0.23999999463558197</real>
-            <real>0.079999998211860657</real>
-        </array>
-    <key>blue_density</key>
-        <array>
-            <real>0.16700799763202667</real>
-            <real>0.45999500155448914</real>
-            <real>0.92000001668930054</real>
-            <real>1</real>
-        </array>
-    <key>blue_horizon</key>
-        <array>
-            <real>0.18089599907398224</real>
-            <real>0.35865798592567444</real>
-            <real>0.41999998688697815</real>
-            <real>1</real>
-        </array>
-    <key>cloud_color</key>
-        <array>
-            <real>0.40999999642372131</real>
-            <real>0.40999999642372131</real>
-            <real>0.40999999642372131</real>
-            <real>1</real>
-        </array>
-    <key>cloud_pos_density1</key>
-        <array>
-            <real>0.5</real>
-            <real>0.5</real>
-            <real>1</real>
-            <real>1</real>
-        </array>
-    <key>cloud_pos_density2</key>
-        <array>
-            <real>0.5</real>
-            <real>0.5</real>
-            <real>0.125</real>
-            <real>1</real>
-        </array>
-    <key>cloud_scale</key>
-        <array>
-            <real>0.41999998688697815</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>cloud_scroll_rate</key>
-        <array>
-            <real>11.539999961853027</real>
-            <real>10.01099967956543</real>
-        </array>
-    <key>cloud_shadow</key>
-        <array>
-            <real>0.36000001430511475</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>density_multiplier</key>
-        <array>
-            <real>0.00042999998549930751</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>distance_multiplier</key>
-        <array>
-            <real>8.1000003814697266</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>east_angle</key>
-        <real>0</real>
-    <key>enable_cloud_scroll</key>
-        <array>
-            <boolean>1</boolean>
-            <boolean>1</boolean>
-        </array>
-    <key>gamma</key>
-        <array>
-            <real>1</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>glow</key>
-        <array>
-            <real>5</real>
-            <real>0.0010000000474974513</real>
-            <real>-0.51999998092651367</real>
-            <real>1</real>
-        </array>
-    <key>haze_density</key>
-        <array>
-            <real>0.75</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>haze_horizon</key>
-        <array>
-            <real>0.18000000715255737</real>
-            <real>0.19915600121021271</real>
-            <real>0.19915600121021271</real>
-            <real>1</real>
-        </array>
-    <key>lightnorm</key>
-        <array>
-            <real>0</real>
-            <real>0.89100658893585205</real>
-            <real>0.45399042963981628</real>
-            <real>0</real>
-        </array>
-    <key>max_y</key>
-        <array>
-            <real>718.70001220703125</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>preset_num</key>
-        <integer>23</integer>
-    <key>star_brightness</key>
-        <real>2</real>
-    <key>sun_angle</key>
-        <real>1.0995575189590454</real>
-    <key>sunlight_color</key>
-        <array>
-            <real>0.33000001311302185</real>
-            <real>0.33000001311302185</real>
-            <real>0.33000001311302185</real>
-            <real>1</real>
-        </array>
-    </map>
-</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/Incongruent%20Truths.xml b/linden/indra/newview/app_settings/windlight/skies/Incongruent%20Truths.xml
deleted file mode 100644
index 098844e..0000000
--- a/linden/indra/newview/app_settings/windlight/skies/Incongruent%20Truths.xml
+++ /dev/null
@@ -1,141 +0,0 @@
-<llsd>
-    <map>
-    <key>ambient</key>
-        <array>
-            <real>0</real>
-            <real>0</real>
-            <real>0.44999998807907104</real>
-            <real>0.44999998807907104</real>
-        </array>
-    <key>blue_density</key>
-        <array>
-            <real>0.13997539444089213</real>
-            <real>0.38665792478461469</real>
-            <real>0.77332294252195766</real>
-            <real>0.95108884837904384</real>
-        </array>
-    <key>blue_horizon</key>
-        <array>
-            <real>0</real>
-            <real>0.22876684367656708</real>
-            <real>0.290018230676651</real>
-            <real>0.31999999284744263</real>
-        </array>
-    <key>cloud_color</key>
-        <array>
-            <real>0.25999999046325684</real>
-            <real>0.28883209824562073</real>
-            <real>0.28994369506835938</real>
-            <real>0.28999999165534973</real>
-        </array>
-    <key>cloud_pos_density1</key>
-        <array>
-            <real>0.17999999225139618</real>
-            <real>0.50999999046325684</real>
-            <real>0.91999995708465576</real>
-            <real>1</real>
-        </array>
-    <key>cloud_pos_density2</key>
-        <array>
-            <real>0.5</real>
-            <real>0.5</real>
-            <real>0.079999998211860657</real>
-            <real>1</real>
-        </array>
-    <key>cloud_scale</key>
-        <array>
-            <real>0.25</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>cloud_scroll_rate</key>
-        <array>
-            <real>10.436104517528292</real>
-            <real>10</real>
-        </array>
-    <key>cloud_shadow</key>
-        <array>
-            <real>0.34000000357627869</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>density_multiplier</key>
-        <array>
-            <real>0.0002899999963119626</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>distance_multiplier</key>
-        <array>
-            <real>1.3000000715255737</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>east_angle</key>
-        <real>2.2619466781616211</real>
-    <key>enable_cloud_scroll</key>
-        <array>
-            <boolean>1</boolean>
-            <boolean>1</boolean>
-        </array>
-    <key>gamma</key>
-        <array>
-            <real>1.5399999618530273</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>glow</key>
-        <array>
-            <real>4.0000009536743164</real>
-            <real>0.0010000000474974513</real>
-            <real>-0.74999994039535522</real>
-            <real>1</real>
-        </array>
-    <key>haze_density</key>
-        <array>
-            <real>0.12999999523162842</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>haze_horizon</key>
-        <array>
-            <real>0.14999999105930328</real>
-            <real>0.19915600121021271</real>
-            <real>0.19915600121021271</real>
-            <real>1</real>
-        </array>
-    <key>lightnorm</key>
-        <array>
-            <real>-0.74630612134933472</real>
-            <real>0.24868990480899811</real>
-            <real>-0.61739814281463623</real>
-            <real>0</real>
-        </array>
-    <key>max_y</key>
-        <array>
-            <real>394.39999389648437</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>preset_num</key>
-        <integer>18</integer>
-    <key>star_brightness</key>
-        <real>0.44999998807907104</real>
-    <key>sun_angle</key>
-        <real>0.25132742524147034</real>
-    <key>sunlight_color</key>
-        <array>
-            <real>2.25</real>
-            <real>1.957500696182251</real>
-            <real>1.170000433921814</real>
-            <real>0.75</real>
-        </array>
-    </map>
-</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/Midday%201.xml b/linden/indra/newview/app_settings/windlight/skies/Midday%201.xml
deleted file mode 100644
index 13a2c75..0000000
--- a/linden/indra/newview/app_settings/windlight/skies/Midday%201.xml
+++ /dev/null
@@ -1,141 +0,0 @@
-<llsd>
-    <map>
-    <key>ambient</key>
-        <array>
-            <real>1.0499999523162842</real>
-            <real>1.0499999523162842</real>
-            <real>1.0499999523162842</real>
-            <real>0.34999999403953552</real>
-        </array>
-    <key>blue_density</key>
-        <array>
-            <real>0.24475815892219543</real>
-            <real>0.44872328639030457</real>
-            <real>0.75999999046325684</real>
-            <real>0.37999999523162842</real>
-        </array>
-    <key>blue_horizon</key>
-        <array>
-            <real>0.49548381567001343</real>
-            <real>0.49548381567001343</real>
-            <real>0.63999998569488525</real>
-            <real>0.31999999284744263</real>
-        </array>
-    <key>cloud_color</key>
-        <array>
-            <real>0.40999999642372131</real>
-            <real>0.40999999642372131</real>
-            <real>0.40999999642372131</real>
-            <real>0.40999999642372131</real>
-        </array>
-    <key>cloud_pos_density1</key>
-        <array>
-            <real>1.6884100437164307</real>
-            <real>0.52609699964523315</real>
-            <real>1</real>
-            <real>1</real>
-        </array>
-    <key>cloud_pos_density2</key>
-        <array>
-            <real>1.6884100437164307</real>
-            <real>0.52609699964523315</real>
-            <real>0.125</real>
-            <real>1</real>
-        </array>
-    <key>cloud_scale</key>
-        <array>
-            <real>0.41999998688697815</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>cloud_scroll_rate</key>
-        <array>
-            <real>10.199999809265137</real>
-            <real>10.01099967956543</real>
-        </array>
-    <key>cloud_shadow</key>
-        <array>
-            <real>0.26999998092651367</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>density_multiplier</key>
-        <array>
-            <real>0.00017999998817685992</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>distance_multiplier</key>
-        <array>
-            <real>0.80000001192092896</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>east_angle</key>
-        <real>0</real>
-    <key>enable_cloud_scroll</key>
-        <array>
-            <boolean>1</boolean>
-            <boolean>1</boolean>
-        </array>
-    <key>gamma</key>
-        <array>
-            <real>1</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>glow</key>
-        <array>
-            <real>5</real>
-            <real>0.0010000000474974513</real>
-            <real>-0.47999998927116394</real>
-            <real>1</real>
-        </array>
-    <key>haze_density</key>
-        <array>
-            <real>0.69999998807907104</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>haze_horizon</key>
-        <array>
-            <real>0.18999999761581421</real>
-            <real>0.19915600121021271</real>
-            <real>0.19915600121021271</real>
-            <real>1</real>
-        </array>
-    <key>lightnorm</key>
-        <array>
-            <real>0</real>
-            <real>0.91269159317016602</real>
-            <real>-0.40864911675453186</real>
-            <real>0</real>
-        </array>
-    <key>max_y</key>
-        <array>
-            <real>1605</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>preset_num</key>
-        <integer>22</integer>
-    <key>star_brightness</key>
-        <real>0</real>
-    <key>sun_angle</key>
-        <real>1.9917697906494141</real>
-    <key>sunlight_color</key>
-        <array>
-            <real>0.7342105507850647</real>
-            <real>0.78157895803451538</real>
-            <real>0.89999997615814209</real>
-            <real>0.29999998211860657</real>
-        </array>
-    </map>
-</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/Midday%202.xml b/linden/indra/newview/app_settings/windlight/skies/Midday%202.xml
deleted file mode 100644
index 04f2ba8..0000000
--- a/linden/indra/newview/app_settings/windlight/skies/Midday%202.xml
+++ /dev/null
@@ -1,141 +0,0 @@
-<llsd>
-    <map>
-    <key>ambient</key>
-        <array>
-            <real>0</real>
-            <real>0</real>
-            <real>0</real>
-            <real>0</real>
-        </array>
-    <key>blue_density</key>
-        <array>
-            <real>0.14522500336170197</real>
-            <real>0.39999699592590332</real>
-            <real>0.80000197887420654</real>
-            <real>1</real>
-        </array>
-    <key>blue_horizon</key>
-        <array>
-            <real>0.43070214986801147</real>
-            <real>0.85394668579101563</real>
-            <real>1</real>
-            <real>1</real>
-        </array>
-    <key>cloud_color</key>
-        <array>
-            <real>0.69999998807907104</real>
-            <real>0.69999998807907104</real>
-            <real>0.69999998807907104</real>
-            <real>1</real>
-        </array>
-    <key>cloud_pos_density1</key>
-        <array>
-            <real>0.5</real>
-            <real>0.5</real>
-            <real>0.53999996185302734</real>
-            <real>1</real>
-        </array>
-    <key>cloud_pos_density2</key>
-        <array>
-            <real>0.5</real>
-            <real>0.5</real>
-            <real>0.125</real>
-            <real>1</real>
-        </array>
-    <key>cloud_scale</key>
-        <array>
-            <real>0.29999998211860657</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>cloud_scroll_rate</key>
-        <array>
-            <real>10.199999809265137</real>
-            <real>10.069999694824219</real>
-        </array>
-    <key>cloud_shadow</key>
-        <array>
-            <real>0.22999998927116394</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>density_multiplier</key>
-        <array>
-            <real>0.0003499999875202775</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>distance_multiplier</key>
-        <array>
-            <real>0</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>east_angle</key>
-        <real>0</real>
-    <key>enable_cloud_scroll</key>
-        <array>
-            <boolean>1</boolean>
-            <boolean>1</boolean>
-        </array>
-    <key>gamma</key>
-        <array>
-            <real>1.6100000143051147</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>glow</key>
-        <array>
-            <real>3.7999999523162842</real>
-            <real>0.0010000000474974513</real>
-            <real>-0.5</real>
-            <real>1</real>
-        </array>
-    <key>haze_density</key>
-        <array>
-            <real>0.69999998807907104</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>haze_horizon</key>
-        <array>
-            <real>0.41999998688697815</real>
-            <real>0.19915600121021271</real>
-            <real>0.19915600121021271</real>
-            <real>1</real>
-        </array>
-    <key>lightnorm</key>
-        <array>
-            <real>0</real>
-            <real>1</real>
-            <real>-4.3711388286737929e-008</real>
-            <real>0</real>
-        </array>
-    <key>max_y</key>
-        <array>
-            <real>600</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>preset_num</key>
-        <integer>-1163005939</integer>
-    <key>star_brightness</key>
-        <real>0</real>
-    <key>sun_angle</key>
-        <real>1.5707963705062866</real>
-    <key>sunlight_color</key>
-        <array>
-            <real>0.80999994277954102</real>
-            <real>0.80999994277954102</real>
-            <real>0.80999994277954102</real>
-            <real>0.26999998092651367</real>
-        </array>
-    </map>
-</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/Midday%203.xml b/linden/indra/newview/app_settings/windlight/skies/Midday%203.xml
deleted file mode 100644
index a23dcab..0000000
--- a/linden/indra/newview/app_settings/windlight/skies/Midday%203.xml
+++ /dev/null
@@ -1,141 +0,0 @@
-<llsd>
-    <map>
-    <key>ambient</key>
-        <array>
-            <real>0.33000001311302185</real>
-            <real>0.33000001311302185</real>
-            <real>0.33000001311302185</real>
-            <real>1</real>
-        </array>
-    <key>blue_density</key>
-        <array>
-            <real>0.16449999809265137</real>
-            <real>0.4699999988079071</real>
-            <real>0.93999999761581421</real>
-            <real>1</real>
-        </array>
-    <key>blue_horizon</key>
-        <array>
-            <real>0.17547200620174408</real>
-            <real>0.35094299912452698</real>
-            <real>0.62000000476837158</real>
-            <real>1</real>
-        </array>
-    <key>cloud_color</key>
-        <array>
-            <real>0.5899999737739563</real>
-            <real>0.79000002145767212</real>
-            <real>0.80000001192092896</real>
-            <real>1</real>
-        </array>
-    <key>cloud_pos_density1</key>
-        <array>
-            <real>2.8148899078369141</real>
-            <real>5.6909198760986328</real>
-            <real>1</real>
-            <real>1</real>
-        </array>
-    <key>cloud_pos_density2</key>
-        <array>
-            <real>5.9584097862243652</real>
-            <real>6.9909601211547852</real>
-            <real>0.070000000298023224</real>
-            <real>1</real>
-        </array>
-    <key>cloud_scale</key>
-        <array>
-            <real>0.41999998688697815</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>cloud_scroll_rate</key>
-        <array>
-            <real>9.9300003051757813</real>
-            <real>10.199999809265137</real>
-        </array>
-    <key>cloud_shadow</key>
-        <array>
-            <real>0.25999999046325684</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>density_multiplier</key>
-        <array>
-            <real>0.00039000000106170774</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>distance_multiplier</key>
-        <array>
-            <real>0.69999998807907104</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>east_angle</key>
-        <real>0</real>
-    <key>enable_cloud_scroll</key>
-        <array>
-            <boolean>1</boolean>
-            <boolean>1</boolean>
-        </array>
-    <key>gamma</key>
-        <array>
-            <real>1.6100000143051147</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>glow</key>
-        <array>
-            <real>5</real>
-            <real>0.0010000000474974513</real>
-            <real>-1.1599999666213989</real>
-            <real>1</real>
-        </array>
-    <key>haze_density</key>
-        <array>
-            <real>0.20999999344348907</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>haze_horizon</key>
-        <array>
-            <real>0.11999999731779099</real>
-            <real>0.19915600121021271</real>
-            <real>0.19915600121021271</real>
-            <real>1</real>
-        </array>
-    <key>lightnorm</key>
-        <array>
-            <real>0</real>
-            <real>1</real>
-            <real>-4.3711388286737929e-008</real>
-            <real>0</real>
-        </array>
-    <key>max_y</key>
-        <array>
-            <real>2250</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>preset_num</key>
-        <integer>24</integer>
-    <key>star_brightness</key>
-        <real>0</real>
-    <key>sun_angle</key>
-        <real>1.5707963705062866</real>
-    <key>sunlight_color</key>
-        <array>
-            <real>1.2599999904632568</real>
-            <real>1.2599999904632568</real>
-            <real>1.2599999904632568</real>
-            <real>1</real>
-        </array>
-    </map>
-</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/Midday%204.xml b/linden/indra/newview/app_settings/windlight/skies/Midday%204.xml
deleted file mode 100644
index 255e314..0000000
--- a/linden/indra/newview/app_settings/windlight/skies/Midday%204.xml
+++ /dev/null
@@ -1,141 +0,0 @@
-<llsd>
-    <map>
-    <key>ambient</key>
-        <array>
-            <real>0.33000001311302185</real>
-            <real>0.33000001311302185</real>
-            <real>0.33000001311302185</real>
-            <real>1</real>
-        </array>
-    <key>blue_density</key>
-        <array>
-            <real>0.097999997437000275</real>
-            <real>0.2800000011920929</real>
-            <real>0.56000000238418579</real>
-            <real>0.56000000238418579</real>
-        </array>
-    <key>blue_horizon</key>
-        <array>
-            <real>0.17547200620174408</real>
-            <real>0.35094299912452698</real>
-            <real>0.61000001430511475</real>
-            <real>0.61000001430511475</real>
-        </array>
-    <key>cloud_color</key>
-        <array>
-            <real>0.5899999737739563</real>
-            <real>0.79000002145767212</real>
-            <real>0.80000001192092896</real>
-            <real>1</real>
-        </array>
-    <key>cloud_pos_density1</key>
-        <array>
-            <real>2.8148899078369141</real>
-            <real>5.6909198760986328</real>
-            <real>1</real>
-            <real>1</real>
-        </array>
-    <key>cloud_pos_density2</key>
-        <array>
-            <real>5.9584097862243652</real>
-            <real>6.9909601211547852</real>
-            <real>0.070000000298023224</real>
-            <real>1</real>
-        </array>
-    <key>cloud_scale</key>
-        <array>
-            <real>0.32999998331069946</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>cloud_scroll_rate</key>
-        <array>
-            <real>9.9300003051757813</real>
-            <real>10.199999809265137</real>
-        </array>
-    <key>cloud_shadow</key>
-        <array>
-            <real>0.22999998927116394</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>density_multiplier</key>
-        <array>
-            <real>0.00039000000106170774</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>distance_multiplier</key>
-        <array>
-            <real>0.69999998807907104</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>east_angle</key>
-        <real>0</real>
-    <key>enable_cloud_scroll</key>
-        <array>
-            <boolean>1</boolean>
-            <boolean>1</boolean>
-        </array>
-    <key>gamma</key>
-        <array>
-            <real>1.6100000143051147</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>glow</key>
-        <array>
-            <real>3.8000011444091797</real>
-            <real>0.0010000000474974513</real>
-            <real>-0.49999997019767761</real>
-            <real>1</real>
-        </array>
-    <key>haze_density</key>
-        <array>
-            <real>0.20999999344348907</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>haze_horizon</key>
-        <array>
-            <real>0.19999998807907104</real>
-            <real>0.19915600121021271</real>
-            <real>0.19915600121021271</real>
-            <real>1</real>
-        </array>
-    <key>lightnorm</key>
-        <array>
-            <real>0</real>
-            <real>1</real>
-            <real>-4.3711388286737929e-008</real>
-            <real>0</real>
-        </array>
-    <key>max_y</key>
-        <array>
-            <real>1802.800048828125</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>preset_num</key>
-        <integer>24</integer>
-    <key>star_brightness</key>
-        <real>0</real>
-    <key>sun_angle</key>
-        <real>1.5707963705062866</real>
-    <key>sunlight_color</key>
-        <array>
-            <real>1.2599999904632568</real>
-            <real>1.2599999904632568</real>
-            <real>1.2599999904632568</real>
-            <real>0.41999998688697815</real>
-        </array>
-    </map>
-</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/Night.xml b/linden/indra/newview/app_settings/windlight/skies/Night.xml
deleted file mode 100644
index c493894..0000000
--- a/linden/indra/newview/app_settings/windlight/skies/Night.xml
+++ /dev/null
@@ -1,141 +0,0 @@
-<llsd>
-    <map>
-    <key>ambient</key>
-        <array>
-            <real>0.20405027105862608</real>
-            <real>0.24246673976617727</real>
-            <real>0.32999997392212316</real>
-            <real>0.11000000166951449</real>
-        </array>
-    <key>blue_density</key>
-        <array>
-            <real>0.44999999369830818</real>
-            <real>0.44999999398335949</real>
-            <real>0.4499999944309046</real>
-            <real>1</real>
-        </array>
-    <key>blue_horizon</key>
-        <array>
-            <real>0.23999999567946317</real>
-            <real>0.23999999579784967</real>
-            <real>0.23999999583870221</real>
-            <real>1</real>
-        </array>
-    <key>cloud_color</key>
-        <array>
-            <real>0.22615400241575034</real>
-            <real>0.22615400241575034</real>
-            <real>0.22615400241575034</real>
-            <real>1</real>
-        </array>
-    <key>cloud_pos_density1</key>
-        <array>
-            <real>0.5</real>
-            <real>0.5</real>
-            <real>0.88000000953711155</real>
-            <real>1</real>
-        </array>
-    <key>cloud_pos_density2</key>
-        <array>
-            <real>0.5</real>
-            <real>0.5</real>
-            <real>0.125</real>
-            <real>1</real>
-        </array>
-    <key>cloud_scale</key>
-        <array>
-            <real>0.41999998688697815</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>cloud_scroll_rate</key>
-        <array>
-            <real>10.49940035411295</real>
-            <real>10.011000104431371</real>
-        </array>
-    <key>cloud_shadow</key>
-        <array>
-            <real>0.36000001430511475</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>density_multiplier</key>
-        <array>
-            <real>0.00030000001824737163</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>distance_multiplier</key>
-        <array>
-            <real>3.0208916693946743e-009</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>east_angle</key>
-        <real>0</real>
-    <key>enable_cloud_scroll</key>
-        <array>
-            <boolean>1</boolean>
-            <boolean>1</boolean>
-        </array>
-    <key>gamma</key>
-        <array>
-            <real>1</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>glow</key>
-        <array>
-            <real>5</real>
-            <real>0.0010000000214212465</real>
-            <real>-0.47999999165502744</real>
-            <real>1</real>
-        </array>
-    <key>haze_density</key>
-        <array>
-            <real>3.9999999963077992</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>haze_horizon</key>
-        <array>
-            <real>1.7901579546794781e-010</real>
-            <real>0.19915600437467304</real>
-            <real>0.19915600437467304</real>
-            <real>1</real>
-        </array>
-    <key>lightnorm</key>
-        <array>
-            <real>0</real>
-            <real>1</real>
-            <real>3.0028815672267228e-005</real>
-            <real>1</real>
-        </array>
-    <key>max_y</key>
-        <array>
-            <real>906.20003957594895</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>preset_num</key>
-        <integer>26</integer>
-    <key>star_brightness</key>
-        <real>2</real>
-    <key>sun_angle</key>
-        <real>4.7123589515686035</real>
-    <key>sunlight_color</key>
-        <array>
-            <real>0.34876692389196384</real>
-            <real>0.3557424864638451</real>
-            <real>0.65999994893325931</real>
-            <real>0.22000000284673543</real>
-        </array>
-    </map>
-</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/Pirate.xml b/linden/indra/newview/app_settings/windlight/skies/Pirate.xml
deleted file mode 100644
index dcb9c27..0000000
--- a/linden/indra/newview/app_settings/windlight/skies/Pirate.xml
+++ /dev/null
@@ -1,141 +0,0 @@
-<llsd>
-    <map>
-    <key>ambient</key>
-        <array>
-            <real>0.27825063467025757</real>
-            <real>0.33063584566116333</real>
-            <real>0.44999998807907104</real>
-            <real>0.14999999105930328</real>
-        </array>
-    <key>blue_density</key>
-        <array>
-            <real>0.14522500336170197</real>
-            <real>0.39999699592590332</real>
-            <real>0.80000197887420654</real>
-            <real>1</real>
-        </array>
-    <key>blue_horizon</key>
-        <array>
-            <real>0.15130999684333801</real>
-            <real>0.30000001192092896</real>
-            <real>0.35131001472473145</real>
-            <real>1</real>
-        </array>
-    <key>cloud_color</key>
-        <array>
-            <real>0.22615399956703186</real>
-            <real>0.22615399956703186</real>
-            <real>0.22615399956703186</real>
-            <real>1</real>
-        </array>
-    <key>cloud_pos_density1</key>
-        <array>
-            <real>1.2046600580215454</real>
-            <real>0.51547497510910034</real>
-            <real>1</real>
-            <real>1</real>
-        </array>
-    <key>cloud_pos_density2</key>
-        <array>
-            <real>1.2046600580215454</real>
-            <real>0.51547497510910034</real>
-            <real>0.125</real>
-            <real>1</real>
-        </array>
-    <key>cloud_scale</key>
-        <array>
-            <real>0.41999998688697815</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>cloud_scroll_rate</key>
-        <array>
-            <real>10.49940013885498</real>
-            <real>10.01099967956543</real>
-        </array>
-    <key>cloud_shadow</key>
-        <array>
-            <real>0.33064401149749756</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>density_multiplier</key>
-        <array>
-            <real>0.0003499999875202775</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>distance_multiplier</key>
-        <array>
-            <real>3.4000000953674316</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>east_angle</key>
-        <real>0</real>
-    <key>enable_cloud_scroll</key>
-        <array>
-            <boolean>1</boolean>
-            <boolean>1</boolean>
-        </array>
-    <key>gamma</key>
-        <array>
-            <real>1</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>glow</key>
-        <array>
-            <real>5</real>
-            <real>0.0010000000474974513</real>
-            <real>-0.36000001430511475</real>
-            <real>1</real>
-        </array>
-    <key>haze_density</key>
-        <array>
-            <real>0.69999998807907104</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>haze_horizon</key>
-        <array>
-            <real>0.19915600121021271</real>
-            <real>0.19915600121021271</real>
-            <real>0.19915600121021271</real>
-            <real>1</real>
-        </array>
-    <key>lightnorm</key>
-        <array>
-            <real>0</real>
-            <real>0.062790460884571075</real>
-            <real>-0.99802672863006592</real>
-            <real>0</real>
-        </array>
-    <key>max_y</key>
-        <array>
-            <real>600</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>preset_num</key>
-        <integer>27</integer>
-    <key>star_brightness</key>
-        <real>0</real>
-    <key>sun_angle</key>
-        <real>3.0787608623504639</real>
-    <key>sunlight_color</key>
-        <array>
-            <real>2.8385701179504395</real>
-            <real>2.8385701179504395</real>
-            <real>2.8385701179504395</real>
-            <real>1</real>
-        </array>
-    </map>
-</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/Purple.xml b/linden/indra/newview/app_settings/windlight/skies/Purple.xml
deleted file mode 100644
index 0e9ac3f..0000000
--- a/linden/indra/newview/app_settings/windlight/skies/Purple.xml
+++ /dev/null
@@ -1,141 +0,0 @@
-<llsd>
-    <map>
-    <key>ambient</key>
-        <array>
-            <real>0.1978670060634613</real>
-            <real>0.23511900007724762</real>
-            <real>0.31999999284744263</real>
-            <real>1</real>
-        </array>
-    <key>blue_density</key>
-        <array>
-            <real>0.13977900147438049</real>
-            <real>0.38499599695205688</real>
-            <real>0.76999998092651367</real>
-            <real>1</real>
-        </array>
-    <key>blue_horizon</key>
-        <array>
-            <real>0.18999999761581421</real>
-            <real>0.18999999761581421</real>
-            <real>0.18999999761581421</real>
-            <real>1</real>
-        </array>
-    <key>cloud_color</key>
-        <array>
-            <real>0.22615399956703186</real>
-            <real>0.22615399956703186</real>
-            <real>0.22615399956703186</real>
-            <real>1</real>
-        </array>
-    <key>cloud_pos_density1</key>
-        <array>
-            <real>5.3780298233032227</real>
-            <real>1.9675600528717041</real>
-            <real>1</real>
-            <real>1</real>
-        </array>
-    <key>cloud_pos_density2</key>
-        <array>
-            <real>5.3780298233032227</real>
-            <real>1.9675600528717041</real>
-            <real>0.125</real>
-            <real>1</real>
-        </array>
-    <key>cloud_scale</key>
-        <array>
-            <real>0.41999998688697815</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>cloud_scroll_rate</key>
-        <array>
-            <real>10.739999771118164</real>
-            <real>10.600000381469727</real>
-        </array>
-    <key>cloud_shadow</key>
-        <array>
-            <real>0.31000000238418579</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>density_multiplier</key>
-        <array>
-            <real>0.00052000000141561031</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>distance_multiplier</key>
-        <array>
-            <real>3.4000000953674316</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>east_angle</key>
-        <real>0</real>
-    <key>enable_cloud_scroll</key>
-        <array>
-            <boolean>1</boolean>
-            <boolean>1</boolean>
-        </array>
-    <key>gamma</key>
-        <array>
-            <real>1</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>glow</key>
-        <array>
-            <real>5</real>
-            <real>0.0010000000474974513</real>
-            <real>-0.47999998927116394</real>
-            <real>1</real>
-        </array>
-    <key>haze_density</key>
-        <array>
-            <real>1.1000000238418579</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>haze_horizon</key>
-        <array>
-            <real>0.12999999523162842</real>
-            <real>0.19915600121021271</real>
-            <real>0.19915600121021271</real>
-            <real>1</real>
-        </array>
-    <key>lightnorm</key>
-        <array>
-            <real>0</real>
-            <real>0.094108030200004578</real>
-            <real>-0.99556201696395874</real>
-            <real>0</real>
-        </array>
-    <key>max_y</key>
-        <array>
-            <real>656.20001220703125</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>preset_num</key>
-        <integer>28</integer>
-    <key>star_brightness</key>
-        <real>0</real>
-    <key>sun_angle</key>
-        <real>3.0473451614379883</real>
-    <key>sunlight_color</key>
-        <array>
-            <real>1.5</real>
-            <real>1.5299999713897705</real>
-            <real>2.8385701179504395</real>
-            <real>1</real>
-        </array>
-    </map>
-</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/Sailor%27s%20Delight.xml b/linden/indra/newview/app_settings/windlight/skies/Sailor%27s%20Delight.xml
deleted file mode 100644
index 70df6b0..0000000
--- a/linden/indra/newview/app_settings/windlight/skies/Sailor%27s%20Delight.xml
+++ /dev/null
@@ -1,141 +0,0 @@
-<llsd>
-    <map>
-    <key>ambient</key>
-        <array>
-            <real>0.8399999737739563</real>
-            <real>0.090738050639629364</real>
-            <real>0.1234893873333931</real>
-            <real>0.8399999737739563</real>
-        </array>
-    <key>blue_density</key>
-        <array>
-            <real>0.93999999761581421</real>
-            <real>0.69999998807907104</real>
-            <real>0.25</real>
-            <real>0.93999999761581421</real>
-        </array>
-    <key>blue_horizon</key>
-        <array>
-            <real>1</real>
-            <real>0.59999996423721313</real>
-            <real>0.25001853704452515</real>
-            <real>1</real>
-        </array>
-    <key>cloud_color</key>
-        <array>
-            <real>0.65999996662139893</real>
-            <real>0.38999998569488525</real>
-            <real>0.22618354856967926</real>
-            <real>0.65999996662139893</real>
-        </array>
-    <key>cloud_pos_density1</key>
-        <array>
-            <real>0.76999998092651367</real>
-            <real>0.50999999046325684</real>
-            <real>1</real>
-            <real>1</real>
-        </array>
-    <key>cloud_pos_density2</key>
-        <array>
-            <real>0.5</real>
-            <real>0.5899999737739563</real>
-            <real>0.019999999552965164</real>
-            <real>1</real>
-        </array>
-    <key>cloud_scale</key>
-        <array>
-            <real>0.26999998092651367</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>cloud_scroll_rate</key>
-        <array>
-            <real>9.4499998092651367</real>
-            <real>9.4399995803833008</real>
-        </array>
-    <key>cloud_shadow</key>
-        <array>
-            <real>0.5</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>density_multiplier</key>
-        <array>
-            <real>0.00019999999494757503</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>distance_multiplier</key>
-        <array>
-            <real>6.7000002861022949</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>east_angle</key>
-        <real>3.7070791721343994</real>
-    <key>enable_cloud_scroll</key>
-        <array>
-            <boolean>1</boolean>
-            <boolean>1</boolean>
-        </array>
-    <key>gamma</key>
-        <array>
-            <real>1.4800000190734863</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>glow</key>
-        <array>
-            <real>0.79999923706054688</real>
-            <real>0.0010000000474974513</real>
-            <real>-0.94999998807907104</real>
-            <real>1</real>
-        </array>
-    <key>haze_density</key>
-        <array>
-            <real>0.89999997615814209</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>haze_horizon</key>
-        <array>
-            <real>0.29999998211860657</real>
-            <real>0.19915600121021271</real>
-            <real>0.19915600121021271</real>
-            <real>1</real>
-        </array>
-    <key>lightnorm</key>
-        <array>
-            <real>0.53160154819488525</real>
-            <real>0.12533323466777802</real>
-            <real>-0.83767020702362061</real>
-            <real>0</real>
-        </array>
-    <key>max_y</key>
-        <array>
-            <real>281.70001220703125</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>preset_num</key>
-        <integer>18</integer>
-    <key>star_brightness</key>
-        <real>1.3799999952316284</real>
-    <key>sun_angle</key>
-        <real>0.12566371262073517</real>
-    <key>sunlight_color</key>
-        <array>
-            <real>0.75</real>
-            <real>1.6800000667572021</real>
-            <real>1.0777359008789062</real>
-            <real>0.56000000238418579</real>
-        </array>
-    </map>
-</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/Sheer%20Surreality.xml b/linden/indra/newview/app_settings/windlight/skies/Sheer%20Surreality.xml
deleted file mode 100644
index 4c44a1b..0000000
--- a/linden/indra/newview/app_settings/windlight/skies/Sheer%20Surreality.xml
+++ /dev/null
@@ -1,141 +0,0 @@
-<llsd>
-    <map>
-    <key>ambient</key>
-        <array>
-            <real>0</real>
-            <real>0.059999998658895493</real>
-            <real>0</real>
-            <real>0.059999998658895493</real>
-        </array>
-    <key>blue_density</key>
-        <array>
-            <real>0</real>
-            <real>0.099999994039535522</real>
-            <real>0.32999998331069946</real>
-            <real>0.32999998331069946</real>
-        </array>
-    <key>blue_horizon</key>
-        <array>
-            <real>0.029999999329447746</real>
-            <real>0</real>
-            <real>1</real>
-            <real>1</real>
-        </array>
-    <key>cloud_color</key>
-        <array>
-            <real>0.81999999284744263</real>
-            <real>0.18999999761581421</real>
-            <real>0.039999999105930328</real>
-            <real>0.81999999284744263</real>
-        </array>
-    <key>cloud_pos_density1</key>
-        <array>
-            <real>0.74000000953674316</real>
-            <real>0.93999999761581421</real>
-            <real>0.20999999344348907</real>
-            <real>1</real>
-        </array>
-    <key>cloud_pos_density2</key>
-        <array>
-            <real>0.65999996662139893</real>
-            <real>0.52999997138977051</real>
-            <real>0.0099999997764825821</real>
-            <real>1</real>
-        </array>
-    <key>cloud_scale</key>
-        <array>
-            <real>0.14000000059604645</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>cloud_scroll_rate</key>
-        <array>
-            <real>18</real>
-            <real>20</real>
-        </array>
-    <key>cloud_shadow</key>
-        <array>
-            <real>0.37999999523162842</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>density_multiplier</key>
-        <array>
-            <real>0.00018000000272877514</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>distance_multiplier</key>
-        <array>
-            <real>6.7000002861022949</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>east_angle</key>
-        <real>2.3247785568237305</real>
-    <key>enable_cloud_scroll</key>
-        <array>
-            <boolean>1</boolean>
-            <boolean>1</boolean>
-        </array>
-    <key>gamma</key>
-        <array>
-            <real>1.9499999284744263</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>glow</key>
-        <array>
-            <real>17.399999618530273</real>
-            <real>0.0010000000474974513</real>
-            <real>-0.64999997615814209</real>
-            <real>1</real>
-        </array>
-    <key>haze_density</key>
-        <array>
-            <real>0.40999999642372131</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>haze_horizon</key>
-        <array>
-            <real>0.17000000178813934</real>
-            <real>0.19915600121021271</real>
-            <real>0.19915600121021271</real>
-            <real>1</real>
-        </array>
-    <key>lightnorm</key>
-        <array>
-            <real>-0.72322052717208862</real>
-            <real>0.12533323466777802</real>
-            <real>-0.67914927005767822</real>
-            <real>0</real>
-        </array>
-    <key>max_y</key>
-        <array>
-            <real>263</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>preset_num</key>
-        <integer>24</integer>
-    <key>star_brightness</key>
-        <real>1.0399999618530273</real>
-    <key>sun_angle</key>
-        <real>0.12566371262073517</real>
-    <key>sunlight_color</key>
-        <array>
-            <real>1.5899999141693115</real>
-            <real>1.5299999713897705</real>
-            <real>0.53999996185302734</real>
-            <real>1.5899999141693115</real>
-        </array>
-    </map>
-</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/water/Default.xml b/linden/indra/newview/app_settings/windlight/water/Default.xml
deleted file mode 100644
index dce4148..0000000
--- a/linden/indra/newview/app_settings/windlight/water/Default.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<llsd>
-    <map>
-    <key>blurMultiplier</key>
-        <real>0.040000002831220627</real>
-    <key>fresnelOffset</key>
-        <real>0.5</real>
-    <key>fresnelScale</key>
-        <real>0.39999997615814209</real>
-    <key>normScale</key>
-        <array>
-            <integer>2</integer>
-            <integer>2</integer>
-            <integer>2</integer>
-        </array>
-    <key>normalMap</key>
-        <uuid>822ded49-9a6c-f61c-cb89-6df54f42cdf4</uuid>
-    <key>scaleAbove</key>
-        <real>0.029999999329447746</real>
-    <key>scaleBelow</key>
-        <real>0.20000000298023224</real>
-    <key>underWaterFogMod</key>
-        <real>0.25</real>
-    <key>waterFogColor</key>
-        <array>
-            <real>0.015686275437474251</real>
-            <real>0.14901961386203766</real>
-            <real>0.25098040699958801</real>
-            <real>1</real>
-        </array>
-    <key>waterFogDensity</key>
-        <real>16</real>
-    <key>wave1Dir</key>
-        <array>
-            <real>1.0499997138977051</real>
-            <real>-0.42000007629394531</real>
-        </array>
-    <key>wave2Dir</key>
-        <array>
-            <real>1.1099996566772461</real>
-            <real>-1.1600000858306885</real>
-        </array>
-    </map>
-</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/water/Glassy.xml b/linden/indra/newview/app_settings/windlight/water/Glassy.xml
deleted file mode 100644
index 01183e4..0000000
--- a/linden/indra/newview/app_settings/windlight/water/Glassy.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<llsd>
-    <map>
-    <key>blurMultiplier</key>
-        <real>0.003000000026077032089233398</real>
-    <key>fresnelOffset</key>
-        <real>0.579999983310699462890625</real>
-    <key>fresnelScale</key>
-        <real>0.0999999940395355224609375</real>
-    <key>normScale</key>
-        <array>
-            <integer>2</integer>
-            <integer>2</integer>
-            <integer>2</integer>
-        </array>
-    <key>normalMap</key>
-        <uuid>822ded49-9a6c-f61c-cb89-6df54f42cdf4</uuid>
-    <key>scaleAbove</key>
-        <real>0.07999999821186065673828125</real>
-    <key>scaleBelow</key>
-        <real>0.2000000029802322387695312</real>
-    <key>underWaterFogMod</key>
-        <real>0.25</real>
-    <key>waterFogColor</key>
-        <array>
-            <real>0.04999999701976776123046875</real>
-            <real>0.37999999523162841796875</real>
-            <real>0.5299999713897705078125</real>
-            <real>0.5299999713897705078125</real>
-        </array>
-    <key>waterFogDensity</key>
-        <real>1</real>
-    <key>wave1Dir</key>
-        <array>
-            <real>0.5</real>
-            <real>-0.1700000017881393432617188</real>
-        </array>
-    <key>wave2Dir</key>
-        <array>
-            <real>0.579999983310699462890625</real>
-            <real>-0.670000016689300537109375</real>
-        </array>
-    </map>
-</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/water/Murky.xml b/linden/indra/newview/app_settings/windlight/water/Murky.xml
deleted file mode 100644
index 1d9e022..0000000
--- a/linden/indra/newview/app_settings/windlight/water/Murky.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<llsd>
-    <map>
-    <key>blurMultiplier</key>
-        <real>0.0030000000260770321</real>
-    <key>fresnelOffset</key>
-        <real>0.39999997615814209</real>
-    <key>fresnelScale</key>
-        <real>0.5</real>
-    <key>normScale</key>
-        <array>
-            <integer>2</integer>
-            <integer>2</integer>
-            <integer>2</integer>
-        </array>
-    <key>normalMap</key>
-        <uuid>822ded49-9a6c-f61c-cb89-6df54f42cdf4</uuid>
-    <key>scaleAbove</key>
-        <real>0.079999998211860657</real>
-    <key>scaleBelow</key>
-        <real>0.20000000298023224</real>
-    <key>underWaterFogMod</key>
-        <real>0.76999998092651367</real>
-    <key>waterFogColor</key>
-        <array>
-            <real>0.08999999612569809</real>
-            <real>0.17000000178813934</real>
-            <real>0.20999999344348907</real>
-            <real>0.20999999344348907</real>
-        </array>
-    <key>waterFogDensity</key>
-        <real>16</real>
-    <key>wave1Dir</key>
-        <array>
-            <real>0.5</real>
-            <real>-0.17000000178813934</real>
-        </array>
-    <key>wave2Dir</key>
-        <array>
-            <real>0.57999998331069946</real>
-            <real>-0.67000001668930054</real>
-        </array>
-    </map>
-</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/water/Pond.xml b/linden/indra/newview/app_settings/windlight/water/Pond.xml
deleted file mode 100644
index 59e3c44..0000000
--- a/linden/indra/newview/app_settings/windlight/water/Pond.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<llsd>
-    <map>
-    <key>blurMultiplier</key>
-        <real>0.0030000000260770321</real>
-    <key>fresnelOffset</key>
-        <real>0.50999999046325684</real>
-    <key>fresnelScale</key>
-        <real>0.099999994039535522</real>
-    <key>normScale</key>
-        <array>
-            <integer>2</integer>
-            <integer>2</integer>
-            <integer>2</integer>
-        </array>
-    <key>normalMap</key>
-        <uuid>822ded49-9a6c-f61c-cb89-6df54f42cdf4</uuid>
-    <key>scaleAbove</key>
-        <real>0.079999998211860657</real>
-    <key>scaleBelow</key>
-        <real>0.20000000298023224</real>
-    <key>underWaterFogMod</key>
-        <real>0.25</real>
-    <key>waterFogColor</key>
-        <array>
-            <real>0.059999998658895493</real>
-            <real>0.37999999523162842</real>
-            <real>0.52999997138977051</real>
-            <real>0.52999997138977051</real>
-        </array>
-    <key>waterFogDensity</key>
-        <real>2.1000001430511475</real>
-    <key>wave1Dir</key>
-        <array>
-            <real>0.5</real>
-            <real>-0.17000000178813934</real>
-        </array>
-    <key>wave2Dir</key>
-        <array>
-            <real>0.57999998331069946</real>
-            <real>-0.67000001668930054</real>
-        </array>
-    </map>
-</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/water/SNAKE%21%21%21.xml b/linden/indra/newview/app_settings/windlight/water/SNAKE%21%21%21.xml
deleted file mode 100644
index 6dbc4e8..0000000
--- a/linden/indra/newview/app_settings/windlight/water/SNAKE%21%21%21.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<llsd>
-    <map>
-    <key>blurMultiplier</key>
-        <real>0.0030000000260770321</real>
-    <key>fresnelOffset</key>
-        <real>0.57999998331069946</real>
-    <key>fresnelScale</key>
-        <real>0.099999994039535522</real>
-    <key>normScale</key>
-        <array>
-            <real>10</real>
-            <real>10</real>
-            <real>10</real>
-        </array>
-    <key>normalMap</key>
-        <uuid>470626e3-ac38-8554-d49b-90311c0176a9</uuid>
-    <key>scaleAbove</key>
-        <real>0.91999995708465576</real>
-    <key>scaleBelow</key>
-        <real>0.93999999761581421</real>
-    <key>underWaterFogMod</key>
-        <real>0.25</real>
-    <key>waterFogColor</key>
-        <array>
-            <real>0.049999997019767761</real>
-            <real>0.37999999523162842</real>
-            <real>0.52999997138977051</real>
-            <real>0.52999997138977051</real>
-        </array>
-    <key>waterFogDensity</key>
-        <real>3.2000000476837158</real>
-    <key>wave1Dir</key>
-        <array>
-            <real>0.5</real>
-            <real>-0.17000000178813934</real>
-        </array>
-    <key>wave2Dir</key>
-        <array>
-            <real>0.57999998331069946</real>
-            <real>-0.67000001668930054</real>
-        </array>
-    </map>
-</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/water/Second%20Plague.xml b/linden/indra/newview/app_settings/windlight/water/Second%20Plague.xml
deleted file mode 100644
index 137483a..0000000
--- a/linden/indra/newview/app_settings/windlight/water/Second%20Plague.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<llsd>
-    <map>
-    <key>blurMultiplier</key>
-        <real>0.017000000923871994</real>
-    <key>fresnelOffset</key>
-        <real>0.37000000476837158</real>
-    <key>fresnelScale</key>
-        <real>0</real>
-    <key>normScale</key>
-        <array>
-            <integer>2</integer>
-            <integer>2</integer>
-            <integer>2</integer>
-        </array>
-    <key>normalMap</key>
-        <uuid>822ded49-9a6c-f61c-cb89-6df54f42cdf4</uuid>
-    <key>scaleAbove</key>
-        <real>0.079999998211860657</real>
-    <key>scaleBelow</key>
-        <real>0.20000000298023224</real>
-    <key>underWaterFogMod</key>
-        <real>0.85999995470046997</real>
-    <key>waterFogColor</key>
-        <array>
-            <real>0.48999997973442078</real>
-            <real>0</real>
-            <real>0</real>
-            <real>0.48999997973442078</real>
-        </array>
-    <key>waterFogDensity</key>
-        <real>20</real>
-    <key>wave1Dir</key>
-        <array>
-            <real>0.5</real>
-            <real>-0.17000000178813934</real>
-        </array>
-    <key>wave2Dir</key>
-        <array>
-            <real>0.57999998331069946</real>
-            <real>-0.67000001668930054</real>
-        </array>
-    </map>
-</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/water/Valdez.xml b/linden/indra/newview/app_settings/windlight/water/Valdez.xml
deleted file mode 100644
index eb70a14..0000000
--- a/linden/indra/newview/app_settings/windlight/water/Valdez.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<llsd>
-    <map>
-    <key>blurMultiplier</key>
-        <real>0.0020000000949949026</real>
-    <key>fresnelOffset</key>
-        <real>0.28999999165534973</real>
-    <key>fresnelScale</key>
-        <real>0</real>
-    <key>normScale</key>
-        <array>
-            <integer>2</integer>
-            <integer>2</integer>
-            <integer>2</integer>
-        </array>
-    <key>normalMap</key>
-        <uuid>822ded49-9a6c-f61c-cb89-6df54f42cdf4</uuid>
-    <key>scaleAbove</key>
-        <real>0.079999998211860657</real>
-    <key>scaleBelow</key>
-        <real>0.20000000298023224</real>
-    <key>underWaterFogMod</key>
-        <real>1</real>
-    <key>waterFogColor</key>
-        <array>
-            <real>0</real>
-            <real>0</real>
-            <real>0</real>
-            <real>0</real>
-        </array>
-    <key>waterFogDensity</key>
-        <real>1024</real>
-    <key>wave1Dir</key>
-        <array>
-            <real>0.5</real>
-            <real>-0.17000000178813934</real>
-        </array>
-    <key>wave2Dir</key>
-        <array>
-            <real>0.57999998331069946</real>
-            <real>-0.67000001668930054</real>
-        </array>
-    </map>
-</llsd>
diff --git a/linden/indra/newview/dronesettings.xml b/linden/indra/newview/dronesettings.xml
new file mode 100644
index 0000000..8a41280
--- /dev/null
+++ b/linden/indra/newview/dronesettings.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<settings version = "101">
+        <!--Turns off dialog asking if you want to enable crash reporting-->
+        <AskedAboutCrashReports value="TRUE"/>
+        <!--Login automatically using last username/password combination-->
+        <AutoLogin value="TRUE"/>
+        <!--Disable GL rendering and GUI (load testing)-->
+        <DisableRendering value="TRUE"/>
+        <!--Specifies that you have not successfully logged in since you installed the latest update-->
+        <FirstLoginThisInstall value="FALSE"/>
+        <!--Login first name-->
+        <FirstName value="drone_00000"/>
+        <!--Rectangle for build options window.-->
+        <FloaterBuildOptionsRect value="160 43 272 130"/>
+        <!--Rectangle for Find window-->
+        <FloaterFindRect2 value="0 -397 780 570"/>
+        <!--Rectangle for gestures window-->
+        <FloaterGestureRect value="0 -307 320 480"/>
+        <!--Rectangle for inventory window-->
+        <FloaterInventoryRect value="132 0 300 400"/>
+        <!--Rectangle for world map-->
+        <FloaterMapRect value="232 -52 200 225"/>
+        <!--Rectangle for avatar control window-->
+        <FloaterMoveRect value="136 0 160 58"/>
+        <!--[DO NOT MODIFY] Controls layout of floating windows within SL window-->
+        <FloaterViewBottom value="62"/>
+        <!--Was flying when last logged out, so fly when logging in-->
+        <FlyingAtExit value="TRUE"/>
+        <!--[DO NOT MODIFY] Version number for tracking hardware changes-->
+        <LastFeatureVersion value="8"/>
+        <!--Login last name-->
+        <LastName value="Tester"/>
+        <!--Version number of last instance of the viewer that you ran-->
+        <LastRunVersion value="1.7.0"/>
+        <!--Number of successful logins to Second Life-->
+        <NumSessions value="27"/>
+        <!--Query current hardware configuration on application startup-->
+        <ProbeHardwareOnStartup value="FALSE"/>
+        <!--Keep password (in encrypted form) for next login-->
+        <RememberPassword value="FALSE"/>
+        <!--Controls how avatars are rendered (0 = normal, 1 = bump mapped, 2 = bump mapped and wavy cloth)-->
+        <RenderAvatarMode value="0"/>
+        <!--Distance of far clip plane from camera (meters)-->
+        <RenderFarClip value="128"/>
+        <!--Show bumpmapping on primitives-->
+        <RenderObjectBump value="FALSE"/>
+        <!--Play back autopilot-->
+        <StatsAutoRun value="TRUE"/>
+        <!--[DO NOT MODIFY] Controls local file caching behavior-->
+        <VFSSalt value="18366"/>
+        <!--Enables FirstStreamingMusic warning dialog-->
+        <WarnFirstStreamingMusic value="FALSE"/>
+        <!--SL viewer window height-->
+        <WindowHeight value="200"/>
+        <!--SL viewer window maximized on login-->
+        <WindowMaximized value="FALSE"/>
+        <!--SL viewer window width-->
+        <WindowWidth value="440"/>
+        <!--X coordinate of lower left corner of SL viewer window, relative to primary display (pixels)-->
+        <WindowX value="820"/>
+        <!--Y coordinate of lower left corner of SL viewer window, relative to primary display (pixels)-->
+        <WindowY value="120"/>
+</settings>
diff --git a/linden/indra/newview/files.lst b/linden/indra/newview/files.lst
index 15062ae..3233ade 100644
--- a/linden/indra/newview/files.lst
+++ b/linden/indra/newview/files.lst
@@ -219,6 +219,7 @@ newview/llpanelobject.cpp
 newview/llpanelpermissions.cpp
 newview/llpanelpick.cpp
 newview/llpanelplace.cpp
+newview/llpanelskins.cpp
 newview/llpanelvolume.cpp
 newview/llpanelweb.cpp
 newview/llparcelselection.cpp
diff --git a/linden/indra/newview/gpu_table.txt b/linden/indra/newview/gpu_table.txt
index f038e0f..52ea166 100644
--- a/linden/indra/newview/gpu_table.txt
+++ b/linden/indra/newview/gpu_table.txt
@@ -75,6 +75,7 @@ ATI Radeon HD 2900				.*ATI.*Radeon HD 29.*				3		1
 ATI Radeon HD 3400                              .*ATI.*Radeon HD 34.*                           1               1
 ATI Radeon HD 3600                              .*ATI.*Radeon HD 36.*                           3               1
 ATI Radeon HD 3800                              .*ATI.*Radeon HD 38.*                           3               1
+ATI Radeon HD 4800                              .*ATI.*Radeon HD 48.*                           3               1
 ATI Radeon OpenGL                               .*ATI.*Radeon OpenGL.*                          0               0
 ATI Radeon 7xxx                                 .*ATI.*Radeon 7.*                                       0               1
 ATI Radeon 8xxx                                 .*ATI.*Radeon 8.*                                       0               1
diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp
index 1ec2c14..6e8528c 100644
--- a/linden/indra/newview/llappviewer.cpp
+++ b/linden/indra/newview/llappviewer.cpp
@@ -621,6 +621,9 @@ bool LLAppViewer::init()
         // Need to do this initialization before we do anything else, since anything
         // that touches files should really go through the lldir API
         gDirUtilp->initAppDirs("SecondLife");
+        // set skin search path to default, will be overridden later
+        // this allows simple skinned file lookups to work
+        gDirUtilp->setSkinFolder("default");
 
         initLogging();
         
@@ -684,6 +687,8 @@ bool LLAppViewer::init()
         */
 #endif
 
+        //test_cached_control();
+
         // track number of times that app has run
         mNumSessions = gSavedSettings.getS32("NumSessions");
         mNumSessions++;
@@ -697,12 +702,12 @@ bool LLAppViewer::init()
         }
         
         // Load art UUID information, don't require these strings to be declared in code.
-        LLString colors_base_filename = gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "colors_base.xml");
+        LLString colors_base_filename = gDirUtilp->findSkinnedFilename("colors_base.xml");
         LL_DEBUGS("InitInfo") << "Loading base colors from " << colors_base_filename << LL_ENDL;
         gColors.loadFromFileLegacy(colors_base_filename.c_str(), FALSE, TYPE_COL4U);
 
         // Load overrides from user colors file
-        LLString user_colors_filename = gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "colors.xml");
+        LLString user_colors_filename = gDirUtilp->findSkinnedFilename("colors.xml");
         LL_DEBUGS("InitInfo") << "Loading user colors from " << user_colors_filename << LL_ENDL;
         if (gColors.loadFromFileLegacy(user_colors_filename.c_str(), FALSE, TYPE_COL4U) == 0)
         {
@@ -1474,7 +1479,7 @@ bool LLAppViewer::initLogging()
         return true;
 }
 
-void LLAppViewer::loadSettingsFromDirectory(ELLPath path_index)
+void LLAppViewer::loadSettingsFromDirectory(ELLPath path_index, bool set_defaults)
 {       
         for(LLSD::map_iterator itr = mSettingsFileList.beginMap(); itr != mSettingsFileList.endMap(); ++itr)
         {
@@ -1507,7 +1512,7 @@ void LLAppViewer::loadSettingsFromDirectory(ELLPath path_index)
                         llwarns << "Cannot load " << settings_file << " - No matching settings group for name " << settings_name << llendl;
                         continue;
                 }
-                if(!gSettings[settings_name]->loadFromFile(full_settings_path))
+                if(!gSettings[settings_name]->loadFromFile(full_settings_path, set_defaults))
                 {
                         llwarns << "Cannot load " << full_settings_path << " - No settings found." << llendl;
                 }
@@ -1556,7 +1561,8 @@ bool LLAppViewer::initConfiguration()
         // - load per account settings (happens in llstartup
         
         // - load defaults
-        loadSettingsFromDirectory(LL_PATH_APP_SETTINGS);
+        bool set_defaults = true;
+        loadSettingsFromDirectory(LL_PATH_APP_SETTINGS, set_defaults);
 
         // - set procedural settings 
         gSavedSettings.setString("ClientSettingsFile", 
@@ -1820,7 +1826,7 @@ bool LLAppViewer::initConfiguration()
         }
     }
 
-    const LLControlVariable* skinfolder = gSavedSettings.getControl("SkinFolder");
+    const LLControlVariable* skinfolder = gSavedSettings.getControl("SkinCurrent");
     if(skinfolder && LLString::null != skinfolder->getValue().asString())
     {   
         gDirUtilp->setSkinFolder(skinfolder->getValue().asString());
@@ -1832,33 +1838,33 @@ bool LLAppViewer::initConfiguration()
         gSecondLife = "Second Life";
 
         // Read skin/branding settings if specified.
-        if (! gDirUtilp->getSkinDir().empty() )
-        {
-                std::string skin_def_file = gDirUtilp->getExpandedFilename(LL_PATH_TOP_SKIN, "skin.xml");
-                LLXmlTree skin_def_tree;
-
-                if (!skin_def_tree.parseFile(skin_def_file))
-                {
-                        llerrs << "Failed to parse skin definition." << llendl;
-                }
-
-                LLXmlTreeNode* rootp = skin_def_tree.getRoot();
-                LLXmlTreeNode* disabled_message_node = rootp->getChildByName("disabled_message");       
-                if (disabled_message_node)
-                {
-                        gDisabledMessage = disabled_message_node->getContents();
-                }
-
-                static LLStdStringHandle hide_links_string = LLXmlTree::addAttributeString("hide_links");
-                rootp->getFastAttributeBOOL(hide_links_string, gHideLinks);
-
-                // Legacy string.  This flag really meant we didn't want to expose references to "Second Life".
-                // Just set gHideLinks instead.
-                static LLStdStringHandle silent_string = LLXmlTree::addAttributeString("silent_update");
-                BOOL silent_update;
-                rootp->getFastAttributeBOOL(silent_string, silent_update);
-                gHideLinks = (gHideLinks || silent_update);
-        }
+        //if (! gDirUtilp->getSkinDir().empty() )
+        //{
+        //      std::string skin_def_file = gDirUtilp->findSkinnedFilename("skin.xml");
+        //      LLXmlTree skin_def_tree;
+
+        //      if (!skin_def_tree.parseFile(skin_def_file))
+        //      {
+        //              llerrs << "Failed to parse skin definition." << llendl;
+        //      }
+
+        //      LLXmlTreeNode* rootp = skin_def_tree.getRoot();
+        //      LLXmlTreeNode* disabled_message_node = rootp->getChildByName("disabled_message");       
+        //      if (disabled_message_node)
+        //      {
+        //              gDisabledMessage = disabled_message_node->getContents();
+        //      }
+
+        //      static LLStdStringHandle hide_links_string = LLXmlTree::addAttributeString("hide_links");
+        //      rootp->getFastAttributeBOOL(hide_links_string, gHideLinks);
+
+        //      // Legacy string.  This flag really meant we didn't want to expose references to "Second Life".
+        //      // Just set gHideLinks instead.
+        //      static LLStdStringHandle silent_string = LLXmlTree::addAttributeString("silent_update");
+        //      BOOL silent_update;
+        //      rootp->getFastAttributeBOOL(silent_string, silent_update);
+        //      gHideLinks = (gHideLinks || silent_update);
+        //}
 
 #if LL_DARWIN
         // Initialize apple menubar and various callbacks
diff --git a/linden/indra/newview/llappviewer.h b/linden/indra/newview/llappviewer.h
index c98be41..f00211f 100644
--- a/linden/indra/newview/llappviewer.h
+++ b/linden/indra/newview/llappviewer.h
@@ -122,7 +122,7 @@ public:
         static const std::string sPerAccountSettingsName; 
         static const std::string sCrashSettingsName; 
 
-        void loadSettingsFromDirectory(ELLPath path_index);
+        void loadSettingsFromDirectory(ELLPath path_index, bool set_defaults = false);
 
         std::string getSettingsFileName(const std::string& file);
 
diff --git a/linden/indra/newview/llfloatereditui.cpp b/linden/indra/newview/llfloatereditui.cpp
index 83c69b5..dfb0571 100644
--- a/linden/indra/newview/llfloatereditui.cpp
+++ b/linden/indra/newview/llfloatereditui.cpp
@@ -48,6 +48,10 @@ void	LLFloaterEditUI::navigateHierarchyButtonPressed(void*	data)
         LLView* view = LLView::sEditingUIView;
         if( !view ) return;
         LLView* parent = view->getParent();
+        if(!parent)
+        {
+                return ;
+        }
         const LLView::child_list_t*     viewChildren = view->getChildList();
         const LLView::child_list_t*     parentChildren = parent->getChildList();
         //LLView::child_list_t::iterator
diff --git a/linden/indra/newview/llfloaterhud.cpp b/linden/indra/newview/llfloaterhud.cpp
index d93e36a..8b34cb9 100644
--- a/linden/indra/newview/llfloaterhud.cpp
+++ b/linden/indra/newview/llfloaterhud.cpp
@@ -66,7 +66,7 @@ LLFloaterHUD::LLFloaterHUD()
         setBackgroundOpaque(TRUE);
 
         // Position floater based on saved location
-        LLRect saved_position_rect = gSavedSettings.getRect("FloaterHUDRect");
+        LLRect saved_position_rect = gSavedSettings.getRect("FloaterHUDRect2");
         reshape(saved_position_rect.getWidth(), saved_position_rect.getHeight(), FALSE);
         setRect(saved_position_rect);
         
@@ -109,7 +109,7 @@ LLFloaterHUD* LLFloaterHUD::getInstance()
 LLFloaterHUD::~LLFloaterHUD()
 {
         // Save floater position
-        gSavedSettings.setRect("FloaterHUDRect", getRect() );
+        gSavedSettings.setRect("FloaterHUDRect2", getRect() );
 
         // Clear out the one instance if it's ours
         if (sInstance == this)
diff --git a/linden/indra/newview/llfloaterpreference.cpp b/linden/indra/newview/llfloaterpreference.cpp
index f267a2d..ff766a3 100644
--- a/linden/indra/newview/llfloaterpreference.cpp
+++ b/linden/indra/newview/llfloaterpreference.cpp
@@ -60,6 +60,7 @@
 #include "llpanelLCD.h"
 #include "llpanelmsgs.h"
 #include "llpanelweb.h"
+#include "llpanelskins.h"
 #include "llprefschat.h"
 #include "llprefsvoice.h"
 #include "llprefsim.h"
@@ -131,6 +132,7 @@ S32 pref_min_height()
 LLPreferenceCore::LLPreferenceCore(LLTabContainer* tab_container, LLButton * default_btn) :
         mTabContainer(tab_container),
         mGeneralPanel(NULL),
+        mSkinsPanel(NULL),
         mInputPanel(NULL),
         mNetworkPanel(NULL),
         mDisplayPanel(NULL),
@@ -142,6 +144,10 @@ LLPreferenceCore::LLPreferenceCore(LLTabContainer* tab_container, LLButton * def
         mTabContainer->addTabPanel(mGeneralPanel, mGeneralPanel->getLabel(), FALSE, onTabChanged, mTabContainer);
         mGeneralPanel->setDefaultBtn(default_btn);
 
+        mSkinsPanel = new LLPanelSkins();
+        mTabContainer->addTabPanel(mSkinsPanel, mSkinsPanel->getLabel(), FALSE, onTabChanged, mTabContainer);
+        mSkinsPanel->setDefaultBtn(default_btn);
+
         mInputPanel = new LLPanelInput();
         mTabContainer->addTabPanel(mInputPanel, mInputPanel->getLabel(), FALSE, onTabChanged, mTabContainer);
         mInputPanel->setDefaultBtn(default_btn);
@@ -205,6 +211,11 @@ LLPreferenceCore::~LLPreferenceCore()
                 delete mGeneralPanel;
                 mGeneralPanel = NULL;
         }
+        if (mSkinsPanel)
+        {
+                delete mSkinsPanel;
+                mSkinsPanel = NULL;
+        }
         if (mInputPanel)
         {
                 delete mInputPanel;
@@ -252,6 +263,7 @@ LLPreferenceCore::~LLPreferenceCore()
 void LLPreferenceCore::apply()
 {
         mGeneralPanel->apply();
+        mSkinsPanel->apply();
         mInputPanel->apply();
         mNetworkPanel->apply();
         mDisplayPanel->apply();
@@ -278,6 +290,7 @@ void LLPreferenceCore::apply()
 void LLPreferenceCore::cancel()
 {
         mGeneralPanel->cancel();
+        mSkinsPanel->cancel();
         mInputPanel->cancel();
         mNetworkPanel->cancel();
         mDisplayPanel->cancel();
diff --git a/linden/indra/newview/llfloaterpreference.h b/linden/indra/newview/llfloaterpreference.h
index 4db42a7..939a4a4 100644
--- a/linden/indra/newview/llfloaterpreference.h
+++ b/linden/indra/newview/llfloaterpreference.h
@@ -54,6 +54,7 @@ class LLPrefsChat;
 class LLPrefsVoice;
 class LLPrefsIM;
 class LLPanelMsgs;
+class LLPanelSkins;
 class LLScrollListCtrl;
 
 class LLPreferenceCore
@@ -81,6 +82,7 @@ public:
 private:
         LLTabContainer  *mTabContainer;
         LLPanelGeneral          *mGeneralPanel;
+        LLPanelSkins                    *mSkinsPanel;
         LLPanelInput                    *mInputPanel;
         LLPanelNetwork          *mNetworkPanel;
         LLPanelDisplay          *mDisplayPanel;
diff --git a/linden/indra/newview/llfloatersnapshot.cpp b/linden/indra/newview/llfloatersnapshot.cpp
index 857b3fa..c83eba3 100644
--- a/linden/indra/newview/llfloatersnapshot.cpp
+++ b/linden/indra/newview/llfloatersnapshot.cpp
@@ -149,7 +149,7 @@ public:
 
 protected:
         LLColor4                                        mColor;
-        LLPointer<LLImageGL>            mViewerImage[2];
+        LLPointer<LLImageGL>            mViewerImage[2]; //used to represent the scene when the frame is frozen.
         LLRect                                          mImageRect[2];
         S32                                                     mWidth[2];
         S32                                                     mHeight[2];
@@ -393,6 +393,7 @@ void LLSnapshotLivePreview::drawPreviewRect(S32 offset_x, S32 offset_y)
         }
 }
 
+//called when the frame is frozen.
 void LLSnapshotLivePreview::draw()
 {
         if (mViewerImage[mCurImageIndex].notNull() &&
@@ -813,34 +814,40 @@ void LLSnapshotLivePreview::onIdle( void* snapshot_preview )
                                 previewp->mDataSize = previewp->mRawImage->getDataSize();
                         }
 
+                        //
+                        //the mViewerImage is used to represent the scene when the frame is frozen.
+                        //
                         LLPointer<LLImageRaw> scaled = new LLImageRaw(previewp->mRawImageEncoded->getData(),
                                                                                                                   previewp->mRawImageEncoded->getWidth(),
                                                                                                                   previewp->mRawImageEncoded->getHeight(),
                                                                                                                   previewp->mRawImageEncoded->getComponents());
                         
-                        // leave original image dimensions, just scale up texture buffer
-                        if (previewp->mRawImageEncoded->getWidth() > 1024 || previewp->mRawImageEncoded->getHeight() > 1024)
+                        if(!scaled->isBufferInvalid())
                         {
-                                // go ahead and shrink image to appropriate power of 2 for display
-                                scaled->biasedScaleToPowerOfTwo(1024);
-                                previewp->mImageScaled[previewp->mCurImageIndex] = TRUE;
-                        }
-                        else
-                        {
-                                // expand image but keep original image data intact
-                                scaled->expandToPowerOfTwo(1024, FALSE);
-                        }
+                                // leave original image dimensions, just scale up texture buffer
+                                if (previewp->mRawImageEncoded->getWidth() > 1024 || previewp->mRawImageEncoded->getHeight() > 1024)
+                                {
+                                        // go ahead and shrink image to appropriate power of 2 for display
+                                        scaled->biasedScaleToPowerOfTwo(1024);
+                                        previewp->mImageScaled[previewp->mCurImageIndex] = TRUE;
+                                }
+                                else
+                                {
+                                        // expand image but keep original image data intact
+                                        scaled->expandToPowerOfTwo(1024, FALSE);
+                                }
 
-                        previewp->mViewerImage[previewp->mCurImageIndex] = new LLImageGL(scaled, FALSE);
-                        previewp->mViewerImage[previewp->mCurImageIndex]->setMipFilterNearest(previewp->getSnapshotType() != SNAPSHOT_TEXTURE);
-                        LLViewerImage::bindTexture(previewp->mViewerImage[previewp->mCurImageIndex]);
-                        previewp->mViewerImage[previewp->mCurImageIndex]->setClamp(TRUE, TRUE);
+                                previewp->mViewerImage[previewp->mCurImageIndex] = new LLImageGL(scaled, FALSE);
+                                previewp->mViewerImage[previewp->mCurImageIndex]->setMipFilterNearest(previewp->getSnapshotType() != SNAPSHOT_TEXTURE);
+                                LLViewerImage::bindTexture(previewp->mViewerImage[previewp->mCurImageIndex]);
+                                previewp->mViewerImage[previewp->mCurImageIndex]->setClamp(TRUE, TRUE);
 
-                        previewp->mSnapshotUpToDate = TRUE;
-                        previewp->generateThumbnailImage(TRUE) ;
+                                previewp->mSnapshotUpToDate = TRUE;
+                                previewp->generateThumbnailImage(TRUE) ;
 
-                        previewp->mPosTakenGlobal = gAgent.getCameraPositionGlobal();
-                        previewp->mShineCountdown = 4; // wait a few frames to avoid animation glitch due to readback this frame
+                                previewp->mPosTakenGlobal = gAgent.getCameraPositionGlobal();
+                                previewp->mShineCountdown = 4; // wait a few frames to avoid animation glitch due to readback this frame
+                        }
                 }
                 previewp->getWindow()->decBusyCount();
                 // only show fullscreen preview when in freeze frame mode
diff --git a/linden/indra/newview/llpanelskins.cpp b/linden/indra/newview/llpanelskins.cpp
new file mode 100644
index 0000000..56c0694
--- /dev/null
+++ b/linden/indra/newview/llpanelskins.cpp
@@ -0,0 +1,109 @@
+/** 
+ * @file llpanelskins.cpp
+ * @brief General preferences panel in preferences floater
+ *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
+ * Copyright (c) 2001-2008, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#include "llviewerprecompiledheaders.h"
+
+#include "llpanelskins.h"
+
+// linden library includes
+#include "llradiogroup.h"
+#include "llbutton.h"
+#include "lluictrlfactory.h"
+
+// project includes
+#include "llviewercontrol.h"
+#include "llviewerwindow.h"
+
+LLPanelSkins::LLPanelSkins()
+{
+        LLUICtrlFactory::getInstance()->buildPanel(this, "panel_preferences_skins.xml");
+}
+
+LLPanelSkins::~LLPanelSkins()
+{
+}
+
+BOOL LLPanelSkins::postBuild()
+{
+        LLRadioGroup* skin_select = getChild<LLRadioGroup>("skin_selection");
+        skin_select->setCommitCallback(onSelectSkin);
+        skin_select->setCallbackUserData(this);
+
+        getChild<LLButton>("classic_preview")->setClickedCallback(onClickClassic, this);
+        getChild<LLButton>("silver_preview")->setClickedCallback(onClickSilver, this);
+
+        refresh();
+        return TRUE;
+}
+
+void LLPanelSkins::refresh()
+{
+        mSkin = gSavedSettings.getString("SkinCurrent");
+        getChild<LLRadioGroup>("skin_selection")->setValue(mSkin);
+}
+
+void LLPanelSkins::apply()
+{
+        if (mSkin != gSavedSettings.getString("SkinCurrent"))
+        {
+                  gViewerWindow->alertXml("ChangeSkin");
+                  refresh();
+        }
+}
+
+void LLPanelSkins::cancel()
+{
+        // reverts any changes to current skin
+        gSavedSettings.setString("SkinCurrent", mSkin);
+}
+
+//static
+void LLPanelSkins::onSelectSkin(LLUICtrl* ctrl, void* data)
+{
+        std::string skin_selection = ctrl->getValue().asString();
+        gSavedSettings.setString("SkinCurrent", skin_selection);
+}
+
+//static 
+void LLPanelSkins::onClickClassic(void* data)
+{
+        LLPanelSkins* self = (LLPanelSkins*)data;
+        gSavedSettings.setString("SkinCurrent", "default");
+        self->getChild<LLRadioGroup>("skin_selection")->setValue("default");
+}
+
+//static 
+void LLPanelSkins::onClickSilver(void* data)
+{
+        LLPanelSkins* self = (LLPanelSkins*)data;
+        gSavedSettings.setString("SkinCurrent", "silver");
+        self->getChild<LLRadioGroup>("skin_selection")->setValue("silver");
+}
diff --git a/linden/indra/newview/llpanelskins.h b/linden/indra/newview/llpanelskins.h
new file mode 100644
index 0000000..88d5da2
--- /dev/null
+++ b/linden/indra/newview/llpanelskins.h
@@ -0,0 +1,58 @@
+/** 
+ * @file llpanelgeneral.h
+ * @author James Cook
+ * @brief General preferences panel in preferences floater
+ *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
+ * Copyright (c) 2001-2008, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#ifndef LL_LLPANELSKINS_H
+#define LL_LLPANELSKINS_H
+
+#include "llpanel.h"
+
+class LLPanelSkins : public LLPanel
+{
+public:
+        LLPanelSkins();
+        virtual ~LLPanelSkins();
+
+        virtual BOOL postBuild();
+        void refresh();
+        void apply();
+        void cancel();
+
+private:
+        static void onSelectSkin(LLUICtrl* ctrl, void* data);
+        static void onClickClassic(void* data);
+        static void onClickSilver(void* data);
+
+private:
+        std::string mSkin;
+};
+
+#endif // LL_LLPANELSKINS_H
diff --git a/linden/indra/newview/lltexturecache.cpp b/linden/indra/newview/lltexturecache.cpp
index 8240f77..22cb6c1 100644
--- a/linden/indra/newview/lltexturecache.cpp
+++ b/linden/indra/newview/lltexturecache.cpp
@@ -927,12 +927,13 @@ S32 LLTextureCache::update(U32 max_time_ms)
 }
 
 //////////////////////////////////////////////////////////////////////////////
-
+// search for local copy of UUID-based image file
 std::string LLTextureCache::getLocalFileName(const LLUUID& id)
 {
         // Does not include extension
         std::string idstr = id.asString();
-        std::string filename = gDirUtilp->getExpandedFilename(LL_PATH_SKINS, "textures", idstr);
+        // TODO: should we be storing cached textures in skin directory?
+        std::string filename = gDirUtilp->getExpandedFilename(LL_PATH_SKINS, "default", "textures", idstr);
         return filename;
 }
 
diff --git a/linden/indra/newview/llviewercontrol.cpp b/linden/indra/newview/llviewercontrol.cpp
index 3f79654..98d19bc 100644
--- a/linden/indra/newview/llviewercontrol.cpp
+++ b/linden/indra/newview/llviewercontrol.cpp
@@ -566,3 +566,124 @@ void settings_setup_listeners()
         gSavedSettings.getControl("LipSyncEnabled")->getSignal()->connect(boost::bind(&handleVoiceClientPrefsChanged, _1));     
 }
 
+template <> eControlType get_control_type<U32>(const U32& in, LLSD& out) 
+{ 
+        out = (LLSD::Integer)in; 
+        return TYPE_U32; 
+}
+
+template <> eControlType get_control_type<S32>(const S32& in, LLSD& out) 
+{ 
+        out = in; 
+        return TYPE_S32; 
+}
+
+template <> eControlType get_control_type<F32>(const F32& in, LLSD& out) 
+{ 
+        out = in; 
+        return TYPE_F32; 
+}
+
+template <> eControlType get_control_type<bool> (const bool& in, LLSD& out) 
+{ 
+        out = in; 
+        return TYPE_BOOLEAN; 
+}
+/*
+// Yay BOOL, its really an S32.
+template <> eControlType get_control_type<BOOL> (const BOOL& in, LLSD& out) 
+{ 
+        out = in; 
+        return TYPE_BOOLEAN; 
+}
+*/
+template <> eControlType get_control_type<std::string>(const std::string& in, LLSD& out) 
+{ 
+        out = in; 
+        return TYPE_STRING; 
+}
+
+template <> eControlType get_control_type<LLVector3>(const LLVector3& in, LLSD& out) 
+{ 
+        out = in.getValue(); 
+        return TYPE_VEC3; 
+}
+
+template <> eControlType get_control_type<LLVector3d>(const LLVector3d& in, LLSD& out) 
+{ 
+        out = in.getValue(); 
+        return TYPE_VEC3D; 
+}
+
+template <> eControlType get_control_type<LLRect>(const LLRect& in, LLSD& out) 
+{ 
+        out = in.getValue(); 
+        return TYPE_RECT; 
+}
+
+template <> eControlType get_control_type<LLColor4>(const LLColor4& in, LLSD& out) 
+{ 
+        out = in.getValue(); 
+        return TYPE_COL4; 
+}
+
+template <> eControlType get_control_type<LLColor3>(const LLColor3& in, LLSD& out) 
+{ 
+        out = in.getValue(); 
+        return TYPE_COL3; 
+}
+
+template <> eControlType get_control_type<LLColor4U>(const LLColor4U& in, LLSD& out) 
+{ 
+        out = in.getValue();
+        return TYPE_COL4U; 
+}
+
+template <> eControlType get_control_type<LLSD>(const LLSD& in, LLSD& out) 
+{ 
+        out = in;
+        return TYPE_LLSD; 
+}
+
+
+#if TEST_CACHED_CONTROL
+
+#define DECL_LLCC(T, V) static LLCachedControl<T> mySetting_##T("TestCachedControl"#T, V)
+DECL_LLCC(U32, (U32)666);
+DECL_LLCC(S32, (S32)-666);
+DECL_LLCC(F32, (F32)-666.666);
+DECL_LLCC(bool, true);
+DECL_LLCC(BOOL, FALSE);
+static LLCachedControl<std::string> mySetting_string("TestCachedControlstring", "Default String Value");
+DECL_LLCC(LLVector3, LLVector3(1.0f, 2.0f, 3.0f));
+DECL_LLCC(LLVector3d, LLVector3d(6.0f, 5.0f, 4.0f));
+DECL_LLCC(LLRect, LLRect(0, 0, 100, 500));
+DECL_LLCC(LLColor4, LLColor4(0.0f, 0.5f, 1.0f));
+DECL_LLCC(LLColor3, LLColor3(1.0f, 0.f, 0.5f));
+DECL_LLCC(LLColor4U, LLColor4U(255, 200, 100, 255));
+
+LLSD test_llsd = LLSD()["testing1"] = LLSD()["testing2"];
+DECL_LLCC(LLSD, test_llsd);
+
+static LLCachedControl<std::string> test_BrowserHomePage("BrowserHomePage", "hahahahahha", "Not the real comment");
+
+void test_cached_control()
+{
+#define TEST_LLCC(T, V) if((T)mySetting_##T != V) llerrs << "Fail "#T << llendl
+        TEST_LLCC(U32, 666);
+        TEST_LLCC(S32, (S32)-666);
+        TEST_LLCC(F32, (F32)-666.666);
+        TEST_LLCC(bool, true);
+        TEST_LLCC(BOOL, FALSE);
+        if((std::string)mySetting_string != "Default String Value") llerrs << "Fail string" << llendl;
+        TEST_LLCC(LLVector3, LLVector3(1.0f, 2.0f, 3.0f));
+        TEST_LLCC(LLVector3d, LLVector3d(6.0f, 5.0f, 4.0f));
+        TEST_LLCC(LLRect, LLRect(0, 0, 100, 500));
+        TEST_LLCC(LLColor4, LLColor4(0.0f, 0.5f, 1.0f));
+        TEST_LLCC(LLColor3, LLColor3(1.0f, 0.f, 0.5f));
+        TEST_LLCC(LLColor4U, LLColor4U(255, 200, 100, 255));
+//There's no LLSD comparsion for LLCC yet. TEST_LLCC(LLSD, test_llsd); 
+
+        if((std::string)test_BrowserHomePage != "http://www.secondlife.com") llerrs << "Fail BrowserHomePage" << llendl;
+}
+#endif // TEST_CACHED_CONTROL
\ No newline at end of file
diff --git a/linden/indra/newview/llviewercontrol.h b/linden/indra/newview/llviewercontrol.h
index c827f37..5de3e38 100644
--- a/linden/indra/newview/llviewercontrol.h
+++ b/linden/indra/newview/llviewercontrol.h
@@ -65,4 +65,114 @@ extern LLControlGroup gCrashSettings;
 extern LLString gLastRunVersion;
 extern LLString gCurrentVersion;
 
+//! Helper function for LLCachedControl
+template <class T> 
+eControlType get_control_type(const T& in, LLSD& out)
+{
+        llerrs << "Usupported control type: " << typeid(T).name() << "." << llendl;
+        return TYPE_COUNT;
+}
+
+//! Publish/Subscribe object to interact with LLControlGroups.
+
+//! An LLCachedControl instance to connect to a LLControlVariable
+//! without have to manually create and bind a listener to a local
+//! object.
+template <class T>
+class LLCachedControl
+{
+    T mCachedValue;
+    LLPointer<LLControlVariable> mControl;
+    boost::signals::connection mConnection;
+
+public:
+        LLCachedControl(const std::string& name, 
+                                        const T& default_value, 
+                                        const std::string& comment = "Declared In Code")
+        {
+                mControl = gSavedSettings.getControl(name);
+                if(mControl.isNull())
+                {
+                        declareTypedControl(gSavedSettings, name, default_value, comment);
+                        mControl = gSavedSettings.getControl(name);
+                        if(mControl.isNull())
+                        {
+                                llerrs << "The control could not be created!!!" << llendl;
+                        }
+
+                        mCachedValue = default_value;
+                }
+                else
+                {
+                        mCachedValue = (const T&)mControl->getValue();
+                }
+
+                // Add a listener to the controls signal...
+                mControl->getSignal()->connect(
+                        boost::bind(&LLCachedControl<T>::handleValueChange, this, _1)
+                        );
+        }
+
+        ~LLCachedControl()
+        {
+                if(mConnection.connected())
+                {
+                        mConnection.disconnect();
+                }
+        }
+
+        LLCachedControl& operator =(const T& newvalue)
+        {
+           setTypeValue(*mControl, newvalue);
+        }
+
+        operator const T&() { return mCachedValue; }
+
+private:
+        void declareTypedControl(LLControlGroup& group, 
+                                                         const std::string& name, 
+                                                         const T& default_value,
+                                                         const std::string& comment)
+        {
+                LLSD init_value;
+                eControlType type = get_control_type<T>(default_value, init_value);
+                if(type < TYPE_COUNT)
+                {
+                        group.declareControl(name, type, init_value, comment, FALSE);
+                }
+        }
+
+        bool handleValueChange(const LLSD& newvalue)
+        {
+                mCachedValue = (const T &)newvalue;
+                return true;
+        }
+
+        void setTypeValue(LLControlVariable& c, const T& v)
+        {
+                // Implicit conversion from T to LLSD...
+                c.set(v);
+        }
+};
+
+template <> eControlType get_control_type<U32>(const U32& in, LLSD& out);
+template <> eControlType get_control_type<S32>(const S32& in, LLSD& out);
+template <> eControlType get_control_type<F32>(const F32& in, LLSD& out);
+template <> eControlType get_control_type<bool> (const bool& in, LLSD& out); 
+// Yay BOOL, its really an S32.
+//template <> eControlType get_control_type<BOOL> (const BOOL& in, LLSD& out) 
+template <> eControlType get_control_type<std::string>(const std::string& in, LLSD& out);
+template <> eControlType get_control_type<LLVector3>(const LLVector3& in, LLSD& out);
+template <> eControlType get_control_type<LLVector3d>(const LLVector3d& in, LLSD& out); 
+template <> eControlType get_control_type<LLRect>(const LLRect& in, LLSD& out);
+template <> eControlType get_control_type<LLColor4>(const LLColor4& in, LLSD& out);
+template <> eControlType get_control_type<LLColor3>(const LLColor3& in, LLSD& out);
+template <> eControlType get_control_type<LLColor4U>(const LLColor4U& in, LLSD& out); 
+template <> eControlType get_control_type<LLSD>(const LLSD& in, LLSD& out);
+
+//#define TEST_CACHED_CONTROL 1
+#ifdef TEST_CACHED_CONTROL
+void test_cached_control();
+#endif TEST_CACHED_CONTROL
+
 #endif // LL_LLVIEWERCONTROL_H
diff --git a/linden/indra/newview/llviewerimage.cpp b/linden/indra/newview/llviewerimage.cpp
index a564352..5559491 100644
--- a/linden/indra/newview/llviewerimage.cpp
+++ b/linden/indra/newview/llviewerimage.cpp
@@ -210,7 +210,7 @@ LLViewerImage::LLViewerImage(const LLString& filename, const LLUUID& id, BOOL us
         : LLImageGL(usemipmaps),
           mID(id)
 {
-        mLocalFileName = gDirUtilp->getExpandedFilename(LL_PATH_SKINS, "textures", filename);
+        mLocalFileName = gDirUtilp->findSkinnedFilename("textures", filename);
         init(true);
         sImageCount++;
 }
diff --git a/linden/indra/newview/llviewerimagelist.cpp b/linden/indra/newview/llviewerimagelist.cpp
index 142e862..6f0605c 100644
--- a/linden/indra/newview/llviewerimagelist.cpp
+++ b/linden/indra/newview/llviewerimagelist.cpp
@@ -125,7 +125,7 @@ void LLViewerImageList::doPreloadImages()
         
         LLUIImageList* image_list = LLUIImageList::getInstance();
 
-        image_list->initFromFile(gDirUtilp->getExpandedFilename(LL_PATH_SKINS, "textures", "textures.xml"));
+        image_list->initFromFile();
 
         // prefetch specific UUIDs
         getImage(IMG_SHOT, TRUE);
@@ -426,6 +426,12 @@ void LLViewerImageList::removeImageFromList(LLViewerImage *image)
         llassert(image);
         if (!image->mInImageList)
         {
+                llinfos << "RefCount: " << image->getNumRefs() << llendl ;
+                uuid_map_t::iterator iter = mUUIDMap.find(image->getID());
+                if(iter == mUUIDMap.end() || iter->second != image)
+                {
+                        llinfos << "Image is not in mUUIDMap!" << llendl ;
+                }
                 llerrs << "LLViewerImageList::removeImageFromList - Image not in list" << llendl;
         }
         llverify(mImageList.erase(image) == 1);
@@ -1276,23 +1282,55 @@ void LLUIImageList::onUIImageLoaded( BOOL success, LLViewerImage *src_vi, LLImag
         }
 }
 
-bool LLUIImageList::initFromFile(const LLString& filename)
+bool LLUIImageList::initFromFile()
 {
-        LLXmlTree xml_tree;
+        // construct path to canonical textures.xml in default skin dir
+        std::string base_file_path = gDirUtilp->getExpandedFilename(LL_PATH_SKINS, "default", "textures", "textures.xml");
+
+        LLXMLNodePtr root;
 
-        if (!xml_tree.parseFile(filename))
+        if (!LLXMLNode::parseFile(base_file_path, root, NULL))
         {
-                llwarns << "Unable to parse UI image list file " << filename << llendl;
+                llwarns << "Unable to parse UI image list file " << base_file_path << llendl;
                 return false;
         }
 
-        LLXmlTreeNode* rootp = xml_tree.getRoot();
-        if (!rootp || !rootp->hasAttribute("version"))
+        if (!root->hasAttribute("version"))
         {
-                llwarns << "No valid version number in UI image list file " << filename << llendl;
+                llwarns << "No valid version number in UI image list file " << base_file_path << llendl;
                 return false;
         }
 
+        std::vector<std::string> paths;
+        // path to current selected skin
+        paths.push_back(gDirUtilp->getSkinDir() 
+                        + gDirUtilp->getDirDelimiter() 
+                        + "textures"
+                        + gDirUtilp->getDirDelimiter()
+                        + "textures.xml");
+        // path to user overrides on current skin
+        paths.push_back(gDirUtilp->getUserSkinDir() 
+                        + gDirUtilp->getDirDelimiter() 
+                        + "textures"
+                        + gDirUtilp->getDirDelimiter()
+                        + "textures.xml");
+
+        // apply skinned xml files incrementally
+        for(std::vector<std::string>::iterator path_it = paths.begin();
+                path_it != paths.end();
+                ++path_it)
+        {
+                // don't reapply base file to itself
+                if (!path_it->empty() && (*path_it) != base_file_path)
+                {
+                        LLXMLNodePtr update_root;
+                        if (LLXMLNode::parseFile(*path_it, update_root, NULL))
+                        {
+                                LLXMLNode::updateNode(root, update_root);
+                        }
+                }
+        }
+
         enum
         {
                 PASS_DECODE_NOW,
@@ -1302,10 +1340,12 @@ bool LLUIImageList::initFromFile(const LLString& filename)
 
         for (S32 pass = PASS_DECODE_NOW; pass < NUM_PASSES; pass++)
         {
-                LLXmlTreeNode* child_nodep = rootp->getFirstChild();
-                while(child_nodep)
+                LLXMLNodePtr child_nodep = root->getFirstChild();
+                while(child_nodep.notNull())
                 {
-                        LLString image_name = child_nodep->getName();
+                        LLString image_name;
+                        child_nodep->getAttributeString("name", image_name);
+
                         LLString file_name = image_name;
                         LLRect scale_rect;
                         BOOL use_mip_maps = FALSE;
@@ -1318,7 +1358,7 @@ bool LLUIImageList::initFromFile(const LLString& filename)
                         {
                                 if (pass == PASS_DECODE_LATER) 
                                 {
-                                        child_nodep = rootp->getNextChild();
+                                        child_nodep = child_nodep->getNextSibling();
                                         continue;
                                 }
                         }
@@ -1326,7 +1366,7 @@ bool LLUIImageList::initFromFile(const LLString& filename)
                         {
                                 if (pass == PASS_DECODE_NOW)
                                 {
-                                        child_nodep = rootp->getNextChild();
+                                        child_nodep = child_nodep->getNextSibling();
                                         continue;
                                 }
                         }
@@ -1334,18 +1374,14 @@ bool LLUIImageList::initFromFile(const LLString& filename)
                         child_nodep->getAttributeString("file_name", file_name);
                         child_nodep->getAttributeBOOL("use_mips", use_mip_maps);
 
-                        LLXmlTreeNode* rect_node = child_nodep->getChildByName("scale_rect");
-                        if (rect_node)
-                        {
-                                rect_node->getAttributeS32("left", scale_rect.mLeft);
-                                rect_node->getAttributeS32("right", scale_rect.mRight);
-                                rect_node->getAttributeS32("bottom", scale_rect.mBottom);
-                                rect_node->getAttributeS32("top", scale_rect.mTop);
-                        }
+                        child_nodep->getAttributeS32("scale_left", scale_rect.mLeft);
+                        child_nodep->getAttributeS32("scale_right", scale_rect.mRight);
+                        child_nodep->getAttributeS32("scale_bottom", scale_rect.mBottom);
+                        child_nodep->getAttributeS32("scale_top", scale_rect.mTop);
                         
                         preloadUIImage(image_name, file_name, use_mip_maps, scale_rect);
                         
-                        child_nodep = rootp->getNextChild();
+                        child_nodep = child_nodep->getNextSibling();
                 }
 
                 if (pass == PASS_DECODE_NOW && !gSavedSettings.getBOOL("NoPreload"))
diff --git a/linden/indra/newview/llviewerimagelist.h b/linden/indra/newview/llviewerimagelist.h
index 24d91fa..6cf84b9 100644
--- a/linden/indra/newview/llviewerimagelist.h
+++ b/linden/indra/newview/llviewerimagelist.h
@@ -200,7 +200,7 @@ public:
         LLUIImagePtr getUIImage(const LLString& name);
         void cleanUp();
 
-        bool initFromFile(const LLString& filename);
+        bool initFromFile();
 
         LLUIImagePtr preloadUIImage(const LLString& name, const LLString& filename, BOOL use_mips, const LLRect& scale_rect);
         
diff --git a/linden/indra/newview/llviewermedia.cpp b/linden/indra/newview/llviewermedia.cpp
index f318d07..e11d1a2 100644
--- a/linden/indra/newview/llviewermedia.cpp
+++ b/linden/indra/newview/llviewermedia.cpp
@@ -44,6 +44,10 @@
 #include "llmediamanager.h"
 #include "lluuid.h"
 
+#include <boost/bind.hpp>       // for SkinFolder listener
+#include <boost/signal.hpp>
+
+
 // Implementation functions not exported into header file
 class LLViewerMediaImpl
         :       public LLMediaObserver
@@ -55,8 +59,6 @@ class LLViewerMediaImpl
                         mMovieImageHasMips(false)
                 { }
 
-                void initControlListeners();
-
                 void destroyMediaSource();
 
             void play(const std::string& media_url,
@@ -79,6 +81,15 @@ class LLViewerMediaImpl
                 void updateImagesMediaStreams();
                 LLUUID getMediaTextureID();
 
+                // Internally set our desired browser user agent string, including
+                // the Second Life version and skin name.  Used because we can
+                // switch skins without restarting the app.
+                static void updateBrowserUserAgent();
+
+                // Callback for when the SkinCurrent control is changed to
+                // switch the user agent string to indicate the new skin.
+                static bool handleSkinCurrentChanged(const LLSD& newvalue);
+
         public:
 
                 // a single media url with some data and an impl.
@@ -93,6 +104,8 @@ class LLViewerMediaImpl
 
 static LLViewerMediaImpl sViewerMediaImpl;
 
+//////////////////////////////////////////////////////////////////////////////////////////
+
 void LLViewerMediaImpl::destroyMediaSource()
 {
         LLMediaManager* mgr = LLMediaManager::getInstance();
@@ -405,12 +418,44 @@ void LLViewerMediaImpl::onMediaSizeChange(const EventType& event_in)
         */
 
 
-//////////////////////////////////////////////////////////////////////////////////////////
 LLUUID LLViewerMediaImpl::getMediaTextureID()
 {
         return mMovieImageID;
 }
 
+// static
+void LLViewerMediaImpl::updateBrowserUserAgent()
+{
+        // Don't use user-visible string to avoid 
+        // punctuation and strange characters.
+        std::string skin_name = gSavedSettings.getString("SkinCurrent");
+
+        // Just in case we need to check browser differences in A/B test
+        // builds.
+        std::string channel = gSavedSettings.getString("VersionChannelName");
+
+        // append our magic version number string to the browser user agent id
+        // See the HTTP 1.0 and 1.1 specifications for allowed formats:
+        // http://www.ietf.org/rfc/rfc1945.txt section 10.15
+        // http://www.ietf.org/rfc/rfc2068.txt section 3.8
+        // This was also helpful:
+        // http://www.mozilla.org/build/revised-user-agent-strings.html
+        std::ostringstream codec;
+        codec << "SecondLife/";
+        codec << LL_VERSION_MAJOR << "." << LL_VERSION_MINOR << "." << LL_VERSION_PATCH << "." << LL_VERSION_BUILD;
+        codec << " (" << channel << "; " << skin_name << " skin)";
+        llinfos << codec.str() << llendl;
+        LLMediaManager::setBrowserUserAgent( codec.str() );
+}
+
+// static
+bool LLViewerMediaImpl::handleSkinCurrentChanged(const LLSD& /*newvalue*/)
+{
+        // gSavedSettings is already updated when this function is called.
+        updateBrowserUserAgent();
+        return true;
+}
+
 //////////////////////////////////////////////////////////////////////////////////////////
 // Wrapper class
 //////////////////////////////////////////////////////////////////////////////////////////
@@ -419,6 +464,7 @@ LLUUID LLViewerMediaImpl::getMediaTextureID()
 // static
 void LLViewerMedia::initClass()
 {
+        // *TODO: This looks like a memory leak to me. JC
         LLMediaManagerData* init_data = new LLMediaManagerData;
 
 //      std::string executable_dir = std::string( arg0 ).substr( 0, std::string( arg0 ).find_last_of("\\/") );
@@ -450,14 +496,6 @@ void LLViewerMedia::initClass()
         component_dir += "mozilla";
 #endif
 
-        // append our magic version number string to the browser user agent id
-        std::ostringstream codec;
-        codec << "[Second Life ";
-        codec << "(" << gSavedSettings.getString("VersionChannelName") << ")";
-        codec << " - " << LL_VERSION_MAJOR << "." << LL_VERSION_MINOR << "." << LL_VERSION_PATCH << "." << LL_VERSION_BUILD;
-        codec << "]";
-        init_data->setBrowserUserAgentId( codec.str() );
-
         std::string application_dir = gDirUtilp->getExecutableDir();
 
         init_data->setBrowserApplicationDir( application_dir );
@@ -470,6 +508,14 @@ void LLViewerMedia::initClass()
 
         LLMediaManager::initClass( init_data );
 
+        // We use a custom user agent with viewer version and skin name.
+        LLViewerMediaImpl::updateBrowserUserAgent();
+
+        // Users can change skins while client is running, so make sure
+        // we pick up on changes.
+        gSavedSettings.getControl("SkinCurrent")->getSignal()->connect( 
+                boost::bind( LLViewerMediaImpl::handleSkinCurrentChanged, _1 ) );
+
         LLMediaManager* mm = LLMediaManager::getInstance();
         LLMIMETypes::mime_info_map_t::const_iterator it;
         for (it = LLMIMETypes::sMap.begin(); it != LLMIMETypes::sMap.end(); ++it)
diff --git a/linden/indra/newview/llviewerwindow.cpp b/linden/indra/newview/llviewerwindow.cpp
index c2fd92c..8134a36 100644
--- a/linden/indra/newview/llviewerwindow.cpp
+++ b/linden/indra/newview/llviewerwindow.cpp
@@ -1856,6 +1856,10 @@ void LLViewerWindow::adjustRectanglesForFirstUse(const LLRect& window)
 {
         LLRect r;
 
+        // *NOTE: The width and height of these floaters must be
+        // identical in settings.xml and their relevant floater.xml
+        // files, otherwise the window construction will get
+        // confused. JC
         adjust_rect_bottom_center("FloaterMoveRect2", window);
 
         adjust_rect_top_center("FloaterCameraRect3", window);
@@ -1864,7 +1868,7 @@ void LLViewerWindow::adjustRectanglesForFirstUse(const LLRect& window)
 
         adjust_rect_top_left("FloaterLandRect5", window);
 
-        adjust_rect_top_left("FloaterHUDRect", window);
+        adjust_rect_top_left("FloaterHUDRect2", window);
 
         adjust_rect_top_left("FloaterFindRect2", window);
 
@@ -4612,14 +4616,15 @@ BOOL LLViewerWindow::rawSnapshot(LLImageRaw *raw, S32 image_width, S32 image_hei
         // Note: this formula depends on the number of components being 3.  Not obvious, but it's correct.      
         image_width += (image_width * (type == SNAPSHOT_TYPE_DEPTH ? 4 : 3)) % 4 ;      
 
+        BOOL ret = TRUE ;
         // Resize image
         if(llabs(image_width - image_buffer_x) > 4 || llabs(image_height - image_buffer_y) > 4)
         {
-                raw->scale( image_width, image_height );  
+                ret = raw->scale( image_width, image_height );  
         }
         else if(image_width != image_buffer_x || image_height != image_buffer_y)
         {
-                raw->scale( image_width, image_height, FALSE );  
+                ret = raw->scale( image_width, image_height, FALSE );  
         }
         
 
@@ -4640,7 +4645,7 @@ BOOL LLViewerWindow::rawSnapshot(LLImageRaw *raw, S32 image_width, S32 image_hei
                 send_agent_resume();
         }
 
-        return TRUE;
+        return ret;
 }
 
 void LLViewerWindow::destroyWindow()
diff --git a/linden/indra/newview/llwebbrowserctrl.cpp b/linden/indra/newview/llwebbrowserctrl.cpp
index cfe5cb6..209af42 100644
--- a/linden/indra/newview/llwebbrowserctrl.cpp
+++ b/linden/indra/newview/llwebbrowserctrl.cpp
@@ -491,7 +491,7 @@ void LLWebBrowserCtrl::navigateToLocalPage( const std::string& subdir, const std
         filename += delim;
         filename += filename_in;
 
-        std::string expanded_filename = gDirUtilp->getExpandedFilename(LL_PATH_HTML, language, filename);
+        std::string expanded_filename = gDirUtilp->findSkinnedFilename("html", language, filename);
 
         if (gDirUtilp->fileExists(expanded_filename))
         {
@@ -500,7 +500,7 @@ void LLWebBrowserCtrl::navigateToLocalPage( const std::string& subdir, const std
         }
         if (language != "en-us")
         {
-                expanded_filename = gDirUtilp->getExpandedFilename(LL_PATH_HTML, "en-us", filename);
+                expanded_filename = gDirUtilp->findSkinnedFilename("html", "en-us", filename);
                 if (gDirUtilp->fileExists(expanded_filename))
                 {
                         navigateTo(expanded_filename);
diff --git a/linden/indra/newview/llwindebug.cpp b/linden/indra/newview/llwindebug.cpp
index aba637c..3f0364b 100644
--- a/linden/indra/newview/llwindebug.cpp
+++ b/linden/indra/newview/llwindebug.cpp
@@ -699,7 +699,7 @@ void LLWinDebug::generateCrashStacks(struct _EXCEPTION_POINTERS *exception_infop
                 // Since there is exception info... Release the hounds.
                 gEmergencyMemoryReserve.release();
 
-                if(gSavedSettings.getControl("SaveMinidump") != NULL && gSavedSettings.getBOOL("SaveMinidump"))
+                if(gSavedSettings.getControl("SaveMinidump").isNull() && gSavedSettings.getBOOL("SaveMinidump"))
                 {
                         _MINIDUMP_EXCEPTION_INFORMATION ExInfo;
 
diff --git a/linden/indra/newview/macview.xcodeproj/project.pbxproj b/linden/indra/newview/macview.xcodeproj/project.pbxproj
index 81e0874..46ee787 100644
--- a/linden/indra/newview/macview.xcodeproj/project.pbxproj
+++ b/linden/indra/newview/macview.xcodeproj/project.pbxproj
@@ -437,6 +437,7 @@
                 79E592870D1B4961002135A7 /* llpngwrapper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8833693C0C18AF33007F52DA /* llpngwrapper.cpp */; };
                 79E5928A0D1B4A1A002135A7 /* libpng12.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 88AA282B0C17720D0032DF53 /* libpng12.a */; };
                 79E593440D1B4A72002135A7 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = FDAA36BE09B919DF00FBF1CA /* libz.dylib */; };
+                79ED67F20E197D67003D1E78 /* llpanelskins.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 79ED67F00E197D66003D1E78 /* llpanelskins.cpp */; };
                 84401E2F0A13CC9A006720A5 /* llfloatergroupinvite.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 84401E2D0A13CC9A006720A5 /* llfloatergroupinvite.cpp */; };
                 84401E320A13CCB2006720A5 /* llpanelgroupinvite.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 84401E300A13CCB2006720A5 /* llpanelgroupinvite.cpp */; };
                 8833693F0C18AF33007F52DA /* llimagepng.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8833693B0C18AF33007F52DA /* llimagepng.cpp */; };
@@ -1691,6 +1692,8 @@
                 61923DA5074AE4F2005E1F34 /* llimagetga.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llimagetga.h; sourceTree = "<group>"; };
                 61923DA8074AE4F3005E1F34 /* llmapimagetype.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llmapimagetype.h; sourceTree = "<group>"; };
                 6192E764074A7CE9005E1F34 /* libllcommon.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libllcommon.a; sourceTree = BUILT_PRODUCTS_DIR; };
+                79ED67F00E197D66003D1E78 /* llpanelskins.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = llpanelskins.cpp; sourceTree = "<group>"; };
+                79ED67F10E197D67003D1E78 /* llpanelskins.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = llpanelskins.h; sourceTree = "<group>"; };
                 84401E2D0A13CC9A006720A5 /* llfloatergroupinvite.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llfloatergroupinvite.cpp; sourceTree = "<group>"; };
                 84401E2E0A13CC9A006720A5 /* llfloatergroupinvite.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llfloatergroupinvite.h; sourceTree = "<group>"; };
                 84401E300A13CCB2006720A5 /* llpanelgroupinvite.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llpanelgroupinvite.cpp; sourceTree = "<group>"; };
@@ -2666,6 +2669,8 @@
                 26F529A0051F61CD00A80050 /* newview */ = {
                         isa = PBXGroup;
                         children = (
+                                79ED67F00E197D66003D1E78 /* llpanelskins.cpp */,
+                                79ED67F10E197D67003D1E78 /* llpanelskins.h */,
                                 AA38F8F00D8A3687003B39F9 /* llfloaterjoystick.cpp */,
                                 AA38F8F10D8A3687003B39F9 /* llfloaterjoystick.h */,
                                 1AE082090DA708E900575141 /* llanimstatelabels.cpp */,
@@ -5059,6 +5064,7 @@
                                 1AE0820F0DA708E900575141 /* llanimstatelabels.cpp in Sources */,
                                 1AE082100DA708E900575141 /* llstylemap.cpp in Sources */,
                                 1AE082110DA708E900575141 /* lltrans.cpp in Sources */,
+                                79ED67F20E197D67003D1E78 /* llpanelskins.cpp in Sources */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;
                 };
diff --git a/linden/indra/newview/newview.vcproj b/linden/indra/newview/newview.vcproj
index a378434..5a21941 100644
--- a/linden/indra/newview/newview.vcproj
+++ b/linden/indra/newview/newview.vcproj
@@ -961,6 +961,9 @@
                                 RelativePath=".\llpanelplace.cpp">
                         </File>
                         <File
+                                RelativePath=".\llpanelskins.cpp">
+                        </File>
+                        <File
                                 RelativePath=".\llpanelvolume.cpp">
                         </File>
                         <File
@@ -1021,10 +1024,10 @@
                                 RelativePath=".\llregionposition.cpp">
                         </File>
                         <File
-                                RelativePath=".\llrendersphere.cpp">
+                                RelativePath=".\llremoteparcelrequest.cpp">
                         </File>
                         <File
-                                RelativePath=".\llremoteparcelrequest.cpp">
+                                RelativePath=".\llrendersphere.cpp">
                         </File>
                         <File
                                 RelativePath=".\llsavedsettingsglue.cpp">
@@ -2159,6 +2162,9 @@
                                 RelativePath=".\llpanelplace.h">
                         </File>
                         <File
+                                RelativePath=".\llpanelskins.h">
+                        </File>
+                        <File
                                 RelativePath=".\llpanelvolume.h">
                         </File>
                         <File
@@ -2225,10 +2231,10 @@
                                 RelativePath=".\llregionposition.h">
                         </File>
                         <File
-                                RelativePath=".\llrendersphere.h">
+                                RelativePath=".\llremoteparcelrequest.h">
                         </File>
                         <File
-                                RelativePath=".\llremoteparcelrequest.h">
+                                RelativePath=".\llrendersphere.h">
                         </File>
                         <File
                                 RelativePath=".\llresourcedata.h">
diff --git a/linden/indra/newview/newview_vc8.vcproj b/linden/indra/newview/newview_vc8.vcproj
index 9d9a9d2..60b1907 100644
--- a/linden/indra/newview/newview_vc8.vcproj
+++ b/linden/indra/newview/newview_vc8.vcproj
@@ -1309,6 +1309,10 @@
                                 >
                         </File>
                         <File
+                                RelativePath=".\llpanelskins.cpp"
+                                >
+                        </File>
+                        <File
                                 RelativePath=".\llpanelvolume.cpp"
                                 >
                         </File>
@@ -2907,6 +2911,10 @@
                                 >
                         </File>
                         <File
+                                RelativePath=".\llpanelskins.h"
+                                >
+                        </File>
+                        <File
                                 RelativePath=".\llpanelvolume.h"
                                 >
                         </File>
diff --git a/linden/indra/newview/releasenotes.txt b/linden/indra/newview/releasenotes.txt
index f4e8955..bed1e27 100644
--- a/linden/indra/newview/releasenotes.txt
+++ b/linden/indra/newview/releasenotes.txt
@@ -4,6 +4,27 @@
 |  http://wiki.secondlife.com/wiki/Beta_Release_Notes  |
 +------------------------------------------------------+
 
+Release Notes for Second Life 1.20(13) July 9th, 2008
+=====================================
+
+Fixes:
+* Fixed: VWR-7893 create a 'Classic' skin for the viewer
+* Fixed: VWR-5059: add option to switch between a Classic and modern theme from within Preferences
+* Fixed: VWR-3529: WindLight: Saving snapshots to disk crashes viewer
+* Fixed: Advanced > XUI > Edit UI... tool will cause a crash if moved up past 'root' 
+* Fixed: Enlarged the Tutorial floater slightly
+
+Release Notes for Second Life 1.20(12) July 2nd, 2008
+=====================================
+
+Fixes:
+* Fixed: VWR-7178: 'Upload a snapshot' cannot take full screen snapshot; limited to square images
+* Fixed: Allow the --set option to be specified multiple times on the command line
+* Fixed: Disable the Thread monitoring (watchdog) in settings again for the Release Candidate
+
+Localization Fixes:
+* Fixed: VWR-7086: floater_buy_land.xml still contains messages regarding First Land
+
 Release Notes for Second Life 1.20(11) June 23rd, 2008
 =====================================
 
diff --git a/linden/indra/newview/app_settings/colors.xml b/linden/indra/newview/skins/default/colors.xml
index cf9466f..cf9466f 100644
--- a/linden/indra/newview/app_settings/colors.xml
+++ b/linden/indra/newview/skins/default/colors.xml
diff --git a/linden/indra/newview/skins/default/colors_base.xml b/linden/indra/newview/skins/default/colors_base.xml
new file mode 100644
index 0000000..e803465
--- /dev/null
+++ b/linden/indra/newview/skins/default/colors_base.xml
@@ -0,0 +1,188 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<settings version = "101">
+    
+<!-- WINDOWS -->
+<TitleBarFocusColor value="255, 255, 255, 30" />        <!-- Focused window title bar highlight, no equivalent for unfocused windows -->
+<FloaterFocusBorderColor value="0, 0, 0, 80" />
+<FloaterUnfocusBorderColor value="0, 0, 0, 80" />
+<FocusBackgroundColor value="62, 62, 62, 255" />        <!-- Background color of focused floaters -->
+<DefaultBackgroundColor value="62, 62, 62, 140" />      <!-- Background color for unfocused floaters -->
+<ColorDropShadow value="0, 0, 0, 200" />                <!-- The drop shadow behind windows and menus -->
+<DefaultHighlightDark value="26, 26, 26, 255" />
+<DefaultHighlightLight value="115, 132, 155, 255" />
+<DefaultShadowDark value="26, 26, 26, 255" />
+<DefaultShadowLight value="0, 0, 0, 255" />
+
+<!-- LABELS -->
+<LabelDisabledColor value="147, 169, 213, 77" />
+<LabelSelectedColor value="255, 255, 255, 255" />
+<LabelSelectedDisabledColor value="164, 190, 237, 128" />
+<LabelTextColor value="147, 169, 213, 255" />
+
+<!-- LOGIN -->
+<LoginProgressBarBgColor value="255, 255, 255, 255" />
+<LoginProgressBarFgColor value="255, 255, 255, 255" />
+<LoginProgressBoxBorderColor value="0, 30, 60, 0" />
+<LoginProgressBoxCenterColor value="0, 0, 0, 200" />
+<LoginProgressBoxShadowColor value="0, 0, 0, 200" />
+<LoginProgressBoxTextColor value="255, 255, 255, 255"/>
+
+<!-- BUTTONS -->
+<ButtonLabelColor value="220, 220, 220, 255" />         <!-- Text labels for buttons, like the "OK" text -->
+<ButtonLabelSelectedColor value="220, 220, 220, 255" />
+<ButtonLabelDisabledColor value="147, 169, 213, 200" />
+<ButtonLabelSelectedDisabledColor value="164, 190, 237, 200" />
+<ButtonSelectedBgColor value="62, 62, 62, 255" />
+<ButtonSelectedColor value="255, 255, 255, 255" />
+<ButtonUnselectedBgColor value="62, 62, 62, 255" />
+<ButtonUnselectedFgColor value="255, 255, 255, 255" />
+<ButtonBorderColor value="239, 156, 0, 255" />
+<ButtonColor value="255, 255, 255, 255" />              <!-- Blended with button art, usually left as opaque white -->
+<ButtonImageColor value="255, 255, 255, 255" />         <!-- Blended with button art, usually left as opaque white -->
+
+<!-- SLIDERS -->
+<SliderDisabledThumbColor value="0, 0, 0, 255" />
+<SliderThumbCenterColor value="200, 200, 200, 255" />
+<SliderThumbOutlineColor value="255, 255, 255, 255" />
+<SliderTrackColor value="255, 255, 255, 255" />
+
+<!-- TEXTFIELDS -->
+<TextBgFocusColor value="200, 209, 204, 255" />         <!-- Text field background when receiving input (focused) -->
+<TextBgReadOnlyColor value="62, 62, 62, 160" />         <!-- Text field background when read-only -->
+<TextBgWriteableColor value="200, 209, 204, 230" />     <!-- Text field background when not receiving input (unfocused) -->
+<TextCursorColor value="0, 0, 0, 255" />
+<TextFgColor value="0, 0, 0, 255" />
+<TextFgReadOnlyColor value="255, 255, 255, 200" />
+<TextFgTentativeColor value="0, 0, 0, 255" />
+<TextEmbeddedItemReadOnlyColor value="58, 147, 242, 255" />     <!-- i.e. About Land name that you don't own -->
+<TextEmbeddedItemColor value="0, 0, 128, 255" />
+<TextDefaultColor value="0, 20, 0, 255"/>
+  
+<!-- LISTBOXES -->
+<ScrollBgReadOnlyColor value="200, 209, 204, 255" />
+<ScrollBgWriteableColor value="200, 209, 204, 255" />
+<ScrollBGStripeColor value="100, 100, 100, 40" />
+<ScrollDisabledColor value="128, 128, 128, 204" />
+<ScrollSelectedBGColor value="100, 100, 188, 150" />
+<ScrollSelectedFGColor value="0, 0, 0, 204" />              <!-- Text color -->
+<ScrollUnselectedColor value="0, 0, 0, 204" />              <!-- Text color -->
+<ScrollHighlightedColor value="183, 184, 188, 128" />       <!-- Hover color -->
+<ScrollbarThumbColor value="60, 76, 124, 255" />            <!-- Scroll bar-->
+<ScrollbarTrackColor value="153, 154, 158, 255" />          <!-- Scroll bar background-->
+
+<!-- MENUS -->
+<MenuBarBgColor value="62, 62, 62, 255" />
+<MenuBarGodBgColor value="62, 128, 62, 255" />
+<MenuNonProductionGodBgColor value="0, 128, 0, 255" />
+<MenuNonProductionBgColor value="128, 0, 0, 255" />
+<MenuDefaultBgColor value="0, 0, 0, 255" />
+<MenuItemDisabledColor value="133, 133, 164, 128" />        <!-- Menu text color; also text color for pie menus and treeviews (like Inventory) -->
+<MenuItemEnabledColor value="255, 255, 255, 255" />         <!-- Menu text color; also text color for pie menus and treeviews (like Inventory) -->
+<MenuItemHighlightBgColor value="183, 184, 188, 100" />
+<MenuItemHighlightFgColor value="255, 255, 255, 255" />     <!-- Highlighted menu text color; also treeview node selection highlight -->
+<MenuPopupBgColor value="0, 0, 0, 255" />
+
+<!--  PIE MENUS -->
+<PieMenuBgColor value="62, 62, 62, 150" />
+<PieMenuLineColor value="0, 0, 0, 128" />
+<PieMenuSelectedColor value="183, 184, 188, 77" />
+
+<!-- TOOLTIPS -->
+<ToolTipBgColor value="183, 184, 188, 200" />
+<ToolTipBorderColor value="171, 212, 245, 255" />
+<ToolTipTextColor value="0, 0, 0, 255" />
+
+<!-- NOTIFICATION POP-UPS -->
+<NotifyBoxColor value="70, 170, 255, 255" />
+<NotifyTextColor value="0, 0, 0, 255" />
+<NotifyCautionBoxColor value="254, 209, 118, 255" />    <!-- the background color of caution permissions prompts -->
+<NotifyCautionWarnColor value="0, 0, 0, 255" />         <!-- the foreground color of the special title text in caution permissions prompts -->
+<GroupNotifyBoxColor value="70, 170, 255, 255" />
+<GroupNotifyTextColor value="0, 30, 60, 255" />
+
+<!-- CHAT AND IM HISTORY TEXTBOX COLORS -->
+<ChatHistoryBgColor value="0, 0, 0, 0" />
+<ChatHistoryTextColor value="255, 255, 255, 255" />
+<IMHistoryBgColor value="0, 30, 80, 200" />
+<IMHistoryTextColor value="255, 255, 255, 255" />
+
+<!-- IN-WORLD SELECTION -->
+<SilhouetteParentColor value="255, 255, 0, 255" />
+<SilhouetteChildColor value="32, 106, 196, 255" />
+<HighlightParentColor value="171, 212, 245, 255" />
+<HighlightChildColor value="171, 212, 245, 255" />
+<HighlightInspectColor value="255, 0, 255, 255" />
+
+<!-- EDIT MODE GRID -->
+<GridFocusPointColor value="255, 255, 255, 128" />
+<GridlineColor value="255, 255, 255, 255" />
+<GridlineBGColor value="235, 235, 255, 200" />
+<GridlineShadowColor value="0, 0, 0, 80" />
+
+<!-- PROPERTY LINES -->
+<PropertyColorAvail value="0, 0, 0, 0" />
+<PropertyColorGroup value="0, 184, 184, 102" />
+<PropertyColorOther value="255, 0, 0, 102" />
+<PropertyColorSelf value="0, 255, 0, 102" />
+<PropertyColorForSale value="255, 128, 0, 102" />
+<PropertyColorAuction value="128, 0, 255, 102" />       <!-- Match the color on the world map -->
+
+<!-- Icon Enable/Disable -->
+<IconEnabledColor value="255, 255, 255, 255"/>
+<IconDisabledColor value="147, 169, 213, 200"/>
+
+<!-- MINI-MAP -->
+<NetMapBackgroundColor value="0, 0, 0, 77" />
+<NetMapYouOwnAboveWater value="0, 255, 255, 255" />
+<NetMapYouOwnBelowWater value="0, 200, 200, 255" />
+<NetMapGroupOwnAboveWater value="255, 0, 255, 255" />
+<NetMapGroupOwnBelowWater value="200, 0, 200, 255" />
+<NetMapOtherOwnAboveWater value="60, 60, 60, 255" />
+<NetMapOtherOwnBelowWater value="30, 30, 30, 255" />
+
+<!-- HELP WINDOW -->
+<HelpBgColor value="200, 209, 204, 255" />
+<HelpFgColor value="0, 0, 0, 255" />
+<HelpScrollTrackColor value="183, 184, 188, 255" />
+<HelpScrollThumbColor value="80, 96, 124, 255" />
+<HelpScrollHighlightColor value="115, 132, 155, 255" />
+<HelpScrollShadowColor value="0, 0, 0, 255" />
+
+<!-- MISC -->
+<AvatarNameColor value="251, 175, 93, 255" />           <!-- Text color of avatar nametags -->
+<FocusColor value="239, 156, 0, 255" />                 <!-- Color of the glow around UI controls with keyboard focus -->
+<FloaterButtonImageColor value="239, 156, 0, 255" />    <!-- The floater buttons (like the close box) are white images that receive this color. -->
+<ButtonCautionImageColor value="255, 255,  255, 255" /> <!-- Match the caution dialog buttons to the default -->
+<HealthTextColor value="255, 255, 255, 255" />
+<MapAutopilotColor value="255, 128, 0, 255" />
+<ContextSilhouetteColor value="239, 156, 0, 255" />     <!-- For "context" highlighting, i.e. pie menu -->
+<ScriptBgReadOnlyColor value="100, 100, 100, 255" />
+<ParcelTextColor value="144, 165, 208, 255" />          <!-- Parcel name on menu bar, normal state -->
+<ParcelHoverColor value="255, 255, 255, 255" />         <!-- Parcel name on menu bar, hover state -->
+<TimeTextColor value="255, 255, 255, 255" />            <!-- SL Time on menu bar -->
+<BalanceTextColor value="0, 255, 0, 255" />             <!-- Linden dollar balance on menu bar -->
+<HealthTextColor value="255, 255, 255, 255" />          <!-- Damage meter text on menu bar -->
+<GroupOverTierColor value="110, 15, 15, 255" />         <!-- Warning text in Group Info window -->
+<FilterBackgroundColor value="0, 0, 20, 255" />         <!-- Matching region of Inventory search text -->
+<FilterTextColor value="255, 200, 70, 255" />
+<InventoryItemSuffixColor value="191, 216, 216, 255" />     <!-- "worn", "no modify", etc-->
+<InventorySearchStatusColor value="255, 255, 255, 255" />
+<ConsoleBackground value="0, 0, 0, 255" />
+<FolderViewLoadingMessageTextColor value="240, 165, 90, 255"/>     <!-- "loading..." in the inv -->
+<InventoryBackgroundColor value="62, 62, 62, 80"/>
+
+<!-- Alert box colors -->
+<AlertBoxColor value="62, 62, 62, 255" />               <!-- Warnings floaters, like when returning objects -->
+<AlertTextColor value="147, 169, 213, 255" />
+<AlertCautionBoxColor value="254, 209, 118, 255" />     <!-- Background color of caution alerts -->
+<AlertCautionTextColor value="0, 0, 0, 255" />          <!-- Foreground color of the special title text in caution alerts -->
+
+<!--  Multi sliders, as in the sky animation setting -->
+<MultiSliderDisabledThumbColor value="0, 0, 0, 255"/>
+<MultiSliderThumbCenterColor value="183, 184, 188, 255"/>
+<MultiSliderThumbOutlineColor value="0, 0, 0, 255"/>
+<MultiSliderTrackColor value="30, 30, 30, 255"/>
+<MultiSliderThumbCenterSelectedColor value="255, 50, 50, 255"/>
+<MultiSliderTriangleColor value="255, 255, 50, 255"/>
+
+</settings>
diff --git a/linden/indra/newview/skins/default/html/de/loading-error/index.html b/linden/indra/newview/skins/default/html/de/loading-error/index.html
new file mode 100644
index 0000000..fbde825
--- /dev/null
+++ b/linden/indra/newview/skins/default/html/de/loading-error/index.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Verbindung nicht möglich</title>
+<style> 
+body {background-color:#000000;font-family:verdana,helvetica,sans-serif;font-size:62.5%;color:#e9f1f8;width:100%;padding:0px;margin:0px;} 
+a {color:#93a9d5;} 
+a:active {color:#50607C;text-decoration:underline;} 
+a:hover {color:#ff7900;text-decoration:underline;} 
+#infobox{position:absolute;top:40%;left:50%;z-index:1;padding:0;width:592px;margin-left:-296px;margin-top:-150px;text-align:center;font-size:1.2em; color:#ccc;} 
+#infobox #submitbtn {padding:15px 3px 5px 15px;height:28px;width:127px;margin-left:244px;} 
+#infobox #submitbtn input {text-transform:capitalize;color:#fff;font-size:1.0em;height:28px;width:127px;border:none;font-weight:normal;background:url(../../btn_purplepill_bg.png) bottom left no-repeat;vertical-align:text-bottom;font-weight:bold;} 
+#infobox #submitbtn input:hover.input_over, #login_box #submitbtn input:hover.input_off {color:#fff;border:none;background:url(../../btn_purplepill_bg.png) bottom right no-repeat;} 
+#infobox #submitbtn input:active.input_over {color:#fff;border:none;background:url(../../btn_purplepill_bg.png) top left no-repeat;} 
+#infobox #submitbtn input.pressed {color:#888;border:none;background:url(../../btn_purplepill_bg.png) top right no-repeat;}
+</style>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /></head>
+<body> <div id="infobox"> <img src="../../unabletoconnect.png"><br/>
+                <p> Second Life kann keine Verbindung mit dem Anmeldeserver herstellen.
+                </p>
+                <p> Überprüfen Sie Ihre Internetverbindung. Falls Ihr Computer oder Netzwerk durch eine Firewall oder einen Proxy geschützt ist, so müssen Sie dafür sorgen, dass Second Life auf das Internet zugreifen darf.
+                </p> <div id="submitbtn">
+                        <input class="input_over" type="submit" value="Erneut versuchen" onclick="document.location='secondlife:///app/login_refresh'; this.className='pressed';" onmouseover="this.className='input_over';" onmouseout="this.className='input_off';" /> </div> </div>
+</div>
+</body>
diff --git a/linden/indra/newview/skins/default/html/en-us/loading-error/index.html b/linden/indra/newview/skins/default/html/en-us/loading-error/index.html
new file mode 100644
index 0000000..71f9c86
--- /dev/null
+++ b/linden/indra/newview/skins/default/html/en-us/loading-error/index.html
@@ -0,0 +1,32 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Unable to Connect</title>
+<style>
+body {background-color:#000000;font-family:verdana,helvetica,sans-serif;font-size:62.5%;color:#e9f1f8;width:100%;padding:0px;margin:0px;}
+a {color:#93a9d5;}
+a:active {color:#50607C;text-decoration:underline;}
+a:hover {color:#ff7900;text-decoration:underline;}
+#infobox{position:absolute;top:40%;left:50%;z-index:1;padding:0;width:592px;margin-left:-296px;margin-top:-150px;text-align:center;font-size:1.2em; color:#ccc;}
+#infobox #submitbtn {padding:15px 3px 5px 15px;height:28px;width:127px;margin-left:244px;}
+#infobox #submitbtn input {text-transform:capitalize;color:#fff;font-size:1.0em;height:28px;width:127px;border:none;font-weight:normal;background:url(../../btn_purplepill_bg.png) bottom left no-repeat;vertical-align:text-bottom;font-weight:bold;}
+#infobox #submitbtn input:hover.input_over, #login_box #submitbtn input:hover.input_off {color:#fff;border:none;background:url(../../btn_purplepill_bg.png) bottom right no-repeat;}
+#infobox #submitbtn input:active.input_over {color:#fff;border:none;background:url(../../btn_purplepill_bg.png) top left no-repeat;}
+#infobox #submitbtn input.pressed {color:#888;border:none;background:url(../../btn_purplepill_bg.png) top right no-repeat;}
+</style>
+</head>
+<body>
+<div id="infobox">
+        <img src="../../unabletoconnect.png"><br/>
+                <p>
+                        Second Life can't establish a connection to the login server.
+                </p>
+                <p>
+                        Please check your internet connection. If your computer or network is protected by a firewall or proxy, make sure that Second Life is permitted to access the network.
+                </p>
+                <div id="submitbtn">
+                        <input class="input_over" type="submit" value="Try Again" onclick="document.location='secondlife:///app/login_refresh'; this.className='pressed';" onmouseover="this.className='input_over';" onmouseout="this.className='input_off';" />
+                </div>
+        </div>
+</div>
+</body>
\ No newline at end of file
diff --git a/linden/indra/newview/skins/default/html/en-us/loading/loading.html b/linden/indra/newview/skins/default/html/en-us/loading/loading.html
new file mode 100644
index 0000000..34e5c84
--- /dev/null
+++ b/linden/indra/newview/skins/default/html/en-us/loading/loading.html
@@ -0,0 +1,9 @@
+<body style="background-color:#000000;font-family:verdana,helvetica,sans-serif;font-size:62.5%;color:#e9f1f8;">

+<table width="100%" height="100%" border="0">

+        <tr>

+                <td align="center" valign="middle" style="font-size:0.8em;">

+                        <img src="sl_logo_rotate_black.gif" align="absmiddle"><br/>&nbsp;&nbsp;&nbsp;loading...

+                </td>

+        </tr>

+</table>

+</body>

diff --git a/linden/indra/newview/skins/default/html/es/loading-error/index.html b/linden/indra/newview/skins/default/html/es/loading-error/index.html
new file mode 100644
index 0000000..c1e75bc
--- /dev/null
+++ b/linden/indra/newview/skins/default/html/es/loading-error/index.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>No se puede establecer una conexión</title>
+<style> 
+body {background-color:#000000;font-family:verdana,helvetica,sans-serif;font-size:62.5%;color:#e9f1f8;width:100%;padding:0px;margin:0px;} 
+a {color:#93a9d5;} 
+a:active {color:#50607C;text-decoration:underline;} 
+a:hover {color:#ff7900;text-decoration:underline;} 
+#infobox{position:absolute;top:40%;left:50%;z-index:1;padding:0;width:592px;margin-left:-296px;margin-top:-150px;text-align:center;font-size:1.2em; color:#ccc;} 
+#infobox #submitbtn {padding:15px 3px 5px 15px;height:28px;width:127px;margin-left:244px;} 
+#infobox #submitbtn input {text-transform:capitalize;color:#fff;font-size:1.0em;height:28px;width:127px;border:none;font-weight:normal;background:url(../../btn_purplepill_bg.png) bottom left no-repeat;vertical-align:text-bottom;font-weight:bold;} 
+#infobox #submitbtn input:hover.input_over, #login_box #submitbtn input:hover.input_off {color:#fff;border:none;background:url(../../btn_purplepill_bg.png) bottom right no-repeat;} 
+#infobox #submitbtn input:active.input_over {color:#fff;border:none;background:url(../../btn_purplepill_bg.png) top left no-repeat;} 
+#infobox #submitbtn input.pressed {color:#888;border:none;background:url(../../btn_purplepill_bg.png) top right no-repeat;}
+</style>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /></head>
+<body> <div id="infobox"> <img src="../../unabletoconnect.png"><br/>
+                <p> Second Life no puede establecer una conexión con el servidor de inicio de sesión.
+                </p>
+                <p> Compruebe la conexión a Internet. Si su computadora o red están protegidas con un firewall o proxy, asegúrese de permitirle el acceso a Second Life a la red.
+                </p> <div id="submitbtn">
+                        <input class="input_over" type="submit" value="Volver a intentarlo" onclick="document.location='secondlife:///app/login_refresh'; this.className='pressed';" onmouseover="this.className='input_over';" onmouseout="this.className='input_off';" /> </div> </div>
+</div>
+</body>
diff --git a/linden/indra/newview/skins/default/html/fr/loading-error/index.html b/linden/indra/newview/skins/default/html/fr/loading-error/index.html
new file mode 100644
index 0000000..69c796c
--- /dev/null
+++ b/linden/indra/newview/skins/default/html/fr/loading-error/index.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Connexion impossible</title>
+<style> 
+body {background-color:#000000;font-family:verdana,helvetica,sans-serif;font-size:62.5%;color:#e9f1f8;width:100%;padding:0px;margin:0px;} 
+a {color:#93a9d5;} 
+a:active {color:#50607C;text-decoration:underline;} 
+a:hover {color:#ff7900;text-decoration:underline;} 
+#infobox{position:absolute;top:40%;left:50%;z-index:1;padding:0;width:592px;margin-left:-296px;margin-top:-150px;text-align:center;font-size:1.2em; color:#ccc;} 
+#infobox #submitbtn {padding:15px 3px 5px 15px;height:28px;width:127px;margin-left:244px;} 
+#infobox #submitbtn input {text-transform:capitalize;color:#fff;font-size:1.0em;height:28px;width:127px;border:none;font-weight:normal;background:url(../../btn_purplepill_bg.png) bottom left no-repeat;vertical-align:text-bottom;font-weight:bold;} 
+#infobox #submitbtn input:hover.input_over, #login_box #submitbtn input:hover.input_off {color:#fff;border:none;background:url(../../btn_purplepill_bg.png) bottom right no-repeat;} 
+#infobox #submitbtn input:active.input_over {color:#fff;border:none;background:url(../../btn_purplepill_bg.png) top left no-repeat;} 
+#infobox #submitbtn input.pressed {color:#888;border:none;background:url(../../btn_purplepill_bg.png) top right no-repeat;}
+</style>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /></head>
+<body> <div id="infobox"> <img src="../../unabletoconnect.png"><br/>
+                <p> Second Life ne peut pas établir de connexion avec le serveur.
+                </p>
+                <p> Vérifiez votre connexion Internet. Si votre ordinateur ou votre réseau est protégé par un.pare-feu ou un proxy, assurez-vous que Second Life a l'autorisation d'accéder au réseau.
+                </p> <div id="submitbtn">
+                        <input class="input_over" type="submit" value="Essayer à nouveau" onclick="document.location='secondlife:///app/login_refresh'; this.className='pressed';" onmouseover="this.className='input_over';" onmouseout="this.className='input_off';" /> </div> </div>
+</div>
+</body>
diff --git a/linden/indra/newview/skins/default/html/ja/loading-error/index.html b/linden/indra/newview/skins/default/html/ja/loading-error/index.html
new file mode 100644
index 0000000..e0bcc94
--- /dev/null
+++ b/linden/indra/newview/skins/default/html/ja/loading-error/index.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>接続できません</title>
+<style> 
+body {background-color:#000000;font-family:verdana,helvetica,sans-serif;font-size:62.5%;color:#e9f1f8;width:100%;padding:0px;margin:0px;} 
+a {color:#93a9d5;} 
+a:active {color:#50607C;text-decoration:underline;} 
+a:hover {color:#ff7900;text-decoration:underline;} 
+#infobox{position:absolute;top:40%;left:50%;z-index:1;padding:0;width:592px;margin-left:-296px;margin-top:-150px;text-align:center;font-size:1.2em; color:#ccc;} 
+#infobox #submitbtn {padding:15px 3px 5px 15px;height:28px;width:127px;margin-left:244px;} 
+#infobox #submitbtn input {text-transform:capitalize;color:#fff;font-size:1.0em;height:28px;width:127px;border:none;font-weight:normal;background:url(../../btn_purplepill_bg.png) bottom left no-repeat;vertical-align:text-bottom;font-weight:bold;} 
+#infobox #submitbtn input:hover.input_over, #login_box #submitbtn input:hover.input_off {color:#fff;border:none;background:url(../../btn_purplepill_bg.png) bottom right no-repeat;} 
+#infobox #submitbtn input:active.input_over {color:#fff;border:none;background:url(../../btn_purplepill_bg.png) top left no-repeat;} 
+#infobox #submitbtn input.pressed {color:#888;border:none;background:url(../../btn_purplepill_bg.png) top right no-repeat;}
+</style>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /></head>
+<body> <div id="infobox"> <img src="../../unabletoconnect.png"><br/>
+                <p> Second Lifeによるログインサーバーへの接続が確立できません。
+                </p>
+                <p> インターネット接続を確認してください。 お使いのコンピュータやネットワークがファイヤウォールまたはプロキシにより保護されている場合は、Second Lifeによるネットワークへのアクセスが許可されていることを確認してください。
+                </p> <div id="submitbtn">
+                        <input class="input_over" type="submit" value="もう一度試す" onclick="document.location='secondlife:///app/login_refresh'; this.className='pressed';" onmouseover="this.className='input_over';" onmouseout="this.className='input_off';" /> </div> </div>
+</div>
+</body>
diff --git a/linden/indra/newview/skins/default/html/ko/loading-error/index.html b/linden/indra/newview/skins/default/html/ko/loading-error/index.html
new file mode 100644
index 0000000..02b8713
--- /dev/null
+++ b/linden/indra/newview/skins/default/html/ko/loading-error/index.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>연결할 수 없습니다.</title>
+<style> 
+body {background-color:#000000;font-family:verdana,helvetica,sans-serif;font-size:62.5%;color:#e9f1f8;width:100%;padding:0px;margin:0px;} 
+a {color:#93a9d5;} 
+a:active {color:#50607C;text-decoration:underline;} 
+a:hover {color:#ff7900;text-decoration:underline;} 
+#infobox{position:absolute;top:40%;left:50%;z-index:1;padding:0;width:592px;margin-left:-296px;margin-top:-150px;text-align:center;font-size:1.2em; color:#ccc;} 
+#infobox #submitbtn {padding:15px 3px 5px 15px;height:28px;width:127px;margin-left:244px;} 
+#infobox #submitbtn input {text-transform:capitalize;color:#fff;font-size:1.0em;height:28px;width:127px;border:none;font-weight:normal;background:url(../../btn_purplepill_bg.png) bottom left no-repeat;vertical-align:text-bottom;font-weight:bold;} 
+#infobox #submitbtn input:hover.input_over, #login_box #submitbtn input:hover.input_off {color:#fff;border:none;background:url(../../btn_purplepill_bg.png) bottom right no-repeat;} 
+#infobox #submitbtn input:active.input_over {color:#fff;border:none;background:url(../../btn_purplepill_bg.png) top left no-repeat;} 
+#infobox #submitbtn input.pressed {color:#888;border:none;background:url(../../btn_purplepill_bg.png) top right no-repeat;}
+</style>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /></head>
+<body> <div id="infobox"> <img src="../../unabletoconnect.png"><br/>
+                <p> Second Life에서 로그인 서버에 대한 보안 연결을 설정할 수 없습니다.
+                </p>
+                <p> 인터넷 연결을 확인하십시오. 사용 중인 컴퓨터 또는 네트워크가 방화벽이나 프록시에 의해 보호된 경우 Second Life가 네트워크에 액세스할 수 있도록 허가되었는지 확인하십시오.
+                </p> <div id="submitbtn">
+                        <input class="input_over" type="submit" value="다시 시도" onclick="document.location='secondlife:///app/login_refresh'; this.className='pressed';" onmouseover="this.className='input_over';" onmouseout="this.className='input_off';" /> </div> </div>
+</div>
+</body>
diff --git a/linden/indra/newview/skins/default/html/pt/loading-error/index.html b/linden/indra/newview/skins/default/html/pt/loading-error/index.html
new file mode 100644
index 0000000..7f17b3a
--- /dev/null
+++ b/linden/indra/newview/skins/default/html/pt/loading-error/index.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Não é Possível Conectar</title>
+<style> 
+body {background-color:#000000;font-family:verdana,helvetica,sans-serif;font-size:62.5%;color:#e9f1f8;width:100%;padding:0px;margin:0px;} 
+a {color:#93a9d5;} 
+a:active {color:#50607C;text-decoration:underline;} 
+a:hover {color:#ff7900;text-decoration:underline;} 
+#infobox{position:absolute;top:40%;left:50%;z-index:1;padding:0;width:592px;margin-left:-296px;margin-top:-150px;text-align:center;font-size:1.2em; color:#ccc;} 
+#infobox #submitbtn {padding:15px 3px 5px 15px;height:28px;width:127px;margin-left:244px;} 
+#infobox #submitbtn input {text-transform:capitalize;color:#fff;font-size:1.0em;height:28px;width:127px;border:none;font-weight:normal;background:url(../../btn_purplepill_bg.png) bottom left no-repeat;vertical-align:text-bottom;font-weight:bold;} 
+#infobox #submitbtn input:hover.input_over, #login_box #submitbtn input:hover.input_off {color:#fff;border:none;background:url(../../btn_purplepill_bg.png) bottom right no-repeat;} 
+#infobox #submitbtn input:active.input_over {color:#fff;border:none;background:url(../../btn_purplepill_bg.png) top left no-repeat;} 
+#infobox #submitbtn input.pressed {color:#888;border:none;background:url(../../btn_purplepill_bg.png) top right no-repeat;}
+</style>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /></head>
+<body> <div id="infobox"> <img src="../../unabletoconnect.png"><br/>
+                <p> O Second Life não consegue estabelecer uma conexão com o servidor de login.
+                </p>
+                <p> Verifique a sua conexão com a Internet. Se o seu computador ou sua rede estiverem protegidos por um firewall ou um proxy, verifique se o Second Life tem permissão de acesso na rede.
+                </p> <div id="submitbtn">
+                        <input class="input_over" type="submit" value="Tentar Novamente" onclick="document.location='secondlife:///app/login_refresh'; this.className='pressed';" onmouseover="this.className='input_over';" onmouseout="this.className='input_off';" /> </div> </div>
+</div>
+</body>
diff --git a/linden/indra/newview/skins/default/html/zh/loading-error/index.html b/linden/indra/newview/skins/default/html/zh/loading-error/index.html
new file mode 100644
index 0000000..01cdec9
--- /dev/null
+++ b/linden/indra/newview/skins/default/html/zh/loading-error/index.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>无法连接</title>
+<style> 
+body {background-color:#000000;font-family:verdana,helvetica,sans-serif;font-size:62.5%;color:#e9f1f8;width:100%;padding:0px;margin:0px;} 
+a {color:#93a9d5;} 
+a:active {color:#50607C;text-decoration:underline;} 
+a:hover {color:#ff7900;text-decoration:underline;} 
+#infobox{position:absolute;top:40%;left:50%;z-index:1;padding:0;width:592px;margin-left:-296px;margin-top:-150px;text-align:center;font-size:1.2em; color:#ccc;} 
+#infobox #submitbtn {padding:15px 3px 5px 15px;height:28px;width:127px;margin-left:244px;} 
+#infobox #submitbtn input {text-transform:capitalize;color:#fff;font-size:1.0em;height:28px;width:127px;border:none;font-weight:normal;background:url(../../btn_purplepill_bg.png) bottom left no-repeat;vertical-align:text-bottom;font-weight:bold;} 
+#infobox #submitbtn input:hover.input_over, #login_box #submitbtn input:hover.input_off {color:#fff;border:none;background:url(../../btn_purplepill_bg.png) bottom right no-repeat;} 
+#infobox #submitbtn input:active.input_over {color:#fff;border:none;background:url(../../btn_purplepill_bg.png) top left no-repeat;} 
+#infobox #submitbtn input.pressed {color:#888;border:none;background:url(../../btn_purplepill_bg.png) top right no-repeat;}
+</style>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /></head>
+<body> <div id="infobox"> <img src="../../unabletoconnect.png"><br/>
+                <p> 第二人生无法与登录服务器连接。
+                </p>
+                <p> 请检查您的因特网连接 如果您的计算机或网络由防火墙或代理器保护，请确认第二人生能在该网络里访问因特网。
+                </p> <div id="submitbtn">
+                        <input class="input_over" type="submit" value="请再试一次" onclick="document.location='secondlife:///app/login_refresh'; this.className='pressed';" onmouseover="this.className='input_over';" onmouseout="this.className='input_off';" /> </div> </div>
+</div>
+</body>
diff --git a/linden/indra/newview/skins/default/textures/textures.xml b/linden/indra/newview/skins/default/textures/textures.xml
new file mode 100644
index 0000000..3c866e7
--- /dev/null
+++ b/linden/indra/newview/skins/default/textures/textures.xml
@@ -0,0 +1,371 @@
+<textures version="101">
+
+  <texture name="icn_scrollbar_thumb.tga" preload="true" scale_top="7" scale_left="4" scale_bottom="8" scale_right="4" />
+  <texture name="icn_scrollbar_bg.tga" preload="true" scale_top="7" scale_left="4" scale_bottom="8" scale_right="4" />
+  <texture name="sm_rounded_corners_simple.tga" scale_left="4" scale_top="4" scale_bottom="4" scale_right="4"/>
+  <texture name="icn_textfield_enabled.tga" scale_left="5" scale_top="5" scale_bottom="5" scale_right="5"/>
+  
+  <texture name="button_disabled_32x128.tga" preload="true" scale_left="16" scale_top="16" scale_right="112" scale_bottom="16" />
+  
+  <texture name="button_enabled_32x128.tga" preload="true" scale_left="16" scale_top="16" scale_right="112" scale_bottom="16" />
+  
+  <texture name="toolbar_btn_enabled.tga" scale_left="7" scale_top="32" scale_right="121" scale_bottom="0" /> 
+
+  <texture name="toolbar_btn_disabled.tga" scale_left="7" scale_top="32" scale_right="121" scale_bottom="0" /> 
+  
+  <texture name="toolbar_btn_selected.tga" scale_left="7" scale_top="32" scale_right="121" scale_bottom="0" /> 
+  
+  <texture name="button_enabled_selected_32x128.tga" preload="true" scale_left="16" scale_top="16" scale_right="112" scale_bottom="16" />
+  
+  <texture name="checkbox_disabled_false.tga"   preload="true"/>
+  <texture name="checkbox_disabled_true.tga"    preload="true"/>
+  <texture name="checkbox_enabled_false.tga"    preload="true"/>
+  <texture name="checkbox_enabled_true.tga"     preload="true"/>
+  
+  <texture name="close_in_blue.tga"     preload="true"/>
+ 
+  <texture name="minimize.tga"  preload="true"/>
+  <texture name="minimize_pressed.tga"  preload="true"/>
+  
+  <texture name="radio_active_false.tga"        preload="true"/>
+  <texture name="radio_active_true.tga" preload="true"/>
+  <texture name="radio_inactive_false.tga"      preload="true"/>
+  <texture name="radio_inactive_true.tga"       preload="true"/>
+  
+  <texture name="combobox_arrow.tga"    preload="true"/>
+  
+  <texture name="resize_handle_bottom_right_blue.tga" preload="true"/>
+  
+  <texture name="rounded_square.tga"    file_name="rounded_square.j2c" preload="true" scale_left="16" scale_top="16" scale_right="112" scale_bottom="16"/>
+  
+  <texture name="rounded_square_soft.tga"       file_name="rounded_square_soft.j2c" preload="true" scale_left="16" scale_top="16" scale_right="112" scale_bottom="16"/>
+  
+  <texture name="toolbar_tab.tga"       preload="true" scale_left="6" scale_top="42" scale_right="104" scale_bottom="8"/>
+  <texture name="toolbar_bg.tga"        preload="true" scale_left="6" scale_top="42" scale_right="96" scale_bottom="16"/>
+  
+  <texture name="progressbar_fill.tga"  preload="true" scale_left="10" scale_top="7" scale_right="65" scale_bottom="7"/>
+  <texture name="progressbar_track.tga" preload="true" scale_left="10" scale_top="7" scale_right="80" scale_bottom="7"/>
+  
+  <texture name="scrollbutton_down_in_blue.tga" preload="true"/>
+  <texture name="scrollbutton_down_out_blue.tga"        preload="true"/>
+  <texture name="scrollbutton_left_in_blue.tga" preload="true"/>
+  <texture name="scrollbutton_left_out_blue.tga"        preload="true"/>
+  <texture name="scrollbutton_right_in_blue.tga"        preload="true"/>
+  <texture name="scrollbutton_right_out_blue.tga"       preload="true"/>
+  <texture name="scrollbutton_up_in_blue.tga"   preload="true"/>
+  <texture name="scrollbutton_up_out_blue.tga"  preload="true"/>
+  <texture name="spin_down_in_blue.tga" preload="true"/>
+  <texture name="spin_down_out_blue.tga"        preload="true"/>
+  <texture name="spin_up_in_blue.tga"   preload="true"/>
+  <texture name="spin_up_out_blue.tga"  preload="true"/>
+  
+  <texture name="square_btn_32x128.tga" preload="true" scale_left="8" scale_top="10" scale_right="120" scale_bottom="10"/>
+  <texture name="square_btn_selected_32x128.tga"        preload="true" scale_left="2" scale_top="10" scale_right="126" scale_bottom="10"/>
+  
+  <texture name="tab_bottom_blue.tga"   preload="true" scale_left="8" scale_top="8" scale_right="120" scale_bottom="9"/>
+  <texture name="tab_bottom_selected_blue.tga"  preload="true" scale_left="8" scale_top="8" scale_right="96" scale_bottom="9"/>
+  <texture name="tab_left.tga"  preload="true" scale_left="8" scale_top="8" scale_right="120" scale_bottom="9"/>
+  <texture name="tab_left_selected.tga" preload="true" scale_left="8" scale_top="8" scale_right="96" scale_bottom="9"/>
+  <texture name="tab_top_blue.tga"      preload="true" scale_left="8" scale_top="8" scale_right="120" scale_bottom="9"/>
+  <texture name="tab_top_selected_blue.tga" preload="true" scale_left="8" scale_top="8" scale_right="96" scale_bottom="9"/>
+  
+  <texture name="startup_logo.j2c" preload="true"/>
+  <texture name="color_swatch_alpha.tga" preload="true"/>
+
+  <texture name="active_voice_tab.tga"/>
+  <texture name="button_anim_pause.tga"/>
+  <texture name="button_anim_pause_selected.tga"/>
+  <texture name="button_anim_play.tga"/>
+  <texture name="button_anim_play_selected.tga"/>
+  <texture name="button_anim_stop.tga"/>
+  <texture name="button_anim_stop_selected.tga"/>
+  <texture name="crosshairs.tga"/>
+  <texture name="direction_arrow.tga"/>
+  <texture name="foot_shadow.j2c" use_mips="true"/>
+
+  <texture name="icon_auction.tga"/>
+  <texture name="icon_avatar_offline.tga"/>
+  <texture name="icon_avatar_online.tga"/>
+  <texture name="icon_day_cycle.tga"/>
+  <texture name="icon_diurnal.tga"/>
+  <texture name="icon_event.tga"/>
+  <texture name="icon_event_mature.tga"/>
+  <texture name="icon_for_sale.tga"/>
+  <texture name="icon_group.tga"/>
+  <texture name="icon_groupnotice.tga"/>
+  <texture name="icon_groupnoticeinventory.tga"/>
+  <texture name="icon_lock.tga"/>
+  <texture name="icon_place.tga"/>
+  <texture name="icon_popular.tga"/>
+  <texture name="icon_top_pick.tga"/>
+
+  <texture name="inv_folder_animation.tga"/>
+  <texture name="inv_folder_bodypart.tga"/>
+  <texture name="inv_folder_callingcard.tga"/>
+  <texture name="inv_folder_clothing.tga"/>
+  <texture name="inv_folder_gesture.tga"/>
+  <texture name="inv_folder_landmark.tga"/>
+  <texture name="inv_folder_lostandfound.tga"/>
+  <texture name="inv_folder_notecard.tga"/>
+  <texture name="inv_folder_object.tga"/>
+  <texture name="inv_folder_plain_closed.tga"/>
+  <texture name="inv_folder_script.tga"/>
+  <texture name="inv_folder_snapshot.tga"/>
+  <texture name="inv_folder_sound.tga"/>
+  <texture name="inv_folder_texture.tga"/>
+  <texture name="inv_folder_trash.tga"/>
+  
+  <texture name="inv_item_animation.tga"/>
+  <texture name="inv_item_skin.tga"/>
+  <texture name="inv_item_callingcard_offline.tga"/>
+  <texture name="inv_item_callingcard_online.tga"/>
+  <texture name="inv_item_eyes.tga"/>
+  <texture name="inv_item_gesture.tga"/>
+  <texture name="inv_item_gloves.tga"/>
+  <texture name="inv_item_hair.tga"/>
+  <texture name="inv_item_jacket.tga"/>
+  <texture name="inv_item_landmark.tga"/>
+  <texture name="inv_item_landmark_visited.tga"/>
+  <texture name="inv_item_notecard.tga"/>
+  <texture name="inv_item_object.tga"/>
+  <texture name="inv_item_object_multi.tga"/>
+  <texture name="inv_item_pants.tga"/>
+  <texture name="inv_item_script.tga"/>
+  <texture name="inv_item_shape.tga"/>
+  <texture name="inv_item_shirt.tga"/>
+  <texture name="inv_item_shoes.tga"/>
+  <texture name="inv_item_skirt.tga"/>
+  <texture name="inv_item_snapshot.tga"/>
+  <texture name="inv_item_socks.tga"/>
+  <texture name="inv_item_sound.tga"/>
+  <texture name="inv_item_texture.tga"/>
+  <texture name="inv_item_underpants.tga"/>
+  <texture name="inv_item_undershirt.tga"/>
+  
+  <texture name="lag_status_critical.tga"/>
+  <texture name="lag_status_good.tga"/>
+  <texture name="lag_status_warning.tga"/>
+  
+  <texture name="legend.tga"/>
+  
+  <texture name="map_avatar_16.tga"/>
+  <texture name="map_avatar_8.tga"/>
+  <texture name="map_avatar_you_8.tga"/>
+  <texture name="map_event.tga"/>
+  <texture name="map_event_mature.tga"/>
+  <texture name="map_home.tga"/>
+  <texture name="map_infohub.tga"/>
+  <texture name="map_telehub.tga"/>
+  <texture name="map_track_16.tga"/>
+  
+  <texture name="media_icon.tga" file_name="icn_label_media.tga" />
+  <texture name="music_icon.tga" file_name="icn_label_music.tga" />
+  <texture name="noentrylines.j2c" use_mips="true"/>
+  <texture name="noentrypasslines.j2c" use_mips="true"/>
+  
+  <texture name="notify_tip_icon.tga"/>
+  <texture name="notify_caution_icon.tga"/>
+  <texture name="notify_next.tga" preload="true"/>
+  <texture name="notify_box_icon.tga"/>
+  
+  <texture name="object_cone.tga"/>
+  <texture name="object_cone_active.tga"/>
+  <texture name="object_cube.tga"/>
+  <texture name="object_cube_active.tga"/>
+  <texture name="object_cylinder.tga"/>
+  <texture name="object_cylinder_active.tga"/>
+  <texture name="object_grass.tga"/>
+  <texture name="object_grass_active.tga"/>
+  <texture name="object_hemi_cone.tga"/>
+  <texture name="object_hemi_cone_active.tga"/>
+  <texture name="object_hemi_cylinder.tga"/>
+  <texture name="object_hemi_cylinder_active.tga"/>
+  <texture name="object_hemi_sphere.tga"/>
+  <texture name="object_hemi_sphere_active.tga"/>
+  <texture name="object_prism.tga"/>
+  <texture name="object_prism_active.tga"/>
+  <texture name="object_pyramid.tga"/>
+  <texture name="object_pyramid_active.tga"/>
+  <texture name="object_ring.tga"/>
+  <texture name="object_ring_active.tga"/>
+  <texture name="object_sphere.tga"/>
+  <texture name="object_sphere_active.tga"/>
+  <texture name="object_tetrahedron.tga"/>
+  <texture name="object_tetrahedron_active.tga"/>
+  <texture name="object_torus.tga"/>
+  <texture name="object_torus_active.tga"/>
+  <texture name="object_tree.tga"/>
+  <texture name="object_tree_active.tga"/>
+  <texture name="object_tube.tga"/>
+  <texture name="object_tube_active.tga"/>
+  
+  <texture name="pixiesmall.j2c" use_mips="true"/>
+  <texture name="script_error.j2c" use_mips="true"/>
+  <texture name="silhouette.j2c" use_mips="true"/>
+  
+  <texture name="status_no_build.tga"/>
+  <texture name="status_voice.tga"/>
+  <texture name="status_buy_currency.tga"/>
+  <texture name="status_buy_currency_pressed.tga"/>
+  <texture name="status_buy_land.tga"/>
+  <texture name="status_buy_land_pressed.tga"/>
+  <texture name="status_no_fly.tga"/>
+  <texture name="status_health.tga"/>
+  <texture name="status_no_push.tga"/>
+  <texture name="status_no_scripts.tga"/>
+  
+  <texture name="tool_dozer.tga"/>
+  <texture name="tool_dozer_active.tga"/>
+  <texture name="tool_zoom.tga"/>
+  <texture name="tool_zoom_active.tga"/>
+
+  <texture name="icn_active-speakers-dot-lvl0.tga"/>
+  <texture name="icn_active-speakers-dot-lvl1.tga"/>
+  <texture name="icn_active-speakers-dot-lvl2.tga"/>
+  <texture name="icn_active-speakers-typing1.tga"/>
+  <texture name="icn_active-speakers-typing2.tga"/>
+  <texture name="icn_active-speakers-typing3.tga"/>
+  
+  <texture name="icn_voice_ptt-off.tga"/>
+  <texture name="icn_voice_ptt-on.tga"/>
+  <texture name="icn_voice_ptt-on-lvl1.tga"/>
+  <texture name="icn_voice_ptt-on-lvl2.tga"/>
+  <texture name="icn_voice_ptt-on-lvl3.tga"/>
+  <texture name="icn_voice-call-end.tga"/>
+  <texture name="icn_voice-call-start.tga"/>
+  
+  <texture name="mute_icon.tga"/>
+  
+  <texture name="icn_slide-groove_dark.tga" scale_left="2" scale_top="5" scale_right="29" scale_bottom="4"/>
+  <texture name="icn_slide-highlight.tga" scale_left="2" scale_top="5" scale_right="29" scale_bottom="4"/>
+  <texture name="icn_slide-thumb_dark.tga" scale_left="2" scale_top="5" scale_right="29" scale_bottom="4"/>
+  
+  <texture name="icn_speaker-muted_dark.tga"/>
+  <texture name="icn_speaker_dark.tga"/>
+
+  <texture name="icn_voice-localchat.tga"/>
+  <texture name="icn_voice-groupfocus.tga"/>
+  <texture name="icn_voice-pvtfocus.tga"/>
+  
+  <texture name="icn_media-pause.tga"/>
+  <texture name="icn_media-play.tga"/>
+  <texture name="icn_music-play.tga"/>
+  <texture name="icn_music-pause.tga"/>
+  <texture name="icn_media_web.tga" preload="true"/>
+  <texture name="icn_media_movie.tga" preload="true"/>
+  
+  <texture name="icn_chatbar.tga"/>
+  <texture name="btn_chatbar.tga" scale_left="20" scale_top="24" scale_right="44" scale_bottom="0"/>
+  <texture name="btn_chatbar_selected.tga" scale_left="20" scale_top="24" scale_right="44" scale_bottom="0"/>
+  
+  <texture name="icn_rounded-text-field.tga"/>
+
+  <texture name="flyout_btn_right_selected.tga" scale_left="0" scale_top="30" scale_right="32" scale_bottom="0"/>
+  
+  <texture name="flyout_btn_right.tga" scale_left="0" scale_top="30" scale_right="32" scale_bottom="0"/>
+  
+  <texture name="flyout_btn_right_disabled.tga" scale_left="0" scale_top="30" scale_right="32" scale_bottom="0"/>
+  
+  <texture name="flyout_btn_left_selected.tga" scale_left="16" scale_top="15" scale_right="112" scale_bottom="15"/>
+  
+  <texture name="flyout_btn_left.tga" scale_left="16" scale_top="15" scale_right="112" scale_bottom="15"/>
+  
+  <texture name="flyout_btn_left_disabled.tga" scale_left="16" scale_top="15" scale_right="112" scale_bottom="15"/>
+
+  <texture name="UIImgResizeBottomRightUUID" file_name="resize_handle_bottom_right_blue.tga"/>
+
+  <texture name="UIImgBtnForwardOutUUID" file_name="move_forward_out.tga" preload="true"/>
+  <texture name="UIImgBtnForwardInUUID" file_name="move_forward_in.tga" preload="true"/>
+  <texture name="UIImgBtnSlideLeftOutUUID" file_name="move_left_out.tga" preload="true"/>
+  <texture name="UIImgBtnSlideLeftInUUID" file_name="move_left_in.tga" preload="true"/>
+  <texture name="UIImgBtnLeftOutUUID"   file_name="move_turn_left_out.tga" preload="true"/>
+  <texture name="UIImgBtnLeftInUUID"    file_name="move_turn_left_in.tga" preload="true"/>
+  <texture name="UIImgBtnRightOutUUID" file_name="move_turn_right_out.tga" preload="true"/>
+  <texture name="UIImgBtnRightInUUID"   file_name="move_turn_right_in.tga" preload="true"/>
+  <texture name="UIImgBtnSlideRightOutUUID" file_name="move_right_out.tga" preload="true"/>
+  <texture name="UIImgBtnSlideRightInUUID" file_name="move_right_in.tga" preload="true"/>
+  <texture name="UIImgBtnMoveUpInUUID" file_name="move_up_in.tga" preload="true"/>
+  <texture name="UIImgBtnMoveUpOutUUID" file_name="move_up_out.tga" preload="true"/>
+  <texture name="UIImgBtnMoveDownInUUID" file_name="move_down_in.tga" preload="true"/>
+  <texture name="UIImgBtnMoveDownOutUUID" file_name="move_down_out.tga" preload="true"/>
+  
+  <texture name="cam_rotate_out.tga" preload="true"/>
+  <texture name="cam_rotate_in.tga" preload="true"/>
+  <texture name="cam_zoom_out.tga" preload="true"/>
+  <texture name="cam_zoom_plus_in.tga" preload="true"/>
+  <texture name="cam_zoom_minus_in.tga" preload="true"/>
+
+  <texture name="UIImgBtnScrollUpOutUUID" file_name="scrollbutton_up_out_blue.tga"/>
+  <texture name="UIImgBtnScrollUpInUUID" file_name="scrollbutton_up_in_blue.tga"/>
+  <texture name="UIImgBtnScrollDownOutUUID" file_name="scrollbutton_down_out_blue.tga"/>
+  <texture name="UIImgBtnScrollDownInUUID" file_name="scrollbutton_down_in_blue.tga"/>
+  <texture name="UIImgBtnScrollLeftOutUUID" file_name="scrollbutton_left_out_blue.tga"/>
+  <texture name="UIImgBtnScrollLeftInUUID" file_name="scrollbutton_left_in_blue.tga"/>
+  <texture name="UIImgBtnScrollRightOutUUID" file_name="scrollbutton_right_out_blue.tga"/>
+  <texture name="UIImgBtnScrollRightInUUID" file_name="scrollbutton_right_in_blue.tga"/>
+
+  <texture name="UIImgBtnJumpLeftOutUUID" file_name="3c18c87e-5f50-14e2-e744-f44734aa365f.tga"/>
+  <texture name="UIImgBtnJumpLeftInUUID" file_name="9cad3e6d-2d6d-107d-f8ab-5ba272b5bfe1.tga"/>
+  <texture name="UIImgBtnJumpRightOutUUID" file_name="ff9a71eb-7414-4cf8-866e-a701deb7c3cf.tga"/>
+  <texture name="UIImgBtnJumpRightInUUID" file_name="7dabc040-ec13-2309-ddf7-4f161f6de2f4.tga"/>
+
+  <texture name="UIImgBtnSpinUpOutUUID" file_name="spin_up_out_blue.tga"/>
+  <texture name="UIImgBtnSpinUpInUUID"  file_name="spin_up_in_blue.tga"/>
+  <texture name="UIImgBtnSpinDownOutUUID"       file_name="spin_down_out_blue.tga"/>
+  <texture name="UIImgBtnSpinDownInUUID"        file_name="spin_down_in_blue.tga"/>
+
+  <texture name="UIImgRadioActiveUUID"  file_name="radio_active_false.tga"/>
+  <texture name="UIImgRadioActiveSelectedUUID" file_name="radio_active_true.tga"/>
+  <texture name="UIImgRadioInactiveUUID"        file_name="radio_inactive_false.tga"/>
+  <texture name="UIImgRadioInactiveSelectedUUID" file_name="radio_inactive_true.tga"/>
+
+  <texture name="UIImgCheckboxActiveUUID"       file_name="checkbox_enabled_false.tga"/>
+  <texture name="UIImgCheckboxActiveSelectedUUID" file_name="checkbox_enabled_true.tga"/>
+  <texture name="UIImgCheckboxInactiveUUID" file_name="checkbox_disabled_false.tga"/>
+  <texture name="UIImgCheckboxInactiveSelectedUUID" file_name="checkbox_disabled_true.tga"/>
+
+  <texture name="UIImgBtnTabTopOutUUID" file_name="tab_top_blue.tga"/>
+  <texture name="UIImgBtnTabTopInUUID"  file_name="tab_top_selected_blue.tga"/>
+  <texture name="UIImgBtnTabBottomOutUUID" file_name="tab_bottom_blue.tga"/>
+  <texture name="UIImgBtnTabBottomInUUID"       file_name="tab_bottom_selected_blue.tga"/>
+
+  <texture name="UIImgGrabUUID" file_name="c63f124c-6340-4fbf-b59e-0869a44adb64.tga"/>
+  <texture name="UIImgGrabSelectedUUID" file_name="c1e21504-f136-451d-b8e9-929037812f1d.tga"/>
+
+  <!--<texture name="UIImgScaleUUID"                    file_name="88a90fef-b448-4883-9344-ecf378a60433.tga"/>-->
+
+  <texture name="UIImgFaceUUID" file_name="ce15fd63-b0b6-463c-a37d-ea6393208b3e.tga"/>
+  <texture name="UIImgFaceSelectedUUID" file_name="b4870163-6208-42a9-9801-93133bf9a6cd.tga"/>
+
+  <texture name="UIImgCreateUUID"       file_name="7a0b1bdb-b5d9-4df5-bac2-ba230da93b5b.tga"/>
+  <texture name="UIImgCreateSelectedUUID"       file_name="0098b015-3daf-4cfe-a72f-915369ea97c2.tga"/>
+
+  <texture name="UIImgBtnCloseInactiveUUID" file_name="close_inactive_blue.tga"/>
+  <texture name="UIImgBtnCloseActiveUUID"       file_name="closebox.tga"/>
+  <texture name="UIImgBtnClosePressedUUID" file_name="close_in_blue.tga"/>
+  <texture name="icn_clear_lineeditor.tga" />
+  
+  <texture name="up_arrow.tga" file_name="up_arrow.png"/>
+  <texture name="down_arrow.tga" file_name="down_arrow.png"/>
+
+
+  <texture name="UIImgBtnMinimizeInactiveUUID" file_name="minimize_inactive.tga"/>
+  <texture name="UIImgBtnMinimizeActiveUUID" file_name="minimize.tga"/>
+  <texture name="UIImgBtnMinimizePressedUUID" file_name="minimize_pressed.tga"/>
+
+  <texture name="UIImgBtnRestoreInactiveUUID" file_name="restore_inactive.tga"/>
+  <texture name="UIImgBtnRestoreActiveUUID" file_name="restore.tga"/>
+  <texture name="UIImgBtnRestorePressedUUID" file_name="restore_pressed.tga"/>
+
+  <texture name="UIImgBtnTearOffInactiveUUID" file_name="tearoffbox.tga"/>
+  <texture name="UIImgBtnTearOffActiveUUID" file_name="tearoffbox.tga"/>
+  <texture name="UIImgBtnTearOffPressedUUID" file_name="tearoff_pressed.tga"/>
+
+  <texture name="UIImgCrosshairsUUID" file_name="crosshairs.tga"/>
+  <texture name="icn_label_music.tga"/>
+  <texture name="icn_label_media.tga"/>
+  <texture name="arrow_down.tga"/>
+  <texture name="skin_thumbnail_modern.png" preload="true"/>
+  <texture name="skin_thumbnail_classic.png" preload="true"/>
+  <texture name="cloud-particle.j2c" use_mips="true"/>
+</textures>
\ No newline at end of file
diff --git a/linden/indra/newview/skins/xui/de/LCD_text.xml b/linden/indra/newview/skins/default/xui/de/LCD_text.xml
index a20d9f4..a20d9f4 100644
--- a/linden/indra/newview/skins/xui/de/LCD_text.xml
+++ b/linden/indra/newview/skins/default/xui/de/LCD_text.xml
diff --git a/linden/indra/newview/skins/xui/de/alerts.xml b/linden/indra/newview/skins/default/xui/de/alerts.xml
index dcaaa0e..dcaaa0e 100644
--- a/linden/indra/newview/skins/xui/de/alerts.xml
+++ b/linden/indra/newview/skins/default/xui/de/alerts.xml
diff --git a/linden/indra/newview/skins/xui/de/floater_about.xml b/linden/indra/newview/skins/default/xui/de/floater_about.xml
index 65d572e..65d572e 100644
--- a/linden/indra/newview/skins/xui/de/floater_about.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_about.xml
diff --git a/linden/indra/newview/skins/xui/de/floater_about_land.xml b/linden/indra/newview/skins/default/xui/de/floater_about_land.xml
index 52cd7a2..52cd7a2 100644
--- a/linden/indra/newview/skins/xui/de/floater_about_land.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_about_land.xml
diff --git a/linden/indra/newview/skins/xui/de/floater_active_speakers.xml b/linden/indra/newview/skins/default/xui/de/floater_active_speakers.xml
index 9ec58c1..9ec58c1 100644
--- a/linden/indra/newview/skins/xui/de/floater_active_speakers.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_active_speakers.xml
diff --git a/linden/indra/newview/skins/xui/de/floater_animation_preview.xml b/linden/indra/newview/skins/default/xui/de/floater_animation_preview.xml
index 3cbcf08..3cbcf08 100644
--- a/linden/indra/newview/skins/xui/de/floater_animation_preview.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_animation_preview.xml
diff --git a/linden/indra/newview/skins/xui/de/floater_auction.xml b/linden/indra/newview/skins/default/xui/de/floater_auction.xml
index 42f6a07..42f6a07 100644
--- a/linden/indra/newview/skins/xui/de/floater_auction.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_auction.xml
diff --git a/linden/indra/newview/skins/xui/de/floater_audio_volume.xml b/linden/indra/newview/skins/default/xui/de/floater_audio_volume.xml
index e5bb9ab..e5bb9ab 100644
--- a/linden/indra/newview/skins/xui/de/floater_audio_volume.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_audio_volume.xml
diff --git a/linden/indra/newview/skins/xui/de/floater_avatar_picker.xml b/linden/indra/newview/skins/default/xui/de/floater_avatar_picker.xml
index f02ffd2..f02ffd2 100644
--- a/linden/indra/newview/skins/xui/de/floater_avatar_picker.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_avatar_picker.xml
diff --git a/linden/indra/newview/skins/xui/de/floater_avatar_textures.xml b/linden/indra/newview/skins/default/xui/de/floater_avatar_textures.xml
index edf80f1..edf80f1 100644
--- a/linden/indra/newview/skins/xui/de/floater_avatar_textures.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_avatar_textures.xml
diff --git a/linden/indra/newview/skins/xui/de/floater_build_options.xml b/linden/indra/newview/skins/default/xui/de/floater_build_options.xml
index de3617e..de3617e 100644
--- a/linden/indra/newview/skins/xui/de/floater_build_options.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_build_options.xml
diff --git a/linden/indra/newview/skins/xui/de/floater_bumps.xml b/linden/indra/newview/skins/default/xui/de/floater_bumps.xml
index 7b21042..7b21042 100644
--- a/linden/indra/newview/skins/xui/de/floater_bumps.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_bumps.xml
diff --git a/linden/indra/newview/skins/xui/de/floater_buy_contents.xml b/linden/indra/newview/skins/default/xui/de/floater_buy_contents.xml
index c2ee63e..c2ee63e 100644
--- a/linden/indra/newview/skins/xui/de/floater_buy_contents.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_buy_contents.xml
diff --git a/linden/indra/newview/skins/xui/de/floater_buy_currency.xml b/linden/indra/newview/skins/default/xui/de/floater_buy_currency.xml
index 787f469..787f469 100644
--- a/linden/indra/newview/skins/xui/de/floater_buy_currency.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_buy_currency.xml
diff --git a/linden/indra/newview/skins/xui/de/floater_buy_land.xml b/linden/indra/newview/skins/default/xui/de/floater_buy_land.xml
index adfa766..adfa766 100644
--- a/linden/indra/newview/skins/xui/de/floater_buy_land.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_buy_land.xml
diff --git a/linden/indra/newview/skins/xui/de/floater_buy_object.xml b/linden/indra/newview/skins/default/xui/de/floater_buy_object.xml
index 910df26..910df26 100644
--- a/linden/indra/newview/skins/xui/de/floater_buy_object.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_buy_object.xml
diff --git a/linden/indra/newview/skins/xui/de/floater_camera.xml b/linden/indra/newview/skins/default/xui/de/floater_camera.xml
index bb36ebd..bb36ebd 100644
--- a/linden/indra/newview/skins/xui/de/floater_camera.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_camera.xml
diff --git a/linden/indra/newview/skins/xui/de/floater_chat_history.xml b/linden/indra/newview/skins/default/xui/de/floater_chat_history.xml
index ed484fe..ed484fe 100644
--- a/linden/indra/newview/skins/xui/de/floater_chat_history.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_chat_history.xml
diff --git a/linden/indra/newview/skins/xui/de/floater_chatterbox.xml b/linden/indra/newview/skins/default/xui/de/floater_chatterbox.xml
index 8a9049d..8a9049d 100644
--- a/linden/indra/newview/skins/xui/de/floater_chatterbox.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_chatterbox.xml
diff --git a/linden/indra/newview/skins/xui/de/floater_choose_group.xml b/linden/indra/newview/skins/default/xui/de/floater_choose_group.xml
index dd29aa7..dd29aa7 100644
--- a/linden/indra/newview/skins/xui/de/floater_choose_group.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_choose_group.xml
diff --git a/linden/indra/newview/skins/xui/de/floater_clothing.xml b/linden/indra/newview/skins/default/xui/de/floater_clothing.xml
index 82becd1..82becd1 100644
--- a/linden/indra/newview/skins/xui/de/floater_clothing.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_clothing.xml
diff --git a/linden/indra/newview/skins/xui/de/floater_color_picker.xml b/linden/indra/newview/skins/default/xui/de/floater_color_picker.xml
index a6f1515..a6f1515 100644
--- a/linden/indra/newview/skins/xui/de/floater_color_picker.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_color_picker.xml
diff --git a/linden/indra/newview/skins/xui/de/floater_critical.xml b/linden/indra/newview/skins/default/xui/de/floater_critical.xml
index 0b14792..0b14792 100644
--- a/linden/indra/newview/skins/xui/de/floater_critical.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_critical.xml
diff --git a/linden/indra/newview/skins/xui/de/floater_customize.xml b/linden/indra/newview/skins/default/xui/de/floater_customize.xml
index 65f4fa7..65f4fa7 100644
--- a/linden/indra/newview/skins/xui/de/floater_customize.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_customize.xml
diff --git a/linden/indra/newview/skins/xui/de/floater_day_cycle_options.xml b/linden/indra/newview/skins/default/xui/de/floater_day_cycle_options.xml
index d2e981c..d2e981c 100644
--- a/linden/indra/newview/skins/xui/de/floater_day_cycle_options.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_day_cycle_options.xml
diff --git a/linden/indra/newview/skins/xui/de/floater_device_settings.xml b/linden/indra/newview/skins/default/xui/de/floater_device_settings.xml
index 6feebdf..6feebdf 100644
--- a/linden/indra/newview/skins/xui/de/floater_device_settings.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_device_settings.xml
diff --git a/linden/indra/newview/skins/xui/de/floater_directory.xml b/linden/indra/newview/skins/default/xui/de/floater_directory.xml
index c149fb4..c149fb4 100644
--- a/linden/indra/newview/skins/xui/de/floater_directory.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_directory.xml
diff --git a/linden/indra/newview/skins/xui/de/floater_env_settings.xml b/linden/indra/newview/skins/default/xui/de/floater_env_settings.xml
index b97e3d5..b97e3d5 100644
--- a/linden/indra/newview/skins/xui/de/floater_env_settings.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_env_settings.xml
diff --git a/linden/indra/newview/skins/xui/de/floater_gesture.xml b/linden/indra/newview/skins/default/xui/de/floater_gesture.xml
index bdee3b8..bdee3b8 100644
--- a/linden/indra/newview/skins/xui/de/floater_gesture.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_gesture.xml
diff --git a/linden/indra/newview/skins/xui/de/floater_god_tools.xml b/linden/indra/newview/skins/default/xui/de/floater_god_tools.xml
index 6356dff..6356dff 100644
--- a/linden/indra/newview/skins/xui/de/floater_god_tools.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_god_tools.xml
diff --git a/linden/indra/newview/skins/xui/de/floater_group_info.xml b/linden/indra/newview/skins/default/xui/de/floater_group_info.xml
index 9d1dde8..9d1dde8 100644
--- a/linden/indra/newview/skins/xui/de/floater_group_info.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_group_info.xml
diff --git a/linden/indra/newview/skins/xui/de/floater_hardware_settings.xml b/linden/indra/newview/skins/default/xui/de/floater_hardware_settings.xml
index 4149d8d..4149d8d 100644
--- a/linden/indra/newview/skins/xui/de/floater_hardware_settings.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_hardware_settings.xml
diff --git a/linden/indra/newview/skins/xui/de/floater_html.xml b/linden/indra/newview/skins/default/xui/de/floater_html.xml
index 7e97d4f..7e97d4f 100644
--- a/linden/indra/newview/skins/xui/de/floater_html.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_html.xml
diff --git a/linden/indra/newview/skins/xui/de/floater_hud.xml b/linden/indra/newview/skins/default/xui/de/floater_hud.xml
index adf9cae..adf9cae 100644
--- a/linden/indra/newview/skins/xui/de/floater_hud.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_hud.xml
diff --git a/linden/indra/newview/skins/xui/de/floater_im.xml b/linden/indra/newview/skins/default/xui/de/floater_im.xml
index 573ff6e..573ff6e 100644
--- a/linden/indra/newview/skins/xui/de/floater_im.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_im.xml
diff --git a/linden/indra/newview/skins/xui/de/floater_image_preview.xml b/linden/indra/newview/skins/default/xui/de/floater_image_preview.xml
index 145e0bb..145e0bb 100644
--- a/linden/indra/newview/skins/xui/de/floater_image_preview.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_image_preview.xml
diff --git a/linden/indra/newview/skins/xui/de/floater_import.xml b/linden/indra/newview/skins/default/xui/de/floater_import.xml
index 3fbc333..3fbc333 100644
--- a/linden/indra/newview/skins/xui/de/floater_import.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_import.xml
diff --git a/linden/indra/newview/skins/xui/de/floater_inspect.xml b/linden/indra/newview/skins/default/xui/de/floater_inspect.xml
index 7c65c4f..7c65c4f 100644
--- a/linden/indra/newview/skins/xui/de/floater_inspect.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_inspect.xml
diff --git a/linden/indra/newview/skins/xui/de/floater_instant_message.xml b/linden/indra/newview/skins/default/xui/de/floater_instant_message.xml
index 094588c..094588c 100644
--- a/linden/indra/newview/skins/xui/de/floater_instant_message.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_instant_message.xml
diff --git a/linden/indra/newview/skins/xui/de/floater_instant_message_ad_hoc.xml b/linden/indra/newview/skins/default/xui/de/floater_instant_message_ad_hoc.xml
index 4b0719c..4b0719c 100644
--- a/linden/indra/newview/skins/xui/de/floater_instant_message_ad_hoc.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_instant_message_ad_hoc.xml
diff --git a/linden/indra/newview/skins/xui/de/floater_instant_message_group.xml b/linden/indra/newview/skins/default/xui/de/floater_instant_message_group.xml
index 118276e..118276e 100644
--- a/linden/indra/newview/skins/xui/de/floater_instant_message_group.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_instant_message_group.xml
diff --git a/linden/indra/newview/skins/xui/de/floater_inventory.xml b/linden/indra/newview/skins/default/xui/de/floater_inventory.xml
index d731d00..d731d00 100644
--- a/linden/indra/newview/skins/xui/de/floater_inventory.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_inventory.xml
diff --git a/linden/indra/newview/skins/xui/de/floater_inventory_item_properties.xml b/linden/indra/newview/skins/default/xui/de/floater_inventory_item_properties.xml
index 1477cdb..1477cdb 100644
--- a/linden/indra/newview/skins/xui/de/floater_inventory_item_properties.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_inventory_item_properties.xml
diff --git a/linden/indra/newview/skins/xui/de/floater_inventory_view_finder.xml b/linden/indra/newview/skins/default/xui/de/floater_inventory_view_finder.xml
index aa24231..aa24231 100644
--- a/linden/indra/newview/skins/xui/de/floater_inventory_view_finder.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_inventory_view_finder.xml
diff --git a/linden/indra/newview/skins/xui/de/floater_joystick.xml b/linden/indra/newview/skins/default/xui/de/floater_joystick.xml
index 837ac7d..837ac7d 100644
--- a/linden/indra/newview/skins/xui/de/floater_joystick.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_joystick.xml
diff --git a/linden/indra/newview/skins/xui/de/floater_lagmeter.xml b/linden/indra/newview/skins/default/xui/de/floater_lagmeter.xml
index dffbf9e..dffbf9e 100644
--- a/linden/indra/newview/skins/xui/de/floater_lagmeter.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_lagmeter.xml
diff --git a/linden/indra/newview/skins/xui/de/floater_land_holdings.xml b/linden/indra/newview/skins/default/xui/de/floater_land_holdings.xml
index f9dcfc9..f9dcfc9 100644
--- a/linden/indra/newview/skins/xui/de/floater_land_holdings.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_land_holdings.xml
diff --git a/linden/indra/newview/skins/xui/de/floater_landmark_ctrl.xml b/linden/indra/newview/skins/default/xui/de/floater_landmark_ctrl.xml
index f983bde..f983bde 100644
--- a/linden/indra/newview/skins/xui/de/floater_landmark_ctrl.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_landmark_ctrl.xml
diff --git a/linden/indra/newview/skins/xui/de/floater_live_lsleditor.xml b/linden/indra/newview/skins/default/xui/de/floater_live_lsleditor.xml
index 7b656f5..7b656f5 100644
--- a/linden/indra/newview/skins/xui/de/floater_live_lsleditor.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_live_lsleditor.xml
diff --git a/linden/indra/newview/skins/xui/de/floater_lsl_guide.xml b/linden/indra/newview/skins/default/xui/de/floater_lsl_guide.xml
index 9fb400d..9fb400d 100644
--- a/linden/indra/newview/skins/xui/de/floater_lsl_guide.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_lsl_guide.xml
diff --git a/linden/indra/newview/skins/xui/de/floater_media_browser.xml b/linden/indra/newview/skins/default/xui/de/floater_media_browser.xml
index 5dda873..5dda873 100644
--- a/linden/indra/newview/skins/xui/de/floater_media_browser.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_media_browser.xml
diff --git a/linden/indra/newview/skins/xui/de/floater_moveview.xml b/linden/indra/newview/skins/default/xui/de/floater_moveview.xml
index 01431ee..01431ee 100644
--- a/linden/indra/newview/skins/xui/de/floater_moveview.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_moveview.xml
diff --git a/linden/indra/newview/skins/xui/de/floater_mute.xml b/linden/indra/newview/skins/default/xui/de/floater_mute.xml
index cc9919a..cc9919a 100644
--- a/linden/indra/newview/skins/xui/de/floater_mute.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_mute.xml
diff --git a/linden/indra/newview/skins/xui/de/floater_mute_object.xml b/linden/indra/newview/skins/default/xui/de/floater_mute_object.xml
index c6351cc..c6351cc 100644
--- a/linden/indra/newview/skins/xui/de/floater_mute_object.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_mute_object.xml
diff --git a/linden/indra/newview/skins/xui/de/floater_my_friends.xml b/linden/indra/newview/skins/default/xui/de/floater_my_friends.xml
index 7d650a2..7d650a2 100644
--- a/linden/indra/newview/skins/xui/de/floater_my_friends.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_my_friends.xml
diff --git a/linden/indra/newview/skins/xui/de/floater_name_description.xml b/linden/indra/newview/skins/default/xui/de/floater_name_description.xml
index 5f5e1cc..5f5e1cc 100644
--- a/linden/indra/newview/skins/xui/de/floater_name_description.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_name_description.xml
diff --git a/linden/indra/newview/skins/xui/de/floater_new_im.xml b/linden/indra/newview/skins/default/xui/de/floater_new_im.xml
index c2334e4..c2334e4 100644
--- a/linden/indra/newview/skins/xui/de/floater_new_im.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_new_im.xml
diff --git a/linden/indra/newview/skins/xui/de/floater_new_outfit_dialog.xml b/linden/indra/newview/skins/default/xui/de/floater_new_outfit_dialog.xml
index 861ecaf..861ecaf 100644
--- a/linden/indra/newview/skins/xui/de/floater_new_outfit_dialog.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_new_outfit_dialog.xml
diff --git a/linden/indra/newview/skins/xui/de/floater_openobject.xml b/linden/indra/newview/skins/default/xui/de/floater_openobject.xml
index c7f9b74..c7f9b74 100644
--- a/linden/indra/newview/skins/xui/de/floater_openobject.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_openobject.xml
diff --git a/linden/indra/newview/skins/xui/de/floater_pay.xml b/linden/indra/newview/skins/default/xui/de/floater_pay.xml
index 5d0dbff..5d0dbff 100644
--- a/linden/indra/newview/skins/xui/de/floater_pay.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_pay.xml
diff --git a/linden/indra/newview/skins/xui/de/floater_pay_object.xml b/linden/indra/newview/skins/default/xui/de/floater_pay_object.xml
index b3d8921..b3d8921 100644
--- a/linden/indra/newview/skins/xui/de/floater_pay_object.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_pay_object.xml
diff --git a/linden/indra/newview/skins/xui/de/floater_post_process.xml b/linden/indra/newview/skins/default/xui/de/floater_post_process.xml
index f2abb9c..f2abb9c 100644
--- a/linden/indra/newview/skins/xui/de/floater_post_process.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_post_process.xml
diff --git a/linden/indra/newview/skins/xui/de/floater_postcard.xml b/linden/indra/newview/skins/default/xui/de/floater_postcard.xml
index 0168d54..0168d54 100644
--- a/linden/indra/newview/skins/xui/de/floater_postcard.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_postcard.xml
diff --git a/linden/indra/newview/skins/xui/de/floater_preferences.xml b/linden/indra/newview/skins/default/xui/de/floater_preferences.xml
index 5f68282..5f68282 100644
--- a/linden/indra/newview/skins/xui/de/floater_preferences.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_preferences.xml
diff --git a/linden/indra/newview/skins/xui/de/floater_preview_animation.xml b/linden/indra/newview/skins/default/xui/de/floater_preview_animation.xml
index 0d5a6b1..0d5a6b1 100644
--- a/linden/indra/newview/skins/xui/de/floater_preview_animation.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_preview_animation.xml
diff --git a/linden/indra/newview/skins/xui/de/floater_preview_classified.xml b/linden/indra/newview/skins/default/xui/de/floater_preview_classified.xml
index caf544a..caf544a 100644
--- a/linden/indra/newview/skins/xui/de/floater_preview_classified.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_preview_classified.xml
diff --git a/linden/indra/newview/skins/xui/de/floater_preview_embedded_texture.xml b/linden/indra/newview/skins/default/xui/de/floater_preview_embedded_texture.xml
index d61450c..d61450c 100644
--- a/linden/indra/newview/skins/xui/de/floater_preview_embedded_texture.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_preview_embedded_texture.xml
diff --git a/linden/indra/newview/skins/xui/de/floater_preview_event.xml b/linden/indra/newview/skins/default/xui/de/floater_preview_event.xml
index a0512a3..a0512a3 100644
--- a/linden/indra/newview/skins/xui/de/floater_preview_event.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_preview_event.xml
diff --git a/linden/indra/newview/skins/xui/de/floater_preview_existing_landmark.xml b/linden/indra/newview/skins/default/xui/de/floater_preview_existing_landmark.xml
index 46fcedb..46fcedb 100644
--- a/linden/indra/newview/skins/xui/de/floater_preview_existing_landmark.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_preview_existing_landmark.xml
diff --git a/linden/indra/newview/skins/xui/de/floater_preview_gesture.xml b/linden/indra/newview/skins/default/xui/de/floater_preview_gesture.xml
index 0596cab..0596cab 100644
--- a/linden/indra/newview/skins/xui/de/floater_preview_gesture.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_preview_gesture.xml
diff --git a/linden/indra/newview/skins/xui/de/floater_preview_notecard.xml b/linden/indra/newview/skins/default/xui/de/floater_preview_notecard.xml
index 370f242..370f242 100644
--- a/linden/indra/newview/skins/xui/de/floater_preview_notecard.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_preview_notecard.xml
diff --git a/linden/indra/newview/skins/xui/de/floater_preview_notecard_keep_discard.xml b/linden/indra/newview/skins/default/xui/de/floater_preview_notecard_keep_discard.xml
index 1faf82b..1faf82b 100644
--- a/linden/indra/newview/skins/xui/de/floater_preview_notecard_keep_discard.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_preview_notecard_keep_discard.xml
diff --git a/linden/indra/newview/skins/xui/de/floater_preview_sound.xml b/linden/indra/newview/skins/default/xui/de/floater_preview_sound.xml
index fd0a824..fd0a824 100644
--- a/linden/indra/newview/skins/xui/de/floater_preview_sound.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_preview_sound.xml
diff --git a/linden/indra/newview/skins/xui/de/floater_preview_texture.xml b/linden/indra/newview/skins/default/xui/de/floater_preview_texture.xml
index 6828da9..6828da9 100644
--- a/linden/indra/newview/skins/xui/de/floater_preview_texture.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_preview_texture.xml
diff --git a/linden/indra/newview/skins/xui/de/floater_preview_texture_keep_discard.xml b/linden/indra/newview/skins/default/xui/de/floater_preview_texture_keep_discard.xml
index beca693..beca693 100644
--- a/linden/indra/newview/skins/xui/de/floater_preview_texture_keep_discard.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_preview_texture_keep_discard.xml
diff --git a/linden/indra/newview/skins/xui/de/floater_preview_url.xml b/linden/indra/newview/skins/default/xui/de/floater_preview_url.xml
index 44b5351..44b5351 100644
--- a/linden/indra/newview/skins/xui/de/floater_preview_url.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_preview_url.xml
diff --git a/linden/indra/newview/skins/xui/de/floater_price_for_listing.xml b/linden/indra/newview/skins/default/xui/de/floater_price_for_listing.xml
index de9f56e..de9f56e 100644
--- a/linden/indra/newview/skins/xui/de/floater_price_for_listing.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_price_for_listing.xml
diff --git a/linden/indra/newview/skins/xui/de/floater_profile.xml b/linden/indra/newview/skins/default/xui/de/floater_profile.xml
index 60c728b..60c728b 100644
--- a/linden/indra/newview/skins/xui/de/floater_profile.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_profile.xml
diff --git a/linden/indra/newview/skins/xui/de/floater_region_info.xml b/linden/indra/newview/skins/default/xui/de/floater_region_info.xml
index fe87232..fe87232 100644
--- a/linden/indra/newview/skins/xui/de/floater_region_info.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_region_info.xml
diff --git a/linden/indra/newview/skins/xui/de/floater_report_abuse.xml b/linden/indra/newview/skins/default/xui/de/floater_report_abuse.xml
index 2c92e70..2c92e70 100644
--- a/linden/indra/newview/skins/xui/de/floater_report_abuse.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_report_abuse.xml
diff --git a/linden/indra/newview/skins/xui/de/floater_report_bug.xml b/linden/indra/newview/skins/default/xui/de/floater_report_bug.xml
index 1e8cae5..1e8cae5 100644
--- a/linden/indra/newview/skins/xui/de/floater_report_bug.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_report_bug.xml
diff --git a/linden/indra/newview/skins/xui/de/floater_script_debug.xml b/linden/indra/newview/skins/default/xui/de/floater_script_debug.xml
index f8c1543..f8c1543 100644
--- a/linden/indra/newview/skins/xui/de/floater_script_debug.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_script_debug.xml
diff --git a/linden/indra/newview/skins/xui/de/floater_script_ed_panel.xml b/linden/indra/newview/skins/default/xui/de/floater_script_ed_panel.xml
index db48c1c..db48c1c 100644
--- a/linden/indra/newview/skins/xui/de/floater_script_ed_panel.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_script_ed_panel.xml
diff --git a/linden/indra/newview/skins/xui/de/floater_script_preview.xml b/linden/indra/newview/skins/default/xui/de/floater_script_preview.xml
index b5312e3..b5312e3 100644
--- a/linden/indra/newview/skins/xui/de/floater_script_preview.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_script_preview.xml
diff --git a/linden/indra/newview/skins/xui/de/floater_script_queue.xml b/linden/indra/newview/skins/default/xui/de/floater_script_queue.xml
index b2a1b13..b2a1b13 100644
--- a/linden/indra/newview/skins/xui/de/floater_script_queue.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_script_queue.xml
diff --git a/linden/indra/newview/skins/xui/de/floater_script_search.xml b/linden/indra/newview/skins/default/xui/de/floater_script_search.xml
index 54045ed..54045ed 100644
--- a/linden/indra/newview/skins/xui/de/floater_script_search.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_script_search.xml
diff --git a/linden/indra/newview/skins/xui/de/floater_select_key.xml b/linden/indra/newview/skins/default/xui/de/floater_select_key.xml
index a860e66..a860e66 100644
--- a/linden/indra/newview/skins/xui/de/floater_select_key.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_select_key.xml
diff --git a/linden/indra/newview/skins/xui/de/floater_sell_land.xml b/linden/indra/newview/skins/default/xui/de/floater_sell_land.xml
index d744c98..d744c98 100644
--- a/linden/indra/newview/skins/xui/de/floater_sell_land.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_sell_land.xml
diff --git a/linden/indra/newview/skins/xui/de/floater_settings_debug.xml b/linden/indra/newview/skins/default/xui/de/floater_settings_debug.xml
index 659207d..659207d 100644
--- a/linden/indra/newview/skins/xui/de/floater_settings_debug.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_settings_debug.xml
diff --git a/linden/indra/newview/skins/xui/de/floater_sim_release_message.xml b/linden/indra/newview/skins/default/xui/de/floater_sim_release_message.xml
index 67b7d45..67b7d45 100644
--- a/linden/indra/newview/skins/xui/de/floater_sim_release_message.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_sim_release_message.xml
diff --git a/linden/indra/newview/skins/xui/de/floater_snapshot.xml b/linden/indra/newview/skins/default/xui/de/floater_snapshot.xml
index 70d09ec..70d09ec 100644
--- a/linden/indra/newview/skins/xui/de/floater_snapshot.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_snapshot.xml
diff --git a/linden/indra/newview/skins/xui/de/floater_sound_preview.xml b/linden/indra/newview/skins/default/xui/de/floater_sound_preview.xml
index cf2c979..cf2c979 100644
--- a/linden/indra/newview/skins/xui/de/floater_sound_preview.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_sound_preview.xml
diff --git a/linden/indra/newview/skins/xui/de/floater_telehub.xml b/linden/indra/newview/skins/default/xui/de/floater_telehub.xml
index 091f803..091f803 100644
--- a/linden/indra/newview/skins/xui/de/floater_telehub.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_telehub.xml
diff --git a/linden/indra/newview/skins/xui/de/floater_test.xml b/linden/indra/newview/skins/default/xui/de/floater_test.xml
index 923c396..923c396 100644
--- a/linden/indra/newview/skins/xui/de/floater_test.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_test.xml
diff --git a/linden/indra/newview/skins/xui/de/floater_texture_ctrl.xml b/linden/indra/newview/skins/default/xui/de/floater_texture_ctrl.xml
index 4aa7db4..4aa7db4 100644
--- a/linden/indra/newview/skins/xui/de/floater_texture_ctrl.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_texture_ctrl.xml
diff --git a/linden/indra/newview/skins/xui/de/floater_tools.xml b/linden/indra/newview/skins/default/xui/de/floater_tools.xml
index 8edb0d4..8edb0d4 100644
--- a/linden/indra/newview/skins/xui/de/floater_tools.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_tools.xml
diff --git a/linden/indra/newview/skins/xui/de/floater_top_objects.xml b/linden/indra/newview/skins/default/xui/de/floater_top_objects.xml
index e13ccfe..e13ccfe 100644
--- a/linden/indra/newview/skins/xui/de/floater_top_objects.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_top_objects.xml
diff --git a/linden/indra/newview/skins/xui/de/floater_tos.xml b/linden/indra/newview/skins/default/xui/de/floater_tos.xml
index de58220..de58220 100644
--- a/linden/indra/newview/skins/xui/de/floater_tos.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_tos.xml
diff --git a/linden/indra/newview/skins/xui/de/floater_url_entry.xml b/linden/indra/newview/skins/default/xui/de/floater_url_entry.xml
index 370b4f0..370b4f0 100644
--- a/linden/indra/newview/skins/xui/de/floater_url_entry.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_url_entry.xml
diff --git a/linden/indra/newview/skins/xui/de/floater_voice_wizard.xml b/linden/indra/newview/skins/default/xui/de/floater_voice_wizard.xml
index d2502db..d2502db 100644
--- a/linden/indra/newview/skins/xui/de/floater_voice_wizard.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_voice_wizard.xml
diff --git a/linden/indra/newview/skins/xui/de/floater_water.xml b/linden/indra/newview/skins/default/xui/de/floater_water.xml
index efd606c..efd606c 100644
--- a/linden/indra/newview/skins/xui/de/floater_water.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_water.xml
diff --git a/linden/indra/newview/skins/xui/de/floater_wearable_save_as.xml b/linden/indra/newview/skins/default/xui/de/floater_wearable_save_as.xml
index 89e351e..89e351e 100644
--- a/linden/indra/newview/skins/xui/de/floater_wearable_save_as.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_wearable_save_as.xml
diff --git a/linden/indra/newview/skins/xui/de/floater_windlight_options.xml b/linden/indra/newview/skins/default/xui/de/floater_windlight_options.xml
index b875126..b875126 100644
--- a/linden/indra/newview/skins/xui/de/floater_windlight_options.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_windlight_options.xml
diff --git a/linden/indra/newview/skins/xui/de/floater_world_map.xml b/linden/indra/newview/skins/default/xui/de/floater_world_map.xml
index c3d203d..c3d203d 100644
--- a/linden/indra/newview/skins/xui/de/floater_world_map.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_world_map.xml
diff --git a/linden/indra/newview/skins/xui/de/menu_inventory.xml b/linden/indra/newview/skins/default/xui/de/menu_inventory.xml
index 97b47dd..97b47dd 100644
--- a/linden/indra/newview/skins/xui/de/menu_inventory.xml
+++ b/linden/indra/newview/skins/default/xui/de/menu_inventory.xml
diff --git a/linden/indra/newview/skins/xui/de/menu_login.xml b/linden/indra/newview/skins/default/xui/de/menu_login.xml
index 8662963..8662963 100644
--- a/linden/indra/newview/skins/xui/de/menu_login.xml
+++ b/linden/indra/newview/skins/default/xui/de/menu_login.xml
diff --git a/linden/indra/newview/skins/xui/de/menu_pie_attachment.xml b/linden/indra/newview/skins/default/xui/de/menu_pie_attachment.xml
index 6e31eda..6e31eda 100644
--- a/linden/indra/newview/skins/xui/de/menu_pie_attachment.xml
+++ b/linden/indra/newview/skins/default/xui/de/menu_pie_attachment.xml
diff --git a/linden/indra/newview/skins/xui/de/menu_pie_avatar.xml b/linden/indra/newview/skins/default/xui/de/menu_pie_avatar.xml
index 9fc0fa6..9fc0fa6 100644
--- a/linden/indra/newview/skins/xui/de/menu_pie_avatar.xml
+++ b/linden/indra/newview/skins/default/xui/de/menu_pie_avatar.xml
diff --git a/linden/indra/newview/skins/xui/de/menu_pie_land.xml b/linden/indra/newview/skins/default/xui/de/menu_pie_land.xml
index 6c2d39d..6c2d39d 100644
--- a/linden/indra/newview/skins/xui/de/menu_pie_land.xml
+++ b/linden/indra/newview/skins/default/xui/de/menu_pie_land.xml
diff --git a/linden/indra/newview/skins/xui/de/menu_pie_object.xml b/linden/indra/newview/skins/default/xui/de/menu_pie_object.xml
index 935a138..935a138 100644
--- a/linden/indra/newview/skins/xui/de/menu_pie_object.xml
+++ b/linden/indra/newview/skins/default/xui/de/menu_pie_object.xml
diff --git a/linden/indra/newview/skins/xui/de/menu_pie_self.xml b/linden/indra/newview/skins/default/xui/de/menu_pie_self.xml
index 87350ee..87350ee 100644
--- a/linden/indra/newview/skins/xui/de/menu_pie_self.xml
+++ b/linden/indra/newview/skins/default/xui/de/menu_pie_self.xml
diff --git a/linden/indra/newview/skins/xui/de/menu_slurl.xml b/linden/indra/newview/skins/default/xui/de/menu_slurl.xml
index 13b91b5..13b91b5 100644
--- a/linden/indra/newview/skins/xui/de/menu_slurl.xml
+++ b/linden/indra/newview/skins/default/xui/de/menu_slurl.xml
diff --git a/linden/indra/newview/skins/xui/de/menu_viewer.xml b/linden/indra/newview/skins/default/xui/de/menu_viewer.xml
index c7d20e7..c7d20e7 100644
--- a/linden/indra/newview/skins/xui/de/menu_viewer.xml
+++ b/linden/indra/newview/skins/default/xui/de/menu_viewer.xml
diff --git a/linden/indra/newview/skins/xui/de/mime_types.xml b/linden/indra/newview/skins/default/xui/de/mime_types.xml
index 03fd660..03fd660 100644
--- a/linden/indra/newview/skins/xui/de/mime_types.xml
+++ b/linden/indra/newview/skins/default/xui/de/mime_types.xml
diff --git a/linden/indra/newview/skins/xui/de/need_to_long.xml b/linden/indra/newview/skins/default/xui/de/need_to_long.xml
index 608a2e6..608a2e6 100644
--- a/linden/indra/newview/skins/xui/de/need_to_long.xml
+++ b/linden/indra/newview/skins/default/xui/de/need_to_long.xml
diff --git a/linden/indra/newview/skins/xui/de/need_to_translate.xml b/linden/indra/newview/skins/default/xui/de/need_to_translate.xml
index 9dfa30b..9dfa30b 100644
--- a/linden/indra/newview/skins/xui/de/need_to_translate.xml
+++ b/linden/indra/newview/skins/default/xui/de/need_to_translate.xml
diff --git a/linden/indra/newview/skins/xui/de/need_to_update.xml b/linden/indra/newview/skins/default/xui/de/need_to_update.xml
index 87b80a4..87b80a4 100644
--- a/linden/indra/newview/skins/xui/de/need_to_update.xml
+++ b/linden/indra/newview/skins/default/xui/de/need_to_update.xml
diff --git a/linden/indra/newview/skins/xui/de/notify.xml b/linden/indra/newview/skins/default/xui/de/notify.xml
index f22acd9..f22acd9 100644
--- a/linden/indra/newview/skins/xui/de/notify.xml
+++ b/linden/indra/newview/skins/default/xui/de/notify.xml
diff --git a/linden/indra/newview/skins/xui/de/panel_audio.xml b/linden/indra/newview/skins/default/xui/de/panel_audio.xml
index b3036d3..b3036d3 100644
--- a/linden/indra/newview/skins/xui/de/panel_audio.xml
+++ b/linden/indra/newview/skins/default/xui/de/panel_audio.xml
diff --git a/linden/indra/newview/skins/xui/de/panel_audio_device.xml b/linden/indra/newview/skins/default/xui/de/panel_audio_device.xml
index 006d768..006d768 100644
--- a/linden/indra/newview/skins/xui/de/panel_audio_device.xml
+++ b/linden/indra/newview/skins/default/xui/de/panel_audio_device.xml
diff --git a/linden/indra/newview/skins/xui/de/panel_avatar.xml b/linden/indra/newview/skins/default/xui/de/panel_avatar.xml
index a8498a5..a8498a5 100644
--- a/linden/indra/newview/skins/xui/de/panel_avatar.xml
+++ b/linden/indra/newview/skins/default/xui/de/panel_avatar.xml
diff --git a/linden/indra/newview/skins/xui/de/panel_avatar_classified.xml b/linden/indra/newview/skins/default/xui/de/panel_avatar_classified.xml
index 237fe27..237fe27 100644
--- a/linden/indra/newview/skins/xui/de/panel_avatar_classified.xml
+++ b/linden/indra/newview/skins/default/xui/de/panel_avatar_classified.xml
diff --git a/linden/indra/newview/skins/xui/de/panel_avatar_pick.xml b/linden/indra/newview/skins/default/xui/de/panel_avatar_pick.xml
index cf5ece0..cf5ece0 100644
--- a/linden/indra/newview/skins/xui/de/panel_avatar_pick.xml
+++ b/linden/indra/newview/skins/default/xui/de/panel_avatar_pick.xml
diff --git a/linden/indra/newview/skins/xui/de/panel_chat_bar.xml b/linden/indra/newview/skins/default/xui/de/panel_chat_bar.xml
index 36037de..36037de 100644
--- a/linden/indra/newview/skins/xui/de/panel_chat_bar.xml
+++ b/linden/indra/newview/skins/default/xui/de/panel_chat_bar.xml
diff --git a/linden/indra/newview/skins/xui/de/panel_classified.xml b/linden/indra/newview/skins/default/xui/de/panel_classified.xml
index acdcb13..acdcb13 100644
--- a/linden/indra/newview/skins/xui/de/panel_classified.xml
+++ b/linden/indra/newview/skins/default/xui/de/panel_classified.xml
diff --git a/linden/indra/newview/skins/xui/de/panel_event.xml b/linden/indra/newview/skins/default/xui/de/panel_event.xml
index 97d1bd2..97d1bd2 100644
--- a/linden/indra/newview/skins/xui/de/panel_event.xml
+++ b/linden/indra/newview/skins/default/xui/de/panel_event.xml
diff --git a/linden/indra/newview/skins/xui/de/panel_friends.xml b/linden/indra/newview/skins/default/xui/de/panel_friends.xml
index e82aa07..e82aa07 100644
--- a/linden/indra/newview/skins/xui/de/panel_friends.xml
+++ b/linden/indra/newview/skins/default/xui/de/panel_friends.xml
diff --git a/linden/indra/newview/skins/xui/de/panel_group.xml b/linden/indra/newview/skins/default/xui/de/panel_group.xml
index f7b1afe..f7b1afe 100644
--- a/linden/indra/newview/skins/xui/de/panel_group.xml
+++ b/linden/indra/newview/skins/default/xui/de/panel_group.xml
diff --git a/linden/indra/newview/skins/xui/de/panel_group_finder.xml b/linden/indra/newview/skins/default/xui/de/panel_group_finder.xml
index 0a3afe6..0a3afe6 100644
--- a/linden/indra/newview/skins/xui/de/panel_group_finder.xml
+++ b/linden/indra/newview/skins/default/xui/de/panel_group_finder.xml
diff --git a/linden/indra/newview/skins/xui/de/panel_group_general.xml b/linden/indra/newview/skins/default/xui/de/panel_group_general.xml
index 0a32de2..0a32de2 100644
--- a/linden/indra/newview/skins/xui/de/panel_group_general.xml
+++ b/linden/indra/newview/skins/default/xui/de/panel_group_general.xml
diff --git a/linden/indra/newview/skins/xui/de/panel_group_invite.xml b/linden/indra/newview/skins/default/xui/de/panel_group_invite.xml
index 0ad1aeb..0ad1aeb 100644
--- a/linden/indra/newview/skins/xui/de/panel_group_invite.xml
+++ b/linden/indra/newview/skins/default/xui/de/panel_group_invite.xml
diff --git a/linden/indra/newview/skins/xui/de/panel_group_land_money.xml b/linden/indra/newview/skins/default/xui/de/panel_group_land_money.xml
index cf11e3c..cf11e3c 100644
--- a/linden/indra/newview/skins/xui/de/panel_group_land_money.xml
+++ b/linden/indra/newview/skins/default/xui/de/panel_group_land_money.xml
diff --git a/linden/indra/newview/skins/xui/de/panel_group_notices.xml b/linden/indra/newview/skins/default/xui/de/panel_group_notices.xml
index 56a384b..56a384b 100644
--- a/linden/indra/newview/skins/xui/de/panel_group_notices.xml
+++ b/linden/indra/newview/skins/default/xui/de/panel_group_notices.xml
diff --git a/linden/indra/newview/skins/xui/de/panel_group_roles.xml b/linden/indra/newview/skins/default/xui/de/panel_group_roles.xml
index 9a478f1..9a478f1 100644
--- a/linden/indra/newview/skins/xui/de/panel_group_roles.xml
+++ b/linden/indra/newview/skins/default/xui/de/panel_group_roles.xml
diff --git a/linden/indra/newview/skins/xui/de/panel_group_voting.xml b/linden/indra/newview/skins/default/xui/de/panel_group_voting.xml
index 1f4480d..1f4480d 100644
--- a/linden/indra/newview/skins/xui/de/panel_group_voting.xml
+++ b/linden/indra/newview/skins/default/xui/de/panel_group_voting.xml
diff --git a/linden/indra/newview/skins/xui/de/panel_groups.xml b/linden/indra/newview/skins/default/xui/de/panel_groups.xml
index 00148d1..00148d1 100644
--- a/linden/indra/newview/skins/xui/de/panel_groups.xml
+++ b/linden/indra/newview/skins/default/xui/de/panel_groups.xml
diff --git a/linden/indra/newview/skins/xui/de/panel_land_covenant.xml b/linden/indra/newview/skins/default/xui/de/panel_land_covenant.xml
index 9df0042..9df0042 100644
--- a/linden/indra/newview/skins/xui/de/panel_land_covenant.xml
+++ b/linden/indra/newview/skins/default/xui/de/panel_land_covenant.xml
diff --git a/linden/indra/newview/skins/xui/de/panel_login.xml b/linden/indra/newview/skins/default/xui/de/panel_login.xml
index ac08744..ac08744 100644
--- a/linden/indra/newview/skins/xui/de/panel_login.xml
+++ b/linden/indra/newview/skins/default/xui/de/panel_login.xml
diff --git a/linden/indra/newview/skins/xui/de/panel_master_volume.xml b/linden/indra/newview/skins/default/xui/de/panel_master_volume.xml
index 4562557..4562557 100644
--- a/linden/indra/newview/skins/xui/de/panel_master_volume.xml
+++ b/linden/indra/newview/skins/default/xui/de/panel_master_volume.xml
diff --git a/linden/indra/newview/skins/xui/de/panel_media_controls.xml b/linden/indra/newview/skins/default/xui/de/panel_media_controls.xml
index 748e291..748e291 100644
--- a/linden/indra/newview/skins/xui/de/panel_media_controls.xml
+++ b/linden/indra/newview/skins/default/xui/de/panel_media_controls.xml
diff --git a/linden/indra/newview/skins/xui/de/panel_media_remote.xml b/linden/indra/newview/skins/default/xui/de/panel_media_remote.xml
index e92e475..e92e475 100644
--- a/linden/indra/newview/skins/xui/de/panel_media_remote.xml
+++ b/linden/indra/newview/skins/default/xui/de/panel_media_remote.xml
diff --git a/linden/indra/newview/skins/xui/de/panel_media_remote_expanded.xml b/linden/indra/newview/skins/default/xui/de/panel_media_remote_expanded.xml
index 0e047a5..0e047a5 100644
--- a/linden/indra/newview/skins/xui/de/panel_media_remote_expanded.xml
+++ b/linden/indra/newview/skins/default/xui/de/panel_media_remote_expanded.xml
diff --git a/linden/indra/newview/skins/xui/de/panel_overlaybar.xml b/linden/indra/newview/skins/default/xui/de/panel_overlaybar.xml
index 41f6ea0..41f6ea0 100644
--- a/linden/indra/newview/skins/xui/de/panel_overlaybar.xml
+++ b/linden/indra/newview/skins/default/xui/de/panel_overlaybar.xml
diff --git a/linden/indra/newview/skins/xui/de/panel_place.xml b/linden/indra/newview/skins/default/xui/de/panel_place.xml
index db97d05..db97d05 100644
--- a/linden/indra/newview/skins/xui/de/panel_place.xml
+++ b/linden/indra/newview/skins/default/xui/de/panel_place.xml
diff --git a/linden/indra/newview/skins/xui/de/panel_place_small.xml b/linden/indra/newview/skins/default/xui/de/panel_place_small.xml
index 2fe7417..2fe7417 100644
--- a/linden/indra/newview/skins/xui/de/panel_place_small.xml
+++ b/linden/indra/newview/skins/default/xui/de/panel_place_small.xml
diff --git a/linden/indra/newview/skins/xui/de/panel_preferences_LCD.xml b/linden/indra/newview/skins/default/xui/de/panel_preferences_LCD.xml
index 6438fe6..6438fe6 100644
--- a/linden/indra/newview/skins/xui/de/panel_preferences_LCD.xml
+++ b/linden/indra/newview/skins/default/xui/de/panel_preferences_LCD.xml
diff --git a/linden/indra/newview/skins/xui/de/panel_preferences_audio.xml b/linden/indra/newview/skins/default/xui/de/panel_preferences_audio.xml
index 9bbe83f..9bbe83f 100644
--- a/linden/indra/newview/skins/xui/de/panel_preferences_audio.xml
+++ b/linden/indra/newview/skins/default/xui/de/panel_preferences_audio.xml
diff --git a/linden/indra/newview/skins/xui/de/panel_preferences_chat.xml b/linden/indra/newview/skins/default/xui/de/panel_preferences_chat.xml
index 036b916..036b916 100644
--- a/linden/indra/newview/skins/xui/de/panel_preferences_chat.xml
+++ b/linden/indra/newview/skins/default/xui/de/panel_preferences_chat.xml
diff --git a/linden/indra/newview/skins/xui/de/panel_preferences_general.xml b/linden/indra/newview/skins/default/xui/de/panel_preferences_general.xml
index 26e8459..26e8459 100644
--- a/linden/indra/newview/skins/xui/de/panel_preferences_general.xml
+++ b/linden/indra/newview/skins/default/xui/de/panel_preferences_general.xml
diff --git a/linden/indra/newview/skins/xui/de/panel_preferences_graphics1.xml b/linden/indra/newview/skins/default/xui/de/panel_preferences_graphics1.xml
index bc40ec0..bc40ec0 100644
--- a/linden/indra/newview/skins/xui/de/panel_preferences_graphics1.xml
+++ b/linden/indra/newview/skins/default/xui/de/panel_preferences_graphics1.xml
diff --git a/linden/indra/newview/skins/xui/de/panel_preferences_im.xml b/linden/indra/newview/skins/default/xui/de/panel_preferences_im.xml
index 58f874e..58f874e 100644
--- a/linden/indra/newview/skins/xui/de/panel_preferences_im.xml
+++ b/linden/indra/newview/skins/default/xui/de/panel_preferences_im.xml
diff --git a/linden/indra/newview/skins/xui/de/panel_preferences_input.xml b/linden/indra/newview/skins/default/xui/de/panel_preferences_input.xml
index 96a203b..96a203b 100644
--- a/linden/indra/newview/skins/xui/de/panel_preferences_input.xml
+++ b/linden/indra/newview/skins/default/xui/de/panel_preferences_input.xml
diff --git a/linden/indra/newview/skins/xui/de/panel_preferences_network.xml b/linden/indra/newview/skins/default/xui/de/panel_preferences_network.xml
index 5fb2173..5fb2173 100644
--- a/linden/indra/newview/skins/xui/de/panel_preferences_network.xml
+++ b/linden/indra/newview/skins/default/xui/de/panel_preferences_network.xml
diff --git a/linden/indra/newview/skins/xui/de/panel_preferences_popups.xml b/linden/indra/newview/skins/default/xui/de/panel_preferences_popups.xml
index 6c38032..6c38032 100644
--- a/linden/indra/newview/skins/xui/de/panel_preferences_popups.xml
+++ b/linden/indra/newview/skins/default/xui/de/panel_preferences_popups.xml
diff --git a/linden/indra/newview/skins/xui/de/panel_preferences_voice.xml b/linden/indra/newview/skins/default/xui/de/panel_preferences_voice.xml
index 137ce6d..137ce6d 100644
--- a/linden/indra/newview/skins/xui/de/panel_preferences_voice.xml
+++ b/linden/indra/newview/skins/default/xui/de/panel_preferences_voice.xml
diff --git a/linden/indra/newview/skins/xui/de/panel_preferences_web.xml b/linden/indra/newview/skins/default/xui/de/panel_preferences_web.xml
index ce44ba6..ce44ba6 100644
--- a/linden/indra/newview/skins/xui/de/panel_preferences_web.xml
+++ b/linden/indra/newview/skins/default/xui/de/panel_preferences_web.xml
diff --git a/linden/indra/newview/skins/xui/de/panel_region_covenant.xml b/linden/indra/newview/skins/default/xui/de/panel_region_covenant.xml
index 8f1f1c2..8f1f1c2 100644
--- a/linden/indra/newview/skins/xui/de/panel_region_covenant.xml
+++ b/linden/indra/newview/skins/default/xui/de/panel_region_covenant.xml
diff --git a/linden/indra/newview/skins/xui/de/panel_region_debug.xml b/linden/indra/newview/skins/default/xui/de/panel_region_debug.xml
index e31754d..e31754d 100644
--- a/linden/indra/newview/skins/xui/de/panel_region_debug.xml
+++ b/linden/indra/newview/skins/default/xui/de/panel_region_debug.xml
diff --git a/linden/indra/newview/skins/xui/de/panel_region_estate.xml b/linden/indra/newview/skins/default/xui/de/panel_region_estate.xml
index dec1bb3..dec1bb3 100644
--- a/linden/indra/newview/skins/xui/de/panel_region_estate.xml
+++ b/linden/indra/newview/skins/default/xui/de/panel_region_estate.xml
diff --git a/linden/indra/newview/skins/xui/de/panel_region_general.xml b/linden/indra/newview/skins/default/xui/de/panel_region_general.xml
index ec4561f..ec4561f 100644
--- a/linden/indra/newview/skins/xui/de/panel_region_general.xml
+++ b/linden/indra/newview/skins/default/xui/de/panel_region_general.xml
diff --git a/linden/indra/newview/skins/xui/de/panel_region_terrain.xml b/linden/indra/newview/skins/default/xui/de/panel_region_terrain.xml
index e79c858..e79c858 100644
--- a/linden/indra/newview/skins/xui/de/panel_region_terrain.xml
+++ b/linden/indra/newview/skins/default/xui/de/panel_region_terrain.xml
diff --git a/linden/indra/newview/skins/xui/de/panel_region_texture.xml b/linden/indra/newview/skins/default/xui/de/panel_region_texture.xml
index df936ff..df936ff 100644
--- a/linden/indra/newview/skins/xui/de/panel_region_texture.xml
+++ b/linden/indra/newview/skins/default/xui/de/panel_region_texture.xml
diff --git a/linden/indra/newview/skins/xui/de/panel_scrolling_param.xml b/linden/indra/newview/skins/default/xui/de/panel_scrolling_param.xml
index d51fda0..d51fda0 100644
--- a/linden/indra/newview/skins/xui/de/panel_scrolling_param.xml
+++ b/linden/indra/newview/skins/default/xui/de/panel_scrolling_param.xml
diff --git a/linden/indra/newview/skins/xui/de/panel_speaker_controls.xml b/linden/indra/newview/skins/default/xui/de/panel_speaker_controls.xml
index 2a98a9a..2a98a9a 100644
--- a/linden/indra/newview/skins/xui/de/panel_speaker_controls.xml
+++ b/linden/indra/newview/skins/default/xui/de/panel_speaker_controls.xml
diff --git a/linden/indra/newview/skins/xui/de/panel_status_bar.xml b/linden/indra/newview/skins/default/xui/de/panel_status_bar.xml
index d0c3460..d0c3460 100644
--- a/linden/indra/newview/skins/xui/de/panel_status_bar.xml
+++ b/linden/indra/newview/skins/default/xui/de/panel_status_bar.xml
diff --git a/linden/indra/newview/skins/xui/de/panel_toolbar.xml b/linden/indra/newview/skins/default/xui/de/panel_toolbar.xml
index ea8b87a..ea8b87a 100644
--- a/linden/indra/newview/skins/xui/de/panel_toolbar.xml
+++ b/linden/indra/newview/skins/default/xui/de/panel_toolbar.xml
diff --git a/linden/indra/newview/skins/xui/de/panel_top_pick.xml b/linden/indra/newview/skins/default/xui/de/panel_top_pick.xml
index 4b961cb..4b961cb 100644
--- a/linden/indra/newview/skins/xui/de/panel_top_pick.xml
+++ b/linden/indra/newview/skins/default/xui/de/panel_top_pick.xml
diff --git a/linden/indra/newview/skins/xui/de/panel_voice_controls.xml b/linden/indra/newview/skins/default/xui/de/panel_voice_controls.xml
index 80eb0e7..80eb0e7 100644
--- a/linden/indra/newview/skins/xui/de/panel_voice_controls.xml
+++ b/linden/indra/newview/skins/default/xui/de/panel_voice_controls.xml
diff --git a/linden/indra/newview/skins/xui/de/panel_voice_enable.xml b/linden/indra/newview/skins/default/xui/de/panel_voice_enable.xml
index ab10218..ab10218 100644
--- a/linden/indra/newview/skins/xui/de/panel_voice_enable.xml
+++ b/linden/indra/newview/skins/default/xui/de/panel_voice_enable.xml
diff --git a/linden/indra/newview/skins/xui/de/panel_voice_options.xml b/linden/indra/newview/skins/default/xui/de/panel_voice_options.xml
index f9cfba7..f9cfba7 100644
--- a/linden/indra/newview/skins/xui/de/panel_voice_options.xml
+++ b/linden/indra/newview/skins/default/xui/de/panel_voice_options.xml
diff --git a/linden/indra/newview/skins/xui/de/panel_voice_remote.xml b/linden/indra/newview/skins/default/xui/de/panel_voice_remote.xml
index 143915b..143915b 100644
--- a/linden/indra/newview/skins/xui/de/panel_voice_remote.xml
+++ b/linden/indra/newview/skins/default/xui/de/panel_voice_remote.xml
diff --git a/linden/indra/newview/skins/xui/de/panel_voice_remote_expanded.xml b/linden/indra/newview/skins/default/xui/de/panel_voice_remote_expanded.xml
index 6ba1d9b..6ba1d9b 100644
--- a/linden/indra/newview/skins/xui/de/panel_voice_remote_expanded.xml
+++ b/linden/indra/newview/skins/default/xui/de/panel_voice_remote_expanded.xml
diff --git a/linden/indra/newview/skins/xui/de/role_actions.xml b/linden/indra/newview/skins/default/xui/de/role_actions.xml
index c46fa0d..c46fa0d 100644
--- a/linden/indra/newview/skins/xui/de/role_actions.xml
+++ b/linden/indra/newview/skins/default/xui/de/role_actions.xml
diff --git a/linden/indra/newview/skins/xui/de/strings.xml b/linden/indra/newview/skins/default/xui/de/strings.xml
index be64d7f..be64d7f 100644
--- a/linden/indra/newview/skins/xui/de/strings.xml
+++ b/linden/indra/newview/skins/default/xui/de/strings.xml
diff --git a/linden/indra/newview/skins/xui/de/teleport_strings.xml b/linden/indra/newview/skins/default/xui/de/teleport_strings.xml
index 6beba54..6beba54 100644
--- a/linden/indra/newview/skins/xui/de/teleport_strings.xml
+++ b/linden/indra/newview/skins/default/xui/de/teleport_strings.xml
diff --git a/linden/indra/newview/skins/xui/de/xui_version.xml b/linden/indra/newview/skins/default/xui/de/xui_version.xml
index 0e77775..0e77775 100644
--- a/linden/indra/newview/skins/xui/de/xui_version.xml
+++ b/linden/indra/newview/skins/default/xui/de/xui_version.xml
diff --git a/linden/indra/newview/skins/xui/en-us/LCD_text.xml b/linden/indra/newview/skins/default/xui/en-us/LCD_text.xml
index b9c1200..b9c1200 100644
--- a/linden/indra/newview/skins/xui/en-us/LCD_text.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/LCD_text.xml
diff --git a/linden/indra/newview/skins/xui/en-us/alerts.xml b/linden/indra/newview/skins/default/xui/en-us/alerts.xml
index 08a316a..89662ea 100644
--- a/linden/indra/newview/skins/xui/en-us/alerts.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/alerts.xml
@@ -885,7 +885,12 @@ Note: This will clear the cache.
                         Port settings take effect after you restart [SECOND_LIFE].
                 </message>
         </alert>
-        <alert modal="true" name="GoToAuctionPage">
+  <alert modal="true" name="ChangeSkin">
+    <message name="message">
+      New skin will appear after you restart [SECOND_LIFE].
+    </message>
+  </alert>
+  <alert modal="true" name="GoToAuctionPage">
                 <message name="message">
                         Go to the [SECOND_LIFE] web page to see auction details
 or make a bid?
diff --git a/linden/indra/newview/skins/xui/en-us/floater_about.xml b/linden/indra/newview/skins/default/xui/en-us/floater_about.xml
index e5f963a..e5f963a 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_about.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_about.xml
diff --git a/linden/indra/newview/skins/xui/en-us/floater_about_land.xml b/linden/indra/newview/skins/default/xui/en-us/floater_about_land.xml
index 1d32b97..262f363 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_about_land.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_about_land.xml
@@ -588,8 +588,8 @@
                                 </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" />
+                             halign="center" height="18" label="?" label_selected="?" left="400"
+                             mouse_opaque="true" name="?" width="18" />
                         <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/xui/en-us/floater_active_speakers.xml b/linden/indra/newview/skins/default/xui/en-us/floater_active_speakers.xml
index 69543b0..69543b0 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_active_speakers.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_active_speakers.xml
diff --git a/linden/indra/newview/skins/xui/en-us/floater_animation_preview.xml b/linden/indra/newview/skins/default/xui/en-us/floater_animation_preview.xml
index f925abd..f925abd 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_animation_preview.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_animation_preview.xml
diff --git a/linden/indra/newview/skins/xui/en-us/floater_auction.xml b/linden/indra/newview/skins/default/xui/en-us/floater_auction.xml
index 4e09f29..4e09f29 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_auction.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_auction.xml
diff --git a/linden/indra/newview/skins/xui/en-us/floater_audio_volume.xml b/linden/indra/newview/skins/default/xui/en-us/floater_audio_volume.xml
index 41dc3eb..41dc3eb 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_audio_volume.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_audio_volume.xml
diff --git a/linden/indra/newview/skins/xui/en-us/floater_avatar_picker.xml b/linden/indra/newview/skins/default/xui/en-us/floater_avatar_picker.xml
index 8e3f822..8e3f822 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_avatar_picker.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_avatar_picker.xml
diff --git a/linden/indra/newview/skins/xui/en-us/floater_avatar_textures.xml b/linden/indra/newview/skins/default/xui/en-us/floater_avatar_textures.xml
index a404dc2..a404dc2 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_avatar_textures.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_avatar_textures.xml
diff --git a/linden/indra/newview/skins/xui/en-us/floater_build_options.xml b/linden/indra/newview/skins/default/xui/en-us/floater_build_options.xml
index 807caa0..807caa0 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_build_options.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_build_options.xml
diff --git a/linden/indra/newview/skins/xui/en-us/floater_bumps.xml b/linden/indra/newview/skins/default/xui/en-us/floater_bumps.xml
index a704fe0..a704fe0 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_bumps.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_bumps.xml
diff --git a/linden/indra/newview/skins/xui/en-us/floater_buy_contents.xml b/linden/indra/newview/skins/default/xui/en-us/floater_buy_contents.xml
index a9acccb..a9acccb 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_buy_contents.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_buy_contents.xml
diff --git a/linden/indra/newview/skins/xui/en-us/floater_buy_currency.xml b/linden/indra/newview/skins/default/xui/en-us/floater_buy_currency.xml
index f592d44..f592d44 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_buy_currency.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_buy_currency.xml
diff --git a/linden/indra/newview/skins/xui/en-us/floater_buy_land.xml b/linden/indra/newview/skins/default/xui/en-us/floater_buy_land.xml
index a7fd3ed..a7fd3ed 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_buy_land.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_buy_land.xml
diff --git a/linden/indra/newview/skins/xui/en-us/floater_buy_object.xml b/linden/indra/newview/skins/default/xui/en-us/floater_buy_object.xml
index 3d30171..3d30171 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_buy_object.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_buy_object.xml
diff --git a/linden/indra/newview/skins/xui/en-us/floater_camera.xml b/linden/indra/newview/skins/default/xui/en-us/floater_camera.xml
index 44e12ef..44e12ef 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_camera.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_camera.xml
diff --git a/linden/indra/newview/skins/xui/en-us/floater_chat_history.xml b/linden/indra/newview/skins/default/xui/en-us/floater_chat_history.xml
index 91f3bdb..91f3bdb 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_chat_history.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_chat_history.xml
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_chatterbox.xml b/linden/indra/newview/skins/default/xui/en-us/floater_chatterbox.xml
new file mode 100644
index 0000000..ea555c0
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_chatterbox.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

+<multi_floater can_close="true" can_drag_on_left="false" can_minimize="true" can_resize="true"

+     height="390" name="floater_chatterbox"

+     rect_control="ChatterboxRect" title="Communicate" width="392">

+<icon enabled="false" image_name="tabarea.tga"

+             bg_alpha_color="blue" color="DefaultShadowLight" border="false"

+             bottom="-388" follows="left|right|bottom" height="17" left="1" scale_image="true"

+             mouse_opaque="false" name="chatterbox_tab_container" width="391"></icon>

+    <tab_container bottom="2" follows="left|right|top|bottom" height="370" left="0"

+             name="chatterbox_tabs" tab_position="bottom" tab_width="80" width="395" />

+</multi_floater>

+

diff --git a/linden/indra/newview/skins/xui/en-us/floater_choose_group.xml b/linden/indra/newview/skins/default/xui/en-us/floater_choose_group.xml
index 02001e9..02001e9 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_choose_group.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_choose_group.xml
diff --git a/linden/indra/newview/skins/xui/en-us/floater_clothing.xml b/linden/indra/newview/skins/default/xui/en-us/floater_clothing.xml
index 3ba01e1..3ba01e1 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_clothing.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_clothing.xml
diff --git a/linden/indra/newview/skins/xui/en-us/floater_color_picker.xml b/linden/indra/newview/skins/default/xui/en-us/floater_color_picker.xml
index dc40144..dc40144 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_color_picker.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_color_picker.xml
diff --git a/linden/indra/newview/skins/xui/en-us/floater_critical.xml b/linden/indra/newview/skins/default/xui/en-us/floater_critical.xml
index 5ce1f5c..5ce1f5c 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_critical.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_critical.xml
diff --git a/linden/indra/newview/skins/xui/en-us/floater_customize.xml b/linden/indra/newview/skins/default/xui/en-us/floater_customize.xml
index e7a7a7b..e7a7a7b 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_customize.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_customize.xml
diff --git a/linden/indra/newview/skins/xui/en-us/floater_day_cycle_options.xml b/linden/indra/newview/skins/default/xui/en-us/floater_day_cycle_options.xml
index 84812b9..84812b9 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_day_cycle_options.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_day_cycle_options.xml
diff --git a/linden/indra/newview/skins/xui/en-us/floater_device_settings.xml b/linden/indra/newview/skins/default/xui/en-us/floater_device_settings.xml
index 6c27707..6c27707 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_device_settings.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_device_settings.xml
diff --git a/linden/indra/newview/skins/xui/en-us/floater_directory.xml b/linden/indra/newview/skins/default/xui/en-us/floater_directory.xml
index 8cfb470..09c4f31 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_directory.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_directory.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="false" height="570" min_height="570" min_width="780"
+     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"
@@ -385,7 +385,6 @@ To buy direct, visit the land and click on the place name in the title bar.
                              font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
                              mouse_opaque="true" name="result_text" v_pad="0" width="328" />
                 </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">
@@ -461,6 +460,7 @@ To buy direct, visit the land and click on the place name in the title bar.
                              name="Search" width="70" />
                         <scroll_list background_visible="true" bottom="-513" column_padding="0" draw_border="true"
                              draw_heading="true" 
+                             
                              follows="left|top|right|bottom" height="464" left="4" mouse_opaque="true"
                              multi_select="false" name="results" search_column="2" width="339">
                                 <column label="" name="icon" width="24" />
@@ -473,7 +473,6 @@ To buy direct, visit the land and click on the place name in the title bar.
                              font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
                              mouse_opaque="true" name="result_text" v_pad="0" width="328" />
                 </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">
@@ -501,8 +500,9 @@ To buy direct, visit the land and click on the place name in the title bar.
       <button bottom="-26" follows="left|top" font="SansSerif" halign="center" height="20"
                              label="Search" label_selected="Search" left_delta="210" mouse_opaque="true"
                              name="Search" width="70" />
-      <scroll_list background_visible="false" bottom="-513" column_padding="0" draw_border="true"
-                             draw_heading="true"
+      <scroll_list background_visible="true" bottom="-513" column_padding="0" draw_border="true"
+                             draw_heading="true" 
+                               
                              follows="left|top|right|bottom" height="464" left="4" mouse_opaque="true"
                              multi_select="false" name="results" search_column="2" width="326">
         <column label="" name="icon" width="24" />
diff --git a/linden/indra/newview/skins/xui/en-us/floater_env_settings.xml b/linden/indra/newview/skins/default/xui/en-us/floater_env_settings.xml
index e2bafbf..68443c5 100644
--- a/linden/indra/newview/skins/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="22" />
+             left="570" name="EnvSettingsHelpButton" width="18" />
 </floater>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_gesture.xml b/linden/indra/newview/skins/default/xui/en-us/floater_gesture.xml
index b8a7174..b8a7174 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_gesture.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_gesture.xml
diff --git a/linden/indra/newview/skins/xui/en-us/floater_god_tools.xml b/linden/indra/newview/skins/default/xui/en-us/floater_god_tools.xml
index ee70387..ee70387 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_god_tools.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_god_tools.xml
diff --git a/linden/indra/newview/skins/xui/en-us/floater_group_info.xml b/linden/indra/newview/skins/default/xui/en-us/floater_group_info.xml
index d0e11d6..d0e11d6 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_group_info.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_group_info.xml
diff --git a/linden/indra/newview/skins/xui/en-us/floater_hardware_settings.xml b/linden/indra/newview/skins/default/xui/en-us/floater_hardware_settings.xml
index 5773142..5773142 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_hardware_settings.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_hardware_settings.xml
diff --git a/linden/indra/newview/skins/xui/en-us/floater_html.xml b/linden/indra/newview/skins/default/xui/en-us/floater_html.xml
index 227e41b..227e41b 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_html.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_html.xml
diff --git a/linden/indra/newview/skins/xui/en-us/floater_hud.xml b/linden/indra/newview/skins/default/xui/en-us/floater_hud.xml
index 2372f3e..2372f3e 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_hud.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_hud.xml
diff --git a/linden/indra/newview/skins/xui/en-us/floater_im.xml b/linden/indra/newview/skins/default/xui/en-us/floater_im.xml
index 11c839c..11c839c 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_im.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_im.xml
diff --git a/linden/indra/newview/skins/xui/en-us/floater_image_preview.xml b/linden/indra/newview/skins/default/xui/en-us/floater_image_preview.xml
index 926e715..926e715 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_image_preview.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_image_preview.xml
diff --git a/linden/indra/newview/skins/xui/en-us/floater_import.xml b/linden/indra/newview/skins/default/xui/en-us/floater_import.xml
index 2e43813..2e43813 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_import.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_import.xml
diff --git a/linden/indra/newview/skins/xui/en-us/floater_inspect.xml b/linden/indra/newview/skins/default/xui/en-us/floater_inspect.xml
index 11f6db3..11f6db3 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_inspect.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_inspect.xml
diff --git a/linden/indra/newview/skins/xui/en-us/floater_instant_message.xml b/linden/indra/newview/skins/default/xui/en-us/floater_instant_message.xml
index cb27be6..cb27be6 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_instant_message.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_instant_message.xml
diff --git a/linden/indra/newview/skins/xui/en-us/floater_instant_message_ad_hoc.xml b/linden/indra/newview/skins/default/xui/en-us/floater_instant_message_ad_hoc.xml
index b47c788..b47c788 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_instant_message_ad_hoc.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_instant_message_ad_hoc.xml
diff --git a/linden/indra/newview/skins/xui/en-us/floater_instant_message_group.xml b/linden/indra/newview/skins/default/xui/en-us/floater_instant_message_group.xml
index 6606980..6606980 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_instant_message_group.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_instant_message_group.xml
diff --git a/linden/indra/newview/skins/xui/en-us/floater_inventory.xml b/linden/indra/newview/skins/default/xui/en-us/floater_inventory.xml
index 1cb1da0..1cb1da0 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_inventory.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_inventory.xml
diff --git a/linden/indra/newview/skins/xui/en-us/floater_inventory_item_properties.xml b/linden/indra/newview/skins/default/xui/en-us/floater_inventory_item_properties.xml
index ce0679c..ce0679c 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_inventory_item_properties.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_inventory_item_properties.xml
diff --git a/linden/indra/newview/skins/xui/en-us/floater_inventory_view_finder.xml b/linden/indra/newview/skins/default/xui/en-us/floater_inventory_view_finder.xml
index 9a9b8db..9a9b8db 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_inventory_view_finder.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_inventory_view_finder.xml
diff --git a/linden/indra/newview/skins/xui/en-us/floater_joystick.xml b/linden/indra/newview/skins/default/xui/en-us/floater_joystick.xml
index 126bc7b..126bc7b 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_joystick.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_joystick.xml
diff --git a/linden/indra/newview/skins/xui/en-us/floater_lagmeter.xml b/linden/indra/newview/skins/default/xui/en-us/floater_lagmeter.xml
index 4fa24dd..4fa24dd 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_lagmeter.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_lagmeter.xml
diff --git a/linden/indra/newview/skins/xui/en-us/floater_land_holdings.xml b/linden/indra/newview/skins/default/xui/en-us/floater_land_holdings.xml
index 19a3d20..19a3d20 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_land_holdings.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_land_holdings.xml
diff --git a/linden/indra/newview/skins/xui/en-us/floater_landmark_ctrl.xml b/linden/indra/newview/skins/default/xui/en-us/floater_landmark_ctrl.xml
index 30c0741..30c0741 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_landmark_ctrl.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_landmark_ctrl.xml
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_live_lsleditor.xml b/linden/indra/newview/skins/default/xui/en-us/floater_live_lsleditor.xml
new file mode 100644
index 0000000..1d4dcb9
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_live_lsleditor.xml
@@ -0,0 +1,20 @@
+<?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" border_drop_shadow_visible="false" border_visible="false" bevel_style="none" border_style="line" border_thickness="0">
+        <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" border_drop_shadow_visible="false" border_visible="false" bevel_style="none" border_style="line" border_thickness="0" />
+        <string name="not_allowed">
+                You are not allowed to view this script.
+        </string>
+        <string name="script_running">
+                Running
+        </string>
+</floater>
\ No newline at end of file
diff --git a/linden/indra/newview/skins/xui/en-us/floater_lsl_guide.xml b/linden/indra/newview/skins/default/xui/en-us/floater_lsl_guide.xml
index 1f25c74..1f25c74 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_lsl_guide.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_lsl_guide.xml
diff --git a/linden/indra/newview/skins/xui/en-us/floater_media_browser.xml b/linden/indra/newview/skins/default/xui/en-us/floater_media_browser.xml
index 5b2d310..5b2d310 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_media_browser.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_media_browser.xml
diff --git a/linden/indra/newview/skins/xui/en-us/floater_moveview.xml b/linden/indra/newview/skins/default/xui/en-us/floater_moveview.xml
index 7add633..7add633 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_moveview.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_moveview.xml
diff --git a/linden/indra/newview/skins/xui/en-us/floater_mute.xml b/linden/indra/newview/skins/default/xui/en-us/floater_mute.xml
index b1ab115..b1ab115 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_mute.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_mute.xml
diff --git a/linden/indra/newview/skins/xui/en-us/floater_mute_object.xml b/linden/indra/newview/skins/default/xui/en-us/floater_mute_object.xml
index 4033058..4033058 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_mute_object.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_mute_object.xml
diff --git a/linden/indra/newview/skins/xui/en-us/floater_my_friends.xml b/linden/indra/newview/skins/default/xui/en-us/floater_my_friends.xml
index 181c7de..181c7de 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_my_friends.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_my_friends.xml
diff --git a/linden/indra/newview/skins/xui/en-us/floater_name_description.xml b/linden/indra/newview/skins/default/xui/en-us/floater_name_description.xml
index 61ac673..61ac673 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_name_description.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_name_description.xml
diff --git a/linden/indra/newview/skins/xui/en-us/floater_new_im.xml b/linden/indra/newview/skins/default/xui/en-us/floater_new_im.xml
index c93b890..c93b890 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_new_im.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_new_im.xml
diff --git a/linden/indra/newview/skins/xui/en-us/floater_new_outfit_dialog.xml b/linden/indra/newview/skins/default/xui/en-us/floater_new_outfit_dialog.xml
index 568f155..568f155 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_new_outfit_dialog.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_new_outfit_dialog.xml
diff --git a/linden/indra/newview/skins/xui/en-us/floater_openobject.xml b/linden/indra/newview/skins/default/xui/en-us/floater_openobject.xml
index c7dd2c1..c7dd2c1 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_openobject.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_openobject.xml
diff --git a/linden/indra/newview/skins/xui/en-us/floater_pay.xml b/linden/indra/newview/skins/default/xui/en-us/floater_pay.xml
index 8f0553d..8f0553d 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_pay.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_pay.xml
diff --git a/linden/indra/newview/skins/xui/en-us/floater_pay_object.xml b/linden/indra/newview/skins/default/xui/en-us/floater_pay_object.xml
index 03e009d..03e009d 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_pay_object.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_pay_object.xml
diff --git a/linden/indra/newview/skins/xui/en-us/floater_post_process.xml b/linden/indra/newview/skins/default/xui/en-us/floater_post_process.xml
index 31691a8..31691a8 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_post_process.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_post_process.xml
diff --git a/linden/indra/newview/skins/xui/en-us/floater_postcard.xml b/linden/indra/newview/skins/default/xui/en-us/floater_postcard.xml
index e688ae3..e688ae3 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_postcard.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_postcard.xml
diff --git a/linden/indra/newview/skins/xui/en-us/floater_preferences.xml b/linden/indra/newview/skins/default/xui/en-us/floater_preferences.xml
index 81168be..81168be 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_preferences.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_preferences.xml
diff --git a/linden/indra/newview/skins/xui/en-us/floater_preview_animation.xml b/linden/indra/newview/skins/default/xui/en-us/floater_preview_animation.xml
index 657898a..657898a 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_preview_animation.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_preview_animation.xml
diff --git a/linden/indra/newview/skins/xui/en-us/floater_preview_classified.xml b/linden/indra/newview/skins/default/xui/en-us/floater_preview_classified.xml
index 3b116b3..3b116b3 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_preview_classified.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_preview_classified.xml
diff --git a/linden/indra/newview/skins/xui/en-us/floater_preview_embedded_texture.xml b/linden/indra/newview/skins/default/xui/en-us/floater_preview_embedded_texture.xml
index a213044..a213044 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_preview_embedded_texture.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_preview_embedded_texture.xml
diff --git a/linden/indra/newview/skins/xui/en-us/floater_preview_event.xml b/linden/indra/newview/skins/default/xui/en-us/floater_preview_event.xml
index 8aab467..8aab467 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_preview_event.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_preview_event.xml
diff --git a/linden/indra/newview/skins/xui/en-us/floater_preview_existing_landmark.xml b/linden/indra/newview/skins/default/xui/en-us/floater_preview_existing_landmark.xml
index efe3aca..efe3aca 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_preview_existing_landmark.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_preview_existing_landmark.xml
diff --git a/linden/indra/newview/skins/xui/en-us/floater_preview_gesture.xml b/linden/indra/newview/skins/default/xui/en-us/floater_preview_gesture.xml
index 25121ff..25121ff 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_preview_gesture.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_preview_gesture.xml
diff --git a/linden/indra/newview/skins/xui/en-us/floater_preview_notecard.xml b/linden/indra/newview/skins/default/xui/en-us/floater_preview_notecard.xml
index 03fc7f6..03fc7f6 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_preview_notecard.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_preview_notecard.xml
diff --git a/linden/indra/newview/skins/xui/en-us/floater_preview_notecard_keep_discard.xml b/linden/indra/newview/skins/default/xui/en-us/floater_preview_notecard_keep_discard.xml
index 32af593..32af593 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_preview_notecard_keep_discard.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_preview_notecard_keep_discard.xml
diff --git a/linden/indra/newview/skins/xui/en-us/floater_preview_sound.xml b/linden/indra/newview/skins/default/xui/en-us/floater_preview_sound.xml
index 9ac36d3..9ac36d3 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_preview_sound.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_preview_sound.xml
diff --git a/linden/indra/newview/skins/xui/en-us/floater_preview_texture.xml b/linden/indra/newview/skins/default/xui/en-us/floater_preview_texture.xml
index f52b1b6..f52b1b6 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_preview_texture.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_preview_texture.xml
diff --git a/linden/indra/newview/skins/xui/en-us/floater_preview_texture_keep_discard.xml b/linden/indra/newview/skins/default/xui/en-us/floater_preview_texture_keep_discard.xml
index 3c4a44d..3c4a44d 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_preview_texture_keep_discard.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_preview_texture_keep_discard.xml
diff --git a/linden/indra/newview/skins/xui/en-us/floater_preview_url.xml b/linden/indra/newview/skins/default/xui/en-us/floater_preview_url.xml
index 055a5fc..055a5fc 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_preview_url.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_preview_url.xml
diff --git a/linden/indra/newview/skins/xui/en-us/floater_price_for_listing.xml b/linden/indra/newview/skins/default/xui/en-us/floater_price_for_listing.xml
index 0e4123c..0e4123c 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_price_for_listing.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_price_for_listing.xml
diff --git a/linden/indra/newview/skins/xui/en-us/floater_profile.xml b/linden/indra/newview/skins/default/xui/en-us/floater_profile.xml
index daf45cf..daf45cf 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_profile.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_profile.xml
diff --git a/linden/indra/newview/skins/xui/en-us/floater_region_info.xml b/linden/indra/newview/skins/default/xui/en-us/floater_region_info.xml
index b0ee0a2..b0ee0a2 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_region_info.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_region_info.xml
diff --git a/linden/indra/newview/skins/xui/en-us/floater_report_abuse.xml b/linden/indra/newview/skins/default/xui/en-us/floater_report_abuse.xml
index 5055885..5055885 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_report_abuse.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_report_abuse.xml
diff --git a/linden/indra/newview/skins/xui/en-us/floater_report_bug.xml b/linden/indra/newview/skins/default/xui/en-us/floater_report_bug.xml
index 9499690..9499690 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_report_bug.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_report_bug.xml
diff --git a/linden/indra/newview/skins/xui/en-us/floater_script_debug.xml b/linden/indra/newview/skins/default/xui/en-us/floater_script_debug.xml
index 2abd503..2abd503 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_script_debug.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_script_debug.xml
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_script_ed_panel.xml b/linden/indra/newview/skins/default/xui/en-us/floater_script_ed_panel.xml
new file mode 100644
index 0000000..72d9c35
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_script_ed_panel.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel bottom="-550" enabled="true" follows="left|top|right|bottom" height="508"
+     left="0" mouse_opaque="true" name="script panel" width="500" border_drop_shadow_visible="false" border_visible="false" bevel_style="none" border_style="line" border_thickness="0">
+        <text_editor type="string" length="1" bottom="-393"
+             embedded_items="false" enabled="true" follows="left|top|right|bottom"
+             font="Monospace" height="376" ignore_tab="false" left="4"
+             max_length="65536" mouse_opaque="true" name="Script Editor" width="492" border_drop_shadow_visible="false" border_visible="false" bevel_style="none" border_style="line" border_thickness="0"
+             word_wrap="true">
+                Loading...
+        </text_editor>
+        <button bottom="-499" enabled="true" follows="right|bottom" font="SansSerif"
+             halign="center" height="20" label="Save" label_selected="Save" left="360"
+             mouse_opaque="true" name="Save_btn" width="128" />
+        <scroll_list background_visible="true" bottom="-457" column_padding="5" draw_border="true"
+             draw_heading="false" draw_stripes="true" enabled="true"
+             follows="left|right|bottom" height="60" left="4" mouse_opaque="true"
+             multi_select="false" name="lsl errors" width="492" />
+        <combo_box allow_text_entry="false" bottom="-499" enabled="true" follows="left|bottom"
+             height="20" label="Insert..." left="12" max_chars="20" mouse_opaque="true"
+             name="Insert..." width="128" />
+        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" bevel_style="none" border_style="line" border_thickness="0"
+             bottom="-473" drop_shadow_visible="true" enabled="true"
+             follows="left|bottom" font="SansSerifSmall" h_pad="0" halign="left"
+             height="12" left="12" mouse_opaque="true" name="line_col" v_pad="0"
+             width="128" />
+        <menu_bar bottom="-18" drop_shadow="false" enabled="true" follows="left|top|right"
+             height="18" left="8" mouse_opaque="false" name="script_menu" opaque="false"
+             tear_off="false" width="476">
+                <menu bottom="0" drop_shadow="true" enabled="true" height="62"
+                     left="0" mouse_opaque="false" name="File" opaque="true" tear_off="false"
+                     width="138">
+                        <menu_item_call bottom_delta="-30" height="20" label="Save" left="0" mouse_opaque="true"
+                             name="Save" width="138" />
+                        <menu_item_separator bottom_delta="-38" height="8" left="0" mouse_opaque="true" name="separator"
+                             width="138" />
+                        <menu_item_call bottom_delta="-58" height="20" label="Revert All Changes" left="0"
+                             mouse_opaque="true" name="Revert All Changes" width="138" />
+                </menu>
+                <menu bottom="665" drop_shadow="true" enabled="true" height="198"
+                     left="222" mouse_opaque="false" name="Edit" opaque="true" tear_off="false"
+                     width="139">
+                        <menu_item_call bottom_delta="-30" enabled="false" height="20" label="Undo" left="0"
+                             mouse_opaque="true" name="Undo" width="139" />
+                        <menu_item_call bottom_delta="-50" enabled="false" height="20" label="Redo" left="0"
+                             mouse_opaque="true" name="Redo" width="139" />
+                        <menu_item_separator bottom_delta="-58" enabled="true" height="8" label="-----------" left="0"
+                             mouse_opaque="true" name="separator" width="139" />
+                        <menu_item_call bottom_delta="-78" enabled="false" height="20" label="Cut" left="0"
+                             mouse_opaque="true" name="Cut" width="139" />
+                        <menu_item_call bottom_delta="-98" enabled="false" height="20" label="Copy" left="0"
+                             mouse_opaque="true" name="Copy" width="139" />
+                        <menu_item_call bottom_delta="-118" enabled="false" height="20" label="Paste" left="0"
+                             mouse_opaque="true" name="Paste" width="139" />
+                        <menu_item_separator bottom_delta="-126" enabled="true" height="8" label="-----------" left="0"
+                             mouse_opaque="true" name="separator2" width="139" />
+                        <menu_item_call bottom_delta="-146" enabled="true" height="20" label="Select All" left="0"
+                             mouse_opaque="true" name="Select All" width="139" />
+                        <menu_item_call bottom_delta="-166" enabled="false" height="20" label="Deselect" left="0"
+                             mouse_opaque="true" name="Deselect" width="139" />
+                        <menu_item_separator bottom_delta="-174" enabled="true" height="8" label="-----------" left="0"
+                             mouse_opaque="true" name="separator3" width="139" />
+                        <menu_item_call bottom_delta="-194" enabled="true" height="20" label="Search / Replace..."
+                             left="0" mouse_opaque="true" name="Search / Replace..." width="139" />
+                </menu>
+                <menu bottom="-18" drop_shadow="true" enabled="true" height="34"
+                     left="0" mouse_opaque="false" name="Help" opaque="true" tear_off="false"
+                     width="112">
+                        <menu_item_call bottom="-30" enabled="true" height="20" label="Help..." left="0"
+                             mouse_opaque="true" name="Help..." width="112" />
+                        <menu_item_call bottom="-30" enabled="true" height="20" label="LSL Wiki Help..." left="0"
+                             mouse_opaque="true" name="LSL Wiki Help..." width="112" />
+                </menu>
+        </menu_bar>
+        <string name="loading">
+                Loading...
+        </string>
+        <string name="can_not_view">
+                You are not allowed to view this script.
+        </string>
+        <string name="public_objects_can_not_run">
+                Public Objects cannot run scripts
+        </string>
+        <string name="script_running">
+                Running
+        </string>
+</panel>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_script_preview.xml b/linden/indra/newview/skins/default/xui/en-us/floater_script_preview.xml
index 167aeb7..167aeb7 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_script_preview.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_script_preview.xml
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_script_queue.xml b/linden/indra/newview/skins/default/xui/en-us/floater_script_queue.xml
new file mode 100644
index 0000000..90d1ac1
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_script_queue.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater bottom="-763" can_close="true" can_drag_on_left="false" can_minimize="true"
+     can_resize="true" enabled="true" height="400" left="408" min_height="100"
+     min_width="100" mouse_opaque="true" name="queue" title="Reset Progress"
+     width="300" border_bevel="none" border_thickness="0">
+        <button bottom="-392" enabled="true" follows="right|bottom" font="SansSerif"
+             halign="center" height="24" label="Close" label_selected="Close" left="220"
+             mouse_opaque="true" name="close" width="64" />
+        <scroll_list background_visible="true" bottom="-364" column_padding="5" draw_border="true"
+             draw_heading="false" draw_stripes="true" enabled="true"
+             follows="left|top|right|bottom" height="344" left="4" mouse_opaque="true"
+             multi_select="false" name="queue output" width="292" />
+</floater>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_script_search.xml b/linden/indra/newview/skins/default/xui/en-us/floater_script_search.xml
index 0702674..0702674 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_script_search.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_script_search.xml
diff --git a/linden/indra/newview/skins/xui/en-us/floater_select_key.xml b/linden/indra/newview/skins/default/xui/en-us/floater_select_key.xml
index 0a9b7ce..0a9b7ce 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_select_key.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_select_key.xml
diff --git a/linden/indra/newview/skins/xui/en-us/floater_sell_land.xml b/linden/indra/newview/skins/default/xui/en-us/floater_sell_land.xml
index a5d25a4..a5d25a4 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_sell_land.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_sell_land.xml
diff --git a/linden/indra/newview/skins/xui/en-us/floater_settings_debug.xml b/linden/indra/newview/skins/default/xui/en-us/floater_settings_debug.xml
index a8c0840..a8c0840 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_settings_debug.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_settings_debug.xml
diff --git a/linden/indra/newview/skins/xui/en-us/floater_sim_release_message.xml b/linden/indra/newview/skins/default/xui/en-us/floater_sim_release_message.xml
index cbb2326..cbb2326 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_sim_release_message.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_sim_release_message.xml
diff --git a/linden/indra/newview/skins/xui/en-us/floater_snapshot.xml b/linden/indra/newview/skins/default/xui/en-us/floater_snapshot.xml
index 1346f7c..1346f7c 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_snapshot.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_snapshot.xml
diff --git a/linden/indra/newview/skins/xui/en-us/floater_sound_preview.xml b/linden/indra/newview/skins/default/xui/en-us/floater_sound_preview.xml
index 01440fc..01440fc 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_sound_preview.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_sound_preview.xml
diff --git a/linden/indra/newview/skins/xui/en-us/floater_telehub.xml b/linden/indra/newview/skins/default/xui/en-us/floater_telehub.xml
index 2bb5d66..2bb5d66 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_telehub.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_telehub.xml
diff --git a/linden/indra/newview/skins/xui/en-us/floater_test.xml b/linden/indra/newview/skins/default/xui/en-us/floater_test.xml
index 58e519f..58e519f 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_test.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_test.xml
diff --git a/linden/indra/newview/skins/xui/en-us/floater_texture_ctrl.xml b/linden/indra/newview/skins/default/xui/en-us/floater_texture_ctrl.xml
index feb243a..feb243a 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_texture_ctrl.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_texture_ctrl.xml
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml b/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
new file mode 100644
index 0000000..db176b3
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
@@ -0,0 +1,1241 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater bottom="-359" can_close="true" can_drag_on_left="false" can_minimize="true"
+     can_resize="false" follows="left|top" height="550" 
+     left="308" min_height="100" min_width="100" mouse_opaque="true"
+     name="toolbox floater" rect_control="ToolboxRect" sound_flags="0" title=""
+     width="272">
+
+<!-- Main floater tabs -->
+
+        <button bottom="-34" follows="left|top" font="SansSerif" halign="center" height="32"
+             image_disabled="tool_zoom.tga"
+             image_disabled_selected="tool_zoom_active.tga"
+             image_selected="tool_zoom_active.tga" image_unselected="tool_zoom.tga"
+             label="" label_selected="" left="4" mouse_opaque="true" name="button focus"
+             tool_tip="Focus" width="32" />
+        <button bottom="-34" follows="left|top" font="SansSerif" halign="center" height="32"
+             image_disabled="UIImgGrabUUID"
+             image_disabled_selected="UIImgGrabSelectedUUID"
+             image_selected="UIImgGrabSelectedUUID" image_unselected="UIImgGrabUUID"
+             label="" label_selected="" left="40" mouse_opaque="true" name="button move"
+             tool_tip="Move" width="32" />
+        <button bottom="-34" follows="left|top" font="SansSerif" halign="center" height="32"
+             image_disabled="UIImgFaceUUID"
+             image_disabled_selected="UIImgFaceSelectedUUID"
+             image_selected="UIImgFaceSelectedUUID" image_unselected="UIImgFaceUUID"
+             label="" label_selected="" left="76" mouse_opaque="true" name="button edit"
+             tool_tip="Edit" width="32" />
+        <button bottom="-34" follows="left|top" font="SansSerif" halign="center" height="32"
+             image_disabled="UIImgCreateUUID"
+             image_disabled_selected="UIImgCreateSelectedUUID"
+             image_selected="UIImgCreateSelectedUUID" image_unselected="UIImgCreateUUID"
+             label="" label_selected="" left="112" mouse_opaque="true"
+             name="button create" tool_tip="Create" width="32" />
+        <button bottom="-34" follows="left|top" font="SansSerif" halign="center" height="32"
+             image_disabled="tool_dozer.tga"
+             image_disabled_selected="tool_dozer_active.tga"
+             image_selected="tool_dozer_active.tga" image_unselected="tool_dozer.tga"
+             label="" label_selected="" left="148" mouse_opaque="true"
+             name="button land" tool_tip="Land" width="32" />
+
+<!-- Focus panel -->
+
+        <check_box bottom="-70" follows="left|top" font="SansSerifSmall" height="16"
+             initial_value="false" label="Zoom" left="4" mouse_opaque="true"
+             name="radio zoom" radio_style="true" width="114" />
+        <volume_slider bottom="-69" follows="left|top" height="14" increment="0.01"
+             initial_val="0.125" left="114" max_val="0.5" min_val="0"
+             mouse_opaque="true" name="slider zoom" width="134" />
+        <check_box bottom="-84" follows="left|top" font="SansSerifSmall" height="16"
+             initial_value="false" label="Orbit (Ctrl)" left="4" mouse_opaque="true"
+             name="radio orbit" radio_style="true" width="114" />
+        <check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"
+             initial_value="false" label="Pan (Ctrl-Shift)" left="4"
+             mouse_opaque="true" name="radio pan" radio_style="true" width="114" />
+
+<!-- Move panel -->
+
+        <check_box bottom="-70" follows="left|top" font="SansSerifSmall" height="16"
+             initial_value="false" label="Move" left="4" mouse_opaque="true"
+             name="radio move" radio_style="true" width="114" />
+        <check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"
+             initial_value="false" label="Lift (Ctrl)" left="4" mouse_opaque="true"
+             name="radio lift" radio_style="true" width="114" />
+        <check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"
+             initial_value="false" label="Spin (Ctrl-Shift)" left="4"
+             mouse_opaque="true" name="radio spin" radio_style="true" width="114" />
+
+<!-- Edit panel -->
+
+        <check_box bottom="-70" follows="left|top" font="SansSerifSmall" height="16"
+             initial_value="false" label="Position" left="4" mouse_opaque="true"
+             name="radio position" radio_style="true" width="114" />
+        <check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"
+             initial_value="false" label="Rotate (Ctrl)" left="4" mouse_opaque="true"
+             name="radio rotate" radio_style="true" width="114" />
+        <check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"
+             initial_value="false" label="Stretch (Ctrl-Shift)" left="4"
+             mouse_opaque="true" name="radio stretch" radio_style="true" width="123" />
+        <check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"
+             initial_value="false" label="Select Texture" left="4" mouse_opaque="true"
+             name="radio select face" radio_style="true" width="114" />
+        <check_box bottom_delta="-19" control_name="EditLinkedParts" follows="left|top"
+             font="SansSerifSmall" height="16" initial_value="false"
+             label="Edit linked parts" left="4" mouse_opaque="true"
+             name="checkbox edit linked parts" width="114" />
+        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             bottom_delta="-20" drop_shadow_visible="true" follows="left|top"
+             font="SansSerifSmall" h_pad="0" halign="left" height="14" left="6"
+             mouse_opaque="true" name="text ruler mode" v_pad="0" width="68">
+                Ruler mode:
+        </text>
+        <combo_box allow_text_entry="false" bottom_delta="-4" follows="left|top" height="20"
+             left_delta="74" max_chars="20" mouse_opaque="true"
+             name="combobox grid mode" width="86">
+                <combo_item name="World" value="World">
+                        World
+                </combo_item>
+                <combo_item name="Local" value="Local">
+                        Local
+                </combo_item>
+                <combo_item name="Reference" value="Reference">
+                        Reference
+                </combo_item>
+        </combo_box>
+        <check_box bottom="-70" control_name="ScaleUniform" follows="left|top"
+             font="SansSerifSmall" height="16" initial_value="false"
+             label="Stretch Both Sides" left="143" mouse_opaque="true"
+             name="checkbox uniform" width="134" />
+        <check_box bottom_delta="-15" control_name="ScaleStretchTextures" follows="left|top"
+             font="SansSerifSmall" height="16" initial_value="true"
+             label="Stretch Textures" left_delta="0" mouse_opaque="true"
+             name="checkbox stretch textures" width="134" />
+        <check_box bottom_delta="-19" control_name="SnapEnabled" follows="left|top"
+             font="SansSerifSmall" height="16" initial_value="true" label="Use Grid"
+             left_delta="0" mouse_opaque="true" name="checkbox snap to grid" width="134" />
+        <button bottom_delta="-14" follows="left|top" font="SansSerifSmall" halign="center"
+             height="16" label="Options..." label_selected="Options..." left_delta="20"
+             mouse_opaque="true" name="Options..." scale_image="TRUE" width="80" />
+
+<!-- Help text -->
+
+        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             bottom="-52" drop_shadow_visible="true" follows="left|top"
+             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
+             mouse_opaque="true" name="text status" v_pad="0" width="264">
+                Drag to move, shift-drag to copy
+        </text>
+
+<!-- Create panel -->
+
+        <button bottom="-75" follows="left|top" font="SansSerif" halign="center" height="24"
+             image_disabled="object_cube.tga"
+             image_disabled_selected="object_cube_active.tga"
+             image_selected="object_cube_active.tga" image_unselected="object_cube.tga"
+             label="" label_selected="" left="4" mouse_opaque="true" name="ToolCube"
+             scale_image="TRUE" width="24" tool_tip="Cube"/>
+        <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
+             height="24" image_disabled="object_prism.tga"
+             image_disabled_selected="object_prism_active.tga"
+             image_selected="object_prism_active.tga"
+             image_unselected="object_prism.tga" label="" label_selected=""
+             left_delta="23" mouse_opaque="true" name="ToolPrism" scale_image="TRUE"
+        tool_tip="Prism" width="24" />
+        <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
+             height="24" image_disabled="object_pyramid.tga"
+             image_disabled_selected="object_pyramid_active.tga"
+             image_selected="object_pyramid_active.tga"
+             image_unselected="object_pyramid.tga" label="" label_selected=""
+             left_delta="23" mouse_opaque="true" name="ToolPyramid" scale_image="TRUE"
+ tool_tip="Pyramid" width="24" />
+        <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
+             height="24" image_disabled="object_tetrahedron.tga"
+             image_disabled_selected="object_tetrahedron_active.tga"
+             image_selected="object_tetrahedron_active.tga"
+             image_unselected="object_tetrahedron.tga" label="" label_selected=""
+             left_delta="23" mouse_opaque="true" name="ToolTetrahedron"
+             scale_image="TRUE" tool_tip="Tetrahedron" width="24" />
+        <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
+             height="24" image_disabled="object_cylinder.tga"
+             image_disabled_selected="object_cylinder_active.tga"
+             image_selected="object_cylinder_active.tga"
+             image_unselected="object_cylinder.tga" label="" label_selected=""
+             left_delta="23" mouse_opaque="true" tool_tip="Cylinder" name="ToolCylinder" scale_image="TRUE"
+             width="24" />
+        <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
+             height="24" image_disabled="object_hemi_cylinder.tga"
+             image_disabled_selected="object_hemi_cylinder_active.tga"
+             image_selected="object_hemi_cylinder_active.tga"
+             image_unselected="object_hemi_cylinder.tga" label="" label_selected=""
+             left_delta="23" mouse_opaque="true" name="ToolHemiCylinder"
+             scale_image="TRUE" tool_tip="Hemicylinder" width="24" />
+        <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
+             height="24" image_disabled="object_cone.tga"
+             image_disabled_selected="object_cone_active.tga"
+             image_selected="object_cone_active.tga" image_unselected="object_cone.tga"
+             label="" label_selected="" left_delta="23" mouse_opaque="true"
+             name="ToolCone" scale_image="TRUE" tool_tip="Cone" width="24" />
+        <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
+             height="24" image_disabled="object_hemi_cone.tga"
+             image_disabled_selected="object_hemi_cone_active.tga"
+             image_selected="object_hemi_cone_active.tga"
+             image_unselected="object_hemi_cone.tga" label="" label_selected=""
+             left_delta="23" mouse_opaque="true" name="ToolHemiCone" scale_image="TRUE"
+      tool_tip="Hemicone" width="24" />
+        <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
+             height="24" image_disabled="object_sphere.tga"
+             image_disabled_selected="object_sphere_active.tga"
+             image_selected="object_sphere_active.tga"
+             image_unselected="object_sphere.tga" label="" label_selected=""
+             left_delta="23" mouse_opaque="true" name="ToolSphere" scale_image="TRUE"
+             width="24" tool_tip="Sphere" />
+        <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
+             height="24" image_disabled="object_hemi_sphere.tga"
+             image_disabled_selected="object_hemi_sphere_active.tga"
+             image_selected="object_hemi_sphere_active.tga"
+             image_unselected="object_hemi_sphere.tga" label="" label_selected=""
+             left_delta="23" mouse_opaque="true" name="ToolHemiSphere"
+             scale_image="TRUE" tool_tip="Hemisphere" width="24" />
+        <button bottom_delta="-23" follows="left|top" font="SansSerif" halign="center"
+             height="24" image_disabled="object_torus.tga"
+             image_disabled_selected="object_torus_active.tga"
+             image_selected="object_torus_active.tga"
+             image_unselected="object_torus.tga" label="" label_selected="" left="4"
+             mouse_opaque="true" name="ToolTorus" scale_image="TRUE" tool_tip="Torus" width="24" />
+        <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
+             height="24" image_disabled="object_tube.tga"
+             image_disabled_selected="object_tube_active.tga"
+             image_selected="object_tube_active.tga" image_unselected="object_tube.tga"
+             label="" label_selected="" left_delta="23" mouse_opaque="true"
+             name="ToolTube" scale_image="TRUE" tool_tip="Tube" width="24" />
+        <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
+             height="24" image_disabled="object_ring.tga"
+             image_disabled_selected="object_ring_active.tga"
+             image_selected="object_ring_active.tga" image_unselected="object_ring.tga"
+             label="" label_selected="" left_delta="23" mouse_opaque="true"
+             name="ToolRing" scale_image="TRUE" tool_tip="Ring" width="24" />
+        <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
+             height="24" image_disabled="object_tree.tga"
+             image_disabled_selected="object_tree_active.tga"
+             image_selected="object_tree_active.tga" image_unselected="object_tree.tga"
+             label="" label_selected="" left_delta="23" mouse_opaque="true"
+             name="ToolTree" scale_image="TRUE" tool_tip="Tree" width="24" />
+        <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
+             height="24" image_disabled="object_grass.tga"
+             image_disabled_selected="object_grass_active.tga"
+             image_selected="object_grass_active.tga"
+             image_unselected="object_grass.tga" label="" label_selected=""
+             left_delta="23" mouse_opaque="true" name="ToolGrass" scale_image="TRUE"
+             tool_tip="Grass" width="24" />
+        <check_box bottom="-117" control_name="CreateToolKeepSelected" follows="left|top"
+             font="SansSerifSmall" height="16" initial_value="false"
+             label="Keep Tool Selected" left="4" mouse_opaque="true"
+             name="checkbox sticky" width="128" />
+        <check_box bottom_delta="-15" control_name="CreateToolCopySelection" follows="left|top"
+             font="SansSerifSmall" height="16" initial_value="false"
+             label="Copy Selection" left_delta="0" mouse_opaque="true"
+             name="checkbox copy selection" width="134" />
+        <check_box bottom_delta="-15" control_name="CreateToolCopyCenters" follows="left|top"
+             font="SansSerifSmall" height="16" initial_value="true" label="Center Copy"
+             left_delta="20" mouse_opaque="true" name="checkbox copy centers"
+             width="134" />
+        <check_box bottom_delta="-15" control_name="CreateToolCopyRotates" follows="left|top"
+             font="SansSerifSmall" height="16" initial_value="false" label="Rotate Copy"
+             left_delta="0" mouse_opaque="true" name="checkbox copy rotates" width="134" />
+
+<!-- Land panel -->
+
+        <check_box bottom="-70" follows="left|top" font="SansSerifSmall" height="16"
+             initial_value="false" label="Select Land" left="4" mouse_opaque="true"
+             name="radio select land" radio_style="true" width="114" />
+        <check_box bottom_delta="-14" follows="left|top" font="SansSerifSmall" height="16"
+             initial_value="false" label="Flatten Land" left="4" mouse_opaque="true"
+             name="radio flatten" radio_style="true" width="114" />
+        <check_box bottom_delta="-14" follows="left|top" font="SansSerifSmall" height="16"
+             initial_value="false" label="Raise Land" left="4" mouse_opaque="true"
+             name="radio raise" radio_style="true" width="114" />
+        <check_box bottom_delta="-14" follows="left|top" font="SansSerifSmall" height="16"
+             initial_value="false" label="Lower Land" left="4" mouse_opaque="true"
+             name="radio lower" radio_style="true" width="114" />
+        <check_box bottom_delta="-14" follows="left|top" font="SansSerifSmall" height="16"
+             initial_value="false" label="Smooth Land" left="4" mouse_opaque="true"
+             name="radio smooth" radio_style="true" width="114" />
+        <check_box bottom_delta="-14" follows="left|top" font="SansSerifSmall" height="16"
+             initial_value="false" label="Roughen Land" left="4" mouse_opaque="true"
+             name="radio noise" radio_style="true" width="114" />
+        <check_box bottom_delta="-14" follows="left|top" font="SansSerifSmall" height="16"
+             initial_value="false" label="Revert Land" left="4" mouse_opaque="true"
+             name="radio revert" radio_style="true" width="114" />
+        <combo_box allow_text_entry="false" bottom="-85" follows="left|top" height="18" left="118"
+             max_chars="20" mouse_opaque="true" name="combobox brush size" width="134">
+                <combo_item name="Small" value="Small">
+                        Small
+                </combo_item>
+                <combo_item name="Medium" value="Medium">
+                        Medium
+                </combo_item>
+                <combo_item name="Large" value="Large">
+                        Large
+                </combo_item>
+        </combo_box>
+        <button bottom_delta="-20" follows="left|top" font="SansSerifSmall" halign="center"
+             height="16" label="Apply to selection" label_selected="Apply to selection"
+             left="118" mouse_opaque="true" name="button apply to selection"
+             scale_image="TRUE" tool_tip="Modify Selected Land" width="134" />
+        <check_box bottom_delta="-20" control_name="ShowParcelOwners" follows="left|top"
+             font="SansSerifSmall" height="16" initial_value="false" label="Show Owners"
+             left="118" mouse_opaque="true" name="checkbox show owners" width="134" />
+        <button bottom="-163" follows="left|top" font="SansSerifSmall" halign="center"
+             height="20" label="More &gt;&gt;" left="186" mouse_opaque="true"
+             name="button more" scale_image="TRUE" tool_tip="Advanced Options"
+             width="80" />
+        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" halign="center"
+             height="20" label="&lt;&lt; Less" left_delta="0" mouse_opaque="true"
+             name="button less" scale_image="TRUE" tool_tip="Advanced Options"
+             width="80" />
+
+<!-- Sub-tabs -->
+
+        <tab_container bottom="-550" follows="left|top" height="384" left="0" mouse_opaque="false"
+             name="Object Info Tabs" tab_max_width="52" tab_min_width="40"
+             tab_position="top" width="272">
+                <panel border="true" bottom="-383" follows="left|top|right|bottom" height="367"
+                     label="General" left="1" mouse_opaque="false" name="General" width="270">
+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             bottom="-20" drop_shadow_visible="true" follows="left|top"
+                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
+                             mouse_opaque="true" name="Name:" v_pad="0" width="78">
+                                Name:
+                        </text>
+                        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-26"
+                             follows="left|top|right" font="SansSerifSmall" height="16" left="88"
+                             max_length="63" mouse_opaque="true" name="Object Name"
+                             select_all_on_focus_received="true" width="172" />
+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             bottom="-40" drop_shadow_visible="true" follows="left|top"
+                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
+                             mouse_opaque="true" name="Description:" v_pad="0" width="78">
+                                Description:
+                        </text>
+                        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-46"
+                             follows="left|top|right" font="SansSerifSmall" height="16" left="88"
+                             max_length="127" mouse_opaque="true" name="Object Description"
+                             select_all_on_focus_received="true" width="172" />
+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             bottom="-66" drop_shadow_visible="true" follows="left|top"
+                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
+                             mouse_opaque="true" name="Creator:" v_pad="0" width="78">
+                                Creator:
+                        </text>
+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             bottom="-66" drop_shadow_visible="true" follows="left|top"
+                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="78"
+                             mouse_opaque="true" name="Creator Name" v_pad="0" width="88">
+                                Thrax Linden
+                        </text>
+                        <button bottom="-66" follows="top|right" font="SansSerifSmall" halign="center"
+                             height="16" label="Profile..." label_selected="Profile..." left_delta="94"
+                             mouse_opaque="true" name="button creator profile" scale_image="TRUE"
+                             width="78" />
+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             bottom="-86" drop_shadow_visible="true" follows="left|top"
+                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
+                             mouse_opaque="true" name="Owner:" v_pad="0" width="78">
+                                Owner:
+                        </text>
+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             bottom="-86" drop_shadow_visible="true" follows="left|top"
+                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="78"
+                             mouse_opaque="true" name="Owner Name" v_pad="0" width="88">
+                                Thrax Linden
+                        </text>
+                        <button bottom="-86" follows="top|right" font="SansSerifSmall" halign="center"
+                             height="16" label="Profile..." label_selected="Profile..." left_delta="94"
+                             mouse_opaque="true" name="button owner profile" scale_image="TRUE"
+                             width="78" />
+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             bottom="-106" drop_shadow_visible="true" follows="left|top"
+                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
+                             mouse_opaque="true" name="Group:" v_pad="0" width="78">
+                                Group:
+                        </text>
+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             bottom="-106" drop_shadow_visible="true" follows="left|top"
+                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="78"
+                             mouse_opaque="true" name="Group Name Proxy" v_pad="0" visible="false"
+                             width="88">
+                                The Lindens
+                        </text>
+                        <button bottom="-106" follows="top|right" font="SansSerifSmall" halign="center"
+                             height="16" label="Set..." label_selected="Set..." left_delta="94"
+                             mouse_opaque="true" name="button set group" scale_image="TRUE" width="78" />
+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             bottom="-126" drop_shadow_visible="true" follows="left|top"
+                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
+                             mouse_opaque="true" name="prim info" v_pad="0" width="166">
+                                1 Object, 1 Primitive
+                        </text>
+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             bottom_delta="-20" drop_shadow_visible="true" follows="left|top"
+                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
+                             mouse_opaque="true" name="Permissions:" v_pad="0" width="85">
+                                Permissions:
+                        </text>
+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             bottom_delta="-20" drop_shadow_visible="true" follows="left|top|right"
+                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
+                             mouse_opaque="true" name="perm_modify" v_pad="0" width="250">
+                                You can modify this object.
+                        </text>
+                        <check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
+                             initial_value="false" label="Share with group" left="10"
+                             mouse_opaque="true" name="checkbox share with group"
+                             tool_tip="Allow group members to move, modify, copy and delete."
+                             width="166" />
+                        <string name="text deed continued">
+                                Deed...
+                        </string>
+                        <string name="text deed">
+                                Deed
+                        </string>
+                        <button bottom="-186" follows="top|right" font="SansSerifSmall" halign="center"
+                             height="16" label="Deed..." label_selected="Deed..." left_delta="172"
+                             mouse_opaque="true" name="button deed" scale_image="TRUE"
+                             tool_tip="Group shared objects can be deeded by a group officer."
+                             width="78" />
+                        <check_box bottom="-206" follows="left|top" font="SansSerifSmall" height="16"
+                             initial_value="false" label="Allow anyone to move" left="10"
+                             mouse_opaque="true" name="checkbox allow everyone move" width="142" />
+                        <check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
+                             initial_value="false" label="Allow anyone to copy" left="10"
+                             mouse_opaque="true" name="checkbox allow everyone copy" width="141" />
+                        <check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
+                             initial_value="false" label="Show in search" left="10" name="search_check"
+                             tool_tip="Let people see this object in search results" width="78" />
+                        <check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
+                             initial_value="false" label="For Sale" left="10" mouse_opaque="true"
+                             name="checkbox for sale" width="78" />
+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             bottom_delta="0" drop_shadow_visible="true" follows="left|top"
+                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="100"
+                             mouse_opaque="true" name="Price:  L$" v_pad="0" width="56">
+                                Price:  L$
+                        </text>
+                        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="0"
+                             follows="left|top|right" font="SansSerifSmall" height="16" left_delta="56"
+                             max_length="25" mouse_opaque="true" name="EdCost" width="84" />
+                        <radio_group bottom="-286" draw_border="false" follows="left|top|right" height="16"
+                             left="42" mouse_opaque="true" name="sale type" width="218">
+                                <radio_item bottom="-16" follows="left|top" height="16" left="0" mouse_opaque="true"
+                                     name="Original" width="70">
+                                        Original
+                                </radio_item>
+                                <radio_item bottom="-16" follows="left|top" height="16" left="70" mouse_opaque="true"
+                                     name="Copy" width="70">
+                                        Copy
+                                </radio_item>
+                                <radio_item bottom="-16" follows="left|top" height="16" left="140" mouse_opaque="true"
+                                     name="Contents" width="76">
+                                        Contents
+                                </radio_item>
+                        </radio_group>
+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             bottom="-298" drop_shadow_visible="true" follows="left|top|right"
+                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
+                             mouse_opaque="true" name="Next owner can:" v_pad="0" width="250">
+                                Next owner can:
+                        </text>
+                        <check_box bottom_delta="-22" follows="left|top|right" font="SansSerifSmall" height="16"
+                             initial_value="false" label="Modify" left="10" mouse_opaque="true"
+                             name="checkbox next owner can modify" width="250" />
+                        <check_box bottom_delta="0" follows="left|top|right" font="SansSerifSmall" height="16"
+                             initial_value="false" label="Copy" left_delta="60" mouse_opaque="true"
+                             name="checkbox next owner can copy" width="190" />
+                        <check_box bottom_delta="0" follows="left|top|right" font="SansSerifSmall" height="16"
+                             initial_value="false" label="Resell/Give away" left_delta="60"
+                             mouse_opaque="true" name="checkbox next owner can transfer" width="130" />
+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             bottom="-332" drop_shadow_visible="true" follows="left|top"
+                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
+                             mouse_opaque="true" name="label click action" v_pad="0" width="150">
+                                When Left-Clicked:
+                        </text>
+                        <combo_box allow_text_entry="false" bottom_delta="-25" follows="left|top" height="18"
+                             left="10" max_chars="20" mouse_opaque="true" name="clickaction" width="150">
+                             <!-- Do not reorder these items, the index numbers are
+                                        used internally. JC -->
+                                <combo_item name="Touch/grab(default)" value="Touch/grab (default)">
+                                        Touch/grab (default)
+                                </combo_item>
+                                <combo_item name="Sitonobject" value="Sit on object">
+                                        Sit on object
+                                </combo_item>
+                                <combo_item name="Buyobject" value="Buy object">
+                                        Buy object
+                                </combo_item>
+                                <combo_item name="Payobject" value="Pay object">
+                                        Pay object
+                                </combo_item>
+                                <combo_item name="Open" value="Open">
+                                        Open
+                                </combo_item>
+                                <combo_item name="Play" value="Play">
+                                        Play parcel media
+                                </combo_item>
+                                <combo_item name="Opemmedia" value="Open Media">
+                                        Open parcel media
+                                </combo_item>
+                        </combo_box>
+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             bottom="-135" drop_shadow_visible="true" follows="left|top"
+                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="88"
+                             mouse_opaque="true" name="B:" v_pad="0" width="174">
+                                B:
+                        </text>
+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             bottom="-135" drop_shadow_visible="true" follows="left|top"
+                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="50"
+                             mouse_opaque="true" name="O:" v_pad="0" width="124">
+                                O;
+                        </text>
+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             bottom="-135" drop_shadow_visible="true" follows="left|top"
+                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="50"
+                             mouse_opaque="true" name="G:" v_pad="0" width="74">
+                                G:
+                        </text>
+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             bottom="-147" drop_shadow_visible="true" follows="left|top"
+                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="88"
+                             mouse_opaque="true" name="E:" v_pad="0" width="174">
+                                E:
+                        </text>
+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             bottom="-147" drop_shadow_visible="true" follows="left|top"
+                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="50"
+                             mouse_opaque="true" name="N:" v_pad="0" width="124">
+                                N:
+                        </text>
+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             bottom="-147" drop_shadow_visible="true" follows="left|top"
+                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="50"
+                             mouse_opaque="true" name="F:" v_pad="0" width="74">
+                                F:
+                        </text>
+                        <string name="text modify info 1">
+                                You can modify this object.
+                        </string>
+                        <string name="text modify info 2">
+                                You can modify these objects.
+                        </string>
+                        <string name="text modify info 3">
+                                You cannot modify this object.
+                        </string>
+                        <string name="text modify info 4">
+                                You cannot modify these objects.
+                        </string>
+                        <string name="text modify warning">
+                                Must select entire object to set permissions.
+                        </string>
+                </panel>
+
+<!-- Object sub-tab -->
+
+                <panel border="true" bottom="-383" follows="left|top|right|bottom" height="367"
+                     label="Object" left="1" mouse_opaque="false" name="Object" width="270">
+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             bottom="-20" drop_shadow_visible="true" follows="left|top"
+                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
+                             mouse_opaque="true" name="select_single" v_pad="0" width="252">
+                                Select only one primitive to edit parameters.
+                        </text>
+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             bottom_delta="0" drop_shadow_visible="true" follows="left|top"
+                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="0"
+                             mouse_opaque="true" name="edit_object" v_pad="0" width="252">
+                                Edit object parameters:
+                        </text>
+                        <check_box bottom_delta="-26" follows="left|top" font="SansSerifSmall" height="16"
+                             initial_value="false" label="Locked" left="8" mouse_opaque="true"
+                             name="checkbox locked"
+                             tool_tip="Prevents object from being moved or deleted. Frequently useful during building to avoid unintended edits."
+                             width="123" />
+                        <check_box bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16"
+                             initial_value="false" label="Physical" left="8" mouse_opaque="true"
+                             name="Physical Checkbox Ctrl"
+                             tool_tip="Allows object to be pushed and affected by gravity" width="123" />
+                        <check_box bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16"
+                             initial_value="false" label="Temporary" left="8" mouse_opaque="true"
+                             name="Temporary Checkbox Ctrl"
+                             tool_tip="Causes object to be deleted 1 minute after creation." width="123" />
+                        <check_box bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16"
+                             initial_value="false" label="Phantom" left="8" mouse_opaque="true"
+                             name="Phantom Checkbox Ctrl"
+                             tool_tip="Causes object to not collide with other objects or avatars"
+                             width="123" />
+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             bottom_delta="-14" drop_shadow_visible="true" follows="left|top"
+                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
+                             mouse_opaque="true" name="label position" v_pad="0" width="121">
+                                Position (meters)
+                        </text>
+                        <spinner bottom_delta="-20" decimal_digits="3" follows="left|top" height="16"
+                             increment="0.01" initial_val="0" label="X" label_width="10" left="10"
+                             max_val="512" min_val="-256" mouse_opaque="true" name="Pos X"
+                             text_enabled_color="110, 15, 15, 255" width="87" />
+                        <spinner bottom_delta="-18" decimal_digits="3" follows="left|top" height="16"
+                             increment="0.01" initial_val="0" label="Y" label_width="10" left="10"
+                             max_val="512" min_val="-256" mouse_opaque="true" name="Pos Y"
+                             text_enabled_color="0, 100, 40, 255" width="87" />
+                        <spinner bottom_delta="-18" decimal_digits="3" follows="left|top" height="16"
+                             increment="0.01" initial_val="0" label="Z" label_width="10" left="10"
+                             max_val="4096" min_val="0" mouse_opaque="true" name="Pos Z"
+                             text_enabled_color="0, 67, 132, 255" width="87" />
+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             bottom_delta="-16" drop_shadow_visible="true" follows="left|top"
+                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
+                             mouse_opaque="true" name="label size" v_pad="0" width="121">
+                                Size (meters)
+                        </text>
+                        <spinner bottom_delta="-20" decimal_digits="3" follows="left|top" height="16"
+                             increment="0.01" initial_val="0" label="X" label_width="10" left="10"
+                             max_val="10" min_val="0.01" mouse_opaque="true" name="Scale X"
+                             text_enabled_color="1, 1, 1, 1" width="87" />
+                        <spinner bottom_delta="-18" decimal_digits="3" follows="left|top" height="16"
+                             increment="0.01" initial_val="0" label="Y" label_width="10" left="10"
+                             max_val="10" min_val="0.01" mouse_opaque="true" name="Scale Y"
+                             text_enabled_color="1, 1, 1, 1" width="87" />
+                        <spinner bottom_delta="-18" decimal_digits="3" follows="left|top" height="16"
+                             increment="0.01" initial_val="0" label="Z" label_width="10" left="10"
+                             max_val="10" min_val="0.01" mouse_opaque="true" name="Scale Z"
+                             text_enabled_color="1, 1, 1, 1" width="87" />
+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             bottom_delta="-16" drop_shadow_visible="true" follows="left|top"
+                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
+                             mouse_opaque="true" name="label rotation" v_pad="0" width="121">
+                                Rotation (degrees)
+                        </text>
+                        <spinner bottom_delta="-22" decimal_digits="2" follows="left|top" height="16"
+                             increment="1" initial_val="0" label="X" label_width="10" left="10"
+                             max_val="9999" min_val="-9999" mouse_opaque="true" name="Rot X"
+                             text_enabled_color="1, 1, 1, 1" width="87" />
+                        <spinner bottom_delta="-18" decimal_digits="2" follows="left|top" height="16"
+                             increment="1" initial_val="0" label="Y" label_width="10" left="10"
+                             max_val="9999" min_val="-9999" mouse_opaque="true" name="Rot Y"
+                             text_enabled_color="1, 1, 1, 1" width="87" />
+                        <spinner bottom_delta="-18" decimal_digits="2" follows="left|top" height="16"
+                             increment="1" initial_val="0" label="Z" label_width="10" left="10"
+                             max_val="9999" min_val="-9999" mouse_opaque="true" name="Rot Z"
+                             text_enabled_color="1, 1, 1, 1" width="87" />
+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             bottom_delta="-16" drop_shadow_visible="true" follows="left|top"
+                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
+                             mouse_opaque="true" name="label material" v_pad="0" width="121">
+                                Material
+                        </text>
+                        <combo_box allow_text_entry="false" bottom_delta="-22" follows="left|top" height="18"
+                             left="10" max_chars="20" mouse_opaque="true" name="material" width="87">
+                                <combo_item name="Stone" value="Stone">
+                                        Stone
+                                </combo_item>
+                                <combo_item name="Metal" value="Metal">
+                                        Metal
+                                </combo_item>
+                                <combo_item name="Glass" value="Glass">
+                                        Glass
+                                </combo_item>
+                                <combo_item name="Wood" value="Wood">
+                                        Wood
+                                </combo_item>
+                                <combo_item name="Flesh" value="Flesh">
+                                        Flesh
+                                </combo_item>
+                                <combo_item name="Plastic" value="Plastic">
+                                        Plastic
+                                </combo_item>
+                                <combo_item name="Rubber" value="Rubber">
+                                        Rubber
+                                </combo_item>
+                        </combo_box>
+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             bottom="-36" drop_shadow_visible="true" follows="left|top"
+                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="121"
+                             mouse_opaque="true" name="label basetype" v_pad="0" width="141">
+                                Building Block Type
+                        </text>
+                        <combo_box allow_text_entry="false" bottom_delta="-24" follows="left|top" height="18"
+                             left="121" max_chars="20" mouse_opaque="true" name="comboBaseType"
+                             width="141">
+                                <combo_item name="Box" value="Box">
+                                        Box
+                                </combo_item>
+                                <combo_item name="Cylinder" value="Cylinder">
+                                        Cylinder
+                                </combo_item>
+                                <combo_item name="Prism" value="Prism">
+                                        Prism
+                                </combo_item>
+                                <combo_item name="Sphere" value="Sphere">
+                                        Sphere
+                                </combo_item>
+                                <combo_item name="Torus" value="Torus">
+                                        Torus
+                                </combo_item>
+                                <combo_item name="Tube" value="Tube">
+                                        Tube
+                                </combo_item>
+                                <combo_item name="Ring" value="Ring">
+                                        Ring
+                                </combo_item>
+                                <combo_item name="Sculpted" value="Sculpted">
+                                        Sculpted
+                                </combo_item>
+                        </combo_box>
+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             bottom_delta="-12" drop_shadow_visible="true" follows="left|top"
+                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="121"
+                             mouse_opaque="true" name="text cut" v_pad="0" width="141">
+                                Path Cut Begin and End
+                        </text>
+                        <spinner bottom_delta="-22" decimal_digits="3" follows="left|top" height="16"
+                             increment="0.05" initial_val="0" label="B" label_width="10" left="121"
+                             max_val="0.98" min_val="0" mouse_opaque="true" name="cut begin" width="68" />
+                        <spinner bottom_delta="0" decimal_digits="3" follows="left|top" height="16"
+                             increment="0.05" initial_val="1" label="E" label_width="10" left_delta="73"
+                             max_val="1" min_val="0.02" mouse_opaque="true" name="cut end" width="68" />
+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             bottom_delta="-14" drop_shadow_visible="true" follows="left|top"
+                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="121"
+                             mouse_opaque="true" name="text hollow" v_pad="0" width="68">
+                                Hollow
+                        </text>
+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             bottom_delta="0" drop_shadow_visible="true" follows="left|top"
+                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="78"
+                             mouse_opaque="true" name="text skew" v_pad="0" width="63">
+                                Skew
+                        </text>
+                        <spinner bottom_delta="-20" decimal_digits="1" follows="left|top" height="16"
+                             increment="5" initial_val="0" left="121" max_val="95" min_val="0"
+                             mouse_opaque="true" name="Scale 1" width="68" />
+                        <spinner bottom_delta="0" decimal_digits="2" follows="left|top" height="16"
+                             increment="0.05" initial_val="0" left_delta="73" max_val="0.95"
+                             min_val="-0.95" mouse_opaque="true" name="Skew" width="68" />
+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             bottom_delta="-15" drop_shadow_visible="true" follows="left|top"
+                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="121"
+                             mouse_opaque="true" name="Hollow Shape" v_pad="0" width="141">
+                                Hollow Shape
+                        </text>
+                        <combo_box allow_text_entry="false" bottom_delta="-24" follows="left|top" height="18"
+                             left="121" max_chars="20" mouse_opaque="true" name="hole" width="141">
+                                <combo_item name="Default" value="Default">
+                                        Default
+                                </combo_item>
+                                <combo_item name="Circle" value="Circle">
+                                        Circle
+                                </combo_item>
+                                <combo_item name="Square" value="Square">
+                                        Square
+                                </combo_item>
+                                <combo_item name="Triangle" value="Triangle">
+                                        Triangle
+                                </combo_item>
+                        </combo_box>
+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             bottom_delta="-12" drop_shadow_visible="true" follows="left|top"
+                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="121"
+                             mouse_opaque="true" name="text twist" v_pad="0" width="141">
+                                Twist Begin and End
+                        </text>
+                        <spinner bottom_delta="-22" decimal_digits="0" follows="left|top" height="16"
+                             increment="9" initial_val="0" label="B" label_width="10" left="121"
+                             max_val="180" min_val="-180" mouse_opaque="true" name="Twist Begin"
+                             width="68" />
+                        <spinner bottom_delta="0" decimal_digits="0" follows="left|top" height="16"
+                             increment="9" initial_val="0" label="E" label_width="10" left_delta="73"
+                             max_val="180" min_val="-180" mouse_opaque="true" name="Twist End"
+                             width="68" />
+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             bottom_delta="-14" drop_shadow_visible="true" follows="left|top"
+                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="121"
+                             mouse_opaque="true" name="scale_taper" v_pad="0" width="141">
+                                Taper
+                        </text>
+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             bottom_delta="0" drop_shadow_visible="true" follows="left|top"
+                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="121"
+                             mouse_opaque="true" name="scale_hole" v_pad="0" width="141">
+                                Hole Size
+                        </text>
+                        <spinner bottom_delta="-20" decimal_digits="2" follows="left|top" height="16"
+                             increment="0.05" initial_val="0" label="X" label_width="10" left="121"
+                             max_val="1" min_val="-1" mouse_opaque="true" name="Taper Scale X"
+                             width="68" />
+                        <spinner bottom_delta="0" decimal_digits="2" follows="left|top" height="16"
+                             increment="0.05" initial_val="0" label="Y" label_width="10" left_delta="73"
+                             max_val="1" min_val="-1" mouse_opaque="true" name="Taper Scale Y"
+                             width="68" />
+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             bottom_delta="-14" drop_shadow_visible="true" follows="left|top"
+                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="121"
+                             mouse_opaque="true" name="text topshear" v_pad="0" width="141">
+                                Top Shear
+                        </text>
+                        <spinner bottom_delta="-20" decimal_digits="2" follows="left|top" height="16"
+                             increment="0.05" initial_val="0" label="X" label_width="10" left="121"
+                             max_val="0.5" min_val="-0.5" mouse_opaque="true" name="Shear X" width="68" />
+                        <spinner bottom_delta="0" decimal_digits="2" follows="left|top" height="16"
+                             increment="0.05" initial_val="0" label="Y" label_width="10" left_delta="73"
+                             max_val="0.5" min_val="-0.5" mouse_opaque="true" name="Shear Y" width="68" />
+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             bottom_delta="-14" drop_shadow_visible="true" follows="left|top"
+                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="121"
+                             mouse_opaque="true" name="advanced_cut" v_pad="0" width="141">
+                                Profile Cut Begin and End
+                        </text>
+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             bottom_delta="0" drop_shadow_visible="true" follows="left|top"
+                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="0"
+                             mouse_opaque="true" name="advanced_dimple" v_pad="0" width="141">
+                                Dimple Begin and End
+                        </text>
+                        <spinner bottom_delta="-19" decimal_digits="3" follows="left|top" height="16"
+                             increment="0.05" initial_val="0" label="B" label_width="10" left="121"
+                             max_val="0.95" min_val="0" mouse_opaque="true" name="Path Limit Begin"
+                             width="68" />
+                        <spinner bottom_delta="0" decimal_digits="3" follows="left|top" height="16"
+                             increment="0.05" initial_val="1" label="E" label_width="10" left_delta="73"
+                             max_val="1" min_val="0.05" mouse_opaque="true" name="Path Limit End"
+                             width="68" />
+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             bottom_delta="-14" drop_shadow_visible="true" follows="left|top"
+                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="121"
+                             mouse_opaque="true" name="text taper2" v_pad="0" width="141">
+                                Taper
+                        </text>
+                        <spinner bottom_delta="-19" decimal_digits="2" follows="left|top" height="16"
+                             increment="0.05" initial_val="0" label="X" label_width="10" left="121"
+                             max_val="1" min_val="-1" mouse_opaque="true" name="Taper X" width="68" />
+                        <spinner bottom_delta="0" decimal_digits="2" follows="left|top" height="16"
+                             increment="0.05" initial_val="0" label="Y" label_width="10" left_delta="73"
+                             max_val="1" min_val="-1" mouse_opaque="true" name="Taper Y" width="68" />
+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             bottom_delta="-12" drop_shadow_visible="true" follows="left|top"
+                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="121"
+                             mouse_opaque="true" name="text radius delta" v_pad="0" width="78">
+                                Radius
+                        </text>
+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             bottom_delta="0" drop_shadow_visible="true" follows="left|top"
+                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="73"
+                             mouse_opaque="true" name="text revolutions" v_pad="0" width="68">
+                                Revolutions
+                        </text>
+                        <spinner bottom_delta="-19" decimal_digits="3" follows="left|top" height="16"
+                             increment="0.05" initial_val="0" left="121" max_val="1" min_val="-1"
+                             mouse_opaque="true" name="Radius Offset" width="68" />
+                        <spinner bottom_delta="0" decimal_digits="2" follows="left|top" height="16"
+                             increment="0.1" initial_val="1" left_delta="73" max_val="4" min_val="1"
+                             mouse_opaque="true" name="Revolutions" width="68" />
+                        <texture_picker allow_no_texture="false" bottom="-211" can_apply_immediately="true"
+                             default_image_name="Default" follows="left|top" height="141"
+                             label="Sculpt Texture" left="121" mouse_opaque="true"
+                             name="sculpt texture control" tool_tip="Click to choose a picture"
+                             visible="false" width="141" />
+                        <text align="left" bg_visible="false" border_drop_shadow_visible="false"
+                             border_visible="false" bottom_delta="-20" drop_shadow_visible="true"
+                             follows="left|top" font="SansSerifSmall" h_pad="0" height="10" left="121"
+                             mouse_opaque="true" name="label sculpt type" v_pad="0" visible="false"
+                             width="121">
+                                Stitching type
+                        </text>
+                        <combo_box allow_text_entry="false" bottom_delta="-24" follows="left|top" height="18"
+                             left="121" max_chars="20" mouse_opaque="true" name="sculpt type control"
+                             visible="false" width="141">
+                                <combo_item name="None" value="None">
+                                        (none)
+                                </combo_item>
+                                <combo_item name="Sphere" value="Sphere">
+                                        Sphere
+                                </combo_item>
+                                <combo_item name="Torus" value="Torus">
+                                        Torus
+                                </combo_item>
+                                <combo_item name="Plane" value="Plane">
+                                        Plane
+                                </combo_item>
+                                <combo_item name="Cylinder" value="Cylinder">
+                                        Cylinder
+                                </combo_item>
+                        </combo_box>
+                </panel>
+
+<!-- Features sub-tab -->
+
+                <panel border="true" bottom="-383" follows="left|top|right|bottom" height="367"
+                     label="Features" left="1" mouse_opaque="false" name="Features" width="270">
+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             bottom="-20" drop_shadow_visible="true" follows="left|top"
+                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
+                             mouse_opaque="true" name="select_single" v_pad="0" width="252">
+                                Select only one primitive to edit features.
+                        </text>
+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             bottom_delta="0" drop_shadow_visible="true" follows="left|top"
+                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
+                             mouse_opaque="true" name="edit_object" v_pad="0" width="252">
+                                Edit object features:
+                        </text>
+                        <check_box bottom_delta="-26" follows="left|top" font="SansSerifSmall" height="16"
+                             initial_value="false" label="Flexible Path" left="10" mouse_opaque="true"
+                             name="Flexible1D Checkbox Ctrl"
+                             tool_tip="Allows object to flex about the Z axis. (Client-side only)"
+                             width="121" />
+                        <spinner bottom_delta="-20" decimal_digits="3" follows="left|top" height="16"
+                             increment="1" initial_val="2" label="Softness" label_width="65" left="10"
+                             max_val="3" min_val="0" mouse_opaque="true" name="FlexNumSections"
+                             width="128" />
+                        <spinner bottom_delta="-20" decimal_digits="3" follows="left|top" height="16"
+                             increment="0.5" initial_val="0.3" label="Gravity" label_width="65"
+                             left="10" max_val="10" min_val="-10" mouse_opaque="true" name="FlexGravity"
+                             width="128" />
+                        <spinner bottom_delta="-20" decimal_digits="3" follows="left|top" height="16"
+                             increment="0.5" initial_val="2" label="Drag" label_width="65" left="10"
+                             max_val="10" min_val="0" mouse_opaque="true" name="FlexFriction"
+                             width="128" />
+                        <spinner bottom_delta="-20" decimal_digits="3" follows="left|top" height="16"
+                             increment="0.5" initial_val="0" label="Wind" label_width="65" left="10"
+                             max_val="10" min_val="0" mouse_opaque="true" name="FlexWind" width="128" />
+                        <spinner bottom_delta="-20" decimal_digits="3" follows="left|top" height="16"
+                             increment="0.5" initial_val="1" label="Tension" label_width="65" left="10"
+                             max_val="10" min_val="0" mouse_opaque="true" name="FlexTension" width="128" />
+                        <spinner bottom_delta="-20" decimal_digits="3" follows="left|top" height="16"
+                             increment="0.01" initial_val="0" label="Force X" label_width="65" left="10"
+                             max_val="10" min_val="-10" mouse_opaque="true" name="FlexForceX"
+                             width="128" />
+                        <spinner bottom_delta="-20" decimal_digits="3" follows="left|top" height="16"
+                             increment="0.01" initial_val="0" label="Force Y" label_width="65" left="10"
+                             max_val="10" min_val="-10" mouse_opaque="true" name="FlexForceY"
+                             width="128" />
+                        <spinner bottom_delta="-20" decimal_digits="3" follows="left|top" height="16"
+                             increment="0.01" initial_val="0" label="Force Z" label_width="65" left="10"
+                             max_val="10" min_val="-10" mouse_opaque="true" name="FlexForceZ"
+                             width="128" />
+                        <check_box bottom_delta="-30" follows="left|top" font="SansSerifSmall" height="16"
+                             initial_value="false" label="Light" left="10" mouse_opaque="true"
+                             name="Light Checkbox Ctrl" tool_tip="Causes object to emit light"
+                             width="121" />
+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             bottom_delta="-21" drop_shadow_visible="true" follows="left|top"
+                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="0"
+                             mouse_opaque="true" name="label color" v_pad="0" width="58">
+                                Color
+                        </text>
+                        <color_swatch border_color="0.45098, 0.517647, 0.607843, 1" bottom_delta="-28"
+                             can_apply_immediately="true" color="0.5, 0.5, 0.5, 1" follows="left|top"
+                             height="48" label="" left_delta="67" mouse_opaque="true" name="colorswatch"
+                             tool_tip="Click to open Color Picker" width="32" />
+                        <spinner bottom_delta="-4" decimal_digits="3" follows="left|top" height="16"
+                             increment="0.1" initial_val="0.5" label="Intensity" label_width="65"
+                             left="10" max_val="1" min_val="0" mouse_opaque="true"
+                             name="Light Intensity" width="128" />
+                        <spinner bottom_delta="-20" decimal_digits="3" follows="left|top" height="16"
+                             increment="0.1" initial_val="5" label="Radius" label_width="65"
+                             left_delta="0" max_val="20" min_val="0" mouse_opaque="true"
+                             name="Light Radius" width="128" />
+                        <spinner bottom_delta="-20" decimal_digits="3" follows="left|top" height="16"
+                             increment="0.25" initial_val="1" label="Falloff" label_width="65"
+                             left_delta="0" max_val="2" min_val="0" mouse_opaque="true"
+                             name="Light Falloff" width="128" />
+                </panel>
+
+<!-- Texture sub-tab -->
+
+                <panel border="true" bottom="-383" follows="left|top|right|bottom" height="367"
+                     label="Texture" left="1" mouse_opaque="false" name="Texture" width="270">
+                        <texture_picker allow_no_texture="false" bottom="-90" can_apply_immediately="true"
+                             default_image_name="Default" follows="left|top" height="80" label="Texture"
+                             left="10" mouse_opaque="true" name="texture control"
+                             tool_tip="Click to choose a picture" width="64" />
+                        <color_swatch border_color="0.45098, 0.517647, 0.607843, 1" bottom="-90"
+                             can_apply_immediately="true" color="1, 1, 1, 1" follows="left|top"
+                             height="80" label="Color" left_delta="90" mouse_opaque="true"
+                             name="colorswatch" tool_tip="Click to open Color Picker" width="64" />
+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             bottom="-11" drop_shadow_visible="true" follows="left|top"
+                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="180"
+                             mouse_opaque="true" name="color trans" v_pad="0" width="80">
+                                Transparency %
+                        </text>
+                        <spinner bottom_delta="-20" decimal_digits="0" follows="left|top" height="16"
+                             increment="2" initial_val="0" left="180" max_val="90" min_val="0"
+                             mouse_opaque="true" name="ColorTrans" width="80" />
+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             bottom_delta="-12" drop_shadow_visible="true" follows="left|top"
+                             font="SansSerifSmall" h_pad="0" halign="left" height="10"
+                             left="180" mouse_opaque="true" name="glow label" v_pad="0" width="80">
+                                Glow
+                        </text>
+                        <spinner bottom_delta="-20" decimal_digits="2" follows="left|top" height="16"
+                             increment="0.1" initial_val="0" left="180" max_val="1"
+                             min_val="0" mouse_opaque="true" name="glow" width="80" />
+                        <check_box bottom_delta="-23" follows="left|top" font="SansSerifSmall" height="16"
+                             initial_value="false" label="Full Bright" left="180" mouse_opaque="true"
+                             name="checkbox fullbright" width="81" />
+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             bottom="-104" drop_shadow_visible="true" follows="left|top"
+                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
+                             mouse_opaque="true" name="tex gen" v_pad="0" width="90">
+                                Mapping
+                        </text>
+                        <combo_box allow_text_entry="false" bottom_delta="-22" follows="left|top" height="18"
+                             left="10" max_chars="20" mouse_opaque="true" name="combobox texgen"
+                             width="80">
+                                <combo_item name="Default" value="Default">
+                                        Default
+                                </combo_item>
+                                <combo_item name="Planar" value="Planar">
+                                        Planar
+                                </combo_item>
+                        </combo_box>
+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             bottom="-104" drop_shadow_visible="true" follows="left|top"
+                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="100"
+                             mouse_opaque="true" name="label shininess" v_pad="0" width="70">
+                                Shininess
+                        </text>
+                        <combo_box allow_text_entry="false" bottom_delta="-22" follows="left|top" height="18"
+                             left="100" max_chars="20" mouse_opaque="true" name="combobox shininess"
+                             width="70">
+                                <combo_item name="None" value="None">
+                                        None
+                                </combo_item>
+                                <combo_item name="Low" value="Low">
+                                        Low
+                                </combo_item>
+                                <combo_item name="Medium" value="Medium">
+                                        Medium
+                                </combo_item>
+                                <combo_item name="High" value="High">
+                                        High
+                                </combo_item>
+                        </combo_box>
+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             bottom="-104" drop_shadow_visible="true" follows="left|top"
+                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="180"
+                             mouse_opaque="true" name="label bumpiness" v_pad="0" width="80">
+                                Bumpiness
+                        </text>
+                        <combo_box allow_text_entry="false" bottom_delta="-22" follows="left|top" height="18"
+                             left="180" max_chars="20" mouse_opaque="true" name="combobox bumpiness"
+                             width="80">
+                                <combo_item name="None" value="None">
+                                        None
+                                </combo_item>
+                                <combo_item name="Brightness" value="Brightness">
+                                        Brightness
+                                </combo_item>
+                                <combo_item name="Darkness" value="Darkness">
+                                        Darkness
+                                </combo_item>
+                                <combo_item name="woodgrain" value="woodgrain">
+                                        woodgrain
+                                </combo_item>
+                                <combo_item name="bark" value="bark">
+                                        bark
+                                </combo_item>
+                                <combo_item name="bricks" value="bricks">
+                                        bricks
+                                </combo_item>
+                                <combo_item name="checker" value="checker">
+                                        checker
+                                </combo_item>
+                                <combo_item name="concrete" value="concrete">
+                                        concrete
+                                </combo_item>
+                                <combo_item name="crustytile" value="crustytile">
+                                        crustytile
+                                </combo_item>
+                                <combo_item name="cutstone" value="cutstone">
+                                        cutstone
+                                </combo_item>
+                                <combo_item name="discs" value="discs">
+                                        discs
+                                </combo_item>
+                                <combo_item name="gravel" value="gravel">
+                                        gravel
+                                </combo_item>
+                                <combo_item name="petridish" value="petridish">
+                                        petridish
+                                </combo_item>
+                                <combo_item name="siding" value="siding">
+                                        siding
+                                </combo_item>
+                                <combo_item name="stonetile" value="stonetile">
+                                        stonetile
+                                </combo_item>
+                                <combo_item name="stucco" value="stucco">
+                                        stucco
+                                </combo_item>
+                                <combo_item name="suction" value="suction">
+                                        suction
+                                </combo_item>
+                                <combo_item name="weave" value="weave">
+                                        weave
+                                </combo_item>
+                        </combo_box>
+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             bottom="-158" drop_shadow_visible="true" follows="left|top"
+                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
+                             mouse_opaque="true" name="tex scale" v_pad="0" width="160">
+                                Repeats per Face
+                        </text>
+                        <spinner bottom="-178" decimal_digits="3" follows="left|top" height="16" increment="0.1"
+                             initial_val="0" label="Horizontal (U)" label_width="90" left="20"
+                             max_val="100" min_val="0" mouse_opaque="true" name="TexScaleU" width="160" />
+                        <check_box bottom="-179" follows="left|top" font="SansSerifSmall" height="16"
+                             initial_value="false" label="Flip" left_delta="170" mouse_opaque="true"
+                             name="checkbox flip s" width="70" />
+                        <spinner bottom="-196" decimal_digits="3" follows="left|top" height="16" increment="0.1"
+                             initial_val="0" label="Vertical (V)" label_width="90" left="20"
+                             max_val="100" min_val="0" mouse_opaque="true" name="TexScaleV" width="160" />
+                        <check_box bottom="-197" follows="left|top" font="SansSerifSmall" height="16"
+                             initial_value="false" label="Flip" left_delta="170" mouse_opaque="true"
+                             name="checkbox flip t" width="70" />
+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             bottom="-228" drop_shadow_visible="true" follows="left|top"
+                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
+                             mouse_opaque="true" name="tex rotate" v_pad="0" width="102">
+                                Rotation (degrees)
+                        </text>
+                        <spinner bottom="-234" decimal_digits="2" follows="left|top" height="16" increment="1"
+                             initial_val="0" left="112" max_val="9999" min_val="-9999"
+                             mouse_opaque="true" name="TexRot" width="68" />
+                        <string name="string repeats per meter">
+                                Repeats Per Meter
+                        </string>
+                        <string name="string repeats per face">
+                                Repeats Per Face
+                        </string>
+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             bottom="-250" drop_shadow_visible="true" follows="left|top"
+                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
+                             mouse_opaque="true" name="rpt" v_pad="0" width="160">
+                                Repeats Per Meter
+                        </text>
+                        <spinner bottom="-256" decimal_digits="1" follows="left|top" height="16" increment="0.1"
+                             initial_val="1" left="112" max_val="10" min_val="0.1" mouse_opaque="true"
+                             name="rptctrl" width="68" />
+                        <button bottom="-256" follows="left|top" font="SansSerifSmall" halign="center"
+                             height="16" label="Apply" label_selected="Apply" left_delta="78"
+                             mouse_opaque="true" name="button apply" scale_image="TRUE" width="75" />
+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             bottom="-288" drop_shadow_visible="true" follows="left|top"
+                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
+                             mouse_opaque="true" name="tex offset" v_pad="0" width="160">
+                                Offset
+                        </text>
+                        <spinner bottom="-308" decimal_digits="3" follows="left|top" height="16" increment="0.1"
+                             initial_val="0" label="Horizontal (U)" label_width="90" left="20"
+                             max_val="1" min_val="-1" mouse_opaque="true" name="TexOffsetU" width="160" />
+                        <spinner bottom_delta="-18" decimal_digits="3" follows="left|top" height="16"
+                             increment="0.1" initial_val="0" label="Vertical (V)" label_width="90"
+                             left="20" max_val="1" min_val="-1" mouse_opaque="true" name="TexOffsetV"
+                             width="160" />
+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             bottom="-352" drop_shadow_visible="true" follows="left|top"
+                             font="SansSerifSmall" h_pad="0" halign="left" height="20" left="10"
+                             mouse_opaque="true" name="textbox autofix" v_pad="0" width="160">
+                                Align media texture
+(must load first)
+                        </text>
+                        <button bottom="-360" follows="left|top" font="SansSerifSmall" halign="center"
+                             height="16" label="Align" label_selected="Align" left="112"
+                             mouse_opaque="true" name="button align" scale_image="TRUE" width="68" />
+                </panel>
+                <panel border="true" bottom="-383" follows="left|top|right|bottom" height="367"
+                     label="Content" left="1" mouse_opaque="false" name="Contents" width="270">
+                        <button bottom="-30" follows="left|top" font="SansSerif" halign="center" height="20"
+                              label="New Script..." label_selected="New Script..."
+                             left="10" mouse_opaque="true" name="button new script" scale_image="TRUE"
+                             width="130" />
+                        <panel bottom_delta="-330" follows="left|top" height="325"  left="10"
+                             mouse_opaque="true" name="ContentsInventory" width="252" />
+                </panel>
+        </tab_container>
+
+<!-- Land Info sub-tab -->
+
+        <panel bottom="-550" follows="left|top" height="384" left="0" mouse_opaque="true"
+             name="land info panel" width="272">
+                <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                     bottom="-18" drop_shadow_visible="true" follows="left|top"
+                     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
+                     mouse_opaque="true" name="label_area_price" v_pad="0" width="150">
+                        Price: L$[PRICE] for [AREA] sq. m.
+                </text>
+                <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                     bottom_delta="0" drop_shadow_visible="true" follows="left|top"
+                     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
+                     mouse_opaque="true" name="label_area" v_pad="0" width="128">
+                        Area: [AREA] sq. m.
+                </text>
+                <button bottom_delta="-38" follows="left|top" font="SansSerif" halign="center"
+                     height="20" label="Buy Land..." label_selected="Buy Land..." left="76"
+                     mouse_opaque="true" name="button buy land" scale_image="TRUE" width="102" />
+                <button bottom_delta="-24" follows="left|top" font="SansSerif" halign="center"
+                     height="20" label="Abandon Land..." label_selected="Abandon Land..."
+                     left="76" mouse_opaque="true" name="button abandon land" scale_image="TRUE"
+                     width="102" />
+                <button bottom_delta="-24" follows="left|top" font="SansSerif" halign="center"
+                     height="20" label="Subdivide..." label_selected="Subdivide..." left="76"
+                     mouse_opaque="true" name="button subdivide land" scale_image="TRUE"
+                     width="102" />
+                <button bottom_delta="-24" follows="left|top" font="SansSerif" halign="center"
+                     height="20" label="Join..." label_selected="Join..." left="76"
+                     mouse_opaque="true" name="button join land" scale_image="TRUE" width="102" />
+                <button bottom_delta="-40" follows="left|top" font="SansSerif" halign="center"
+                     height="20" label="About Land..." label_selected="About Land..." left="76"
+                     mouse_opaque="true" name="button about land" scale_image="TRUE" width="102" />
+        </panel>
+        <string name="status_rotate">
+                Drag colored bands to rotate object
+        </string>
+        <string name="status_scale">
+                Click and drag to stretch selected side
+        </string>
+        <string name="status_move">
+                Drag to move, shift-drag to copy
+        </string>
+        <string name="status_modifyland">
+                Click and hold to modify land
+        </string>
+        <string name="status_camera">
+                Click and drag to change view
+        </string>
+        <string name="status_grab">
+                Drag to move objects, Ctrl to lift, Ctrl-Shift to spin
+        </string>
+        <string name="status_place">
+                Click in the world to create, shift-click to select
+        </string>
+        <string name="status_selectland">
+                Click and drag to select land
+        </string>
+        <string name="grid_screen_text">
+                Screen
+        </string>
+        <string name="grid_local_text">
+                Local
+        </string>
+        <string name="grid_world_text">
+                World
+        </string>
+        <string name="grid_reference_text">
+                Reference
+        </string>
+        <string name="grid_attachment_text">
+                Attachment
+        </string>
+</floater>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_top_objects.xml b/linden/indra/newview/skins/default/xui/en-us/floater_top_objects.xml
index 2003548..2003548 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_top_objects.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_top_objects.xml
diff --git a/linden/indra/newview/skins/xui/en-us/floater_tos.xml b/linden/indra/newview/skins/default/xui/en-us/floater_tos.xml
index 68ddae0..68ddae0 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_tos.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_tos.xml
diff --git a/linden/indra/newview/skins/xui/en-us/floater_url_entry.xml b/linden/indra/newview/skins/default/xui/en-us/floater_url_entry.xml
index fb1f64a..fb1f64a 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_url_entry.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_url_entry.xml
diff --git a/linden/indra/newview/skins/xui/en-us/floater_voice_wizard.xml b/linden/indra/newview/skins/default/xui/en-us/floater_voice_wizard.xml
index 6ed2ea4..6ed2ea4 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_voice_wizard.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_voice_wizard.xml
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_water.xml b/linden/indra/newview/skins/default/xui/en-us/floater_water.xml
new file mode 100644
index 0000000..9dcb96e
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_water.xml
@@ -0,0 +1,260 @@
+<?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="18" 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="18" 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="18" 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="18" 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="18" 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="18" 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="18" 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="18" 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="18" 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="18" 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="18" 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="18" 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/xui/en-us/floater_wearable_save_as.xml b/linden/indra/newview/skins/default/xui/en-us/floater_wearable_save_as.xml
index 0284e55..0284e55 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_wearable_save_as.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_wearable_save_as.xml
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_windlight_options.xml b/linden/indra/newview/skins/default/xui/en-us/floater_windlight_options.xml
new file mode 100644
index 0000000..906e7de
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_windlight_options.xml
@@ -0,0 +1,593 @@
+<?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="-50" 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="New" label_selected="New" left_delta="170"
+             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="80"
+             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="80"
+             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="120" mouse_opaque="true" name="WLDayCycleMenuButton"
+             scale_image="true" width="120" />
+        <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="18" 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="18" 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="18" 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="18" 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="18" 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="18" 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="18" 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="18" 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="18" 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="18" 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="18" 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="18" 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="18" 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="18" 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="18" 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="18" 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="18" 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="18" 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="18" 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="18" 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="18" 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="18" 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/xui/en-us/floater_world_map.xml b/linden/indra/newview/skins/default/xui/en-us/floater_world_map.xml
index 0ebab6f..0ebab6f 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_world_map.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_world_map.xml
diff --git a/linden/indra/newview/skins/xui/en-us/menu_inventory.xml b/linden/indra/newview/skins/default/xui/en-us/menu_inventory.xml
index 31288ac..31288ac 100644
--- a/linden/indra/newview/skins/xui/en-us/menu_inventory.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_inventory.xml
diff --git a/linden/indra/newview/skins/xui/en-us/menu_login.xml b/linden/indra/newview/skins/default/xui/en-us/menu_login.xml
index d7ff80b..d7ff80b 100644
--- a/linden/indra/newview/skins/xui/en-us/menu_login.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_login.xml
diff --git a/linden/indra/newview/skins/xui/en-us/menu_pie_attachment.xml b/linden/indra/newview/skins/default/xui/en-us/menu_pie_attachment.xml
index 85028d5..85028d5 100644
--- a/linden/indra/newview/skins/xui/en-us/menu_pie_attachment.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_pie_attachment.xml
diff --git a/linden/indra/newview/skins/xui/en-us/menu_pie_avatar.xml b/linden/indra/newview/skins/default/xui/en-us/menu_pie_avatar.xml
index b224954..b224954 100644
--- a/linden/indra/newview/skins/xui/en-us/menu_pie_avatar.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_pie_avatar.xml
diff --git a/linden/indra/newview/skins/xui/en-us/menu_pie_land.xml b/linden/indra/newview/skins/default/xui/en-us/menu_pie_land.xml
index ee2a431..ee2a431 100644
--- a/linden/indra/newview/skins/xui/en-us/menu_pie_land.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_pie_land.xml
diff --git a/linden/indra/newview/skins/xui/en-us/menu_pie_object.xml b/linden/indra/newview/skins/default/xui/en-us/menu_pie_object.xml
index c5a04ce..c5a04ce 100644
--- a/linden/indra/newview/skins/xui/en-us/menu_pie_object.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_pie_object.xml
diff --git a/linden/indra/newview/skins/xui/en-us/menu_pie_self.xml b/linden/indra/newview/skins/default/xui/en-us/menu_pie_self.xml
index 72fca5e..72fca5e 100644
--- a/linden/indra/newview/skins/xui/en-us/menu_pie_self.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_pie_self.xml
diff --git a/linden/indra/newview/skins/xui/en-us/menu_slurl.xml b/linden/indra/newview/skins/default/xui/en-us/menu_slurl.xml
index 6852a70..6852a70 100644
--- a/linden/indra/newview/skins/xui/en-us/menu_slurl.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_slurl.xml
diff --git a/linden/indra/newview/skins/xui/en-us/menu_viewer.xml b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
index 054f867..054f867 100644
--- a/linden/indra/newview/skins/xui/en-us/menu_viewer.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
diff --git a/linden/indra/newview/skins/xui/en-us/mime_types.xml b/linden/indra/newview/skins/default/xui/en-us/mime_types.xml
index e2e6fb2..e2e6fb2 100644
--- a/linden/indra/newview/skins/xui/en-us/mime_types.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/mime_types.xml
diff --git a/linden/indra/newview/skins/xui/en-us/notify.xml b/linden/indra/newview/skins/default/xui/en-us/notify.xml
index 02aa57c..02aa57c 100644
--- a/linden/indra/newview/skins/xui/en-us/notify.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/notify.xml
diff --git a/linden/indra/newview/skins/xui/en-us/panel_audio.xml b/linden/indra/newview/skins/default/xui/en-us/panel_audio.xml
index b9877c8..b9877c8 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_audio.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_audio.xml
diff --git a/linden/indra/newview/skins/xui/en-us/panel_audio_device.xml b/linden/indra/newview/skins/default/xui/en-us/panel_audio_device.xml
index 39820e5..39820e5 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_audio_device.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_audio_device.xml
diff --git a/linden/indra/newview/skins/xui/en-us/panel_avatar.xml b/linden/indra/newview/skins/default/xui/en-us/panel_avatar.xml
index 78884cd..fa7f420 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_avatar.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_avatar.xml
@@ -85,11 +85,11 @@
                                 Partner:
                         </text>
                         <button bottom_delta="2" follows="left|top" font="SansSerif" halign="center"
-                             height="16" label="i" label_selected="i" left_delta="44"
+                             height="18" label="i" label_selected="i" left_delta="44"
                              mouse_opaque="true" name="partner_info"
                              tool_tip="Click to open partner&apos;s profile" width="18" />
                         <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
-                             height="16" label="?" label_selected="?" left_delta="24"
+                             height="18" label="?" label_selected="?" left_delta="24"
                              mouse_opaque="true" name="partner_help" width="18" />
                         <line_editor bevel_style="in" border_style="line"
                              border_thickness="1" bottom_delta="-16" enabled="true" follows="left|top"
@@ -158,7 +158,7 @@
                              name="allow_publish"
                              tool_tip="Publish extra profile information such as description and image in Search."
                              width="130" />
-                        <button bottom="-423" follows="left|top" font="SansSerif" halign="center" height="16"
+                        <button bottom="-425" follows="left|top" font="SansSerif" halign="center" height="20"
                              label="?" label_selected="?" left_delta="145" mouse_opaque="true" name="?"
                              width="20" />
                         <button bottom="-428" font="SansSerif" halign="center" height="20" label="Find on Map"
diff --git a/linden/indra/newview/skins/xui/en-us/panel_avatar_classified.xml b/linden/indra/newview/skins/default/xui/en-us/panel_avatar_classified.xml
index d378cb9..d378cb9 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_avatar_classified.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_avatar_classified.xml
diff --git a/linden/indra/newview/skins/xui/en-us/panel_avatar_pick.xml b/linden/indra/newview/skins/default/xui/en-us/panel_avatar_pick.xml
index af8b58c..af8b58c 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_avatar_pick.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_avatar_pick.xml
diff --git a/linden/indra/newview/skins/xui/en-us/panel_bars.xml b/linden/indra/newview/skins/default/xui/en-us/panel_bars.xml
index d8cb4d0..d8cb4d0 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_bars.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_bars.xml
diff --git a/linden/indra/newview/skins/xui/en-us/panel_bg_tab.xml b/linden/indra/newview/skins/default/xui/en-us/panel_bg_tab.xml
index 4da6be0..4da6be0 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_bg_tab.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_bg_tab.xml
diff --git a/linden/indra/newview/skins/xui/en-us/panel_bg_toolbar.xml b/linden/indra/newview/skins/default/xui/en-us/panel_bg_toolbar.xml
index af91e4e..af91e4e 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_bg_toolbar.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_bg_toolbar.xml
diff --git a/linden/indra/newview/skins/xui/en-us/panel_chat_bar.xml b/linden/indra/newview/skins/default/xui/en-us/panel_chat_bar.xml
index 20a63db..20a63db 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_chat_bar.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_chat_bar.xml
diff --git a/linden/indra/newview/skins/xui/en-us/panel_classified.xml b/linden/indra/newview/skins/default/xui/en-us/panel_classified.xml
index 063a110..063a110 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_classified.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_classified.xml
diff --git a/linden/indra/newview/skins/xui/en-us/panel_event.xml b/linden/indra/newview/skins/default/xui/en-us/panel_event.xml
index 9bb570a..9bb570a 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_event.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_event.xml
diff --git a/linden/indra/newview/skins/xui/en-us/panel_friends.xml b/linden/indra/newview/skins/default/xui/en-us/panel_friends.xml
index f6eacb1..f6eacb1 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_friends.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_friends.xml
diff --git a/linden/indra/newview/skins/xui/en-us/panel_group.xml b/linden/indra/newview/skins/default/xui/en-us/panel_group.xml
index 775c7b9..775c7b9 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_group.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_group.xml
diff --git a/linden/indra/newview/skins/xui/en-us/panel_group_finder.xml b/linden/indra/newview/skins/default/xui/en-us/panel_group_finder.xml
index 3e51568..3e51568 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_group_finder.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_group_finder.xml
diff --git a/linden/indra/newview/skins/xui/en-us/panel_group_general.xml b/linden/indra/newview/skins/default/xui/en-us/panel_group_general.xml
index 8103363..8103363 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_group_general.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_group_general.xml
diff --git a/linden/indra/newview/skins/xui/en-us/panel_group_invite.xml b/linden/indra/newview/skins/default/xui/en-us/panel_group_invite.xml
index 8c5cbb5..8c5cbb5 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_group_invite.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_group_invite.xml
diff --git a/linden/indra/newview/skins/xui/en-us/panel_group_land_money.xml b/linden/indra/newview/skins/default/xui/en-us/panel_group_land_money.xml
index f6b8838..f6b8838 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_group_land_money.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_group_land_money.xml
diff --git a/linden/indra/newview/skins/xui/en-us/panel_group_notices.xml b/linden/indra/newview/skins/default/xui/en-us/panel_group_notices.xml
index 0e5e84d..0e5e84d 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_group_notices.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_group_notices.xml
diff --git a/linden/indra/newview/skins/xui/en-us/panel_group_roles.xml b/linden/indra/newview/skins/default/xui/en-us/panel_group_roles.xml
index 53f847a..53f847a 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_group_roles.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_group_roles.xml
diff --git a/linden/indra/newview/skins/xui/en-us/panel_group_voting.xml b/linden/indra/newview/skins/default/xui/en-us/panel_group_voting.xml
index e044f34..e044f34 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_group_voting.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_group_voting.xml
diff --git a/linden/indra/newview/skins/xui/en-us/panel_groups.xml b/linden/indra/newview/skins/default/xui/en-us/panel_groups.xml
index 416f58b..416f58b 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_groups.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_groups.xml
diff --git a/linden/indra/newview/skins/xui/en-us/panel_land_covenant.xml b/linden/indra/newview/skins/default/xui/en-us/panel_land_covenant.xml
index 3d5ee66..3d5ee66 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_land_covenant.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_land_covenant.xml
diff --git a/linden/indra/newview/skins/xui/en-us/panel_login.xml b/linden/indra/newview/skins/default/xui/en-us/panel_login.xml
index 8378eb2..8378eb2 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_login.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_login.xml
diff --git a/linden/indra/newview/skins/xui/en-us/panel_master_volume.xml b/linden/indra/newview/skins/default/xui/en-us/panel_master_volume.xml
index 27bace7..27bace7 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_master_volume.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_master_volume.xml
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_media_controls.xml b/linden/indra/newview/skins/default/xui/en-us/panel_media_controls.xml
new file mode 100644
index 0000000..1fead04
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_media_controls.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

+<panel bg_visible="false" border="false" border_visible="false" bottom="1"

+     enabled="true" follows="right|bottom" height="20" left="0"

+     name="media_controls" width="262">

+        <icon bottom="-22" enabled="true" follows="left|top" height="22"

+             image_name="icn_label_music.tga" label="" left_delta="2" mouse_opaque="true"

+             name="music_icon" scale_image="true" tool_tip="Play/pause streaming music"

+             width="20" />

+        <button bottom="-21" enabled="true" follows="left|top" height="20"

+          image_overlay="icn_play.tga"

+          image_unselected="flyout_btn_left.tga"

+             image_selected="flyout_btn_left_selected.tga"

+             image_disabled="flyout_btn_left_disabled.tga"

+              label="" left_delta="20"

+             mouse_opaque="true" name="music_play" scale_image="true" toggle="false"

+             tool_tip="Play/pause streaming music" width="20" />

+  <button bottom="-21" enabled="false" follows="left|top" height="20"

+             image_overlay="icn_pause.tga"

+             image_unselected="flyout_btn_left.tga"

+             image_selected="flyout_btn_left_selected.tga"

+             image_disabled="flyout_btn_left_disabled.tga"

+             label="" left_delta="0"

+             mouse_opaque="true" name="music_pause" scale_image="true" toggle="false"

+             tool_tip="Pause streaming music" width="20" />

+  <button bottom="-21" enabled="true" follows="left|top" height="20"

+             image_overlay="icn_stop.tga"

+             image_unselected="flyout_btn_right.tga"

+             image_selected="flyout_btn_right_selected.tga"

+             image_disabled="flyout_btn_right_disabled.tga"

+             label="" left_delta="20"

+             mouse_opaque="true" name="music_stop" scale_image="true" toggle="false"

+             tool_tip="Stop streaming music" width="20" />

+  <icon bottom="-22" enabled="true" follows="left|top" height="22"

+             image_name="icn_label_media.tga"

+             label="" left_delta="23" mouse_opaque="true"

+             name="media_icon" scale_image="true" tool_tip="Play/pause streaming music"

+             width="20" />

+  <button bottom="-21" enabled="true" follows="left|top" height="20"

+             image_overlay="icn_play.tga"

+             image_unselected="flyout_btn_left.tga"

+             image_selected="flyout_btn_left_selected.tga"

+             image_disabled="flyout_btn_left_disabled.tga"

+             label="" left_delta="21"

+             mouse_opaque="true" name="media_play" scale_image="true" toggle="false"

+             tool_tip="Play/pause streaming music" width="20" />

+  <button bottom="-21" enabled="false" follows="left|top" height="20"

+             image_overlay="icn_pause.tga"

+                          image_unselected="flyout_btn_left.tga"

+             image_selected="flyout_btn_left_selected.tga"

+             image_disabled="flyout_btn_left_disabled.tga"

+             label="" left_delta="0"

+             mouse_opaque="true" name="media_pause" scale_image="true" toggle="false"

+             tool_tip="Pause streaming media" width="20" />

+        <button bottom="-21" enabled="true" follows="left|top" height="20"

+             image_overlay="icn_stop.tga"

+                          image_unselected="flyout_btn_right.tga"

+             image_selected="flyout_btn_right_selected.tga"

+             image_disabled="flyout_btn_right_disabled.tga"

+             label="" left_delta="20"

+             mouse_opaque="true" name="media_stop" scale_image="true" toggle="false"

+             tool_tip="Stop streaming media" width="20" />

+        <volume_slider bottom="-23" control_name="AudioLevelMaster" height="22" increment="0.05"

+             initial_val="0.5" left_delta="15" max_val="1" min_val="0"

+             mouse_opaque="true" name="volume_slider" tool_tip="Master Volume"

+             width="56" />

+        <button bottom="-19" control_name="MuteAudio" height="20"

+             image_selected="icn_speaker-muted_dark.tga"

+             image_unselected="icn_speaker_dark.tga" label="" left_delta="56"

+             name="mute_master" toggle="true" tool_tip="Master Mute" width="24" />

+        <button bottom="-22" control_name="ShowVolumeSettingsPopup" height="22" label=""

+             left_delta="19" name="expand" scale_image="true" toggle="true"

+             tool_tip="Adjust individual volume levels" width="22" />

+        

+        <string name="play_label">

+                Play

+        </string>

+        <string name="stop_label">

+                Stop

+        </string>

+        <string name="pause_label">

+                Pause

+        </string>

+        <string name="default_tooltip_label">

+                No Media Specified

+        </string>

+        <string name="media_hidden_label">

+                (URL hidden by parcel owner)

+        </string>

+        <string name="media_icon_tooltip_web">

+                This location displays content from the World Wide Web. Click the Play button to display Web content.

+        </string>

+        <string name="media_icon_tooltip_movie">

+                This location displays Video content. Click the Play button to play the video.

+        </string>

+        <string name="media_play_tooltip">

+                Display Web content at this location.

+        </string>

+</panel>

diff --git a/linden/indra/newview/skins/xui/en-us/panel_media_remote.xml b/linden/indra/newview/skins/default/xui/en-us/panel_media_remote.xml
index 86c977d..86c977d 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_media_remote.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_media_remote.xml
diff --git a/linden/indra/newview/skins/xui/en-us/panel_media_remote_expanded.xml b/linden/indra/newview/skins/default/xui/en-us/panel_media_remote_expanded.xml
index 3c3f8b1..3c3f8b1 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_media_remote_expanded.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_media_remote_expanded.xml
diff --git a/linden/indra/newview/skins/xui/en-us/panel_overlaybar.xml b/linden/indra/newview/skins/default/xui/en-us/panel_overlaybar.xml
index bcd7bbc..bcd7bbc 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_overlaybar.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_overlaybar.xml
diff --git a/linden/indra/newview/skins/xui/en-us/panel_place.xml b/linden/indra/newview/skins/default/xui/en-us/panel_place.xml
index d960a1a..d960a1a 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_place.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_place.xml
diff --git a/linden/indra/newview/skins/xui/en-us/panel_place_small.xml b/linden/indra/newview/skins/default/xui/en-us/panel_place_small.xml
index 1020a0a..1020a0a 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_place_small.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_place_small.xml
diff --git a/linden/indra/newview/skins/xui/en-us/panel_preferences_LCD.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_LCD.xml
index 2cc8b13..2cc8b13 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_preferences_LCD.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_LCD.xml
diff --git a/linden/indra/newview/skins/xui/en-us/panel_preferences_audio.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_audio.xml
index 92978ab..92978ab 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_preferences_audio.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_audio.xml
diff --git a/linden/indra/newview/skins/xui/en-us/panel_preferences_chat.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml
index 27ec29a..27ec29a 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_preferences_chat.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml
diff --git a/linden/indra/newview/skins/xui/en-us/panel_preferences_general.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
index 99a376b..99a376b 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_preferences_general.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
diff --git a/linden/indra/newview/skins/xui/en-us/panel_preferences_graphics1.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml
index 527309e..527309e 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_preferences_graphics1.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml
diff --git a/linden/indra/newview/skins/xui/en-us/panel_preferences_im.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml
index 493b153..493b153 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_preferences_im.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml
diff --git a/linden/indra/newview/skins/xui/en-us/panel_preferences_input.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_input.xml
index 85aab95..85aab95 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_preferences_input.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_input.xml
diff --git a/linden/indra/newview/skins/xui/en-us/panel_preferences_network.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_network.xml
index 6834ab5..6834ab5 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_preferences_network.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_network.xml
diff --git a/linden/indra/newview/skins/xui/en-us/panel_preferences_popups.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_popups.xml
index 5e8f871..5e8f871 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_preferences_popups.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_popups.xml
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_skins.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_skins.xml
new file mode 100644
index 0000000..7bf4ab2
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_skins.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

+<panel border="true" bottom="-409" enabled="true" follows="left|top|right|bottom"

+     height="408" label="Skins" left="102" mouse_opaque="true"

+     name="Skins panel" width="517">

+        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

+             bottom="-22" drop_shadow_visible="true" enabled="true" follows="left|top"

+             font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10"

+             mouse_opaque="true" name="muting_text" v_pad="0" width="400">

+                Select a skin (requires restart):

+        </text>

+  <radio_group bottom="0" draw_border="false" follows="top|left" height="380" left="12"

+             name="skin_selection" width="480">

+    <radio_item bottom="-20" height="20" left="0" name="default" width="480">

+      Classic

+    </radio_item>

+    <radio_item bottom="-180" height="20" left="0" name="silver" width="480">

+      Silver

+    </radio_item>

+  </radio_group>

+  <button left="130" bottom="-160" width="301" height="129" name="classic_preview" label="" scale_image="true" image_selected="skin_thumbnail_classic.png" image_unselected="skin_thumbnail_classic.png"/>

+  <button left="130" bottom="-320" width="301" height="129" name="silver_preview" label="" scale_image="true" image_selected="skin_thumbnail_modern.png" image_unselected="skin_thumbnail_modern.png"/>

+</panel>

diff --git a/linden/indra/newview/skins/xui/en-us/panel_preferences_voice.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_voice.xml
index 62fb7b7..62fb7b7 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_preferences_voice.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_voice.xml
diff --git a/linden/indra/newview/skins/xui/en-us/panel_preferences_web.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_web.xml
index 4d84e32..4d84e32 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_preferences_web.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_web.xml
diff --git a/linden/indra/newview/skins/xui/en-us/panel_region_covenant.xml b/linden/indra/newview/skins/default/xui/en-us/panel_region_covenant.xml
index 9bb7d90..9bb7d90 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_region_covenant.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_region_covenant.xml
diff --git a/linden/indra/newview/skins/xui/en-us/panel_region_debug.xml b/linden/indra/newview/skins/default/xui/en-us/panel_region_debug.xml
index b1c2bb7..b1c2bb7 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_region_debug.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_region_debug.xml
diff --git a/linden/indra/newview/skins/xui/en-us/panel_region_estate.xml b/linden/indra/newview/skins/default/xui/en-us/panel_region_estate.xml
index fa172aa..fa172aa 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_region_estate.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_region_estate.xml
diff --git a/linden/indra/newview/skins/xui/en-us/panel_region_general.xml b/linden/indra/newview/skins/default/xui/en-us/panel_region_general.xml
index af3cecf..af3cecf 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_region_general.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_region_general.xml
diff --git a/linden/indra/newview/skins/xui/en-us/panel_region_terrain.xml b/linden/indra/newview/skins/default/xui/en-us/panel_region_terrain.xml
index e93e87c..e93e87c 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_region_terrain.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_region_terrain.xml
diff --git a/linden/indra/newview/skins/xui/en-us/panel_region_texture.xml b/linden/indra/newview/skins/default/xui/en-us/panel_region_texture.xml
index 9b9a58b..9b9a58b 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_region_texture.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_region_texture.xml
diff --git a/linden/indra/newview/skins/xui/en-us/panel_scrolling_param.xml b/linden/indra/newview/skins/default/xui/en-us/panel_scrolling_param.xml
index b4281a2..b4281a2 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_scrolling_param.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_scrolling_param.xml
diff --git a/linden/indra/newview/skins/xui/en-us/panel_speaker_controls.xml b/linden/indra/newview/skins/default/xui/en-us/panel_speaker_controls.xml
index 1a9b6a8..1a9b6a8 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_speaker_controls.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_speaker_controls.xml
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_status_bar.xml b/linden/indra/newview/skins/default/xui/en-us/panel_status_bar.xml
new file mode 100644
index 0000000..614f1f9
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_status_bar.xml
@@ -0,0 +1,121 @@
+<?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="llPushObject restricted" 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="-95" width="94" 
+          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" border_drop_shadow_visible="false" bottom="-16"
+             commit_on_focus_lost="false" enabled="true" follows="right|bottom"
+             font="SansSerifSmall" handle_edit_keys_directly="false" height="11"
+             label="Search" left="-94" 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="78"/>
+        <button bottom="-17" enabled="true" follows="right|bottom" font="SansSerifSmall"
+             halign="center" height="16" image_unselected="status_search_btn.png" image_selected="status_search_btn_pressed.png" image_disabled_selected="status_search_btn_pressed.png" image_disabled="status_search_btn.png"
+             label="" label_selected="" left="-16" mouse_opaque="true" name="search_btn"
+             tool_tip="Search Second Life" width="16" scale_image="false"/>
+        <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/default/xui/en-us/panel_toolbar.xml b/linden/indra/newview/skins/default/xui/en-us/panel_toolbar.xml
new file mode 100644
index 0000000..9c57be0
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_toolbar.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel background_opaque="true" background_visible="true" bottom="0" can_close="true"
+     can_minimize="false" can_resize="false" follows="left|right|bottom"
+     height="28" name="toolbar" width="1024">
+    
+  <string name="Redock Windows">Redock Windows</string>
+  <!-- panel bottom="0" filename="panel_bg_toolbar.xml" height="28" left="0" width="1024" /-->
+  <layout_stack name="toolbar_stack" follows="left|right|bottom|top" bottom="2" left="1" width="1022" height="26" min_width="200" min_height="26"  orientation="horizontal" border_size="0">
+    <icon image_name="spacer24.tga" width="2" height="2" follows="left|right" auto_resize="false" color="0,0,0,0" left="0" />
+    <button bottom="0" font="SansSerif" height="24"
+               image_selected="btn_chatbar_selected.tga" scale_image="true"
+               image_unselected="btn_chatbar.tga" label="" left="2" name="chat_btn"
+               image_overlay="icn_chatbar.tga" tool_tip="Show Chat Bar. (Enter)"
+               width="50" auto_resize="false" follows="left|right" user_resize="false"/>
+    <icon image_name="spacer24.tga" left_delta="2" width="2" height="2" follows="left|right" auto_resize="false" color="0,0,0,0"/>
+     <flyout_button bottom="0" font="SansSerif" height="24" label="Communicate" left="0"
+               name="communicate_btn" tool_tip="Communicate with your Friends and Groups."
+               list_position="above"
+               width="50" follows="left|right" user_resize="false"/>
+    <icon image_name="spacer24.tga" width="2" height="2" follows="left|right" auto_resize="false" color="0,0,0,0"/>
+    <button bottom="0" font="SansSerif" height="24" label="Fly"
+        image_overlay="icn_toolbar_fly.tga" image_overlay_alignment="left"
+                        image_selected="toolbar_btn_selected.tga"
+             image_unselected="toolbar_btn_enabled.tga"
+             image_disabled="toolbar_btn_disabled.tga" scale_image="true"
+               label_selected="Stop Flying" left="0" name="fly_btn"
+               tool_tip="Start flying. Use E/C or PgUp/PgDn to fly up and down."
+               width="50" follows="left|right" user_resize="false"/>
+    <button bottom="0" font="SansSerif" height="24" label="Snapshot" left="0"
+             image_overlay="icn_toolbar_snapshot.tga" image_overlay_alignment="left"
+                        image_selected="toolbar_btn_selected.tga"
+             image_unselected="toolbar_btn_enabled.tga"
+             image_disabled="toolbar_btn_disabled.tga" scale_image="true"
+               name="snapshot_btn" tool_tip="Save a screen shot to disk or inventory."
+               width="50" follows="left|right" user_resize="false"/>
+    <button bottom="0" font="SansSerif" height="24" label="Search" left="0"
+             image_overlay="icn_toolbar_search.tga" image_overlay_alignment="left"
+             image_selected="toolbar_btn_selected.tga"
+             image_unselected="toolbar_btn_enabled.tga"
+             image_disabled="toolbar_btn_disabled.tga" scale_image="true"
+               name="directory_btn"
+               tool_tip="Search for places, events, people, and more." width="50" follows="left|right" user_resize="false"/>
+    <button bottom="0" font="SansSerif" height="24" label="Build" left="0" name="build_btn"
+                         image_overlay="icn_toolbar_build.tga" image_overlay_alignment="left"
+                        image_selected="toolbar_btn_selected.tga"
+             image_unselected="toolbar_btn_enabled.tga"
+             image_disabled="toolbar_btn_disabled.tga" scale_image="true"
+               tool_tip="Create new objects." width="50" follows="left|right" user_resize="false"/>
+    <button bottom="0" font="SansSerif" height="24" label="Map" left="0" name="map_btn"
+                         image_overlay="icn_toolbar_map.tga" image_overlay_alignment="left"
+                        image_selected="toolbar_btn_selected.tga"
+             image_unselected="toolbar_btn_enabled.tga"
+             image_disabled="toolbar_btn_disabled.tga" scale_image="true"
+               tool_tip="Map of the world. (Ctrl-M)" width="50" follows="left|right" user_resize="false"/>
+    <button bottom="0" font="SansSerif" height="24" label="Mini-Map" left="0"
+                         image_overlay="icn_toolbar_minimap.tga" image_overlay_alignment="left"
+                        image_selected="toolbar_btn_selected.tga"
+             image_unselected="toolbar_btn_enabled.tga"
+             image_disabled="toolbar_btn_disabled.tga" scale_image="true"
+               name="radar_btn" tool_tip="Map of the area around you. (Ctrl-Shift-M)"
+               width="50" follows="left|right" user_resize="false"/>
+    <button bottom="0" font="SansSerif" height="24" label="Inventory" left="0"
+                         image_overlay="icn_toolbar_inventory.tga" image_overlay_alignment="left"
+                        image_selected="toolbar_btn_selected.tga"
+             image_unselected="toolbar_btn_enabled.tga"
+             image_disabled="toolbar_btn_disabled.tga" scale_image="true"
+               name="inventory_btn" tool_tip="Your items. (Ctrl-I)" width="50" follows="left|right" user_resize="false"/>
+  </layout_stack>
+
+</panel>
diff --git a/linden/indra/newview/skins/xui/en-us/panel_top_pick.xml b/linden/indra/newview/skins/default/xui/en-us/panel_top_pick.xml
index 03d0919..03d0919 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_top_pick.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_top_pick.xml
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_voice_controls.xml b/linden/indra/newview/skins/default/xui/en-us/panel_voice_controls.xml
new file mode 100644
index 0000000..c588dc5
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_voice_controls.xml
@@ -0,0 +1,19 @@
+<?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="128">

+        <button bottom="-22" height="22" image_overlay="active_speakers.tga" label="" left="2"

+             name="speakers_btn"

+             tool_tip="Show list of residents using voice chat around you" width="38" />

+        <button bottom="-22" height="22" label="Talk" left_delta="40" name="push_to_talk"

+             tab_stop="false" tool_tip="Hold the button to talk" width="64" />

+        <button bottom="-19" height="16" image_selected="ptt_lock_on.tga"

+             image_unselected="ptt_lock_off.tga" label="" left_delta="4" 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="-22" control_name="ShowVoiceChannelPopup" height="22" label=""

+             left_delta="20" name="show_channel" scale_image="true" toggle="true"

+             tool_tip="Click to show current voice channel" width="22" />

+</panel>

diff --git a/linden/indra/newview/skins/xui/en-us/panel_voice_enable.xml b/linden/indra/newview/skins/default/xui/en-us/panel_voice_enable.xml
index fdec2f4..fdec2f4 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_voice_enable.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_voice_enable.xml
diff --git a/linden/indra/newview/skins/xui/en-us/panel_voice_options.xml b/linden/indra/newview/skins/default/xui/en-us/panel_voice_options.xml
index 0ecf3fc..0ecf3fc 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_voice_options.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_voice_options.xml
diff --git a/linden/indra/newview/skins/xui/en-us/panel_voice_remote.xml b/linden/indra/newview/skins/default/xui/en-us/panel_voice_remote.xml
index c785e72..c785e72 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_voice_remote.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_voice_remote.xml
diff --git a/linden/indra/newview/skins/xui/en-us/panel_voice_remote_expanded.xml b/linden/indra/newview/skins/default/xui/en-us/panel_voice_remote_expanded.xml
index 7464467..7464467 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_voice_remote_expanded.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_voice_remote_expanded.xml
diff --git a/linden/indra/newview/skins/xui/en-us/role_actions.xml b/linden/indra/newview/skins/default/xui/en-us/role_actions.xml
index bcd23d5..bcd23d5 100644
--- a/linden/indra/newview/skins/xui/en-us/role_actions.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/role_actions.xml
diff --git a/linden/indra/newview/skins/xui/en-us/strings.xml b/linden/indra/newview/skins/default/xui/en-us/strings.xml
index 9952d56..9952d56 100644
--- a/linden/indra/newview/skins/xui/en-us/strings.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/strings.xml
diff --git a/linden/indra/newview/skins/xui/en-us/teleport_strings.xml b/linden/indra/newview/skins/default/xui/en-us/teleport_strings.xml
index 616dc1a..616dc1a 100644
--- a/linden/indra/newview/skins/xui/en-us/teleport_strings.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/teleport_strings.xml
diff --git a/linden/indra/newview/skins/xui/en-us/xui_version.xml b/linden/indra/newview/skins/default/xui/en-us/xui_version.xml
index 0e77775..0e77775 100644
--- a/linden/indra/newview/skins/xui/en-us/xui_version.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/xui_version.xml
diff --git a/linden/indra/newview/skins/xui/es/alerts.xml b/linden/indra/newview/skins/default/xui/es/alerts.xml
index da0e94c..da0e94c 100644
--- a/linden/indra/newview/skins/xui/es/alerts.xml
+++ b/linden/indra/newview/skins/default/xui/es/alerts.xml
diff --git a/linden/indra/newview/skins/xui/es/floater_about.xml b/linden/indra/newview/skins/default/xui/es/floater_about.xml
index c9273dc..c9273dc 100644
--- a/linden/indra/newview/skins/xui/es/floater_about.xml
+++ b/linden/indra/newview/skins/default/xui/es/floater_about.xml
diff --git a/linden/indra/newview/skins/xui/es/floater_about_land.xml b/linden/indra/newview/skins/default/xui/es/floater_about_land.xml
index 1411093..1411093 100644
--- a/linden/indra/newview/skins/xui/es/floater_about_land.xml
+++ b/linden/indra/newview/skins/default/xui/es/floater_about_land.xml
diff --git a/linden/indra/newview/skins/xui/es/floater_animation_preview.xml b/linden/indra/newview/skins/default/xui/es/floater_animation_preview.xml
index 9ca7956..9ca7956 100644
--- a/linden/indra/newview/skins/xui/es/floater_animation_preview.xml
+++ b/linden/indra/newview/skins/default/xui/es/floater_animation_preview.xml
diff --git a/linden/indra/newview/skins/xui/es/floater_auction.xml b/linden/indra/newview/skins/default/xui/es/floater_auction.xml
index d0a2629..d0a2629 100644
--- a/linden/indra/newview/skins/xui/es/floater_auction.xml
+++ b/linden/indra/newview/skins/default/xui/es/floater_auction.xml
diff --git a/linden/indra/newview/skins/xui/es/floater_avatar_picker.xml b/linden/indra/newview/skins/default/xui/es/floater_avatar_picker.xml
index 85e3f74..85e3f74 100644
--- a/linden/indra/newview/skins/xui/es/floater_avatar_picker.xml
+++ b/linden/indra/newview/skins/default/xui/es/floater_avatar_picker.xml
diff --git a/linden/indra/newview/skins/xui/es/floater_avatar_textures.xml b/linden/indra/newview/skins/default/xui/es/floater_avatar_textures.xml
index 4f99f16..4f99f16 100644
--- a/linden/indra/newview/skins/xui/es/floater_avatar_textures.xml
+++ b/linden/indra/newview/skins/default/xui/es/floater_avatar_textures.xml
diff --git a/linden/indra/newview/skins/xui/es/floater_build_options.xml b/linden/indra/newview/skins/default/xui/es/floater_build_options.xml
index fa0250e..fa0250e 100644
--- a/linden/indra/newview/skins/xui/es/floater_build_options.xml
+++ b/linden/indra/newview/skins/default/xui/es/floater_build_options.xml
diff --git a/linden/indra/newview/skins/xui/es/floater_bumps.xml b/linden/indra/newview/skins/default/xui/es/floater_bumps.xml
index 99cc6ae..99cc6ae 100644
--- a/linden/indra/newview/skins/xui/es/floater_bumps.xml
+++ b/linden/indra/newview/skins/default/xui/es/floater_bumps.xml
diff --git a/linden/indra/newview/skins/xui/es/floater_buy_contents.xml b/linden/indra/newview/skins/default/xui/es/floater_buy_contents.xml
index 307cddc..307cddc 100644
--- a/linden/indra/newview/skins/xui/es/floater_buy_contents.xml
+++ b/linden/indra/newview/skins/default/xui/es/floater_buy_contents.xml
diff --git a/linden/indra/newview/skins/xui/es/floater_buy_currency.xml b/linden/indra/newview/skins/default/xui/es/floater_buy_currency.xml
index aa8a8e0..aa8a8e0 100644
--- a/linden/indra/newview/skins/xui/es/floater_buy_currency.xml
+++ b/linden/indra/newview/skins/default/xui/es/floater_buy_currency.xml
diff --git a/linden/indra/newview/skins/xui/es/floater_buy_land.xml b/linden/indra/newview/skins/default/xui/es/floater_buy_land.xml
index 7e7ea71..7e7ea71 100644
--- a/linden/indra/newview/skins/xui/es/floater_buy_land.xml
+++ b/linden/indra/newview/skins/default/xui/es/floater_buy_land.xml
diff --git a/linden/indra/newview/skins/xui/es/floater_buy_object.xml b/linden/indra/newview/skins/default/xui/es/floater_buy_object.xml
index 1d06306..1d06306 100644
--- a/linden/indra/newview/skins/xui/es/floater_buy_object.xml
+++ b/linden/indra/newview/skins/default/xui/es/floater_buy_object.xml
diff --git a/linden/indra/newview/skins/xui/es/floater_chat_history.xml b/linden/indra/newview/skins/default/xui/es/floater_chat_history.xml
index 66e716b..66e716b 100644
--- a/linden/indra/newview/skins/xui/es/floater_chat_history.xml
+++ b/linden/indra/newview/skins/default/xui/es/floater_chat_history.xml
diff --git a/linden/indra/newview/skins/xui/es/floater_choose_group.xml b/linden/indra/newview/skins/default/xui/es/floater_choose_group.xml
index 4d66e3b..4d66e3b 100644
--- a/linden/indra/newview/skins/xui/es/floater_choose_group.xml
+++ b/linden/indra/newview/skins/default/xui/es/floater_choose_group.xml
diff --git a/linden/indra/newview/skins/xui/es/floater_clothing.xml b/linden/indra/newview/skins/default/xui/es/floater_clothing.xml
index 89693f8..89693f8 100644
--- a/linden/indra/newview/skins/xui/es/floater_clothing.xml
+++ b/linden/indra/newview/skins/default/xui/es/floater_clothing.xml
diff --git a/linden/indra/newview/skins/xui/es/floater_color_picker.xml b/linden/indra/newview/skins/default/xui/es/floater_color_picker.xml
index d7f1a99..d7f1a99 100644
--- a/linden/indra/newview/skins/xui/es/floater_color_picker.xml
+++ b/linden/indra/newview/skins/default/xui/es/floater_color_picker.xml
diff --git a/linden/indra/newview/skins/xui/es/floater_critical.xml b/linden/indra/newview/skins/default/xui/es/floater_critical.xml
index 92c996d..92c996d 100644
--- a/linden/indra/newview/skins/xui/es/floater_critical.xml
+++ b/linden/indra/newview/skins/default/xui/es/floater_critical.xml
diff --git a/linden/indra/newview/skins/xui/es/floater_customize.xml b/linden/indra/newview/skins/default/xui/es/floater_customize.xml
index 1a5b279..1a5b279 100644
--- a/linden/indra/newview/skins/xui/es/floater_customize.xml
+++ b/linden/indra/newview/skins/default/xui/es/floater_customize.xml
diff --git a/linden/indra/newview/skins/xui/es/floater_directory.xml b/linden/indra/newview/skins/default/xui/es/floater_directory.xml
index ae43be8..ae43be8 100644
--- a/linden/indra/newview/skins/xui/es/floater_directory.xml
+++ b/linden/indra/newview/skins/default/xui/es/floater_directory.xml
diff --git a/linden/indra/newview/skins/xui/es/floater_gesture.xml b/linden/indra/newview/skins/default/xui/es/floater_gesture.xml
index 1df5846..1df5846 100644
--- a/linden/indra/newview/skins/xui/es/floater_gesture.xml
+++ b/linden/indra/newview/skins/default/xui/es/floater_gesture.xml
diff --git a/linden/indra/newview/skins/xui/es/floater_god_tools.xml b/linden/indra/newview/skins/default/xui/es/floater_god_tools.xml
index 2b734ec..2b734ec 100644
--- a/linden/indra/newview/skins/xui/es/floater_god_tools.xml
+++ b/linden/indra/newview/skins/default/xui/es/floater_god_tools.xml
diff --git a/linden/indra/newview/skins/xui/es/floater_group_info.xml b/linden/indra/newview/skins/default/xui/es/floater_group_info.xml
index 4e5d877..4e5d877 100644
--- a/linden/indra/newview/skins/xui/es/floater_group_info.xml
+++ b/linden/indra/newview/skins/default/xui/es/floater_group_info.xml
diff --git a/linden/indra/newview/skins/xui/es/floater_html.xml b/linden/indra/newview/skins/default/xui/es/floater_html.xml
index ab36540..ab36540 100644
--- a/linden/indra/newview/skins/xui/es/floater_html.xml
+++ b/linden/indra/newview/skins/default/xui/es/floater_html.xml
diff --git a/linden/indra/newview/skins/xui/es/floater_im.xml b/linden/indra/newview/skins/default/xui/es/floater_im.xml
index 5653d03..5653d03 100644
--- a/linden/indra/newview/skins/xui/es/floater_im.xml
+++ b/linden/indra/newview/skins/default/xui/es/floater_im.xml
diff --git a/linden/indra/newview/skins/xui/es/floater_image_preview.xml b/linden/indra/newview/skins/default/xui/es/floater_image_preview.xml
index b4ef4ad..b4ef4ad 100644
--- a/linden/indra/newview/skins/xui/es/floater_image_preview.xml
+++ b/linden/indra/newview/skins/default/xui/es/floater_image_preview.xml
diff --git a/linden/indra/newview/skins/xui/es/floater_import.xml b/linden/indra/newview/skins/default/xui/es/floater_import.xml
index 02883a8..02883a8 100644
--- a/linden/indra/newview/skins/xui/es/floater_import.xml
+++ b/linden/indra/newview/skins/default/xui/es/floater_import.xml
diff --git a/linden/indra/newview/skins/xui/es/floater_instant_message.xml b/linden/indra/newview/skins/default/xui/es/floater_instant_message.xml
index 660e4dc..660e4dc 100644
--- a/linden/indra/newview/skins/xui/es/floater_instant_message.xml
+++ b/linden/indra/newview/skins/default/xui/es/floater_instant_message.xml
diff --git a/linden/indra/newview/skins/xui/es/floater_inventory.xml b/linden/indra/newview/skins/default/xui/es/floater_inventory.xml
index f3807ac..f3807ac 100644
--- a/linden/indra/newview/skins/xui/es/floater_inventory.xml
+++ b/linden/indra/newview/skins/default/xui/es/floater_inventory.xml
diff --git a/linden/indra/newview/skins/xui/es/floater_inventory_item_properties.xml b/linden/indra/newview/skins/default/xui/es/floater_inventory_item_properties.xml
index 5405203..5405203 100644
--- a/linden/indra/newview/skins/xui/es/floater_inventory_item_properties.xml
+++ b/linden/indra/newview/skins/default/xui/es/floater_inventory_item_properties.xml
diff --git a/linden/indra/newview/skins/xui/es/floater_inventory_view_finder.xml b/linden/indra/newview/skins/default/xui/es/floater_inventory_view_finder.xml
index 53d2c40..53d2c40 100644
--- a/linden/indra/newview/skins/xui/es/floater_inventory_view_finder.xml
+++ b/linden/indra/newview/skins/default/xui/es/floater_inventory_view_finder.xml
diff --git a/linden/indra/newview/skins/xui/es/floater_land_holdings.xml b/linden/indra/newview/skins/default/xui/es/floater_land_holdings.xml
index e2347c6..e2347c6 100644
--- a/linden/indra/newview/skins/xui/es/floater_land_holdings.xml
+++ b/linden/indra/newview/skins/default/xui/es/floater_land_holdings.xml
diff --git a/linden/indra/newview/skins/xui/es/floater_live_lsleditor.xml b/linden/indra/newview/skins/default/xui/es/floater_live_lsleditor.xml
index 3cc3f0e..3cc3f0e 100644
--- a/linden/indra/newview/skins/xui/es/floater_live_lsleditor.xml
+++ b/linden/indra/newview/skins/default/xui/es/floater_live_lsleditor.xml
diff --git a/linden/indra/newview/skins/xui/es/floater_moveview.xml b/linden/indra/newview/skins/default/xui/es/floater_moveview.xml
index 1072bb2..1072bb2 100644
--- a/linden/indra/newview/skins/xui/es/floater_moveview.xml
+++ b/linden/indra/newview/skins/default/xui/es/floater_moveview.xml
diff --git a/linden/indra/newview/skins/xui/es/floater_mute.xml b/linden/indra/newview/skins/default/xui/es/floater_mute.xml
index b85345b..b85345b 100644
--- a/linden/indra/newview/skins/xui/es/floater_mute.xml
+++ b/linden/indra/newview/skins/default/xui/es/floater_mute.xml
diff --git a/linden/indra/newview/skins/xui/es/floater_name_description.xml b/linden/indra/newview/skins/default/xui/es/floater_name_description.xml
index b6ef0e5..b6ef0e5 100644
--- a/linden/indra/newview/skins/xui/es/floater_name_description.xml
+++ b/linden/indra/newview/skins/default/xui/es/floater_name_description.xml
diff --git a/linden/indra/newview/skins/xui/es/floater_new_im.xml b/linden/indra/newview/skins/default/xui/es/floater_new_im.xml
index a4646e9..a4646e9 100644
--- a/linden/indra/newview/skins/xui/es/floater_new_im.xml
+++ b/linden/indra/newview/skins/default/xui/es/floater_new_im.xml
diff --git a/linden/indra/newview/skins/xui/es/floater_new_outfit_dialog.xml b/linden/indra/newview/skins/default/xui/es/floater_new_outfit_dialog.xml
index 11d282b..11d282b 100644
--- a/linden/indra/newview/skins/xui/es/floater_new_outfit_dialog.xml
+++ b/linden/indra/newview/skins/default/xui/es/floater_new_outfit_dialog.xml
diff --git a/linden/indra/newview/skins/xui/es/floater_openobject.xml b/linden/indra/newview/skins/default/xui/es/floater_openobject.xml
index e6062e8..e6062e8 100644
--- a/linden/indra/newview/skins/xui/es/floater_openobject.xml
+++ b/linden/indra/newview/skins/default/xui/es/floater_openobject.xml
diff --git a/linden/indra/newview/skins/xui/es/floater_pay.xml b/linden/indra/newview/skins/default/xui/es/floater_pay.xml
index e097399..e097399 100644
--- a/linden/indra/newview/skins/xui/es/floater_pay.xml
+++ b/linden/indra/newview/skins/default/xui/es/floater_pay.xml
diff --git a/linden/indra/newview/skins/xui/es/floater_pay_object.xml b/linden/indra/newview/skins/default/xui/es/floater_pay_object.xml
index 18e9829..18e9829 100644
--- a/linden/indra/newview/skins/xui/es/floater_pay_object.xml
+++ b/linden/indra/newview/skins/default/xui/es/floater_pay_object.xml
diff --git a/linden/indra/newview/skins/xui/es/floater_postcard.xml b/linden/indra/newview/skins/default/xui/es/floater_postcard.xml
index 55e2351..55e2351 100644
--- a/linden/indra/newview/skins/xui/es/floater_postcard.xml
+++ b/linden/indra/newview/skins/default/xui/es/floater_postcard.xml
diff --git a/linden/indra/newview/skins/xui/es/floater_preferences.xml b/linden/indra/newview/skins/default/xui/es/floater_preferences.xml
index 70862a0..70862a0 100644
--- a/linden/indra/newview/skins/xui/es/floater_preferences.xml
+++ b/linden/indra/newview/skins/default/xui/es/floater_preferences.xml
diff --git a/linden/indra/newview/skins/xui/es/floater_preview_animation.xml b/linden/indra/newview/skins/default/xui/es/floater_preview_animation.xml
index c7e46d5..c7e46d5 100644
--- a/linden/indra/newview/skins/xui/es/floater_preview_animation.xml
+++ b/linden/indra/newview/skins/default/xui/es/floater_preview_animation.xml
diff --git a/linden/indra/newview/skins/xui/es/floater_preview_embedded_texture.xml b/linden/indra/newview/skins/default/xui/es/floater_preview_embedded_texture.xml
index 9f110e6..9f110e6 100644
--- a/linden/indra/newview/skins/xui/es/floater_preview_embedded_texture.xml
+++ b/linden/indra/newview/skins/default/xui/es/floater_preview_embedded_texture.xml
diff --git a/linden/indra/newview/skins/xui/es/floater_preview_existing_landmark.xml b/linden/indra/newview/skins/default/xui/es/floater_preview_existing_landmark.xml
index 8605a52..8605a52 100644
--- a/linden/indra/newview/skins/xui/es/floater_preview_existing_landmark.xml
+++ b/linden/indra/newview/skins/default/xui/es/floater_preview_existing_landmark.xml
diff --git a/linden/indra/newview/skins/xui/es/floater_preview_gesture.xml b/linden/indra/newview/skins/default/xui/es/floater_preview_gesture.xml
index 65b768a..65b768a 100644
--- a/linden/indra/newview/skins/xui/es/floater_preview_gesture.xml
+++ b/linden/indra/newview/skins/default/xui/es/floater_preview_gesture.xml
diff --git a/linden/indra/newview/skins/xui/es/floater_preview_notecard.xml b/linden/indra/newview/skins/default/xui/es/floater_preview_notecard.xml
index 9c45dbc..9c45dbc 100644
--- a/linden/indra/newview/skins/xui/es/floater_preview_notecard.xml
+++ b/linden/indra/newview/skins/default/xui/es/floater_preview_notecard.xml
diff --git a/linden/indra/newview/skins/xui/es/floater_preview_notecard_keep_discard.xml b/linden/indra/newview/skins/default/xui/es/floater_preview_notecard_keep_discard.xml
index 4e1b991..4e1b991 100644
--- a/linden/indra/newview/skins/xui/es/floater_preview_notecard_keep_discard.xml
+++ b/linden/indra/newview/skins/default/xui/es/floater_preview_notecard_keep_discard.xml
diff --git a/linden/indra/newview/skins/xui/es/floater_preview_sound.xml b/linden/indra/newview/skins/default/xui/es/floater_preview_sound.xml
index 93f7937..93f7937 100644
--- a/linden/indra/newview/skins/xui/es/floater_preview_sound.xml
+++ b/linden/indra/newview/skins/default/xui/es/floater_preview_sound.xml
diff --git a/linden/indra/newview/skins/xui/es/floater_preview_texture.xml b/linden/indra/newview/skins/default/xui/es/floater_preview_texture.xml
index e450ac2..e450ac2 100644
--- a/linden/indra/newview/skins/xui/es/floater_preview_texture.xml
+++ b/linden/indra/newview/skins/default/xui/es/floater_preview_texture.xml
diff --git a/linden/indra/newview/skins/xui/es/floater_preview_texture_keep_discard.xml b/linden/indra/newview/skins/default/xui/es/floater_preview_texture_keep_discard.xml
index 383d8f5..383d8f5 100644
--- a/linden/indra/newview/skins/xui/es/floater_preview_texture_keep_discard.xml
+++ b/linden/indra/newview/skins/default/xui/es/floater_preview_texture_keep_discard.xml
diff --git a/linden/indra/newview/skins/xui/es/floater_price_for_listing.xml b/linden/indra/newview/skins/default/xui/es/floater_price_for_listing.xml
index 7490c14..7490c14 100644
--- a/linden/indra/newview/skins/xui/es/floater_price_for_listing.xml
+++ b/linden/indra/newview/skins/default/xui/es/floater_price_for_listing.xml
diff --git a/linden/indra/newview/skins/xui/es/floater_profile.xml b/linden/indra/newview/skins/default/xui/es/floater_profile.xml
index f87fc8d..f87fc8d 100644
--- a/linden/indra/newview/skins/xui/es/floater_profile.xml
+++ b/linden/indra/newview/skins/default/xui/es/floater_profile.xml
diff --git a/linden/indra/newview/skins/xui/es/floater_report_abuse.xml b/linden/indra/newview/skins/default/xui/es/floater_report_abuse.xml
index c0461e9..c0461e9 100644
--- a/linden/indra/newview/skins/xui/es/floater_report_abuse.xml
+++ b/linden/indra/newview/skins/default/xui/es/floater_report_abuse.xml
diff --git a/linden/indra/newview/skins/xui/es/floater_report_bug.xml b/linden/indra/newview/skins/default/xui/es/floater_report_bug.xml
index 9cdc287..9cdc287 100644
--- a/linden/indra/newview/skins/xui/es/floater_report_bug.xml
+++ b/linden/indra/newview/skins/default/xui/es/floater_report_bug.xml
diff --git a/linden/indra/newview/skins/xui/es/floater_script_debug.xml b/linden/indra/newview/skins/default/xui/es/floater_script_debug.xml
index db57b03..db57b03 100644
--- a/linden/indra/newview/skins/xui/es/floater_script_debug.xml
+++ b/linden/indra/newview/skins/default/xui/es/floater_script_debug.xml
diff --git a/linden/indra/newview/skins/xui/es/floater_script_ed_panel.xml b/linden/indra/newview/skins/default/xui/es/floater_script_ed_panel.xml
index f2f6e10..f2f6e10 100644
--- a/linden/indra/newview/skins/xui/es/floater_script_ed_panel.xml
+++ b/linden/indra/newview/skins/default/xui/es/floater_script_ed_panel.xml
diff --git a/linden/indra/newview/skins/xui/es/floater_script_preview.xml b/linden/indra/newview/skins/default/xui/es/floater_script_preview.xml
index 1e93da5..1e93da5 100644
--- a/linden/indra/newview/skins/xui/es/floater_script_preview.xml
+++ b/linden/indra/newview/skins/default/xui/es/floater_script_preview.xml
diff --git a/linden/indra/newview/skins/xui/es/floater_script_queue.xml b/linden/indra/newview/skins/default/xui/es/floater_script_queue.xml
index f2f283c..f2f283c 100644
--- a/linden/indra/newview/skins/xui/es/floater_script_queue.xml
+++ b/linden/indra/newview/skins/default/xui/es/floater_script_queue.xml
diff --git a/linden/indra/newview/skins/xui/es/floater_script_search.xml b/linden/indra/newview/skins/default/xui/es/floater_script_search.xml
index 04a6436..04a6436 100644
--- a/linden/indra/newview/skins/xui/es/floater_script_search.xml
+++ b/linden/indra/newview/skins/default/xui/es/floater_script_search.xml
diff --git a/linden/indra/newview/skins/xui/es/floater_sell_land.xml b/linden/indra/newview/skins/default/xui/es/floater_sell_land.xml
index d4b7556..d4b7556 100644
--- a/linden/indra/newview/skins/xui/es/floater_sell_land.xml
+++ b/linden/indra/newview/skins/default/xui/es/floater_sell_land.xml
diff --git a/linden/indra/newview/skins/xui/es/floater_settings_debug.xml b/linden/indra/newview/skins/default/xui/es/floater_settings_debug.xml
index fd695fd..fd695fd 100644
--- a/linden/indra/newview/skins/xui/es/floater_settings_debug.xml
+++ b/linden/indra/newview/skins/default/xui/es/floater_settings_debug.xml
diff --git a/linden/indra/newview/skins/xui/es/floater_snapshot.xml b/linden/indra/newview/skins/default/xui/es/floater_snapshot.xml
index 245a2fe..245a2fe 100644
--- a/linden/indra/newview/skins/xui/es/floater_snapshot.xml
+++ b/linden/indra/newview/skins/default/xui/es/floater_snapshot.xml
diff --git a/linden/indra/newview/skins/xui/es/floater_sound_preview.xml b/linden/indra/newview/skins/default/xui/es/floater_sound_preview.xml
index 28e6ff6..28e6ff6 100644
--- a/linden/indra/newview/skins/xui/es/floater_sound_preview.xml
+++ b/linden/indra/newview/skins/default/xui/es/floater_sound_preview.xml
diff --git a/linden/indra/newview/skins/xui/es/floater_telehub.xml b/linden/indra/newview/skins/default/xui/es/floater_telehub.xml
index cd9cce8..cd9cce8 100644
--- a/linden/indra/newview/skins/xui/es/floater_telehub.xml
+++ b/linden/indra/newview/skins/default/xui/es/floater_telehub.xml
diff --git a/linden/indra/newview/skins/xui/es/floater_texture_ctrl.xml b/linden/indra/newview/skins/default/xui/es/floater_texture_ctrl.xml
index 933a553..933a553 100644
--- a/linden/indra/newview/skins/xui/es/floater_texture_ctrl.xml
+++ b/linden/indra/newview/skins/default/xui/es/floater_texture_ctrl.xml
diff --git a/linden/indra/newview/skins/xui/es/floater_tools.xml b/linden/indra/newview/skins/default/xui/es/floater_tools.xml
index 6fb0368..6fb0368 100644
--- a/linden/indra/newview/skins/xui/es/floater_tools.xml
+++ b/linden/indra/newview/skins/default/xui/es/floater_tools.xml
diff --git a/linden/indra/newview/skins/xui/es/floater_top_objects.xml b/linden/indra/newview/skins/default/xui/es/floater_top_objects.xml
index bdfd04d..bdfd04d 100644
--- a/linden/indra/newview/skins/xui/es/floater_top_objects.xml
+++ b/linden/indra/newview/skins/default/xui/es/floater_top_objects.xml
diff --git a/linden/indra/newview/skins/xui/es/floater_tos.xml b/linden/indra/newview/skins/default/xui/es/floater_tos.xml
index 6047b64..6047b64 100644
--- a/linden/indra/newview/skins/xui/es/floater_tos.xml
+++ b/linden/indra/newview/skins/default/xui/es/floater_tos.xml
diff --git a/linden/indra/newview/skins/xui/es/floater_wearable_save_as.xml b/linden/indra/newview/skins/default/xui/es/floater_wearable_save_as.xml
index 3d3d512..3d3d512 100644
--- a/linden/indra/newview/skins/xui/es/floater_wearable_save_as.xml
+++ b/linden/indra/newview/skins/default/xui/es/floater_wearable_save_as.xml
diff --git a/linden/indra/newview/skins/xui/es/floater_world_map.xml b/linden/indra/newview/skins/default/xui/es/floater_world_map.xml
index d3b45a9..d3b45a9 100644
--- a/linden/indra/newview/skins/xui/es/floater_world_map.xml
+++ b/linden/indra/newview/skins/default/xui/es/floater_world_map.xml
diff --git a/linden/indra/newview/skins/xui/es/menu_inventory.xml b/linden/indra/newview/skins/default/xui/es/menu_inventory.xml
index 2331020..2331020 100644
--- a/linden/indra/newview/skins/xui/es/menu_inventory.xml
+++ b/linden/indra/newview/skins/default/xui/es/menu_inventory.xml
diff --git a/linden/indra/newview/skins/xui/es/menu_pie_attachment.xml b/linden/indra/newview/skins/default/xui/es/menu_pie_attachment.xml
index a2277e9..a2277e9 100644
--- a/linden/indra/newview/skins/xui/es/menu_pie_attachment.xml
+++ b/linden/indra/newview/skins/default/xui/es/menu_pie_attachment.xml
diff --git a/linden/indra/newview/skins/xui/es/menu_pie_avatar.xml b/linden/indra/newview/skins/default/xui/es/menu_pie_avatar.xml
index 2caec32..2caec32 100644
--- a/linden/indra/newview/skins/xui/es/menu_pie_avatar.xml
+++ b/linden/indra/newview/skins/default/xui/es/menu_pie_avatar.xml
diff --git a/linden/indra/newview/skins/xui/es/menu_pie_land.xml b/linden/indra/newview/skins/default/xui/es/menu_pie_land.xml
index 4fd6699..4fd6699 100644
--- a/linden/indra/newview/skins/xui/es/menu_pie_land.xml
+++ b/linden/indra/newview/skins/default/xui/es/menu_pie_land.xml
diff --git a/linden/indra/newview/skins/xui/es/menu_pie_object.xml b/linden/indra/newview/skins/default/xui/es/menu_pie_object.xml
index 842e7e0..842e7e0 100644
--- a/linden/indra/newview/skins/xui/es/menu_pie_object.xml
+++ b/linden/indra/newview/skins/default/xui/es/menu_pie_object.xml
diff --git a/linden/indra/newview/skins/xui/es/menu_pie_self.xml b/linden/indra/newview/skins/default/xui/es/menu_pie_self.xml
index 03a176b..03a176b 100644
--- a/linden/indra/newview/skins/xui/es/menu_pie_self.xml
+++ b/linden/indra/newview/skins/default/xui/es/menu_pie_self.xml
diff --git a/linden/indra/newview/skins/xui/es/menu_viewer.xml b/linden/indra/newview/skins/default/xui/es/menu_viewer.xml
index bb67d7c..bb67d7c 100644
--- a/linden/indra/newview/skins/xui/es/menu_viewer.xml
+++ b/linden/indra/newview/skins/default/xui/es/menu_viewer.xml
diff --git a/linden/indra/newview/skins/xui/es/notify.xml b/linden/indra/newview/skins/default/xui/es/notify.xml
index fbb2ee7..fbb2ee7 100644
--- a/linden/indra/newview/skins/xui/es/notify.xml
+++ b/linden/indra/newview/skins/default/xui/es/notify.xml
diff --git a/linden/indra/newview/skins/xui/es/panel_avatar.xml b/linden/indra/newview/skins/default/xui/es/panel_avatar.xml
index a4a6df7..a4a6df7 100644
--- a/linden/indra/newview/skins/xui/es/panel_avatar.xml
+++ b/linden/indra/newview/skins/default/xui/es/panel_avatar.xml
diff --git a/linden/indra/newview/skins/xui/es/panel_avatar_classified.xml b/linden/indra/newview/skins/default/xui/es/panel_avatar_classified.xml
index f07d47c..f07d47c 100644
--- a/linden/indra/newview/skins/xui/es/panel_avatar_classified.xml
+++ b/linden/indra/newview/skins/default/xui/es/panel_avatar_classified.xml
diff --git a/linden/indra/newview/skins/xui/es/panel_avatar_pick.xml b/linden/indra/newview/skins/default/xui/es/panel_avatar_pick.xml
index 85fcec7..85fcec7 100644
--- a/linden/indra/newview/skins/xui/es/panel_avatar_pick.xml
+++ b/linden/indra/newview/skins/default/xui/es/panel_avatar_pick.xml
diff --git a/linden/indra/newview/skins/xui/es/panel_chat_bar.xml b/linden/indra/newview/skins/default/xui/es/panel_chat_bar.xml
index e388719..e388719 100644
--- a/linden/indra/newview/skins/xui/es/panel_chat_bar.xml
+++ b/linden/indra/newview/skins/default/xui/es/panel_chat_bar.xml
diff --git a/linden/indra/newview/skins/xui/es/panel_classified.xml b/linden/indra/newview/skins/default/xui/es/panel_classified.xml
index bc177f6..bc177f6 100644
--- a/linden/indra/newview/skins/xui/es/panel_classified.xml
+++ b/linden/indra/newview/skins/default/xui/es/panel_classified.xml
diff --git a/linden/indra/newview/skins/xui/es/panel_event.xml b/linden/indra/newview/skins/default/xui/es/panel_event.xml
index b28833f..b28833f 100644
--- a/linden/indra/newview/skins/xui/es/panel_event.xml
+++ b/linden/indra/newview/skins/default/xui/es/panel_event.xml
diff --git a/linden/indra/newview/skins/xui/es/panel_group.xml b/linden/indra/newview/skins/default/xui/es/panel_group.xml
index 1332e0f..1332e0f 100644
--- a/linden/indra/newview/skins/xui/es/panel_group.xml
+++ b/linden/indra/newview/skins/default/xui/es/panel_group.xml
diff --git a/linden/indra/newview/skins/xui/es/panel_group_finder.xml b/linden/indra/newview/skins/default/xui/es/panel_group_finder.xml
index b2d0917..b2d0917 100644
--- a/linden/indra/newview/skins/xui/es/panel_group_finder.xml
+++ b/linden/indra/newview/skins/default/xui/es/panel_group_finder.xml
diff --git a/linden/indra/newview/skins/xui/es/panel_group_general.xml b/linden/indra/newview/skins/default/xui/es/panel_group_general.xml
index ec31765..ec31765 100644
--- a/linden/indra/newview/skins/xui/es/panel_group_general.xml
+++ b/linden/indra/newview/skins/default/xui/es/panel_group_general.xml
diff --git a/linden/indra/newview/skins/xui/es/panel_group_invite.xml b/linden/indra/newview/skins/default/xui/es/panel_group_invite.xml
index abd6d94..abd6d94 100644
--- a/linden/indra/newview/skins/xui/es/panel_group_invite.xml
+++ b/linden/indra/newview/skins/default/xui/es/panel_group_invite.xml
diff --git a/linden/indra/newview/skins/xui/es/panel_group_land_money.xml b/linden/indra/newview/skins/default/xui/es/panel_group_land_money.xml
index 268b62f..268b62f 100644
--- a/linden/indra/newview/skins/xui/es/panel_group_land_money.xml
+++ b/linden/indra/newview/skins/default/xui/es/panel_group_land_money.xml
diff --git a/linden/indra/newview/skins/xui/es/panel_group_notices.xml b/linden/indra/newview/skins/default/xui/es/panel_group_notices.xml
index 62d884d..62d884d 100644
--- a/linden/indra/newview/skins/xui/es/panel_group_notices.xml
+++ b/linden/indra/newview/skins/default/xui/es/panel_group_notices.xml
diff --git a/linden/indra/newview/skins/xui/es/panel_group_roles.xml b/linden/indra/newview/skins/default/xui/es/panel_group_roles.xml
index 5dd8be4..5dd8be4 100644
--- a/linden/indra/newview/skins/xui/es/panel_group_roles.xml
+++ b/linden/indra/newview/skins/default/xui/es/panel_group_roles.xml
diff --git a/linden/indra/newview/skins/xui/es/panel_group_voting.xml b/linden/indra/newview/skins/default/xui/es/panel_group_voting.xml
index 186434b..186434b 100644
--- a/linden/indra/newview/skins/xui/es/panel_group_voting.xml
+++ b/linden/indra/newview/skins/default/xui/es/panel_group_voting.xml
diff --git a/linden/indra/newview/skins/xui/es/panel_land_covenant.xml b/linden/indra/newview/skins/default/xui/es/panel_land_covenant.xml
index 1fda379..1fda379 100644
--- a/linden/indra/newview/skins/xui/es/panel_land_covenant.xml
+++ b/linden/indra/newview/skins/default/xui/es/panel_land_covenant.xml
diff --git a/linden/indra/newview/skins/xui/es/panel_login.xml b/linden/indra/newview/skins/default/xui/es/panel_login.xml
index 7b79f2e..7b79f2e 100644
--- a/linden/indra/newview/skins/xui/es/panel_login.xml
+++ b/linden/indra/newview/skins/default/xui/es/panel_login.xml
diff --git a/linden/indra/newview/skins/xui/es/panel_media_remote.xml b/linden/indra/newview/skins/default/xui/es/panel_media_remote.xml
index b3c194d..b3c194d 100644
--- a/linden/indra/newview/skins/xui/es/panel_media_remote.xml
+++ b/linden/indra/newview/skins/default/xui/es/panel_media_remote.xml
diff --git a/linden/indra/newview/skins/xui/es/panel_overlaybar.xml b/linden/indra/newview/skins/default/xui/es/panel_overlaybar.xml
index 3f91574..3f91574 100644
--- a/linden/indra/newview/skins/xui/es/panel_overlaybar.xml
+++ b/linden/indra/newview/skins/default/xui/es/panel_overlaybar.xml
diff --git a/linden/indra/newview/skins/xui/es/panel_place.xml b/linden/indra/newview/skins/default/xui/es/panel_place.xml
index 65f866e..65f866e 100644
--- a/linden/indra/newview/skins/xui/es/panel_place.xml
+++ b/linden/indra/newview/skins/default/xui/es/panel_place.xml
diff --git a/linden/indra/newview/skins/xui/es/panel_place_small.xml b/linden/indra/newview/skins/default/xui/es/panel_place_small.xml
index 65f866e..65f866e 100644
--- a/linden/indra/newview/skins/xui/es/panel_place_small.xml
+++ b/linden/indra/newview/skins/default/xui/es/panel_place_small.xml
diff --git a/linden/indra/newview/skins/xui/es/panel_preferences_audio.xml b/linden/indra/newview/skins/default/xui/es/panel_preferences_audio.xml
index ff9c232..ff9c232 100644
--- a/linden/indra/newview/skins/xui/es/panel_preferences_audio.xml
+++ b/linden/indra/newview/skins/default/xui/es/panel_preferences_audio.xml
diff --git a/linden/indra/newview/skins/xui/es/panel_preferences_chat.xml b/linden/indra/newview/skins/default/xui/es/panel_preferences_chat.xml
index 6ce405f..6ce405f 100644
--- a/linden/indra/newview/skins/xui/es/panel_preferences_chat.xml
+++ b/linden/indra/newview/skins/default/xui/es/panel_preferences_chat.xml
diff --git a/linden/indra/newview/skins/xui/es/panel_preferences_general.xml b/linden/indra/newview/skins/default/xui/es/panel_preferences_general.xml
index 66fb9bd..66fb9bd 100644
--- a/linden/indra/newview/skins/xui/es/panel_preferences_general.xml
+++ b/linden/indra/newview/skins/default/xui/es/panel_preferences_general.xml
diff --git a/linden/indra/newview/skins/xui/es/panel_preferences_graphics1.xml b/linden/indra/newview/skins/default/xui/es/panel_preferences_graphics1.xml
index 9e85b2a..9e85b2a 100644
--- a/linden/indra/newview/skins/xui/es/panel_preferences_graphics1.xml
+++ b/linden/indra/newview/skins/default/xui/es/panel_preferences_graphics1.xml
diff --git a/linden/indra/newview/skins/xui/es/panel_preferences_im.xml b/linden/indra/newview/skins/default/xui/es/panel_preferences_im.xml
index 89e4159..89e4159 100644
--- a/linden/indra/newview/skins/xui/es/panel_preferences_im.xml
+++ b/linden/indra/newview/skins/default/xui/es/panel_preferences_im.xml
diff --git a/linden/indra/newview/skins/xui/es/panel_preferences_input.xml b/linden/indra/newview/skins/default/xui/es/panel_preferences_input.xml
index 29fc14b..29fc14b 100644
--- a/linden/indra/newview/skins/xui/es/panel_preferences_input.xml
+++ b/linden/indra/newview/skins/default/xui/es/panel_preferences_input.xml
diff --git a/linden/indra/newview/skins/xui/es/panel_preferences_network.xml b/linden/indra/newview/skins/default/xui/es/panel_preferences_network.xml
index f72decc..f72decc 100644
--- a/linden/indra/newview/skins/xui/es/panel_preferences_network.xml
+++ b/linden/indra/newview/skins/default/xui/es/panel_preferences_network.xml
diff --git a/linden/indra/newview/skins/xui/es/panel_preferences_popups.xml b/linden/indra/newview/skins/default/xui/es/panel_preferences_popups.xml
index 6ac24b8..6ac24b8 100644
--- a/linden/indra/newview/skins/xui/es/panel_preferences_popups.xml
+++ b/linden/indra/newview/skins/default/xui/es/panel_preferences_popups.xml
diff --git a/linden/indra/newview/skins/xui/es/panel_region_covenant.xml b/linden/indra/newview/skins/default/xui/es/panel_region_covenant.xml
index 9e34f43..9e34f43 100644
--- a/linden/indra/newview/skins/xui/es/panel_region_covenant.xml
+++ b/linden/indra/newview/skins/default/xui/es/panel_region_covenant.xml
diff --git a/linden/indra/newview/skins/xui/es/panel_region_debug.xml b/linden/indra/newview/skins/default/xui/es/panel_region_debug.xml
index 2ecca0f..2ecca0f 100644
--- a/linden/indra/newview/skins/xui/es/panel_region_debug.xml
+++ b/linden/indra/newview/skins/default/xui/es/panel_region_debug.xml
diff --git a/linden/indra/newview/skins/xui/es/panel_region_estate.xml b/linden/indra/newview/skins/default/xui/es/panel_region_estate.xml
index e23de17..e23de17 100644
--- a/linden/indra/newview/skins/xui/es/panel_region_estate.xml
+++ b/linden/indra/newview/skins/default/xui/es/panel_region_estate.xml
diff --git a/linden/indra/newview/skins/xui/es/panel_region_general.xml b/linden/indra/newview/skins/default/xui/es/panel_region_general.xml
index 2bc6e94..2bc6e94 100644
--- a/linden/indra/newview/skins/xui/es/panel_region_general.xml
+++ b/linden/indra/newview/skins/default/xui/es/panel_region_general.xml
diff --git a/linden/indra/newview/skins/xui/es/panel_region_terrain.xml b/linden/indra/newview/skins/default/xui/es/panel_region_terrain.xml
index d60f4ac..d60f4ac 100644
--- a/linden/indra/newview/skins/xui/es/panel_region_terrain.xml
+++ b/linden/indra/newview/skins/default/xui/es/panel_region_terrain.xml
diff --git a/linden/indra/newview/skins/xui/es/panel_region_texture.xml b/linden/indra/newview/skins/default/xui/es/panel_region_texture.xml
index 4969194..4969194 100644
--- a/linden/indra/newview/skins/xui/es/panel_region_texture.xml
+++ b/linden/indra/newview/skins/default/xui/es/panel_region_texture.xml
diff --git a/linden/indra/newview/skins/xui/es/panel_scrolling_param.xml b/linden/indra/newview/skins/default/xui/es/panel_scrolling_param.xml
index 4b27d00..4b27d00 100644
--- a/linden/indra/newview/skins/xui/es/panel_scrolling_param.xml
+++ b/linden/indra/newview/skins/default/xui/es/panel_scrolling_param.xml
diff --git a/linden/indra/newview/skins/xui/es/panel_status_bar.xml b/linden/indra/newview/skins/default/xui/es/panel_status_bar.xml
index f9f2733..f9f2733 100644
--- a/linden/indra/newview/skins/xui/es/panel_status_bar.xml
+++ b/linden/indra/newview/skins/default/xui/es/panel_status_bar.xml
diff --git a/linden/indra/newview/skins/xui/es/panel_toolbar.xml b/linden/indra/newview/skins/default/xui/es/panel_toolbar.xml
index b804f95..b804f95 100644
--- a/linden/indra/newview/skins/xui/es/panel_toolbar.xml
+++ b/linden/indra/newview/skins/default/xui/es/panel_toolbar.xml
diff --git a/linden/indra/newview/skins/xui/es/panel_top_pick.xml b/linden/indra/newview/skins/default/xui/es/panel_top_pick.xml
index c1dd09d..c1dd09d 100644
--- a/linden/indra/newview/skins/xui/es/panel_top_pick.xml
+++ b/linden/indra/newview/skins/default/xui/es/panel_top_pick.xml
diff --git a/linden/indra/newview/skins/xui/es/role_actions.xml b/linden/indra/newview/skins/default/xui/es/role_actions.xml
index 1e10ccf..1e10ccf 100644
--- a/linden/indra/newview/skins/xui/es/role_actions.xml
+++ b/linden/indra/newview/skins/default/xui/es/role_actions.xml
diff --git a/linden/indra/newview/skins/xui/es/xui_version.xml b/linden/indra/newview/skins/default/xui/es/xui_version.xml
index ee2a0be..ee2a0be 100644
--- a/linden/indra/newview/skins/xui/es/xui_version.xml
+++ b/linden/indra/newview/skins/default/xui/es/xui_version.xml
diff --git a/linden/indra/newview/skins/xui/fr/alerts.xml b/linden/indra/newview/skins/default/xui/fr/alerts.xml
index d8272d3..d8272d3 100644
--- a/linden/indra/newview/skins/xui/fr/alerts.xml
+++ b/linden/indra/newview/skins/default/xui/fr/alerts.xml
diff --git a/linden/indra/newview/skins/xui/fr/floater_about.xml b/linden/indra/newview/skins/default/xui/fr/floater_about.xml
index 2c8ab77..2c8ab77 100644
--- a/linden/indra/newview/skins/xui/fr/floater_about.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_about.xml
diff --git a/linden/indra/newview/skins/xui/fr/floater_about_land.xml b/linden/indra/newview/skins/default/xui/fr/floater_about_land.xml
index cfd117c..cfd117c 100644
--- a/linden/indra/newview/skins/xui/fr/floater_about_land.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_about_land.xml
diff --git a/linden/indra/newview/skins/xui/fr/floater_animation_preview.xml b/linden/indra/newview/skins/default/xui/fr/floater_animation_preview.xml
index 93028ee..93028ee 100644
--- a/linden/indra/newview/skins/xui/fr/floater_animation_preview.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_animation_preview.xml
diff --git a/linden/indra/newview/skins/xui/fr/floater_auction.xml b/linden/indra/newview/skins/default/xui/fr/floater_auction.xml
index 7fbfecd..7fbfecd 100644
--- a/linden/indra/newview/skins/xui/fr/floater_auction.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_auction.xml
diff --git a/linden/indra/newview/skins/xui/fr/floater_avatar_picker.xml b/linden/indra/newview/skins/default/xui/fr/floater_avatar_picker.xml
index cd16361..cd16361 100644
--- a/linden/indra/newview/skins/xui/fr/floater_avatar_picker.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_avatar_picker.xml
diff --git a/linden/indra/newview/skins/xui/fr/floater_avatar_textures.xml b/linden/indra/newview/skins/default/xui/fr/floater_avatar_textures.xml
index d7954e9..d7954e9 100644
--- a/linden/indra/newview/skins/xui/fr/floater_avatar_textures.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_avatar_textures.xml
diff --git a/linden/indra/newview/skins/xui/fr/floater_build_options.xml b/linden/indra/newview/skins/default/xui/fr/floater_build_options.xml
index f05e522..f05e522 100644
--- a/linden/indra/newview/skins/xui/fr/floater_build_options.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_build_options.xml
diff --git a/linden/indra/newview/skins/xui/fr/floater_bumps.xml b/linden/indra/newview/skins/default/xui/fr/floater_bumps.xml
index 5f39ba6..5f39ba6 100644
--- a/linden/indra/newview/skins/xui/fr/floater_bumps.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_bumps.xml
diff --git a/linden/indra/newview/skins/xui/fr/floater_buy_contents.xml b/linden/indra/newview/skins/default/xui/fr/floater_buy_contents.xml
index 2902ad7..2902ad7 100644
--- a/linden/indra/newview/skins/xui/fr/floater_buy_contents.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_buy_contents.xml
diff --git a/linden/indra/newview/skins/xui/fr/floater_buy_currency.xml b/linden/indra/newview/skins/default/xui/fr/floater_buy_currency.xml
index e43b3b0..e43b3b0 100644
--- a/linden/indra/newview/skins/xui/fr/floater_buy_currency.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_buy_currency.xml
diff --git a/linden/indra/newview/skins/xui/fr/floater_buy_land.xml b/linden/indra/newview/skins/default/xui/fr/floater_buy_land.xml
index d1ddbbe..d1ddbbe 100644
--- a/linden/indra/newview/skins/xui/fr/floater_buy_land.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_buy_land.xml
diff --git a/linden/indra/newview/skins/xui/fr/floater_buy_object.xml b/linden/indra/newview/skins/default/xui/fr/floater_buy_object.xml
index 66b9b58..66b9b58 100644
--- a/linden/indra/newview/skins/xui/fr/floater_buy_object.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_buy_object.xml
diff --git a/linden/indra/newview/skins/xui/fr/floater_chat_history.xml b/linden/indra/newview/skins/default/xui/fr/floater_chat_history.xml
index 31dec87..31dec87 100644
--- a/linden/indra/newview/skins/xui/fr/floater_chat_history.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_chat_history.xml
diff --git a/linden/indra/newview/skins/xui/fr/floater_choose_group.xml b/linden/indra/newview/skins/default/xui/fr/floater_choose_group.xml
index 06977e5..06977e5 100644
--- a/linden/indra/newview/skins/xui/fr/floater_choose_group.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_choose_group.xml
diff --git a/linden/indra/newview/skins/xui/fr/floater_clothing.xml b/linden/indra/newview/skins/default/xui/fr/floater_clothing.xml
index 93f9665..93f9665 100644
--- a/linden/indra/newview/skins/xui/fr/floater_clothing.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_clothing.xml
diff --git a/linden/indra/newview/skins/xui/fr/floater_color_picker.xml b/linden/indra/newview/skins/default/xui/fr/floater_color_picker.xml
index 66452a3..66452a3 100644
--- a/linden/indra/newview/skins/xui/fr/floater_color_picker.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_color_picker.xml
diff --git a/linden/indra/newview/skins/xui/fr/floater_critical.xml b/linden/indra/newview/skins/default/xui/fr/floater_critical.xml
index f7b55c8..f7b55c8 100644
--- a/linden/indra/newview/skins/xui/fr/floater_critical.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_critical.xml
diff --git a/linden/indra/newview/skins/xui/fr/floater_customize.xml b/linden/indra/newview/skins/default/xui/fr/floater_customize.xml
index 55a7a41..55a7a41 100644
--- a/linden/indra/newview/skins/xui/fr/floater_customize.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_customize.xml
diff --git a/linden/indra/newview/skins/xui/fr/floater_directory.xml b/linden/indra/newview/skins/default/xui/fr/floater_directory.xml
index fe58289..fe58289 100644
--- a/linden/indra/newview/skins/xui/fr/floater_directory.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_directory.xml
diff --git a/linden/indra/newview/skins/xui/fr/floater_gesture.xml b/linden/indra/newview/skins/default/xui/fr/floater_gesture.xml
index b83f600..b83f600 100644
--- a/linden/indra/newview/skins/xui/fr/floater_gesture.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_gesture.xml
diff --git a/linden/indra/newview/skins/xui/fr/floater_god_tools.xml b/linden/indra/newview/skins/default/xui/fr/floater_god_tools.xml
index 2139392..2139392 100644
--- a/linden/indra/newview/skins/xui/fr/floater_god_tools.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_god_tools.xml
diff --git a/linden/indra/newview/skins/xui/fr/floater_group_info.xml b/linden/indra/newview/skins/default/xui/fr/floater_group_info.xml
index 0906005..0906005 100644
--- a/linden/indra/newview/skins/xui/fr/floater_group_info.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_group_info.xml
diff --git a/linden/indra/newview/skins/xui/fr/floater_html.xml b/linden/indra/newview/skins/default/xui/fr/floater_html.xml
index c60d6ca..c60d6ca 100644
--- a/linden/indra/newview/skins/xui/fr/floater_html.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_html.xml
diff --git a/linden/indra/newview/skins/xui/fr/floater_im.xml b/linden/indra/newview/skins/default/xui/fr/floater_im.xml
index 158e02f..158e02f 100644
--- a/linden/indra/newview/skins/xui/fr/floater_im.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_im.xml
diff --git a/linden/indra/newview/skins/xui/fr/floater_image_preview.xml b/linden/indra/newview/skins/default/xui/fr/floater_image_preview.xml
index 47dd811..47dd811 100644
--- a/linden/indra/newview/skins/xui/fr/floater_image_preview.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_image_preview.xml
diff --git a/linden/indra/newview/skins/xui/fr/floater_import.xml b/linden/indra/newview/skins/default/xui/fr/floater_import.xml
index 8cf086f..8cf086f 100644
--- a/linden/indra/newview/skins/xui/fr/floater_import.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_import.xml
diff --git a/linden/indra/newview/skins/xui/fr/floater_instant_message.xml b/linden/indra/newview/skins/default/xui/fr/floater_instant_message.xml
index c70eb51..c70eb51 100644
--- a/linden/indra/newview/skins/xui/fr/floater_instant_message.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_instant_message.xml
diff --git a/linden/indra/newview/skins/xui/fr/floater_inventory.xml b/linden/indra/newview/skins/default/xui/fr/floater_inventory.xml
index 5aa0127..5aa0127 100644
--- a/linden/indra/newview/skins/xui/fr/floater_inventory.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_inventory.xml
diff --git a/linden/indra/newview/skins/xui/fr/floater_inventory_item_properties.xml b/linden/indra/newview/skins/default/xui/fr/floater_inventory_item_properties.xml
index 9791248..9791248 100644
--- a/linden/indra/newview/skins/xui/fr/floater_inventory_item_properties.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_inventory_item_properties.xml
diff --git a/linden/indra/newview/skins/xui/fr/floater_inventory_view_finder.xml b/linden/indra/newview/skins/default/xui/fr/floater_inventory_view_finder.xml
index 4187a82..4187a82 100644
--- a/linden/indra/newview/skins/xui/fr/floater_inventory_view_finder.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_inventory_view_finder.xml
diff --git a/linden/indra/newview/skins/xui/fr/floater_land_holdings.xml b/linden/indra/newview/skins/default/xui/fr/floater_land_holdings.xml
index 8ef1029..8ef1029 100644
--- a/linden/indra/newview/skins/xui/fr/floater_land_holdings.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_land_holdings.xml
diff --git a/linden/indra/newview/skins/xui/fr/floater_live_lsleditor.xml b/linden/indra/newview/skins/default/xui/fr/floater_live_lsleditor.xml
index f759464..f759464 100644
--- a/linden/indra/newview/skins/xui/fr/floater_live_lsleditor.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_live_lsleditor.xml
diff --git a/linden/indra/newview/skins/xui/fr/floater_moveview.xml b/linden/indra/newview/skins/default/xui/fr/floater_moveview.xml
index d9d0910..d9d0910 100644
--- a/linden/indra/newview/skins/xui/fr/floater_moveview.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_moveview.xml
diff --git a/linden/indra/newview/skins/xui/fr/floater_mute.xml b/linden/indra/newview/skins/default/xui/fr/floater_mute.xml
index 89f59bf..89f59bf 100644
--- a/linden/indra/newview/skins/xui/fr/floater_mute.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_mute.xml
diff --git a/linden/indra/newview/skins/xui/fr/floater_name_description.xml b/linden/indra/newview/skins/default/xui/fr/floater_name_description.xml
index dbe97f8..dbe97f8 100644
--- a/linden/indra/newview/skins/xui/fr/floater_name_description.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_name_description.xml
diff --git a/linden/indra/newview/skins/xui/fr/floater_new_im.xml b/linden/indra/newview/skins/default/xui/fr/floater_new_im.xml
index 8f4b9c2..8f4b9c2 100644
--- a/linden/indra/newview/skins/xui/fr/floater_new_im.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_new_im.xml
diff --git a/linden/indra/newview/skins/xui/fr/floater_new_outfit_dialog.xml b/linden/indra/newview/skins/default/xui/fr/floater_new_outfit_dialog.xml
index c1188b4..c1188b4 100644
--- a/linden/indra/newview/skins/xui/fr/floater_new_outfit_dialog.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_new_outfit_dialog.xml
diff --git a/linden/indra/newview/skins/xui/fr/floater_openobject.xml b/linden/indra/newview/skins/default/xui/fr/floater_openobject.xml
index 8f12527..8f12527 100644
--- a/linden/indra/newview/skins/xui/fr/floater_openobject.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_openobject.xml
diff --git a/linden/indra/newview/skins/xui/fr/floater_pay.xml b/linden/indra/newview/skins/default/xui/fr/floater_pay.xml
index b3e39f8..b3e39f8 100644
--- a/linden/indra/newview/skins/xui/fr/floater_pay.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_pay.xml
diff --git a/linden/indra/newview/skins/xui/fr/floater_pay_object.xml b/linden/indra/newview/skins/default/xui/fr/floater_pay_object.xml
index 0252f98..0252f98 100644
--- a/linden/indra/newview/skins/xui/fr/floater_pay_object.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_pay_object.xml
diff --git a/linden/indra/newview/skins/xui/fr/floater_postcard.xml b/linden/indra/newview/skins/default/xui/fr/floater_postcard.xml
index 8c1a625..8c1a625 100644
--- a/linden/indra/newview/skins/xui/fr/floater_postcard.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_postcard.xml
diff --git a/linden/indra/newview/skins/xui/fr/floater_preferences.xml b/linden/indra/newview/skins/default/xui/fr/floater_preferences.xml
index aa3e717..aa3e717 100644
--- a/linden/indra/newview/skins/xui/fr/floater_preferences.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_preferences.xml
diff --git a/linden/indra/newview/skins/xui/fr/floater_preview_animation.xml b/linden/indra/newview/skins/default/xui/fr/floater_preview_animation.xml
index 7682670..7682670 100644
--- a/linden/indra/newview/skins/xui/fr/floater_preview_animation.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_preview_animation.xml
diff --git a/linden/indra/newview/skins/xui/fr/floater_preview_embedded_texture.xml b/linden/indra/newview/skins/default/xui/fr/floater_preview_embedded_texture.xml
index bd9696d..bd9696d 100644
--- a/linden/indra/newview/skins/xui/fr/floater_preview_embedded_texture.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_preview_embedded_texture.xml
diff --git a/linden/indra/newview/skins/xui/fr/floater_preview_existing_landmark.xml b/linden/indra/newview/skins/default/xui/fr/floater_preview_existing_landmark.xml
index 86ab802..86ab802 100644
--- a/linden/indra/newview/skins/xui/fr/floater_preview_existing_landmark.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_preview_existing_landmark.xml
diff --git a/linden/indra/newview/skins/xui/fr/floater_preview_gesture.xml b/linden/indra/newview/skins/default/xui/fr/floater_preview_gesture.xml
index a8e59e1..a8e59e1 100644
--- a/linden/indra/newview/skins/xui/fr/floater_preview_gesture.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_preview_gesture.xml
diff --git a/linden/indra/newview/skins/xui/fr/floater_preview_notecard.xml b/linden/indra/newview/skins/default/xui/fr/floater_preview_notecard.xml
index 58a5439..58a5439 100644
--- a/linden/indra/newview/skins/xui/fr/floater_preview_notecard.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_preview_notecard.xml
diff --git a/linden/indra/newview/skins/xui/fr/floater_preview_notecard_keep_discard.xml b/linden/indra/newview/skins/default/xui/fr/floater_preview_notecard_keep_discard.xml
index d86c11a..d86c11a 100644
--- a/linden/indra/newview/skins/xui/fr/floater_preview_notecard_keep_discard.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_preview_notecard_keep_discard.xml
diff --git a/linden/indra/newview/skins/xui/fr/floater_preview_sound.xml b/linden/indra/newview/skins/default/xui/fr/floater_preview_sound.xml
index 53813d8..53813d8 100644
--- a/linden/indra/newview/skins/xui/fr/floater_preview_sound.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_preview_sound.xml
diff --git a/linden/indra/newview/skins/xui/fr/floater_preview_texture.xml b/linden/indra/newview/skins/default/xui/fr/floater_preview_texture.xml
index 491087d..491087d 100644
--- a/linden/indra/newview/skins/xui/fr/floater_preview_texture.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_preview_texture.xml
diff --git a/linden/indra/newview/skins/xui/fr/floater_preview_texture_keep_discard.xml b/linden/indra/newview/skins/default/xui/fr/floater_preview_texture_keep_discard.xml
index d5b90cc..d5b90cc 100644
--- a/linden/indra/newview/skins/xui/fr/floater_preview_texture_keep_discard.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_preview_texture_keep_discard.xml
diff --git a/linden/indra/newview/skins/xui/fr/floater_price_for_listing.xml b/linden/indra/newview/skins/default/xui/fr/floater_price_for_listing.xml
index 8759536..8759536 100644
--- a/linden/indra/newview/skins/xui/fr/floater_price_for_listing.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_price_for_listing.xml
diff --git a/linden/indra/newview/skins/xui/fr/floater_profile.xml b/linden/indra/newview/skins/default/xui/fr/floater_profile.xml
index e54aabc..e54aabc 100644
--- a/linden/indra/newview/skins/xui/fr/floater_profile.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_profile.xml
diff --git a/linden/indra/newview/skins/xui/fr/floater_report_abuse.xml b/linden/indra/newview/skins/default/xui/fr/floater_report_abuse.xml
index 2dcb1a9..2dcb1a9 100644
--- a/linden/indra/newview/skins/xui/fr/floater_report_abuse.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_report_abuse.xml
diff --git a/linden/indra/newview/skins/xui/fr/floater_report_bug.xml b/linden/indra/newview/skins/default/xui/fr/floater_report_bug.xml
index e7ba400..e7ba400 100644
--- a/linden/indra/newview/skins/xui/fr/floater_report_bug.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_report_bug.xml
diff --git a/linden/indra/newview/skins/xui/fr/floater_script_debug.xml b/linden/indra/newview/skins/default/xui/fr/floater_script_debug.xml
index 3381e51..3381e51 100644
--- a/linden/indra/newview/skins/xui/fr/floater_script_debug.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_script_debug.xml
diff --git a/linden/indra/newview/skins/xui/fr/floater_script_ed_panel.xml b/linden/indra/newview/skins/default/xui/fr/floater_script_ed_panel.xml
index 9b8a80e..9b8a80e 100644
--- a/linden/indra/newview/skins/xui/fr/floater_script_ed_panel.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_script_ed_panel.xml
diff --git a/linden/indra/newview/skins/xui/fr/floater_script_preview.xml b/linden/indra/newview/skins/default/xui/fr/floater_script_preview.xml
index 4038c49..4038c49 100644
--- a/linden/indra/newview/skins/xui/fr/floater_script_preview.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_script_preview.xml
diff --git a/linden/indra/newview/skins/xui/fr/floater_script_queue.xml b/linden/indra/newview/skins/default/xui/fr/floater_script_queue.xml
index d93fd92..d93fd92 100644
--- a/linden/indra/newview/skins/xui/fr/floater_script_queue.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_script_queue.xml
diff --git a/linden/indra/newview/skins/xui/fr/floater_script_search.xml b/linden/indra/newview/skins/default/xui/fr/floater_script_search.xml
index c6e3e26..c6e3e26 100644
--- a/linden/indra/newview/skins/xui/fr/floater_script_search.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_script_search.xml
diff --git a/linden/indra/newview/skins/xui/fr/floater_sell_land.xml b/linden/indra/newview/skins/default/xui/fr/floater_sell_land.xml
index 4601535..4601535 100644
--- a/linden/indra/newview/skins/xui/fr/floater_sell_land.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_sell_land.xml
diff --git a/linden/indra/newview/skins/xui/fr/floater_settings_debug.xml b/linden/indra/newview/skins/default/xui/fr/floater_settings_debug.xml
index 4b7ed35..4b7ed35 100644
--- a/linden/indra/newview/skins/xui/fr/floater_settings_debug.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_settings_debug.xml
diff --git a/linden/indra/newview/skins/xui/fr/floater_snapshot.xml b/linden/indra/newview/skins/default/xui/fr/floater_snapshot.xml
index e942972..e942972 100644
--- a/linden/indra/newview/skins/xui/fr/floater_snapshot.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_snapshot.xml
diff --git a/linden/indra/newview/skins/xui/fr/floater_sound_preview.xml b/linden/indra/newview/skins/default/xui/fr/floater_sound_preview.xml
index b55ae8d..b55ae8d 100644
--- a/linden/indra/newview/skins/xui/fr/floater_sound_preview.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_sound_preview.xml
diff --git a/linden/indra/newview/skins/xui/fr/floater_telehub.xml b/linden/indra/newview/skins/default/xui/fr/floater_telehub.xml
index 9c41927..9c41927 100644
--- a/linden/indra/newview/skins/xui/fr/floater_telehub.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_telehub.xml
diff --git a/linden/indra/newview/skins/xui/fr/floater_texture_ctrl.xml b/linden/indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml
index 4e07078..4e07078 100644
--- a/linden/indra/newview/skins/xui/fr/floater_texture_ctrl.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml
diff --git a/linden/indra/newview/skins/xui/fr/floater_tools.xml b/linden/indra/newview/skins/default/xui/fr/floater_tools.xml
index 8e94eae..8e94eae 100644
--- a/linden/indra/newview/skins/xui/fr/floater_tools.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_tools.xml
diff --git a/linden/indra/newview/skins/xui/fr/floater_top_objects.xml b/linden/indra/newview/skins/default/xui/fr/floater_top_objects.xml
index 1628004..1628004 100644
--- a/linden/indra/newview/skins/xui/fr/floater_top_objects.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_top_objects.xml
diff --git a/linden/indra/newview/skins/xui/fr/floater_tos.xml b/linden/indra/newview/skins/default/xui/fr/floater_tos.xml
index 41d2557..41d2557 100644
--- a/linden/indra/newview/skins/xui/fr/floater_tos.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_tos.xml
diff --git a/linden/indra/newview/skins/xui/fr/floater_wearable_save_as.xml b/linden/indra/newview/skins/default/xui/fr/floater_wearable_save_as.xml
index f313e97..f313e97 100644
--- a/linden/indra/newview/skins/xui/fr/floater_wearable_save_as.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_wearable_save_as.xml
diff --git a/linden/indra/newview/skins/xui/fr/floater_world_map.xml b/linden/indra/newview/skins/default/xui/fr/floater_world_map.xml
index 8a0d907..8a0d907 100644
--- a/linden/indra/newview/skins/xui/fr/floater_world_map.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_world_map.xml
diff --git a/linden/indra/newview/skins/xui/fr/menu_inventory.xml b/linden/indra/newview/skins/default/xui/fr/menu_inventory.xml
index 4d383cc..4d383cc 100644
--- a/linden/indra/newview/skins/xui/fr/menu_inventory.xml
+++ b/linden/indra/newview/skins/default/xui/fr/menu_inventory.xml
diff --git a/linden/indra/newview/skins/xui/fr/menu_pie_attachment.xml b/linden/indra/newview/skins/default/xui/fr/menu_pie_attachment.xml
index 46ac519..46ac519 100644
--- a/linden/indra/newview/skins/xui/fr/menu_pie_attachment.xml
+++ b/linden/indra/newview/skins/default/xui/fr/menu_pie_attachment.xml
diff --git a/linden/indra/newview/skins/xui/fr/menu_pie_avatar.xml b/linden/indra/newview/skins/default/xui/fr/menu_pie_avatar.xml
index 69003dd..69003dd 100644
--- a/linden/indra/newview/skins/xui/fr/menu_pie_avatar.xml
+++ b/linden/indra/newview/skins/default/xui/fr/menu_pie_avatar.xml
diff --git a/linden/indra/newview/skins/xui/fr/menu_pie_land.xml b/linden/indra/newview/skins/default/xui/fr/menu_pie_land.xml
index 4c53048..4c53048 100644
--- a/linden/indra/newview/skins/xui/fr/menu_pie_land.xml
+++ b/linden/indra/newview/skins/default/xui/fr/menu_pie_land.xml
diff --git a/linden/indra/newview/skins/xui/fr/menu_pie_object.xml b/linden/indra/newview/skins/default/xui/fr/menu_pie_object.xml
index ce395d3..ce395d3 100644
--- a/linden/indra/newview/skins/xui/fr/menu_pie_object.xml
+++ b/linden/indra/newview/skins/default/xui/fr/menu_pie_object.xml
diff --git a/linden/indra/newview/skins/xui/fr/menu_pie_self.xml b/linden/indra/newview/skins/default/xui/fr/menu_pie_self.xml
index d042c34..d042c34 100644
--- a/linden/indra/newview/skins/xui/fr/menu_pie_self.xml
+++ b/linden/indra/newview/skins/default/xui/fr/menu_pie_self.xml
diff --git a/linden/indra/newview/skins/xui/fr/menu_viewer.xml b/linden/indra/newview/skins/default/xui/fr/menu_viewer.xml
index 0f6d7a2..0f6d7a2 100644
--- a/linden/indra/newview/skins/xui/fr/menu_viewer.xml
+++ b/linden/indra/newview/skins/default/xui/fr/menu_viewer.xml
diff --git a/linden/indra/newview/skins/xui/fr/notify.xml b/linden/indra/newview/skins/default/xui/fr/notify.xml
index 0ade3b5..0ade3b5 100644
--- a/linden/indra/newview/skins/xui/fr/notify.xml
+++ b/linden/indra/newview/skins/default/xui/fr/notify.xml
diff --git a/linden/indra/newview/skins/xui/fr/panel_avatar.xml b/linden/indra/newview/skins/default/xui/fr/panel_avatar.xml
index 28ef7b4..28ef7b4 100644
--- a/linden/indra/newview/skins/xui/fr/panel_avatar.xml
+++ b/linden/indra/newview/skins/default/xui/fr/panel_avatar.xml
diff --git a/linden/indra/newview/skins/xui/fr/panel_avatar_classified.xml b/linden/indra/newview/skins/default/xui/fr/panel_avatar_classified.xml
index c42a339..c42a339 100644
--- a/linden/indra/newview/skins/xui/fr/panel_avatar_classified.xml
+++ b/linden/indra/newview/skins/default/xui/fr/panel_avatar_classified.xml
diff --git a/linden/indra/newview/skins/xui/fr/panel_avatar_pick.xml b/linden/indra/newview/skins/default/xui/fr/panel_avatar_pick.xml
index 44baf9c..44baf9c 100644
--- a/linden/indra/newview/skins/xui/fr/panel_avatar_pick.xml
+++ b/linden/indra/newview/skins/default/xui/fr/panel_avatar_pick.xml
diff --git a/linden/indra/newview/skins/xui/fr/panel_chat_bar.xml b/linden/indra/newview/skins/default/xui/fr/panel_chat_bar.xml
index addbca5..addbca5 100644
--- a/linden/indra/newview/skins/xui/fr/panel_chat_bar.xml
+++ b/linden/indra/newview/skins/default/xui/fr/panel_chat_bar.xml
diff --git a/linden/indra/newview/skins/xui/fr/panel_classified.xml b/linden/indra/newview/skins/default/xui/fr/panel_classified.xml
index 735d08d..735d08d 100644
--- a/linden/indra/newview/skins/xui/fr/panel_classified.xml
+++ b/linden/indra/newview/skins/default/xui/fr/panel_classified.xml
diff --git a/linden/indra/newview/skins/xui/fr/panel_event.xml b/linden/indra/newview/skins/default/xui/fr/panel_event.xml
index 958d0b3..958d0b3 100644
--- a/linden/indra/newview/skins/xui/fr/panel_event.xml
+++ b/linden/indra/newview/skins/default/xui/fr/panel_event.xml
diff --git a/linden/indra/newview/skins/xui/fr/panel_group.xml b/linden/indra/newview/skins/default/xui/fr/panel_group.xml
index f9330c9..f9330c9 100644
--- a/linden/indra/newview/skins/xui/fr/panel_group.xml
+++ b/linden/indra/newview/skins/default/xui/fr/panel_group.xml
diff --git a/linden/indra/newview/skins/xui/fr/panel_group_finder.xml b/linden/indra/newview/skins/default/xui/fr/panel_group_finder.xml
index 70e17d7..70e17d7 100644
--- a/linden/indra/newview/skins/xui/fr/panel_group_finder.xml
+++ b/linden/indra/newview/skins/default/xui/fr/panel_group_finder.xml
diff --git a/linden/indra/newview/skins/xui/fr/panel_group_general.xml b/linden/indra/newview/skins/default/xui/fr/panel_group_general.xml
index a98419f..a98419f 100644
--- a/linden/indra/newview/skins/xui/fr/panel_group_general.xml
+++ b/linden/indra/newview/skins/default/xui/fr/panel_group_general.xml
diff --git a/linden/indra/newview/skins/xui/fr/panel_group_invite.xml b/linden/indra/newview/skins/default/xui/fr/panel_group_invite.xml
index 54d0d3b..54d0d3b 100644
--- a/linden/indra/newview/skins/xui/fr/panel_group_invite.xml
+++ b/linden/indra/newview/skins/default/xui/fr/panel_group_invite.xml
diff --git a/linden/indra/newview/skins/xui/fr/panel_group_land_money.xml b/linden/indra/newview/skins/default/xui/fr/panel_group_land_money.xml
index b205c1e..b205c1e 100644
--- a/linden/indra/newview/skins/xui/fr/panel_group_land_money.xml
+++ b/linden/indra/newview/skins/default/xui/fr/panel_group_land_money.xml
diff --git a/linden/indra/newview/skins/xui/fr/panel_group_notices.xml b/linden/indra/newview/skins/default/xui/fr/panel_group_notices.xml
index a266155..a266155 100644
--- a/linden/indra/newview/skins/xui/fr/panel_group_notices.xml
+++ b/linden/indra/newview/skins/default/xui/fr/panel_group_notices.xml
diff --git a/linden/indra/newview/skins/xui/fr/panel_group_roles.xml b/linden/indra/newview/skins/default/xui/fr/panel_group_roles.xml
index 351617a..351617a 100644
--- a/linden/indra/newview/skins/xui/fr/panel_group_roles.xml
+++ b/linden/indra/newview/skins/default/xui/fr/panel_group_roles.xml
diff --git a/linden/indra/newview/skins/xui/fr/panel_group_voting.xml b/linden/indra/newview/skins/default/xui/fr/panel_group_voting.xml
index a517731..a517731 100644
--- a/linden/indra/newview/skins/xui/fr/panel_group_voting.xml
+++ b/linden/indra/newview/skins/default/xui/fr/panel_group_voting.xml
diff --git a/linden/indra/newview/skins/xui/fr/panel_land_covenant.xml b/linden/indra/newview/skins/default/xui/fr/panel_land_covenant.xml
index 0207938..0207938 100644
--- a/linden/indra/newview/skins/xui/fr/panel_land_covenant.xml
+++ b/linden/indra/newview/skins/default/xui/fr/panel_land_covenant.xml
diff --git a/linden/indra/newview/skins/xui/fr/panel_login.xml b/linden/indra/newview/skins/default/xui/fr/panel_login.xml
index 6081b4c..6081b4c 100644
--- a/linden/indra/newview/skins/xui/fr/panel_login.xml
+++ b/linden/indra/newview/skins/default/xui/fr/panel_login.xml
diff --git a/linden/indra/newview/skins/xui/fr/panel_media_remote.xml b/linden/indra/newview/skins/default/xui/fr/panel_media_remote.xml
index 50ef48d..50ef48d 100644
--- a/linden/indra/newview/skins/xui/fr/panel_media_remote.xml
+++ b/linden/indra/newview/skins/default/xui/fr/panel_media_remote.xml
diff --git a/linden/indra/newview/skins/xui/fr/panel_overlaybar.xml b/linden/indra/newview/skins/default/xui/fr/panel_overlaybar.xml
index 3a7c304..3a7c304 100644
--- a/linden/indra/newview/skins/xui/fr/panel_overlaybar.xml
+++ b/linden/indra/newview/skins/default/xui/fr/panel_overlaybar.xml
diff --git a/linden/indra/newview/skins/xui/fr/panel_place.xml b/linden/indra/newview/skins/default/xui/fr/panel_place.xml
index 7bb73a6..7bb73a6 100644
--- a/linden/indra/newview/skins/xui/fr/panel_place.xml
+++ b/linden/indra/newview/skins/default/xui/fr/panel_place.xml
diff --git a/linden/indra/newview/skins/xui/fr/panel_place_small.xml b/linden/indra/newview/skins/default/xui/fr/panel_place_small.xml
index 7bb73a6..7bb73a6 100644
--- a/linden/indra/newview/skins/xui/fr/panel_place_small.xml
+++ b/linden/indra/newview/skins/default/xui/fr/panel_place_small.xml
diff --git a/linden/indra/newview/skins/xui/fr/panel_preferences_audio.xml b/linden/indra/newview/skins/default/xui/fr/panel_preferences_audio.xml
index 1dda9f7..1dda9f7 100644
--- a/linden/indra/newview/skins/xui/fr/panel_preferences_audio.xml
+++ b/linden/indra/newview/skins/default/xui/fr/panel_preferences_audio.xml
diff --git a/linden/indra/newview/skins/xui/fr/panel_preferences_chat.xml b/linden/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml
index be02051..be02051 100644
--- a/linden/indra/newview/skins/xui/fr/panel_preferences_chat.xml
+++ b/linden/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml
diff --git a/linden/indra/newview/skins/xui/fr/panel_preferences_general.xml b/linden/indra/newview/skins/default/xui/fr/panel_preferences_general.xml
index acf89cd..acf89cd 100644
--- a/linden/indra/newview/skins/xui/fr/panel_preferences_general.xml
+++ b/linden/indra/newview/skins/default/xui/fr/panel_preferences_general.xml
diff --git a/linden/indra/newview/skins/xui/fr/panel_preferences_graphics1.xml b/linden/indra/newview/skins/default/xui/fr/panel_preferences_graphics1.xml
index da61141..da61141 100644
--- a/linden/indra/newview/skins/xui/fr/panel_preferences_graphics1.xml
+++ b/linden/indra/newview/skins/default/xui/fr/panel_preferences_graphics1.xml
diff --git a/linden/indra/newview/skins/xui/fr/panel_preferences_im.xml b/linden/indra/newview/skins/default/xui/fr/panel_preferences_im.xml
index 941ac7f..941ac7f 100644
--- a/linden/indra/newview/skins/xui/fr/panel_preferences_im.xml
+++ b/linden/indra/newview/skins/default/xui/fr/panel_preferences_im.xml
diff --git a/linden/indra/newview/skins/xui/fr/panel_preferences_input.xml b/linden/indra/newview/skins/default/xui/fr/panel_preferences_input.xml
index 65f60a8..65f60a8 100644
--- a/linden/indra/newview/skins/xui/fr/panel_preferences_input.xml
+++ b/linden/indra/newview/skins/default/xui/fr/panel_preferences_input.xml
diff --git a/linden/indra/newview/skins/xui/fr/panel_preferences_network.xml b/linden/indra/newview/skins/default/xui/fr/panel_preferences_network.xml
index c968b45..c968b45 100644
--- a/linden/indra/newview/skins/xui/fr/panel_preferences_network.xml
+++ b/linden/indra/newview/skins/default/xui/fr/panel_preferences_network.xml
diff --git a/linden/indra/newview/skins/xui/fr/panel_preferences_popups.xml b/linden/indra/newview/skins/default/xui/fr/panel_preferences_popups.xml
index 1688ac5..1688ac5 100644
--- a/linden/indra/newview/skins/xui/fr/panel_preferences_popups.xml
+++ b/linden/indra/newview/skins/default/xui/fr/panel_preferences_popups.xml
diff --git a/linden/indra/newview/skins/xui/fr/panel_region_covenant.xml b/linden/indra/newview/skins/default/xui/fr/panel_region_covenant.xml
index 8355bc5..8355bc5 100644
--- a/linden/indra/newview/skins/xui/fr/panel_region_covenant.xml
+++ b/linden/indra/newview/skins/default/xui/fr/panel_region_covenant.xml
diff --git a/linden/indra/newview/skins/xui/fr/panel_region_debug.xml b/linden/indra/newview/skins/default/xui/fr/panel_region_debug.xml
index 6d98945..6d98945 100644
--- a/linden/indra/newview/skins/xui/fr/panel_region_debug.xml
+++ b/linden/indra/newview/skins/default/xui/fr/panel_region_debug.xml
diff --git a/linden/indra/newview/skins/xui/fr/panel_region_estate.xml b/linden/indra/newview/skins/default/xui/fr/panel_region_estate.xml
index eccc4df..eccc4df 100644
--- a/linden/indra/newview/skins/xui/fr/panel_region_estate.xml
+++ b/linden/indra/newview/skins/default/xui/fr/panel_region_estate.xml
diff --git a/linden/indra/newview/skins/xui/fr/panel_region_general.xml b/linden/indra/newview/skins/default/xui/fr/panel_region_general.xml
index 29f52d5..29f52d5 100644
--- a/linden/indra/newview/skins/xui/fr/panel_region_general.xml
+++ b/linden/indra/newview/skins/default/xui/fr/panel_region_general.xml
diff --git a/linden/indra/newview/skins/xui/fr/panel_region_terrain.xml b/linden/indra/newview/skins/default/xui/fr/panel_region_terrain.xml
index dbe5d0b..dbe5d0b 100644
--- a/linden/indra/newview/skins/xui/fr/panel_region_terrain.xml
+++ b/linden/indra/newview/skins/default/xui/fr/panel_region_terrain.xml
diff --git a/linden/indra/newview/skins/xui/fr/panel_region_texture.xml b/linden/indra/newview/skins/default/xui/fr/panel_region_texture.xml
index 10cbd4a..10cbd4a 100644
--- a/linden/indra/newview/skins/xui/fr/panel_region_texture.xml
+++ b/linden/indra/newview/skins/default/xui/fr/panel_region_texture.xml
diff --git a/linden/indra/newview/skins/xui/fr/panel_scrolling_param.xml b/linden/indra/newview/skins/default/xui/fr/panel_scrolling_param.xml
index 19a1a4b..19a1a4b 100644
--- a/linden/indra/newview/skins/xui/fr/panel_scrolling_param.xml
+++ b/linden/indra/newview/skins/default/xui/fr/panel_scrolling_param.xml
diff --git a/linden/indra/newview/skins/xui/fr/panel_status_bar.xml b/linden/indra/newview/skins/default/xui/fr/panel_status_bar.xml
index 7ca8299..7ca8299 100644
--- a/linden/indra/newview/skins/xui/fr/panel_status_bar.xml
+++ b/linden/indra/newview/skins/default/xui/fr/panel_status_bar.xml
diff --git a/linden/indra/newview/skins/xui/fr/panel_toolbar.xml b/linden/indra/newview/skins/default/xui/fr/panel_toolbar.xml
index 87e32b2..87e32b2 100644
--- a/linden/indra/newview/skins/xui/fr/panel_toolbar.xml
+++ b/linden/indra/newview/skins/default/xui/fr/panel_toolbar.xml
diff --git a/linden/indra/newview/skins/xui/fr/panel_top_pick.xml b/linden/indra/newview/skins/default/xui/fr/panel_top_pick.xml
index 37cae77..37cae77 100644
--- a/linden/indra/newview/skins/xui/fr/panel_top_pick.xml
+++ b/linden/indra/newview/skins/default/xui/fr/panel_top_pick.xml
diff --git a/linden/indra/newview/skins/xui/fr/role_actions.xml b/linden/indra/newview/skins/default/xui/fr/role_actions.xml
index c3d6ffe..c3d6ffe 100644
--- a/linden/indra/newview/skins/xui/fr/role_actions.xml
+++ b/linden/indra/newview/skins/default/xui/fr/role_actions.xml
diff --git a/linden/indra/newview/skins/xui/fr/xui_version.xml b/linden/indra/newview/skins/default/xui/fr/xui_version.xml
index ee2a0be..ee2a0be 100644
--- a/linden/indra/newview/skins/xui/fr/xui_version.xml
+++ b/linden/indra/newview/skins/default/xui/fr/xui_version.xml
diff --git a/linden/indra/newview/skins/xui/ja/LCD_text.xml b/linden/indra/newview/skins/default/xui/ja/LCD_text.xml
index 534f303..534f303 100644
--- a/linden/indra/newview/skins/xui/ja/LCD_text.xml
+++ b/linden/indra/newview/skins/default/xui/ja/LCD_text.xml
diff --git a/linden/indra/newview/skins/xui/ja/alerts.xml b/linden/indra/newview/skins/default/xui/ja/alerts.xml
index f010bc3..f010bc3 100644
--- a/linden/indra/newview/skins/xui/ja/alerts.xml
+++ b/linden/indra/newview/skins/default/xui/ja/alerts.xml
diff --git a/linden/indra/newview/skins/xui/ja/floater_about.xml b/linden/indra/newview/skins/default/xui/ja/floater_about.xml
index 75983b5..75983b5 100644
--- a/linden/indra/newview/skins/xui/ja/floater_about.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_about.xml
diff --git a/linden/indra/newview/skins/xui/ja/floater_about_land.xml b/linden/indra/newview/skins/default/xui/ja/floater_about_land.xml
index cbefed4..cbefed4 100644
--- a/linden/indra/newview/skins/xui/ja/floater_about_land.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_about_land.xml
diff --git a/linden/indra/newview/skins/xui/ja/floater_active_speakers.xml b/linden/indra/newview/skins/default/xui/ja/floater_active_speakers.xml
index 643033f..643033f 100644
--- a/linden/indra/newview/skins/xui/ja/floater_active_speakers.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_active_speakers.xml
diff --git a/linden/indra/newview/skins/xui/ja/floater_animation_preview.xml b/linden/indra/newview/skins/default/xui/ja/floater_animation_preview.xml
index 27a07e6..27a07e6 100644
--- a/linden/indra/newview/skins/xui/ja/floater_animation_preview.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_animation_preview.xml
diff --git a/linden/indra/newview/skins/xui/ja/floater_auction.xml b/linden/indra/newview/skins/default/xui/ja/floater_auction.xml
index ba34ec4..ba34ec4 100644
--- a/linden/indra/newview/skins/xui/ja/floater_auction.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_auction.xml
diff --git a/linden/indra/newview/skins/xui/ja/floater_audio_volume.xml b/linden/indra/newview/skins/default/xui/ja/floater_audio_volume.xml
index 4075d2e..4075d2e 100644
--- a/linden/indra/newview/skins/xui/ja/floater_audio_volume.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_audio_volume.xml
diff --git a/linden/indra/newview/skins/xui/ja/floater_avatar_picker.xml b/linden/indra/newview/skins/default/xui/ja/floater_avatar_picker.xml
index a23c6f0..a23c6f0 100644
--- a/linden/indra/newview/skins/xui/ja/floater_avatar_picker.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_avatar_picker.xml
diff --git a/linden/indra/newview/skins/xui/ja/floater_avatar_textures.xml b/linden/indra/newview/skins/default/xui/ja/floater_avatar_textures.xml
index ee7e4df..ee7e4df 100644
--- a/linden/indra/newview/skins/xui/ja/floater_avatar_textures.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_avatar_textures.xml
diff --git a/linden/indra/newview/skins/xui/ja/floater_build_options.xml b/linden/indra/newview/skins/default/xui/ja/floater_build_options.xml
index 49348aa..49348aa 100644
--- a/linden/indra/newview/skins/xui/ja/floater_build_options.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_build_options.xml
diff --git a/linden/indra/newview/skins/xui/ja/floater_bumps.xml b/linden/indra/newview/skins/default/xui/ja/floater_bumps.xml
index 89748b4..89748b4 100644
--- a/linden/indra/newview/skins/xui/ja/floater_bumps.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_bumps.xml
diff --git a/linden/indra/newview/skins/xui/ja/floater_buy_contents.xml b/linden/indra/newview/skins/default/xui/ja/floater_buy_contents.xml
index 1ea1032..1ea1032 100644
--- a/linden/indra/newview/skins/xui/ja/floater_buy_contents.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_buy_contents.xml
diff --git a/linden/indra/newview/skins/xui/ja/floater_buy_currency.xml b/linden/indra/newview/skins/default/xui/ja/floater_buy_currency.xml
index ca8f44d..ca8f44d 100644
--- a/linden/indra/newview/skins/xui/ja/floater_buy_currency.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_buy_currency.xml
diff --git a/linden/indra/newview/skins/xui/ja/floater_buy_land.xml b/linden/indra/newview/skins/default/xui/ja/floater_buy_land.xml
index c67bdaf..c67bdaf 100644
--- a/linden/indra/newview/skins/xui/ja/floater_buy_land.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_buy_land.xml
diff --git a/linden/indra/newview/skins/xui/ja/floater_buy_object.xml b/linden/indra/newview/skins/default/xui/ja/floater_buy_object.xml
index 1b5dd8b..1b5dd8b 100644
--- a/linden/indra/newview/skins/xui/ja/floater_buy_object.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_buy_object.xml
diff --git a/linden/indra/newview/skins/xui/ja/floater_camera.xml b/linden/indra/newview/skins/default/xui/ja/floater_camera.xml
index e5a491b..e5a491b 100644
--- a/linden/indra/newview/skins/xui/ja/floater_camera.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_camera.xml
diff --git a/linden/indra/newview/skins/xui/ja/floater_chat_history.xml b/linden/indra/newview/skins/default/xui/ja/floater_chat_history.xml
index 5d2de11..5d2de11 100644
--- a/linden/indra/newview/skins/xui/ja/floater_chat_history.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_chat_history.xml
diff --git a/linden/indra/newview/skins/xui/ja/floater_chatterbox.xml b/linden/indra/newview/skins/default/xui/ja/floater_chatterbox.xml
index 474d19f..474d19f 100644
--- a/linden/indra/newview/skins/xui/ja/floater_chatterbox.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_chatterbox.xml
diff --git a/linden/indra/newview/skins/xui/ja/floater_choose_group.xml b/linden/indra/newview/skins/default/xui/ja/floater_choose_group.xml
index 08c91f1..08c91f1 100644
--- a/linden/indra/newview/skins/xui/ja/floater_choose_group.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_choose_group.xml
diff --git a/linden/indra/newview/skins/xui/ja/floater_clothing.xml b/linden/indra/newview/skins/default/xui/ja/floater_clothing.xml
index 5a47a09..5a47a09 100644
--- a/linden/indra/newview/skins/xui/ja/floater_clothing.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_clothing.xml
diff --git a/linden/indra/newview/skins/xui/ja/floater_color_picker.xml b/linden/indra/newview/skins/default/xui/ja/floater_color_picker.xml
index 8047e49..8047e49 100644
--- a/linden/indra/newview/skins/xui/ja/floater_color_picker.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_color_picker.xml
diff --git a/linden/indra/newview/skins/xui/ja/floater_critical.xml b/linden/indra/newview/skins/default/xui/ja/floater_critical.xml
index 39f6ee8..39f6ee8 100644
--- a/linden/indra/newview/skins/xui/ja/floater_critical.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_critical.xml
diff --git a/linden/indra/newview/skins/xui/ja/floater_customize.xml b/linden/indra/newview/skins/default/xui/ja/floater_customize.xml
index 7b4fdbc..7b4fdbc 100644
--- a/linden/indra/newview/skins/xui/ja/floater_customize.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_customize.xml
diff --git a/linden/indra/newview/skins/xui/ja/floater_day_cycle_options.xml b/linden/indra/newview/skins/default/xui/ja/floater_day_cycle_options.xml
index 1b0c89a..1b0c89a 100644
--- a/linden/indra/newview/skins/xui/ja/floater_day_cycle_options.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_day_cycle_options.xml
diff --git a/linden/indra/newview/skins/xui/ja/floater_device_settings.xml b/linden/indra/newview/skins/default/xui/ja/floater_device_settings.xml
index b9a0332..b9a0332 100644
--- a/linden/indra/newview/skins/xui/ja/floater_device_settings.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_device_settings.xml
diff --git a/linden/indra/newview/skins/xui/ja/floater_directory.xml b/linden/indra/newview/skins/default/xui/ja/floater_directory.xml
index 0090ceb..0090ceb 100644
--- a/linden/indra/newview/skins/xui/ja/floater_directory.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_directory.xml
diff --git a/linden/indra/newview/skins/xui/ja/floater_env_settings.xml b/linden/indra/newview/skins/default/xui/ja/floater_env_settings.xml
index 4c19de1..4c19de1 100644
--- a/linden/indra/newview/skins/xui/ja/floater_env_settings.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_env_settings.xml
diff --git a/linden/indra/newview/skins/xui/ja/floater_gesture.xml b/linden/indra/newview/skins/default/xui/ja/floater_gesture.xml
index 66be1f7..66be1f7 100644
--- a/linden/indra/newview/skins/xui/ja/floater_gesture.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_gesture.xml
diff --git a/linden/indra/newview/skins/xui/ja/floater_god_tools.xml b/linden/indra/newview/skins/default/xui/ja/floater_god_tools.xml
index 7524356..7524356 100644
--- a/linden/indra/newview/skins/xui/ja/floater_god_tools.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_god_tools.xml
diff --git a/linden/indra/newview/skins/xui/ja/floater_group_info.xml b/linden/indra/newview/skins/default/xui/ja/floater_group_info.xml
index 9330ca0..9330ca0 100644
--- a/linden/indra/newview/skins/xui/ja/floater_group_info.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_group_info.xml
diff --git a/linden/indra/newview/skins/xui/ja/floater_hardware_settings.xml b/linden/indra/newview/skins/default/xui/ja/floater_hardware_settings.xml
index 9da09ff..9da09ff 100644
--- a/linden/indra/newview/skins/xui/ja/floater_hardware_settings.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_hardware_settings.xml
diff --git a/linden/indra/newview/skins/xui/ja/floater_html.xml b/linden/indra/newview/skins/default/xui/ja/floater_html.xml
index 6e1e7a0..6e1e7a0 100644
--- a/linden/indra/newview/skins/xui/ja/floater_html.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_html.xml
diff --git a/linden/indra/newview/skins/xui/ja/floater_hud.xml b/linden/indra/newview/skins/default/xui/ja/floater_hud.xml
index 4b4137b..4b4137b 100644
--- a/linden/indra/newview/skins/xui/ja/floater_hud.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_hud.xml
diff --git a/linden/indra/newview/skins/xui/ja/floater_im.xml b/linden/indra/newview/skins/default/xui/ja/floater_im.xml
index 7761f9d..7761f9d 100644
--- a/linden/indra/newview/skins/xui/ja/floater_im.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_im.xml
diff --git a/linden/indra/newview/skins/xui/ja/floater_image_preview.xml b/linden/indra/newview/skins/default/xui/ja/floater_image_preview.xml
index be8e5c6..be8e5c6 100644
--- a/linden/indra/newview/skins/xui/ja/floater_image_preview.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_image_preview.xml
diff --git a/linden/indra/newview/skins/xui/ja/floater_import.xml b/linden/indra/newview/skins/default/xui/ja/floater_import.xml
index 8da31b8..8da31b8 100644
--- a/linden/indra/newview/skins/xui/ja/floater_import.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_import.xml
diff --git a/linden/indra/newview/skins/xui/ja/floater_inspect.xml b/linden/indra/newview/skins/default/xui/ja/floater_inspect.xml
index 81484f4..81484f4 100644
--- a/linden/indra/newview/skins/xui/ja/floater_inspect.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_inspect.xml
diff --git a/linden/indra/newview/skins/xui/ja/floater_instant_message.xml b/linden/indra/newview/skins/default/xui/ja/floater_instant_message.xml
index ab20016..ab20016 100644
--- a/linden/indra/newview/skins/xui/ja/floater_instant_message.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_instant_message.xml
diff --git a/linden/indra/newview/skins/xui/ja/floater_instant_message_ad_hoc.xml b/linden/indra/newview/skins/default/xui/ja/floater_instant_message_ad_hoc.xml
index d1cf8af..d1cf8af 100644
--- a/linden/indra/newview/skins/xui/ja/floater_instant_message_ad_hoc.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_instant_message_ad_hoc.xml
diff --git a/linden/indra/newview/skins/xui/ja/floater_instant_message_group.xml b/linden/indra/newview/skins/default/xui/ja/floater_instant_message_group.xml
index ceacef6..ceacef6 100644
--- a/linden/indra/newview/skins/xui/ja/floater_instant_message_group.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_instant_message_group.xml
diff --git a/linden/indra/newview/skins/xui/ja/floater_inventory.xml b/linden/indra/newview/skins/default/xui/ja/floater_inventory.xml
index 6edae5a..6edae5a 100644
--- a/linden/indra/newview/skins/xui/ja/floater_inventory.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_inventory.xml
diff --git a/linden/indra/newview/skins/xui/ja/floater_inventory_item_properties.xml b/linden/indra/newview/skins/default/xui/ja/floater_inventory_item_properties.xml
index 10bb7e4..10bb7e4 100644
--- a/linden/indra/newview/skins/xui/ja/floater_inventory_item_properties.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_inventory_item_properties.xml
diff --git a/linden/indra/newview/skins/xui/ja/floater_inventory_view_finder.xml b/linden/indra/newview/skins/default/xui/ja/floater_inventory_view_finder.xml
index 92475aa..92475aa 100644
--- a/linden/indra/newview/skins/xui/ja/floater_inventory_view_finder.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_inventory_view_finder.xml
diff --git a/linden/indra/newview/skins/xui/ja/floater_joystick.xml b/linden/indra/newview/skins/default/xui/ja/floater_joystick.xml
index baef61c..baef61c 100644
--- a/linden/indra/newview/skins/xui/ja/floater_joystick.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_joystick.xml
diff --git a/linden/indra/newview/skins/xui/ja/floater_lagmeter.xml b/linden/indra/newview/skins/default/xui/ja/floater_lagmeter.xml
index fbd7a6d..fbd7a6d 100644
--- a/linden/indra/newview/skins/xui/ja/floater_lagmeter.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_lagmeter.xml
diff --git a/linden/indra/newview/skins/xui/ja/floater_land_holdings.xml b/linden/indra/newview/skins/default/xui/ja/floater_land_holdings.xml
index 49d7f16..49d7f16 100644
--- a/linden/indra/newview/skins/xui/ja/floater_land_holdings.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_land_holdings.xml
diff --git a/linden/indra/newview/skins/xui/ja/floater_landmark_ctrl.xml b/linden/indra/newview/skins/default/xui/ja/floater_landmark_ctrl.xml
index 46107e7..46107e7 100644
--- a/linden/indra/newview/skins/xui/ja/floater_landmark_ctrl.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_landmark_ctrl.xml
diff --git a/linden/indra/newview/skins/xui/ja/floater_live_lsleditor.xml b/linden/indra/newview/skins/default/xui/ja/floater_live_lsleditor.xml
index b7ce98c..b7ce98c 100644
--- a/linden/indra/newview/skins/xui/ja/floater_live_lsleditor.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_live_lsleditor.xml
diff --git a/linden/indra/newview/skins/xui/ja/floater_lsl_guide.xml b/linden/indra/newview/skins/default/xui/ja/floater_lsl_guide.xml
index 238070b..238070b 100644
--- a/linden/indra/newview/skins/xui/ja/floater_lsl_guide.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_lsl_guide.xml
diff --git a/linden/indra/newview/skins/xui/ja/floater_media_browser.xml b/linden/indra/newview/skins/default/xui/ja/floater_media_browser.xml
index 55707b9..55707b9 100644
--- a/linden/indra/newview/skins/xui/ja/floater_media_browser.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_media_browser.xml
diff --git a/linden/indra/newview/skins/xui/ja/floater_moveview.xml b/linden/indra/newview/skins/default/xui/ja/floater_moveview.xml
index c40a1d9..c40a1d9 100644
--- a/linden/indra/newview/skins/xui/ja/floater_moveview.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_moveview.xml
diff --git a/linden/indra/newview/skins/xui/ja/floater_mute.xml b/linden/indra/newview/skins/default/xui/ja/floater_mute.xml
index dbc89f8..dbc89f8 100644
--- a/linden/indra/newview/skins/xui/ja/floater_mute.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_mute.xml
diff --git a/linden/indra/newview/skins/xui/ja/floater_mute_object.xml b/linden/indra/newview/skins/default/xui/ja/floater_mute_object.xml
index abb738a..abb738a 100644
--- a/linden/indra/newview/skins/xui/ja/floater_mute_object.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_mute_object.xml
diff --git a/linden/indra/newview/skins/xui/ja/floater_my_friends.xml b/linden/indra/newview/skins/default/xui/ja/floater_my_friends.xml
index e28029b..e28029b 100644
--- a/linden/indra/newview/skins/xui/ja/floater_my_friends.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_my_friends.xml
diff --git a/linden/indra/newview/skins/xui/ja/floater_name_description.xml b/linden/indra/newview/skins/default/xui/ja/floater_name_description.xml
index 5e38a8a..5e38a8a 100644
--- a/linden/indra/newview/skins/xui/ja/floater_name_description.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_name_description.xml
diff --git a/linden/indra/newview/skins/xui/ja/floater_new_im.xml b/linden/indra/newview/skins/default/xui/ja/floater_new_im.xml
index d87b79c..d87b79c 100644
--- a/linden/indra/newview/skins/xui/ja/floater_new_im.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_new_im.xml
diff --git a/linden/indra/newview/skins/xui/ja/floater_new_outfit_dialog.xml b/linden/indra/newview/skins/default/xui/ja/floater_new_outfit_dialog.xml
index e39f9f1..e39f9f1 100644
--- a/linden/indra/newview/skins/xui/ja/floater_new_outfit_dialog.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_new_outfit_dialog.xml
diff --git a/linden/indra/newview/skins/xui/ja/floater_openobject.xml b/linden/indra/newview/skins/default/xui/ja/floater_openobject.xml
index 3abda50..3abda50 100644
--- a/linden/indra/newview/skins/xui/ja/floater_openobject.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_openobject.xml
diff --git a/linden/indra/newview/skins/xui/ja/floater_pay.xml b/linden/indra/newview/skins/default/xui/ja/floater_pay.xml
index 114cb90..114cb90 100644
--- a/linden/indra/newview/skins/xui/ja/floater_pay.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_pay.xml
diff --git a/linden/indra/newview/skins/xui/ja/floater_pay_object.xml b/linden/indra/newview/skins/default/xui/ja/floater_pay_object.xml
index 6ad9c7c..6ad9c7c 100644
--- a/linden/indra/newview/skins/xui/ja/floater_pay_object.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_pay_object.xml
diff --git a/linden/indra/newview/skins/xui/ja/floater_post_process.xml b/linden/indra/newview/skins/default/xui/ja/floater_post_process.xml
index 0ada3d1..0ada3d1 100644
--- a/linden/indra/newview/skins/xui/ja/floater_post_process.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_post_process.xml
diff --git a/linden/indra/newview/skins/xui/ja/floater_postcard.xml b/linden/indra/newview/skins/default/xui/ja/floater_postcard.xml
index eb318f6..eb318f6 100644
--- a/linden/indra/newview/skins/xui/ja/floater_postcard.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_postcard.xml
diff --git a/linden/indra/newview/skins/xui/ja/floater_preferences.xml b/linden/indra/newview/skins/default/xui/ja/floater_preferences.xml
index 3d0c82b..3d0c82b 100644
--- a/linden/indra/newview/skins/xui/ja/floater_preferences.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_preferences.xml
diff --git a/linden/indra/newview/skins/xui/ja/floater_preview_animation.xml b/linden/indra/newview/skins/default/xui/ja/floater_preview_animation.xml
index dfb90f2..dfb90f2 100644
--- a/linden/indra/newview/skins/xui/ja/floater_preview_animation.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_preview_animation.xml
diff --git a/linden/indra/newview/skins/xui/ja/floater_preview_classified.xml b/linden/indra/newview/skins/default/xui/ja/floater_preview_classified.xml
index a58d131..a58d131 100644
--- a/linden/indra/newview/skins/xui/ja/floater_preview_classified.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_preview_classified.xml
diff --git a/linden/indra/newview/skins/xui/ja/floater_preview_embedded_texture.xml b/linden/indra/newview/skins/default/xui/ja/floater_preview_embedded_texture.xml
index 5ca4550..5ca4550 100644
--- a/linden/indra/newview/skins/xui/ja/floater_preview_embedded_texture.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_preview_embedded_texture.xml
diff --git a/linden/indra/newview/skins/xui/ja/floater_preview_event.xml b/linden/indra/newview/skins/default/xui/ja/floater_preview_event.xml
index 7f49c27..7f49c27 100644
--- a/linden/indra/newview/skins/xui/ja/floater_preview_event.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_preview_event.xml
diff --git a/linden/indra/newview/skins/xui/ja/floater_preview_existing_landmark.xml b/linden/indra/newview/skins/default/xui/ja/floater_preview_existing_landmark.xml
index 544669c..544669c 100644
--- a/linden/indra/newview/skins/xui/ja/floater_preview_existing_landmark.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_preview_existing_landmark.xml
diff --git a/linden/indra/newview/skins/xui/ja/floater_preview_gesture.xml b/linden/indra/newview/skins/default/xui/ja/floater_preview_gesture.xml
index 930aff9..930aff9 100644
--- a/linden/indra/newview/skins/xui/ja/floater_preview_gesture.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_preview_gesture.xml
diff --git a/linden/indra/newview/skins/xui/ja/floater_preview_notecard.xml b/linden/indra/newview/skins/default/xui/ja/floater_preview_notecard.xml
index 2fb42d1..2fb42d1 100644
--- a/linden/indra/newview/skins/xui/ja/floater_preview_notecard.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_preview_notecard.xml
diff --git a/linden/indra/newview/skins/xui/ja/floater_preview_notecard_keep_discard.xml b/linden/indra/newview/skins/default/xui/ja/floater_preview_notecard_keep_discard.xml
index d07a01f..d07a01f 100644
--- a/linden/indra/newview/skins/xui/ja/floater_preview_notecard_keep_discard.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_preview_notecard_keep_discard.xml
diff --git a/linden/indra/newview/skins/xui/ja/floater_preview_sound.xml b/linden/indra/newview/skins/default/xui/ja/floater_preview_sound.xml
index d455d4c..d455d4c 100644
--- a/linden/indra/newview/skins/xui/ja/floater_preview_sound.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_preview_sound.xml
diff --git a/linden/indra/newview/skins/xui/ja/floater_preview_texture.xml b/linden/indra/newview/skins/default/xui/ja/floater_preview_texture.xml
index affcc51..affcc51 100644
--- a/linden/indra/newview/skins/xui/ja/floater_preview_texture.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_preview_texture.xml
diff --git a/linden/indra/newview/skins/xui/ja/floater_preview_texture_keep_discard.xml b/linden/indra/newview/skins/default/xui/ja/floater_preview_texture_keep_discard.xml
index 1cf2d8e..1cf2d8e 100644
--- a/linden/indra/newview/skins/xui/ja/floater_preview_texture_keep_discard.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_preview_texture_keep_discard.xml
diff --git a/linden/indra/newview/skins/xui/ja/floater_preview_url.xml b/linden/indra/newview/skins/default/xui/ja/floater_preview_url.xml
index 354620e..354620e 100644
--- a/linden/indra/newview/skins/xui/ja/floater_preview_url.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_preview_url.xml
diff --git a/linden/indra/newview/skins/xui/ja/floater_price_for_listing.xml b/linden/indra/newview/skins/default/xui/ja/floater_price_for_listing.xml
index eb1362b..eb1362b 100644
--- a/linden/indra/newview/skins/xui/ja/floater_price_for_listing.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_price_for_listing.xml
diff --git a/linden/indra/newview/skins/xui/ja/floater_profile.xml b/linden/indra/newview/skins/default/xui/ja/floater_profile.xml
index 6ba8988..6ba8988 100644
--- a/linden/indra/newview/skins/xui/ja/floater_profile.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_profile.xml
diff --git a/linden/indra/newview/skins/xui/ja/floater_region_info.xml b/linden/indra/newview/skins/default/xui/ja/floater_region_info.xml
index 78fab8b..78fab8b 100644
--- a/linden/indra/newview/skins/xui/ja/floater_region_info.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_region_info.xml
diff --git a/linden/indra/newview/skins/xui/ja/floater_report_abuse.xml b/linden/indra/newview/skins/default/xui/ja/floater_report_abuse.xml
index e87b779..e87b779 100644
--- a/linden/indra/newview/skins/xui/ja/floater_report_abuse.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_report_abuse.xml
diff --git a/linden/indra/newview/skins/xui/ja/floater_report_bug.xml b/linden/indra/newview/skins/default/xui/ja/floater_report_bug.xml
index 7c20151..7c20151 100644
--- a/linden/indra/newview/skins/xui/ja/floater_report_bug.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_report_bug.xml
diff --git a/linden/indra/newview/skins/xui/ja/floater_script_debug.xml b/linden/indra/newview/skins/default/xui/ja/floater_script_debug.xml
index dd934e3..dd934e3 100644
--- a/linden/indra/newview/skins/xui/ja/floater_script_debug.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_script_debug.xml
diff --git a/linden/indra/newview/skins/xui/ja/floater_script_ed_panel.xml b/linden/indra/newview/skins/default/xui/ja/floater_script_ed_panel.xml
index 60519a0..60519a0 100644
--- a/linden/indra/newview/skins/xui/ja/floater_script_ed_panel.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_script_ed_panel.xml
diff --git a/linden/indra/newview/skins/xui/ja/floater_script_preview.xml b/linden/indra/newview/skins/default/xui/ja/floater_script_preview.xml
index 4cf4851..4cf4851 100644
--- a/linden/indra/newview/skins/xui/ja/floater_script_preview.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_script_preview.xml
diff --git a/linden/indra/newview/skins/xui/ja/floater_script_queue.xml b/linden/indra/newview/skins/default/xui/ja/floater_script_queue.xml
index 7c4979a..7c4979a 100644
--- a/linden/indra/newview/skins/xui/ja/floater_script_queue.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_script_queue.xml
diff --git a/linden/indra/newview/skins/xui/ja/floater_script_search.xml b/linden/indra/newview/skins/default/xui/ja/floater_script_search.xml
index 2accc0f..2accc0f 100644
--- a/linden/indra/newview/skins/xui/ja/floater_script_search.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_script_search.xml
diff --git a/linden/indra/newview/skins/xui/ja/floater_select_key.xml b/linden/indra/newview/skins/default/xui/ja/floater_select_key.xml
index 496fadd..496fadd 100644
--- a/linden/indra/newview/skins/xui/ja/floater_select_key.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_select_key.xml
diff --git a/linden/indra/newview/skins/xui/ja/floater_sell_land.xml b/linden/indra/newview/skins/default/xui/ja/floater_sell_land.xml
index 4b8650a..4b8650a 100644
--- a/linden/indra/newview/skins/xui/ja/floater_sell_land.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_sell_land.xml
diff --git a/linden/indra/newview/skins/xui/ja/floater_settings_debug.xml b/linden/indra/newview/skins/default/xui/ja/floater_settings_debug.xml
index 1de3763..1de3763 100644
--- a/linden/indra/newview/skins/xui/ja/floater_settings_debug.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_settings_debug.xml
diff --git a/linden/indra/newview/skins/xui/ja/floater_sim_release_message.xml b/linden/indra/newview/skins/default/xui/ja/floater_sim_release_message.xml
index d07a032..d07a032 100644
--- a/linden/indra/newview/skins/xui/ja/floater_sim_release_message.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_sim_release_message.xml
diff --git a/linden/indra/newview/skins/xui/ja/floater_snapshot.xml b/linden/indra/newview/skins/default/xui/ja/floater_snapshot.xml
index 694ea4e..694ea4e 100644
--- a/linden/indra/newview/skins/xui/ja/floater_snapshot.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_snapshot.xml
diff --git a/linden/indra/newview/skins/xui/ja/floater_sound_preview.xml b/linden/indra/newview/skins/default/xui/ja/floater_sound_preview.xml
index 2faa30a..2faa30a 100644
--- a/linden/indra/newview/skins/xui/ja/floater_sound_preview.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_sound_preview.xml
diff --git a/linden/indra/newview/skins/xui/ja/floater_telehub.xml b/linden/indra/newview/skins/default/xui/ja/floater_telehub.xml
index 9570d40..9570d40 100644
--- a/linden/indra/newview/skins/xui/ja/floater_telehub.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_telehub.xml
diff --git a/linden/indra/newview/skins/xui/ja/floater_test.xml b/linden/indra/newview/skins/default/xui/ja/floater_test.xml
index 7808c5f..7808c5f 100644
--- a/linden/indra/newview/skins/xui/ja/floater_test.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_test.xml
diff --git a/linden/indra/newview/skins/xui/ja/floater_texture_ctrl.xml b/linden/indra/newview/skins/default/xui/ja/floater_texture_ctrl.xml
index 79af253..79af253 100644
--- a/linden/indra/newview/skins/xui/ja/floater_texture_ctrl.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_texture_ctrl.xml
diff --git a/linden/indra/newview/skins/xui/ja/floater_tools.xml b/linden/indra/newview/skins/default/xui/ja/floater_tools.xml
index 3ec14a7..3ec14a7 100644
--- a/linden/indra/newview/skins/xui/ja/floater_tools.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_tools.xml
diff --git a/linden/indra/newview/skins/xui/ja/floater_top_objects.xml b/linden/indra/newview/skins/default/xui/ja/floater_top_objects.xml
index 879e2d8..879e2d8 100644
--- a/linden/indra/newview/skins/xui/ja/floater_top_objects.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_top_objects.xml
diff --git a/linden/indra/newview/skins/xui/ja/floater_tos.xml b/linden/indra/newview/skins/default/xui/ja/floater_tos.xml
index ee01a2b..ee01a2b 100644
--- a/linden/indra/newview/skins/xui/ja/floater_tos.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_tos.xml
diff --git a/linden/indra/newview/skins/xui/ja/floater_url_entry.xml b/linden/indra/newview/skins/default/xui/ja/floater_url_entry.xml
index af038ea..af038ea 100644
--- a/linden/indra/newview/skins/xui/ja/floater_url_entry.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_url_entry.xml
diff --git a/linden/indra/newview/skins/xui/ja/floater_voice_wizard.xml b/linden/indra/newview/skins/default/xui/ja/floater_voice_wizard.xml
index 79ed30b..79ed30b 100644
--- a/linden/indra/newview/skins/xui/ja/floater_voice_wizard.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_voice_wizard.xml
diff --git a/linden/indra/newview/skins/xui/ja/floater_water.xml b/linden/indra/newview/skins/default/xui/ja/floater_water.xml
index 91094e2..91094e2 100644
--- a/linden/indra/newview/skins/xui/ja/floater_water.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_water.xml
diff --git a/linden/indra/newview/skins/xui/ja/floater_wearable_save_as.xml b/linden/indra/newview/skins/default/xui/ja/floater_wearable_save_as.xml
index 8286d29..8286d29 100644
--- a/linden/indra/newview/skins/xui/ja/floater_wearable_save_as.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_wearable_save_as.xml
diff --git a/linden/indra/newview/skins/xui/ja/floater_windlight_options.xml b/linden/indra/newview/skins/default/xui/ja/floater_windlight_options.xml
index d4a3d41..d4a3d41 100644
--- a/linden/indra/newview/skins/xui/ja/floater_windlight_options.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_windlight_options.xml
diff --git a/linden/indra/newview/skins/xui/ja/floater_world_map.xml b/linden/indra/newview/skins/default/xui/ja/floater_world_map.xml
index f755964..f755964 100644
--- a/linden/indra/newview/skins/xui/ja/floater_world_map.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_world_map.xml
diff --git a/linden/indra/newview/skins/xui/ja/menu_inventory.xml b/linden/indra/newview/skins/default/xui/ja/menu_inventory.xml
index 04ae1d3..04ae1d3 100644
--- a/linden/indra/newview/skins/xui/ja/menu_inventory.xml
+++ b/linden/indra/newview/skins/default/xui/ja/menu_inventory.xml
diff --git a/linden/indra/newview/skins/xui/ja/menu_login.xml b/linden/indra/newview/skins/default/xui/ja/menu_login.xml
index ecad945..ecad945 100644
--- a/linden/indra/newview/skins/xui/ja/menu_login.xml
+++ b/linden/indra/newview/skins/default/xui/ja/menu_login.xml
diff --git a/linden/indra/newview/skins/xui/ja/menu_pie_attachment.xml b/linden/indra/newview/skins/default/xui/ja/menu_pie_attachment.xml
index 3497dd8..3497dd8 100644
--- a/linden/indra/newview/skins/xui/ja/menu_pie_attachment.xml
+++ b/linden/indra/newview/skins/default/xui/ja/menu_pie_attachment.xml
diff --git a/linden/indra/newview/skins/xui/ja/menu_pie_avatar.xml b/linden/indra/newview/skins/default/xui/ja/menu_pie_avatar.xml
index f206789..f206789 100644
--- a/linden/indra/newview/skins/xui/ja/menu_pie_avatar.xml
+++ b/linden/indra/newview/skins/default/xui/ja/menu_pie_avatar.xml
diff --git a/linden/indra/newview/skins/xui/ja/menu_pie_land.xml b/linden/indra/newview/skins/default/xui/ja/menu_pie_land.xml
index 8e9c571..8e9c571 100644
--- a/linden/indra/newview/skins/xui/ja/menu_pie_land.xml
+++ b/linden/indra/newview/skins/default/xui/ja/menu_pie_land.xml
diff --git a/linden/indra/newview/skins/xui/ja/menu_pie_object.xml b/linden/indra/newview/skins/default/xui/ja/menu_pie_object.xml
index 64a8190..64a8190 100644
--- a/linden/indra/newview/skins/xui/ja/menu_pie_object.xml
+++ b/linden/indra/newview/skins/default/xui/ja/menu_pie_object.xml
diff --git a/linden/indra/newview/skins/xui/ja/menu_pie_self.xml b/linden/indra/newview/skins/default/xui/ja/menu_pie_self.xml
index 8ffa8bb..8ffa8bb 100644
--- a/linden/indra/newview/skins/xui/ja/menu_pie_self.xml
+++ b/linden/indra/newview/skins/default/xui/ja/menu_pie_self.xml
diff --git a/linden/indra/newview/skins/xui/ja/menu_slurl.xml b/linden/indra/newview/skins/default/xui/ja/menu_slurl.xml
index 5007773..5007773 100644
--- a/linden/indra/newview/skins/xui/ja/menu_slurl.xml
+++ b/linden/indra/newview/skins/default/xui/ja/menu_slurl.xml
diff --git a/linden/indra/newview/skins/xui/ja/menu_viewer.xml b/linden/indra/newview/skins/default/xui/ja/menu_viewer.xml
index 278e43f..278e43f 100644
--- a/linden/indra/newview/skins/xui/ja/menu_viewer.xml
+++ b/linden/indra/newview/skins/default/xui/ja/menu_viewer.xml
diff --git a/linden/indra/newview/skins/xui/ja/mime_types.xml b/linden/indra/newview/skins/default/xui/ja/mime_types.xml
index 9bebc7c..9bebc7c 100644
--- a/linden/indra/newview/skins/xui/ja/mime_types.xml
+++ b/linden/indra/newview/skins/default/xui/ja/mime_types.xml
diff --git a/linden/indra/newview/skins/xui/ja/need_to_long.xml b/linden/indra/newview/skins/default/xui/ja/need_to_long.xml
index 205da47..205da47 100644
--- a/linden/indra/newview/skins/xui/ja/need_to_long.xml
+++ b/linden/indra/newview/skins/default/xui/ja/need_to_long.xml
diff --git a/linden/indra/newview/skins/xui/ja/need_to_translate.xml b/linden/indra/newview/skins/default/xui/ja/need_to_translate.xml
index 893906b..893906b 100644
--- a/linden/indra/newview/skins/xui/ja/need_to_translate.xml
+++ b/linden/indra/newview/skins/default/xui/ja/need_to_translate.xml
diff --git a/linden/indra/newview/skins/xui/ja/need_to_update.xml b/linden/indra/newview/skins/default/xui/ja/need_to_update.xml
index 4489411..4489411 100644
--- a/linden/indra/newview/skins/xui/ja/need_to_update.xml
+++ b/linden/indra/newview/skins/default/xui/ja/need_to_update.xml
diff --git a/linden/indra/newview/skins/xui/ja/notify.xml b/linden/indra/newview/skins/default/xui/ja/notify.xml
index 1a10704..1a10704 100644
--- a/linden/indra/newview/skins/xui/ja/notify.xml
+++ b/linden/indra/newview/skins/default/xui/ja/notify.xml
diff --git a/linden/indra/newview/skins/xui/ja/panel_audio.xml b/linden/indra/newview/skins/default/xui/ja/panel_audio.xml
index 02be06d..02be06d 100644
--- a/linden/indra/newview/skins/xui/ja/panel_audio.xml
+++ b/linden/indra/newview/skins/default/xui/ja/panel_audio.xml
diff --git a/linden/indra/newview/skins/xui/ja/panel_audio_device.xml b/linden/indra/newview/skins/default/xui/ja/panel_audio_device.xml
index 7bd1bce..7bd1bce 100644
--- a/linden/indra/newview/skins/xui/ja/panel_audio_device.xml
+++ b/linden/indra/newview/skins/default/xui/ja/panel_audio_device.xml
diff --git a/linden/indra/newview/skins/xui/ja/panel_avatar.xml b/linden/indra/newview/skins/default/xui/ja/panel_avatar.xml
index 8c4c92b..8c4c92b 100644
--- a/linden/indra/newview/skins/xui/ja/panel_avatar.xml
+++ b/linden/indra/newview/skins/default/xui/ja/panel_avatar.xml
diff --git a/linden/indra/newview/skins/xui/ja/panel_avatar_classified.xml b/linden/indra/newview/skins/default/xui/ja/panel_avatar_classified.xml
index c4a1328..c4a1328 100644
--- a/linden/indra/newview/skins/xui/ja/panel_avatar_classified.xml
+++ b/linden/indra/newview/skins/default/xui/ja/panel_avatar_classified.xml
diff --git a/linden/indra/newview/skins/xui/ja/panel_avatar_pick.xml b/linden/indra/newview/skins/default/xui/ja/panel_avatar_pick.xml
index 32df18a..32df18a 100644
--- a/linden/indra/newview/skins/xui/ja/panel_avatar_pick.xml
+++ b/linden/indra/newview/skins/default/xui/ja/panel_avatar_pick.xml
diff --git a/linden/indra/newview/skins/xui/ja/panel_chat_bar.xml b/linden/indra/newview/skins/default/xui/ja/panel_chat_bar.xml
index f0bb74b..f0bb74b 100644
--- a/linden/indra/newview/skins/xui/ja/panel_chat_bar.xml
+++ b/linden/indra/newview/skins/default/xui/ja/panel_chat_bar.xml
diff --git a/linden/indra/newview/skins/xui/ja/panel_classified.xml b/linden/indra/newview/skins/default/xui/ja/panel_classified.xml
index 22113f7..22113f7 100644
--- a/linden/indra/newview/skins/xui/ja/panel_classified.xml
+++ b/linden/indra/newview/skins/default/xui/ja/panel_classified.xml
diff --git a/linden/indra/newview/skins/xui/ja/panel_event.xml b/linden/indra/newview/skins/default/xui/ja/panel_event.xml
index 3132024..3132024 100644
--- a/linden/indra/newview/skins/xui/ja/panel_event.xml
+++ b/linden/indra/newview/skins/default/xui/ja/panel_event.xml
diff --git a/linden/indra/newview/skins/xui/ja/panel_friends.xml b/linden/indra/newview/skins/default/xui/ja/panel_friends.xml
index 45f1f32..45f1f32 100644
--- a/linden/indra/newview/skins/xui/ja/panel_friends.xml
+++ b/linden/indra/newview/skins/default/xui/ja/panel_friends.xml
diff --git a/linden/indra/newview/skins/xui/ja/panel_group.xml b/linden/indra/newview/skins/default/xui/ja/panel_group.xml
index 65f5e17..65f5e17 100644
--- a/linden/indra/newview/skins/xui/ja/panel_group.xml
+++ b/linden/indra/newview/skins/default/xui/ja/panel_group.xml
diff --git a/linden/indra/newview/skins/xui/ja/panel_group_finder.xml b/linden/indra/newview/skins/default/xui/ja/panel_group_finder.xml
index e4c51c7..e4c51c7 100644
--- a/linden/indra/newview/skins/xui/ja/panel_group_finder.xml
+++ b/linden/indra/newview/skins/default/xui/ja/panel_group_finder.xml
diff --git a/linden/indra/newview/skins/xui/ja/panel_group_general.xml b/linden/indra/newview/skins/default/xui/ja/panel_group_general.xml
index bed2bed..bed2bed 100644
--- a/linden/indra/newview/skins/xui/ja/panel_group_general.xml
+++ b/linden/indra/newview/skins/default/xui/ja/panel_group_general.xml
diff --git a/linden/indra/newview/skins/xui/ja/panel_group_invite.xml b/linden/indra/newview/skins/default/xui/ja/panel_group_invite.xml
index f004d14..f004d14 100644
--- a/linden/indra/newview/skins/xui/ja/panel_group_invite.xml
+++ b/linden/indra/newview/skins/default/xui/ja/panel_group_invite.xml
diff --git a/linden/indra/newview/skins/xui/ja/panel_group_land_money.xml b/linden/indra/newview/skins/default/xui/ja/panel_group_land_money.xml
index 53ea61a..53ea61a 100644
--- a/linden/indra/newview/skins/xui/ja/panel_group_land_money.xml
+++ b/linden/indra/newview/skins/default/xui/ja/panel_group_land_money.xml
diff --git a/linden/indra/newview/skins/xui/ja/panel_group_notices.xml b/linden/indra/newview/skins/default/xui/ja/panel_group_notices.xml
index 2bdc45f..2bdc45f 100644
--- a/linden/indra/newview/skins/xui/ja/panel_group_notices.xml
+++ b/linden/indra/newview/skins/default/xui/ja/panel_group_notices.xml
diff --git a/linden/indra/newview/skins/xui/ja/panel_group_roles.xml b/linden/indra/newview/skins/default/xui/ja/panel_group_roles.xml
index 4640600..4640600 100644
--- a/linden/indra/newview/skins/xui/ja/panel_group_roles.xml
+++ b/linden/indra/newview/skins/default/xui/ja/panel_group_roles.xml
diff --git a/linden/indra/newview/skins/xui/ja/panel_group_voting.xml b/linden/indra/newview/skins/default/xui/ja/panel_group_voting.xml
index a4b2e5e..a4b2e5e 100644
--- a/linden/indra/newview/skins/xui/ja/panel_group_voting.xml
+++ b/linden/indra/newview/skins/default/xui/ja/panel_group_voting.xml
diff --git a/linden/indra/newview/skins/xui/ja/panel_groups.xml b/linden/indra/newview/skins/default/xui/ja/panel_groups.xml
index 2256593..2256593 100644
--- a/linden/indra/newview/skins/xui/ja/panel_groups.xml
+++ b/linden/indra/newview/skins/default/xui/ja/panel_groups.xml
diff --git a/linden/indra/newview/skins/xui/ja/panel_land_covenant.xml b/linden/indra/newview/skins/default/xui/ja/panel_land_covenant.xml
index e1e9ba7..e1e9ba7 100644
--- a/linden/indra/newview/skins/xui/ja/panel_land_covenant.xml
+++ b/linden/indra/newview/skins/default/xui/ja/panel_land_covenant.xml
diff --git a/linden/indra/newview/skins/xui/ja/panel_login.xml b/linden/indra/newview/skins/default/xui/ja/panel_login.xml
index f908a1f..f908a1f 100644
--- a/linden/indra/newview/skins/xui/ja/panel_login.xml
+++ b/linden/indra/newview/skins/default/xui/ja/panel_login.xml
diff --git a/linden/indra/newview/skins/xui/ja/panel_master_volume.xml b/linden/indra/newview/skins/default/xui/ja/panel_master_volume.xml
index c905a75..c905a75 100644
--- a/linden/indra/newview/skins/xui/ja/panel_master_volume.xml
+++ b/linden/indra/newview/skins/default/xui/ja/panel_master_volume.xml
diff --git a/linden/indra/newview/skins/xui/ja/panel_media_controls.xml b/linden/indra/newview/skins/default/xui/ja/panel_media_controls.xml
index dccdc35..dccdc35 100644
--- a/linden/indra/newview/skins/xui/ja/panel_media_controls.xml
+++ b/linden/indra/newview/skins/default/xui/ja/panel_media_controls.xml
diff --git a/linden/indra/newview/skins/xui/ja/panel_media_remote.xml b/linden/indra/newview/skins/default/xui/ja/panel_media_remote.xml
index e92e475..e92e475 100644
--- a/linden/indra/newview/skins/xui/ja/panel_media_remote.xml
+++ b/linden/indra/newview/skins/default/xui/ja/panel_media_remote.xml
diff --git a/linden/indra/newview/skins/xui/ja/panel_media_remote_expanded.xml b/linden/indra/newview/skins/default/xui/ja/panel_media_remote_expanded.xml
index abc92db..abc92db 100644
--- a/linden/indra/newview/skins/xui/ja/panel_media_remote_expanded.xml
+++ b/linden/indra/newview/skins/default/xui/ja/panel_media_remote_expanded.xml
diff --git a/linden/indra/newview/skins/xui/ja/panel_overlaybar.xml b/linden/indra/newview/skins/default/xui/ja/panel_overlaybar.xml
index a64a190..a64a190 100644
--- a/linden/indra/newview/skins/xui/ja/panel_overlaybar.xml
+++ b/linden/indra/newview/skins/default/xui/ja/panel_overlaybar.xml
diff --git a/linden/indra/newview/skins/xui/ja/panel_place.xml b/linden/indra/newview/skins/default/xui/ja/panel_place.xml
index 7339a05..7339a05 100644
--- a/linden/indra/newview/skins/xui/ja/panel_place.xml
+++ b/linden/indra/newview/skins/default/xui/ja/panel_place.xml
diff --git a/linden/indra/newview/skins/xui/ja/panel_place_small.xml b/linden/indra/newview/skins/default/xui/ja/panel_place_small.xml
index 32e3520..32e3520 100644
--- a/linden/indra/newview/skins/xui/ja/panel_place_small.xml
+++ b/linden/indra/newview/skins/default/xui/ja/panel_place_small.xml
diff --git a/linden/indra/newview/skins/xui/ja/panel_preferences_LCD.xml b/linden/indra/newview/skins/default/xui/ja/panel_preferences_LCD.xml
index 899de6d..899de6d 100644
--- a/linden/indra/newview/skins/xui/ja/panel_preferences_LCD.xml
+++ b/linden/indra/newview/skins/default/xui/ja/panel_preferences_LCD.xml
diff --git a/linden/indra/newview/skins/xui/ja/panel_preferences_audio.xml b/linden/indra/newview/skins/default/xui/ja/panel_preferences_audio.xml
index 057d236..057d236 100644
--- a/linden/indra/newview/skins/xui/ja/panel_preferences_audio.xml
+++ b/linden/indra/newview/skins/default/xui/ja/panel_preferences_audio.xml
diff --git a/linden/indra/newview/skins/xui/ja/panel_preferences_chat.xml b/linden/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml
index 12f009f..12f009f 100644
--- a/linden/indra/newview/skins/xui/ja/panel_preferences_chat.xml
+++ b/linden/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml
diff --git a/linden/indra/newview/skins/xui/ja/panel_preferences_general.xml b/linden/indra/newview/skins/default/xui/ja/panel_preferences_general.xml
index 213d1ed..213d1ed 100644
--- a/linden/indra/newview/skins/xui/ja/panel_preferences_general.xml
+++ b/linden/indra/newview/skins/default/xui/ja/panel_preferences_general.xml
diff --git a/linden/indra/newview/skins/xui/ja/panel_preferences_graphics1.xml b/linden/indra/newview/skins/default/xui/ja/panel_preferences_graphics1.xml
index 60de066..60de066 100644
--- a/linden/indra/newview/skins/xui/ja/panel_preferences_graphics1.xml
+++ b/linden/indra/newview/skins/default/xui/ja/panel_preferences_graphics1.xml
diff --git a/linden/indra/newview/skins/xui/ja/panel_preferences_im.xml b/linden/indra/newview/skins/default/xui/ja/panel_preferences_im.xml
index 4c79ae2..4c79ae2 100644
--- a/linden/indra/newview/skins/xui/ja/panel_preferences_im.xml
+++ b/linden/indra/newview/skins/default/xui/ja/panel_preferences_im.xml
diff --git a/linden/indra/newview/skins/xui/ja/panel_preferences_input.xml b/linden/indra/newview/skins/default/xui/ja/panel_preferences_input.xml
index 045d7fb..045d7fb 100644
--- a/linden/indra/newview/skins/xui/ja/panel_preferences_input.xml
+++ b/linden/indra/newview/skins/default/xui/ja/panel_preferences_input.xml
diff --git a/linden/indra/newview/skins/xui/ja/panel_preferences_network.xml b/linden/indra/newview/skins/default/xui/ja/panel_preferences_network.xml
index ec7db5a..ec7db5a 100644
--- a/linden/indra/newview/skins/xui/ja/panel_preferences_network.xml
+++ b/linden/indra/newview/skins/default/xui/ja/panel_preferences_network.xml
diff --git a/linden/indra/newview/skins/xui/ja/panel_preferences_popups.xml b/linden/indra/newview/skins/default/xui/ja/panel_preferences_popups.xml
index 667582b..667582b 100644
--- a/linden/indra/newview/skins/xui/ja/panel_preferences_popups.xml
+++ b/linden/indra/newview/skins/default/xui/ja/panel_preferences_popups.xml
diff --git a/linden/indra/newview/skins/xui/ja/panel_preferences_voice.xml b/linden/indra/newview/skins/default/xui/ja/panel_preferences_voice.xml
index 85deb89..85deb89 100644
--- a/linden/indra/newview/skins/xui/ja/panel_preferences_voice.xml
+++ b/linden/indra/newview/skins/default/xui/ja/panel_preferences_voice.xml
diff --git a/linden/indra/newview/skins/xui/ja/panel_preferences_web.xml b/linden/indra/newview/skins/default/xui/ja/panel_preferences_web.xml
index 72dd64d..72dd64d 100644
--- a/linden/indra/newview/skins/xui/ja/panel_preferences_web.xml
+++ b/linden/indra/newview/skins/default/xui/ja/panel_preferences_web.xml
diff --git a/linden/indra/newview/skins/xui/ja/panel_region_covenant.xml b/linden/indra/newview/skins/default/xui/ja/panel_region_covenant.xml
index 81822c5..81822c5 100644
--- a/linden/indra/newview/skins/xui/ja/panel_region_covenant.xml
+++ b/linden/indra/newview/skins/default/xui/ja/panel_region_covenant.xml
diff --git a/linden/indra/newview/skins/xui/ja/panel_region_debug.xml b/linden/indra/newview/skins/default/xui/ja/panel_region_debug.xml
index 321c261..321c261 100644
--- a/linden/indra/newview/skins/xui/ja/panel_region_debug.xml
+++ b/linden/indra/newview/skins/default/xui/ja/panel_region_debug.xml
diff --git a/linden/indra/newview/skins/xui/ja/panel_region_estate.xml b/linden/indra/newview/skins/default/xui/ja/panel_region_estate.xml
index 42eaec0..42eaec0 100644
--- a/linden/indra/newview/skins/xui/ja/panel_region_estate.xml
+++ b/linden/indra/newview/skins/default/xui/ja/panel_region_estate.xml
diff --git a/linden/indra/newview/skins/xui/ja/panel_region_general.xml b/linden/indra/newview/skins/default/xui/ja/panel_region_general.xml
index 0708c9c..0708c9c 100644
--- a/linden/indra/newview/skins/xui/ja/panel_region_general.xml
+++ b/linden/indra/newview/skins/default/xui/ja/panel_region_general.xml
diff --git a/linden/indra/newview/skins/xui/ja/panel_region_terrain.xml b/linden/indra/newview/skins/default/xui/ja/panel_region_terrain.xml
index d77f974..d77f974 100644
--- a/linden/indra/newview/skins/xui/ja/panel_region_terrain.xml
+++ b/linden/indra/newview/skins/default/xui/ja/panel_region_terrain.xml
diff --git a/linden/indra/newview/skins/xui/ja/panel_region_texture.xml b/linden/indra/newview/skins/default/xui/ja/panel_region_texture.xml
index 6527f0f..6527f0f 100644
--- a/linden/indra/newview/skins/xui/ja/panel_region_texture.xml
+++ b/linden/indra/newview/skins/default/xui/ja/panel_region_texture.xml
diff --git a/linden/indra/newview/skins/xui/ja/panel_scrolling_param.xml b/linden/indra/newview/skins/default/xui/ja/panel_scrolling_param.xml
index b7e334d..b7e334d 100644
--- a/linden/indra/newview/skins/xui/ja/panel_scrolling_param.xml
+++ b/linden/indra/newview/skins/default/xui/ja/panel_scrolling_param.xml
diff --git a/linden/indra/newview/skins/xui/ja/panel_speaker_controls.xml b/linden/indra/newview/skins/default/xui/ja/panel_speaker_controls.xml
index b82aace..b82aace 100644
--- a/linden/indra/newview/skins/xui/ja/panel_speaker_controls.xml
+++ b/linden/indra/newview/skins/default/xui/ja/panel_speaker_controls.xml
diff --git a/linden/indra/newview/skins/xui/ja/panel_status_bar.xml b/linden/indra/newview/skins/default/xui/ja/panel_status_bar.xml
index bfbb2c1..bfbb2c1 100644
--- a/linden/indra/newview/skins/xui/ja/panel_status_bar.xml
+++ b/linden/indra/newview/skins/default/xui/ja/panel_status_bar.xml
diff --git a/linden/indra/newview/skins/xui/ja/panel_toolbar.xml b/linden/indra/newview/skins/default/xui/ja/panel_toolbar.xml
index 56d0407..56d0407 100644
--- a/linden/indra/newview/skins/xui/ja/panel_toolbar.xml
+++ b/linden/indra/newview/skins/default/xui/ja/panel_toolbar.xml
diff --git a/linden/indra/newview/skins/xui/ja/panel_top_pick.xml b/linden/indra/newview/skins/default/xui/ja/panel_top_pick.xml
index 1fa150b..1fa150b 100644
--- a/linden/indra/newview/skins/xui/ja/panel_top_pick.xml
+++ b/linden/indra/newview/skins/default/xui/ja/panel_top_pick.xml
diff --git a/linden/indra/newview/skins/xui/ja/panel_voice_controls.xml b/linden/indra/newview/skins/default/xui/ja/panel_voice_controls.xml
index a71563e..a71563e 100644
--- a/linden/indra/newview/skins/xui/ja/panel_voice_controls.xml
+++ b/linden/indra/newview/skins/default/xui/ja/panel_voice_controls.xml
diff --git a/linden/indra/newview/skins/xui/ja/panel_voice_enable.xml b/linden/indra/newview/skins/default/xui/ja/panel_voice_enable.xml
index adb7766..adb7766 100644
--- a/linden/indra/newview/skins/xui/ja/panel_voice_enable.xml
+++ b/linden/indra/newview/skins/default/xui/ja/panel_voice_enable.xml
diff --git a/linden/indra/newview/skins/xui/ja/panel_voice_options.xml b/linden/indra/newview/skins/default/xui/ja/panel_voice_options.xml
index d708691..d708691 100644
--- a/linden/indra/newview/skins/xui/ja/panel_voice_options.xml
+++ b/linden/indra/newview/skins/default/xui/ja/panel_voice_options.xml
diff --git a/linden/indra/newview/skins/xui/ja/panel_voice_remote.xml b/linden/indra/newview/skins/default/xui/ja/panel_voice_remote.xml
index 7f1237e..7f1237e 100644
--- a/linden/indra/newview/skins/xui/ja/panel_voice_remote.xml
+++ b/linden/indra/newview/skins/default/xui/ja/panel_voice_remote.xml
diff --git a/linden/indra/newview/skins/xui/ja/panel_voice_remote_expanded.xml b/linden/indra/newview/skins/default/xui/ja/panel_voice_remote_expanded.xml
index 57052c2..57052c2 100644
--- a/linden/indra/newview/skins/xui/ja/panel_voice_remote_expanded.xml
+++ b/linden/indra/newview/skins/default/xui/ja/panel_voice_remote_expanded.xml
diff --git a/linden/indra/newview/skins/xui/ja/role_actions.xml b/linden/indra/newview/skins/default/xui/ja/role_actions.xml
index c0c98b3..c0c98b3 100644
--- a/linden/indra/newview/skins/xui/ja/role_actions.xml
+++ b/linden/indra/newview/skins/default/xui/ja/role_actions.xml
diff --git a/linden/indra/newview/skins/xui/ja/strings.xml b/linden/indra/newview/skins/default/xui/ja/strings.xml
index 700f6bd..700f6bd 100644
--- a/linden/indra/newview/skins/xui/ja/strings.xml
+++ b/linden/indra/newview/skins/default/xui/ja/strings.xml
diff --git a/linden/indra/newview/skins/xui/ja/teleport_strings.xml b/linden/indra/newview/skins/default/xui/ja/teleport_strings.xml
index 288c44b..288c44b 100644
--- a/linden/indra/newview/skins/xui/ja/teleport_strings.xml
+++ b/linden/indra/newview/skins/default/xui/ja/teleport_strings.xml
diff --git a/linden/indra/newview/skins/xui/ja/xui_version.xml b/linden/indra/newview/skins/default/xui/ja/xui_version.xml
index 0e77775..0e77775 100644
--- a/linden/indra/newview/skins/xui/ja/xui_version.xml
+++ b/linden/indra/newview/skins/default/xui/ja/xui_version.xml
diff --git a/linden/indra/newview/skins/xui/ko/LCD_text.xml b/linden/indra/newview/skins/default/xui/ko/LCD_text.xml
index 0ebfae7..0ebfae7 100644
--- a/linden/indra/newview/skins/xui/ko/LCD_text.xml
+++ b/linden/indra/newview/skins/default/xui/ko/LCD_text.xml
diff --git a/linden/indra/newview/skins/xui/ko/alerts.xml b/linden/indra/newview/skins/default/xui/ko/alerts.xml
index 914648c..914648c 100644
--- a/linden/indra/newview/skins/xui/ko/alerts.xml
+++ b/linden/indra/newview/skins/default/xui/ko/alerts.xml
diff --git a/linden/indra/newview/skins/xui/ko/floater_about.xml b/linden/indra/newview/skins/default/xui/ko/floater_about.xml
index 19f3a27..19f3a27 100644
--- a/linden/indra/newview/skins/xui/ko/floater_about.xml
+++ b/linden/indra/newview/skins/default/xui/ko/floater_about.xml
diff --git a/linden/indra/newview/skins/xui/ko/floater_about_land.xml b/linden/indra/newview/skins/default/xui/ko/floater_about_land.xml
index 036b378..036b378 100644
--- a/linden/indra/newview/skins/xui/ko/floater_about_land.xml
+++ b/linden/indra/newview/skins/default/xui/ko/floater_about_land.xml
diff --git a/linden/indra/newview/skins/xui/ko/floater_active_speakers.xml b/linden/indra/newview/skins/default/xui/ko/floater_active_speakers.xml
index fa5c28c..fa5c28c 100644
--- a/linden/indra/newview/skins/xui/ko/floater_active_speakers.xml
+++ b/linden/indra/newview/skins/default/xui/ko/floater_active_speakers.xml
diff --git a/linden/indra/newview/skins/xui/ko/floater_animation_preview.xml b/linden/indra/newview/skins/default/xui/ko/floater_animation_preview.xml
index 2f10760..2f10760 100644
--- a/linden/indra/newview/skins/xui/ko/floater_animation_preview.xml
+++ b/linden/indra/newview/skins/default/xui/ko/floater_animation_preview.xml
diff --git a/linden/indra/newview/skins/xui/ko/floater_auction.xml b/linden/indra/newview/skins/default/xui/ko/floater_auction.xml
index ea8e9c8..ea8e9c8 100644
--- a/linden/indra/newview/skins/xui/ko/floater_auction.xml
+++ b/linden/indra/newview/skins/default/xui/ko/floater_auction.xml
diff --git a/linden/indra/newview/skins/xui/ko/floater_audio_volume.xml b/linden/indra/newview/skins/default/xui/ko/floater_audio_volume.xml
index 848c21d..848c21d 100644
--- a/linden/indra/newview/skins/xui/ko/floater_audio_volume.xml
+++ b/linden/indra/newview/skins/default/xui/ko/floater_audio_volume.xml
diff --git a/linden/indra/newview/skins/xui/ko/floater_avatar_picker.xml b/linden/indra/newview/skins/default/xui/ko/floater_avatar_picker.xml
index daac505..daac505 100644
--- a/linden/indra/newview/skins/xui/ko/floater_avatar_picker.xml
+++ b/linden/indra/newview/skins/default/xui/ko/floater_avatar_picker.xml
diff --git a/linden/indra/newview/skins/xui/ko/floater_avatar_textures.xml b/linden/indra/newview/skins/default/xui/ko/floater_avatar_textures.xml
index 46f86cc..46f86cc 100644
--- a/linden/indra/newview/skins/xui/ko/floater_avatar_textures.xml
+++ b/linden/indra/newview/skins/default/xui/ko/floater_avatar_textures.xml
diff --git a/linden/indra/newview/skins/xui/ko/floater_build_options.xml b/linden/indra/newview/skins/default/xui/ko/floater_build_options.xml
index b258fa6..b258fa6 100644
--- a/linden/indra/newview/skins/xui/ko/floater_build_options.xml
+++ b/linden/indra/newview/skins/default/xui/ko/floater_build_options.xml
diff --git a/linden/indra/newview/skins/xui/ko/floater_bumps.xml b/linden/indra/newview/skins/default/xui/ko/floater_bumps.xml
index 35ee93c..35ee93c 100644
--- a/linden/indra/newview/skins/xui/ko/floater_bumps.xml
+++ b/linden/indra/newview/skins/default/xui/ko/floater_bumps.xml
diff --git a/linden/indra/newview/skins/xui/ko/floater_buy_contents.xml b/linden/indra/newview/skins/default/xui/ko/floater_buy_contents.xml
index ccc16d3..ccc16d3 100644
--- a/linden/indra/newview/skins/xui/ko/floater_buy_contents.xml
+++ b/linden/indra/newview/skins/default/xui/ko/floater_buy_contents.xml
diff --git a/linden/indra/newview/skins/xui/ko/floater_buy_currency.xml b/linden/indra/newview/skins/default/xui/ko/floater_buy_currency.xml
index e169c0e..e169c0e 100644
--- a/linden/indra/newview/skins/xui/ko/floater_buy_currency.xml
+++ b/linden/indra/newview/skins/default/xui/ko/floater_buy_currency.xml
diff --git a/linden/indra/newview/skins/xui/ko/floater_buy_land.xml b/linden/indra/newview/skins/default/xui/ko/floater_buy_land.xml
index cdd38c8..cdd38c8 100644
--- a/linden/indra/newview/skins/xui/ko/floater_buy_land.xml
+++ b/linden/indra/newview/skins/default/xui/ko/floater_buy_land.xml
diff --git a/linden/indra/newview/skins/xui/ko/floater_buy_object.xml b/linden/indra/newview/skins/default/xui/ko/floater_buy_object.xml
index da3df23..da3df23 100644
--- a/linden/indra/newview/skins/xui/ko/floater_buy_object.xml
+++ b/linden/indra/newview/skins/default/xui/ko/floater_buy_object.xml
diff --git a/linden/indra/newview/skins/xui/ko/floater_camera.xml b/linden/indra/newview/skins/default/xui/ko/floater_camera.xml
index c08bf02..c08bf02 100644
--- a/linden/indra/newview/skins/xui/ko/floater_camera.xml
+++ b/linden/indra/newview/skins/default/xui/ko/floater_camera.xml
diff --git a/linden/indra/newview/skins/xui/ko/floater_chat_history.xml b/linden/indra/newview/skins/default/xui/ko/floater_chat_history.xml
index 3c634d8..3c634d8 100644
--- a/linden/indra/newview/skins/xui/ko/floater_chat_history.xml
+++ b/linden/indra/newview/skins/default/xui/ko/floater_chat_history.xml
diff --git a/linden/indra/newview/skins/xui/ko/floater_chatterbox.xml b/linden/indra/newview/skins/default/xui/ko/floater_chatterbox.xml
index fe974d6..fe974d6 100644
--- a/linden/indra/newview/skins/xui/ko/floater_chatterbox.xml
+++ b/linden/indra/newview/skins/default/xui/ko/floater_chatterbox.xml
diff --git a/linden/indra/newview/skins/xui/ko/floater_choose_group.xml b/linden/indra/newview/skins/default/xui/ko/floater_choose_group.xml
index 2cb821a..2cb821a 100644
--- a/linden/indra/newview/skins/xui/ko/floater_choose_group.xml
+++ b/linden/indra/newview/skins/default/xui/ko/floater_choose_group.xml
diff --git a/linden/indra/newview/skins/xui/ko/floater_clothing.xml b/linden/indra/newview/skins/default/xui/ko/floater_clothing.xml
index d13f35b..d13f35b 100644
--- a/linden/indra/newview/skins/xui/ko/floater_clothing.xml
+++ b/linden/indra/newview/skins/default/xui/ko/floater_clothing.xml
diff --git a/linden/indra/newview/skins/xui/ko/floater_color_picker.xml b/linden/indra/newview/skins/default/xui/ko/floater_color_picker.xml
index bae7b0c..bae7b0c 100644
--- a/linden/indra/newview/skins/xui/ko/floater_color_picker.xml
+++ b/linden/indra/newview/skins/default/xui/ko/floater_color_picker.xml
diff --git a/linden/indra/newview/skins/xui/ko/floater_critical.xml b/linden/indra/newview/skins/default/xui/ko/floater_critical.xml
index e5ce706..e5ce706 100644
--- a/linden/indra/newview/skins/xui/ko/floater_critical.xml
+++ b/linden/indra/newview/skins/default/xui/ko/floater_critical.xml
diff --git a/linden/indra/newview/skins/xui/ko/floater_customize.xml b/linden/indra/newview/skins/default/xui/ko/floater_customize.xml
index 812484b..812484b 100644
--- a/linden/indra/newview/skins/xui/ko/floater_customize.xml
+++ b/linden/indra/newview/skins/default/xui/ko/floater_customize.xml
diff --git a/linden/indra/newview/skins/xui/ko/floater_day_cycle_options.xml b/linden/indra/newview/skins/default/xui/ko/floater_day_cycle_options.xml
index 9d41de9..9d41de9 100644
--- a/linden/indra/newview/skins/xui/ko/floater_day_cycle_options.xml
+++ b/linden/indra/newview/skins/default/xui/ko/floater_day_cycle_options.xml
diff --git a/linden/indra/newview/skins/xui/ko/floater_device_settings.xml b/linden/indra/newview/skins/default/xui/ko/floater_device_settings.xml
index 16b089b..16b089b 100644
--- a/linden/indra/newview/skins/xui/ko/floater_device_settings.xml
+++ b/linden/indra/newview/skins/default/xui/ko/floater_device_settings.xml
diff --git a/linden/indra/newview/skins/xui/ko/floater_directory.xml b/linden/indra/newview/skins/default/xui/ko/floater_directory.xml
index a9b41d8..a9b41d8 100644
--- a/linden/indra/newview/skins/xui/ko/floater_directory.xml
+++ b/linden/indra/newview/skins/default/xui/ko/floater_directory.xml
diff --git a/linden/indra/newview/skins/xui/ko/floater_env_settings.xml b/linden/indra/newview/skins/default/xui/ko/floater_env_settings.xml
index d455910..d455910 100644
--- a/linden/indra/newview/skins/xui/ko/floater_env_settings.xml
+++ b/linden/indra/newview/skins/default/xui/ko/floater_env_settings.xml
diff --git a/linden/indra/newview/skins/xui/ko/floater_gesture.xml b/linden/indra/newview/skins/default/xui/ko/floater_gesture.xml
index ab525d0..ab525d0 100644
--- a/linden/indra/newview/skins/xui/ko/floater_gesture.xml
+++ b/linden/indra/newview/skins/default/xui/ko/floater_gesture.xml
diff --git a/linden/indra/newview/skins/xui/ko/floater_god_tools.xml b/linden/indra/newview/skins/default/xui/ko/floater_god_tools.xml
index 5cd358b..5cd358b 100644
--- a/linden/indra/newview/skins/xui/ko/floater_god_tools.xml
+++ b/linden/indra/newview/skins/default/xui/ko/floater_god_tools.xml
diff --git a/linden/indra/newview/skins/xui/ko/floater_group_info.xml b/linden/indra/newview/skins/default/xui/ko/floater_group_info.xml
index 658dc7e..658dc7e 100644
--- a/linden/indra/newview/skins/xui/ko/floater_group_info.xml
+++ b/linden/indra/newview/skins/default/xui/ko/floater_group_info.xml
diff --git a/linden/indra/newview/skins/xui/ko/floater_hardware_settings.xml b/linden/indra/newview/skins/default/xui/ko/floater_hardware_settings.xml
index 9a5ce36..9a5ce36 100644
--- a/linden/indra/newview/skins/xui/ko/floater_hardware_settings.xml
+++ b/linden/indra/newview/skins/default/xui/ko/floater_hardware_settings.xml
diff --git a/linden/indra/newview/skins/xui/ko/floater_html.xml b/linden/indra/newview/skins/default/xui/ko/floater_html.xml
index c99763e..c99763e 100644
--- a/linden/indra/newview/skins/xui/ko/floater_html.xml
+++ b/linden/indra/newview/skins/default/xui/ko/floater_html.xml
diff --git a/linden/indra/newview/skins/xui/ko/floater_hud.xml b/linden/indra/newview/skins/default/xui/ko/floater_hud.xml
index dd74235..dd74235 100644
--- a/linden/indra/newview/skins/xui/ko/floater_hud.xml
+++ b/linden/indra/newview/skins/default/xui/ko/floater_hud.xml
diff --git a/linden/indra/newview/skins/xui/ko/floater_im.xml b/linden/indra/newview/skins/default/xui/ko/floater_im.xml
index 64fb77d..64fb77d 100644
--- a/linden/indra/newview/skins/xui/ko/floater_im.xml
+++ b/linden/indra/newview/skins/default/xui/ko/floater_im.xml
diff --git a/linden/indra/newview/skins/xui/ko/floater_image_preview.xml b/linden/indra/newview/skins/default/xui/ko/floater_image_preview.xml
index 8ce9fa3..8ce9fa3 100644
--- a/linden/indra/newview/skins/xui/ko/floater_image_preview.xml
+++ b/linden/indra/newview/skins/default/xui/ko/floater_image_preview.xml
diff --git a/linden/indra/newview/skins/xui/ko/floater_import.xml b/linden/indra/newview/skins/default/xui/ko/floater_import.xml
index 44aa94b..44aa94b 100644
--- a/linden/indra/newview/skins/xui/ko/floater_import.xml
+++ b/linden/indra/newview/skins/default/xui/ko/floater_import.xml
diff --git a/linden/indra/newview/skins/xui/ko/floater_inspect.xml b/linden/indra/newview/skins/default/xui/ko/floater_inspect.xml
index 064dee7..064dee7 100644
--- a/linden/indra/newview/skins/xui/ko/floater_inspect.xml
+++ b/linden/indra/newview/skins/default/xui/ko/floater_inspect.xml
diff --git a/linden/indra/newview/skins/xui/ko/floater_instant_message.xml b/linden/indra/newview/skins/default/xui/ko/floater_instant_message.xml
index 994f238..994f238 100644
--- a/linden/indra/newview/skins/xui/ko/floater_instant_message.xml
+++ b/linden/indra/newview/skins/default/xui/ko/floater_instant_message.xml
diff --git a/linden/indra/newview/skins/xui/ko/floater_instant_message_ad_hoc.xml b/linden/indra/newview/skins/default/xui/ko/floater_instant_message_ad_hoc.xml
index dc7f5af..dc7f5af 100644
--- a/linden/indra/newview/skins/xui/ko/floater_instant_message_ad_hoc.xml
+++ b/linden/indra/newview/skins/default/xui/ko/floater_instant_message_ad_hoc.xml
diff --git a/linden/indra/newview/skins/xui/ko/floater_instant_message_group.xml b/linden/indra/newview/skins/default/xui/ko/floater_instant_message_group.xml
index 891613c..891613c 100644
--- a/linden/indra/newview/skins/xui/ko/floater_instant_message_group.xml
+++ b/linden/indra/newview/skins/default/xui/ko/floater_instant_message_group.xml
diff --git a/linden/indra/newview/skins/xui/ko/floater_inventory.xml b/linden/indra/newview/skins/default/xui/ko/floater_inventory.xml
index e53ad55..e53ad55 100644
--- a/linden/indra/newview/skins/xui/ko/floater_inventory.xml
+++ b/linden/indra/newview/skins/default/xui/ko/floater_inventory.xml
diff --git a/linden/indra/newview/skins/xui/ko/floater_inventory_item_properties.xml b/linden/indra/newview/skins/default/xui/ko/floater_inventory_item_properties.xml
index a94a34a..a94a34a 100644
--- a/linden/indra/newview/skins/xui/ko/floater_inventory_item_properties.xml
+++ b/linden/indra/newview/skins/default/xui/ko/floater_inventory_item_properties.xml
diff --git a/linden/indra/newview/skins/xui/ko/floater_inventory_view_finder.xml b/linden/indra/newview/skins/default/xui/ko/floater_inventory_view_finder.xml
index 7b05697..7b05697 100644
--- a/linden/indra/newview/skins/xui/ko/floater_inventory_view_finder.xml
+++ b/linden/indra/newview/skins/default/xui/ko/floater_inventory_view_finder.xml
diff --git a/linden/indra/newview/skins/xui/ko/floater_joystick.xml b/linden/indra/newview/skins/default/xui/ko/floater_joystick.xml
index dd0fe30..dd0fe30 100644
--- a/linden/indra/newview/skins/xui/ko/floater_joystick.xml
+++ b/linden/indra/newview/skins/default/xui/ko/floater_joystick.xml
diff --git a/linden/indra/newview/skins/xui/ko/floater_lagmeter.xml b/linden/indra/newview/skins/default/xui/ko/floater_lagmeter.xml
index 0795341..0795341 100644
--- a/linden/indra/newview/skins/xui/ko/floater_lagmeter.xml
+++ b/linden/indra/newview/skins/default/xui/ko/floater_lagmeter.xml
diff --git a/linden/indra/newview/skins/xui/ko/floater_land_holdings.xml b/linden/indra/newview/skins/default/xui/ko/floater_land_holdings.xml
index 5956860..5956860 100644
--- a/linden/indra/newview/skins/xui/ko/floater_land_holdings.xml
+++ b/linden/indra/newview/skins/default/xui/ko/floater_land_holdings.xml
diff --git a/linden/indra/newview/skins/xui/ko/floater_landmark_ctrl.xml b/linden/indra/newview/skins/default/xui/ko/floater_landmark_ctrl.xml
index dd72ea4..dd72ea4 100644
--- a/linden/indra/newview/skins/xui/ko/floater_landmark_ctrl.xml
+++ b/linden/indra/newview/skins/default/xui/ko/floater_landmark_ctrl.xml
diff --git a/linden/indra/newview/skins/xui/ko/floater_live_lsleditor.xml b/linden/indra/newview/skins/default/xui/ko/floater_live_lsleditor.xml
index f4b5464..f4b5464 100644
--- a/linden/indra/newview/skins/xui/ko/floater_live_lsleditor.xml
+++ b/linden/indra/newview/skins/default/xui/ko/floater_live_lsleditor.xml
diff --git a/linden/indra/newview/skins/xui/ko/floater_lsl_guide.xml b/linden/indra/newview/skins/default/xui/ko/floater_lsl_guide.xml
index 17089ea..17089ea 100644
--- a/linden/indra/newview/skins/xui/ko/floater_lsl_guide.xml
+++ b/linden/indra/newview/skins/default/xui/ko/floater_lsl_guide.xml
diff --git a/linden/indra/newview/skins/xui/ko/floater_media_browser.xml b/linden/indra/newview/skins/default/xui/ko/floater_media_browser.xml
index 7047368..7047368 100644
--- a/linden/indra/newview/skins/xui/ko/floater_media_browser.xml
+++ b/linden/indra/newview/skins/default/xui/ko/floater_media_browser.xml
diff --git a/linden/indra/newview/skins/xui/ko/floater_moveview.xml b/linden/indra/newview/skins/default/xui/ko/floater_moveview.xml
index 76ba2ff..76ba2ff 100644
--- a/linden/indra/newview/skins/xui/ko/floater_moveview.xml
+++ b/linden/indra/newview/skins/default/xui/ko/floater_moveview.xml
diff --git a/linden/indra/newview/skins/xui/ko/floater_mute.xml b/linden/indra/newview/skins/default/xui/ko/floater_mute.xml
index 6acc4ce..6acc4ce 100644
--- a/linden/indra/newview/skins/xui/ko/floater_mute.xml
+++ b/linden/indra/newview/skins/default/xui/ko/floater_mute.xml
diff --git a/linden/indra/newview/skins/xui/ko/floater_mute_object.xml b/linden/indra/newview/skins/default/xui/ko/floater_mute_object.xml
index 103ea95..103ea95 100644
--- a/linden/indra/newview/skins/xui/ko/floater_mute_object.xml
+++ b/linden/indra/newview/skins/default/xui/ko/floater_mute_object.xml
diff --git a/linden/indra/newview/skins/xui/ko/floater_my_friends.xml b/linden/indra/newview/skins/default/xui/ko/floater_my_friends.xml
index 7326e73..7326e73 100644
--- a/linden/indra/newview/skins/xui/ko/floater_my_friends.xml
+++ b/linden/indra/newview/skins/default/xui/ko/floater_my_friends.xml
diff --git a/linden/indra/newview/skins/xui/ko/floater_name_description.xml b/linden/indra/newview/skins/default/xui/ko/floater_name_description.xml
index 1d21542..1d21542 100644
--- a/linden/indra/newview/skins/xui/ko/floater_name_description.xml
+++ b/linden/indra/newview/skins/default/xui/ko/floater_name_description.xml
diff --git a/linden/indra/newview/skins/xui/ko/floater_new_im.xml b/linden/indra/newview/skins/default/xui/ko/floater_new_im.xml
index 325746a..325746a 100644
--- a/linden/indra/newview/skins/xui/ko/floater_new_im.xml
+++ b/linden/indra/newview/skins/default/xui/ko/floater_new_im.xml
diff --git a/linden/indra/newview/skins/xui/ko/floater_new_outfit_dialog.xml b/linden/indra/newview/skins/default/xui/ko/floater_new_outfit_dialog.xml
index e1578f1..e1578f1 100644
--- a/linden/indra/newview/skins/xui/ko/floater_new_outfit_dialog.xml
+++ b/linden/indra/newview/skins/default/xui/ko/floater_new_outfit_dialog.xml
diff --git a/linden/indra/newview/skins/xui/ko/floater_openobject.xml b/linden/indra/newview/skins/default/xui/ko/floater_openobject.xml
index cad165e..cad165e 100644
--- a/linden/indra/newview/skins/xui/ko/floater_openobject.xml
+++ b/linden/indra/newview/skins/default/xui/ko/floater_openobject.xml
diff --git a/linden/indra/newview/skins/xui/ko/floater_pay.xml b/linden/indra/newview/skins/default/xui/ko/floater_pay.xml
index a76640b..a76640b 100644
--- a/linden/indra/newview/skins/xui/ko/floater_pay.xml
+++ b/linden/indra/newview/skins/default/xui/ko/floater_pay.xml
diff --git a/linden/indra/newview/skins/xui/ko/floater_pay_object.xml b/linden/indra/newview/skins/default/xui/ko/floater_pay_object.xml
index 8fa6dff..8fa6dff 100644
--- a/linden/indra/newview/skins/xui/ko/floater_pay_object.xml
+++ b/linden/indra/newview/skins/default/xui/ko/floater_pay_object.xml
diff --git a/linden/indra/newview/skins/xui/ko/floater_post_process.xml b/linden/indra/newview/skins/default/xui/ko/floater_post_process.xml
index 74b6946..74b6946 100644
--- a/linden/indra/newview/skins/xui/ko/floater_post_process.xml
+++ b/linden/indra/newview/skins/default/xui/ko/floater_post_process.xml
diff --git a/linden/indra/newview/skins/xui/ko/floater_postcard.xml b/linden/indra/newview/skins/default/xui/ko/floater_postcard.xml
index 9bb7ecf..9bb7ecf 100644
--- a/linden/indra/newview/skins/xui/ko/floater_postcard.xml
+++ b/linden/indra/newview/skins/default/xui/ko/floater_postcard.xml
diff --git a/linden/indra/newview/skins/xui/ko/floater_preferences.xml b/linden/indra/newview/skins/default/xui/ko/floater_preferences.xml
index 2da29b4..2da29b4 100644
--- a/linden/indra/newview/skins/xui/ko/floater_preferences.xml
+++ b/linden/indra/newview/skins/default/xui/ko/floater_preferences.xml
diff --git a/linden/indra/newview/skins/xui/ko/floater_preview_animation.xml b/linden/indra/newview/skins/default/xui/ko/floater_preview_animation.xml
index 4a0159f..4a0159f 100644
--- a/linden/indra/newview/skins/xui/ko/floater_preview_animation.xml
+++ b/linden/indra/newview/skins/default/xui/ko/floater_preview_animation.xml
diff --git a/linden/indra/newview/skins/xui/ko/floater_preview_classified.xml b/linden/indra/newview/skins/default/xui/ko/floater_preview_classified.xml
index 04d70e6..04d70e6 100644
--- a/linden/indra/newview/skins/xui/ko/floater_preview_classified.xml
+++ b/linden/indra/newview/skins/default/xui/ko/floater_preview_classified.xml
diff --git a/linden/indra/newview/skins/xui/ko/floater_preview_embedded_texture.xml b/linden/indra/newview/skins/default/xui/ko/floater_preview_embedded_texture.xml
index 42a0548..42a0548 100644
--- a/linden/indra/newview/skins/xui/ko/floater_preview_embedded_texture.xml
+++ b/linden/indra/newview/skins/default/xui/ko/floater_preview_embedded_texture.xml
diff --git a/linden/indra/newview/skins/xui/ko/floater_preview_event.xml b/linden/indra/newview/skins/default/xui/ko/floater_preview_event.xml
index 9affa71..9affa71 100644
--- a/linden/indra/newview/skins/xui/ko/floater_preview_event.xml
+++ b/linden/indra/newview/skins/default/xui/ko/floater_preview_event.xml
diff --git a/linden/indra/newview/skins/xui/ko/floater_preview_existing_landmark.xml b/linden/indra/newview/skins/default/xui/ko/floater_preview_existing_landmark.xml
index 2ff0664..2ff0664 100644
--- a/linden/indra/newview/skins/xui/ko/floater_preview_existing_landmark.xml
+++ b/linden/indra/newview/skins/default/xui/ko/floater_preview_existing_landmark.xml
diff --git a/linden/indra/newview/skins/xui/ko/floater_preview_gesture.xml b/linden/indra/newview/skins/default/xui/ko/floater_preview_gesture.xml
index 1945a59..1945a59 100644
--- a/linden/indra/newview/skins/xui/ko/floater_preview_gesture.xml
+++ b/linden/indra/newview/skins/default/xui/ko/floater_preview_gesture.xml
diff --git a/linden/indra/newview/skins/xui/ko/floater_preview_notecard.xml b/linden/indra/newview/skins/default/xui/ko/floater_preview_notecard.xml
index bbef72f..bbef72f 100644
--- a/linden/indra/newview/skins/xui/ko/floater_preview_notecard.xml
+++ b/linden/indra/newview/skins/default/xui/ko/floater_preview_notecard.xml
diff --git a/linden/indra/newview/skins/xui/ko/floater_preview_notecard_keep_discard.xml b/linden/indra/newview/skins/default/xui/ko/floater_preview_notecard_keep_discard.xml
index 514f74b..514f74b 100644
--- a/linden/indra/newview/skins/xui/ko/floater_preview_notecard_keep_discard.xml
+++ b/linden/indra/newview/skins/default/xui/ko/floater_preview_notecard_keep_discard.xml
diff --git a/linden/indra/newview/skins/xui/ko/floater_preview_sound.xml b/linden/indra/newview/skins/default/xui/ko/floater_preview_sound.xml
index 38ff533..38ff533 100644
--- a/linden/indra/newview/skins/xui/ko/floater_preview_sound.xml
+++ b/linden/indra/newview/skins/default/xui/ko/floater_preview_sound.xml
diff --git a/linden/indra/newview/skins/xui/ko/floater_preview_texture.xml b/linden/indra/newview/skins/default/xui/ko/floater_preview_texture.xml
index 2281061..2281061 100644
--- a/linden/indra/newview/skins/xui/ko/floater_preview_texture.xml
+++ b/linden/indra/newview/skins/default/xui/ko/floater_preview_texture.xml
diff --git a/linden/indra/newview/skins/xui/ko/floater_preview_texture_keep_discard.xml b/linden/indra/newview/skins/default/xui/ko/floater_preview_texture_keep_discard.xml
index 616b0b6..616b0b6 100644
--- a/linden/indra/newview/skins/xui/ko/floater_preview_texture_keep_discard.xml
+++ b/linden/indra/newview/skins/default/xui/ko/floater_preview_texture_keep_discard.xml
diff --git a/linden/indra/newview/skins/xui/ko/floater_preview_url.xml b/linden/indra/newview/skins/default/xui/ko/floater_preview_url.xml
index 2ce7484..2ce7484 100644
--- a/linden/indra/newview/skins/xui/ko/floater_preview_url.xml
+++ b/linden/indra/newview/skins/default/xui/ko/floater_preview_url.xml
diff --git a/linden/indra/newview/skins/xui/ko/floater_price_for_listing.xml b/linden/indra/newview/skins/default/xui/ko/floater_price_for_listing.xml
index ccf2e4d..ccf2e4d 100644
--- a/linden/indra/newview/skins/xui/ko/floater_price_for_listing.xml
+++ b/linden/indra/newview/skins/default/xui/ko/floater_price_for_listing.xml
diff --git a/linden/indra/newview/skins/xui/ko/floater_profile.xml b/linden/indra/newview/skins/default/xui/ko/floater_profile.xml
index 3238537..3238537 100644
--- a/linden/indra/newview/skins/xui/ko/floater_profile.xml
+++ b/linden/indra/newview/skins/default/xui/ko/floater_profile.xml
diff --git a/linden/indra/newview/skins/xui/ko/floater_region_info.xml b/linden/indra/newview/skins/default/xui/ko/floater_region_info.xml
index 340bd77..340bd77 100644
--- a/linden/indra/newview/skins/xui/ko/floater_region_info.xml
+++ b/linden/indra/newview/skins/default/xui/ko/floater_region_info.xml
diff --git a/linden/indra/newview/skins/xui/ko/floater_report_abuse.xml b/linden/indra/newview/skins/default/xui/ko/floater_report_abuse.xml
index 970d987..970d987 100644
--- a/linden/indra/newview/skins/xui/ko/floater_report_abuse.xml
+++ b/linden/indra/newview/skins/default/xui/ko/floater_report_abuse.xml
diff --git a/linden/indra/newview/skins/xui/ko/floater_report_bug.xml b/linden/indra/newview/skins/default/xui/ko/floater_report_bug.xml
index fbe3a45..fbe3a45 100644
--- a/linden/indra/newview/skins/xui/ko/floater_report_bug.xml
+++ b/linden/indra/newview/skins/default/xui/ko/floater_report_bug.xml
diff --git a/linden/indra/newview/skins/xui/ko/floater_script_debug.xml b/linden/indra/newview/skins/default/xui/ko/floater_script_debug.xml
index 44b3e5f..44b3e5f 100644
--- a/linden/indra/newview/skins/xui/ko/floater_script_debug.xml
+++ b/linden/indra/newview/skins/default/xui/ko/floater_script_debug.xml
diff --git a/linden/indra/newview/skins/xui/ko/floater_script_ed_panel.xml b/linden/indra/newview/skins/default/xui/ko/floater_script_ed_panel.xml
index 55c7877..55c7877 100644
--- a/linden/indra/newview/skins/xui/ko/floater_script_ed_panel.xml
+++ b/linden/indra/newview/skins/default/xui/ko/floater_script_ed_panel.xml
diff --git a/linden/indra/newview/skins/xui/ko/floater_script_preview.xml b/linden/indra/newview/skins/default/xui/ko/floater_script_preview.xml
index d1d71ce..d1d71ce 100644
--- a/linden/indra/newview/skins/xui/ko/floater_script_preview.xml
+++ b/linden/indra/newview/skins/default/xui/ko/floater_script_preview.xml
diff --git a/linden/indra/newview/skins/xui/ko/floater_script_queue.xml b/linden/indra/newview/skins/default/xui/ko/floater_script_queue.xml
index 5391244..5391244 100644
--- a/linden/indra/newview/skins/xui/ko/floater_script_queue.xml
+++ b/linden/indra/newview/skins/default/xui/ko/floater_script_queue.xml
diff --git a/linden/indra/newview/skins/xui/ko/floater_script_search.xml b/linden/indra/newview/skins/default/xui/ko/floater_script_search.xml
index 614523a..614523a 100644
--- a/linden/indra/newview/skins/xui/ko/floater_script_search.xml
+++ b/linden/indra/newview/skins/default/xui/ko/floater_script_search.xml
diff --git a/linden/indra/newview/skins/xui/ko/floater_select_key.xml b/linden/indra/newview/skins/default/xui/ko/floater_select_key.xml
index 3a35800..3a35800 100644
--- a/linden/indra/newview/skins/xui/ko/floater_select_key.xml
+++ b/linden/indra/newview/skins/default/xui/ko/floater_select_key.xml
diff --git a/linden/indra/newview/skins/xui/ko/floater_sell_land.xml b/linden/indra/newview/skins/default/xui/ko/floater_sell_land.xml
index 2844424..2844424 100644
--- a/linden/indra/newview/skins/xui/ko/floater_sell_land.xml
+++ b/linden/indra/newview/skins/default/xui/ko/floater_sell_land.xml
diff --git a/linden/indra/newview/skins/xui/ko/floater_settings_debug.xml b/linden/indra/newview/skins/default/xui/ko/floater_settings_debug.xml
index e63c4d3..e63c4d3 100644
--- a/linden/indra/newview/skins/xui/ko/floater_settings_debug.xml
+++ b/linden/indra/newview/skins/default/xui/ko/floater_settings_debug.xml
diff --git a/linden/indra/newview/skins/xui/ko/floater_sim_release_message.xml b/linden/indra/newview/skins/default/xui/ko/floater_sim_release_message.xml
index f11af99..f11af99 100644
--- a/linden/indra/newview/skins/xui/ko/floater_sim_release_message.xml
+++ b/linden/indra/newview/skins/default/xui/ko/floater_sim_release_message.xml
diff --git a/linden/indra/newview/skins/xui/ko/floater_snapshot.xml b/linden/indra/newview/skins/default/xui/ko/floater_snapshot.xml
index 9afdd60..9afdd60 100644
--- a/linden/indra/newview/skins/xui/ko/floater_snapshot.xml
+++ b/linden/indra/newview/skins/default/xui/ko/floater_snapshot.xml
diff --git a/linden/indra/newview/skins/xui/ko/floater_sound_preview.xml b/linden/indra/newview/skins/default/xui/ko/floater_sound_preview.xml
index af208ef..af208ef 100644
--- a/linden/indra/newview/skins/xui/ko/floater_sound_preview.xml
+++ b/linden/indra/newview/skins/default/xui/ko/floater_sound_preview.xml
diff --git a/linden/indra/newview/skins/xui/ko/floater_telehub.xml b/linden/indra/newview/skins/default/xui/ko/floater_telehub.xml
index 2e79c62..2e79c62 100644
--- a/linden/indra/newview/skins/xui/ko/floater_telehub.xml
+++ b/linden/indra/newview/skins/default/xui/ko/floater_telehub.xml
diff --git a/linden/indra/newview/skins/xui/ko/floater_test.xml b/linden/indra/newview/skins/default/xui/ko/floater_test.xml
index 05b4f7a..05b4f7a 100644
--- a/linden/indra/newview/skins/xui/ko/floater_test.xml
+++ b/linden/indra/newview/skins/default/xui/ko/floater_test.xml
diff --git a/linden/indra/newview/skins/xui/ko/floater_texture_ctrl.xml b/linden/indra/newview/skins/default/xui/ko/floater_texture_ctrl.xml
index 6df5d2e..6df5d2e 100644
--- a/linden/indra/newview/skins/xui/ko/floater_texture_ctrl.xml
+++ b/linden/indra/newview/skins/default/xui/ko/floater_texture_ctrl.xml
diff --git a/linden/indra/newview/skins/xui/ko/floater_tools.xml b/linden/indra/newview/skins/default/xui/ko/floater_tools.xml
index 0bc11f3..0bc11f3 100644
--- a/linden/indra/newview/skins/xui/ko/floater_tools.xml
+++ b/linden/indra/newview/skins/default/xui/ko/floater_tools.xml
diff --git a/linden/indra/newview/skins/xui/ko/floater_top_objects.xml b/linden/indra/newview/skins/default/xui/ko/floater_top_objects.xml
index 22c9f38..22c9f38 100644
--- a/linden/indra/newview/skins/xui/ko/floater_top_objects.xml
+++ b/linden/indra/newview/skins/default/xui/ko/floater_top_objects.xml
diff --git a/linden/indra/newview/skins/xui/ko/floater_tos.xml b/linden/indra/newview/skins/default/xui/ko/floater_tos.xml
index a5d0a47..a5d0a47 100644
--- a/linden/indra/newview/skins/xui/ko/floater_tos.xml
+++ b/linden/indra/newview/skins/default/xui/ko/floater_tos.xml
diff --git a/linden/indra/newview/skins/xui/ko/floater_url_entry.xml b/linden/indra/newview/skins/default/xui/ko/floater_url_entry.xml
index 54406f2..54406f2 100644
--- a/linden/indra/newview/skins/xui/ko/floater_url_entry.xml
+++ b/linden/indra/newview/skins/default/xui/ko/floater_url_entry.xml
diff --git a/linden/indra/newview/skins/xui/ko/floater_voice_wizard.xml b/linden/indra/newview/skins/default/xui/ko/floater_voice_wizard.xml
index 264e8a8..264e8a8 100644
--- a/linden/indra/newview/skins/xui/ko/floater_voice_wizard.xml
+++ b/linden/indra/newview/skins/default/xui/ko/floater_voice_wizard.xml
diff --git a/linden/indra/newview/skins/xui/ko/floater_water.xml b/linden/indra/newview/skins/default/xui/ko/floater_water.xml
index aae1931..aae1931 100644
--- a/linden/indra/newview/skins/xui/ko/floater_water.xml
+++ b/linden/indra/newview/skins/default/xui/ko/floater_water.xml
diff --git a/linden/indra/newview/skins/xui/ko/floater_wearable_save_as.xml b/linden/indra/newview/skins/default/xui/ko/floater_wearable_save_as.xml
index 554b1bd..554b1bd 100644
--- a/linden/indra/newview/skins/xui/ko/floater_wearable_save_as.xml
+++ b/linden/indra/newview/skins/default/xui/ko/floater_wearable_save_as.xml
diff --git a/linden/indra/newview/skins/xui/ko/floater_windlight_options.xml b/linden/indra/newview/skins/default/xui/ko/floater_windlight_options.xml
index 57bc9aa..57bc9aa 100644
--- a/linden/indra/newview/skins/xui/ko/floater_windlight_options.xml
+++ b/linden/indra/newview/skins/default/xui/ko/floater_windlight_options.xml
diff --git a/linden/indra/newview/skins/xui/ko/floater_world_map.xml b/linden/indra/newview/skins/default/xui/ko/floater_world_map.xml
index e8d09c9..e8d09c9 100644
--- a/linden/indra/newview/skins/xui/ko/floater_world_map.xml
+++ b/linden/indra/newview/skins/default/xui/ko/floater_world_map.xml
diff --git a/linden/indra/newview/skins/xui/ko/menu_inventory.xml b/linden/indra/newview/skins/default/xui/ko/menu_inventory.xml
index 6b09904..6b09904 100644
--- a/linden/indra/newview/skins/xui/ko/menu_inventory.xml
+++ b/linden/indra/newview/skins/default/xui/ko/menu_inventory.xml
diff --git a/linden/indra/newview/skins/xui/ko/menu_login.xml b/linden/indra/newview/skins/default/xui/ko/menu_login.xml
index 73bbf9c..73bbf9c 100644
--- a/linden/indra/newview/skins/xui/ko/menu_login.xml
+++ b/linden/indra/newview/skins/default/xui/ko/menu_login.xml
diff --git a/linden/indra/newview/skins/xui/ko/menu_pie_attachment.xml b/linden/indra/newview/skins/default/xui/ko/menu_pie_attachment.xml
index 0b2ed99..0b2ed99 100644
--- a/linden/indra/newview/skins/xui/ko/menu_pie_attachment.xml
+++ b/linden/indra/newview/skins/default/xui/ko/menu_pie_attachment.xml
diff --git a/linden/indra/newview/skins/xui/ko/menu_pie_avatar.xml b/linden/indra/newview/skins/default/xui/ko/menu_pie_avatar.xml
index c1152ad..c1152ad 100644
--- a/linden/indra/newview/skins/xui/ko/menu_pie_avatar.xml
+++ b/linden/indra/newview/skins/default/xui/ko/menu_pie_avatar.xml
diff --git a/linden/indra/newview/skins/xui/ko/menu_pie_land.xml b/linden/indra/newview/skins/default/xui/ko/menu_pie_land.xml
index 0e5b48d..0e5b48d 100644
--- a/linden/indra/newview/skins/xui/ko/menu_pie_land.xml
+++ b/linden/indra/newview/skins/default/xui/ko/menu_pie_land.xml
diff --git a/linden/indra/newview/skins/xui/ko/menu_pie_object.xml b/linden/indra/newview/skins/default/xui/ko/menu_pie_object.xml
index e7e165e..e7e165e 100644
--- a/linden/indra/newview/skins/xui/ko/menu_pie_object.xml
+++ b/linden/indra/newview/skins/default/xui/ko/menu_pie_object.xml
diff --git a/linden/indra/newview/skins/xui/ko/menu_pie_self.xml b/linden/indra/newview/skins/default/xui/ko/menu_pie_self.xml
index f759701..f759701 100644
--- a/linden/indra/newview/skins/xui/ko/menu_pie_self.xml
+++ b/linden/indra/newview/skins/default/xui/ko/menu_pie_self.xml
diff --git a/linden/indra/newview/skins/xui/ko/menu_slurl.xml b/linden/indra/newview/skins/default/xui/ko/menu_slurl.xml
index a52474b..a52474b 100644
--- a/linden/indra/newview/skins/xui/ko/menu_slurl.xml
+++ b/linden/indra/newview/skins/default/xui/ko/menu_slurl.xml
diff --git a/linden/indra/newview/skins/xui/ko/menu_viewer.xml b/linden/indra/newview/skins/default/xui/ko/menu_viewer.xml
index 3abedaa..3abedaa 100644
--- a/linden/indra/newview/skins/xui/ko/menu_viewer.xml
+++ b/linden/indra/newview/skins/default/xui/ko/menu_viewer.xml
diff --git a/linden/indra/newview/skins/xui/ko/mime_types.xml b/linden/indra/newview/skins/default/xui/ko/mime_types.xml
index 9d2348c..9d2348c 100644
--- a/linden/indra/newview/skins/xui/ko/mime_types.xml
+++ b/linden/indra/newview/skins/default/xui/ko/mime_types.xml
diff --git a/linden/indra/newview/skins/xui/ko/need_to_long.xml b/linden/indra/newview/skins/default/xui/ko/need_to_long.xml
index d185c4d..d185c4d 100644
--- a/linden/indra/newview/skins/xui/ko/need_to_long.xml
+++ b/linden/indra/newview/skins/default/xui/ko/need_to_long.xml
diff --git a/linden/indra/newview/skins/xui/ko/need_to_translate.xml b/linden/indra/newview/skins/default/xui/ko/need_to_translate.xml
index a541bf2..a541bf2 100644
--- a/linden/indra/newview/skins/xui/ko/need_to_translate.xml
+++ b/linden/indra/newview/skins/default/xui/ko/need_to_translate.xml
diff --git a/linden/indra/newview/skins/xui/ko/need_to_update.xml b/linden/indra/newview/skins/default/xui/ko/need_to_update.xml
index 27b7cf9..27b7cf9 100644
--- a/linden/indra/newview/skins/xui/ko/need_to_update.xml
+++ b/linden/indra/newview/skins/default/xui/ko/need_to_update.xml
diff --git a/linden/indra/newview/skins/xui/ko/notify.xml b/linden/indra/newview/skins/default/xui/ko/notify.xml
index 3f92fb1..3f92fb1 100644
--- a/linden/indra/newview/skins/xui/ko/notify.xml
+++ b/linden/indra/newview/skins/default/xui/ko/notify.xml
diff --git a/linden/indra/newview/skins/xui/ko/panel_audio.xml b/linden/indra/newview/skins/default/xui/ko/panel_audio.xml
index 287dc77..287dc77 100644
--- a/linden/indra/newview/skins/xui/ko/panel_audio.xml
+++ b/linden/indra/newview/skins/default/xui/ko/panel_audio.xml
diff --git a/linden/indra/newview/skins/xui/ko/panel_audio_device.xml b/linden/indra/newview/skins/default/xui/ko/panel_audio_device.xml
index 35ebef8..35ebef8 100644
--- a/linden/indra/newview/skins/xui/ko/panel_audio_device.xml
+++ b/linden/indra/newview/skins/default/xui/ko/panel_audio_device.xml
diff --git a/linden/indra/newview/skins/xui/ko/panel_avatar.xml b/linden/indra/newview/skins/default/xui/ko/panel_avatar.xml
index b19f71f..b19f71f 100644
--- a/linden/indra/newview/skins/xui/ko/panel_avatar.xml
+++ b/linden/indra/newview/skins/default/xui/ko/panel_avatar.xml
diff --git a/linden/indra/newview/skins/xui/ko/panel_avatar_classified.xml b/linden/indra/newview/skins/default/xui/ko/panel_avatar_classified.xml
index a751b48..a751b48 100644
--- a/linden/indra/newview/skins/xui/ko/panel_avatar_classified.xml
+++ b/linden/indra/newview/skins/default/xui/ko/panel_avatar_classified.xml
diff --git a/linden/indra/newview/skins/xui/ko/panel_avatar_pick.xml b/linden/indra/newview/skins/default/xui/ko/panel_avatar_pick.xml
index 89afde4..89afde4 100644
--- a/linden/indra/newview/skins/xui/ko/panel_avatar_pick.xml
+++ b/linden/indra/newview/skins/default/xui/ko/panel_avatar_pick.xml
diff --git a/linden/indra/newview/skins/xui/ko/panel_chat_bar.xml b/linden/indra/newview/skins/default/xui/ko/panel_chat_bar.xml
index febfe23..febfe23 100644
--- a/linden/indra/newview/skins/xui/ko/panel_chat_bar.xml
+++ b/linden/indra/newview/skins/default/xui/ko/panel_chat_bar.xml
diff --git a/linden/indra/newview/skins/xui/ko/panel_classified.xml b/linden/indra/newview/skins/default/xui/ko/panel_classified.xml
index 9d1f80c..9d1f80c 100644
--- a/linden/indra/newview/skins/xui/ko/panel_classified.xml
+++ b/linden/indra/newview/skins/default/xui/ko/panel_classified.xml
diff --git a/linden/indra/newview/skins/xui/ko/panel_event.xml b/linden/indra/newview/skins/default/xui/ko/panel_event.xml
index 4f1f69a..4f1f69a 100644
--- a/linden/indra/newview/skins/xui/ko/panel_event.xml
+++ b/linden/indra/newview/skins/default/xui/ko/panel_event.xml
diff --git a/linden/indra/newview/skins/xui/ko/panel_friends.xml b/linden/indra/newview/skins/default/xui/ko/panel_friends.xml
index 96f5b4d..96f5b4d 100644
--- a/linden/indra/newview/skins/xui/ko/panel_friends.xml
+++ b/linden/indra/newview/skins/default/xui/ko/panel_friends.xml
diff --git a/linden/indra/newview/skins/xui/ko/panel_group.xml b/linden/indra/newview/skins/default/xui/ko/panel_group.xml
index 5957e12..5957e12 100644
--- a/linden/indra/newview/skins/xui/ko/panel_group.xml
+++ b/linden/indra/newview/skins/default/xui/ko/panel_group.xml
diff --git a/linden/indra/newview/skins/xui/ko/panel_group_finder.xml b/linden/indra/newview/skins/default/xui/ko/panel_group_finder.xml
index 68ed91b..68ed91b 100644
--- a/linden/indra/newview/skins/xui/ko/panel_group_finder.xml
+++ b/linden/indra/newview/skins/default/xui/ko/panel_group_finder.xml
diff --git a/linden/indra/newview/skins/xui/ko/panel_group_general.xml b/linden/indra/newview/skins/default/xui/ko/panel_group_general.xml
index a2c1024..a2c1024 100644
--- a/linden/indra/newview/skins/xui/ko/panel_group_general.xml
+++ b/linden/indra/newview/skins/default/xui/ko/panel_group_general.xml
diff --git a/linden/indra/newview/skins/xui/ko/panel_group_invite.xml b/linden/indra/newview/skins/default/xui/ko/panel_group_invite.xml
index 338649f..338649f 100644
--- a/linden/indra/newview/skins/xui/ko/panel_group_invite.xml
+++ b/linden/indra/newview/skins/default/xui/ko/panel_group_invite.xml
diff --git a/linden/indra/newview/skins/xui/ko/panel_group_land_money.xml b/linden/indra/newview/skins/default/xui/ko/panel_group_land_money.xml
index dcb935b..dcb935b 100644
--- a/linden/indra/newview/skins/xui/ko/panel_group_land_money.xml
+++ b/linden/indra/newview/skins/default/xui/ko/panel_group_land_money.xml
diff --git a/linden/indra/newview/skins/xui/ko/panel_group_notices.xml b/linden/indra/newview/skins/default/xui/ko/panel_group_notices.xml
index e71bdb0..e71bdb0 100644
--- a/linden/indra/newview/skins/xui/ko/panel_group_notices.xml
+++ b/linden/indra/newview/skins/default/xui/ko/panel_group_notices.xml
diff --git a/linden/indra/newview/skins/xui/ko/panel_group_roles.xml b/linden/indra/newview/skins/default/xui/ko/panel_group_roles.xml
index dbe0bcb..dbe0bcb 100644
--- a/linden/indra/newview/skins/xui/ko/panel_group_roles.xml
+++ b/linden/indra/newview/skins/default/xui/ko/panel_group_roles.xml
diff --git a/linden/indra/newview/skins/xui/ko/panel_group_voting.xml b/linden/indra/newview/skins/default/xui/ko/panel_group_voting.xml
index d1e7d25..d1e7d25 100644
--- a/linden/indra/newview/skins/xui/ko/panel_group_voting.xml
+++ b/linden/indra/newview/skins/default/xui/ko/panel_group_voting.xml
diff --git a/linden/indra/newview/skins/xui/ko/panel_groups.xml b/linden/indra/newview/skins/default/xui/ko/panel_groups.xml
index 2628229..2628229 100644
--- a/linden/indra/newview/skins/xui/ko/panel_groups.xml
+++ b/linden/indra/newview/skins/default/xui/ko/panel_groups.xml
diff --git a/linden/indra/newview/skins/xui/ko/panel_land_covenant.xml b/linden/indra/newview/skins/default/xui/ko/panel_land_covenant.xml
index d4f09ce..d4f09ce 100644
--- a/linden/indra/newview/skins/xui/ko/panel_land_covenant.xml
+++ b/linden/indra/newview/skins/default/xui/ko/panel_land_covenant.xml
diff --git a/linden/indra/newview/skins/xui/ko/panel_login.xml b/linden/indra/newview/skins/default/xui/ko/panel_login.xml
index d0afa24..d0afa24 100644
--- a/linden/indra/newview/skins/xui/ko/panel_login.xml
+++ b/linden/indra/newview/skins/default/xui/ko/panel_login.xml
diff --git a/linden/indra/newview/skins/xui/ko/panel_master_volume.xml b/linden/indra/newview/skins/default/xui/ko/panel_master_volume.xml
index 1d2c24e..1d2c24e 100644
--- a/linden/indra/newview/skins/xui/ko/panel_master_volume.xml
+++ b/linden/indra/newview/skins/default/xui/ko/panel_master_volume.xml
diff --git a/linden/indra/newview/skins/xui/ko/panel_media_controls.xml b/linden/indra/newview/skins/default/xui/ko/panel_media_controls.xml
index 8669b80..8669b80 100644
--- a/linden/indra/newview/skins/xui/ko/panel_media_controls.xml
+++ b/linden/indra/newview/skins/default/xui/ko/panel_media_controls.xml
diff --git a/linden/indra/newview/skins/xui/ko/panel_media_remote.xml b/linden/indra/newview/skins/default/xui/ko/panel_media_remote.xml
index e92e475..e92e475 100644
--- a/linden/indra/newview/skins/xui/ko/panel_media_remote.xml
+++ b/linden/indra/newview/skins/default/xui/ko/panel_media_remote.xml
diff --git a/linden/indra/newview/skins/xui/ko/panel_media_remote_expanded.xml b/linden/indra/newview/skins/default/xui/ko/panel_media_remote_expanded.xml
index e6027e0..e6027e0 100644
--- a/linden/indra/newview/skins/xui/ko/panel_media_remote_expanded.xml
+++ b/linden/indra/newview/skins/default/xui/ko/panel_media_remote_expanded.xml
diff --git a/linden/indra/newview/skins/xui/ko/panel_overlaybar.xml b/linden/indra/newview/skins/default/xui/ko/panel_overlaybar.xml
index 71e7a2f..71e7a2f 100644
--- a/linden/indra/newview/skins/xui/ko/panel_overlaybar.xml
+++ b/linden/indra/newview/skins/default/xui/ko/panel_overlaybar.xml
diff --git a/linden/indra/newview/skins/xui/ko/panel_place.xml b/linden/indra/newview/skins/default/xui/ko/panel_place.xml
index 5e0bb07..5e0bb07 100644
--- a/linden/indra/newview/skins/xui/ko/panel_place.xml
+++ b/linden/indra/newview/skins/default/xui/ko/panel_place.xml
diff --git a/linden/indra/newview/skins/xui/ko/panel_place_small.xml b/linden/indra/newview/skins/default/xui/ko/panel_place_small.xml
index e002a83..e002a83 100644
--- a/linden/indra/newview/skins/xui/ko/panel_place_small.xml
+++ b/linden/indra/newview/skins/default/xui/ko/panel_place_small.xml
diff --git a/linden/indra/newview/skins/xui/ko/panel_preferences_LCD.xml b/linden/indra/newview/skins/default/xui/ko/panel_preferences_LCD.xml
index 6ee1536..6ee1536 100644
--- a/linden/indra/newview/skins/xui/ko/panel_preferences_LCD.xml
+++ b/linden/indra/newview/skins/default/xui/ko/panel_preferences_LCD.xml
diff --git a/linden/indra/newview/skins/xui/ko/panel_preferences_audio.xml b/linden/indra/newview/skins/default/xui/ko/panel_preferences_audio.xml
index f51848d..f51848d 100644
--- a/linden/indra/newview/skins/xui/ko/panel_preferences_audio.xml
+++ b/linden/indra/newview/skins/default/xui/ko/panel_preferences_audio.xml
diff --git a/linden/indra/newview/skins/xui/ko/panel_preferences_chat.xml b/linden/indra/newview/skins/default/xui/ko/panel_preferences_chat.xml
index 91adf0b..91adf0b 100644
--- a/linden/indra/newview/skins/xui/ko/panel_preferences_chat.xml
+++ b/linden/indra/newview/skins/default/xui/ko/panel_preferences_chat.xml
diff --git a/linden/indra/newview/skins/xui/ko/panel_preferences_general.xml b/linden/indra/newview/skins/default/xui/ko/panel_preferences_general.xml
index 3ff0d55..3ff0d55 100644
--- a/linden/indra/newview/skins/xui/ko/panel_preferences_general.xml
+++ b/linden/indra/newview/skins/default/xui/ko/panel_preferences_general.xml
diff --git a/linden/indra/newview/skins/xui/ko/panel_preferences_graphics1.xml b/linden/indra/newview/skins/default/xui/ko/panel_preferences_graphics1.xml
index e986982..e986982 100644
--- a/linden/indra/newview/skins/xui/ko/panel_preferences_graphics1.xml
+++ b/linden/indra/newview/skins/default/xui/ko/panel_preferences_graphics1.xml
diff --git a/linden/indra/newview/skins/xui/ko/panel_preferences_im.xml b/linden/indra/newview/skins/default/xui/ko/panel_preferences_im.xml
index e7fc52d..e7fc52d 100644
--- a/linden/indra/newview/skins/xui/ko/panel_preferences_im.xml
+++ b/linden/indra/newview/skins/default/xui/ko/panel_preferences_im.xml
diff --git a/linden/indra/newview/skins/xui/ko/panel_preferences_input.xml b/linden/indra/newview/skins/default/xui/ko/panel_preferences_input.xml
index b7838df..b7838df 100644
--- a/linden/indra/newview/skins/xui/ko/panel_preferences_input.xml
+++ b/linden/indra/newview/skins/default/xui/ko/panel_preferences_input.xml
diff --git a/linden/indra/newview/skins/xui/ko/panel_preferences_network.xml b/linden/indra/newview/skins/default/xui/ko/panel_preferences_network.xml
index 8aaef59..8aaef59 100644
--- a/linden/indra/newview/skins/xui/ko/panel_preferences_network.xml
+++ b/linden/indra/newview/skins/default/xui/ko/panel_preferences_network.xml
diff --git a/linden/indra/newview/skins/xui/ko/panel_preferences_popups.xml b/linden/indra/newview/skins/default/xui/ko/panel_preferences_popups.xml
index 385e1be..385e1be 100644
--- a/linden/indra/newview/skins/xui/ko/panel_preferences_popups.xml
+++ b/linden/indra/newview/skins/default/xui/ko/panel_preferences_popups.xml
diff --git a/linden/indra/newview/skins/xui/ko/panel_preferences_voice.xml b/linden/indra/newview/skins/default/xui/ko/panel_preferences_voice.xml
index 1d934b8..1d934b8 100644
--- a/linden/indra/newview/skins/xui/ko/panel_preferences_voice.xml
+++ b/linden/indra/newview/skins/default/xui/ko/panel_preferences_voice.xml
diff --git a/linden/indra/newview/skins/xui/ko/panel_preferences_web.xml b/linden/indra/newview/skins/default/xui/ko/panel_preferences_web.xml
index 3966877..3966877 100644
--- a/linden/indra/newview/skins/xui/ko/panel_preferences_web.xml
+++ b/linden/indra/newview/skins/default/xui/ko/panel_preferences_web.xml
diff --git a/linden/indra/newview/skins/xui/ko/panel_region_covenant.xml b/linden/indra/newview/skins/default/xui/ko/panel_region_covenant.xml
index 89f4ea6..89f4ea6 100644
--- a/linden/indra/newview/skins/xui/ko/panel_region_covenant.xml
+++ b/linden/indra/newview/skins/default/xui/ko/panel_region_covenant.xml
diff --git a/linden/indra/newview/skins/xui/ko/panel_region_debug.xml b/linden/indra/newview/skins/default/xui/ko/panel_region_debug.xml
index f77cd66..f77cd66 100644
--- a/linden/indra/newview/skins/xui/ko/panel_region_debug.xml
+++ b/linden/indra/newview/skins/default/xui/ko/panel_region_debug.xml
diff --git a/linden/indra/newview/skins/xui/ko/panel_region_estate.xml b/linden/indra/newview/skins/default/xui/ko/panel_region_estate.xml
index a408180..a408180 100644
--- a/linden/indra/newview/skins/xui/ko/panel_region_estate.xml
+++ b/linden/indra/newview/skins/default/xui/ko/panel_region_estate.xml
diff --git a/linden/indra/newview/skins/xui/ko/panel_region_general.xml b/linden/indra/newview/skins/default/xui/ko/panel_region_general.xml
index 5366b7e..5366b7e 100644
--- a/linden/indra/newview/skins/xui/ko/panel_region_general.xml
+++ b/linden/indra/newview/skins/default/xui/ko/panel_region_general.xml
diff --git a/linden/indra/newview/skins/xui/ko/panel_region_terrain.xml b/linden/indra/newview/skins/default/xui/ko/panel_region_terrain.xml
index 4cc8f57..4cc8f57 100644
--- a/linden/indra/newview/skins/xui/ko/panel_region_terrain.xml
+++ b/linden/indra/newview/skins/default/xui/ko/panel_region_terrain.xml
diff --git a/linden/indra/newview/skins/xui/ko/panel_region_texture.xml b/linden/indra/newview/skins/default/xui/ko/panel_region_texture.xml
index 855e0c2..855e0c2 100644
--- a/linden/indra/newview/skins/xui/ko/panel_region_texture.xml
+++ b/linden/indra/newview/skins/default/xui/ko/panel_region_texture.xml
diff --git a/linden/indra/newview/skins/xui/ko/panel_scrolling_param.xml b/linden/indra/newview/skins/default/xui/ko/panel_scrolling_param.xml
index 39162f2..39162f2 100644
--- a/linden/indra/newview/skins/xui/ko/panel_scrolling_param.xml
+++ b/linden/indra/newview/skins/default/xui/ko/panel_scrolling_param.xml
diff --git a/linden/indra/newview/skins/xui/ko/panel_speaker_controls.xml b/linden/indra/newview/skins/default/xui/ko/panel_speaker_controls.xml
index 4104aa7..4104aa7 100644
--- a/linden/indra/newview/skins/xui/ko/panel_speaker_controls.xml
+++ b/linden/indra/newview/skins/default/xui/ko/panel_speaker_controls.xml
diff --git a/linden/indra/newview/skins/xui/ko/panel_status_bar.xml b/linden/indra/newview/skins/default/xui/ko/panel_status_bar.xml
index bc3bb85..bc3bb85 100644
--- a/linden/indra/newview/skins/xui/ko/panel_status_bar.xml
+++ b/linden/indra/newview/skins/default/xui/ko/panel_status_bar.xml
diff --git a/linden/indra/newview/skins/xui/ko/panel_toolbar.xml b/linden/indra/newview/skins/default/xui/ko/panel_toolbar.xml
index d01305f..d01305f 100644
--- a/linden/indra/newview/skins/xui/ko/panel_toolbar.xml
+++ b/linden/indra/newview/skins/default/xui/ko/panel_toolbar.xml
diff --git a/linden/indra/newview/skins/xui/ko/panel_top_pick.xml b/linden/indra/newview/skins/default/xui/ko/panel_top_pick.xml
index 021ef61..021ef61 100644
--- a/linden/indra/newview/skins/xui/ko/panel_top_pick.xml
+++ b/linden/indra/newview/skins/default/xui/ko/panel_top_pick.xml
diff --git a/linden/indra/newview/skins/xui/ko/panel_voice_controls.xml b/linden/indra/newview/skins/default/xui/ko/panel_voice_controls.xml
index 536581c..536581c 100644
--- a/linden/indra/newview/skins/xui/ko/panel_voice_controls.xml
+++ b/linden/indra/newview/skins/default/xui/ko/panel_voice_controls.xml
diff --git a/linden/indra/newview/skins/xui/ko/panel_voice_enable.xml b/linden/indra/newview/skins/default/xui/ko/panel_voice_enable.xml
index a217886..a217886 100644
--- a/linden/indra/newview/skins/xui/ko/panel_voice_enable.xml
+++ b/linden/indra/newview/skins/default/xui/ko/panel_voice_enable.xml
diff --git a/linden/indra/newview/skins/xui/ko/panel_voice_options.xml b/linden/indra/newview/skins/default/xui/ko/panel_voice_options.xml
index 1803bd8..1803bd8 100644
--- a/linden/indra/newview/skins/xui/ko/panel_voice_options.xml
+++ b/linden/indra/newview/skins/default/xui/ko/panel_voice_options.xml
diff --git a/linden/indra/newview/skins/xui/ko/panel_voice_remote.xml b/linden/indra/newview/skins/default/xui/ko/panel_voice_remote.xml
index 36feb3a..36feb3a 100644
--- a/linden/indra/newview/skins/xui/ko/panel_voice_remote.xml
+++ b/linden/indra/newview/skins/default/xui/ko/panel_voice_remote.xml
diff --git a/linden/indra/newview/skins/xui/ko/panel_voice_remote_expanded.xml b/linden/indra/newview/skins/default/xui/ko/panel_voice_remote_expanded.xml
index cc42d40..cc42d40 100644
--- a/linden/indra/newview/skins/xui/ko/panel_voice_remote_expanded.xml
+++ b/linden/indra/newview/skins/default/xui/ko/panel_voice_remote_expanded.xml
diff --git a/linden/indra/newview/skins/xui/ko/role_actions.xml b/linden/indra/newview/skins/default/xui/ko/role_actions.xml
index 9e06970..9e06970 100644
--- a/linden/indra/newview/skins/xui/ko/role_actions.xml
+++ b/linden/indra/newview/skins/default/xui/ko/role_actions.xml
diff --git a/linden/indra/newview/skins/xui/ko/strings.xml b/linden/indra/newview/skins/default/xui/ko/strings.xml
index a7ccb58..a7ccb58 100644
--- a/linden/indra/newview/skins/xui/ko/strings.xml
+++ b/linden/indra/newview/skins/default/xui/ko/strings.xml
diff --git a/linden/indra/newview/skins/xui/ko/teleport_strings.xml b/linden/indra/newview/skins/default/xui/ko/teleport_strings.xml
index e7985e9..e7985e9 100644
--- a/linden/indra/newview/skins/xui/ko/teleport_strings.xml
+++ b/linden/indra/newview/skins/default/xui/ko/teleport_strings.xml
diff --git a/linden/indra/newview/skins/xui/ko/xui_version.xml b/linden/indra/newview/skins/default/xui/ko/xui_version.xml
index 0e77775..0e77775 100644
--- a/linden/indra/newview/skins/xui/ko/xui_version.xml
+++ b/linden/indra/newview/skins/default/xui/ko/xui_version.xml
diff --git a/linden/indra/newview/skins/xui/pt/alerts.xml b/linden/indra/newview/skins/default/xui/pt/alerts.xml
index d80c7a5..d80c7a5 100644
--- a/linden/indra/newview/skins/xui/pt/alerts.xml
+++ b/linden/indra/newview/skins/default/xui/pt/alerts.xml
diff --git a/linden/indra/newview/skins/xui/pt/floater_about.xml b/linden/indra/newview/skins/default/xui/pt/floater_about.xml
index 5aaff2e..5aaff2e 100644
--- a/linden/indra/newview/skins/xui/pt/floater_about.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_about.xml
diff --git a/linden/indra/newview/skins/xui/pt/floater_about_land.xml b/linden/indra/newview/skins/default/xui/pt/floater_about_land.xml
index 3e88b27..3e88b27 100644
--- a/linden/indra/newview/skins/xui/pt/floater_about_land.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_about_land.xml
diff --git a/linden/indra/newview/skins/xui/pt/floater_account_history.xml b/linden/indra/newview/skins/default/xui/pt/floater_account_history.xml
index ebabdde..ebabdde 100644
--- a/linden/indra/newview/skins/xui/pt/floater_account_history.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_account_history.xml
diff --git a/linden/indra/newview/skins/xui/pt/floater_animation_preview.xml b/linden/indra/newview/skins/default/xui/pt/floater_animation_preview.xml
index de8d637..de8d637 100644
--- a/linden/indra/newview/skins/xui/pt/floater_animation_preview.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_animation_preview.xml
diff --git a/linden/indra/newview/skins/xui/pt/floater_auction.xml b/linden/indra/newview/skins/default/xui/pt/floater_auction.xml
index 2c6fc03..2c6fc03 100644
--- a/linden/indra/newview/skins/xui/pt/floater_auction.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_auction.xml
diff --git a/linden/indra/newview/skins/xui/pt/floater_avatar_picker.xml b/linden/indra/newview/skins/default/xui/pt/floater_avatar_picker.xml
index a4c6c37..a4c6c37 100644
--- a/linden/indra/newview/skins/xui/pt/floater_avatar_picker.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_avatar_picker.xml
diff --git a/linden/indra/newview/skins/xui/pt/floater_avatar_textures.xml b/linden/indra/newview/skins/default/xui/pt/floater_avatar_textures.xml
index 7533298..7533298 100644
--- a/linden/indra/newview/skins/xui/pt/floater_avatar_textures.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_avatar_textures.xml
diff --git a/linden/indra/newview/skins/xui/pt/floater_build_options.xml b/linden/indra/newview/skins/default/xui/pt/floater_build_options.xml
index 8f23a06..8f23a06 100644
--- a/linden/indra/newview/skins/xui/pt/floater_build_options.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_build_options.xml
diff --git a/linden/indra/newview/skins/xui/pt/floater_bumps.xml b/linden/indra/newview/skins/default/xui/pt/floater_bumps.xml
index 199cf9a..199cf9a 100644
--- a/linden/indra/newview/skins/xui/pt/floater_bumps.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_bumps.xml
diff --git a/linden/indra/newview/skins/xui/pt/floater_buy_contents.xml b/linden/indra/newview/skins/default/xui/pt/floater_buy_contents.xml
index f68311e..f68311e 100644
--- a/linden/indra/newview/skins/xui/pt/floater_buy_contents.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_buy_contents.xml
diff --git a/linden/indra/newview/skins/xui/pt/floater_buy_currency.xml b/linden/indra/newview/skins/default/xui/pt/floater_buy_currency.xml
index ccc61c1..ccc61c1 100644
--- a/linden/indra/newview/skins/xui/pt/floater_buy_currency.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_buy_currency.xml
diff --git a/linden/indra/newview/skins/xui/pt/floater_buy_land.xml b/linden/indra/newview/skins/default/xui/pt/floater_buy_land.xml
index d724d35..d724d35 100644
--- a/linden/indra/newview/skins/xui/pt/floater_buy_land.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_buy_land.xml
diff --git a/linden/indra/newview/skins/xui/pt/floater_buy_object.xml b/linden/indra/newview/skins/default/xui/pt/floater_buy_object.xml
index b8f2ba7..b8f2ba7 100644
--- a/linden/indra/newview/skins/xui/pt/floater_buy_object.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_buy_object.xml
diff --git a/linden/indra/newview/skins/xui/pt/floater_chat_history.xml b/linden/indra/newview/skins/default/xui/pt/floater_chat_history.xml
index 27a0b0b..27a0b0b 100644
--- a/linden/indra/newview/skins/xui/pt/floater_chat_history.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_chat_history.xml
diff --git a/linden/indra/newview/skins/xui/pt/floater_choose_group.xml b/linden/indra/newview/skins/default/xui/pt/floater_choose_group.xml
index e52bb3d..e52bb3d 100644
--- a/linden/indra/newview/skins/xui/pt/floater_choose_group.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_choose_group.xml
diff --git a/linden/indra/newview/skins/xui/pt/floater_clothing.xml b/linden/indra/newview/skins/default/xui/pt/floater_clothing.xml
index e3b0e58..e3b0e58 100644
--- a/linden/indra/newview/skins/xui/pt/floater_clothing.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_clothing.xml
diff --git a/linden/indra/newview/skins/xui/pt/floater_color_picker.xml b/linden/indra/newview/skins/default/xui/pt/floater_color_picker.xml
index a4ea117..a4ea117 100644
--- a/linden/indra/newview/skins/xui/pt/floater_color_picker.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_color_picker.xml
diff --git a/linden/indra/newview/skins/xui/pt/floater_critical.xml b/linden/indra/newview/skins/default/xui/pt/floater_critical.xml
index 78d3b54..78d3b54 100644
--- a/linden/indra/newview/skins/xui/pt/floater_critical.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_critical.xml
diff --git a/linden/indra/newview/skins/xui/pt/floater_customize.xml b/linden/indra/newview/skins/default/xui/pt/floater_customize.xml
index 417aec9..417aec9 100644
--- a/linden/indra/newview/skins/xui/pt/floater_customize.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_customize.xml
diff --git a/linden/indra/newview/skins/xui/pt/floater_directory.xml b/linden/indra/newview/skins/default/xui/pt/floater_directory.xml
index 0950d7c..0950d7c 100644
--- a/linden/indra/newview/skins/xui/pt/floater_directory.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_directory.xml
diff --git a/linden/indra/newview/skins/xui/pt/floater_gesture.xml b/linden/indra/newview/skins/default/xui/pt/floater_gesture.xml
index 7fd928b..7fd928b 100644
--- a/linden/indra/newview/skins/xui/pt/floater_gesture.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_gesture.xml
diff --git a/linden/indra/newview/skins/xui/pt/floater_god_tools.xml b/linden/indra/newview/skins/default/xui/pt/floater_god_tools.xml
index 4fe70cb..4fe70cb 100644
--- a/linden/indra/newview/skins/xui/pt/floater_god_tools.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_god_tools.xml
diff --git a/linden/indra/newview/skins/xui/pt/floater_group_info.xml b/linden/indra/newview/skins/default/xui/pt/floater_group_info.xml
index eeef539..eeef539 100644
--- a/linden/indra/newview/skins/xui/pt/floater_group_info.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_group_info.xml
diff --git a/linden/indra/newview/skins/xui/pt/floater_html.xml b/linden/indra/newview/skins/default/xui/pt/floater_html.xml
index d9caffc..d9caffc 100644
--- a/linden/indra/newview/skins/xui/pt/floater_html.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_html.xml
diff --git a/linden/indra/newview/skins/xui/pt/floater_im.xml b/linden/indra/newview/skins/default/xui/pt/floater_im.xml
index e559f55..e559f55 100644
--- a/linden/indra/newview/skins/xui/pt/floater_im.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_im.xml
diff --git a/linden/indra/newview/skins/xui/pt/floater_image_preview.xml b/linden/indra/newview/skins/default/xui/pt/floater_image_preview.xml
index 94285ee..94285ee 100644
--- a/linden/indra/newview/skins/xui/pt/floater_image_preview.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_image_preview.xml
diff --git a/linden/indra/newview/skins/xui/pt/floater_import.xml b/linden/indra/newview/skins/default/xui/pt/floater_import.xml
index 8b08dc1..8b08dc1 100644
--- a/linden/indra/newview/skins/xui/pt/floater_import.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_import.xml
diff --git a/linden/indra/newview/skins/xui/pt/floater_inspect.xml b/linden/indra/newview/skins/default/xui/pt/floater_inspect.xml
index 4600151..4600151 100644
--- a/linden/indra/newview/skins/xui/pt/floater_inspect.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_inspect.xml
diff --git a/linden/indra/newview/skins/xui/pt/floater_instant_message.xml b/linden/indra/newview/skins/default/xui/pt/floater_instant_message.xml
index 76c8cbe..76c8cbe 100644
--- a/linden/indra/newview/skins/xui/pt/floater_instant_message.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_instant_message.xml
diff --git a/linden/indra/newview/skins/xui/pt/floater_instant_message_ad_hoc.xml b/linden/indra/newview/skins/default/xui/pt/floater_instant_message_ad_hoc.xml
index 46ada4e..46ada4e 100644
--- a/linden/indra/newview/skins/xui/pt/floater_instant_message_ad_hoc.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_instant_message_ad_hoc.xml
diff --git a/linden/indra/newview/skins/xui/pt/floater_inventory.xml b/linden/indra/newview/skins/default/xui/pt/floater_inventory.xml
index b34895f..b34895f 100644
--- a/linden/indra/newview/skins/xui/pt/floater_inventory.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_inventory.xml
diff --git a/linden/indra/newview/skins/xui/pt/floater_inventory_item_properties.xml b/linden/indra/newview/skins/default/xui/pt/floater_inventory_item_properties.xml
index 4cc6797..4cc6797 100644
--- a/linden/indra/newview/skins/xui/pt/floater_inventory_item_properties.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_inventory_item_properties.xml
diff --git a/linden/indra/newview/skins/xui/pt/floater_inventory_view_finder.xml b/linden/indra/newview/skins/default/xui/pt/floater_inventory_view_finder.xml
index d65af04..d65af04 100644
--- a/linden/indra/newview/skins/xui/pt/floater_inventory_view_finder.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_inventory_view_finder.xml
diff --git a/linden/indra/newview/skins/xui/pt/floater_joystick.xml b/linden/indra/newview/skins/default/xui/pt/floater_joystick.xml
index 136c4a8..136c4a8 100644
--- a/linden/indra/newview/skins/xui/pt/floater_joystick.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_joystick.xml
diff --git a/linden/indra/newview/skins/xui/pt/floater_land_holdings.xml b/linden/indra/newview/skins/default/xui/pt/floater_land_holdings.xml
index 6d2acca..6d2acca 100644
--- a/linden/indra/newview/skins/xui/pt/floater_land_holdings.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_land_holdings.xml
diff --git a/linden/indra/newview/skins/xui/pt/floater_live_lsleditor.xml b/linden/indra/newview/skins/default/xui/pt/floater_live_lsleditor.xml
index 9753b38..9753b38 100644
--- a/linden/indra/newview/skins/xui/pt/floater_live_lsleditor.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_live_lsleditor.xml
diff --git a/linden/indra/newview/skins/xui/pt/floater_lsl_guide.xml b/linden/indra/newview/skins/default/xui/pt/floater_lsl_guide.xml
index b13af3b..b13af3b 100644
--- a/linden/indra/newview/skins/xui/pt/floater_lsl_guide.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_lsl_guide.xml
diff --git a/linden/indra/newview/skins/xui/pt/floater_moveview.xml b/linden/indra/newview/skins/default/xui/pt/floater_moveview.xml
index c6c7460..c6c7460 100644
--- a/linden/indra/newview/skins/xui/pt/floater_moveview.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_moveview.xml
diff --git a/linden/indra/newview/skins/xui/pt/floater_mute.xml b/linden/indra/newview/skins/default/xui/pt/floater_mute.xml
index bd95a7f..bd95a7f 100644
--- a/linden/indra/newview/skins/xui/pt/floater_mute.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_mute.xml
diff --git a/linden/indra/newview/skins/xui/pt/floater_name_description.xml b/linden/indra/newview/skins/default/xui/pt/floater_name_description.xml
index a698aeb..a698aeb 100644
--- a/linden/indra/newview/skins/xui/pt/floater_name_description.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_name_description.xml
diff --git a/linden/indra/newview/skins/xui/pt/floater_new_im.xml b/linden/indra/newview/skins/default/xui/pt/floater_new_im.xml
index b36ab27..b36ab27 100644
--- a/linden/indra/newview/skins/xui/pt/floater_new_im.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_new_im.xml
diff --git a/linden/indra/newview/skins/xui/pt/floater_new_outfit_dialog.xml b/linden/indra/newview/skins/default/xui/pt/floater_new_outfit_dialog.xml
index 3418355..3418355 100644
--- a/linden/indra/newview/skins/xui/pt/floater_new_outfit_dialog.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_new_outfit_dialog.xml
diff --git a/linden/indra/newview/skins/xui/pt/floater_openobject.xml b/linden/indra/newview/skins/default/xui/pt/floater_openobject.xml
index 51f7178..51f7178 100644
--- a/linden/indra/newview/skins/xui/pt/floater_openobject.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_openobject.xml
diff --git a/linden/indra/newview/skins/xui/pt/floater_pay.xml b/linden/indra/newview/skins/default/xui/pt/floater_pay.xml
index 76facb4..76facb4 100644
--- a/linden/indra/newview/skins/xui/pt/floater_pay.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_pay.xml
diff --git a/linden/indra/newview/skins/xui/pt/floater_pay_object.xml b/linden/indra/newview/skins/default/xui/pt/floater_pay_object.xml
index 7973baf..7973baf 100644
--- a/linden/indra/newview/skins/xui/pt/floater_pay_object.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_pay_object.xml
diff --git a/linden/indra/newview/skins/xui/pt/floater_postcard.xml b/linden/indra/newview/skins/default/xui/pt/floater_postcard.xml
index deb5d0c..deb5d0c 100644
--- a/linden/indra/newview/skins/xui/pt/floater_postcard.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_postcard.xml
diff --git a/linden/indra/newview/skins/xui/pt/floater_preferences.xml b/linden/indra/newview/skins/default/xui/pt/floater_preferences.xml
index ba17294..ba17294 100644
--- a/linden/indra/newview/skins/xui/pt/floater_preferences.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_preferences.xml
diff --git a/linden/indra/newview/skins/xui/pt/floater_preview_animation.xml b/linden/indra/newview/skins/default/xui/pt/floater_preview_animation.xml
index d71a4de..d71a4de 100644
--- a/linden/indra/newview/skins/xui/pt/floater_preview_animation.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_preview_animation.xml
diff --git a/linden/indra/newview/skins/xui/pt/floater_preview_embedded_texture.xml b/linden/indra/newview/skins/default/xui/pt/floater_preview_embedded_texture.xml
index 119cc6c..119cc6c 100644
--- a/linden/indra/newview/skins/xui/pt/floater_preview_embedded_texture.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_preview_embedded_texture.xml
diff --git a/linden/indra/newview/skins/xui/pt/floater_preview_existing_landmark.xml b/linden/indra/newview/skins/default/xui/pt/floater_preview_existing_landmark.xml
index dcb42b4..dcb42b4 100644
--- a/linden/indra/newview/skins/xui/pt/floater_preview_existing_landmark.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_preview_existing_landmark.xml
diff --git a/linden/indra/newview/skins/xui/pt/floater_preview_gesture.xml b/linden/indra/newview/skins/default/xui/pt/floater_preview_gesture.xml
index 13a27d3..13a27d3 100644
--- a/linden/indra/newview/skins/xui/pt/floater_preview_gesture.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_preview_gesture.xml
diff --git a/linden/indra/newview/skins/xui/pt/floater_preview_notecard.xml b/linden/indra/newview/skins/default/xui/pt/floater_preview_notecard.xml
index b8d9e2d..b8d9e2d 100644
--- a/linden/indra/newview/skins/xui/pt/floater_preview_notecard.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_preview_notecard.xml
diff --git a/linden/indra/newview/skins/xui/pt/floater_preview_notecard_keep_discard.xml b/linden/indra/newview/skins/default/xui/pt/floater_preview_notecard_keep_discard.xml
index 837f9d1..837f9d1 100644
--- a/linden/indra/newview/skins/xui/pt/floater_preview_notecard_keep_discard.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_preview_notecard_keep_discard.xml
diff --git a/linden/indra/newview/skins/xui/pt/floater_preview_sound.xml b/linden/indra/newview/skins/default/xui/pt/floater_preview_sound.xml
index e8cc7a9..e8cc7a9 100644
--- a/linden/indra/newview/skins/xui/pt/floater_preview_sound.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_preview_sound.xml
diff --git a/linden/indra/newview/skins/xui/pt/floater_preview_texture.xml b/linden/indra/newview/skins/default/xui/pt/floater_preview_texture.xml
index 64b2b82..64b2b82 100644
--- a/linden/indra/newview/skins/xui/pt/floater_preview_texture.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_preview_texture.xml
diff --git a/linden/indra/newview/skins/xui/pt/floater_preview_texture_keep_discard.xml b/linden/indra/newview/skins/default/xui/pt/floater_preview_texture_keep_discard.xml
index dc0ff84..dc0ff84 100644
--- a/linden/indra/newview/skins/xui/pt/floater_preview_texture_keep_discard.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_preview_texture_keep_discard.xml
diff --git a/linden/indra/newview/skins/xui/pt/floater_price_for_listing.xml b/linden/indra/newview/skins/default/xui/pt/floater_price_for_listing.xml
index 0cfa11b..0cfa11b 100644
--- a/linden/indra/newview/skins/xui/pt/floater_price_for_listing.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_price_for_listing.xml
diff --git a/linden/indra/newview/skins/xui/pt/floater_profile.xml b/linden/indra/newview/skins/default/xui/pt/floater_profile.xml
index 597b3bf..597b3bf 100644
--- a/linden/indra/newview/skins/xui/pt/floater_profile.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_profile.xml
diff --git a/linden/indra/newview/skins/xui/pt/floater_report_abuse.xml b/linden/indra/newview/skins/default/xui/pt/floater_report_abuse.xml
index 78fccec..78fccec 100644
--- a/linden/indra/newview/skins/xui/pt/floater_report_abuse.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_report_abuse.xml
diff --git a/linden/indra/newview/skins/xui/pt/floater_report_bug.xml b/linden/indra/newview/skins/default/xui/pt/floater_report_bug.xml
index c9b37a7..c9b37a7 100644
--- a/linden/indra/newview/skins/xui/pt/floater_report_bug.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_report_bug.xml
diff --git a/linden/indra/newview/skins/xui/pt/floater_script_debug.xml b/linden/indra/newview/skins/default/xui/pt/floater_script_debug.xml
index 877f5b8..877f5b8 100644
--- a/linden/indra/newview/skins/xui/pt/floater_script_debug.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_script_debug.xml
diff --git a/linden/indra/newview/skins/xui/pt/floater_script_ed_panel.xml b/linden/indra/newview/skins/default/xui/pt/floater_script_ed_panel.xml
index 1d9bec3..1d9bec3 100644
--- a/linden/indra/newview/skins/xui/pt/floater_script_ed_panel.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_script_ed_panel.xml
diff --git a/linden/indra/newview/skins/xui/pt/floater_script_preview.xml b/linden/indra/newview/skins/default/xui/pt/floater_script_preview.xml
index 68405a6..68405a6 100644
--- a/linden/indra/newview/skins/xui/pt/floater_script_preview.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_script_preview.xml
diff --git a/linden/indra/newview/skins/xui/pt/floater_script_queue.xml b/linden/indra/newview/skins/default/xui/pt/floater_script_queue.xml
index 0a083d5..0a083d5 100644
--- a/linden/indra/newview/skins/xui/pt/floater_script_queue.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_script_queue.xml
diff --git a/linden/indra/newview/skins/xui/pt/floater_script_search.xml b/linden/indra/newview/skins/default/xui/pt/floater_script_search.xml
index b7aaa2e..b7aaa2e 100644
--- a/linden/indra/newview/skins/xui/pt/floater_script_search.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_script_search.xml
diff --git a/linden/indra/newview/skins/xui/pt/floater_sell_land.xml b/linden/indra/newview/skins/default/xui/pt/floater_sell_land.xml
index 1acdc22..1acdc22 100644
--- a/linden/indra/newview/skins/xui/pt/floater_sell_land.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_sell_land.xml
diff --git a/linden/indra/newview/skins/xui/pt/floater_settings_debug.xml b/linden/indra/newview/skins/default/xui/pt/floater_settings_debug.xml
index 9a1bb15..9a1bb15 100644
--- a/linden/indra/newview/skins/xui/pt/floater_settings_debug.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_settings_debug.xml
diff --git a/linden/indra/newview/skins/xui/pt/floater_snapshot.xml b/linden/indra/newview/skins/default/xui/pt/floater_snapshot.xml
index 4d30377..4d30377 100644
--- a/linden/indra/newview/skins/xui/pt/floater_snapshot.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_snapshot.xml
diff --git a/linden/indra/newview/skins/xui/pt/floater_sound_preview.xml b/linden/indra/newview/skins/default/xui/pt/floater_sound_preview.xml
index 4057460..4057460 100644
--- a/linden/indra/newview/skins/xui/pt/floater_sound_preview.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_sound_preview.xml
diff --git a/linden/indra/newview/skins/xui/pt/floater_telehub.xml b/linden/indra/newview/skins/default/xui/pt/floater_telehub.xml
index b2281b3..b2281b3 100644
--- a/linden/indra/newview/skins/xui/pt/floater_telehub.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_telehub.xml
diff --git a/linden/indra/newview/skins/xui/pt/floater_texture_ctrl.xml b/linden/indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml
index 013b02b..013b02b 100644
--- a/linden/indra/newview/skins/xui/pt/floater_texture_ctrl.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml
diff --git a/linden/indra/newview/skins/xui/pt/floater_tools.xml b/linden/indra/newview/skins/default/xui/pt/floater_tools.xml
index 336bff0..336bff0 100644
--- a/linden/indra/newview/skins/xui/pt/floater_tools.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_tools.xml
diff --git a/linden/indra/newview/skins/xui/pt/floater_top_objects.xml b/linden/indra/newview/skins/default/xui/pt/floater_top_objects.xml
index 6da86f5..6da86f5 100644
--- a/linden/indra/newview/skins/xui/pt/floater_top_objects.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_top_objects.xml
diff --git a/linden/indra/newview/skins/xui/pt/floater_tos.xml b/linden/indra/newview/skins/default/xui/pt/floater_tos.xml
index 5e4e819..5e4e819 100644
--- a/linden/indra/newview/skins/xui/pt/floater_tos.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_tos.xml
diff --git a/linden/indra/newview/skins/xui/pt/floater_wearable_save_as.xml b/linden/indra/newview/skins/default/xui/pt/floater_wearable_save_as.xml
index ca986a1..ca986a1 100644
--- a/linden/indra/newview/skins/xui/pt/floater_wearable_save_as.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_wearable_save_as.xml
diff --git a/linden/indra/newview/skins/xui/pt/floater_world_map.xml b/linden/indra/newview/skins/default/xui/pt/floater_world_map.xml
index 5501c81..5501c81 100644
--- a/linden/indra/newview/skins/xui/pt/floater_world_map.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_world_map.xml
diff --git a/linden/indra/newview/skins/xui/pt/menu_inventory.xml b/linden/indra/newview/skins/default/xui/pt/menu_inventory.xml
index 0c9bc77..0c9bc77 100644
--- a/linden/indra/newview/skins/xui/pt/menu_inventory.xml
+++ b/linden/indra/newview/skins/default/xui/pt/menu_inventory.xml
diff --git a/linden/indra/newview/skins/xui/pt/menu_pie_attachment.xml b/linden/indra/newview/skins/default/xui/pt/menu_pie_attachment.xml
index fe7f329..fe7f329 100644
--- a/linden/indra/newview/skins/xui/pt/menu_pie_attachment.xml
+++ b/linden/indra/newview/skins/default/xui/pt/menu_pie_attachment.xml
diff --git a/linden/indra/newview/skins/xui/pt/menu_pie_avatar.xml b/linden/indra/newview/skins/default/xui/pt/menu_pie_avatar.xml
index b2ff482..b2ff482 100644
--- a/linden/indra/newview/skins/xui/pt/menu_pie_avatar.xml
+++ b/linden/indra/newview/skins/default/xui/pt/menu_pie_avatar.xml
diff --git a/linden/indra/newview/skins/xui/pt/menu_pie_land.xml b/linden/indra/newview/skins/default/xui/pt/menu_pie_land.xml
index 8f50917..8f50917 100644
--- a/linden/indra/newview/skins/xui/pt/menu_pie_land.xml
+++ b/linden/indra/newview/skins/default/xui/pt/menu_pie_land.xml
diff --git a/linden/indra/newview/skins/xui/pt/menu_pie_object.xml b/linden/indra/newview/skins/default/xui/pt/menu_pie_object.xml
index 1973197..1973197 100644
--- a/linden/indra/newview/skins/xui/pt/menu_pie_object.xml
+++ b/linden/indra/newview/skins/default/xui/pt/menu_pie_object.xml
diff --git a/linden/indra/newview/skins/xui/pt/menu_pie_self.xml b/linden/indra/newview/skins/default/xui/pt/menu_pie_self.xml
index d261b98..d261b98 100644
--- a/linden/indra/newview/skins/xui/pt/menu_pie_self.xml
+++ b/linden/indra/newview/skins/default/xui/pt/menu_pie_self.xml
diff --git a/linden/indra/newview/skins/xui/pt/menu_viewer.xml b/linden/indra/newview/skins/default/xui/pt/menu_viewer.xml
index 46d279e..46d279e 100644
--- a/linden/indra/newview/skins/xui/pt/menu_viewer.xml
+++ b/linden/indra/newview/skins/default/xui/pt/menu_viewer.xml
diff --git a/linden/indra/newview/skins/xui/pt/notify.xml b/linden/indra/newview/skins/default/xui/pt/notify.xml
index 1e95e22..1e95e22 100644
--- a/linden/indra/newview/skins/xui/pt/notify.xml
+++ b/linden/indra/newview/skins/default/xui/pt/notify.xml
diff --git a/linden/indra/newview/skins/xui/pt/panel_account_details.xml b/linden/indra/newview/skins/default/xui/pt/panel_account_details.xml
index 716de40..716de40 100644
--- a/linden/indra/newview/skins/xui/pt/panel_account_details.xml
+++ b/linden/indra/newview/skins/default/xui/pt/panel_account_details.xml
diff --git a/linden/indra/newview/skins/xui/pt/panel_account_planning.xml b/linden/indra/newview/skins/default/xui/pt/panel_account_planning.xml
index 5700400..5700400 100644
--- a/linden/indra/newview/skins/xui/pt/panel_account_planning.xml
+++ b/linden/indra/newview/skins/default/xui/pt/panel_account_planning.xml
diff --git a/linden/indra/newview/skins/xui/pt/panel_account_transactions.xml b/linden/indra/newview/skins/default/xui/pt/panel_account_transactions.xml
index 5af0871..5af0871 100644
--- a/linden/indra/newview/skins/xui/pt/panel_account_transactions.xml
+++ b/linden/indra/newview/skins/default/xui/pt/panel_account_transactions.xml
diff --git a/linden/indra/newview/skins/xui/pt/panel_avatar.xml b/linden/indra/newview/skins/default/xui/pt/panel_avatar.xml
index bfa9edb..bfa9edb 100644
--- a/linden/indra/newview/skins/xui/pt/panel_avatar.xml
+++ b/linden/indra/newview/skins/default/xui/pt/panel_avatar.xml
diff --git a/linden/indra/newview/skins/xui/pt/panel_avatar_classified.xml b/linden/indra/newview/skins/default/xui/pt/panel_avatar_classified.xml
index 0a0e396..0a0e396 100644
--- a/linden/indra/newview/skins/xui/pt/panel_avatar_classified.xml
+++ b/linden/indra/newview/skins/default/xui/pt/panel_avatar_classified.xml
diff --git a/linden/indra/newview/skins/xui/pt/panel_avatar_pick.xml b/linden/indra/newview/skins/default/xui/pt/panel_avatar_pick.xml
index f80f54d..f80f54d 100644
--- a/linden/indra/newview/skins/xui/pt/panel_avatar_pick.xml
+++ b/linden/indra/newview/skins/default/xui/pt/panel_avatar_pick.xml
diff --git a/linden/indra/newview/skins/xui/pt/panel_chat_bar.xml b/linden/indra/newview/skins/default/xui/pt/panel_chat_bar.xml
index 0fab2a2..0fab2a2 100644
--- a/linden/indra/newview/skins/xui/pt/panel_chat_bar.xml
+++ b/linden/indra/newview/skins/default/xui/pt/panel_chat_bar.xml
diff --git a/linden/indra/newview/skins/xui/pt/panel_classified.xml b/linden/indra/newview/skins/default/xui/pt/panel_classified.xml
index ba219b4..ba219b4 100644
--- a/linden/indra/newview/skins/xui/pt/panel_classified.xml
+++ b/linden/indra/newview/skins/default/xui/pt/panel_classified.xml
diff --git a/linden/indra/newview/skins/xui/pt/panel_event.xml b/linden/indra/newview/skins/default/xui/pt/panel_event.xml
index 5493583..5493583 100644
--- a/linden/indra/newview/skins/xui/pt/panel_event.xml
+++ b/linden/indra/newview/skins/default/xui/pt/panel_event.xml
diff --git a/linden/indra/newview/skins/xui/pt/panel_group.xml b/linden/indra/newview/skins/default/xui/pt/panel_group.xml
index 0606d7a..0606d7a 100644
--- a/linden/indra/newview/skins/xui/pt/panel_group.xml
+++ b/linden/indra/newview/skins/default/xui/pt/panel_group.xml
diff --git a/linden/indra/newview/skins/xui/pt/panel_group_finder.xml b/linden/indra/newview/skins/default/xui/pt/panel_group_finder.xml
index c11b95f..c11b95f 100644
--- a/linden/indra/newview/skins/xui/pt/panel_group_finder.xml
+++ b/linden/indra/newview/skins/default/xui/pt/panel_group_finder.xml
diff --git a/linden/indra/newview/skins/xui/pt/panel_group_general.xml b/linden/indra/newview/skins/default/xui/pt/panel_group_general.xml
index 31bd1b6..31bd1b6 100644
--- a/linden/indra/newview/skins/xui/pt/panel_group_general.xml
+++ b/linden/indra/newview/skins/default/xui/pt/panel_group_general.xml
diff --git a/linden/indra/newview/skins/xui/pt/panel_group_invite.xml b/linden/indra/newview/skins/default/xui/pt/panel_group_invite.xml
index 89f0b93..89f0b93 100644
--- a/linden/indra/newview/skins/xui/pt/panel_group_invite.xml
+++ b/linden/indra/newview/skins/default/xui/pt/panel_group_invite.xml
diff --git a/linden/indra/newview/skins/xui/pt/panel_group_land_money.xml b/linden/indra/newview/skins/default/xui/pt/panel_group_land_money.xml
index 7288c98..7288c98 100644
--- a/linden/indra/newview/skins/xui/pt/panel_group_land_money.xml
+++ b/linden/indra/newview/skins/default/xui/pt/panel_group_land_money.xml
diff --git a/linden/indra/newview/skins/xui/pt/panel_group_notices.xml b/linden/indra/newview/skins/default/xui/pt/panel_group_notices.xml
index f5698a7..f5698a7 100644
--- a/linden/indra/newview/skins/xui/pt/panel_group_notices.xml
+++ b/linden/indra/newview/skins/default/xui/pt/panel_group_notices.xml
diff --git a/linden/indra/newview/skins/xui/pt/panel_group_roles.xml b/linden/indra/newview/skins/default/xui/pt/panel_group_roles.xml
index 8bf421c..8bf421c 100644
--- a/linden/indra/newview/skins/xui/pt/panel_group_roles.xml
+++ b/linden/indra/newview/skins/default/xui/pt/panel_group_roles.xml
diff --git a/linden/indra/newview/skins/xui/pt/panel_group_voting.xml b/linden/indra/newview/skins/default/xui/pt/panel_group_voting.xml
index 56bae09..56bae09 100644
--- a/linden/indra/newview/skins/xui/pt/panel_group_voting.xml
+++ b/linden/indra/newview/skins/default/xui/pt/panel_group_voting.xml
diff --git a/linden/indra/newview/skins/xui/pt/panel_land_covenant.xml b/linden/indra/newview/skins/default/xui/pt/panel_land_covenant.xml
index 0d15847..0d15847 100644
--- a/linden/indra/newview/skins/xui/pt/panel_land_covenant.xml
+++ b/linden/indra/newview/skins/default/xui/pt/panel_land_covenant.xml
diff --git a/linden/indra/newview/skins/xui/pt/panel_login.xml b/linden/indra/newview/skins/default/xui/pt/panel_login.xml
index fb42e24..fb42e24 100644
--- a/linden/indra/newview/skins/xui/pt/panel_login.xml
+++ b/linden/indra/newview/skins/default/xui/pt/panel_login.xml
diff --git a/linden/indra/newview/skins/xui/pt/panel_media_remote.xml b/linden/indra/newview/skins/default/xui/pt/panel_media_remote.xml
index ef098bc..ef098bc 100644
--- a/linden/indra/newview/skins/xui/pt/panel_media_remote.xml
+++ b/linden/indra/newview/skins/default/xui/pt/panel_media_remote.xml
diff --git a/linden/indra/newview/skins/xui/pt/panel_overlaybar.xml b/linden/indra/newview/skins/default/xui/pt/panel_overlaybar.xml
index 8d8c760..8d8c760 100644
--- a/linden/indra/newview/skins/xui/pt/panel_overlaybar.xml
+++ b/linden/indra/newview/skins/default/xui/pt/panel_overlaybar.xml
diff --git a/linden/indra/newview/skins/xui/pt/panel_place.xml b/linden/indra/newview/skins/default/xui/pt/panel_place.xml
index 0c41592..0c41592 100644
--- a/linden/indra/newview/skins/xui/pt/panel_place.xml
+++ b/linden/indra/newview/skins/default/xui/pt/panel_place.xml
diff --git a/linden/indra/newview/skins/xui/pt/panel_place_small.xml b/linden/indra/newview/skins/default/xui/pt/panel_place_small.xml
index 8912149..8912149 100644
--- a/linden/indra/newview/skins/xui/pt/panel_place_small.xml
+++ b/linden/indra/newview/skins/default/xui/pt/panel_place_small.xml
diff --git a/linden/indra/newview/skins/xui/pt/panel_preferences_audio.xml b/linden/indra/newview/skins/default/xui/pt/panel_preferences_audio.xml
index c43b0b6..c43b0b6 100644
--- a/linden/indra/newview/skins/xui/pt/panel_preferences_audio.xml
+++ b/linden/indra/newview/skins/default/xui/pt/panel_preferences_audio.xml
diff --git a/linden/indra/newview/skins/xui/pt/panel_preferences_chat.xml b/linden/indra/newview/skins/default/xui/pt/panel_preferences_chat.xml
index d99e620..d99e620 100644
--- a/linden/indra/newview/skins/xui/pt/panel_preferences_chat.xml
+++ b/linden/indra/newview/skins/default/xui/pt/panel_preferences_chat.xml
diff --git a/linden/indra/newview/skins/xui/pt/panel_preferences_general.xml b/linden/indra/newview/skins/default/xui/pt/panel_preferences_general.xml
index f076766..f076766 100644
--- a/linden/indra/newview/skins/xui/pt/panel_preferences_general.xml
+++ b/linden/indra/newview/skins/default/xui/pt/panel_preferences_general.xml
diff --git a/linden/indra/newview/skins/xui/pt/panel_preferences_graphics1.xml b/linden/indra/newview/skins/default/xui/pt/panel_preferences_graphics1.xml
index 58b9956..58b9956 100644
--- a/linden/indra/newview/skins/xui/pt/panel_preferences_graphics1.xml
+++ b/linden/indra/newview/skins/default/xui/pt/panel_preferences_graphics1.xml
diff --git a/linden/indra/newview/skins/xui/pt/panel_preferences_im.xml b/linden/indra/newview/skins/default/xui/pt/panel_preferences_im.xml
index 72bcae1..72bcae1 100644
--- a/linden/indra/newview/skins/xui/pt/panel_preferences_im.xml
+++ b/linden/indra/newview/skins/default/xui/pt/panel_preferences_im.xml
diff --git a/linden/indra/newview/skins/xui/pt/panel_preferences_input.xml b/linden/indra/newview/skins/default/xui/pt/panel_preferences_input.xml
index 2c5d5bd..2c5d5bd 100644
--- a/linden/indra/newview/skins/xui/pt/panel_preferences_input.xml
+++ b/linden/indra/newview/skins/default/xui/pt/panel_preferences_input.xml
diff --git a/linden/indra/newview/skins/xui/pt/panel_preferences_network.xml b/linden/indra/newview/skins/default/xui/pt/panel_preferences_network.xml
index ca017dc..ca017dc 100644
--- a/linden/indra/newview/skins/xui/pt/panel_preferences_network.xml
+++ b/linden/indra/newview/skins/default/xui/pt/panel_preferences_network.xml
diff --git a/linden/indra/newview/skins/xui/pt/panel_preferences_popups.xml b/linden/indra/newview/skins/default/xui/pt/panel_preferences_popups.xml
index a6ade10..a6ade10 100644
--- a/linden/indra/newview/skins/xui/pt/panel_preferences_popups.xml
+++ b/linden/indra/newview/skins/default/xui/pt/panel_preferences_popups.xml
diff --git a/linden/indra/newview/skins/xui/pt/panel_preferences_web.xml b/linden/indra/newview/skins/default/xui/pt/panel_preferences_web.xml
index 1fd6bb9..1fd6bb9 100644
--- a/linden/indra/newview/skins/xui/pt/panel_preferences_web.xml
+++ b/linden/indra/newview/skins/default/xui/pt/panel_preferences_web.xml
diff --git a/linden/indra/newview/skins/xui/pt/panel_region_covenant.xml b/linden/indra/newview/skins/default/xui/pt/panel_region_covenant.xml
index f82586d..f82586d 100644
--- a/linden/indra/newview/skins/xui/pt/panel_region_covenant.xml
+++ b/linden/indra/newview/skins/default/xui/pt/panel_region_covenant.xml
diff --git a/linden/indra/newview/skins/xui/pt/panel_region_debug.xml b/linden/indra/newview/skins/default/xui/pt/panel_region_debug.xml
index d597b28..d597b28 100644
--- a/linden/indra/newview/skins/xui/pt/panel_region_debug.xml
+++ b/linden/indra/newview/skins/default/xui/pt/panel_region_debug.xml
diff --git a/linden/indra/newview/skins/xui/pt/panel_region_estate.xml b/linden/indra/newview/skins/default/xui/pt/panel_region_estate.xml
index 1560505..1560505 100644
--- a/linden/indra/newview/skins/xui/pt/panel_region_estate.xml
+++ b/linden/indra/newview/skins/default/xui/pt/panel_region_estate.xml
diff --git a/linden/indra/newview/skins/xui/pt/panel_region_general.xml b/linden/indra/newview/skins/default/xui/pt/panel_region_general.xml
index c80d6f4..c80d6f4 100644
--- a/linden/indra/newview/skins/xui/pt/panel_region_general.xml
+++ b/linden/indra/newview/skins/default/xui/pt/panel_region_general.xml
diff --git a/linden/indra/newview/skins/xui/pt/panel_region_terrain.xml b/linden/indra/newview/skins/default/xui/pt/panel_region_terrain.xml
index a396c38..a396c38 100644
--- a/linden/indra/newview/skins/xui/pt/panel_region_terrain.xml
+++ b/linden/indra/newview/skins/default/xui/pt/panel_region_terrain.xml
diff --git a/linden/indra/newview/skins/xui/pt/panel_region_texture.xml b/linden/indra/newview/skins/default/xui/pt/panel_region_texture.xml
index 29de27d..29de27d 100644
--- a/linden/indra/newview/skins/xui/pt/panel_region_texture.xml
+++ b/linden/indra/newview/skins/default/xui/pt/panel_region_texture.xml
diff --git a/linden/indra/newview/skins/xui/pt/panel_scrolling_param.xml b/linden/indra/newview/skins/default/xui/pt/panel_scrolling_param.xml
index ac4e6c4..ac4e6c4 100644
--- a/linden/indra/newview/skins/xui/pt/panel_scrolling_param.xml
+++ b/linden/indra/newview/skins/default/xui/pt/panel_scrolling_param.xml
diff --git a/linden/indra/newview/skins/xui/pt/panel_status_bar.xml b/linden/indra/newview/skins/default/xui/pt/panel_status_bar.xml
index 194bf11..194bf11 100644
--- a/linden/indra/newview/skins/xui/pt/panel_status_bar.xml
+++ b/linden/indra/newview/skins/default/xui/pt/panel_status_bar.xml
diff --git a/linden/indra/newview/skins/xui/pt/panel_toolbar.xml b/linden/indra/newview/skins/default/xui/pt/panel_toolbar.xml
index 8f62b7b..8f62b7b 100644
--- a/linden/indra/newview/skins/xui/pt/panel_toolbar.xml
+++ b/linden/indra/newview/skins/default/xui/pt/panel_toolbar.xml
diff --git a/linden/indra/newview/skins/xui/pt/panel_top_pick.xml b/linden/indra/newview/skins/default/xui/pt/panel_top_pick.xml
index 4c922ac..4c922ac 100644
--- a/linden/indra/newview/skins/xui/pt/panel_top_pick.xml
+++ b/linden/indra/newview/skins/default/xui/pt/panel_top_pick.xml
diff --git a/linden/indra/newview/skins/xui/pt/role_actions.xml b/linden/indra/newview/skins/default/xui/pt/role_actions.xml
index 91ca2a4..91ca2a4 100644
--- a/linden/indra/newview/skins/xui/pt/role_actions.xml
+++ b/linden/indra/newview/skins/default/xui/pt/role_actions.xml
diff --git a/linden/indra/newview/skins/xui/pt/teleport_strings.xml b/linden/indra/newview/skins/default/xui/pt/teleport_strings.xml
index b3f1c39..b3f1c39 100644
--- a/linden/indra/newview/skins/xui/pt/teleport_strings.xml
+++ b/linden/indra/newview/skins/default/xui/pt/teleport_strings.xml
diff --git a/linden/indra/newview/skins/xui/pt/xui_version.xml b/linden/indra/newview/skins/default/xui/pt/xui_version.xml
index ee2a0be..ee2a0be 100644
--- a/linden/indra/newview/skins/xui/pt/xui_version.xml
+++ b/linden/indra/newview/skins/default/xui/pt/xui_version.xml
diff --git a/linden/indra/newview/skins/xui/zh/alerts.xml b/linden/indra/newview/skins/default/xui/zh/alerts.xml
index 5aaaafa..5aaaafa 100644
--- a/linden/indra/newview/skins/xui/zh/alerts.xml
+++ b/linden/indra/newview/skins/default/xui/zh/alerts.xml
diff --git a/linden/indra/newview/skins/xui/zh/floater_about.xml b/linden/indra/newview/skins/default/xui/zh/floater_about.xml
index a53e82f..a53e82f 100644
--- a/linden/indra/newview/skins/xui/zh/floater_about.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_about.xml
diff --git a/linden/indra/newview/skins/xui/zh/floater_about_land.xml b/linden/indra/newview/skins/default/xui/zh/floater_about_land.xml
index 63ac152..63ac152 100644
--- a/linden/indra/newview/skins/xui/zh/floater_about_land.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_about_land.xml
diff --git a/linden/indra/newview/skins/xui/zh/floater_account_history.xml b/linden/indra/newview/skins/default/xui/zh/floater_account_history.xml
index 00f1aeb..00f1aeb 100644
--- a/linden/indra/newview/skins/xui/zh/floater_account_history.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_account_history.xml
diff --git a/linden/indra/newview/skins/xui/zh/floater_animation_preview.xml b/linden/indra/newview/skins/default/xui/zh/floater_animation_preview.xml
index 4133242..4133242 100644
--- a/linden/indra/newview/skins/xui/zh/floater_animation_preview.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_animation_preview.xml
diff --git a/linden/indra/newview/skins/xui/zh/floater_auction.xml b/linden/indra/newview/skins/default/xui/zh/floater_auction.xml
index 79a24f4..79a24f4 100644
--- a/linden/indra/newview/skins/xui/zh/floater_auction.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_auction.xml
diff --git a/linden/indra/newview/skins/xui/zh/floater_avatar_picker.xml b/linden/indra/newview/skins/default/xui/zh/floater_avatar_picker.xml
index d6172f6..d6172f6 100644
--- a/linden/indra/newview/skins/xui/zh/floater_avatar_picker.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_avatar_picker.xml
diff --git a/linden/indra/newview/skins/xui/zh/floater_avatar_textures.xml b/linden/indra/newview/skins/default/xui/zh/floater_avatar_textures.xml
index bdb4e75..bdb4e75 100644
--- a/linden/indra/newview/skins/xui/zh/floater_avatar_textures.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_avatar_textures.xml
diff --git a/linden/indra/newview/skins/xui/zh/floater_build_options.xml b/linden/indra/newview/skins/default/xui/zh/floater_build_options.xml
index 64ada24..64ada24 100644
--- a/linden/indra/newview/skins/xui/zh/floater_build_options.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_build_options.xml
diff --git a/linden/indra/newview/skins/xui/zh/floater_bumps.xml b/linden/indra/newview/skins/default/xui/zh/floater_bumps.xml
index b4d265a..b4d265a 100644
--- a/linden/indra/newview/skins/xui/zh/floater_bumps.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_bumps.xml
diff --git a/linden/indra/newview/skins/xui/zh/floater_buy_contents.xml b/linden/indra/newview/skins/default/xui/zh/floater_buy_contents.xml
index 079f792..079f792 100644
--- a/linden/indra/newview/skins/xui/zh/floater_buy_contents.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_buy_contents.xml
diff --git a/linden/indra/newview/skins/xui/zh/floater_buy_currency.xml b/linden/indra/newview/skins/default/xui/zh/floater_buy_currency.xml
index bc8b13a..bc8b13a 100644
--- a/linden/indra/newview/skins/xui/zh/floater_buy_currency.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_buy_currency.xml
diff --git a/linden/indra/newview/skins/xui/zh/floater_buy_land.xml b/linden/indra/newview/skins/default/xui/zh/floater_buy_land.xml
index f7336aa..f7336aa 100644
--- a/linden/indra/newview/skins/xui/zh/floater_buy_land.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_buy_land.xml
diff --git a/linden/indra/newview/skins/xui/zh/floater_buy_object.xml b/linden/indra/newview/skins/default/xui/zh/floater_buy_object.xml
index 54c829d..54c829d 100644
--- a/linden/indra/newview/skins/xui/zh/floater_buy_object.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_buy_object.xml
diff --git a/linden/indra/newview/skins/xui/zh/floater_chat_history.xml b/linden/indra/newview/skins/default/xui/zh/floater_chat_history.xml
index cae2952..cae2952 100644
--- a/linden/indra/newview/skins/xui/zh/floater_chat_history.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_chat_history.xml
diff --git a/linden/indra/newview/skins/xui/zh/floater_choose_group.xml b/linden/indra/newview/skins/default/xui/zh/floater_choose_group.xml
index f43eddd..f43eddd 100644
--- a/linden/indra/newview/skins/xui/zh/floater_choose_group.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_choose_group.xml
diff --git a/linden/indra/newview/skins/xui/zh/floater_clothing.xml b/linden/indra/newview/skins/default/xui/zh/floater_clothing.xml
index 3572602..3572602 100644
--- a/linden/indra/newview/skins/xui/zh/floater_clothing.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_clothing.xml
diff --git a/linden/indra/newview/skins/xui/zh/floater_color_picker.xml b/linden/indra/newview/skins/default/xui/zh/floater_color_picker.xml
index b9e7b53..b9e7b53 100644
--- a/linden/indra/newview/skins/xui/zh/floater_color_picker.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_color_picker.xml
diff --git a/linden/indra/newview/skins/xui/zh/floater_critical.xml b/linden/indra/newview/skins/default/xui/zh/floater_critical.xml
index de628aa..de628aa 100644
--- a/linden/indra/newview/skins/xui/zh/floater_critical.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_critical.xml
diff --git a/linden/indra/newview/skins/xui/zh/floater_customize.xml b/linden/indra/newview/skins/default/xui/zh/floater_customize.xml
index e25f38f..e25f38f 100644
--- a/linden/indra/newview/skins/xui/zh/floater_customize.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_customize.xml
diff --git a/linden/indra/newview/skins/xui/zh/floater_directory.xml b/linden/indra/newview/skins/default/xui/zh/floater_directory.xml
index b5eb94b..b5eb94b 100644
--- a/linden/indra/newview/skins/xui/zh/floater_directory.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_directory.xml
diff --git a/linden/indra/newview/skins/xui/zh/floater_gesture.xml b/linden/indra/newview/skins/default/xui/zh/floater_gesture.xml
index 3473e35..3473e35 100644
--- a/linden/indra/newview/skins/xui/zh/floater_gesture.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_gesture.xml
diff --git a/linden/indra/newview/skins/xui/zh/floater_god_tools.xml b/linden/indra/newview/skins/default/xui/zh/floater_god_tools.xml
index 8f69431..8f69431 100644
--- a/linden/indra/newview/skins/xui/zh/floater_god_tools.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_god_tools.xml
diff --git a/linden/indra/newview/skins/xui/zh/floater_group_info.xml b/linden/indra/newview/skins/default/xui/zh/floater_group_info.xml
index 23687c8..23687c8 100644
--- a/linden/indra/newview/skins/xui/zh/floater_group_info.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_group_info.xml
diff --git a/linden/indra/newview/skins/xui/zh/floater_html.xml b/linden/indra/newview/skins/default/xui/zh/floater_html.xml
index 0232bdc..0232bdc 100644
--- a/linden/indra/newview/skins/xui/zh/floater_html.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_html.xml
diff --git a/linden/indra/newview/skins/xui/zh/floater_im.xml b/linden/indra/newview/skins/default/xui/zh/floater_im.xml
index 423e0ae..423e0ae 100644
--- a/linden/indra/newview/skins/xui/zh/floater_im.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_im.xml
diff --git a/linden/indra/newview/skins/xui/zh/floater_image_preview.xml b/linden/indra/newview/skins/default/xui/zh/floater_image_preview.xml
index e669ce0..e669ce0 100644
--- a/linden/indra/newview/skins/xui/zh/floater_image_preview.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_image_preview.xml
diff --git a/linden/indra/newview/skins/xui/zh/floater_import.xml b/linden/indra/newview/skins/default/xui/zh/floater_import.xml
index 87e9259..87e9259 100644
--- a/linden/indra/newview/skins/xui/zh/floater_import.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_import.xml
diff --git a/linden/indra/newview/skins/xui/zh/floater_inspect.xml b/linden/indra/newview/skins/default/xui/zh/floater_inspect.xml
index 2e98fd7..2e98fd7 100644
--- a/linden/indra/newview/skins/xui/zh/floater_inspect.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_inspect.xml
diff --git a/linden/indra/newview/skins/xui/zh/floater_instant_message.xml b/linden/indra/newview/skins/default/xui/zh/floater_instant_message.xml
index 038fa3d..038fa3d 100644
--- a/linden/indra/newview/skins/xui/zh/floater_instant_message.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_instant_message.xml
diff --git a/linden/indra/newview/skins/xui/zh/floater_inventory.xml b/linden/indra/newview/skins/default/xui/zh/floater_inventory.xml
index c231b5c..c231b5c 100644
--- a/linden/indra/newview/skins/xui/zh/floater_inventory.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_inventory.xml
diff --git a/linden/indra/newview/skins/xui/zh/floater_inventory_item_properties.xml b/linden/indra/newview/skins/default/xui/zh/floater_inventory_item_properties.xml
index 73ffedc..73ffedc 100644
--- a/linden/indra/newview/skins/xui/zh/floater_inventory_item_properties.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_inventory_item_properties.xml
diff --git a/linden/indra/newview/skins/xui/zh/floater_inventory_view_finder.xml b/linden/indra/newview/skins/default/xui/zh/floater_inventory_view_finder.xml
index 706933f..706933f 100644
--- a/linden/indra/newview/skins/xui/zh/floater_inventory_view_finder.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_inventory_view_finder.xml
diff --git a/linden/indra/newview/skins/xui/zh/floater_land_holdings.xml b/linden/indra/newview/skins/default/xui/zh/floater_land_holdings.xml
index 9d340ab..9d340ab 100644
--- a/linden/indra/newview/skins/xui/zh/floater_land_holdings.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_land_holdings.xml
diff --git a/linden/indra/newview/skins/xui/zh/floater_live_lsleditor.xml b/linden/indra/newview/skins/default/xui/zh/floater_live_lsleditor.xml
index b7527fc..b7527fc 100644
--- a/linden/indra/newview/skins/xui/zh/floater_live_lsleditor.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_live_lsleditor.xml
diff --git a/linden/indra/newview/skins/xui/zh/floater_moveview.xml b/linden/indra/newview/skins/default/xui/zh/floater_moveview.xml
index 4972c68..4972c68 100644
--- a/linden/indra/newview/skins/xui/zh/floater_moveview.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_moveview.xml
diff --git a/linden/indra/newview/skins/xui/zh/floater_mute.xml b/linden/indra/newview/skins/default/xui/zh/floater_mute.xml
index dba916e..dba916e 100644
--- a/linden/indra/newview/skins/xui/zh/floater_mute.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_mute.xml
diff --git a/linden/indra/newview/skins/xui/zh/floater_name_description.xml b/linden/indra/newview/skins/default/xui/zh/floater_name_description.xml
index 49039f0..49039f0 100644
--- a/linden/indra/newview/skins/xui/zh/floater_name_description.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_name_description.xml
diff --git a/linden/indra/newview/skins/xui/zh/floater_new_im.xml b/linden/indra/newview/skins/default/xui/zh/floater_new_im.xml
index a6b52de..a6b52de 100644
--- a/linden/indra/newview/skins/xui/zh/floater_new_im.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_new_im.xml
diff --git a/linden/indra/newview/skins/xui/zh/floater_new_outfit_dialog.xml b/linden/indra/newview/skins/default/xui/zh/floater_new_outfit_dialog.xml
index c7abad0..c7abad0 100644
--- a/linden/indra/newview/skins/xui/zh/floater_new_outfit_dialog.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_new_outfit_dialog.xml
diff --git a/linden/indra/newview/skins/xui/zh/floater_openobject.xml b/linden/indra/newview/skins/default/xui/zh/floater_openobject.xml
index 0ead435..0ead435 100644
--- a/linden/indra/newview/skins/xui/zh/floater_openobject.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_openobject.xml
diff --git a/linden/indra/newview/skins/xui/zh/floater_pay.xml b/linden/indra/newview/skins/default/xui/zh/floater_pay.xml
index d065349..d065349 100644
--- a/linden/indra/newview/skins/xui/zh/floater_pay.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_pay.xml
diff --git a/linden/indra/newview/skins/xui/zh/floater_pay_object.xml b/linden/indra/newview/skins/default/xui/zh/floater_pay_object.xml
index 956104f..956104f 100644
--- a/linden/indra/newview/skins/xui/zh/floater_pay_object.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_pay_object.xml
diff --git a/linden/indra/newview/skins/xui/zh/floater_postcard.xml b/linden/indra/newview/skins/default/xui/zh/floater_postcard.xml
index dc6df6f..dc6df6f 100644
--- a/linden/indra/newview/skins/xui/zh/floater_postcard.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_postcard.xml
diff --git a/linden/indra/newview/skins/xui/zh/floater_preferences.xml b/linden/indra/newview/skins/default/xui/zh/floater_preferences.xml
index 788e77c..788e77c 100644
--- a/linden/indra/newview/skins/xui/zh/floater_preferences.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_preferences.xml
diff --git a/linden/indra/newview/skins/xui/zh/floater_preview_animation.xml b/linden/indra/newview/skins/default/xui/zh/floater_preview_animation.xml
index 76f5e65..76f5e65 100644
--- a/linden/indra/newview/skins/xui/zh/floater_preview_animation.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_preview_animation.xml
diff --git a/linden/indra/newview/skins/xui/zh/floater_preview_embedded_texture.xml b/linden/indra/newview/skins/default/xui/zh/floater_preview_embedded_texture.xml
index 0cf530c..0cf530c 100644
--- a/linden/indra/newview/skins/xui/zh/floater_preview_embedded_texture.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_preview_embedded_texture.xml
diff --git a/linden/indra/newview/skins/xui/zh/floater_preview_existing_landmark.xml b/linden/indra/newview/skins/default/xui/zh/floater_preview_existing_landmark.xml
index 699b13d..699b13d 100644
--- a/linden/indra/newview/skins/xui/zh/floater_preview_existing_landmark.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_preview_existing_landmark.xml
diff --git a/linden/indra/newview/skins/xui/zh/floater_preview_gesture.xml b/linden/indra/newview/skins/default/xui/zh/floater_preview_gesture.xml
index 41b63d2..41b63d2 100644
--- a/linden/indra/newview/skins/xui/zh/floater_preview_gesture.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_preview_gesture.xml
diff --git a/linden/indra/newview/skins/xui/zh/floater_preview_notecard.xml b/linden/indra/newview/skins/default/xui/zh/floater_preview_notecard.xml
index feccac6..feccac6 100644
--- a/linden/indra/newview/skins/xui/zh/floater_preview_notecard.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_preview_notecard.xml
diff --git a/linden/indra/newview/skins/xui/zh/floater_preview_notecard_keep_discard.xml b/linden/indra/newview/skins/default/xui/zh/floater_preview_notecard_keep_discard.xml
index cfc961f..cfc961f 100644
--- a/linden/indra/newview/skins/xui/zh/floater_preview_notecard_keep_discard.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_preview_notecard_keep_discard.xml
diff --git a/linden/indra/newview/skins/xui/zh/floater_preview_sound.xml b/linden/indra/newview/skins/default/xui/zh/floater_preview_sound.xml
index 5721b42..5721b42 100644
--- a/linden/indra/newview/skins/xui/zh/floater_preview_sound.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_preview_sound.xml
diff --git a/linden/indra/newview/skins/xui/zh/floater_preview_texture.xml b/linden/indra/newview/skins/default/xui/zh/floater_preview_texture.xml
index a3b0711..a3b0711 100644
--- a/linden/indra/newview/skins/xui/zh/floater_preview_texture.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_preview_texture.xml
diff --git a/linden/indra/newview/skins/xui/zh/floater_preview_texture_keep_discard.xml b/linden/indra/newview/skins/default/xui/zh/floater_preview_texture_keep_discard.xml
index f4b74a9..f4b74a9 100644
--- a/linden/indra/newview/skins/xui/zh/floater_preview_texture_keep_discard.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_preview_texture_keep_discard.xml
diff --git a/linden/indra/newview/skins/xui/zh/floater_price_for_listing.xml b/linden/indra/newview/skins/default/xui/zh/floater_price_for_listing.xml
index 95658da..95658da 100644
--- a/linden/indra/newview/skins/xui/zh/floater_price_for_listing.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_price_for_listing.xml
diff --git a/linden/indra/newview/skins/xui/zh/floater_profile.xml b/linden/indra/newview/skins/default/xui/zh/floater_profile.xml
index 9937f32..9937f32 100644
--- a/linden/indra/newview/skins/xui/zh/floater_profile.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_profile.xml
diff --git a/linden/indra/newview/skins/xui/zh/floater_report_abuse.xml b/linden/indra/newview/skins/default/xui/zh/floater_report_abuse.xml
index f033d7f..f033d7f 100644
--- a/linden/indra/newview/skins/xui/zh/floater_report_abuse.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_report_abuse.xml
diff --git a/linden/indra/newview/skins/xui/zh/floater_report_bug.xml b/linden/indra/newview/skins/default/xui/zh/floater_report_bug.xml
index 65472d4..65472d4 100644
--- a/linden/indra/newview/skins/xui/zh/floater_report_bug.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_report_bug.xml
diff --git a/linden/indra/newview/skins/xui/zh/floater_script_debug.xml b/linden/indra/newview/skins/default/xui/zh/floater_script_debug.xml
index 0d40bd7..0d40bd7 100644
--- a/linden/indra/newview/skins/xui/zh/floater_script_debug.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_script_debug.xml
diff --git a/linden/indra/newview/skins/xui/zh/floater_script_ed_panel.xml b/linden/indra/newview/skins/default/xui/zh/floater_script_ed_panel.xml
index 2941882..2941882 100644
--- a/linden/indra/newview/skins/xui/zh/floater_script_ed_panel.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_script_ed_panel.xml
diff --git a/linden/indra/newview/skins/xui/zh/floater_script_preview.xml b/linden/indra/newview/skins/default/xui/zh/floater_script_preview.xml
index 47e7a30..47e7a30 100644
--- a/linden/indra/newview/skins/xui/zh/floater_script_preview.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_script_preview.xml
diff --git a/linden/indra/newview/skins/xui/zh/floater_script_queue.xml b/linden/indra/newview/skins/default/xui/zh/floater_script_queue.xml
index 19185e3..19185e3 100644
--- a/linden/indra/newview/skins/xui/zh/floater_script_queue.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_script_queue.xml
diff --git a/linden/indra/newview/skins/xui/zh/floater_script_search.xml b/linden/indra/newview/skins/default/xui/zh/floater_script_search.xml
index 25e71d7..25e71d7 100644
--- a/linden/indra/newview/skins/xui/zh/floater_script_search.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_script_search.xml
diff --git a/linden/indra/newview/skins/xui/zh/floater_sell_land.xml b/linden/indra/newview/skins/default/xui/zh/floater_sell_land.xml
index 08eff9b..08eff9b 100644
--- a/linden/indra/newview/skins/xui/zh/floater_sell_land.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_sell_land.xml
diff --git a/linden/indra/newview/skins/xui/zh/floater_settings_debug.xml b/linden/indra/newview/skins/default/xui/zh/floater_settings_debug.xml
index 6524191..6524191 100644
--- a/linden/indra/newview/skins/xui/zh/floater_settings_debug.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_settings_debug.xml
diff --git a/linden/indra/newview/skins/xui/zh/floater_snapshot.xml b/linden/indra/newview/skins/default/xui/zh/floater_snapshot.xml
index 3fd6971..3fd6971 100644
--- a/linden/indra/newview/skins/xui/zh/floater_snapshot.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_snapshot.xml
diff --git a/linden/indra/newview/skins/xui/zh/floater_sound_preview.xml b/linden/indra/newview/skins/default/xui/zh/floater_sound_preview.xml
index e5d0abf..e5d0abf 100644
--- a/linden/indra/newview/skins/xui/zh/floater_sound_preview.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_sound_preview.xml
diff --git a/linden/indra/newview/skins/xui/zh/floater_telehub.xml b/linden/indra/newview/skins/default/xui/zh/floater_telehub.xml
index 8381e5f..8381e5f 100644
--- a/linden/indra/newview/skins/xui/zh/floater_telehub.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_telehub.xml
diff --git a/linden/indra/newview/skins/xui/zh/floater_texture_ctrl.xml b/linden/indra/newview/skins/default/xui/zh/floater_texture_ctrl.xml
index 98c56cb..98c56cb 100644
--- a/linden/indra/newview/skins/xui/zh/floater_texture_ctrl.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_texture_ctrl.xml
diff --git a/linden/indra/newview/skins/xui/zh/floater_tools.xml b/linden/indra/newview/skins/default/xui/zh/floater_tools.xml
index d62802e..d62802e 100644
--- a/linden/indra/newview/skins/xui/zh/floater_tools.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_tools.xml
diff --git a/linden/indra/newview/skins/xui/zh/floater_top_objects.xml b/linden/indra/newview/skins/default/xui/zh/floater_top_objects.xml
index ad333a3..ad333a3 100644
--- a/linden/indra/newview/skins/xui/zh/floater_top_objects.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_top_objects.xml
diff --git a/linden/indra/newview/skins/xui/zh/floater_tos.xml b/linden/indra/newview/skins/default/xui/zh/floater_tos.xml
index 6395465..6395465 100644
--- a/linden/indra/newview/skins/xui/zh/floater_tos.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_tos.xml
diff --git a/linden/indra/newview/skins/xui/zh/floater_wearable_save_as.xml b/linden/indra/newview/skins/default/xui/zh/floater_wearable_save_as.xml
index 11db09a..11db09a 100644
--- a/linden/indra/newview/skins/xui/zh/floater_wearable_save_as.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_wearable_save_as.xml
diff --git a/linden/indra/newview/skins/xui/zh/floater_world_map.xml b/linden/indra/newview/skins/default/xui/zh/floater_world_map.xml
index 2e177e1..2e177e1 100644
--- a/linden/indra/newview/skins/xui/zh/floater_world_map.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_world_map.xml
diff --git a/linden/indra/newview/skins/xui/zh/menu_inventory.xml b/linden/indra/newview/skins/default/xui/zh/menu_inventory.xml
index 254a793..254a793 100644
--- a/linden/indra/newview/skins/xui/zh/menu_inventory.xml
+++ b/linden/indra/newview/skins/default/xui/zh/menu_inventory.xml
diff --git a/linden/indra/newview/skins/xui/zh/menu_pie_attachment.xml b/linden/indra/newview/skins/default/xui/zh/menu_pie_attachment.xml
index 2cc9788..2cc9788 100644
--- a/linden/indra/newview/skins/xui/zh/menu_pie_attachment.xml
+++ b/linden/indra/newview/skins/default/xui/zh/menu_pie_attachment.xml
diff --git a/linden/indra/newview/skins/xui/zh/menu_pie_avatar.xml b/linden/indra/newview/skins/default/xui/zh/menu_pie_avatar.xml
index 9b7e7f8..9b7e7f8 100644
--- a/linden/indra/newview/skins/xui/zh/menu_pie_avatar.xml
+++ b/linden/indra/newview/skins/default/xui/zh/menu_pie_avatar.xml
diff --git a/linden/indra/newview/skins/xui/zh/menu_pie_land.xml b/linden/indra/newview/skins/default/xui/zh/menu_pie_land.xml
index 02f215c..02f215c 100644
--- a/linden/indra/newview/skins/xui/zh/menu_pie_land.xml
+++ b/linden/indra/newview/skins/default/xui/zh/menu_pie_land.xml
diff --git a/linden/indra/newview/skins/xui/zh/menu_pie_object.xml b/linden/indra/newview/skins/default/xui/zh/menu_pie_object.xml
index af33cfa..af33cfa 100644
--- a/linden/indra/newview/skins/xui/zh/menu_pie_object.xml
+++ b/linden/indra/newview/skins/default/xui/zh/menu_pie_object.xml
diff --git a/linden/indra/newview/skins/xui/zh/menu_pie_self.xml b/linden/indra/newview/skins/default/xui/zh/menu_pie_self.xml
index 2c2eb82..2c2eb82 100644
--- a/linden/indra/newview/skins/xui/zh/menu_pie_self.xml
+++ b/linden/indra/newview/skins/default/xui/zh/menu_pie_self.xml
diff --git a/linden/indra/newview/skins/xui/zh/menu_viewer.xml b/linden/indra/newview/skins/default/xui/zh/menu_viewer.xml
index ea8610f..ea8610f 100644
--- a/linden/indra/newview/skins/xui/zh/menu_viewer.xml
+++ b/linden/indra/newview/skins/default/xui/zh/menu_viewer.xml
diff --git a/linden/indra/newview/skins/xui/zh/need_to_translate.xml b/linden/indra/newview/skins/default/xui/zh/need_to_translate.xml
index b10fab4..b10fab4 100644
--- a/linden/indra/newview/skins/xui/zh/need_to_translate.xml
+++ b/linden/indra/newview/skins/default/xui/zh/need_to_translate.xml
diff --git a/linden/indra/newview/skins/xui/zh/notify.xml b/linden/indra/newview/skins/default/xui/zh/notify.xml
index ad3940d..ad3940d 100644
--- a/linden/indra/newview/skins/xui/zh/notify.xml
+++ b/linden/indra/newview/skins/default/xui/zh/notify.xml
diff --git a/linden/indra/newview/skins/xui/zh/panel_account_details.xml b/linden/indra/newview/skins/default/xui/zh/panel_account_details.xml
index 2f4443a..2f4443a 100644
--- a/linden/indra/newview/skins/xui/zh/panel_account_details.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_account_details.xml
diff --git a/linden/indra/newview/skins/xui/zh/panel_account_planning.xml b/linden/indra/newview/skins/default/xui/zh/panel_account_planning.xml
index 9fb19a3..9fb19a3 100644
--- a/linden/indra/newview/skins/xui/zh/panel_account_planning.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_account_planning.xml
diff --git a/linden/indra/newview/skins/xui/zh/panel_account_transactions.xml b/linden/indra/newview/skins/default/xui/zh/panel_account_transactions.xml
index a169555..a169555 100644
--- a/linden/indra/newview/skins/xui/zh/panel_account_transactions.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_account_transactions.xml
diff --git a/linden/indra/newview/skins/xui/zh/panel_avatar.xml b/linden/indra/newview/skins/default/xui/zh/panel_avatar.xml
index db9599e..db9599e 100644
--- a/linden/indra/newview/skins/xui/zh/panel_avatar.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_avatar.xml
diff --git a/linden/indra/newview/skins/xui/zh/panel_avatar_classified.xml b/linden/indra/newview/skins/default/xui/zh/panel_avatar_classified.xml
index b9d6407..b9d6407 100644
--- a/linden/indra/newview/skins/xui/zh/panel_avatar_classified.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_avatar_classified.xml
diff --git a/linden/indra/newview/skins/xui/zh/panel_avatar_pick.xml b/linden/indra/newview/skins/default/xui/zh/panel_avatar_pick.xml
index d769eaf..d769eaf 100644
--- a/linden/indra/newview/skins/xui/zh/panel_avatar_pick.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_avatar_pick.xml
diff --git a/linden/indra/newview/skins/xui/zh/panel_chat_bar.xml b/linden/indra/newview/skins/default/xui/zh/panel_chat_bar.xml
index 8bf05df..8bf05df 100644
--- a/linden/indra/newview/skins/xui/zh/panel_chat_bar.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_chat_bar.xml
diff --git a/linden/indra/newview/skins/xui/zh/panel_classified.xml b/linden/indra/newview/skins/default/xui/zh/panel_classified.xml
index c03a7cc..c03a7cc 100644
--- a/linden/indra/newview/skins/xui/zh/panel_classified.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_classified.xml
diff --git a/linden/indra/newview/skins/xui/zh/panel_event.xml b/linden/indra/newview/skins/default/xui/zh/panel_event.xml
index 0d0f836..0d0f836 100644
--- a/linden/indra/newview/skins/xui/zh/panel_event.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_event.xml
diff --git a/linden/indra/newview/skins/xui/zh/panel_group.xml b/linden/indra/newview/skins/default/xui/zh/panel_group.xml
index de61853..de61853 100644
--- a/linden/indra/newview/skins/xui/zh/panel_group.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_group.xml
diff --git a/linden/indra/newview/skins/xui/zh/panel_group_finder.xml b/linden/indra/newview/skins/default/xui/zh/panel_group_finder.xml
index 332cb2d..332cb2d 100644
--- a/linden/indra/newview/skins/xui/zh/panel_group_finder.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_group_finder.xml
diff --git a/linden/indra/newview/skins/xui/zh/panel_group_general.xml b/linden/indra/newview/skins/default/xui/zh/panel_group_general.xml
index 92bd0bf..92bd0bf 100644
--- a/linden/indra/newview/skins/xui/zh/panel_group_general.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_group_general.xml
diff --git a/linden/indra/newview/skins/xui/zh/panel_group_invite.xml b/linden/indra/newview/skins/default/xui/zh/panel_group_invite.xml
index 45e8202..45e8202 100644
--- a/linden/indra/newview/skins/xui/zh/panel_group_invite.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_group_invite.xml
diff --git a/linden/indra/newview/skins/xui/zh/panel_group_land_money.xml b/linden/indra/newview/skins/default/xui/zh/panel_group_land_money.xml
index 626f845..626f845 100644
--- a/linden/indra/newview/skins/xui/zh/panel_group_land_money.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_group_land_money.xml
diff --git a/linden/indra/newview/skins/xui/zh/panel_group_notices.xml b/linden/indra/newview/skins/default/xui/zh/panel_group_notices.xml
index e6629cb..e6629cb 100644
--- a/linden/indra/newview/skins/xui/zh/panel_group_notices.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_group_notices.xml
diff --git a/linden/indra/newview/skins/xui/zh/panel_group_roles.xml b/linden/indra/newview/skins/default/xui/zh/panel_group_roles.xml
index 743b639..743b639 100644
--- a/linden/indra/newview/skins/xui/zh/panel_group_roles.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_group_roles.xml
diff --git a/linden/indra/newview/skins/xui/zh/panel_group_voting.xml b/linden/indra/newview/skins/default/xui/zh/panel_group_voting.xml
index 5763676..5763676 100644
--- a/linden/indra/newview/skins/xui/zh/panel_group_voting.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_group_voting.xml
diff --git a/linden/indra/newview/skins/xui/zh/panel_land_covenant.xml b/linden/indra/newview/skins/default/xui/zh/panel_land_covenant.xml
index fb44932..fb44932 100644
--- a/linden/indra/newview/skins/xui/zh/panel_land_covenant.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_land_covenant.xml
diff --git a/linden/indra/newview/skins/xui/zh/panel_login.xml b/linden/indra/newview/skins/default/xui/zh/panel_login.xml
index dc06531..dc06531 100644
--- a/linden/indra/newview/skins/xui/zh/panel_login.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_login.xml
diff --git a/linden/indra/newview/skins/xui/zh/panel_media_remote.xml b/linden/indra/newview/skins/default/xui/zh/panel_media_remote.xml
index 7c48ead..7c48ead 100644
--- a/linden/indra/newview/skins/xui/zh/panel_media_remote.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_media_remote.xml
diff --git a/linden/indra/newview/skins/xui/zh/panel_overlaybar.xml b/linden/indra/newview/skins/default/xui/zh/panel_overlaybar.xml
index 627206c..627206c 100644
--- a/linden/indra/newview/skins/xui/zh/panel_overlaybar.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_overlaybar.xml
diff --git a/linden/indra/newview/skins/xui/zh/panel_place.xml b/linden/indra/newview/skins/default/xui/zh/panel_place.xml
index 133d320..133d320 100644
--- a/linden/indra/newview/skins/xui/zh/panel_place.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_place.xml
diff --git a/linden/indra/newview/skins/xui/zh/panel_place_small.xml b/linden/indra/newview/skins/default/xui/zh/panel_place_small.xml
index 133d320..133d320 100644
--- a/linden/indra/newview/skins/xui/zh/panel_place_small.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_place_small.xml
diff --git a/linden/indra/newview/skins/xui/zh/panel_preferences_audio.xml b/linden/indra/newview/skins/default/xui/zh/panel_preferences_audio.xml
index ba8055c..ba8055c 100644
--- a/linden/indra/newview/skins/xui/zh/panel_preferences_audio.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_preferences_audio.xml
diff --git a/linden/indra/newview/skins/xui/zh/panel_preferences_chat.xml b/linden/indra/newview/skins/default/xui/zh/panel_preferences_chat.xml
index f62aec5..f62aec5 100644
--- a/linden/indra/newview/skins/xui/zh/panel_preferences_chat.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_preferences_chat.xml
diff --git a/linden/indra/newview/skins/xui/zh/panel_preferences_general.xml b/linden/indra/newview/skins/default/xui/zh/panel_preferences_general.xml
index 77460f2..77460f2 100644
--- a/linden/indra/newview/skins/xui/zh/panel_preferences_general.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_preferences_general.xml
diff --git a/linden/indra/newview/skins/xui/zh/panel_preferences_graphics1.xml b/linden/indra/newview/skins/default/xui/zh/panel_preferences_graphics1.xml
index ddaabdb..ddaabdb 100644
--- a/linden/indra/newview/skins/xui/zh/panel_preferences_graphics1.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_preferences_graphics1.xml
diff --git a/linden/indra/newview/skins/xui/zh/panel_preferences_im.xml b/linden/indra/newview/skins/default/xui/zh/panel_preferences_im.xml
index c41e004..c41e004 100644
--- a/linden/indra/newview/skins/xui/zh/panel_preferences_im.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_preferences_im.xml
diff --git a/linden/indra/newview/skins/xui/zh/panel_preferences_input.xml b/linden/indra/newview/skins/default/xui/zh/panel_preferences_input.xml
index d7d1d33..d7d1d33 100644
--- a/linden/indra/newview/skins/xui/zh/panel_preferences_input.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_preferences_input.xml
diff --git a/linden/indra/newview/skins/xui/zh/panel_preferences_network.xml b/linden/indra/newview/skins/default/xui/zh/panel_preferences_network.xml
index 0adb918..0adb918 100644
--- a/linden/indra/newview/skins/xui/zh/panel_preferences_network.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_preferences_network.xml
diff --git a/linden/indra/newview/skins/xui/zh/panel_preferences_popups.xml b/linden/indra/newview/skins/default/xui/zh/panel_preferences_popups.xml
index 0d674b9..0d674b9 100644
--- a/linden/indra/newview/skins/xui/zh/panel_preferences_popups.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_preferences_popups.xml
diff --git a/linden/indra/newview/skins/xui/zh/panel_region_covenant.xml b/linden/indra/newview/skins/default/xui/zh/panel_region_covenant.xml
index 54fc8a9..54fc8a9 100644
--- a/linden/indra/newview/skins/xui/zh/panel_region_covenant.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_region_covenant.xml
diff --git a/linden/indra/newview/skins/xui/zh/panel_region_debug.xml b/linden/indra/newview/skins/default/xui/zh/panel_region_debug.xml
index 31e0672..31e0672 100644
--- a/linden/indra/newview/skins/xui/zh/panel_region_debug.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_region_debug.xml
diff --git a/linden/indra/newview/skins/xui/zh/panel_region_estate.xml b/linden/indra/newview/skins/default/xui/zh/panel_region_estate.xml
index e09603b..e09603b 100644
--- a/linden/indra/newview/skins/xui/zh/panel_region_estate.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_region_estate.xml
diff --git a/linden/indra/newview/skins/xui/zh/panel_region_general.xml b/linden/indra/newview/skins/default/xui/zh/panel_region_general.xml
index 0439f12..0439f12 100644
--- a/linden/indra/newview/skins/xui/zh/panel_region_general.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_region_general.xml
diff --git a/linden/indra/newview/skins/xui/zh/panel_region_terrain.xml b/linden/indra/newview/skins/default/xui/zh/panel_region_terrain.xml
index 3f6a408..3f6a408 100644
--- a/linden/indra/newview/skins/xui/zh/panel_region_terrain.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_region_terrain.xml
diff --git a/linden/indra/newview/skins/xui/zh/panel_region_texture.xml b/linden/indra/newview/skins/default/xui/zh/panel_region_texture.xml
index 93c86cb..93c86cb 100644
--- a/linden/indra/newview/skins/xui/zh/panel_region_texture.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_region_texture.xml
diff --git a/linden/indra/newview/skins/xui/zh/panel_scrolling_param.xml b/linden/indra/newview/skins/default/xui/zh/panel_scrolling_param.xml
index 12585b0..12585b0 100644
--- a/linden/indra/newview/skins/xui/zh/panel_scrolling_param.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_scrolling_param.xml
diff --git a/linden/indra/newview/skins/xui/zh/panel_status_bar.xml b/linden/indra/newview/skins/default/xui/zh/panel_status_bar.xml
index cb5493c..cb5493c 100644
--- a/linden/indra/newview/skins/xui/zh/panel_status_bar.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_status_bar.xml
diff --git a/linden/indra/newview/skins/xui/zh/panel_toolbar.xml b/linden/indra/newview/skins/default/xui/zh/panel_toolbar.xml
index 74f8128..74f8128 100644
--- a/linden/indra/newview/skins/xui/zh/panel_toolbar.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_toolbar.xml
diff --git a/linden/indra/newview/skins/xui/zh/panel_top_pick.xml b/linden/indra/newview/skins/default/xui/zh/panel_top_pick.xml
index 70c4278..70c4278 100644
--- a/linden/indra/newview/skins/xui/zh/panel_top_pick.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_top_pick.xml
diff --git a/linden/indra/newview/skins/xui/zh/role_actions.xml b/linden/indra/newview/skins/default/xui/zh/role_actions.xml
index 9f6f957..9f6f957 100644
--- a/linden/indra/newview/skins/xui/zh/role_actions.xml
+++ b/linden/indra/newview/skins/default/xui/zh/role_actions.xml
diff --git a/linden/indra/newview/skins/xui/zh/strings.xml b/linden/indra/newview/skins/default/xui/zh/strings.xml
index b262393..b262393 100644
--- a/linden/indra/newview/skins/xui/zh/strings.xml
+++ b/linden/indra/newview/skins/default/xui/zh/strings.xml
diff --git a/linden/indra/newview/skins/xui/zh/strings_long.xml b/linden/indra/newview/skins/default/xui/zh/strings_long.xml
index b262393..b262393 100644
--- a/linden/indra/newview/skins/xui/zh/strings_long.xml
+++ b/linden/indra/newview/skins/default/xui/zh/strings_long.xml
diff --git a/linden/indra/newview/skins/xui/zh/xui_version.xml b/linden/indra/newview/skins/default/xui/zh/xui_version.xml
index ee2a0be..ee2a0be 100644
--- a/linden/indra/newview/skins/xui/zh/xui_version.xml
+++ b/linden/indra/newview/skins/default/xui/zh/xui_version.xml
diff --git a/linden/indra/newview/skins/paths.xml b/linden/indra/newview/skins/paths.xml
index fb6f4a1..949cc14 100644
--- a/linden/indra/newview/skins/paths.xml
+++ b/linden/indra/newview/skins/paths.xml
@@ -1,4 +1,4 @@
 <paths>
-        <directory>/skins/xui/en-us/</directory>
-        <directory>/skins/xui/[Language]/</directory>
+        <directory>xui/en-us</directory>
+        <directory>xui/[LANGUAGE]</directory>
 </paths>
\ No newline at end of file
diff --git a/linden/indra/newview/skins/silver/colors.xml b/linden/indra/newview/skins/silver/colors.xml
new file mode 100644
index 0000000..71a7787
--- /dev/null
+++ b/linden/indra/newview/skins/silver/colors.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>

+<settings version = "101">

+</settings>

diff --git a/linden/indra/newview/app_settings/colors_base.xml b/linden/indra/newview/skins/silver/colors_base.xml
index 0da10ab..8d8117a 100644
--- a/linden/indra/newview/app_settings/colors_base.xml
+++ b/linden/indra/newview/skins/silver/colors_base.xml
@@ -1,187 +1,187 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<settings version = "101">
-
-<!-- WINDOWS -->
-<TitleBarFocusColor value="50, 115, 185, 120" />        <!-- Focused window title bar highlight, no equivalent for unfocused windows -->
-<FloaterFocusBorderColor value="50, 115, 185, 75" />
-<FloaterUnfocusBorderColor value="110, 110, 110, 60" />
-<FocusBackgroundColor value="165, 180, 200, 245" />     <!-- Background color of focused floaters -->
-<DefaultBackgroundColor value="165, 180, 200, 128" />   <!-- Background color for unfocused floaters -->
-<ColorDropShadow value="0, 0, 0, 200" />                <!-- The drop shadow behind windows and menus -->
-<DefaultHighlightDark value="50, 115, 185, 255" />
-<DefaultHighlightLight value="50, 115, 185, 255" />
-<DefaultShadowDark value="50, 115, 185, 255" />
-<DefaultShadowLight value="50, 115, 185, 255" />
-
-<!-- LABELS -->
-<LabelDisabledColor value="0, 30, 60, 128" />
-<LabelSelectedColor value="255, 255, 255, 255" />
-<LabelSelectedDisabledColor value="164, 190, 237, 128" />
-<LabelTextColor value="0, 30, 60, 255" />
-
-<!-- LOGIN -->
-<LoginProgressBarBgColor value="255, 255, 255, 255" />
-<LoginProgressBarFgColor value="255, 255, 255, 255" />
-<LoginProgressBoxBorderColor value="0, 30, 60, 0" />
-<LoginProgressBoxCenterColor value="0, 0, 0, 200" />
-<LoginProgressBoxShadowColor value="0, 0, 0, 200" />
-<LoginProgressBoxTextColor value="255, 255, 255, 255"/>
-
-<!-- BUTTONS -->
-<ButtonLabelColor value="0, 30, 60, 255" />             <!-- Text labels for buttons, like the "OK" text -->
-<ButtonLabelSelectedColor value="255, 255, 255, 255" />
-<ButtonLabelDisabledColor value="0, 30, 60, 128" />
-<ButtonLabelSelectedDisabledColor value="0, 30, 60, 128" />
-<ButtonSelectedBgColor value="62, 62, 62, 255" />
-<ButtonSelectedColor value="255, 255, 255, 255" />
-<ButtonUnselectedBgColor value="62, 62, 62, 255" />
-<ButtonUnselectedFgColor value="255, 255, 255, 255" />
-<ButtonBorderColor value="239, 156, 0, 255" />
-<ButtonColor value="255, 255, 255, 255" />              <!-- Blended with button art, usually left as opaque white -->
-<ButtonImageColor value="255, 255, 255, 255" />         <!-- Blended with button art, usually left as opaque white -->
-
-<!-- SLIDERS -->
-<SliderDisabledThumbColor value="0, 0, 0, 255" />
-<SliderThumbCenterColor value="255, 255, 255, 255" />
-<SliderThumbOutlineColor value="37, 64, 99, 255" />
-<SliderTrackColor value="37, 64, 99, 255" />
-
-<!-- TEXTFIELDS -->
-<TextBgFocusColor value="255, 255, 255, 255" />         <!-- Text field background when receiving input (focused) -->
-<TextBgReadOnlyColor value="255, 255, 255, 140" />      <!-- Text field background when read-only -->
-<TextBgWriteableColor value="255, 255, 255, 255" />     <!-- Text field background when not receiving input (unfocused) -->
-<TextCursorColor value="0, 0, 0, 255" />
-<TextFgColor value="45, 48, 45, 255" />
-<TextFgReadOnlyColor value="0, 0, 0, 200" />
-<TextFgTentativeColor value="0, 0, 0, 128" />
-<TextEmbeddedItemReadOnlyColor value="58, 147, 242, 255" />     <!-- i.e. About Land name that you don't own -->
-<TextEmbeddedItemColor value="0, 0, 128, 255" />
-<TextDefaultColor value="0, 20, 0, 255"/>
-  
-<!-- LISTBOXES -->
-<ScrollBgReadOnlyColor value="255, 255, 255, 140" />
-<ScrollBgWriteableColor value="255, 255, 255, 140" />
-<ScrollBGStripeColor value="145, 180, 220, 60" />
-<ScrollDisabledColor value="128, 128, 128, 204" />
-<ScrollSelectedBGColor value="50, 115, 185, 150" />
-<ScrollSelectedFGColor value="0, 30, 60, 255" />        <!-- Text color -->
-<ScrollUnselectedColor value="0, 30, 60, 255" />        <!-- Text color -->
-<ScrollHighlightedColor value="145, 180, 220, 128" />   <!-- Hover color -->
-<ScrollbarThumbColor value="120, 160, 200, 255" />
-<ScrollbarTrackColor value="183, 202, 220, 255" />
-
-<!-- MENUS -->
-<MenuBarBgColor value="185, 200, 220, 230" />
-<MenuBarGodBgColor value="100, 200, 130, 230" />
-<MenuNonProductionGodBgColor value="100, 200, 130, 230" />
-<MenuNonProductionBgColor value="230, 70, 70, 230" />
-<MenuDefaultBgColor value="210, 220, 230, 245" />
-<MenuItemDisabledColor value="0, 30, 60, 128" />        <!-- Menu text color; also text color for pie menus and treeviews (like Inventory) -->
-<MenuItemEnabledColor value="0, 30, 60, 255" />         <!-- Menu text color; also text color for pie menus and treeviews (like Inventory) -->
-<MenuItemHighlightBgColor value="50, 115, 185, 100" />
-<MenuItemHighlightFgColor value="0, 30, 60, 255" />     <!-- Highlighted menu text color; also treeview node selection highlight -->
-<MenuPopupBgColor value="197, 217, 234, 240" />
-
-<!--  PIE MENUS -->
-<PieMenuBgColor value="118, 156, 201, 230" />
-<PieMenuLineColor value="255, 255, 255, 60" />
-<PieMenuSelectedColor value="185, 200, 220, 120" />
-
-<!-- TOOLTIPS -->
-<ToolTipBgColor value="250, 255, 225, 230" />
-<ToolTipBorderColor value="171, 212, 245, 255" />
-<ToolTipTextColor value="0, 0, 0, 255" />
-
-<!-- NOTIFICATION POP-UPS -->
-<NotifyBoxColor value="170, 210, 255, 240" />
-<NotifyTextColor value="0, 30, 60, 255" />
-<NotifyCautionBoxColor value="254, 209, 118, 255" />    <!-- the background color of caution permissions prompts -->
-<NotifyCautionWarnColor value="0, 0, 0, 255" />         <!-- the foreground color of the special title text in caution permissions prompts -->
-<GroupNotifyBoxColor value="170, 210, 255, 240" />
-<GroupNotifyTextColor value="0, 30, 60, 255" />
-
-<!-- CHAT AND IM HISTORY TEXTBOX COLORS -->
-<ChatHistoryBgColor value="0, 30, 80, 200" />
-<ChatHistoryTextColor value="255, 255, 255, 255" />
-<IMHistoryBgColor value="0, 30, 80, 200" />
-<IMHistoryTextColor value="255, 255, 255, 255" />
-
-<!-- IN-WORLD SELECTION -->
-<SilhouetteParentColor value="255, 255, 0, 255" />
-<SilhouetteChildColor value="32, 106, 196, 255" />
-<HighlightParentColor value="171, 212, 245, 255" />
-<HighlightChildColor value="171, 212, 245, 255" />
-<HighlightInspectColor value="255, 0, 255, 255" />
-
-<!-- EDIT MODE GRID -->
-<GridFocusPointColor value="255, 255, 255, 128" />
-<GridlineColor value="255, 255, 255, 255" />
-<GridlineBGColor value="235, 235, 255, 200" />
-<GridlineShadowColor value="0, 0, 0, 80" />
-
-<!-- PROPERTY LINES -->
-<PropertyColorAvail value="0, 0, 0, 0" />
-<PropertyColorGroup value="0, 184, 184, 102" />
-<PropertyColorOther value="255, 0, 0, 102" />
-<PropertyColorSelf value="0, 255, 0, 102" />
-<PropertyColorForSale value="255, 128, 0, 102" />
-<PropertyColorAuction value="128, 0, 255, 102" />       <!-- Match the color on the world map -->
-
-<!-- Icon Enable/Disable -->
-<IconEnabledColor value="255, 255, 255, 255"/>
-<IconDisabledColor value="147, 169, 213, 200"/>
-
-<!-- MINI-MAP -->
-<NetMapBackgroundColor value="0, 0, 0, 77" />
-<NetMapYouOwnAboveWater value="0, 255, 255, 255" />
-<NetMapYouOwnBelowWater value="0, 200, 200, 255" />
-<NetMapGroupOwnAboveWater value="255, 0, 255, 255" />
-<NetMapGroupOwnBelowWater value="200, 0, 200, 255" />
-<NetMapOtherOwnAboveWater value="60, 60, 60, 255" />
-<NetMapOtherOwnBelowWater value="30, 30, 30, 255" />
-
-<!-- HELP WINDOW -->
-<HelpBgColor value="200, 209, 204, 255" />
-<HelpFgColor value="0, 0, 0, 255" />
-<HelpScrollTrackColor value="0, 0, 0, 255" />
-<HelpScrollThumbColor value="255, 255, 255, 255" />
-<HelpScrollHighlightColor value="115, 132, 155, 255" />
-<HelpScrollShadowColor value="0, 0, 0, 255" />
-
-<!-- MISC -->
-<AvatarNameColor value="251, 175, 93, 255" />           <!-- Text color of avatar nametags -->
-<FocusColor value="239, 156, 0, 255" />                 <!-- Color of the glow around UI controls with keyboard focus -->
-<FloaterButtonImageColor value="255, 255, 255, 255" />  <!-- The floater buttons (like the close box) are white images that receive this color. -->
-<ButtonCautionImageColor value="255, 255,  255, 255" /> <!-- Match the caution dialog buttons to the default -->
-<HealthTextColor value="255, 255, 255, 255" />
-<MapAutopilotColor value="255, 128, 0, 255" />
-<ContextSilhouetteColor value="239, 156, 0, 255" />     <!-- For "context" highlighting, i.e. pie menu -->
-<ScriptBgReadOnlyColor value="180, 180, 180, 255" />
-<ParcelTextColor value="40, 40, 90, 255" />             <!-- Parcel name on menu bar, normal state -->
-<ParcelHoverColor value="70, 70, 100, 255" />           <!-- Parcel name on menu bar, hover state -->
-<TimeTextColor value="0, 30, 60, 255" />                <!-- SL Time on menu bar -->
-<BalanceTextColor value="0, 100, 40, 255" />            <!-- Linden dollar balance on menu bar -->
-<HealthTextColor value="110, 15, 15, 255" />            <!-- Damage meter text on menu bar -->
-<GroupOverTierColor value="110, 15, 15, 255" />         <!-- Warning text in Group Info window -->
-<FilterBackgroundColor value="75, 75, 150, 180" /> <!-- Matching region of Inventory search text -->
-<FilterTextColor value="255, 200, 70, 255" />
-<InventoryItemSuffixColor value="120, 70, 55, 255"/>
-<InventorySearchStatusColor value="0, 0, 0, 255" />
-<ConsoleBackground value="0, 0, 0, 255" />
-<FolderViewLoadingMessageTextColor value="240, 165, 90, 255"/>
-<InventoryBackgroundColor value="255, 255, 255, 80"/>
-
- <!-- Alert box colors -->
-<AlertBoxColor value="165, 180, 200, 245"/>
-<AlertTextColor value="0, 30, 60, 255"/>
-<AlertCautionBoxColor value="254, 209, 118, 255"/>      <!-- Background color of caution alerts -->
-<AlertCautionTextColor value="0, 0, 0, 255"/>           <!-- Foreground color of the special title text in caution alerts -->
-
-<!--  Multi sliders, as in the sky animation setting -->
-<MultiSliderDisabledThumbColor value="0, 0, 0, 255"/>
-<MultiSliderThumbCenterColor value="183, 184, 188, 255"/>
-<MultiSliderThumbOutlineColor value="0, 0, 0, 255"/>
-<MultiSliderTrackColor value="30, 30, 30, 255"/>
-<MultiSliderThumbCenterSelectedColor value="255, 50, 50, 255"/>
-<MultiSliderTriangleColor value="255, 255, 50, 255"/>
-</settings>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>

+<settings version = "101">

+

+<!-- WINDOWS -->

+<TitleBarFocusColor value="50, 115, 185, 120" />        <!-- Focused window title bar highlight, no equivalent for unfocused windows -->

+<FloaterFocusBorderColor value="50, 115, 185, 75" />

+<FloaterUnfocusBorderColor value="110, 110, 110, 60" />

+<FocusBackgroundColor value="165, 180, 200, 245" />     <!-- Background color of focused floaters -->

+<DefaultBackgroundColor value="165, 180, 200, 128" />   <!-- Background color for unfocused floaters -->

+<ColorDropShadow value="0, 0, 0, 200" />                <!-- The drop shadow behind windows and menus -->

+<DefaultHighlightDark value="50, 115, 185, 255" />

+<DefaultHighlightLight value="50, 115, 185, 255" />

+<DefaultShadowDark value="50, 115, 185, 255" />

+<DefaultShadowLight value="50, 115, 185, 255" />

+

+<!-- LABELS -->

+<LabelDisabledColor value="0, 30, 60, 128" />

+<LabelSelectedColor value="255, 255, 255, 255" />

+<LabelSelectedDisabledColor value="164, 190, 237, 128" />

+<LabelTextColor value="0, 30, 60, 255" />

+

+<!-- LOGIN -->

+<LoginProgressBarBgColor value="255, 255, 255, 255" />

+<LoginProgressBarFgColor value="255, 255, 255, 255" />

+<LoginProgressBoxBorderColor value="0, 30, 60, 0" />

+<LoginProgressBoxCenterColor value="0, 0, 0, 200" />

+<LoginProgressBoxShadowColor value="0, 0, 0, 200" />

+<LoginProgressBoxTextColor value="255, 255, 255, 255"/>

+

+<!-- BUTTONS -->

+<ButtonLabelColor value="0, 30, 60, 255" />             <!-- Text labels for buttons, like the "OK" text -->

+<ButtonLabelSelectedColor value="255, 255, 255, 255" />

+<ButtonLabelDisabledColor value="0, 30, 60, 128" />

+<ButtonLabelSelectedDisabledColor value="0, 30, 60, 128" />

+<ButtonSelectedBgColor value="62, 62, 62, 255" />

+<ButtonSelectedColor value="255, 255, 255, 255" />

+<ButtonUnselectedBgColor value="62, 62, 62, 255" />

+<ButtonUnselectedFgColor value="255, 255, 255, 255" />

+<ButtonBorderColor value="239, 156, 0, 255" />

+<ButtonColor value="255, 255, 255, 255" />              <!-- Blended with button art, usually left as opaque white -->

+<ButtonImageColor value="255, 255, 255, 255" />         <!-- Blended with button art, usually left as opaque white -->

+

+<!-- SLIDERS -->

+<SliderDisabledThumbColor value="0, 0, 0, 255" />

+<SliderThumbCenterColor value="255, 255, 255, 255" />

+<SliderThumbOutlineColor value="37, 64, 99, 255" />

+<SliderTrackColor value="37, 64, 99, 255" />

+

+<!-- TEXTFIELDS -->

+<TextBgFocusColor value="255, 255, 255, 255" />         <!-- Text field background when receiving input (focused) -->

+<TextBgReadOnlyColor value="255, 255, 255, 140" />      <!-- Text field background when read-only -->

+<TextBgWriteableColor value="255, 255, 255, 255" />     <!-- Text field background when not receiving input (unfocused) -->

+<TextCursorColor value="0, 0, 0, 255" />

+<TextFgColor value="45, 48, 45, 255" />

+<TextFgReadOnlyColor value="0, 0, 0, 200" />

+<TextFgTentativeColor value="0, 0, 0, 128" />

+<TextEmbeddedItemReadOnlyColor value="58, 147, 242, 255" />     <!-- i.e. About Land name that you don't own -->

+<TextEmbeddedItemColor value="0, 0, 128, 255" />

+<TextDefaultColor value="0, 20, 0, 255"/>

+  

+<!-- LISTBOXES -->

+<ScrollBgReadOnlyColor value="255, 255, 255, 140" />

+<ScrollBgWriteableColor value="255, 255, 255, 140" />

+<ScrollBGStripeColor value="145, 180, 220, 60" />

+<ScrollDisabledColor value="128, 128, 128, 204" />

+<ScrollSelectedBGColor value="50, 115, 185, 150" />

+<ScrollSelectedFGColor value="0, 30, 60, 255" />        <!-- Text color -->

+<ScrollUnselectedColor value="0, 30, 60, 255" />        <!-- Text color -->

+<ScrollHighlightedColor value="145, 180, 220, 128" />   <!-- Hover color -->

+<ScrollbarThumbColor value="120, 160, 200, 255" />

+<ScrollbarTrackColor value="183, 202, 220, 255" />

+

+<!-- MENUS -->

+<MenuBarBgColor value="185, 200, 220, 230" />

+<MenuBarGodBgColor value="100, 200, 130, 230" />

+<MenuNonProductionGodBgColor value="100, 200, 130, 230" />

+<MenuNonProductionBgColor value="230, 70, 70, 230" />

+<MenuDefaultBgColor value="210, 220, 230, 245" />

+<MenuItemDisabledColor value="0, 30, 60, 128" />        <!-- Menu text color; also text color for pie menus and treeviews (like Inventory) -->

+<MenuItemEnabledColor value="0, 30, 60, 255" />         <!-- Menu text color; also text color for pie menus and treeviews (like Inventory) -->

+<MenuItemHighlightBgColor value="50, 115, 185, 100" />

+<MenuItemHighlightFgColor value="0, 30, 60, 255" />     <!-- Highlighted menu text color; also treeview node selection highlight -->

+<MenuPopupBgColor value="197, 217, 234, 240" />

+

+<!--  PIE MENUS -->

+<PieMenuBgColor value="118, 156, 201, 230" />

+<PieMenuLineColor value="255, 255, 255, 60" />

+<PieMenuSelectedColor value="185, 200, 220, 120" />

+

+<!-- TOOLTIPS -->

+<ToolTipBgColor value="250, 255, 225, 230" />

+<ToolTipBorderColor value="171, 212, 245, 255" />

+<ToolTipTextColor value="0, 0, 0, 255" />

+

+<!-- NOTIFICATION POP-UPS -->

+<NotifyBoxColor value="170, 210, 255, 240" />

+<NotifyTextColor value="0, 30, 60, 255" />

+<NotifyCautionBoxColor value="254, 209, 118, 255" />    <!-- the background color of caution permissions prompts -->

+<NotifyCautionWarnColor value="0, 0, 0, 255" />         <!-- the foreground color of the special title text in caution permissions prompts -->

+<GroupNotifyBoxColor value="170, 210, 255, 240" />

+<GroupNotifyTextColor value="0, 30, 60, 255" />

+

+<!-- CHAT AND IM HISTORY TEXTBOX COLORS -->

+<ChatHistoryBgColor value="0, 30, 80, 200" />

+<ChatHistoryTextColor value="255, 255, 255, 255" />

+<IMHistoryBgColor value="0, 30, 80, 200" />

+<IMHistoryTextColor value="255, 255, 255, 255" />

+

+<!-- IN-WORLD SELECTION -->

+<SilhouetteParentColor value="255, 255, 0, 255" />

+<SilhouetteChildColor value="32, 106, 196, 255" />

+<HighlightParentColor value="171, 212, 245, 255" />

+<HighlightChildColor value="171, 212, 245, 255" />

+<HighlightInspectColor value="255, 0, 255, 255" />

+

+<!-- EDIT MODE GRID -->

+<GridFocusPointColor value="255, 255, 255, 128" />

+<GridlineColor value="255, 255, 255, 255" />

+<GridlineBGColor value="235, 235, 255, 200" />

+<GridlineShadowColor value="0, 0, 0, 80" />

+

+<!-- PROPERTY LINES -->

+<PropertyColorAvail value="0, 0, 0, 0" />

+<PropertyColorGroup value="0, 184, 184, 102" />

+<PropertyColorOther value="255, 0, 0, 102" />

+<PropertyColorSelf value="0, 255, 0, 102" />

+<PropertyColorForSale value="255, 128, 0, 102" />

+<PropertyColorAuction value="128, 0, 255, 102" />       <!-- Match the color on the world map -->

+

+<!-- Icon Enable/Disable -->

+<IconEnabledColor value="255, 255, 255, 255"/>

+<IconDisabledColor value="147, 169, 213, 200"/>

+

+<!-- MINI-MAP -->

+<NetMapBackgroundColor value="0, 0, 0, 77" />

+<NetMapYouOwnAboveWater value="0, 255, 255, 255" />

+<NetMapYouOwnBelowWater value="0, 200, 200, 255" />

+<NetMapGroupOwnAboveWater value="255, 0, 255, 255" />

+<NetMapGroupOwnBelowWater value="200, 0, 200, 255" />

+<NetMapOtherOwnAboveWater value="60, 60, 60, 255" />

+<NetMapOtherOwnBelowWater value="30, 30, 30, 255" />

+

+<!-- HELP WINDOW -->

+<HelpBgColor value="200, 209, 204, 255" />

+<HelpFgColor value="0, 0, 0, 255" />

+<HelpScrollTrackColor value="0, 0, 0, 255" />

+<HelpScrollThumbColor value="255, 255, 255, 255" />

+<HelpScrollHighlightColor value="115, 132, 155, 255" />

+<HelpScrollShadowColor value="0, 0, 0, 255" />

+

+<!-- MISC -->

+<AvatarNameColor value="251, 175, 93, 255" />           <!-- Text color of avatar nametags -->

+<FocusColor value="239, 156, 0, 255" />                 <!-- Color of the glow around UI controls with keyboard focus -->

+<FloaterButtonImageColor value="255, 255, 255, 255" />  <!-- The floater buttons (like the close box) are white images that receive this color. -->

+<ButtonCautionImageColor value="255, 255,  255, 255" /> <!-- Match the caution dialog buttons to the default -->

+<HealthTextColor value="255, 255, 255, 255" />

+<MapAutopilotColor value="255, 128, 0, 255" />

+<ContextSilhouetteColor value="239, 156, 0, 255" />     <!-- For "context" highlighting, i.e. pie menu -->

+<ScriptBgReadOnlyColor value="180, 180, 180, 255" />

+<ParcelTextColor value="40, 40, 90, 255" />             <!-- Parcel name on menu bar, normal state -->

+<ParcelHoverColor value="70, 70, 100, 255" />           <!-- Parcel name on menu bar, hover state -->

+<TimeTextColor value="0, 30, 60, 255" />                <!-- SL Time on menu bar -->

+<BalanceTextColor value="0, 100, 40, 255" />            <!-- Linden dollar balance on menu bar -->

+<HealthTextColor value="110, 15, 15, 255" />            <!-- Damage meter text on menu bar -->

+<GroupOverTierColor value="110, 15, 15, 255" />         <!-- Warning text in Group Info window -->

+<FilterBackgroundColor value="75, 75, 150, 180" /> <!-- Matching region of Inventory search text -->

+<FilterTextColor value="255, 200, 70, 255" />

+<InventoryItemSuffixColor value="120, 70, 55, 255"/>

+<InventorySearchStatusColor value="0, 0, 0, 255" />

+<ConsoleBackground value="0, 0, 0, 255" />

+<FolderViewLoadingMessageTextColor value="240, 165, 90, 255"/>

+<InventoryBackgroundColor value="255, 255, 255, 80"/>

+

+ <!-- Alert box colors -->

+<AlertBoxColor value="165, 180, 200, 245"/>

+<AlertTextColor value="0, 30, 60, 255"/>

+<AlertCautionBoxColor value="254, 209, 118, 255"/>      <!-- Background color of caution alerts -->

+<AlertCautionTextColor value="0, 0, 0, 255"/>           <!-- Foreground color of the special title text in caution alerts -->

+

+<!--  Multi sliders, as in the sky animation setting -->

+<MultiSliderDisabledThumbColor value="0, 0, 0, 255"/>

+<MultiSliderThumbCenterColor value="183, 184, 188, 255"/>

+<MultiSliderThumbOutlineColor value="0, 0, 0, 255"/>

+<MultiSliderTrackColor value="30, 30, 30, 255"/>

+<MultiSliderThumbCenterSelectedColor value="255, 50, 50, 255"/>

+<MultiSliderTriangleColor value="255, 255, 50, 255"/>

+</settings>

diff --git a/linden/indra/newview/skins/silver/textures/textures.xml b/linden/indra/newview/skins/silver/textures/textures.xml
new file mode 100644
index 0000000..c5b4c5c
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/textures.xml
@@ -0,0 +1,25 @@
+<textures version="101">

+  <texture name="button_disabled_32x128.tga" preload="true" scale_left="8" scale_top="16" scale_right="120" scale_bottom="8"/>

+  <texture name="button_enabled_32x128.tga" preload="true" scale_left="8" scale_top="16" scale_right="120" scale_bottom="8"/>

+  <texture name="toolbar_btn_enabled.tga" scale_left="26" scale_top="24" scale_right="102" scale_bottom="0" />

+

+  <texture name="progressbar_fill.tga" preload="true" scale_left="4" scale_top="7" scale_right="71" scale_bottom="7"/>

+  <texture name="progressbar_track.tga" preload="true" scale_left="3" scale_top="7" scale_right="87" scale_bottom="7"/>

+

+  <texture name="toolbar_btn_disabled.tga" scale_left="26" scale_top="24" scale_right="102" scale_bottom="0" />

+  <texture name="toolbar_btn_selected.tga" scale_left="26" scale_top="24" scale_right="102" scale_bottom="0" />

+  <texture name="button_enabled_selected_32x128.tga" preload="true" scale_left="12" scale_top="12" scale_right="118" scale_bottom="14"/>

+

+  <texture name="rounded_square.tga" file_name="rounded_square.tga" preload="true" scale_left="8" scale_top="16" scale_right="120" scale_bottom="8"/>

+  <texture name="rounded_square_soft.tga" file_name="rounded_square_soft.tga" preload="true" scale_left="8" scale_top="16" scale_right="120" scale_bottom="8"/>

+

+  <texture name="btn_chatbar.tga" scale_left="16" scale_top="24" scale_right="48" scale_bottom="0"/>

+  <texture name="btn_chatbar_selected.tga" scale_left="16" scale_top="24" scale_right="48" scale_bottom="0"/>

+

+  <texture name="flyout_btn_right_selected.tga" scale_left="6" scale_top="12" scale_right="26" scale_bottom="12"/>

+  <texture name="flyout_btn_right.tga" scale_left="6" scale_top="12" scale_right="26" scale_bottom="12"/>

+  <texture name="flyout_btn_right_disabled.tga" scale_left="6" scale_top="12" scale_right="122" scale_bottom="12"/>

+  <texture name="flyout_btn_left_selected.tga" scale_left="6" scale_top="12" scale_right="122" scale_bottom="12"/>

+  <texture name="flyout_btn_left.tga" scale_left="6" scale_top="12" scale_right="122" scale_bottom="12"/>

+ <texture name="flyout_btn_left_disabled.tga" scale_left="6" scale_top="12" scale_right="122" scale_bottom="12"/>

+</textures>

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
new file mode 100644
index 0000000..b9c3755
--- /dev/null
+++ b/linden/indra/newview/skins/silver/xui/en-us/floater_about_land.xml
@@ -0,0 +1,889 @@
+<?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="72">

+                                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="78"

+                             max_length="63" mouse_opaque="true" name="Name"

+                             select_all_on_focus_received="false" select_on_focus="false"

+                             width="368" />

+                        <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="80">

+                                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="76" max_length="255" mouse_opaque="true" name="Description"

+                             select_all_on_focus_received="false" select_on_focus="false"

+                             width="370" 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="Owner:" v_pad="0" width="72">

+                                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="76"

+                             mouse_opaque="true" name="OwnerText" v_pad="0" width="292">

+                                Leyla Linden

+                        </text>

+                        <button bottom="-100" 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="-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="Group:" v_pad="0" width="72">

+                                Group:

+                        </text>

+                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

+                             bottom="-122" drop_shadow_visible="true" enabled="false" follows="left|top"

+                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="76"

+                             mouse_opaque="true" name="GroupText" v_pad="0" width="110" />

+                        <button bottom="-120" 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="-140" enabled="false" follows="left|top" font="SansSerifSmall"

+                             height="16" initial_value="false" label="Allow Deed to Group" left="76"

+                             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="136" />

+                        <button bottom="-140" 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="-160" enabled="false" follows="left|top" font="SansSerifSmall"

+                             height="16" initial_value="false"

+                             label="Owner Makes Contribution With Deed" left="76" 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="219" />

+                        <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="For Sale:" v_pad="0" width="72">

+                                For Sale:

+                        </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="76"

+                             mouse_opaque="true" name="Not for sale." v_pad="0" width="206">

+                                Not for sale.

+                        </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="76"

+                             mouse_opaque="true" name="For Sale: Price L$[PRICE]." v_pad="0" width="206">

+                                Price: L$[PRICE].

+                        </text>

+                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

+                             bottom="-200" drop_shadow_visible="true" enabled="false" follows="left|top"

+                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="76"

+                             mouse_opaque="true" name="SalePending" v_pad="0" width="364" />

+                        <button bottom="-204" 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="-200" drop_shadow_visible="true" enabled="true" follows="left|top"

+                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="76"

+                             mouse_opaque="true" name="For sale to" v_pad="0" width="206">

+                                For sale to: [BUYER]

+                        </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="76"

+                             mouse_opaque="true" name="Sell with landowners objects in parcel."

+                             v_pad="0" width="206">

+                                Objects included in 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="76"

+                             mouse_opaque="true" name="Selling with no objects in parcel." v_pad="0"

+                             width="206">

+                                Objects not included in sale.

+                        </text>

+                        <button bottom="-208" 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="-244" 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="72">

+                                Claimed:

+                        </text>

+                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

+                             bottom="-244" drop_shadow_visible="true" enabled="true" follows="left|top"

+                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="76"

+                             mouse_opaque="true" name="DateClaimText" v_pad="0" width="206">

+                                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="-264" 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="72">

+                                Area:

+                        </text>

+                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

+                             bottom="-264" drop_shadow_visible="true" enabled="true" follows="left|top"

+                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="76"

+                             mouse_opaque="true" name="PriceText" v_pad="0" width="206">

+                                4048 sq. m.

+                        </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="4"

+                             mouse_opaque="true" name="Traffic:" v_pad="0" width="72">

+                                Traffic:

+                        </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="76"

+                             mouse_opaque="true" name="DwellText" v_pad="0" width="206">

+                                0

+                        </text>

+                        <button bottom="-308" 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="-332" 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="-332" 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="-308" 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="-260" 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="-284" 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>

+                </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="SansSerifSmall" h_pad="0" halign="left" height="20" left="180"

+                             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="-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="region_name_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="-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="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="-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_name_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="-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_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="-80" 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">

+                                Estate Owner:

+                        </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="20" left="120"

+                             mouse_opaque="false" name="estate_owner_text" v_pad="0" width="150">

+                                (none)

+                        </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="SansSerif" h_pad="0" halign="left" height="20" left="05"

+                             mouse_opaque="false" name="resellable_clause" v_pad="0" width="485">

+                                Purchased 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="-120" drop_shadow_visible="true" enabled="true" follows="left|top"

+                             font="SansSerif" h_pad="0" halign="left" height="20" left="05"

+                             mouse_opaque="false" name="changeable_clause" v_pad="0" width="485">

+                                Purchased land in this region may not be joined/subdivided.

+                        </text>

+                        <text_editor type="string" length="1" bottom="-325" embedded_items="false" enabled="false"

+                             follows="left|top|right|bottom" font="SansSerifSmall" height="200"

+                             left="15" max_length="65535" mouse_opaque="true" name="covenant_editor"

+                             width="420" word_wrap="true">

+                                There is no Covenant provided for this Estate.

+                        </text_editor>

+                        <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="fakse"

+                             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="false" 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" />

+                        </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" width="268" />

+                        <check_box bottom="-60" enabled="true" follows="left|top" font="SansSerifSmall"

+                             height="16" initial_value="false" label="Create Landmarks" left="14"

+                             mouse_opaque="true" name="check landmark" radio_style="false" width="268" />

+                        <check_box bottom="-80" enabled="true" follows="left|top" font="SansSerifSmall"

+                             height="16" initial_value="false" label="Fly" left="14" mouse_opaque="true"

+                             name="check fly" radio_style="false" width="268" />

+                        <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" width="268" />

+                        <check_box bottom="-120" enabled="true" follows="left|top" font="SansSerifSmall"

+                             height="16" initial_value="false" label="Restrict Pushing" left="178"

+                             mouse_opaque="true" name="PushRestrictCheck" radio_style="false"

+                             tool_tip="llPushObject will only work through parcel owner scripts or on scripts where the pushee is the script owner."

+                             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" />

+                        <combo_box allow_text_entry="false" bottom="-140" enabled="true" follows="left|top"

+                             height="18" left="255" max_chars="20" mouse_opaque="true"

+                             name="land category" width="130">

+                                <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="-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="Your parcel information or content is considered mature."

+                             width="107" />

+                        <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="Set the landing point to your avatar&apos;s location. It must be inside this land 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">

+                                Restrict Pushing

+                        </string>

+                        <string name="push_restrict_region_text">

+                                Restrict 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 spatialized sound to this parcel" left="80"

+                             mouse_opaque="true" name="check sound local" radio_style="false"

+                             width="292" />

+                        <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>

+                        <radio_group bottom_delta="-40" draw_border="true" enabled="true" follows="left|top"

+                             height="54" left="80" mouse_opaque="true" name="parcel_voice_channel"

+                             tab_stop="true" width="219">

+                                <radio_item type="string" length="1" bottom="-19" enabled="true" follows="left|top" height="16" left="3"

+                                     mouse_opaque="true" name="Estate" width="463">

+                                        Use the Estate spatial channel

+                                </radio_item>

+                                <radio_item type="string" length="1" bottom="-35" enabled="true" follows="left|top" height="16" left="3"

+                                     mouse_opaque="true" name="Private" width="463">

+                                        Use a private spatial channel

+                                </radio_item>

+                                <radio_item type="string" length="1" bottom="-51" enabled="true" follows="left|top" height="16" left="3"

+                                     mouse_opaque="true" name="Disabled" width="463">

+                                        Disable spatial audio on this parcel

+                                </radio_item>

+                        </radio_group>

+                </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 ore 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/xui/en-us/floater_chatterbox.xml b/linden/indra/newview/skins/silver/xui/en-us/floater_chatterbox.xml
index 83059f2..83059f2 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_chatterbox.xml
+++ b/linden/indra/newview/skins/silver/xui/en-us/floater_chatterbox.xml
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
new file mode 100644
index 0000000..dc88f62
--- /dev/null
+++ b/linden/indra/newview/skins/silver/xui/en-us/floater_directory.xml
@@ -0,0 +1,598 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

+<floater can_close="true" can_drag_on_left="false" can_minimize="true"

+     can_resize="false" 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>

+                        <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" />

+                        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="0"

+                             commit_on_focus_lost="false" enabled="true" follows="top|left|right"

+                             font="SansSerif" handle_edit_keys_directly="false" height="20"

+                             label="Search" left_delta="80" 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="180" />

+                        <button bottom_delta="0" follows="top|right" font="SansSerif" height="20"

+                             label="Search" left_delta="185" name="search_btn" width="70" />

+                        <combo_box allow_text_entry="false" bottom_delta="0" follows="right|top" height="18"

+                             left_delta="100" max_chars="20" mouse_opaque="true" name="Category"

+                             width="128">

+                                <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_delta="0" control_name="ShowMatureFindAll" follows="right|top"

+                             font="SansSerifSmall" height="16" initial_value="false"

+                             label="Include Mature content" left_delta="133" name="mature_check"

+                             width="156" />

+                        <web_browser bottom="25" follows="top|left|bottom|right" font="SansSerifSmall" left="10"

+                             name="find_browser" right="-10" top="-40" />

+                        <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">

+                        <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" />

+                        <string name="searching_text">

+                                Searching...

+                        </string>

+                        <string name="not_found_text">

+                                None Found.

+                        </string>

+                        <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" />

+                        <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|top" font="SansSerif" height="18" left_delta="38"

+                             max_length="63" mouse_opaque="true" name="name" width="128" />

+                        <check_box bottom_delta="-18" control_name="ShowMatureClassifieds" follows="left|top"

+                             font="SansSerifSmall" height="16" initial_value="true"

+                             label="Include Mature content" left_delta="0" mouse_opaque="true"

+                             name="incmature" width="156" />

+                        <combo_box allow_text_entry="false" bottom="-24" follows="left|top" height="18" left="182"

+                             max_chars="20" mouse_opaque="true" name="Category" width="128">

+                                <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="-26" follows="left|top" font="SansSerif" halign="center" height="20"

+                             label="Browse" label_selected="Browse" left_delta="142" mouse_opaque="true"

+                             name="Browse" width="85" />

+                        <button bottom="-26" follows="left|top" font="SansSerif" halign="center" height="20"

+                             label="Search" label_selected="Search" mouse_opaque="true" name="Search"

+                             visible="false" width="70" />

+                        <button bottom="-26" follows="right|top" font="SansSerif" halign="center" height="20"

+                             label="Place an Ad..." label_selected="Place an Ad..." left="-140"

+                             mouse_opaque="true" name="Place an Ad..." width="125" />

+                        <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="-513" column_padding="0" draw_border="true" draw_heading="true"                       follows="left|top|right|bottom" height="464" 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="328" />

+                </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>

+                        <radio_group bottom="-40" draw_border="false" follows="left|top" height="40" left="4"

+                             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="left|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="36" />

+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

+                             bottom="-36" drop_shadow_visible="true" follows="left|top" font="SansSerif"

+                             h_pad="0" halign="center" height="14" left_delta="40" mouse_opaque="true"

+                             name="date_text" v_pad="0" width="48">

+                                6/6

+                        </text>

+                        <button bottom="-40" follows="left|top" font="SansSerif" halign="center" height="20"

+                             label="&gt;&gt;" label_selected="&gt;&gt;" left_delta="52"

+                             mouse_opaque="true" name="&gt;&gt;" tool_tip="Go forward a day" width="36" />

+                        <button bottom="-40" follows="left|top" font="SansSerif" halign="center" height="20"

+                             label="Today" label_selected="Today" left_delta="48" mouse_opaque="true"

+                             name="Today" tool_tip="Show today&apos;s events" width="80" />

+                        <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">

+                                Category:

+                        </text>

+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

+                             bottom_delta="-20" drop_shadow_visible="true" follows="left|top"

+                             font="SansSerifSmall" h_pad="0" halign="left" height="20" left="289"

+                             mouse_opaque="true" name="text2" v_pad="0" width="90">

+                                Name/Desc:

+                        </text>

+                        <combo_box allow_text_entry="false" bottom="-22" follows="left|top" height="18" left="379"

+                             max_chars="20" mouse_opaque="true" name="category combo" width="180">

+                                <combo_item name="All" value="0">

+                                        All

+                                </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>

+                        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20"

+                             follows="left|top" font="SansSerifSmall" height="18" left="379"

+                             max_length="32" mouse_opaque="true" name="event_search_text" tab_group="1"

+                             width="180" />

+                        <check_box bottom="-30" control_name="ShowMatureEvents" follows="left|top"

+                             font="SansSerifSmall" height="16" initial_value="false" label="Show Mature"

+                             left="569" mouse_opaque="true" name="incmature" width="120" />

+                        <button bottom="-28" follows="left|top" font="SansSerif" halign="center" height="20"

+                             label="Search" label_selected="Search" left_delta="110" mouse_opaque="true"

+                             name="Search" tool_tip="Search" width="80" />

+                        <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="-513" column_padding="0" draw_border="true" draw_heading="true" 

+                             follows="left|top|right|bottom" height="464" 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="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="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">

+                        <string name="searching_text">

+                                Searching...

+                        </string>

+                        <string name="not_found_text">

+                                None Found.

+                        </string>

+                        <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="390" 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="304" width="80" />

+                        <combo_box allow_text_entry="false" bottom="-22" follows="left|top" height="18" left="4"

+                             max_chars="20" mouse_opaque="true" name="type" width="125">

+                                <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>

+                        <combo_box allow_text_entry="false" bottom_delta="-18" follows="left|top" height="18"

+                             left="4" max_chars="20" mouse_opaque="true" name="rating" width="125">

+                                <combo_item name="PG&amp;Mature" value="PG &amp; Mature">

+                                        PG &amp; Mature

+                                </combo_item>

+                                <combo_item name="PGonly" value="PG only">

+                                        PG only

+                                </combo_item>

+                                <combo_item name="Matureonly" value="Mature only">

+                                        Mature only

+                                </combo_item>

+                        </combo_box>

+                        <check_box bottom="-22" control_name="FindLandPrice" follows="left|top"

+                             font="SansSerifSmall" height="16" initial_value="true"

+                             label="Price &lt;= L$" left="132" mouse_opaque="true" name="pricecheck"

+                             width="88" />

+                        <check_box bottom_delta="-16" control_name="FindLandArea" follows="left|top"

+                             font="SansSerifSmall" height="16" initial_value="true"

+                             label="Area &gt;= sq.m." left="132" mouse_opaque="true" name="areacheck"

+                             width="102" />

+                        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-22"

+                             follows="left|top" font="SansSerifSmall" height="16" left="221"

+                             max_length="10" mouse_opaque="true" name="priceedit" width="50" />

+                        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-16"

+                             follows="left|top" font="SansSerifSmall" height="16" left="221"

+                             max_length="10" mouse_opaque="true" name="areaedit" width="50" />

+                        <button bottom="-26" follows="left|top" font="SansSerif" halign="center" height="20"

+                             label="Search" label_selected="Search" left="278" mouse_opaque="true"

+                             name="Search" width="70" />

+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

+                             bottom="-38" drop_shadow_visible="true" follows="left|top"

+                             font="SansSerifSmall" h_pad="0" halign="left" height="32" left="354"

+                             mouse_opaque="true" name="land" v_pad="0" width="430">

+                                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.

+                        </text>

+                        <scroll_list background_visible="true" bottom="-513" column_padding="0" draw_border="true" draw_heading="true" 

+                             follows="left|top|right|bottom" height="464" left="4" mouse_opaque="true"

+                             multi_select="false" name="results" search_column="2" width="387">

+                                <column label="" name="icon" width="24" />

+                                <column label="" name="type" width="-1" />

+                                <column dynamicwidth="true" label="Name" name="name" />

+                                <column label="L$ Price" name="price" width="65" />

+                                <column label="Area" name="area" width="50" />

+                                <column label="L$/sq.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" />

+                </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>

+                        <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" />

+                        <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|top" font="SansSerif" height="18" left_delta="38"

+                             max_length="63" mouse_opaque="true" name="name" width="128" />

+                        <check_box bottom_delta="-18" control_name="ShowMatureSims" follows="left|top"

+                             font="SansSerifSmall" height="16" initial_value="false"

+                             label="Include parcels with Mature content" left_delta="0"

+                             mouse_opaque="true" name="incmature" width="204" />

+                        <combo_box allow_text_entry="false" bottom="-24" follows="left|top" height="18" left="182"

+                             max_chars="20" mouse_opaque="true" name="Category" width="128">

+                                <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="-26" follows="left|top" font="SansSerif" halign="center" height="20"

+                             label="Search" label_selected="Search" left_delta="136" mouse_opaque="true"

+                             name="Search" width="70" />

+                        <scroll_list background_visible="true" bottom="-513" column_padding="0" draw_border="true"

+                             draw_heading="true" 

+                             follows="left|top|right|bottom" height="464" 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" />

+                </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>

+                        <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" />

+      <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|top" font="SansSerif" height="18" left_delta="38"

+                             max_length="63" mouse_opaque="true" name="name" width="200" />

+      <button bottom="-26" follows="left|top" font="SansSerif" halign="center" height="20"

+                             label="Search" label_selected="Search" left_delta="210" mouse_opaque="true"

+                             name="Search" width="70" />

+      <scroll_list background_visible="true" bottom="-513" column_padding="0" draw_border="true"

+                             draw_heading="true"

+                             follows="left|top|right|bottom" height="464" 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" />

+                </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>

+      <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" />

+      <line_editor bevel_style="in"

+                                                border_style="line"

+                                                border_thickness="1"

+                                                bottom_delta="0"

+                                                enabled="true"

+                                                follows="top|left|right"

+                                                font="SansSerif"

+                                                handle_edit_keys_directly="false"

+                                                commit_on_focus_lost="false"

+                                                height="20"

+                                                hidden="false"

+                                                label="Search"

+                                                left_delta="80"

+                                                width="180"

+                                                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 follows="top|right" font="SansSerif" height="20"

+                                label="Search"

+                                left_delta="185"

+                                bottom_delta="0"

+                                name="search_btn" width="70" />

+      <check_box bottom_delta="0"

+                                control_name="ShowMatureFindAll" follows="right|top"

+                             font="SansSerifSmall" height="16" initial_value="false"

+                             label="Include Mature content"

+                             left_delta="133"

+                             name="mature_check"

+                             width="156" />

+      <web_browser name="groups_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/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="20" follows="right|top" height="470" left="340"

+             name="place_details_panel" width="440" />

+        <panel bottom="20" 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
new file mode 100644
index 0000000..ef37e9b
--- /dev/null
+++ b/linden/indra/newview/skins/silver/xui/en-us/floater_env_settings.xml
@@ -0,0 +1,66 @@
+<?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/xui/en-us/floater_live_lsleditor.xml b/linden/indra/newview/skins/silver/xui/en-us/floater_live_lsleditor.xml
index 62cf350..f7e230f 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_live_lsleditor.xml
+++ b/linden/indra/newview/skins/silver/xui/en-us/floater_live_lsleditor.xml
@@ -1,20 +1,20 @@
-<?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" />
-        <string name="not_allowed">
-                You are not allowed to view this script.
-        </string>
-        <string name="script_running">
-                Running
-        </string>
-</floater>
+<?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" />

+        <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/xui/en-us/floater_script_ed_panel.xml b/linden/indra/newview/skins/silver/xui/en-us/floater_script_ed_panel.xml
index 6bc26b9..0eca4ac 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_script_ed_panel.xml
+++ b/linden/indra/newview/skins/silver/xui/en-us/floater_script_ed_panel.xml
@@ -1,86 +1,86 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel bottom="-550" enabled="true" follows="left|top|right|bottom" height="508"
-     left="0" mouse_opaque="true" name="script panel" width="500">
-        <text_editor type="string" length="1" bottom="-393"
-             embedded_items="false" enabled="true" follows="left|top|right|bottom"
-             font="Monospace" height="376" ignore_tab="false" left="4"
-             max_length="65536" mouse_opaque="true" name="Script Editor" width="492"
-             word_wrap="true">
-                Loading...
-        </text_editor>
-        <button bottom="-499" enabled="true" follows="right|bottom" font="SansSerif"
-             halign="center" height="20" label="Save" label_selected="Save" left="360"
-             mouse_opaque="true" name="Save_btn" width="128" />
-        <scroll_list background_visible="true" bottom="-457" column_padding="5" draw_border="true"
-             draw_heading="false" draw_stripes="true" enabled="true"
-             follows="left|right|bottom" height="60" left="4" mouse_opaque="true"
-             multi_select="false" name="lsl errors" width="492" />
-        <combo_box allow_text_entry="false" bottom="-499" enabled="true" follows="left|bottom"
-             height="20" label="Insert..." left="12" max_chars="20" mouse_opaque="true"
-             name="Insert..." width="128" />
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-473" drop_shadow_visible="true" enabled="true"
-             follows="left|bottom" font="SansSerifSmall" h_pad="0" halign="left"
-             height="12" left="12" mouse_opaque="true" name="line_col" v_pad="0"
-             width="128" />
-        <menu_bar bottom="-15" drop_shadow="false" enabled="true" follows="left|top|right"
-             height="18" left="8" mouse_opaque="false" name="script_menu" opaque="false"
-             tear_off="false" width="476">
-                <menu bottom="0" drop_shadow="true" enabled="true" height="62"
-                     left="0" mouse_opaque="false" name="File" opaque="true" tear_off="false"
-                     width="138">
-                        <menu_item_call bottom_delta="-30" height="20" label="Save" left="0" mouse_opaque="true"
-                             name="Save" width="138" />
-                        <menu_item_separator bottom_delta="-38" height="8" left="0" mouse_opaque="true" name="separator"
-                             width="138" />
-                        <menu_item_call bottom_delta="-58" height="20" label="Revert All Changes" left="0"
-                             mouse_opaque="true" name="Revert All Changes" width="138" />
-                </menu>
-                <menu bottom="665" drop_shadow="true" enabled="true" height="198"
-                     left="222" mouse_opaque="false" name="Edit" opaque="true" tear_off="false"
-                     width="139">
-                        <menu_item_call bottom_delta="-30" enabled="false" height="20" label="Undo" left="0"
-                             mouse_opaque="true" name="Undo" width="139" />
-                        <menu_item_call bottom_delta="-50" enabled="false" height="20" label="Redo" left="0"
-                             mouse_opaque="true" name="Redo" width="139" />
-                        <menu_item_separator bottom_delta="-58" enabled="true" height="8" label="-----------" left="0"
-                             mouse_opaque="true" name="separator" width="139" />
-                        <menu_item_call bottom_delta="-78" enabled="false" height="20" label="Cut" left="0"
-                             mouse_opaque="true" name="Cut" width="139" />
-                        <menu_item_call bottom_delta="-98" enabled="false" height="20" label="Copy" left="0"
-                             mouse_opaque="true" name="Copy" width="139" />
-                        <menu_item_call bottom_delta="-118" enabled="false" height="20" label="Paste" left="0"
-                             mouse_opaque="true" name="Paste" width="139" />
-                        <menu_item_separator bottom_delta="-126" enabled="true" height="8" label="-----------" left="0"
-                             mouse_opaque="true" name="separator2" width="139" />
-                        <menu_item_call bottom_delta="-146" enabled="true" height="20" label="Select All" left="0"
-                             mouse_opaque="true" name="Select All" width="139" />
-                        <menu_item_call bottom_delta="-166" enabled="false" height="20" label="Deselect" left="0"
-                             mouse_opaque="true" name="Deselect" width="139" />
-                        <menu_item_separator bottom_delta="-174" enabled="true" height="8" label="-----------" left="0"
-                             mouse_opaque="true" name="separator3" width="139" />
-                        <menu_item_call bottom_delta="-194" enabled="true" height="20" label="Search / Replace..."
-                             left="0" mouse_opaque="true" name="Search / Replace..." width="139" />
-                </menu>
-                <menu bottom="-18" drop_shadow="true" enabled="true" height="34"
-                     left="0" mouse_opaque="false" name="Help" opaque="true" tear_off="false"
-                     width="112">
-                        <menu_item_call bottom="-30" enabled="true" height="20" label="Help..." left="0"
-                             mouse_opaque="true" name="Help..." width="112" />
-                        <menu_item_call bottom="-30" enabled="true" height="20" label="LSL Wiki Help..." left="0"
-                             mouse_opaque="true" name="LSL Wiki Help..." width="112" />
-                </menu>
-        </menu_bar>
-        <string name="loading">
-                Loading...
-        </string>
-        <string name="can_not_view">
-                You are not allowed to view this script.
-        </string>
-        <string name="public_objects_can_not_run">
-                Public Objects cannot run scripts
-        </string>
-        <string name="script_running">
-                Running
-        </string>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

+<panel bottom="-550" enabled="true" follows="left|top|right|bottom" height="508"

+     left="0" mouse_opaque="true" name="script panel" width="500">

+        <text_editor type="string" length="1" bottom="-393"

+             embedded_items="false" enabled="true" follows="left|top|right|bottom"

+             font="Monospace" height="376" ignore_tab="false" left="4"

+             max_length="65536" mouse_opaque="true" name="Script Editor" width="492"

+             word_wrap="true">

+                Loading...

+        </text_editor>

+        <button bottom="-499" enabled="true" follows="right|bottom" font="SansSerif"

+             halign="center" height="20" label="Save" label_selected="Save" left="360"

+             mouse_opaque="true" name="Save_btn" width="128" />

+        <scroll_list background_visible="true" bottom="-457" column_padding="5" draw_border="true"

+             draw_heading="false" draw_stripes="true" enabled="true"

+             follows="left|right|bottom" height="60" left="4" mouse_opaque="true"

+             multi_select="false" name="lsl errors" width="492" />

+        <combo_box allow_text_entry="false" bottom="-499" enabled="true" follows="left|bottom"

+             height="20" label="Insert..." left="12" max_chars="20" mouse_opaque="true"

+             name="Insert..." width="128" />

+        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

+             bottom="-473" drop_shadow_visible="true" enabled="true"

+             follows="left|bottom" font="SansSerifSmall" h_pad="0" halign="left"

+             height="12" left="12" mouse_opaque="true" name="line_col" v_pad="0"

+             width="128" />

+        <menu_bar bottom="-15" drop_shadow="false" enabled="true" follows="left|top|right"

+             height="18" left="8" mouse_opaque="false" name="script_menu" opaque="false"

+             tear_off="false" width="476">

+                <menu bottom="0" drop_shadow="true" enabled="true" height="62"

+                     left="0" mouse_opaque="false" name="File" opaque="true" tear_off="false"

+                     width="138">

+                        <menu_item_call bottom_delta="-30" height="20" label="Save" left="0" mouse_opaque="true"

+                             name="Save" width="138" />

+                        <menu_item_separator bottom_delta="-38" height="8" left="0" mouse_opaque="true" name="separator"

+                             width="138" />

+                        <menu_item_call bottom_delta="-58" height="20" label="Revert All Changes" left="0"

+                             mouse_opaque="true" name="Revert All Changes" width="138" />

+                </menu>

+                <menu bottom="665" drop_shadow="true" enabled="true" height="198"

+                     left="222" mouse_opaque="false" name="Edit" opaque="true" tear_off="false"

+                     width="139">

+                        <menu_item_call bottom_delta="-30" enabled="false" height="20" label="Undo" left="0"

+                             mouse_opaque="true" name="Undo" width="139" />

+                        <menu_item_call bottom_delta="-50" enabled="false" height="20" label="Redo" left="0"

+                             mouse_opaque="true" name="Redo" width="139" />

+                        <menu_item_separator bottom_delta="-58" enabled="true" height="8" label="-----------" left="0"

+                             mouse_opaque="true" name="separator" width="139" />

+                        <menu_item_call bottom_delta="-78" enabled="false" height="20" label="Cut" left="0"

+                             mouse_opaque="true" name="Cut" width="139" />

+                        <menu_item_call bottom_delta="-98" enabled="false" height="20" label="Copy" left="0"

+                             mouse_opaque="true" name="Copy" width="139" />

+                        <menu_item_call bottom_delta="-118" enabled="false" height="20" label="Paste" left="0"

+                             mouse_opaque="true" name="Paste" width="139" />

+                        <menu_item_separator bottom_delta="-126" enabled="true" height="8" label="-----------" left="0"

+                             mouse_opaque="true" name="separator2" width="139" />

+                        <menu_item_call bottom_delta="-146" enabled="true" height="20" label="Select All" left="0"

+                             mouse_opaque="true" name="Select All" width="139" />

+                        <menu_item_call bottom_delta="-166" enabled="false" height="20" label="Deselect" left="0"

+                             mouse_opaque="true" name="Deselect" width="139" />

+                        <menu_item_separator bottom_delta="-174" enabled="true" height="8" label="-----------" left="0"

+                             mouse_opaque="true" name="separator3" width="139" />

+                        <menu_item_call bottom_delta="-194" enabled="true" height="20" label="Search / Replace..."

+                             left="0" mouse_opaque="true" name="Search / Replace..." width="139" />

+                </menu>

+                <menu bottom="-18" drop_shadow="true" enabled="true" height="34"

+                     left="0" mouse_opaque="false" name="Help" opaque="true" tear_off="false"

+                     width="112">

+                        <menu_item_call bottom="-30" enabled="true" height="20" label="Help..." left="0"

+                             mouse_opaque="true" name="Help..." width="112" />

+                        <menu_item_call bottom="-30" enabled="true" height="20" label="LSL Wiki Help..." left="0"

+                             mouse_opaque="true" name="LSL Wiki Help..." width="112" />

+                </menu>

+        </menu_bar>

+        <string name="loading">

+                Loading...

+        </string>

+        <string name="can_not_view">

+                You are not allowed to view this script.

+        </string>

+        <string name="public_objects_can_not_run">

+                Public Objects cannot run scripts

+        </string>

+        <string name="script_running">

+                Running

+        </string>

+</panel>

diff --git a/linden/indra/newview/skins/xui/en-us/floater_script_queue.xml b/linden/indra/newview/skins/silver/xui/en-us/floater_script_queue.xml
index c44457c..91e9d8f 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_script_queue.xml
+++ b/linden/indra/newview/skins/silver/xui/en-us/floater_script_queue.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater bottom="-763" can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="true" enabled="true" height="400" left="408" min_height="100"
-     min_width="100" mouse_opaque="true" name="queue" title="Reset Progress"
-     width="300">
-        <button bottom="-392" enabled="true" follows="right|bottom" font="SansSerif"
-             halign="center" height="24" label="Close" label_selected="Close" left="220"
-             mouse_opaque="true" name="close" width="64" />
-        <scroll_list background_visible="true" bottom="-364" column_padding="5" draw_border="true"
-             draw_heading="false" draw_stripes="true" enabled="true"
-             follows="left|top|right|bottom" height="344" left="4" mouse_opaque="true"
-             multi_select="false" name="queue output" width="292" />
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

+<floater bottom="-763" can_close="true" can_drag_on_left="false" can_minimize="true"

+     can_resize="true" enabled="true" height="400" left="408" min_height="100"

+     min_width="100" mouse_opaque="true" name="queue" title="Reset Progress"

+     width="300">

+        <button bottom="-392" enabled="true" follows="right|bottom" font="SansSerif"

+             halign="center" height="24" label="Close" label_selected="Close" left="220"

+             mouse_opaque="true" name="close" width="64" />

+        <scroll_list background_visible="true" bottom="-364" column_padding="5" draw_border="true"

+             draw_heading="false" draw_stripes="true" enabled="true"

+             follows="left|top|right|bottom" height="344" left="4" mouse_opaque="true"

+             multi_select="false" name="queue output" width="292" />

+</floater>

diff --git a/linden/indra/newview/skins/xui/en-us/floater_tools.xml b/linden/indra/newview/skins/silver/xui/en-us/floater_tools.xml
index c45ab77..cd453fa 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_tools.xml
+++ b/linden/indra/newview/skins/silver/xui/en-us/floater_tools.xml
@@ -1,1241 +1,1241 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater bottom="-359" can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="false" follows="left|top" height="550" 
-     left="308" min_height="100" min_width="100" mouse_opaque="true"
-     name="toolbox floater" rect_control="ToolboxRect" sound_flags="0" title=""
-     width="272">
-
-<!-- Main floater tabs -->
-
-        <button bottom="-34" follows="left|top" font="SansSerif" halign="center" height="32"
-             image_disabled="tool_zoom.tga"
-             image_disabled_selected="tool_zoom_active.tga"
-             image_selected="tool_zoom_active.tga" image_unselected="tool_zoom.tga"
-             label="" label_selected="" left="4" mouse_opaque="true" name="button focus"
-             tool_tip="Focus" width="32" />
-        <button bottom="-34" follows="left|top" font="SansSerif" halign="center" height="32"
-             image_disabled="UIImgGrabUUID"
-             image_disabled_selected="UIImgGrabSelectedUUID"
-             image_selected="UIImgGrabSelectedUUID" image_unselected="UIImgGrabUUID"
-             label="" label_selected="" left="40" mouse_opaque="true" name="button move"
-             tool_tip="Move" width="32" />
-        <button bottom="-34" follows="left|top" font="SansSerif" halign="center" height="32"
-             image_disabled="UIImgFaceUUID"
-             image_disabled_selected="UIImgFaceSelectedUUID"
-             image_selected="UIImgFaceSelectedUUID" image_unselected="UIImgFaceUUID"
-             label="" label_selected="" left="76" mouse_opaque="true" name="button edit"
-             tool_tip="Edit" width="32" />
-        <button bottom="-34" follows="left|top" font="SansSerif" halign="center" height="32"
-             image_disabled="UIImgCreateUUID"
-             image_disabled_selected="UIImgCreateSelectedUUID"
-             image_selected="UIImgCreateSelectedUUID" image_unselected="UIImgCreateUUID"
-             label="" label_selected="" left="112" mouse_opaque="true"
-             name="button create" tool_tip="Create" width="32" />
-        <button bottom="-34" follows="left|top" font="SansSerif" halign="center" height="32"
-             image_disabled="tool_dozer.tga"
-             image_disabled_selected="tool_dozer_active.tga"
-             image_selected="tool_dozer_active.tga" image_unselected="tool_dozer.tga"
-             label="" label_selected="" left="148" mouse_opaque="true"
-             name="button land" tool_tip="Land" width="32" />
-
-<!-- Focus panel -->
-
-        <check_box bottom="-70" follows="left|top" font="SansSerifSmall" height="16"
-             initial_value="false" label="Zoom" left="4" mouse_opaque="true"
-             name="radio zoom" radio_style="true" width="114" />
-        <volume_slider bottom="-69" follows="left|top" height="14" increment="0.01"
-             initial_val="0.125" left="114" max_val="0.5" min_val="0"
-             mouse_opaque="true" name="slider zoom" width="134" />
-        <check_box bottom="-84" follows="left|top" font="SansSerifSmall" height="16"
-             initial_value="false" label="Orbit (Ctrl)" left="4" mouse_opaque="true"
-             name="radio orbit" radio_style="true" width="114" />
-        <check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"
-             initial_value="false" label="Pan (Ctrl-Shift)" left="4"
-             mouse_opaque="true" name="radio pan" radio_style="true" width="114" />
-
-<!-- Move panel -->
-
-        <check_box bottom="-70" follows="left|top" font="SansSerifSmall" height="16"
-             initial_value="false" label="Move" left="4" mouse_opaque="true"
-             name="radio move" radio_style="true" width="114" />
-        <check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"
-             initial_value="false" label="Lift (Ctrl)" left="4" mouse_opaque="true"
-             name="radio lift" radio_style="true" width="114" />
-        <check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"
-             initial_value="false" label="Spin (Ctrl-Shift)" left="4"
-             mouse_opaque="true" name="radio spin" radio_style="true" width="114" />
-
-<!-- Edit panel -->
-
-        <check_box bottom="-70" follows="left|top" font="SansSerifSmall" height="16"
-             initial_value="false" label="Position" left="4" mouse_opaque="true"
-             name="radio position" radio_style="true" width="114" />
-        <check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"
-             initial_value="false" label="Rotate (Ctrl)" left="4" mouse_opaque="true"
-             name="radio rotate" radio_style="true" width="114" />
-        <check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"
-             initial_value="false" label="Stretch (Ctrl-Shift)" left="4"
-             mouse_opaque="true" name="radio stretch" radio_style="true" width="123" />
-        <check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"
-             initial_value="false" label="Select Texture" left="4" mouse_opaque="true"
-             name="radio select face" radio_style="true" width="114" />
-        <check_box bottom_delta="-19" control_name="EditLinkedParts" follows="left|top"
-             font="SansSerifSmall" height="16" initial_value="false"
-             label="Edit linked parts" left="4" mouse_opaque="true"
-             name="checkbox edit linked parts" width="114" />
-        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom_delta="-20" drop_shadow_visible="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="14" left="6"
-             mouse_opaque="true" name="text ruler mode" v_pad="0" width="68">
-                Ruler mode:
-        </text>
-        <combo_box allow_text_entry="false" bottom_delta="-4" follows="left|top" height="20"
-             left_delta="74" max_chars="20" mouse_opaque="true"
-             name="combobox grid mode" width="86">
-                <combo_item name="World" value="World">
-                        World
-                </combo_item>
-                <combo_item name="Local" value="Local">
-                        Local
-                </combo_item>
-                <combo_item name="Reference" value="Reference">
-                        Reference
-                </combo_item>
-        </combo_box>
-        <check_box bottom="-70" control_name="ScaleUniform" follows="left|top"
-             font="SansSerifSmall" height="16" initial_value="false"
-             label="Stretch Both Sides" left="143" mouse_opaque="true"
-             name="checkbox uniform" width="134" />
-        <check_box bottom_delta="-15" control_name="ScaleStretchTextures" follows="left|top"
-             font="SansSerifSmall" height="16" initial_value="true"
-             label="Stretch Textures" left_delta="0" mouse_opaque="true"
-             name="checkbox stretch textures" width="134" />
-        <check_box bottom_delta="-19" control_name="SnapEnabled" follows="left|top"
-             font="SansSerifSmall" height="16" initial_value="true" label="Use Grid"
-             left_delta="0" mouse_opaque="true" name="checkbox snap to grid" width="134" />
-        <button bottom_delta="-14" follows="left|top" font="SansSerifSmall" halign="center"
-             height="16" label="Options..." label_selected="Options..." left_delta="20"
-             mouse_opaque="true" name="Options..." scale_image="TRUE" width="80" />
-
-<!-- Help text -->
-
-        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-52" drop_shadow_visible="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
-             mouse_opaque="true" name="text status" v_pad="0" width="264">
-                Drag to move, shift-drag to copy
-        </text>
-
-<!-- Create panel -->
-
-        <button bottom="-78" follows="left|top" font="SansSerif" halign="center" height="30"
-             image_disabled="object_cube.tga"
-             image_disabled_selected="object_cube_active.tga"
-             image_selected="object_cube_active.tga" image_unselected="object_cube.tga"
-             label="" label_selected="" left="4" mouse_opaque="true" name="ToolCube"
-             scale_image="TRUE" width="30" tool_tip="Cube"/>
-        <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
-             height="30" image_disabled="object_prism.tga"
-             image_disabled_selected="object_prism_active.tga"
-             image_selected="object_prism_active.tga"
-             image_unselected="object_prism.tga" label="" label_selected=""
-             left_delta="28" mouse_opaque="true" name="ToolPrism" scale_image="TRUE"
-        tool_tip="Prism" width="30" />
-        <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
-             height="30" image_disabled="object_pyramid.tga"
-             image_disabled_selected="object_pyramid_active.tga"
-             image_selected="object_pyramid_active.tga"
-             image_unselected="object_pyramid.tga" label="" label_selected=""
-             left_delta="28" mouse_opaque="true" name="ToolPyramid" scale_image="TRUE"
- tool_tip="Pyramid" width="30" />
-        <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
-             height="30" image_disabled="object_tetrahedron.tga"
-             image_disabled_selected="object_tetrahedron_active.tga"
-             image_selected="object_tetrahedron_active.tga"
-             image_unselected="object_tetrahedron.tga" label="" label_selected=""
-             left_delta="23" mouse_opaque="true" name="ToolTetrahedron"
-             scale_image="TRUE" tool_tip="Tetrahedron" width="30" />
-        <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
-             height="30" image_disabled="object_cylinder.tga"
-             image_disabled_selected="object_cylinder_active.tga"
-             image_selected="object_cylinder_active.tga"
-             image_unselected="object_cylinder.tga" label="" label_selected=""
-             left_delta="23" mouse_opaque="true" tool_tip="Cylinder" name="ToolCylinder" scale_image="TRUE"
-             width="30" />
-        <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
-             height="30" image_disabled="object_hemi_cylinder.tga"
-             image_disabled_selected="object_hemi_cylinder_active.tga"
-             image_selected="object_hemi_cylinder_active.tga"
-             image_unselected="object_hemi_cylinder.tga" label="" label_selected=""
-             left_delta="23" mouse_opaque="true" name="ToolHemiCylinder"
-             scale_image="TRUE" tool_tip="Hemicylinder" width="30" />
-        <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
-             height="30" image_disabled="object_cone.tga"
-             image_disabled_selected="object_cone_active.tga"
-             image_selected="object_cone_active.tga" image_unselected="object_cone.tga"
-             label="" label_selected="" left_delta="23" mouse_opaque="true"
-             name="ToolCone" scale_image="TRUE" tool_tip="Cone" width="30" />
-        <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
-             height="30" image_disabled="object_hemi_cone.tga"
-             image_disabled_selected="object_hemi_cone_active.tga"
-             image_selected="object_hemi_cone_active.tga"
-             image_unselected="object_hemi_cone.tga" label="" label_selected=""
-             left_delta="23" mouse_opaque="true" name="ToolHemiCone" scale_image="TRUE"
-      tool_tip="Hemicone" width="30" />
-        <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
-             height="30" image_disabled="object_sphere.tga"
-             image_disabled_selected="object_sphere_active.tga"
-             image_selected="object_sphere_active.tga"
-             image_unselected="object_sphere.tga" label="" label_selected=""
-             left_delta="23" mouse_opaque="true" name="ToolSphere" scale_image="TRUE"
-             width="30" tool_tip="Sphere" />
-        <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
-             height="30" image_disabled="object_hemi_sphere.tga"
-             image_disabled_selected="object_hemi_sphere_active.tga"
-             image_selected="object_hemi_sphere_active.tga"
-             image_unselected="object_hemi_sphere.tga" label="" label_selected=""
-             left_delta="23" mouse_opaque="true" name="ToolHemiSphere"
-             scale_image="TRUE" tool_tip="Hemisphere" width="30" />
-        <button bottom_delta="-23" follows="left|top" font="SansSerif" halign="center"
-             height="30" image_disabled="object_torus.tga"
-             image_disabled_selected="object_torus_active.tga"
-             image_selected="object_torus_active.tga"
-             image_unselected="object_torus.tga" label="" label_selected="" left="4"
-             mouse_opaque="true" name="ToolTorus" scale_image="TRUE" tool_tip="Torus" width="30" />
-        <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
-             height="30" image_disabled="object_tube.tga"
-             image_disabled_selected="object_tube_active.tga"
-             image_selected="object_tube_active.tga" image_unselected="object_tube.tga"
-             label="" label_selected="" left_delta="23" mouse_opaque="true"
-             name="ToolTube" scale_image="TRUE" tool_tip="Tube" width="30" />
-        <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
-             height="30" image_disabled="object_ring.tga"
-             image_disabled_selected="object_ring_active.tga"
-             image_selected="object_ring_active.tga" image_unselected="object_ring.tga"
-             label="" label_selected="" left_delta="23" mouse_opaque="true"
-             name="ToolRing" scale_image="TRUE" tool_tip="Ring" width="30" />
-        <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
-             height="30" image_disabled="object_tree.tga"
-             image_disabled_selected="object_tree_active.tga"
-             image_selected="object_tree_active.tga" image_unselected="object_tree.tga"
-             label="" label_selected="" left_delta="23" mouse_opaque="true"
-             name="ToolTree" scale_image="TRUE" tool_tip="Tree" width="30" />
-        <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
-             height="30" image_disabled="object_grass.tga"
-             image_disabled_selected="object_grass_active.tga"
-             image_selected="object_grass_active.tga"
-             image_unselected="object_grass.tga" label="" label_selected=""
-             left_delta="28" mouse_opaque="true" name="ToolGrass" scale_image="TRUE"
-             tool_tip="Grass" width="30" />
-        <check_box bottom="-120" control_name="CreateToolKeepSelected" follows="left|top"
-             font="SansSerifSmall" height="16" initial_value="false"
-             label="Keep Tool Selected" left="4" mouse_opaque="true"
-             name="checkbox sticky" width="128" />
-        <check_box bottom_delta="-15" control_name="CreateToolCopySelection" follows="left|top"
-             font="SansSerifSmall" height="16" initial_value="false"
-             label="Copy Selection" left_delta="0" mouse_opaque="true"
-             name="checkbox copy selection" width="134" />
-        <check_box bottom_delta="-15" control_name="CreateToolCopyCenters" follows="left|top"
-             font="SansSerifSmall" height="16" initial_value="true" label="Center Copy"
-             left_delta="20" mouse_opaque="true" name="checkbox copy centers"
-             width="134" />
-        <check_box bottom_delta="-15" control_name="CreateToolCopyRotates" follows="left|top"
-             font="SansSerifSmall" height="16" initial_value="false" label="Rotate Copy"
-             left_delta="0" mouse_opaque="true" name="checkbox copy rotates" width="134" />
-
-<!-- Land panel -->
-
-        <check_box bottom="-70" follows="left|top" font="SansSerifSmall" height="16"
-             initial_value="false" label="Select Land" left="4" mouse_opaque="true"
-             name="radio select land" radio_style="true" width="114" />
-        <check_box bottom_delta="-14" follows="left|top" font="SansSerifSmall" height="16"
-             initial_value="false" label="Flatten Land" left="4" mouse_opaque="true"
-             name="radio flatten" radio_style="true" width="114" />
-        <check_box bottom_delta="-14" follows="left|top" font="SansSerifSmall" height="16"
-             initial_value="false" label="Raise Land" left="4" mouse_opaque="true"
-             name="radio raise" radio_style="true" width="114" />
-        <check_box bottom_delta="-14" follows="left|top" font="SansSerifSmall" height="16"
-             initial_value="false" label="Lower Land" left="4" mouse_opaque="true"
-             name="radio lower" radio_style="true" width="114" />
-        <check_box bottom_delta="-14" follows="left|top" font="SansSerifSmall" height="16"
-             initial_value="false" label="Smooth Land" left="4" mouse_opaque="true"
-             name="radio smooth" radio_style="true" width="114" />
-        <check_box bottom_delta="-14" follows="left|top" font="SansSerifSmall" height="16"
-             initial_value="false" label="Roughen Land" left="4" mouse_opaque="true"
-             name="radio noise" radio_style="true" width="114" />
-        <check_box bottom_delta="-14" follows="left|top" font="SansSerifSmall" height="16"
-             initial_value="false" label="Revert Land" left="4" mouse_opaque="true"
-             name="radio revert" radio_style="true" width="114" />
-        <combo_box allow_text_entry="false" bottom="-85" follows="left|top" height="18" left="118"
-             max_chars="20" mouse_opaque="true" name="combobox brush size" width="134">
-                <combo_item name="Small" value="Small">
-                        Small
-                </combo_item>
-                <combo_item name="Medium" value="Medium">
-                        Medium
-                </combo_item>
-                <combo_item name="Large" value="Large">
-                        Large
-                </combo_item>
-        </combo_box>
-        <button bottom_delta="-20" follows="left|top" font="SansSerifSmall" halign="center"
-             height="16" label="Apply to selection" label_selected="Apply to selection"
-             left="118" mouse_opaque="true" name="button apply to selection"
-             scale_image="TRUE" tool_tip="Modify Selected Land" width="134" />
-        <check_box bottom_delta="-20" control_name="ShowParcelOwners" follows="left|top"
-             font="SansSerifSmall" height="16" initial_value="false" label="Show Owners"
-             left="118" mouse_opaque="true" name="checkbox show owners" width="134" />
-        <button bottom="-163" follows="left|top" font="SansSerifSmall" halign="center"
-             height="20" label="More &gt;&gt;" left="186" mouse_opaque="true"
-             name="button more" scale_image="TRUE" tool_tip="Advanced Options"
-             width="80" />
-        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" halign="center"
-             height="20" label="&lt;&lt; Less" left_delta="0" mouse_opaque="true"
-             name="button less" scale_image="TRUE" tool_tip="Advanced Options"
-             width="80" />
-
-<!-- Sub-tabs -->
-
-        <tab_container bottom="-550" follows="left|top" height="384" left="0" mouse_opaque="false"
-             name="Object Info Tabs" tab_max_width="52" tab_min_width="40"
-             tab_position="top" width="272">
-                <panel border="true" bottom="-383" follows="left|top|right|bottom" height="367"
-                     label="General" left="1" mouse_opaque="false" name="General" width="270">
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-20" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
-                             mouse_opaque="true" name="Name:" v_pad="0" width="78">
-                                Name:
-                        </text>
-                        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-26"
-                             follows="left|top|right" font="SansSerifSmall" height="16" left="88"
-                             max_length="63" mouse_opaque="true" name="Object Name"
-                             select_all_on_focus_received="true" width="172" />
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-40" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
-                             mouse_opaque="true" name="Description:" v_pad="0" width="78">
-                                Description:
-                        </text>
-                        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-46"
-                             follows="left|top|right" font="SansSerifSmall" height="16" left="88"
-                             max_length="127" mouse_opaque="true" name="Object Description"
-                             select_all_on_focus_received="true" width="172" />
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-66" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
-                             mouse_opaque="true" name="Creator:" v_pad="0" width="78">
-                                Creator:
-                        </text>
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-66" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="78"
-                             mouse_opaque="true" name="Creator Name" v_pad="0" width="88">
-                                Thrax Linden
-                        </text>
-                        <button bottom="-66" follows="top|right" font="SansSerifSmall" halign="center"
-                             height="16" label="Profile..." label_selected="Profile..." left_delta="94"
-                             mouse_opaque="true" name="button creator profile" scale_image="TRUE"
-                             width="78" />
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-86" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
-                             mouse_opaque="true" name="Owner:" v_pad="0" width="78">
-                                Owner:
-                        </text>
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-86" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="78"
-                             mouse_opaque="true" name="Owner Name" v_pad="0" width="88">
-                                Thrax Linden
-                        </text>
-                        <button bottom="-86" follows="top|right" font="SansSerifSmall" halign="center"
-                             height="16" label="Profile..." label_selected="Profile..." left_delta="94"
-                             mouse_opaque="true" name="button owner profile" scale_image="TRUE"
-                             width="78" />
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-106" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
-                             mouse_opaque="true" name="Group:" v_pad="0" width="78">
-                                Group:
-                        </text>
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-106" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="78"
-                             mouse_opaque="true" name="Group Name Proxy" v_pad="0" visible="false"
-                             width="88">
-                                The Lindens
-                        </text>
-                        <button bottom="-106" follows="top|right" font="SansSerifSmall" halign="center"
-                             height="16" label="Set..." label_selected="Set..." left_delta="94"
-                             mouse_opaque="true" name="button set group" scale_image="TRUE" width="78" />
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-126" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
-                             mouse_opaque="true" name="prim info" v_pad="0" width="166">
-                                1 Object, 1 Primitive
-                        </text>
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom_delta="-20" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
-                             mouse_opaque="true" name="Permissions:" v_pad="0" width="85">
-                                Permissions:
-                        </text>
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom_delta="-20" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
-                             mouse_opaque="true" name="perm_modify" v_pad="0" width="250">
-                                You can modify this object.
-                        </text>
-                        <check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
-                             initial_value="false" label="Share with group" left="10"
-                             mouse_opaque="true" name="checkbox share with group"
-                             tool_tip="Allow group members to move, modify, copy and delete."
-                             width="166" />
-                        <string name="text deed continued">
-                                Deed...
-                        </string>
-                        <string name="text deed">
-                                Deed
-                        </string>
-                        <button bottom="-186" follows="top|right" font="SansSerifSmall" halign="center"
-                             height="16" label="Deed..." label_selected="Deed..." left_delta="172"
-                             mouse_opaque="true" name="button deed" scale_image="TRUE"
-                             tool_tip="Group shared objects can be deeded by a group officer."
-                             width="78" />
-                        <check_box bottom="-206" follows="left|top" font="SansSerifSmall" height="16"
-                             initial_value="false" label="Allow anyone to move" left="10"
-                             mouse_opaque="true" name="checkbox allow everyone move" width="142" />
-                        <check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
-                             initial_value="false" label="Allow anyone to copy" left="10"
-                             mouse_opaque="true" name="checkbox allow everyone copy" width="141" />
-                        <check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
-                             initial_value="false" label="Show in search" left="10" name="search_check"
-                             tool_tip="Let people see this object in search results" width="78" />
-                        <check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
-                             initial_value="false" label="For Sale" left="10" mouse_opaque="true"
-                             name="checkbox for sale" width="78" />
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom_delta="0" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="100"
-                             mouse_opaque="true" name="Price:  L$" v_pad="0" width="56">
-                                Price:  L$
-                        </text>
-                        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="0"
-                             follows="left|top|right" font="SansSerifSmall" height="16" left_delta="56"
-                             max_length="25" mouse_opaque="true" name="EdCost" width="84" />
-                        <radio_group bottom="-286" draw_border="false" follows="left|top|right" height="16"
-                             left="42" mouse_opaque="true" name="sale type" width="218">
-                                <radio_item bottom="-16" follows="left|top" height="16" left="0" mouse_opaque="true"
-                                     name="Original" width="70">
-                                        Original
-                                </radio_item>
-                                <radio_item bottom="-16" follows="left|top" height="16" left="70" mouse_opaque="true"
-                                     name="Copy" width="70">
-                                        Copy
-                                </radio_item>
-                                <radio_item bottom="-16" follows="left|top" height="16" left="140" mouse_opaque="true"
-                                     name="Contents" width="76">
-                                        Contents
-                                </radio_item>
-                        </radio_group>
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-298" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
-                             mouse_opaque="true" name="Next owner can:" v_pad="0" width="250">
-                                Next owner can:
-                        </text>
-                        <check_box bottom_delta="-22" follows="left|top|right" font="SansSerifSmall" height="16"
-                             initial_value="false" label="Modify" left="10" mouse_opaque="true"
-                             name="checkbox next owner can modify" width="250" />
-                        <check_box bottom_delta="0" follows="left|top|right" font="SansSerifSmall" height="16"
-                             initial_value="false" label="Copy" left_delta="60" mouse_opaque="true"
-                             name="checkbox next owner can copy" width="190" />
-                        <check_box bottom_delta="0" follows="left|top|right" font="SansSerifSmall" height="16"
-                             initial_value="false" label="Resell/Give away" left_delta="60"
-                             mouse_opaque="true" name="checkbox next owner can transfer" width="130" />
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-332" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
-                             mouse_opaque="true" name="label click action" v_pad="0" width="150">
-                                When Left-Clicked:
-                        </text>
-                        <combo_box allow_text_entry="false" bottom_delta="-25" follows="left|top" height="18"
-                             left="10" max_chars="20" mouse_opaque="true" name="clickaction" width="150">
-                             <!-- Do not reorder these items, the index numbers are
-                                        used internally. JC -->
-                                <combo_item name="Touch/grab(default)" value="Touch/grab (default)">
-                                        Touch/grab (default)
-                                </combo_item>
-                                <combo_item name="Sitonobject" value="Sit on object">
-                                        Sit on object
-                                </combo_item>
-                                <combo_item name="Buyobject" value="Buy object">
-                                        Buy object
-                                </combo_item>
-                                <combo_item name="Payobject" value="Pay object">
-                                        Pay object
-                                </combo_item>
-                                <combo_item name="Open" value="Open">
-                                        Open
-                                </combo_item>
-                                <combo_item name="Play" value="Play">
-                                        Play parcel media
-                                </combo_item>
-                                <combo_item name="Opemmedia" value="Open Media">
-                                        Open parcel media
-                                </combo_item>
-                        </combo_box>
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-135" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="88"
-                             mouse_opaque="true" name="B:" v_pad="0" width="174">
-                                B:
-                        </text>
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-135" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="50"
-                             mouse_opaque="true" name="O:" v_pad="0" width="124">
-                                O;
-                        </text>
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-135" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="50"
-                             mouse_opaque="true" name="G:" v_pad="0" width="74">
-                                G:
-                        </text>
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-147" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="88"
-                             mouse_opaque="true" name="E:" v_pad="0" width="174">
-                                E:
-                        </text>
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-147" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="50"
-                             mouse_opaque="true" name="N:" v_pad="0" width="124">
-                                N:
-                        </text>
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-147" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="50"
-                             mouse_opaque="true" name="F:" v_pad="0" width="74">
-                                F:
-                        </text>
-                        <string name="text modify info 1">
-                                You can modify this object.
-                        </string>
-                        <string name="text modify info 2">
-                                You can modify these objects.
-                        </string>
-                        <string name="text modify info 3">
-                                You cannot modify this object.
-                        </string>
-                        <string name="text modify info 4">
-                                You cannot modify these objects.
-                        </string>
-                        <string name="text modify warning">
-                                Must select entire object to set permissions.
-                        </string>
-                </panel>
-
-<!-- Object sub-tab -->
-
-                <panel border="true" bottom="-383" follows="left|top|right|bottom" height="367"
-                     label="Object" left="1" mouse_opaque="false" name="Object" width="270">
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-20" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
-                             mouse_opaque="true" name="select_single" v_pad="0" width="252">
-                                Select only one primitive to edit parameters.
-                        </text>
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom_delta="0" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="0"
-                             mouse_opaque="true" name="edit_object" v_pad="0" width="252">
-                                Edit object parameters:
-                        </text>
-                        <check_box bottom_delta="-26" follows="left|top" font="SansSerifSmall" height="16"
-                             initial_value="false" label="Locked" left="8" mouse_opaque="true"
-                             name="checkbox locked"
-                             tool_tip="Prevents object from being moved or deleted. Frequently useful during building to avoid unintended edits."
-                             width="123" />
-                        <check_box bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16"
-                             initial_value="false" label="Physical" left="8" mouse_opaque="true"
-                             name="Physical Checkbox Ctrl"
-                             tool_tip="Allows object to be pushed and affected by gravity" width="123" />
-                        <check_box bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16"
-                             initial_value="false" label="Temporary" left="8" mouse_opaque="true"
-                             name="Temporary Checkbox Ctrl"
-                             tool_tip="Causes object to be deleted 1 minute after creation." width="123" />
-                        <check_box bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16"
-                             initial_value="false" label="Phantom" left="8" mouse_opaque="true"
-                             name="Phantom Checkbox Ctrl"
-                             tool_tip="Causes object to not collide with other objects or avatars"
-                             width="123" />
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom_delta="-14" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
-                             mouse_opaque="true" name="label position" v_pad="0" width="121">
-                                Position (meters)
-                        </text>
-                        <spinner bottom_delta="-20" decimal_digits="3" follows="left|top" height="16"
-                             increment="0.01" initial_val="0" label="X" label_width="10" left="10"
-                             max_val="512" min_val="-256" mouse_opaque="true" name="Pos X"
-                             text_enabled_color="110, 15, 15, 255" width="87" />
-                        <spinner bottom_delta="-18" decimal_digits="3" follows="left|top" height="16"
-                             increment="0.01" initial_val="0" label="Y" label_width="10" left="10"
-                             max_val="512" min_val="-256" mouse_opaque="true" name="Pos Y"
-                             text_enabled_color="0, 100, 40, 255" width="87" />
-                        <spinner bottom_delta="-18" decimal_digits="3" follows="left|top" height="16"
-                             increment="0.01" initial_val="0" label="Z" label_width="10" left="10"
-                             max_val="4096" min_val="0" mouse_opaque="true" name="Pos Z"
-                             text_enabled_color="0, 67, 132, 255" width="87" />
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom_delta="-16" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
-                             mouse_opaque="true" name="label size" v_pad="0" width="121">
-                                Size (meters)
-                        </text>
-                        <spinner bottom_delta="-20" decimal_digits="3" follows="left|top" height="16"
-                             increment="0.01" initial_val="0" label="X" label_width="10" left="10"
-                             max_val="10" min_val="0.01" mouse_opaque="true" name="Scale X"
-                             text_enabled_color="1, 1, 1, 1" width="87" />
-                        <spinner bottom_delta="-18" decimal_digits="3" follows="left|top" height="16"
-                             increment="0.01" initial_val="0" label="Y" label_width="10" left="10"
-                             max_val="10" min_val="0.01" mouse_opaque="true" name="Scale Y"
-                             text_enabled_color="1, 1, 1, 1" width="87" />
-                        <spinner bottom_delta="-18" decimal_digits="3" follows="left|top" height="16"
-                             increment="0.01" initial_val="0" label="Z" label_width="10" left="10"
-                             max_val="10" min_val="0.01" mouse_opaque="true" name="Scale Z"
-                             text_enabled_color="1, 1, 1, 1" width="87" />
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom_delta="-16" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
-                             mouse_opaque="true" name="label rotation" v_pad="0" width="121">
-                                Rotation (degrees)
-                        </text>
-                        <spinner bottom_delta="-22" decimal_digits="2" follows="left|top" height="16"
-                             increment="1" initial_val="0" label="X" label_width="10" left="10"
-                             max_val="9999" min_val="-9999" mouse_opaque="true" name="Rot X"
-                             text_enabled_color="1, 1, 1, 1" width="87" />
-                        <spinner bottom_delta="-18" decimal_digits="2" follows="left|top" height="16"
-                             increment="1" initial_val="0" label="Y" label_width="10" left="10"
-                             max_val="9999" min_val="-9999" mouse_opaque="true" name="Rot Y"
-                             text_enabled_color="1, 1, 1, 1" width="87" />
-                        <spinner bottom_delta="-18" decimal_digits="2" follows="left|top" height="16"
-                             increment="1" initial_val="0" label="Z" label_width="10" left="10"
-                             max_val="9999" min_val="-9999" mouse_opaque="true" name="Rot Z"
-                             text_enabled_color="1, 1, 1, 1" width="87" />
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom_delta="-16" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
-                             mouse_opaque="true" name="label material" v_pad="0" width="121">
-                                Material
-                        </text>
-                        <combo_box allow_text_entry="false" bottom_delta="-22" follows="left|top" height="18"
-                             left="10" max_chars="20" mouse_opaque="true" name="material" width="87">
-                                <combo_item name="Stone" value="Stone">
-                                        Stone
-                                </combo_item>
-                                <combo_item name="Metal" value="Metal">
-                                        Metal
-                                </combo_item>
-                                <combo_item name="Glass" value="Glass">
-                                        Glass
-                                </combo_item>
-                                <combo_item name="Wood" value="Wood">
-                                        Wood
-                                </combo_item>
-                                <combo_item name="Flesh" value="Flesh">
-                                        Flesh
-                                </combo_item>
-                                <combo_item name="Plastic" value="Plastic">
-                                        Plastic
-                                </combo_item>
-                                <combo_item name="Rubber" value="Rubber">
-                                        Rubber
-                                </combo_item>
-                        </combo_box>
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-36" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="121"
-                             mouse_opaque="true" name="label basetype" v_pad="0" width="141">
-                                Building Block Type
-                        </text>
-                        <combo_box allow_text_entry="false" bottom_delta="-24" follows="left|top" height="18"
-                             left="121" max_chars="20" mouse_opaque="true" name="comboBaseType"
-                             width="141">
-                                <combo_item name="Box" value="Box">
-                                        Box
-                                </combo_item>
-                                <combo_item name="Cylinder" value="Cylinder">
-                                        Cylinder
-                                </combo_item>
-                                <combo_item name="Prism" value="Prism">
-                                        Prism
-                                </combo_item>
-                                <combo_item name="Sphere" value="Sphere">
-                                        Sphere
-                                </combo_item>
-                                <combo_item name="Torus" value="Torus">
-                                        Torus
-                                </combo_item>
-                                <combo_item name="Tube" value="Tube">
-                                        Tube
-                                </combo_item>
-                                <combo_item name="Ring" value="Ring">
-                                        Ring
-                                </combo_item>
-                                <combo_item name="Sculpted" value="Sculpted">
-                                        Sculpted
-                                </combo_item>
-                        </combo_box>
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom_delta="-12" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="121"
-                             mouse_opaque="true" name="text cut" v_pad="0" width="141">
-                                Path Cut Begin and End
-                        </text>
-                        <spinner bottom_delta="-22" decimal_digits="3" follows="left|top" height="16"
-                             increment="0.05" initial_val="0" label="B" label_width="10" left="121"
-                             max_val="0.98" min_val="0" mouse_opaque="true" name="cut begin" width="68" />
-                        <spinner bottom_delta="0" decimal_digits="3" follows="left|top" height="16"
-                             increment="0.05" initial_val="1" label="E" label_width="10" left_delta="73"
-                             max_val="1" min_val="0.02" mouse_opaque="true" name="cut end" width="68" />
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom_delta="-14" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="121"
-                             mouse_opaque="true" name="text hollow" v_pad="0" width="68">
-                                Hollow
-                        </text>
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom_delta="0" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="78"
-                             mouse_opaque="true" name="text skew" v_pad="0" width="63">
-                                Skew
-                        </text>
-                        <spinner bottom_delta="-20" decimal_digits="1" follows="left|top" height="16"
-                             increment="5" initial_val="0" left="121" max_val="95" min_val="0"
-                             mouse_opaque="true" name="Scale 1" width="68" />
-                        <spinner bottom_delta="0" decimal_digits="2" follows="left|top" height="16"
-                             increment="0.05" initial_val="0" left_delta="73" max_val="0.95"
-                             min_val="-0.95" mouse_opaque="true" name="Skew" width="68" />
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom_delta="-15" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="121"
-                             mouse_opaque="true" name="Hollow Shape" v_pad="0" width="141">
-                                Hollow Shape
-                        </text>
-                        <combo_box allow_text_entry="false" bottom_delta="-24" follows="left|top" height="18"
-                             left="121" max_chars="20" mouse_opaque="true" name="hole" width="141">
-                                <combo_item name="Default" value="Default">
-                                        Default
-                                </combo_item>
-                                <combo_item name="Circle" value="Circle">
-                                        Circle
-                                </combo_item>
-                                <combo_item name="Square" value="Square">
-                                        Square
-                                </combo_item>
-                                <combo_item name="Triangle" value="Triangle">
-                                        Triangle
-                                </combo_item>
-                        </combo_box>
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom_delta="-12" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="121"
-                             mouse_opaque="true" name="text twist" v_pad="0" width="141">
-                                Twist Begin and End
-                        </text>
-                        <spinner bottom_delta="-22" decimal_digits="0" follows="left|top" height="16"
-                             increment="9" initial_val="0" label="B" label_width="10" left="121"
-                             max_val="180" min_val="-180" mouse_opaque="true" name="Twist Begin"
-                             width="68" />
-                        <spinner bottom_delta="0" decimal_digits="0" follows="left|top" height="16"
-                             increment="9" initial_val="0" label="E" label_width="10" left_delta="73"
-                             max_val="180" min_val="-180" mouse_opaque="true" name="Twist End"
-                             width="68" />
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom_delta="-14" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="121"
-                             mouse_opaque="true" name="scale_taper" v_pad="0" width="141">
-                                Taper
-                        </text>
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom_delta="0" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="121"
-                             mouse_opaque="true" name="scale_hole" v_pad="0" width="141">
-                                Hole Size
-                        </text>
-                        <spinner bottom_delta="-20" decimal_digits="2" follows="left|top" height="16"
-                             increment="0.05" initial_val="0" label="X" label_width="10" left="121"
-                             max_val="1" min_val="-1" mouse_opaque="true" name="Taper Scale X"
-                             width="68" />
-                        <spinner bottom_delta="0" decimal_digits="2" follows="left|top" height="16"
-                             increment="0.05" initial_val="0" label="Y" label_width="10" left_delta="73"
-                             max_val="1" min_val="-1" mouse_opaque="true" name="Taper Scale Y"
-                             width="68" />
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom_delta="-14" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="121"
-                             mouse_opaque="true" name="text topshear" v_pad="0" width="141">
-                                Top Shear
-                        </text>
-                        <spinner bottom_delta="-20" decimal_digits="2" follows="left|top" height="16"
-                             increment="0.05" initial_val="0" label="X" label_width="10" left="121"
-                             max_val="0.5" min_val="-0.5" mouse_opaque="true" name="Shear X" width="68" />
-                        <spinner bottom_delta="0" decimal_digits="2" follows="left|top" height="16"
-                             increment="0.05" initial_val="0" label="Y" label_width="10" left_delta="73"
-                             max_val="0.5" min_val="-0.5" mouse_opaque="true" name="Shear Y" width="68" />
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom_delta="-14" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="121"
-                             mouse_opaque="true" name="advanced_cut" v_pad="0" width="141">
-                                Profile Cut Begin and End
-                        </text>
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom_delta="0" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="0"
-                             mouse_opaque="true" name="advanced_dimple" v_pad="0" width="141">
-                                Dimple Begin and End
-                        </text>
-                        <spinner bottom_delta="-19" decimal_digits="3" follows="left|top" height="16"
-                             increment="0.05" initial_val="0" label="B" label_width="10" left="121"
-                             max_val="0.95" min_val="0" mouse_opaque="true" name="Path Limit Begin"
-                             width="68" />
-                        <spinner bottom_delta="0" decimal_digits="3" follows="left|top" height="16"
-                             increment="0.05" initial_val="1" label="E" label_width="10" left_delta="73"
-                             max_val="1" min_val="0.05" mouse_opaque="true" name="Path Limit End"
-                             width="68" />
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom_delta="-14" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="121"
-                             mouse_opaque="true" name="text taper2" v_pad="0" width="141">
-                                Taper
-                        </text>
-                        <spinner bottom_delta="-19" decimal_digits="2" follows="left|top" height="16"
-                             increment="0.05" initial_val="0" label="X" label_width="10" left="121"
-                             max_val="1" min_val="-1" mouse_opaque="true" name="Taper X" width="68" />
-                        <spinner bottom_delta="0" decimal_digits="2" follows="left|top" height="16"
-                             increment="0.05" initial_val="0" label="Y" label_width="10" left_delta="73"
-                             max_val="1" min_val="-1" mouse_opaque="true" name="Taper Y" width="68" />
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom_delta="-12" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="121"
-                             mouse_opaque="true" name="text radius delta" v_pad="0" width="78">
-                                Radius
-                        </text>
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom_delta="0" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="73"
-                             mouse_opaque="true" name="text revolutions" v_pad="0" width="68">
-                                Revolutions
-                        </text>
-                        <spinner bottom_delta="-19" decimal_digits="3" follows="left|top" height="16"
-                             increment="0.05" initial_val="0" left="121" max_val="1" min_val="-1"
-                             mouse_opaque="true" name="Radius Offset" width="68" />
-                        <spinner bottom_delta="0" decimal_digits="2" follows="left|top" height="16"
-                             increment="0.1" initial_val="1" left_delta="73" max_val="4" min_val="1"
-                             mouse_opaque="true" name="Revolutions" width="68" />
-                        <texture_picker allow_no_texture="false" bottom="-211" can_apply_immediately="true"
-                             default_image_name="Default" follows="left|top" height="141"
-                             label="Sculpt Texture" left="121" mouse_opaque="true"
-                             name="sculpt texture control" tool_tip="Click to choose a picture"
-                             visible="false" width="141" />
-                        <text align="left" bg_visible="false" border_drop_shadow_visible="false"
-                             border_visible="false" bottom_delta="-20" drop_shadow_visible="true"
-                             follows="left|top" font="SansSerifSmall" h_pad="0" height="10" left="121"
-                             mouse_opaque="true" name="label sculpt type" v_pad="0" visible="false"
-                             width="121">
-                                Stitching type
-                        </text>
-                        <combo_box allow_text_entry="false" bottom_delta="-24" follows="left|top" height="18"
-                             left="121" max_chars="20" mouse_opaque="true" name="sculpt type control"
-                             visible="false" width="141">
-                                <combo_item name="None" value="None">
-                                        (none)
-                                </combo_item>
-                                <combo_item name="Sphere" value="Sphere">
-                                        Sphere
-                                </combo_item>
-                                <combo_item name="Torus" value="Torus">
-                                        Torus
-                                </combo_item>
-                                <combo_item name="Plane" value="Plane">
-                                        Plane
-                                </combo_item>
-                                <combo_item name="Cylinder" value="Cylinder">
-                                        Cylinder
-                                </combo_item>
-                        </combo_box>
-                </panel>
-
-<!-- Features sub-tab -->
-
-                <panel border="true" bottom="-383" follows="left|top|right|bottom" height="367"
-                     label="Features" left="1" mouse_opaque="false" name="Features" width="270">
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-20" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
-                             mouse_opaque="true" name="select_single" v_pad="0" width="252">
-                                Select only one primitive to edit features.
-                        </text>
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom_delta="0" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
-                             mouse_opaque="true" name="edit_object" v_pad="0" width="252">
-                                Edit object features:
-                        </text>
-                        <check_box bottom_delta="-26" follows="left|top" font="SansSerifSmall" height="16"
-                             initial_value="false" label="Flexible Path" left="10" mouse_opaque="true"
-                             name="Flexible1D Checkbox Ctrl"
-                             tool_tip="Allows object to flex about the Z axis. (Client-side only)"
-                             width="121" />
-                        <spinner bottom_delta="-20" decimal_digits="3" follows="left|top" height="16"
-                             increment="1" initial_val="2" label="Softness" label_width="65" left="10"
-                             max_val="3" min_val="0" mouse_opaque="true" name="FlexNumSections"
-                             width="128" />
-                        <spinner bottom_delta="-20" decimal_digits="3" follows="left|top" height="16"
-                             increment="0.5" initial_val="0.3" label="Gravity" label_width="65"
-                             left="10" max_val="10" min_val="-10" mouse_opaque="true" name="FlexGravity"
-                             width="128" />
-                        <spinner bottom_delta="-20" decimal_digits="3" follows="left|top" height="16"
-                             increment="0.5" initial_val="2" label="Drag" label_width="65" left="10"
-                             max_val="10" min_val="0" mouse_opaque="true" name="FlexFriction"
-                             width="128" />
-                        <spinner bottom_delta="-20" decimal_digits="3" follows="left|top" height="16"
-                             increment="0.5" initial_val="0" label="Wind" label_width="65" left="10"
-                             max_val="10" min_val="0" mouse_opaque="true" name="FlexWind" width="128" />
-                        <spinner bottom_delta="-20" decimal_digits="3" follows="left|top" height="16"
-                             increment="0.5" initial_val="1" label="Tension" label_width="65" left="10"
-                             max_val="10" min_val="0" mouse_opaque="true" name="FlexTension" width="128" />
-                        <spinner bottom_delta="-20" decimal_digits="3" follows="left|top" height="16"
-                             increment="0.01" initial_val="0" label="Force X" label_width="65" left="10"
-                             max_val="10" min_val="-10" mouse_opaque="true" name="FlexForceX"
-                             width="128" />
-                        <spinner bottom_delta="-20" decimal_digits="3" follows="left|top" height="16"
-                             increment="0.01" initial_val="0" label="Force Y" label_width="65" left="10"
-                             max_val="10" min_val="-10" mouse_opaque="true" name="FlexForceY"
-                             width="128" />
-                        <spinner bottom_delta="-20" decimal_digits="3" follows="left|top" height="16"
-                             increment="0.01" initial_val="0" label="Force Z" label_width="65" left="10"
-                             max_val="10" min_val="-10" mouse_opaque="true" name="FlexForceZ"
-                             width="128" />
-                        <check_box bottom_delta="-30" follows="left|top" font="SansSerifSmall" height="16"
-                             initial_value="false" label="Light" left="10" mouse_opaque="true"
-                             name="Light Checkbox Ctrl" tool_tip="Causes object to emit light"
-                             width="121" />
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom_delta="-21" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="0"
-                             mouse_opaque="true" name="label color" v_pad="0" width="58">
-                                Color
-                        </text>
-                        <color_swatch border_color="0.45098, 0.517647, 0.607843, 1" bottom_delta="-28"
-                             can_apply_immediately="true" color="0.5, 0.5, 0.5, 1" follows="left|top"
-                             height="48" label="" left_delta="67" mouse_opaque="true" name="colorswatch"
-                             tool_tip="Click to open Color Picker" width="32" />
-                        <spinner bottom_delta="-4" decimal_digits="3" follows="left|top" height="16"
-                             increment="0.1" initial_val="0.5" label="Intensity" label_width="65"
-                             left="10" max_val="1" min_val="0" mouse_opaque="true"
-                             name="Light Intensity" width="128" />
-                        <spinner bottom_delta="-20" decimal_digits="3" follows="left|top" height="16"
-                             increment="0.1" initial_val="5" label="Radius" label_width="65"
-                             left_delta="0" max_val="20" min_val="0" mouse_opaque="true"
-                             name="Light Radius" width="128" />
-                        <spinner bottom_delta="-20" decimal_digits="3" follows="left|top" height="16"
-                             increment="0.25" initial_val="1" label="Falloff" label_width="65"
-                             left_delta="0" max_val="2" min_val="0" mouse_opaque="true"
-                             name="Light Falloff" width="128" />
-                </panel>
-
-<!-- Texture sub-tab -->
-
-                <panel border="true" bottom="-383" follows="left|top|right|bottom" height="367"
-                     label="Texture" left="1" mouse_opaque="false" name="Texture" width="270">
-                        <texture_picker allow_no_texture="false" bottom="-90" can_apply_immediately="true"
-                             default_image_name="Default" follows="left|top" height="80" label="Texture"
-                             left="10" mouse_opaque="true" name="texture control"
-                             tool_tip="Click to choose a picture" width="64" />
-                        <color_swatch border_color="0.45098, 0.517647, 0.607843, 1" bottom="-90"
-                             can_apply_immediately="true" color="1, 1, 1, 1" follows="left|top"
-                             height="80" label="Color" left_delta="90" mouse_opaque="true"
-                             name="colorswatch" tool_tip="Click to open Color Picker" width="64" />
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-11" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="180"
-                             mouse_opaque="true" name="color trans" v_pad="0" width="80">
-                                Transparency %
-                        </text>
-                        <spinner bottom_delta="-20" decimal_digits="0" follows="left|top" height="16"
-                             increment="2" initial_val="0" left="180" max_val="90" min_val="0"
-                             mouse_opaque="true" name="ColorTrans" width="80" />
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom_delta="-12" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="10"
-                             left="180" mouse_opaque="true" name="glow label" v_pad="0" width="80">
-                                Glow
-                        </text>
-                        <spinner bottom_delta="-20" decimal_digits="2" follows="left|top" height="16"
-                             increment="0.1" initial_val="0" left="180" max_val="1"
-                             min_val="0" mouse_opaque="true" name="glow" width="80" />
-                        <check_box bottom_delta="-23" follows="left|top" font="SansSerifSmall" height="16"
-                             initial_value="false" label="Full Bright" left="180" mouse_opaque="true"
-                             name="checkbox fullbright" width="81" />
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-104" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
-                             mouse_opaque="true" name="tex gen" v_pad="0" width="90">
-                                Mapping
-                        </text>
-                        <combo_box allow_text_entry="false" bottom_delta="-22" follows="left|top" height="18"
-                             left="10" max_chars="20" mouse_opaque="true" name="combobox texgen"
-                             width="80">
-                                <combo_item name="Default" value="Default">
-                                        Default
-                                </combo_item>
-                                <combo_item name="Planar" value="Planar">
-                                        Planar
-                                </combo_item>
-                        </combo_box>
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-104" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="100"
-                             mouse_opaque="true" name="label shininess" v_pad="0" width="70">
-                                Shininess
-                        </text>
-                        <combo_box allow_text_entry="false" bottom_delta="-22" follows="left|top" height="18"
-                             left="100" max_chars="20" mouse_opaque="true" name="combobox shininess"
-                             width="70">
-                                <combo_item name="None" value="None">
-                                        None
-                                </combo_item>
-                                <combo_item name="Low" value="Low">
-                                        Low
-                                </combo_item>
-                                <combo_item name="Medium" value="Medium">
-                                        Medium
-                                </combo_item>
-                                <combo_item name="High" value="High">
-                                        High
-                                </combo_item>
-                        </combo_box>
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-104" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="180"
-                             mouse_opaque="true" name="label bumpiness" v_pad="0" width="80">
-                                Bumpiness
-                        </text>
-                        <combo_box allow_text_entry="false" bottom_delta="-22" follows="left|top" height="18"
-                             left="180" max_chars="20" mouse_opaque="true" name="combobox bumpiness"
-                             width="80">
-                                <combo_item name="None" value="None">
-                                        None
-                                </combo_item>
-                                <combo_item name="Brightness" value="Brightness">
-                                        Brightness
-                                </combo_item>
-                                <combo_item name="Darkness" value="Darkness">
-                                        Darkness
-                                </combo_item>
-                                <combo_item name="woodgrain" value="woodgrain">
-                                        woodgrain
-                                </combo_item>
-                                <combo_item name="bark" value="bark">
-                                        bark
-                                </combo_item>
-                                <combo_item name="bricks" value="bricks">
-                                        bricks
-                                </combo_item>
-                                <combo_item name="checker" value="checker">
-                                        checker
-                                </combo_item>
-                                <combo_item name="concrete" value="concrete">
-                                        concrete
-                                </combo_item>
-                                <combo_item name="crustytile" value="crustytile">
-                                        crustytile
-                                </combo_item>
-                                <combo_item name="cutstone" value="cutstone">
-                                        cutstone
-                                </combo_item>
-                                <combo_item name="discs" value="discs">
-                                        discs
-                                </combo_item>
-                                <combo_item name="gravel" value="gravel">
-                                        gravel
-                                </combo_item>
-                                <combo_item name="petridish" value="petridish">
-                                        petridish
-                                </combo_item>
-                                <combo_item name="siding" value="siding">
-                                        siding
-                                </combo_item>
-                                <combo_item name="stonetile" value="stonetile">
-                                        stonetile
-                                </combo_item>
-                                <combo_item name="stucco" value="stucco">
-                                        stucco
-                                </combo_item>
-                                <combo_item name="suction" value="suction">
-                                        suction
-                                </combo_item>
-                                <combo_item name="weave" value="weave">
-                                        weave
-                                </combo_item>
-                        </combo_box>
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-158" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
-                             mouse_opaque="true" name="tex scale" v_pad="0" width="160">
-                                Repeats per Face
-                        </text>
-                        <spinner bottom="-178" decimal_digits="3" follows="left|top" height="16" increment="0.1"
-                             initial_val="0" label="Horizontal (U)" label_width="90" left="20"
-                             max_val="100" min_val="0" mouse_opaque="true" name="TexScaleU" width="160" />
-                        <check_box bottom="-179" follows="left|top" font="SansSerifSmall" height="16"
-                             initial_value="false" label="Flip" left_delta="170" mouse_opaque="true"
-                             name="checkbox flip s" width="70" />
-                        <spinner bottom="-196" decimal_digits="3" follows="left|top" height="16" increment="0.1"
-                             initial_val="0" label="Vertical (V)" label_width="90" left="20"
-                             max_val="100" min_val="0" mouse_opaque="true" name="TexScaleV" width="160" />
-                        <check_box bottom="-197" follows="left|top" font="SansSerifSmall" height="16"
-                             initial_value="false" label="Flip" left_delta="170" mouse_opaque="true"
-                             name="checkbox flip t" width="70" />
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-228" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
-                             mouse_opaque="true" name="tex rotate" v_pad="0" width="102">
-                                Rotation (degrees)
-                        </text>
-                        <spinner bottom="-234" decimal_digits="2" follows="left|top" height="16" increment="1"
-                             initial_val="0" left="112" max_val="9999" min_val="-9999"
-                             mouse_opaque="true" name="TexRot" width="68" />
-                        <string name="string repeats per meter">
-                                Repeats Per Meter
-                        </string>
-                        <string name="string repeats per face">
-                                Repeats Per Face
-                        </string>
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-250" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
-                             mouse_opaque="true" name="rpt" v_pad="0" width="160">
-                                Repeats Per Meter
-                        </text>
-                        <spinner bottom="-256" decimal_digits="1" follows="left|top" height="16" increment="0.1"
-                             initial_val="1" left="112" max_val="10" min_val="0.1" mouse_opaque="true"
-                             name="rptctrl" width="68" />
-                        <button bottom="-256" follows="left|top" font="SansSerifSmall" halign="center"
-                             height="16" label="Apply" label_selected="Apply" left_delta="78"
-                             mouse_opaque="true" name="button apply" scale_image="TRUE" width="75" />
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-288" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
-                             mouse_opaque="true" name="tex offset" v_pad="0" width="160">
-                                Offset
-                        </text>
-                        <spinner bottom="-308" decimal_digits="3" follows="left|top" height="16" increment="0.1"
-                             initial_val="0" label="Horizontal (U)" label_width="90" left="20"
-                             max_val="1" min_val="-1" mouse_opaque="true" name="TexOffsetU" width="160" />
-                        <spinner bottom_delta="-18" decimal_digits="3" follows="left|top" height="16"
-                             increment="0.1" initial_val="0" label="Vertical (V)" label_width="90"
-                             left="20" max_val="1" min_val="-1" mouse_opaque="true" name="TexOffsetV"
-                             width="160" />
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-352" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="20" left="10"
-                             mouse_opaque="true" name="textbox autofix" v_pad="0" width="160">
-                                Align media texture
-(must load first)
-                        </text>
-                        <button bottom="-360" follows="left|top" font="SansSerifSmall" halign="center"
-                             height="16" label="Align" label_selected="Align" left="112"
-                             mouse_opaque="true" name="button align" scale_image="TRUE" width="68" />
-                </panel>
-                <panel border="true" bottom="-383" follows="left|top|right|bottom" height="367"
-                     label="Content" left="1" mouse_opaque="false" name="Contents" width="270">
-                        <button bottom="-30" follows="left|top" font="SansSerif" halign="center" height="20"
-                              label="New Script..." label_selected="New Script..."
-                             left="10" mouse_opaque="true" name="button new script" scale_image="TRUE"
-                             width="130" />
-                        <panel bottom_delta="-330" follows="left|top" height="325"  left="10"
-                             mouse_opaque="true" name="ContentsInventory" width="252" />
-                </panel>
-        </tab_container>
-
-<!-- Land Info sub-tab -->
-
-        <panel bottom="-550" follows="left|top" height="384" left="0" mouse_opaque="true"
-             name="land info panel" width="272">
-                <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                     bottom="-18" drop_shadow_visible="true" follows="left|top"
-                     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
-                     mouse_opaque="true" name="label_area_price" v_pad="0" width="150">
-                        Price: L$[PRICE] for [AREA] sq. m.
-                </text>
-                <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                     bottom_delta="0" drop_shadow_visible="true" follows="left|top"
-                     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
-                     mouse_opaque="true" name="label_area" v_pad="0" width="72">
-                        Area: [AREA] sq. m.
-                </text>
-                <button bottom_delta="-38" follows="left|top" font="SansSerif" halign="center"
-                     height="20" label="Buy Land..." label_selected="Buy Land..." left="76"
-                     mouse_opaque="true" name="button buy land" scale_image="TRUE" width="102" />
-                <button bottom_delta="-24" follows="left|top" font="SansSerif" halign="center"
-                     height="20" label="Abandon Land..." label_selected="Abandon Land..."
-                     left="76" mouse_opaque="true" name="button abandon land" scale_image="TRUE"
-                     width="102" />
-                <button bottom_delta="-24" follows="left|top" font="SansSerif" halign="center"
-                     height="20" label="Subdivide..." label_selected="Subdivide..." left="76"
-                     mouse_opaque="true" name="button subdivide land" scale_image="TRUE"
-                     width="102" />
-                <button bottom_delta="-24" follows="left|top" font="SansSerif" halign="center"
-                     height="20" label="Join..." label_selected="Join..." left="76"
-                     mouse_opaque="true" name="button join land" scale_image="TRUE" width="102" />
-                <button bottom_delta="-40" follows="left|top" font="SansSerif" halign="center"
-                     height="20" label="About Land..." label_selected="About Land..." left="76"
-                     mouse_opaque="true" name="button about land" scale_image="TRUE" width="102" />
-        </panel>
-        <string name="status_rotate">
-                Drag colored bands to rotate object
-        </string>
-        <string name="status_scale">
-                Click and drag to stretch selected side
-        </string>
-        <string name="status_move">
-                Drag to move, shift-drag to copy
-        </string>
-        <string name="status_modifyland">
-                Click and hold to modify land
-        </string>
-        <string name="status_camera">
-                Click and drag to change view
-        </string>
-        <string name="status_grab">
-                Drag to move objects, Ctrl to lift, Ctrl-Shift to spin
-        </string>
-        <string name="status_place">
-                Click in the world to create, shift-click to select
-        </string>
-        <string name="status_selectland">
-                Click and drag to select land
-        </string>
-        <string name="grid_screen_text">
-                Screen
-        </string>
-        <string name="grid_local_text">
-                Local
-        </string>
-        <string name="grid_world_text">
-                World
-        </string>
-        <string name="grid_reference_text">
-                Reference
-        </string>
-        <string name="grid_attachment_text">
-                Attachment
-        </string>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

+<floater bottom="-359" can_close="true" can_drag_on_left="false" can_minimize="true"

+     can_resize="false" follows="left|top" height="550" 

+     left="308" min_height="100" min_width="100" mouse_opaque="true"

+     name="toolbox floater" rect_control="ToolboxRect" sound_flags="0" title=""

+     width="272">

+

+<!-- Main floater tabs -->

+

+        <button bottom="-34" follows="left|top" font="SansSerif" halign="center" height="32"

+             image_disabled="tool_zoom.tga"

+             image_disabled_selected="tool_zoom_active.tga"

+             image_selected="tool_zoom_active.tga" image_unselected="tool_zoom.tga"

+             label="" label_selected="" left="4" mouse_opaque="true" name="button focus"

+             tool_tip="Focus" width="32" />

+        <button bottom="-34" follows="left|top" font="SansSerif" halign="center" height="32"

+             image_disabled="UIImgGrabUUID"

+             image_disabled_selected="UIImgGrabSelectedUUID"

+             image_selected="UIImgGrabSelectedUUID" image_unselected="UIImgGrabUUID"

+             label="" label_selected="" left="40" mouse_opaque="true" name="button move"

+             tool_tip="Move" width="32" />

+        <button bottom="-34" follows="left|top" font="SansSerif" halign="center" height="32"

+             image_disabled="UIImgFaceUUID"

+             image_disabled_selected="UIImgFaceSelectedUUID"

+             image_selected="UIImgFaceSelectedUUID" image_unselected="UIImgFaceUUID"

+             label="" label_selected="" left="76" mouse_opaque="true" name="button edit"

+             tool_tip="Edit" width="32" />

+        <button bottom="-34" follows="left|top" font="SansSerif" halign="center" height="32"

+             image_disabled="UIImgCreateUUID"

+             image_disabled_selected="UIImgCreateSelectedUUID"

+             image_selected="UIImgCreateSelectedUUID" image_unselected="UIImgCreateUUID"

+             label="" label_selected="" left="112" mouse_opaque="true"

+             name="button create" tool_tip="Create" width="32" />

+        <button bottom="-34" follows="left|top" font="SansSerif" halign="center" height="32"

+             image_disabled="tool_dozer.tga"

+             image_disabled_selected="tool_dozer_active.tga"

+             image_selected="tool_dozer_active.tga" image_unselected="tool_dozer.tga"

+             label="" label_selected="" left="148" mouse_opaque="true"

+             name="button land" tool_tip="Land" width="32" />

+

+<!-- Focus panel -->

+

+        <check_box bottom="-70" follows="left|top" font="SansSerifSmall" height="16"

+             initial_value="false" label="Zoom" left="4" mouse_opaque="true"

+             name="radio zoom" radio_style="true" width="114" />

+        <volume_slider bottom="-69" follows="left|top" height="14" increment="0.01"

+             initial_val="0.125" left="114" max_val="0.5" min_val="0"

+             mouse_opaque="true" name="slider zoom" width="134" />

+        <check_box bottom="-84" follows="left|top" font="SansSerifSmall" height="16"

+             initial_value="false" label="Orbit (Ctrl)" left="4" mouse_opaque="true"

+             name="radio orbit" radio_style="true" width="114" />

+        <check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"

+             initial_value="false" label="Pan (Ctrl-Shift)" left="4"

+             mouse_opaque="true" name="radio pan" radio_style="true" width="114" />

+

+<!-- Move panel -->

+

+        <check_box bottom="-70" follows="left|top" font="SansSerifSmall" height="16"

+             initial_value="false" label="Move" left="4" mouse_opaque="true"

+             name="radio move" radio_style="true" width="114" />

+        <check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"

+             initial_value="false" label="Lift (Ctrl)" left="4" mouse_opaque="true"

+             name="radio lift" radio_style="true" width="114" />

+        <check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"

+             initial_value="false" label="Spin (Ctrl-Shift)" left="4"

+             mouse_opaque="true" name="radio spin" radio_style="true" width="114" />

+

+<!-- Edit panel -->

+

+        <check_box bottom="-70" follows="left|top" font="SansSerifSmall" height="16"

+             initial_value="false" label="Position" left="4" mouse_opaque="true"

+             name="radio position" radio_style="true" width="114" />

+        <check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"

+             initial_value="false" label="Rotate (Ctrl)" left="4" mouse_opaque="true"

+             name="radio rotate" radio_style="true" width="114" />

+        <check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"

+             initial_value="false" label="Stretch (Ctrl-Shift)" left="4"

+             mouse_opaque="true" name="radio stretch" radio_style="true" width="123" />

+        <check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"

+             initial_value="false" label="Select Texture" left="4" mouse_opaque="true"

+             name="radio select face" radio_style="true" width="114" />

+        <check_box bottom_delta="-19" control_name="EditLinkedParts" follows="left|top"

+             font="SansSerifSmall" height="16" initial_value="false"

+             label="Edit linked parts" left="4" mouse_opaque="true"

+             name="checkbox edit linked parts" width="114" />

+        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

+             bottom_delta="-20" drop_shadow_visible="true" follows="left|top"

+             font="SansSerifSmall" h_pad="0" halign="left" height="14" left="6"

+             mouse_opaque="true" name="text ruler mode" v_pad="0" width="68">

+                Ruler mode:

+        </text>

+        <combo_box allow_text_entry="false" bottom_delta="-4" follows="left|top" height="20"

+             left_delta="74" max_chars="20" mouse_opaque="true"

+             name="combobox grid mode" width="86">

+                <combo_item name="World" value="World">

+                        World

+                </combo_item>

+                <combo_item name="Local" value="Local">

+                        Local

+                </combo_item>

+                <combo_item name="Reference" value="Reference">

+                        Reference

+                </combo_item>

+        </combo_box>

+        <check_box bottom="-70" control_name="ScaleUniform" follows="left|top"

+             font="SansSerifSmall" height="16" initial_value="false"

+             label="Stretch Both Sides" left="143" mouse_opaque="true"

+             name="checkbox uniform" width="134" />

+        <check_box bottom_delta="-15" control_name="ScaleStretchTextures" follows="left|top"

+             font="SansSerifSmall" height="16" initial_value="true"

+             label="Stretch Textures" left_delta="0" mouse_opaque="true"

+             name="checkbox stretch textures" width="134" />

+        <check_box bottom_delta="-19" control_name="SnapEnabled" follows="left|top"

+             font="SansSerifSmall" height="16" initial_value="true" label="Use Grid"

+             left_delta="0" mouse_opaque="true" name="checkbox snap to grid" width="134" />

+        <button bottom_delta="-14" follows="left|top" font="SansSerifSmall" halign="center"

+             height="16" label="Options..." label_selected="Options..." left_delta="20"

+             mouse_opaque="true" name="Options..." scale_image="TRUE" width="80" />

+

+<!-- Help text -->

+

+        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

+             bottom="-52" drop_shadow_visible="true" follows="left|top"

+             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"

+             mouse_opaque="true" name="text status" v_pad="0" width="264">

+                Drag to move, shift-drag to copy

+        </text>

+

+<!-- Create panel -->

+

+        <button bottom="-78" follows="left|top" font="SansSerif" halign="center" height="30"

+             image_disabled="object_cube.tga"

+             image_disabled_selected="object_cube_active.tga"

+             image_selected="object_cube_active.tga" image_unselected="object_cube.tga"

+             label="" label_selected="" left="4" mouse_opaque="true" name="ToolCube"

+             scale_image="TRUE" width="30" tool_tip="Cube"/>

+        <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"

+             height="30" image_disabled="object_prism.tga"

+             image_disabled_selected="object_prism_active.tga"

+             image_selected="object_prism_active.tga"

+             image_unselected="object_prism.tga" label="" label_selected=""

+             left_delta="28" mouse_opaque="true" name="ToolPrism" scale_image="TRUE"

+        tool_tip="Prism" width="30" />

+        <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"

+             height="30" image_disabled="object_pyramid.tga"

+             image_disabled_selected="object_pyramid_active.tga"

+             image_selected="object_pyramid_active.tga"

+             image_unselected="object_pyramid.tga" label="" label_selected=""

+             left_delta="28" mouse_opaque="true" name="ToolPyramid" scale_image="TRUE"

+ tool_tip="Pyramid" width="30" />

+        <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"

+             height="30" image_disabled="object_tetrahedron.tga"

+             image_disabled_selected="object_tetrahedron_active.tga"

+             image_selected="object_tetrahedron_active.tga"

+             image_unselected="object_tetrahedron.tga" label="" label_selected=""

+             left_delta="23" mouse_opaque="true" name="ToolTetrahedron"

+             scale_image="TRUE" tool_tip="Tetrahedron" width="30" />

+        <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"

+             height="30" image_disabled="object_cylinder.tga"

+             image_disabled_selected="object_cylinder_active.tga"

+             image_selected="object_cylinder_active.tga"

+             image_unselected="object_cylinder.tga" label="" label_selected=""

+             left_delta="23" mouse_opaque="true" tool_tip="Cylinder" name="ToolCylinder" scale_image="TRUE"

+             width="30" />

+        <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"

+             height="30" image_disabled="object_hemi_cylinder.tga"

+             image_disabled_selected="object_hemi_cylinder_active.tga"

+             image_selected="object_hemi_cylinder_active.tga"

+             image_unselected="object_hemi_cylinder.tga" label="" label_selected=""

+             left_delta="23" mouse_opaque="true" name="ToolHemiCylinder"

+             scale_image="TRUE" tool_tip="Hemicylinder" width="30" />

+        <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"

+             height="30" image_disabled="object_cone.tga"

+             image_disabled_selected="object_cone_active.tga"

+             image_selected="object_cone_active.tga" image_unselected="object_cone.tga"

+             label="" label_selected="" left_delta="23" mouse_opaque="true"

+             name="ToolCone" scale_image="TRUE" tool_tip="Cone" width="30" />

+        <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"

+             height="30" image_disabled="object_hemi_cone.tga"

+             image_disabled_selected="object_hemi_cone_active.tga"

+             image_selected="object_hemi_cone_active.tga"

+             image_unselected="object_hemi_cone.tga" label="" label_selected=""

+             left_delta="23" mouse_opaque="true" name="ToolHemiCone" scale_image="TRUE"

+      tool_tip="Hemicone" width="30" />

+        <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"

+             height="30" image_disabled="object_sphere.tga"

+             image_disabled_selected="object_sphere_active.tga"

+             image_selected="object_sphere_active.tga"

+             image_unselected="object_sphere.tga" label="" label_selected=""

+             left_delta="23" mouse_opaque="true" name="ToolSphere" scale_image="TRUE"

+             width="30" tool_tip="Sphere" />

+        <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"

+             height="30" image_disabled="object_hemi_sphere.tga"

+             image_disabled_selected="object_hemi_sphere_active.tga"

+             image_selected="object_hemi_sphere_active.tga"

+             image_unselected="object_hemi_sphere.tga" label="" label_selected=""

+             left_delta="23" mouse_opaque="true" name="ToolHemiSphere"

+             scale_image="TRUE" tool_tip="Hemisphere" width="30" />

+        <button bottom_delta="-23" follows="left|top" font="SansSerif" halign="center"

+             height="30" image_disabled="object_torus.tga"

+             image_disabled_selected="object_torus_active.tga"

+             image_selected="object_torus_active.tga"

+             image_unselected="object_torus.tga" label="" label_selected="" left="4"

+             mouse_opaque="true" name="ToolTorus" scale_image="TRUE" tool_tip="Torus" width="30" />

+        <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"

+             height="30" image_disabled="object_tube.tga"

+             image_disabled_selected="object_tube_active.tga"

+             image_selected="object_tube_active.tga" image_unselected="object_tube.tga"

+             label="" label_selected="" left_delta="23" mouse_opaque="true"

+             name="ToolTube" scale_image="TRUE" tool_tip="Tube" width="30" />

+        <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"

+             height="30" image_disabled="object_ring.tga"

+             image_disabled_selected="object_ring_active.tga"

+             image_selected="object_ring_active.tga" image_unselected="object_ring.tga"

+             label="" label_selected="" left_delta="23" mouse_opaque="true"

+             name="ToolRing" scale_image="TRUE" tool_tip="Ring" width="30" />

+        <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"

+             height="30" image_disabled="object_tree.tga"

+             image_disabled_selected="object_tree_active.tga"

+             image_selected="object_tree_active.tga" image_unselected="object_tree.tga"

+             label="" label_selected="" left_delta="23" mouse_opaque="true"

+             name="ToolTree" scale_image="TRUE" tool_tip="Tree" width="30" />

+        <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"

+             height="30" image_disabled="object_grass.tga"

+             image_disabled_selected="object_grass_active.tga"

+             image_selected="object_grass_active.tga"

+             image_unselected="object_grass.tga" label="" label_selected=""

+             left_delta="28" mouse_opaque="true" name="ToolGrass" scale_image="TRUE"

+             tool_tip="Grass" width="30" />

+        <check_box bottom="-120" control_name="CreateToolKeepSelected" follows="left|top"

+             font="SansSerifSmall" height="16" initial_value="false"

+             label="Keep Tool Selected" left="4" mouse_opaque="true"

+             name="checkbox sticky" width="128" />

+        <check_box bottom_delta="-15" control_name="CreateToolCopySelection" follows="left|top"

+             font="SansSerifSmall" height="16" initial_value="false"

+             label="Copy Selection" left_delta="0" mouse_opaque="true"

+             name="checkbox copy selection" width="134" />

+        <check_box bottom_delta="-15" control_name="CreateToolCopyCenters" follows="left|top"

+             font="SansSerifSmall" height="16" initial_value="true" label="Center Copy"

+             left_delta="20" mouse_opaque="true" name="checkbox copy centers"

+             width="134" />

+        <check_box bottom_delta="-15" control_name="CreateToolCopyRotates" follows="left|top"

+             font="SansSerifSmall" height="16" initial_value="false" label="Rotate Copy"

+             left_delta="0" mouse_opaque="true" name="checkbox copy rotates" width="134" />

+

+<!-- Land panel -->

+

+        <check_box bottom="-70" follows="left|top" font="SansSerifSmall" height="16"

+             initial_value="false" label="Select Land" left="4" mouse_opaque="true"

+             name="radio select land" radio_style="true" width="114" />

+        <check_box bottom_delta="-14" follows="left|top" font="SansSerifSmall" height="16"

+             initial_value="false" label="Flatten Land" left="4" mouse_opaque="true"

+             name="radio flatten" radio_style="true" width="114" />

+        <check_box bottom_delta="-14" follows="left|top" font="SansSerifSmall" height="16"

+             initial_value="false" label="Raise Land" left="4" mouse_opaque="true"

+             name="radio raise" radio_style="true" width="114" />

+        <check_box bottom_delta="-14" follows="left|top" font="SansSerifSmall" height="16"

+             initial_value="false" label="Lower Land" left="4" mouse_opaque="true"

+             name="radio lower" radio_style="true" width="114" />

+        <check_box bottom_delta="-14" follows="left|top" font="SansSerifSmall" height="16"

+             initial_value="false" label="Smooth Land" left="4" mouse_opaque="true"

+             name="radio smooth" radio_style="true" width="114" />

+        <check_box bottom_delta="-14" follows="left|top" font="SansSerifSmall" height="16"

+             initial_value="false" label="Roughen Land" left="4" mouse_opaque="true"

+             name="radio noise" radio_style="true" width="114" />

+        <check_box bottom_delta="-14" follows="left|top" font="SansSerifSmall" height="16"

+             initial_value="false" label="Revert Land" left="4" mouse_opaque="true"

+             name="radio revert" radio_style="true" width="114" />

+        <combo_box allow_text_entry="false" bottom="-85" follows="left|top" height="18" left="118"

+             max_chars="20" mouse_opaque="true" name="combobox brush size" width="134">

+                <combo_item name="Small" value="Small">

+                        Small

+                </combo_item>

+                <combo_item name="Medium" value="Medium">

+                        Medium

+                </combo_item>

+                <combo_item name="Large" value="Large">

+                        Large

+                </combo_item>

+        </combo_box>

+        <button bottom_delta="-20" follows="left|top" font="SansSerifSmall" halign="center"

+             height="16" label="Apply to selection" label_selected="Apply to selection"

+             left="118" mouse_opaque="true" name="button apply to selection"

+             scale_image="TRUE" tool_tip="Modify Selected Land" width="134" />

+        <check_box bottom_delta="-20" control_name="ShowParcelOwners" follows="left|top"

+             font="SansSerifSmall" height="16" initial_value="false" label="Show Owners"

+             left="118" mouse_opaque="true" name="checkbox show owners" width="134" />

+        <button bottom="-163" follows="left|top" font="SansSerifSmall" halign="center"

+             height="20" label="More &gt;&gt;" left="186" mouse_opaque="true"

+             name="button more" scale_image="TRUE" tool_tip="Advanced Options"

+             width="80" />

+        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" halign="center"

+             height="20" label="&lt;&lt; Less" left_delta="0" mouse_opaque="true"

+             name="button less" scale_image="TRUE" tool_tip="Advanced Options"

+             width="80" />

+

+<!-- Sub-tabs -->

+

+        <tab_container bottom="-550" follows="left|top" height="384" left="0" mouse_opaque="false"

+             name="Object Info Tabs" tab_max_width="52" tab_min_width="40"

+             tab_position="top" width="272">

+                <panel border="true" bottom="-383" follows="left|top|right|bottom" height="367"

+                     label="General" left="1" mouse_opaque="false" name="General" width="270">

+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

+                             bottom="-20" drop_shadow_visible="true" follows="left|top"

+                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"

+                             mouse_opaque="true" name="Name:" v_pad="0" width="78">

+                                Name:

+                        </text>

+                        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-26"

+                             follows="left|top|right" font="SansSerifSmall" height="16" left="88"

+                             max_length="63" mouse_opaque="true" name="Object Name"

+                             select_all_on_focus_received="true" width="172" />

+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

+                             bottom="-40" drop_shadow_visible="true" follows="left|top"

+                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"

+                             mouse_opaque="true" name="Description:" v_pad="0" width="78">

+                                Description:

+                        </text>

+                        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-46"

+                             follows="left|top|right" font="SansSerifSmall" height="16" left="88"

+                             max_length="127" mouse_opaque="true" name="Object Description"

+                             select_all_on_focus_received="true" width="172" />

+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

+                             bottom="-66" drop_shadow_visible="true" follows="left|top"

+                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"

+                             mouse_opaque="true" name="Creator:" v_pad="0" width="78">

+                                Creator:

+                        </text>

+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

+                             bottom="-66" drop_shadow_visible="true" follows="left|top"

+                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="78"

+                             mouse_opaque="true" name="Creator Name" v_pad="0" width="88">

+                                Thrax Linden

+                        </text>

+                        <button bottom="-66" follows="top|right" font="SansSerifSmall" halign="center"

+                             height="16" label="Profile..." label_selected="Profile..." left_delta="94"

+                             mouse_opaque="true" name="button creator profile" scale_image="TRUE"

+                             width="78" />

+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

+                             bottom="-86" drop_shadow_visible="true" follows="left|top"

+                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"

+                             mouse_opaque="true" name="Owner:" v_pad="0" width="78">

+                                Owner:

+                        </text>

+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

+                             bottom="-86" drop_shadow_visible="true" follows="left|top"

+                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="78"

+                             mouse_opaque="true" name="Owner Name" v_pad="0" width="88">

+                                Thrax Linden

+                        </text>

+                        <button bottom="-86" follows="top|right" font="SansSerifSmall" halign="center"

+                             height="16" label="Profile..." label_selected="Profile..." left_delta="94"

+                             mouse_opaque="true" name="button owner profile" scale_image="TRUE"

+                             width="78" />

+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

+                             bottom="-106" drop_shadow_visible="true" follows="left|top"

+                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"

+                             mouse_opaque="true" name="Group:" v_pad="0" width="78">

+                                Group:

+                        </text>

+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

+                             bottom="-106" drop_shadow_visible="true" follows="left|top"

+                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="78"

+                             mouse_opaque="true" name="Group Name Proxy" v_pad="0" visible="false"

+                             width="88">

+                                The Lindens

+                        </text>

+                        <button bottom="-106" follows="top|right" font="SansSerifSmall" halign="center"

+                             height="16" label="Set..." label_selected="Set..." left_delta="94"

+                             mouse_opaque="true" name="button set group" scale_image="TRUE" width="78" />

+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

+                             bottom="-126" drop_shadow_visible="true" follows="left|top"

+                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"

+                             mouse_opaque="true" name="prim info" v_pad="0" width="166">

+                                1 Object, 1 Primitive

+                        </text>

+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

+                             bottom_delta="-20" drop_shadow_visible="true" follows="left|top"

+                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"

+                             mouse_opaque="true" name="Permissions:" v_pad="0" width="85">

+                                Permissions:

+                        </text>

+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

+                             bottom_delta="-20" drop_shadow_visible="true" follows="left|top|right"

+                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"

+                             mouse_opaque="true" name="perm_modify" v_pad="0" width="250">

+                                You can modify this object.

+                        </text>

+                        <check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"

+                             initial_value="false" label="Share with group" left="10"

+                             mouse_opaque="true" name="checkbox share with group"

+                             tool_tip="Allow group members to move, modify, copy and delete."

+                             width="166" />

+                        <string name="text deed continued">

+                                Deed...

+                        </string>

+                        <string name="text deed">

+                                Deed

+                        </string>

+                        <button bottom="-186" follows="top|right" font="SansSerifSmall" halign="center"

+                             height="16" label="Deed..." label_selected="Deed..." left_delta="172"

+                             mouse_opaque="true" name="button deed" scale_image="TRUE"

+                             tool_tip="Group shared objects can be deeded by a group officer."

+                             width="78" />

+                        <check_box bottom="-206" follows="left|top" font="SansSerifSmall" height="16"

+                             initial_value="false" label="Allow anyone to move" left="10"

+                             mouse_opaque="true" name="checkbox allow everyone move" width="142" />

+                        <check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"

+                             initial_value="false" label="Allow anyone to copy" left="10"

+                             mouse_opaque="true" name="checkbox allow everyone copy" width="141" />

+                        <check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"

+                             initial_value="false" label="Show in search" left="10" name="search_check"

+                             tool_tip="Let people see this object in search results" width="78" />

+                        <check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"

+                             initial_value="false" label="For Sale" left="10" mouse_opaque="true"

+                             name="checkbox for sale" width="78" />

+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

+                             bottom_delta="0" drop_shadow_visible="true" follows="left|top"

+                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="100"

+                             mouse_opaque="true" name="Price:  L$" v_pad="0" width="56">

+                                Price:  L$

+                        </text>

+                        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="0"

+                             follows="left|top|right" font="SansSerifSmall" height="16" left_delta="56"

+                             max_length="25" mouse_opaque="true" name="EdCost" width="84" />

+                        <radio_group bottom="-286" draw_border="false" follows="left|top|right" height="16"

+                             left="42" mouse_opaque="true" name="sale type" width="218">

+                                <radio_item bottom="-16" follows="left|top" height="16" left="0" mouse_opaque="true"

+                                     name="Original" width="70">

+                                        Original

+                                </radio_item>

+                                <radio_item bottom="-16" follows="left|top" height="16" left="70" mouse_opaque="true"

+                                     name="Copy" width="70">

+                                        Copy

+                                </radio_item>

+                                <radio_item bottom="-16" follows="left|top" height="16" left="140" mouse_opaque="true"

+                                     name="Contents" width="76">

+                                        Contents

+                                </radio_item>

+                        </radio_group>

+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

+                             bottom="-298" drop_shadow_visible="true" follows="left|top|right"

+                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"

+                             mouse_opaque="true" name="Next owner can:" v_pad="0" width="250">

+                                Next owner can:

+                        </text>

+                        <check_box bottom_delta="-22" follows="left|top|right" font="SansSerifSmall" height="16"

+                             initial_value="false" label="Modify" left="10" mouse_opaque="true"

+                             name="checkbox next owner can modify" width="250" />

+                        <check_box bottom_delta="0" follows="left|top|right" font="SansSerifSmall" height="16"

+                             initial_value="false" label="Copy" left_delta="60" mouse_opaque="true"

+                             name="checkbox next owner can copy" width="190" />

+                        <check_box bottom_delta="0" follows="left|top|right" font="SansSerifSmall" height="16"

+                             initial_value="false" label="Resell/Give away" left_delta="60"

+                             mouse_opaque="true" name="checkbox next owner can transfer" width="130" />

+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

+                             bottom="-332" drop_shadow_visible="true" follows="left|top"

+                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"

+                             mouse_opaque="true" name="label click action" v_pad="0" width="150">

+                                When Left-Clicked:

+                        </text>

+                        <combo_box allow_text_entry="false" bottom_delta="-25" follows="left|top" height="18"

+                             left="10" max_chars="20" mouse_opaque="true" name="clickaction" width="150">

+                             <!-- Do not reorder these items, the index numbers are

+                                        used internally. JC -->

+                                <combo_item name="Touch/grab(default)" value="Touch/grab (default)">

+                                        Touch/grab (default)

+                                </combo_item>

+                                <combo_item name="Sitonobject" value="Sit on object">

+                                        Sit on object

+                                </combo_item>

+                                <combo_item name="Buyobject" value="Buy object">

+                                        Buy object

+                                </combo_item>

+                                <combo_item name="Payobject" value="Pay object">

+                                        Pay object

+                                </combo_item>

+                                <combo_item name="Open" value="Open">

+                                        Open

+                                </combo_item>

+                                <combo_item name="Play" value="Play">

+                                        Play parcel media

+                                </combo_item>

+                                <combo_item name="Opemmedia" value="Open Media">

+                                        Open parcel media

+                                </combo_item>

+                        </combo_box>

+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

+                             bottom="-135" drop_shadow_visible="true" follows="left|top"

+                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="88"

+                             mouse_opaque="true" name="B:" v_pad="0" width="174">

+                                B:

+                        </text>

+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

+                             bottom="-135" drop_shadow_visible="true" follows="left|top"

+                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="50"

+                             mouse_opaque="true" name="O:" v_pad="0" width="124">

+                                O;

+                        </text>

+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

+                             bottom="-135" drop_shadow_visible="true" follows="left|top"

+                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="50"

+                             mouse_opaque="true" name="G:" v_pad="0" width="74">

+                                G:

+                        </text>

+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

+                             bottom="-147" drop_shadow_visible="true" follows="left|top"

+                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="88"

+                             mouse_opaque="true" name="E:" v_pad="0" width="174">

+                                E:

+                        </text>

+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

+                             bottom="-147" drop_shadow_visible="true" follows="left|top"

+                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="50"

+                             mouse_opaque="true" name="N:" v_pad="0" width="124">

+                                N:

+                        </text>

+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

+                             bottom="-147" drop_shadow_visible="true" follows="left|top"

+                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="50"

+                             mouse_opaque="true" name="F:" v_pad="0" width="74">

+                                F:

+                        </text>

+                        <string name="text modify info 1">

+                                You can modify this object.

+                        </string>

+                        <string name="text modify info 2">

+                                You can modify these objects.

+                        </string>

+                        <string name="text modify info 3">

+                                You cannot modify this object.

+                        </string>

+                        <string name="text modify info 4">

+                                You cannot modify these objects.

+                        </string>

+                        <string name="text modify warning">

+                                Must select entire object to set permissions.

+                        </string>

+                </panel>

+

+<!-- Object sub-tab -->

+

+                <panel border="true" bottom="-383" follows="left|top|right|bottom" height="367"

+                     label="Object" left="1" mouse_opaque="false" name="Object" width="270">

+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

+                             bottom="-20" drop_shadow_visible="true" follows="left|top"

+                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"

+                             mouse_opaque="true" name="select_single" v_pad="0" width="252">

+                                Select only one primitive to edit parameters.

+                        </text>

+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

+                             bottom_delta="0" drop_shadow_visible="true" follows="left|top"

+                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="0"

+                             mouse_opaque="true" name="edit_object" v_pad="0" width="252">

+                                Edit object parameters:

+                        </text>

+                        <check_box bottom_delta="-26" follows="left|top" font="SansSerifSmall" height="16"

+                             initial_value="false" label="Locked" left="8" mouse_opaque="true"

+                             name="checkbox locked"

+                             tool_tip="Prevents object from being moved or deleted. Frequently useful during building to avoid unintended edits."

+                             width="123" />

+                        <check_box bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16"

+                             initial_value="false" label="Physical" left="8" mouse_opaque="true"

+                             name="Physical Checkbox Ctrl"

+                             tool_tip="Allows object to be pushed and affected by gravity" width="123" />

+                        <check_box bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16"

+                             initial_value="false" label="Temporary" left="8" mouse_opaque="true"

+                             name="Temporary Checkbox Ctrl"

+                             tool_tip="Causes object to be deleted 1 minute after creation." width="123" />

+                        <check_box bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16"

+                             initial_value="false" label="Phantom" left="8" mouse_opaque="true"

+                             name="Phantom Checkbox Ctrl"

+                             tool_tip="Causes object to not collide with other objects or avatars"

+                             width="123" />

+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

+                             bottom_delta="-14" drop_shadow_visible="true" follows="left|top"

+                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"

+                             mouse_opaque="true" name="label position" v_pad="0" width="121">

+                                Position (meters)

+                        </text>

+                        <spinner bottom_delta="-20" decimal_digits="3" follows="left|top" height="16"

+                             increment="0.01" initial_val="0" label="X" label_width="10" left="10"

+                             max_val="512" min_val="-256" mouse_opaque="true" name="Pos X"

+                             text_enabled_color="110, 15, 15, 255" width="87" />

+                        <spinner bottom_delta="-18" decimal_digits="3" follows="left|top" height="16"

+                             increment="0.01" initial_val="0" label="Y" label_width="10" left="10"

+                             max_val="512" min_val="-256" mouse_opaque="true" name="Pos Y"

+                             text_enabled_color="0, 100, 40, 255" width="87" />

+                        <spinner bottom_delta="-18" decimal_digits="3" follows="left|top" height="16"

+                             increment="0.01" initial_val="0" label="Z" label_width="10" left="10"

+                             max_val="4096" min_val="0" mouse_opaque="true" name="Pos Z"

+                             text_enabled_color="0, 67, 132, 255" width="87" />

+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

+                             bottom_delta="-16" drop_shadow_visible="true" follows="left|top"

+                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"

+                             mouse_opaque="true" name="label size" v_pad="0" width="121">

+                                Size (meters)

+                        </text>

+                        <spinner bottom_delta="-20" decimal_digits="3" follows="left|top" height="16"

+                             increment="0.01" initial_val="0" label="X" label_width="10" left="10"

+                             max_val="10" min_val="0.01" mouse_opaque="true" name="Scale X"

+                             text_enabled_color="1, 1, 1, 1" width="87" />

+                        <spinner bottom_delta="-18" decimal_digits="3" follows="left|top" height="16"

+                             increment="0.01" initial_val="0" label="Y" label_width="10" left="10"

+                             max_val="10" min_val="0.01" mouse_opaque="true" name="Scale Y"

+                             text_enabled_color="1, 1, 1, 1" width="87" />

+                        <spinner bottom_delta="-18" decimal_digits="3" follows="left|top" height="16"

+                             increment="0.01" initial_val="0" label="Z" label_width="10" left="10"

+                             max_val="10" min_val="0.01" mouse_opaque="true" name="Scale Z"

+                             text_enabled_color="1, 1, 1, 1" width="87" />

+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

+                             bottom_delta="-16" drop_shadow_visible="true" follows="left|top"

+                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"

+                             mouse_opaque="true" name="label rotation" v_pad="0" width="121">

+                                Rotation (degrees)

+                        </text>

+                        <spinner bottom_delta="-22" decimal_digits="2" follows="left|top" height="16"

+                             increment="1" initial_val="0" label="X" label_width="10" left="10"

+                             max_val="9999" min_val="-9999" mouse_opaque="true" name="Rot X"

+                             text_enabled_color="1, 1, 1, 1" width="87" />

+                        <spinner bottom_delta="-18" decimal_digits="2" follows="left|top" height="16"

+                             increment="1" initial_val="0" label="Y" label_width="10" left="10"

+                             max_val="9999" min_val="-9999" mouse_opaque="true" name="Rot Y"

+                             text_enabled_color="1, 1, 1, 1" width="87" />

+                        <spinner bottom_delta="-18" decimal_digits="2" follows="left|top" height="16"

+                             increment="1" initial_val="0" label="Z" label_width="10" left="10"

+                             max_val="9999" min_val="-9999" mouse_opaque="true" name="Rot Z"

+                             text_enabled_color="1, 1, 1, 1" width="87" />

+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

+                             bottom_delta="-16" drop_shadow_visible="true" follows="left|top"

+                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"

+                             mouse_opaque="true" name="label material" v_pad="0" width="121">

+                                Material

+                        </text>

+                        <combo_box allow_text_entry="false" bottom_delta="-22" follows="left|top" height="18"

+                             left="10" max_chars="20" mouse_opaque="true" name="material" width="87">

+                                <combo_item name="Stone" value="Stone">

+                                        Stone

+                                </combo_item>

+                                <combo_item name="Metal" value="Metal">

+                                        Metal

+                                </combo_item>

+                                <combo_item name="Glass" value="Glass">

+                                        Glass

+                                </combo_item>

+                                <combo_item name="Wood" value="Wood">

+                                        Wood

+                                </combo_item>

+                                <combo_item name="Flesh" value="Flesh">

+                                        Flesh

+                                </combo_item>

+                                <combo_item name="Plastic" value="Plastic">

+                                        Plastic

+                                </combo_item>

+                                <combo_item name="Rubber" value="Rubber">

+                                        Rubber

+                                </combo_item>

+                        </combo_box>

+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

+                             bottom="-36" drop_shadow_visible="true" follows="left|top"

+                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="121"

+                             mouse_opaque="true" name="label basetype" v_pad="0" width="141">

+                                Building Block Type

+                        </text>

+                        <combo_box allow_text_entry="false" bottom_delta="-24" follows="left|top" height="18"

+                             left="121" max_chars="20" mouse_opaque="true" name="comboBaseType"

+                             width="141">

+                                <combo_item name="Box" value="Box">

+                                        Box

+                                </combo_item>

+                                <combo_item name="Cylinder" value="Cylinder">

+                                        Cylinder

+                                </combo_item>

+                                <combo_item name="Prism" value="Prism">

+                                        Prism

+                                </combo_item>

+                                <combo_item name="Sphere" value="Sphere">

+                                        Sphere

+                                </combo_item>

+                                <combo_item name="Torus" value="Torus">

+                                        Torus

+                                </combo_item>

+                                <combo_item name="Tube" value="Tube">

+                                        Tube

+                                </combo_item>

+                                <combo_item name="Ring" value="Ring">

+                                        Ring

+                                </combo_item>

+                                <combo_item name="Sculpted" value="Sculpted">

+                                        Sculpted

+                                </combo_item>

+                        </combo_box>

+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

+                             bottom_delta="-12" drop_shadow_visible="true" follows="left|top"

+                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="121"

+                             mouse_opaque="true" name="text cut" v_pad="0" width="141">

+                                Path Cut Begin and End

+                        </text>

+                        <spinner bottom_delta="-22" decimal_digits="3" follows="left|top" height="16"

+                             increment="0.05" initial_val="0" label="B" label_width="10" left="121"

+                             max_val="0.98" min_val="0" mouse_opaque="true" name="cut begin" width="68" />

+                        <spinner bottom_delta="0" decimal_digits="3" follows="left|top" height="16"

+                             increment="0.05" initial_val="1" label="E" label_width="10" left_delta="73"

+                             max_val="1" min_val="0.02" mouse_opaque="true" name="cut end" width="68" />

+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

+                             bottom_delta="-14" drop_shadow_visible="true" follows="left|top"

+                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="121"

+                             mouse_opaque="true" name="text hollow" v_pad="0" width="68">

+                                Hollow

+                        </text>

+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

+                             bottom_delta="0" drop_shadow_visible="true" follows="left|top"

+                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="78"

+                             mouse_opaque="true" name="text skew" v_pad="0" width="63">

+                                Skew

+                        </text>

+                        <spinner bottom_delta="-20" decimal_digits="1" follows="left|top" height="16"

+                             increment="5" initial_val="0" left="121" max_val="95" min_val="0"

+                             mouse_opaque="true" name="Scale 1" width="68" />

+                        <spinner bottom_delta="0" decimal_digits="2" follows="left|top" height="16"

+                             increment="0.05" initial_val="0" left_delta="73" max_val="0.95"

+                             min_val="-0.95" mouse_opaque="true" name="Skew" width="68" />

+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

+                             bottom_delta="-15" drop_shadow_visible="true" follows="left|top"

+                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="121"

+                             mouse_opaque="true" name="Hollow Shape" v_pad="0" width="141">

+                                Hollow Shape

+                        </text>

+                        <combo_box allow_text_entry="false" bottom_delta="-24" follows="left|top" height="18"

+                             left="121" max_chars="20" mouse_opaque="true" name="hole" width="141">

+                                <combo_item name="Default" value="Default">

+                                        Default

+                                </combo_item>

+                                <combo_item name="Circle" value="Circle">

+                                        Circle

+                                </combo_item>

+                                <combo_item name="Square" value="Square">

+                                        Square

+                                </combo_item>

+                                <combo_item name="Triangle" value="Triangle">

+                                        Triangle

+                                </combo_item>

+                        </combo_box>

+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

+                             bottom_delta="-12" drop_shadow_visible="true" follows="left|top"

+                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="121"

+                             mouse_opaque="true" name="text twist" v_pad="0" width="141">

+                                Twist Begin and End

+                        </text>

+                        <spinner bottom_delta="-22" decimal_digits="0" follows="left|top" height="16"

+                             increment="9" initial_val="0" label="B" label_width="10" left="121"

+                             max_val="180" min_val="-180" mouse_opaque="true" name="Twist Begin"

+                             width="68" />

+                        <spinner bottom_delta="0" decimal_digits="0" follows="left|top" height="16"

+                             increment="9" initial_val="0" label="E" label_width="10" left_delta="73"

+                             max_val="180" min_val="-180" mouse_opaque="true" name="Twist End"

+                             width="68" />

+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

+                             bottom_delta="-14" drop_shadow_visible="true" follows="left|top"

+                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="121"

+                             mouse_opaque="true" name="scale_taper" v_pad="0" width="141">

+                                Taper

+                        </text>

+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

+                             bottom_delta="0" drop_shadow_visible="true" follows="left|top"

+                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="121"

+                             mouse_opaque="true" name="scale_hole" v_pad="0" width="141">

+                                Hole Size

+                        </text>

+                        <spinner bottom_delta="-20" decimal_digits="2" follows="left|top" height="16"

+                             increment="0.05" initial_val="0" label="X" label_width="10" left="121"

+                             max_val="1" min_val="-1" mouse_opaque="true" name="Taper Scale X"

+                             width="68" />

+                        <spinner bottom_delta="0" decimal_digits="2" follows="left|top" height="16"

+                             increment="0.05" initial_val="0" label="Y" label_width="10" left_delta="73"

+                             max_val="1" min_val="-1" mouse_opaque="true" name="Taper Scale Y"

+                             width="68" />

+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

+                             bottom_delta="-14" drop_shadow_visible="true" follows="left|top"

+                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="121"

+                             mouse_opaque="true" name="text topshear" v_pad="0" width="141">

+                                Top Shear

+                        </text>

+                        <spinner bottom_delta="-20" decimal_digits="2" follows="left|top" height="16"

+                             increment="0.05" initial_val="0" label="X" label_width="10" left="121"

+                             max_val="0.5" min_val="-0.5" mouse_opaque="true" name="Shear X" width="68" />

+                        <spinner bottom_delta="0" decimal_digits="2" follows="left|top" height="16"

+                             increment="0.05" initial_val="0" label="Y" label_width="10" left_delta="73"

+                             max_val="0.5" min_val="-0.5" mouse_opaque="true" name="Shear Y" width="68" />

+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

+                             bottom_delta="-14" drop_shadow_visible="true" follows="left|top"

+                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="121"

+                             mouse_opaque="true" name="advanced_cut" v_pad="0" width="141">

+                                Profile Cut Begin and End

+                        </text>

+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

+                             bottom_delta="0" drop_shadow_visible="true" follows="left|top"

+                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="0"

+                             mouse_opaque="true" name="advanced_dimple" v_pad="0" width="141">

+                                Dimple Begin and End

+                        </text>

+                        <spinner bottom_delta="-19" decimal_digits="3" follows="left|top" height="16"

+                             increment="0.05" initial_val="0" label="B" label_width="10" left="121"

+                             max_val="0.95" min_val="0" mouse_opaque="true" name="Path Limit Begin"

+                             width="68" />

+                        <spinner bottom_delta="0" decimal_digits="3" follows="left|top" height="16"

+                             increment="0.05" initial_val="1" label="E" label_width="10" left_delta="73"

+                             max_val="1" min_val="0.05" mouse_opaque="true" name="Path Limit End"

+                             width="68" />

+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

+                             bottom_delta="-14" drop_shadow_visible="true" follows="left|top"

+                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="121"

+                             mouse_opaque="true" name="text taper2" v_pad="0" width="141">

+                                Taper

+                        </text>

+                        <spinner bottom_delta="-19" decimal_digits="2" follows="left|top" height="16"

+                             increment="0.05" initial_val="0" label="X" label_width="10" left="121"

+                             max_val="1" min_val="-1" mouse_opaque="true" name="Taper X" width="68" />

+                        <spinner bottom_delta="0" decimal_digits="2" follows="left|top" height="16"

+                             increment="0.05" initial_val="0" label="Y" label_width="10" left_delta="73"

+                             max_val="1" min_val="-1" mouse_opaque="true" name="Taper Y" width="68" />

+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

+                             bottom_delta="-12" drop_shadow_visible="true" follows="left|top"

+                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="121"

+                             mouse_opaque="true" name="text radius delta" v_pad="0" width="78">

+                                Radius

+                        </text>

+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

+                             bottom_delta="0" drop_shadow_visible="true" follows="left|top"

+                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="73"

+                             mouse_opaque="true" name="text revolutions" v_pad="0" width="68">

+                                Revolutions

+                        </text>

+                        <spinner bottom_delta="-19" decimal_digits="3" follows="left|top" height="16"

+                             increment="0.05" initial_val="0" left="121" max_val="1" min_val="-1"

+                             mouse_opaque="true" name="Radius Offset" width="68" />

+                        <spinner bottom_delta="0" decimal_digits="2" follows="left|top" height="16"

+                             increment="0.1" initial_val="1" left_delta="73" max_val="4" min_val="1"

+                             mouse_opaque="true" name="Revolutions" width="68" />

+                        <texture_picker allow_no_texture="false" bottom="-211" can_apply_immediately="true"

+                             default_image_name="Default" follows="left|top" height="141"

+                             label="Sculpt Texture" left="121" mouse_opaque="true"

+                             name="sculpt texture control" tool_tip="Click to choose a picture"

+                             visible="false" width="141" />

+                        <text align="left" bg_visible="false" border_drop_shadow_visible="false"

+                             border_visible="false" bottom_delta="-20" drop_shadow_visible="true"

+                             follows="left|top" font="SansSerifSmall" h_pad="0" height="10" left="121"

+                             mouse_opaque="true" name="label sculpt type" v_pad="0" visible="false"

+                             width="121">

+                                Stitching type

+                        </text>

+                        <combo_box allow_text_entry="false" bottom_delta="-24" follows="left|top" height="18"

+                             left="121" max_chars="20" mouse_opaque="true" name="sculpt type control"

+                             visible="false" width="141">

+                                <combo_item name="None" value="None">

+                                        (none)

+                                </combo_item>

+                                <combo_item name="Sphere" value="Sphere">

+                                        Sphere

+                                </combo_item>

+                                <combo_item name="Torus" value="Torus">

+                                        Torus

+                                </combo_item>

+                                <combo_item name="Plane" value="Plane">

+                                        Plane

+                                </combo_item>

+                                <combo_item name="Cylinder" value="Cylinder">

+                                        Cylinder

+                                </combo_item>

+                        </combo_box>

+                </panel>

+

+<!-- Features sub-tab -->

+

+                <panel border="true" bottom="-383" follows="left|top|right|bottom" height="367"

+                     label="Features" left="1" mouse_opaque="false" name="Features" width="270">

+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

+                             bottom="-20" drop_shadow_visible="true" follows="left|top"

+                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"

+                             mouse_opaque="true" name="select_single" v_pad="0" width="252">

+                                Select only one primitive to edit features.

+                        </text>

+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

+                             bottom_delta="0" drop_shadow_visible="true" follows="left|top"

+                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"

+                             mouse_opaque="true" name="edit_object" v_pad="0" width="252">

+                                Edit object features:

+                        </text>

+                        <check_box bottom_delta="-26" follows="left|top" font="SansSerifSmall" height="16"

+                             initial_value="false" label="Flexible Path" left="10" mouse_opaque="true"

+                             name="Flexible1D Checkbox Ctrl"

+                             tool_tip="Allows object to flex about the Z axis. (Client-side only)"

+                             width="121" />

+                        <spinner bottom_delta="-20" decimal_digits="3" follows="left|top" height="16"

+                             increment="1" initial_val="2" label="Softness" label_width="65" left="10"

+                             max_val="3" min_val="0" mouse_opaque="true" name="FlexNumSections"

+                             width="128" />

+                        <spinner bottom_delta="-20" decimal_digits="3" follows="left|top" height="16"

+                             increment="0.5" initial_val="0.3" label="Gravity" label_width="65"

+                             left="10" max_val="10" min_val="-10" mouse_opaque="true" name="FlexGravity"

+                             width="128" />

+                        <spinner bottom_delta="-20" decimal_digits="3" follows="left|top" height="16"

+                             increment="0.5" initial_val="2" label="Drag" label_width="65" left="10"

+                             max_val="10" min_val="0" mouse_opaque="true" name="FlexFriction"

+                             width="128" />

+                        <spinner bottom_delta="-20" decimal_digits="3" follows="left|top" height="16"

+                             increment="0.5" initial_val="0" label="Wind" label_width="65" left="10"

+                             max_val="10" min_val="0" mouse_opaque="true" name="FlexWind" width="128" />

+                        <spinner bottom_delta="-20" decimal_digits="3" follows="left|top" height="16"

+                             increment="0.5" initial_val="1" label="Tension" label_width="65" left="10"

+                             max_val="10" min_val="0" mouse_opaque="true" name="FlexTension" width="128" />

+                        <spinner bottom_delta="-20" decimal_digits="3" follows="left|top" height="16"

+                             increment="0.01" initial_val="0" label="Force X" label_width="65" left="10"

+                             max_val="10" min_val="-10" mouse_opaque="true" name="FlexForceX"

+                             width="128" />

+                        <spinner bottom_delta="-20" decimal_digits="3" follows="left|top" height="16"

+                             increment="0.01" initial_val="0" label="Force Y" label_width="65" left="10"

+                             max_val="10" min_val="-10" mouse_opaque="true" name="FlexForceY"

+                             width="128" />

+                        <spinner bottom_delta="-20" decimal_digits="3" follows="left|top" height="16"

+                             increment="0.01" initial_val="0" label="Force Z" label_width="65" left="10"

+                             max_val="10" min_val="-10" mouse_opaque="true" name="FlexForceZ"

+                             width="128" />

+                        <check_box bottom_delta="-30" follows="left|top" font="SansSerifSmall" height="16"

+                             initial_value="false" label="Light" left="10" mouse_opaque="true"

+                             name="Light Checkbox Ctrl" tool_tip="Causes object to emit light"

+                             width="121" />

+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

+                             bottom_delta="-21" drop_shadow_visible="true" follows="left|top"

+                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="0"

+                             mouse_opaque="true" name="label color" v_pad="0" width="58">

+                                Color

+                        </text>

+                        <color_swatch border_color="0.45098, 0.517647, 0.607843, 1" bottom_delta="-28"

+                             can_apply_immediately="true" color="0.5, 0.5, 0.5, 1" follows="left|top"

+                             height="48" label="" left_delta="67" mouse_opaque="true" name="colorswatch"

+                             tool_tip="Click to open Color Picker" width="32" />

+                        <spinner bottom_delta="-4" decimal_digits="3" follows="left|top" height="16"

+                             increment="0.1" initial_val="0.5" label="Intensity" label_width="65"

+                             left="10" max_val="1" min_val="0" mouse_opaque="true"

+                             name="Light Intensity" width="128" />

+                        <spinner bottom_delta="-20" decimal_digits="3" follows="left|top" height="16"

+                             increment="0.1" initial_val="5" label="Radius" label_width="65"

+                             left_delta="0" max_val="20" min_val="0" mouse_opaque="true"

+                             name="Light Radius" width="128" />

+                        <spinner bottom_delta="-20" decimal_digits="3" follows="left|top" height="16"

+                             increment="0.25" initial_val="1" label="Falloff" label_width="65"

+                             left_delta="0" max_val="2" min_val="0" mouse_opaque="true"

+                             name="Light Falloff" width="128" />

+                </panel>

+

+<!-- Texture sub-tab -->

+

+                <panel border="true" bottom="-383" follows="left|top|right|bottom" height="367"

+                     label="Texture" left="1" mouse_opaque="false" name="Texture" width="270">

+                        <texture_picker allow_no_texture="false" bottom="-90" can_apply_immediately="true"

+                             default_image_name="Default" follows="left|top" height="80" label="Texture"

+                             left="10" mouse_opaque="true" name="texture control"

+                             tool_tip="Click to choose a picture" width="64" />

+                        <color_swatch border_color="0.45098, 0.517647, 0.607843, 1" bottom="-90"

+                             can_apply_immediately="true" color="1, 1, 1, 1" follows="left|top"

+                             height="80" label="Color" left_delta="90" mouse_opaque="true"

+                             name="colorswatch" tool_tip="Click to open Color Picker" width="64" />

+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

+                             bottom="-11" drop_shadow_visible="true" follows="left|top"

+                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="180"

+                             mouse_opaque="true" name="color trans" v_pad="0" width="80">

+                                Transparency %

+                        </text>

+                        <spinner bottom_delta="-20" decimal_digits="0" follows="left|top" height="16"

+                             increment="2" initial_val="0" left="180" max_val="90" min_val="0"

+                             mouse_opaque="true" name="ColorTrans" width="80" />

+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

+                             bottom_delta="-12" drop_shadow_visible="true" follows="left|top"

+                             font="SansSerifSmall" h_pad="0" halign="left" height="10"

+                             left="180" mouse_opaque="true" name="glow label" v_pad="0" width="80">

+                                Glow

+                        </text>

+                        <spinner bottom_delta="-20" decimal_digits="2" follows="left|top" height="16"

+                             increment="0.1" initial_val="0" left="180" max_val="1"

+                             min_val="0" mouse_opaque="true" name="glow" width="80" />

+                        <check_box bottom_delta="-23" follows="left|top" font="SansSerifSmall" height="16"

+                             initial_value="false" label="Full Bright" left="180" mouse_opaque="true"

+                             name="checkbox fullbright" width="81" />

+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

+                             bottom="-104" drop_shadow_visible="true" follows="left|top"

+                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"

+                             mouse_opaque="true" name="tex gen" v_pad="0" width="90">

+                                Mapping

+                        </text>

+                        <combo_box allow_text_entry="false" bottom_delta="-22" follows="left|top" height="18"

+                             left="10" max_chars="20" mouse_opaque="true" name="combobox texgen"

+                             width="80">

+                                <combo_item name="Default" value="Default">

+                                        Default

+                                </combo_item>

+                                <combo_item name="Planar" value="Planar">

+                                        Planar

+                                </combo_item>

+                        </combo_box>

+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

+                             bottom="-104" drop_shadow_visible="true" follows="left|top"

+                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="100"

+                             mouse_opaque="true" name="label shininess" v_pad="0" width="70">

+                                Shininess

+                        </text>

+                        <combo_box allow_text_entry="false" bottom_delta="-22" follows="left|top" height="18"

+                             left="100" max_chars="20" mouse_opaque="true" name="combobox shininess"

+                             width="70">

+                                <combo_item name="None" value="None">

+                                        None

+                                </combo_item>

+                                <combo_item name="Low" value="Low">

+                                        Low

+                                </combo_item>

+                                <combo_item name="Medium" value="Medium">

+                                        Medium

+                                </combo_item>

+                                <combo_item name="High" value="High">

+                                        High

+                                </combo_item>

+                        </combo_box>

+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

+                             bottom="-104" drop_shadow_visible="true" follows="left|top"

+                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="180"

+                             mouse_opaque="true" name="label bumpiness" v_pad="0" width="80">

+                                Bumpiness

+                        </text>

+                        <combo_box allow_text_entry="false" bottom_delta="-22" follows="left|top" height="18"

+                             left="180" max_chars="20" mouse_opaque="true" name="combobox bumpiness"

+                             width="80">

+                                <combo_item name="None" value="None">

+                                        None

+                                </combo_item>

+                                <combo_item name="Brightness" value="Brightness">

+                                        Brightness

+                                </combo_item>

+                                <combo_item name="Darkness" value="Darkness">

+                                        Darkness

+                                </combo_item>

+                                <combo_item name="woodgrain" value="woodgrain">

+                                        woodgrain

+                                </combo_item>

+                                <combo_item name="bark" value="bark">

+                                        bark

+                                </combo_item>

+                                <combo_item name="bricks" value="bricks">

+                                        bricks

+                                </combo_item>

+                                <combo_item name="checker" value="checker">

+                                        checker

+                                </combo_item>

+                                <combo_item name="concrete" value="concrete">

+                                        concrete

+                                </combo_item>

+                                <combo_item name="crustytile" value="crustytile">

+                                        crustytile

+                                </combo_item>

+                                <combo_item name="cutstone" value="cutstone">

+                                        cutstone

+                                </combo_item>

+                                <combo_item name="discs" value="discs">

+                                        discs

+                                </combo_item>

+                                <combo_item name="gravel" value="gravel">

+                                        gravel

+                                </combo_item>

+                                <combo_item name="petridish" value="petridish">

+                                        petridish

+                                </combo_item>

+                                <combo_item name="siding" value="siding">

+                                        siding

+                                </combo_item>

+                                <combo_item name="stonetile" value="stonetile">

+                                        stonetile

+                                </combo_item>

+                                <combo_item name="stucco" value="stucco">

+                                        stucco

+                                </combo_item>

+                                <combo_item name="suction" value="suction">

+                                        suction

+                                </combo_item>

+                                <combo_item name="weave" value="weave">

+                                        weave

+                                </combo_item>

+                        </combo_box>

+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

+                             bottom="-158" drop_shadow_visible="true" follows="left|top"

+                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"

+                             mouse_opaque="true" name="tex scale" v_pad="0" width="160">

+                                Repeats per Face

+                        </text>

+                        <spinner bottom="-178" decimal_digits="3" follows="left|top" height="16" increment="0.1"

+                             initial_val="0" label="Horizontal (U)" label_width="90" left="20"

+                             max_val="100" min_val="0" mouse_opaque="true" name="TexScaleU" width="160" />

+                        <check_box bottom="-179" follows="left|top" font="SansSerifSmall" height="16"

+                             initial_value="false" label="Flip" left_delta="170" mouse_opaque="true"

+                             name="checkbox flip s" width="70" />

+                        <spinner bottom="-196" decimal_digits="3" follows="left|top" height="16" increment="0.1"

+                             initial_val="0" label="Vertical (V)" label_width="90" left="20"

+                             max_val="100" min_val="0" mouse_opaque="true" name="TexScaleV" width="160" />

+                        <check_box bottom="-197" follows="left|top" font="SansSerifSmall" height="16"

+                             initial_value="false" label="Flip" left_delta="170" mouse_opaque="true"

+                             name="checkbox flip t" width="70" />

+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

+                             bottom="-228" drop_shadow_visible="true" follows="left|top"

+                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"

+                             mouse_opaque="true" name="tex rotate" v_pad="0" width="102">

+                                Rotation (degrees)

+                        </text>

+                        <spinner bottom="-234" decimal_digits="2" follows="left|top" height="16" increment="1"

+                             initial_val="0" left="112" max_val="9999" min_val="-9999"

+                             mouse_opaque="true" name="TexRot" width="68" />

+                        <string name="string repeats per meter">

+                                Repeats Per Meter

+                        </string>

+                        <string name="string repeats per face">

+                                Repeats Per Face

+                        </string>

+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

+                             bottom="-250" drop_shadow_visible="true" follows="left|top"

+                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"

+                             mouse_opaque="true" name="rpt" v_pad="0" width="160">

+                                Repeats Per Meter

+                        </text>

+                        <spinner bottom="-256" decimal_digits="1" follows="left|top" height="16" increment="0.1"

+                             initial_val="1" left="112" max_val="10" min_val="0.1" mouse_opaque="true"

+                             name="rptctrl" width="68" />

+                        <button bottom="-256" follows="left|top" font="SansSerifSmall" halign="center"

+                             height="16" label="Apply" label_selected="Apply" left_delta="78"

+                             mouse_opaque="true" name="button apply" scale_image="TRUE" width="75" />

+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

+                             bottom="-288" drop_shadow_visible="true" follows="left|top"

+                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"

+                             mouse_opaque="true" name="tex offset" v_pad="0" width="160">

+                                Offset

+                        </text>

+                        <spinner bottom="-308" decimal_digits="3" follows="left|top" height="16" increment="0.1"

+                             initial_val="0" label="Horizontal (U)" label_width="90" left="20"

+                             max_val="1" min_val="-1" mouse_opaque="true" name="TexOffsetU" width="160" />

+                        <spinner bottom_delta="-18" decimal_digits="3" follows="left|top" height="16"

+                             increment="0.1" initial_val="0" label="Vertical (V)" label_width="90"

+                             left="20" max_val="1" min_val="-1" mouse_opaque="true" name="TexOffsetV"

+                             width="160" />

+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

+                             bottom="-352" drop_shadow_visible="true" follows="left|top"

+                             font="SansSerifSmall" h_pad="0" halign="left" height="20" left="10"

+                             mouse_opaque="true" name="textbox autofix" v_pad="0" width="160">

+                                Align media texture

+(must load first)

+                        </text>

+                        <button bottom="-360" follows="left|top" font="SansSerifSmall" halign="center"

+                             height="16" label="Align" label_selected="Align" left="112"

+                             mouse_opaque="true" name="button align" scale_image="TRUE" width="68" />

+                </panel>

+                <panel border="true" bottom="-383" follows="left|top|right|bottom" height="367"

+                     label="Content" left="1" mouse_opaque="false" name="Contents" width="270">

+                        <button bottom="-30" follows="left|top" font="SansSerif" halign="center" height="20"

+                              label="New Script..." label_selected="New Script..."

+                             left="10" mouse_opaque="true" name="button new script" scale_image="TRUE"

+                             width="130" />

+                        <panel bottom_delta="-330" follows="left|top" height="325"  left="10"

+                             mouse_opaque="true" name="ContentsInventory" width="252" />

+                </panel>

+        </tab_container>

+

+<!-- Land Info sub-tab -->

+

+        <panel bottom="-550" follows="left|top" height="384" left="0" mouse_opaque="true"

+             name="land info panel" width="272">

+                <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

+                     bottom="-18" drop_shadow_visible="true" follows="left|top"

+                     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"

+                     mouse_opaque="true" name="label_area_price" v_pad="0" width="150">

+                        Price: L$[PRICE] for [AREA] sq. m.

+                </text>

+                <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

+                     bottom_delta="0" drop_shadow_visible="true" follows="left|top"

+                     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"

+                     mouse_opaque="true" name="label_area" v_pad="0" width="72">

+                        Area: [AREA] sq. m.

+                </text>

+                <button bottom_delta="-38" follows="left|top" font="SansSerif" halign="center"

+                     height="20" label="Buy Land..." label_selected="Buy Land..." left="76"

+                     mouse_opaque="true" name="button buy land" scale_image="TRUE" width="102" />

+                <button bottom_delta="-24" follows="left|top" font="SansSerif" halign="center"

+                     height="20" label="Abandon Land..." label_selected="Abandon Land..."

+                     left="76" mouse_opaque="true" name="button abandon land" scale_image="TRUE"

+                     width="102" />

+                <button bottom_delta="-24" follows="left|top" font="SansSerif" halign="center"

+                     height="20" label="Subdivide..." label_selected="Subdivide..." left="76"

+                     mouse_opaque="true" name="button subdivide land" scale_image="TRUE"

+                     width="102" />

+                <button bottom_delta="-24" follows="left|top" font="SansSerif" halign="center"

+                     height="20" label="Join..." label_selected="Join..." left="76"

+                     mouse_opaque="true" name="button join land" scale_image="TRUE" width="102" />

+                <button bottom_delta="-40" follows="left|top" font="SansSerif" halign="center"

+                     height="20" label="About Land..." label_selected="About Land..." left="76"

+                     mouse_opaque="true" name="button about land" scale_image="TRUE" width="102" />

+        </panel>

+        <string name="status_rotate">

+                Drag colored bands to rotate object

+        </string>

+        <string name="status_scale">

+                Click and drag to stretch selected side

+        </string>

+        <string name="status_move">

+                Drag to move, shift-drag to copy

+        </string>

+        <string name="status_modifyland">

+                Click and hold to modify land

+        </string>

+        <string name="status_camera">

+                Click and drag to change view

+        </string>

+        <string name="status_grab">

+                Drag to move objects, Ctrl to lift, Ctrl-Shift to spin

+        </string>

+        <string name="status_place">

+                Click in the world to create, shift-click to select

+        </string>

+        <string name="status_selectland">

+                Click and drag to select land

+        </string>

+        <string name="grid_screen_text">

+                Screen

+        </string>

+        <string name="grid_local_text">

+                Local

+        </string>

+        <string name="grid_world_text">

+                World

+        </string>

+        <string name="grid_reference_text">

+                Reference

+        </string>

+        <string name="grid_attachment_text">

+                Attachment

+        </string>

+</floater>

diff --git a/linden/indra/newview/skins/xui/en-us/floater_water.xml b/linden/indra/newview/skins/silver/xui/en-us/floater_water.xml
index 5b65837..c3a217c 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_water.xml
+++ b/linden/indra/newview/skins/silver/xui/en-us/floater_water.xml
@@ -1,260 +1,260 @@
-<?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>
+<?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/xui/en-us/floater_windlight_options.xml b/linden/indra/newview/skins/silver/xui/en-us/floater_windlight_options.xml
index 11859cc..5ec7b1b 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_windlight_options.xml
+++ b/linden/indra/newview/skins/silver/xui/en-us/floater_windlight_options.xml
@@ -1,593 +1,593 @@
-<?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="-50" 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="New" label_selected="New" left_delta="170"
-             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="80"
-             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="80"
-             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="120" mouse_opaque="true" name="WLDayCycleMenuButton"
-             scale_image="true" width="120" />
-        <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>
+<?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="-50" 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="New" label_selected="New" left_delta="170"

+             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="80"

+             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="80"

+             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="120" mouse_opaque="true" name="WLDayCycleMenuButton"

+             scale_image="true" width="120" />

+        <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_avatar.xml b/linden/indra/newview/skins/silver/xui/en-us/panel_avatar.xml
new file mode 100644
index 0000000..ac7f6a3
--- /dev/null
+++ b/linden/indra/newview/skins/silver/xui/en-us/panel_avatar.xml
@@ -0,0 +1,435 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

+<panel bottom="-550" height="486" left="350" name="Panel Avatar" width="430">

+        <tab_container bottom="-486" height="486" left="0" mouse_opaque="false" name="tab"

+             tab_min_width="50" tab_position="top" width="419">

+                <panel border="true" bottom="-482" follows="left|top|right|bottom" height="466"

+                     label="2nd Life" left="1" mouse_opaque="true" name="2nd Life" width="418">

+                        <string name="CaptionTextAcctInfo">

+                                [ACCTTYPE]

+[PAYMENTINFO]

+[AGEVERIFICATION]

+                        </string>

+                        <string name="AcctTypeResident">

+                                Resident

+                        </string>

+                        <string name="AcctTypeTrial">

+                                Trial

+                        </string>

+                        <string name="AcctTypeCharterMember">

+                                Charter Member

+                        </string>

+                        <string name="AcctTypeEmployee">

+                                Linden Lab Employee

+                        </string>

+                        <string name="PaymentInfoUsed">

+                                Payment Info Used

+                        </string>

+                        <string name="PaymentInfoOnFile">

+                                Payment Info On File

+                        </string>

+                        <string name="NoPaymentInfoOnFile">

+                                No Payment Info On File

+                        </string>

+                        <string name="AgeVerified">

+                                Age-verified

+                        </string>

+                        <string name="NotAgeVerified">

+                                Not Age-verified

+                        </string>

+                        <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="right" height="16" left="4"

+                             mouse_opaque="true" name="Name:" v_pad="0" width="70">

+                                Name:

+                        </text>

+                        <name_editor bevel_style="in" border_style="line"

+                             border_thickness="1" bottom="-24" enabled="false" follows="left|top"

+                             font="SansSerifSmall" height="16" is_unicode="false" left_delta="75"

+                             max_length="254" mouse_opaque="false" name="name"

+                             width="180" />

+                        <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="16" left="279"

+                             mouse_opaque="true" name="online_yes" v_pad="0" width="121">

+                                Currently Online

+                        </text>

+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

+                             bottom_delta="-20" drop_shadow_visible="true" follows="left|top"

+                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="279"

+                             mouse_opaque="true" name="label" v_pad="0" width="121">

+                                Born:

+                        </text>

+                        <line_editor bevel_style="in" border_style="line"

+                             border_thickness="1" bottom_delta="-16" enabled="true" follows="left|top"

+                             font="SansSerifSmall" height="16" is_unicode="false" left="279"

+                             max_length="254" mouse_opaque="false" name="born"

+                             width="121" />

+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

+                             bottom_delta="-20" drop_shadow_visible="true" follows="left|top"

+                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="279"

+                             mouse_opaque="true" name="label2" v_pad="0" width="121">

+                                Account:

+                        </text>

+                        <view_border bevel_style="in" bottom_delta="-48" follows="left|top" height="48" left="279"

+                             mouse_opaque="false" name="acct_border" width="121" />

+                        <text bg_visible="false" border_drop_shadow_visible="false"

+                             border_visible="true" bottom_delta="0" drop_shadow_visible="true"

+                             follows="left|top" font="SansSerifSmall" height="48" left="279"

+                             mouse_opaque="false" name="acct" width="121" />

+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

+                             bottom_delta="-20" drop_shadow_visible="true" follows="left|top"

+                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="279"

+                             mouse_opaque="true" name="partner_label"

+                             tool_tip="Second Life partner. For more info on how to set, see www.secondlife.com/partner"

+                             v_pad="0" width="130">

+                                Partner:

+                        </text>

+                        <button bottom_delta="2" follows="left|top" font="SansSerif" halign="center"

+                             height="16" label="i" label_selected="i" left_delta="44"

+                             mouse_opaque="true" name="partner_info"

+                             tool_tip="Click to open partner&apos;s profile" width="18" />

+                        <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"

+                             height="16" label="?" label_selected="?" left_delta="24"

+                             mouse_opaque="true" name="partner_help" width="18" />

+                        <line_editor bevel_style="in" border_style="line"

+                             border_thickness="1" bottom_delta="-16" enabled="true" follows="left|top"

+                             font="SansSerifSmall" height="16" is_unicode="false" left="279"

+                             max_length="254" mouse_opaque="false" name="partner_edit"

+                             tool_tip="Second Life partner. For more info on how to set, see www.secondlife.com/partner"

+                             width="121">

+                                [FIRST] [LAST]

+                        </line_editor>

+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

+                             bottom="-44" drop_shadow_visible="true" follows="left|top"

+                             font="SansSerifSmall" h_pad="0" halign="right" height="16" left="4"

+                             mouse_opaque="true" name="Photo:" v_pad="0" width="70">

+                                Photo:

+                        </text>

+                        <texture_picker allow_no_texture="true" bottom="-179" can_apply_immediately="false"

+                             default_image_name="None" follows="left|top" height="151" label=""

+                             left="79" mouse_opaque="true" name="img"

+                             tool_tip="Click to choose a picture" width="180" />

+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

+                             bottom="-183" drop_shadow_visible="true" follows="left|top"

+                             font="SansSerifSmall" h_pad="0" halign="right" height="16" left="4"

+                             mouse_opaque="true" name="Groups:" v_pad="0" width="70">

+                                Groups:

+                        </text>

+                        <scroll_list background_visible="true" bottom="-258" column_padding="5" draw_border="true"

+                             follows="left|top" height="90" left="79" mouse_opaque="false"

+                             multi_select="false" name="groups" width="321" />

+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

+                             bottom="-280" drop_shadow_visible="true" follows="left|top"

+                             font="SansSerifSmall" h_pad="0" halign="right" height="16" left="4"

+                             mouse_opaque="true" name="About:" v_pad="0" width="70">

+                                About:

+                        </text>

+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

+                             bottom_delta="-16" drop_shadow_visible="true" follows="left|top"

+                             font="SansSerifSmall" h_pad="0" halign="right" height="16" left="0"

+                             mouse_opaque="true" name="(500 chars)" v_pad="0" width="70">

+                                (500 chars)

+                        </text>

+                        <text_editor bottom="-375" embedded_items="false"

+                             enabled="true" follows="left|top" font="SansSerifSmall" height="110"

+                             is_unicode="false" left="79" max_length="511" mouse_opaque="true"

+                             name="about" width="321" word_wrap="true" />

+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

+                             bottom="-403" drop_shadow_visible="true" follows="left|top"

+                             font="SansSerifSmall" h_pad="0" halign="right" height="16" left="0"

+                             mouse_opaque="true" name="Give item:" v_pad="0" width="75">

+                                Give item:

+                        </text>

+                        <view_border blevel_style="in" border_thickness="0" bottom="-466" follows="left|top"

+                             height="466" left_delta="4" mouse_opaque="false" name="drop_target_rect"

+                             width="409" />

+                        <view_border blevel_style="in" bottom="-403" follows="left|top" height="16" left_delta="75"

+                             mouse_opaque="false" name="drop_target_rect_vis" width="321" />

+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

+                             bottom_delta="0" drop_shadow_visible="true" follows="left|top"

+                             font="SansSerifSmall" h_pad="0" halign="center" height="16" left_delta="0"

+                             mouse_opaque="true" name="Give inventory"

+                             tool_tip="Drop inventory items here to give them to this person." v_pad="2"

+                             width="321">

+                                Drop inventory item here.

+                        </text>

+                        <check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"

+                             initial_value="false" label="Show in search" left="75" mouse_opaque="true"

+                             name="allow_publish"

+                             tool_tip="Publish extra profile information such as description and image in Search."

+                             width="130" />

+                        <button bottom="-423" follows="left|top" font="SansSerif" halign="center" height="16"

+                             label="?" label_selected="?" left_delta="145" mouse_opaque="true" name="?"

+                             width="20" />

+                        <button bottom="-428" font="SansSerif" halign="center" height="20" label="Find on Map"

+                             label_selected="Find on Map" left="24" mouse_opaque="true"

+                             name="Find on Map" width="100" />

+                        <button bottom="-428" font="SansSerif" halign="center" height="20"

+                             label="Offer Teleport..." label_selected="Offer Teleport..."

+                             left_delta="102" mouse_opaque="true" name="Offer Teleport..." width="140" />

+                        <button bottom="-428" font="SansSerif" halign="center" height="20"

+                             label="Add Friend..." label_selected="Add Friend..." left_delta="142"

+                             mouse_opaque="true" name="Add Friend..." width="130" />

+                        <button bottom_delta="-24" font="SansSerif" halign="center" height="20" label="Pay..."

+                             label_selected="Pay..." left="24" mouse_opaque="true" name="Pay..."

+                             width="100" />

+                        <button bottom_delta="0" font="SansSerif" halign="center" height="20"

+                             label="Instant Message..." label_selected="Instant Message..."

+                             left_delta="102" mouse_opaque="true" name="Instant Message..."

+                             tool_tip="Instant Message (IM)" width="140" />

+                        <button bottom_delta="0" font="SansSerif" halign="center" height="20" label="Mute"

+                             label_selected="Mute" left_delta="142" mouse_opaque="true" name="Mute"

+                             width="130" />

+                </panel>

+                <panel border="true" bottom="-482" follows="left|top|right|bottom" height="466"

+                     label="Web" left="1" mouse_opaque="true" name="WebProfile" width="418">

+                        <button bottom_delta="-22" follows="left|top" font="SansSerifSmall" halign="center"

+                             height="18" label="Home" label_selected="Home" left="10"

+                             mouse_opaque="true" name="home" width="55" />

+                        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" halign="center"

+                             height="18" label="Load" label_selected="Load" left_delta="60"

+                             mouse_opaque="true" name="load"

+                             tool_tip="Load this profile page with embedded web browser." width="60" />

+                        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" halign="center"

+                             height="18" label="Open..." label_selected="Open..." left_delta="63"

+                             mouse_opaque="true" name="open"

+                             tool_tip="Open this profile page in your default external web browser."

+                             width="60" />

+                        <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"

+                             height="18" label="?" label_selected="?" left_delta="65"

+                             mouse_opaque="true" name="web_profile_help" width="18" />

+                        <check_box bottom_delta="0" follows="right|top" font="SansSerifSmall" height="16"

+                             initial_value="false" label="Automatically load web profiles"

+                             left_delta="30" mouse_opaque="true" name="auto_load"

+                             tool_tip="Automatically load ALL profile webpages without asking first."

+                             width="127" />

+                        <line_editor bevel_style="in" border_style="line"

+                             border_thickness="1" bottom_delta="-18" enabled="false" follows="left|top"

+                             font="SansSerifSmall" height="16" is_unicode="false" left="10"

+                             max_length="254" mouse_opaque="true" name="url_edit"

+                             width="400" />

+                        <web_browser border_visible="false" bottom="-444" follows="top|left|right" height="400"

+                             ignore_ui_scale="false" left="10" name="profile_html" start_url=""

+                             width="400" />

+                        <text bottom="5" follows="bottom|left|right" left="15" name="status_text" right="-70"

+                             top="25" />

+                </panel>

+                <panel border="true" bottom="-482" follows="left|top|right|bottom" height="466"

+                     label="Interests" left="1" mouse_opaque="true" name="Interests" width="418">

+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

+                             bottom="-36" drop_shadow_visible="true" follows="left|top"

+                             font="SansSerifSmall" h_pad="0" halign="right" height="16" left="4"

+                             mouse_opaque="true" name="I Want To:" v_pad="0" width="70">

+                                I Want To:

+                        </text>

+                        <check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"

+                             initial_value="false" label="Build" left_delta="70" mouse_opaque="true"

+                             name="chk0" width="90" />

+                        <check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"

+                             initial_value="false" label="Explore" left_delta="170" mouse_opaque="true"

+                             name="chk1" width="90" />

+                        <check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"

+                             initial_value="false" label="Meet" left_delta="-170" mouse_opaque="true"

+                             name="chk2" width="57" />

+                        <check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"

+                             initial_value="false" label="Be Hired" left_delta="170" mouse_opaque="true"

+                             name="chk6" width="92" />

+                        <check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"

+                             initial_value="false" label="Group" left_delta="-170" mouse_opaque="true"

+                             name="chk3" width="90" />

+                        <check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"

+                             initial_value="false" label="Buy" left_delta="170" mouse_opaque="true"

+                             name="chk4" width="90" />

+                        <check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"

+                             initial_value="false" label="Sell" left_delta="-170" mouse_opaque="true"

+                             name="chk5" width="50" />

+                        <check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"

+                             initial_value="false" label="Hire" left_delta="170" mouse_opaque="true"

+                             name="chk7" width="92" />

+                        <line_editor bevel_style="in" border_style="line"

+                             border_thickness="1" bottom_delta="-20" enabled="true" follows="left|top"

+                             font="SansSerifSmall" height="16" is_unicode="false" left="74"

+                             max_length="254" mouse_opaque="true" name="want_to_edit"

+                             width="330" />

+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

+                             bottom_delta="-26" drop_shadow_visible="true" follows="left|top"

+                             font="SansSerifSmall" h_pad="0" halign="right" height="16" left="4"

+                             mouse_opaque="true" name="Skills:" v_pad="0" width="70">

+                                Skills:

+                        </text>

+                        <check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"

+                             initial_value="false" label="Textures" left_delta="70" mouse_opaque="true"

+                             name="schk0" width="90" />

+                        <check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"

+                             initial_value="false" label="Architecture" left_delta="170"

+                             mouse_opaque="true" name="schk1" width="93" />

+                        <check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"

+                             initial_value="false" label="Event Planning" left_delta="0"

+                             mouse_opaque="true" name="schk2" width="105" />

+                        <check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"

+                             initial_value="false" label="Modeling" left_delta="-170"

+                             mouse_opaque="true" name="schk3" width="90" />

+                        <check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"

+                             initial_value="false" label="Scripting" left_delta="0" mouse_opaque="true"

+                             name="schk4" width="90" />

+                        <check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"

+                             initial_value="false" label="Custom Characters" left_delta="170"

+                             mouse_opaque="true" name="schk5" width="127" />

+                        <line_editor bevel_style="in" border_style="line"

+                             border_thickness="1" bottom_delta="-20" enabled="true" follows="left|top"

+                             font="SansSerifSmall" height="16" is_unicode="false" left="74"

+                             max_length="254" mouse_opaque="true" name="skills_edit"

+                             width="330" />

+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

+                             bottom_delta="-30" drop_shadow_visible="true" follows="left|top"

+                             font="SansSerifSmall" h_pad="0" halign="right" height="16" left="4"

+                             mouse_opaque="true" name="Languages:" v_pad="0" width="70">

+                                Languages:

+                        </text>

+                        <line_editor bevel_style="in" border_style="line"

+                             border_thickness="1" bottom_delta="0" enabled="true" follows="left|top"

+                             font="SansSerifSmall" height="16" is_unicode="false" left="74"

+                             max_length="254" mouse_opaque="true" name="languages_edit"

+                             width="330" />

+                </panel>

+                <panel border="true" bottom="-482" follows="left|top|right|bottom" height="466"

+                     label="Picks" left="1" mouse_opaque="true" name="Picks" width="418">

+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

+                             bottom="-20" drop_shadow_visible="true" follows="left|top"

+                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="114"

+                             mouse_opaque="true"

+                             name="Tell everyone about your favorite places in Second Life." v_pad="0"

+                             width="302">

+                                Tell everyone about your favorite places in Second Life.

+                        </text>

+                        <button bottom_delta="-24" follows="left|top" font="SansSerif" halign="center"

+                             height="20" label="New..." label_selected="New..." left="114"

+                             mouse_opaque="true" name="New..." width="75" />

+                        <button bottom="-44" follows="left|top" font="SansSerif" halign="center" height="20"

+                             label="Delete..." label_selected="Delete..." left_delta="79"

+                             mouse_opaque="true" name="Delete..." width="75" />

+                        <tab_container bottom="-411" follows="left|top" height="363" left="4" mouse_opaque="false"

+                             name="picks tab" tab_position="left" width="412" />

+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

+                             bottom="-70" drop_shadow_visible="true" follows="left|top" font="SansSerif"

+                             h_pad="0" halign="left" height="20" left="114" mouse_opaque="false"

+                             name="loading_text" v_pad="0" width="302">

+                                Loading...

+                        </text>

+                </panel>

+                <panel border="true" bottom="-482" follows="left|top|right|bottom" height="466"

+                     label="Classified" left="1" mouse_opaque="true" name="Classified"

+                     width="418">

+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

+                             bottom="-20" drop_shadow_visible="true" follows="left|top"

+                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="114"

+                             mouse_opaque="true"

+                             name="Place an ad in Second Life&apos;s classified listings." v_pad="0"

+                             width="302">

+                                Place an ad in Second Life&apos;s classified listings.

+                        </text>

+                        <button bottom_delta="-24" follows="left|top" font="SansSerif" halign="center"

+                             height="20" label="New..." label_selected="New..." left="114"

+                             mouse_opaque="true" name="New..." width="75" />

+                        <button bottom="-44" follows="left|top" font="SansSerif" halign="center" height="20"

+                             label="Delete..." label_selected="Delete..." left_delta="79"

+                             mouse_opaque="true" name="Delete..." width="75" />

+                        <tab_container bottom="-443" follows="left|top" height="395" left="4" mouse_opaque="false"

+                             name="classified tab" tab_position="left" width="412" />

+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

+                             bottom="-70" drop_shadow_visible="true" follows="left|top" font="SansSerif"

+                             h_pad="0" halign="left" height="20" left="114" mouse_opaque="false"

+                             name="loading_text" v_pad="0" width="302">

+                                Loading...

+                        </text>

+                </panel>

+                <panel border="true" bottom="-482" follows="left|top|right|bottom" height="466"

+                     label="1st Life" left="1" mouse_opaque="true" name="1st Life" width="418">

+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

+                             bottom="-36" drop_shadow_visible="true" follows="left|top"

+                             font="SansSerifSmall" h_pad="0" halign="right" height="16" left="4"

+                             mouse_opaque="true" name="Photo:" v_pad="0" width="61">

+                                Photo:

+                        </text>

+                        <texture_picker allow_no_texture="true" bottom="-171" can_apply_immediately="false"

+                             default_image_name="None" follows="left|top" height="151" label=""

+                             left="70" mouse_opaque="true" name="img"

+                             tool_tip="Click to choose a picture" width="135" />

+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

+                             bottom="-203" drop_shadow_visible="true" follows="left|top"

+                             font="SansSerifSmall" h_pad="0" halign="right" height="16" left="4"

+                             mouse_opaque="true" name="Info:" v_pad="0" width="61">

+                                Info:

+                        </text>

+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

+                             bottom_delta="-16" drop_shadow_visible="true" follows="left|top"

+                             font="SansSerifSmall" h_pad="0" halign="right" height="16" left="0"

+                             mouse_opaque="true" name="(250 chars)" v_pad="0" width="65">

+                                (250 chars)

+                        </text>

+                        <text_editor bottom="-347" embedded_items="false"

+                             enabled="true" follows="left|top" font="SansSerifSmall" height="160"

+                             is_unicode="false" left="70" max_length="254" mouse_opaque="false"

+                             name="about" width="330" word_wrap="true" />

+                </panel>

+                <panel border="true" bottom="-482" follows="left|top|right|bottom" height="466"

+                     label="My Notes" left="1" mouse_opaque="true" name="My Notes" width="418">

+                        <string name="Loading">

+                                Loading...

+                        </string>

+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

+                             bottom="-52" drop_shadow_visible="true" follows="left|top"

+                             font="SansSerifSmall" h_pad="0" halign="left" height="48" left="10"

+                             mouse_opaque="true" name="label" v_pad="0" width="412">

+                                Use this space to record your notes about this person.  Keep track

+of trades in progress, joint projects, etc.  Only you can see these

+notes.  This person cannot see them, nor can other people.

+                        </text>

+                        <text_editor bottom_delta="-260" embedded_items="false" enabled="true" follows="left|top"

+                             font="SansSerif" height="256" is_unicode="false" left="10"

+                             max_length="1023" mouse_opaque="true" name="notes edit" width="400"

+                             word_wrap="false" />

+                </panel>

+        </tab_container>

+        <button bottom="-483" font="SansSerif" halign="center" height="20" label="OK"

+             label_selected="OK" left="208" mouse_opaque="true" name="OK" width="100" />

+        <button bottom_delta="0" font="SansSerif" halign="center" height="20" label="Cancel"

+             label_selected="Cancel" left_delta="105" mouse_opaque="true" name="Cancel"

+             width="100" />

+        <button bottom_delta="132" font="SansSerif" halign="center" height="20" label="Kick"

+             label_selected="Kick" left="4" mouse_opaque="true" name="Kick" width="72" />

+        <button bottom_delta="-24" font="SansSerif" halign="center" height="20" label="Freeze"

+             label_selected="Freeze" left="4" mouse_opaque="true" name="Freeze"

+             tool_tip="Stop this resident&apos;s movement and chat." width="72" />

+        <button bottom_delta="-24" font="SansSerif" halign="center" height="20"

+             label="Unfreeze" label_selected="Unfreeze" left="4" mouse_opaque="true"

+             name="Unfreeze" tool_tip="Thaw resident" width="72" />

+        <button bottom_delta="-24" font="SansSerif" halign="center" height="20" label="CSR"

+             label_selected="CSR" left="4" mouse_opaque="true" name="csr_btn"

+             tool_tip="Open customer service tool for this resident" width="72" />

+        <string name="ShowOnMapNonFriend">

+                Show location on the map.

+Disabled because you have not

+formed a friendship with them.

+        </string>

+        <string name="ShowOnMapFriendOffline">

+                Show location on the map.

+    Disabled because they are not online.

+        </string>

+        <string name="ShowOnMapFriendOnline">

+                Show location on the map.

+        </string>

+        <string name="TeleportGod">

+                Force a teleport to your location.

+        </string>

+        <string name="TeleportPrelude">

+                Offer a teleport to your location.

+Disabled until you leave Orientation Island.

+        </string>

+        <string name="TeleportNormal">

+                Offer a teleport to your location.

+        </string>

+        <string name="Loading">

+                Loading...

+        </string>

+</panel>

diff --git a/linden/indra/newview/skins/xui/en-us/panel_media_controls.xml b/linden/indra/newview/skins/silver/xui/en-us/panel_media_controls.xml
index fe392a6..fe392a6 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_media_controls.xml
+++ b/linden/indra/newview/skins/silver/xui/en-us/panel_media_controls.xml
diff --git a/linden/indra/newview/skins/xui/en-us/panel_status_bar.xml b/linden/indra/newview/skins/silver/xui/en-us/panel_status_bar.xml
index 1def3fb..3387566 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_status_bar.xml
+++ b/linden/indra/newview/skins/silver/xui/en-us/panel_status_bar.xml
@@ -1,123 +1,123 @@
-<?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="llPushObject restricted" 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>
+<?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="llPushObject restricted" 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/xui/en-us/panel_toolbar.xml b/linden/indra/newview/skins/silver/xui/en-us/panel_toolbar.xml
index 1009b3d..fe07c36 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_toolbar.xml
+++ b/linden/indra/newview/skins/silver/xui/en-us/panel_toolbar.xml
@@ -1,77 +1,77 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel background_opaque="false" background_visible="false" bottom="0" can_close="true"
-     can_minimize="false" can_resize="false" follows="left|right|bottom"
-     height="28" name="toolbar" width="1024">
-    
-  <string name="Redock Windows">Redock Windows</string>
-  <panel bottom="0" filename="panel_bg_toolbar.xml" height="28" left="0" width="1024" />
-  <layout_stack name="toolbar_stack" follows="left|right|bottom|top" bottom="2" left="1" width="1022" height="26" min_width="200" min_height="26"  orientation="horizontal" border_size="0">
-    <icon image_name="spacer24.tga" width="2" height="2" follows="left|right" auto_resize="false" color="0,0,0,0" left="0" />
-    <button bottom="0" font="SansSerif" height="24"
-               image_selected="btn_chatbar_selected.tga" scale_image="true"
-               image_unselected="btn_chatbar.tga" label="" left="2" name="chat_btn"
-               image_overlay="icn_chatbar.tga" tool_tip="Show Chat Bar. (Enter)"
-               width="50" auto_resize="false" follows="left|right" user_resize="false"/>
-    <icon image_name="spacer24.tga" left_delta="2" width="2" height="2" follows="left|right" auto_resize="false" color="0,0,0,0"/>
-     <flyout_button bottom="0" font="SansSerif" height="24" label="Communicate" left="0"
-               name="communicate_btn" tool_tip="Communicate with your Friends and Groups."
-               list_position="above"
-               width="50" follows="left|right" user_resize="false"/>
-    <icon image_name="spacer24.tga" width="2" height="2" follows="left|right" auto_resize="false" color="0,0,0,0"/>
-    <button bottom="0" font="SansSerif" height="24" label="Fly"
-        image_overlay="icn_toolbar_fly.tga" image_overlay_alignment="left"
-                        image_selected="toolbar_btn_selected.tga"
-             image_unselected="toolbar_btn_enabled.tga"
-             image_disabled="toolbar_btn_disabled.tga" scale_image="true"
-               label_selected="Stop Flying" left="0" name="fly_btn"
-               tool_tip="Start flying. Use E/C or PgUp/PgDn to fly up and down."
-               width="50" follows="left|right" user_resize="false"/>
-    <icon image_name="spacer24.tga" width="2" height="2" follows="left|right" auto_resize="false" color="0,0,0,0" />
-    <button bottom="0" font="SansSerif" height="24" label="Snapshot" left="0"
-             image_overlay="icn_toolbar_snapshot.tga" image_overlay_alignment="left"
-                        image_selected="toolbar_btn_selected.tga"
-             image_unselected="toolbar_btn_enabled.tga"
-             image_disabled="toolbar_btn_disabled.tga" scale_image="true"
-               name="snapshot_btn" tool_tip="Save a screen shot to disk or inventory."
-               width="50" follows="left|right" user_resize="false"/>
-    <icon image_name="spacer24.tga" width="2" height="2" follows="left|right" auto_resize="false" color="0,0,0,0" />
-    <button bottom="0" font="SansSerif" height="24" label="Search" left="0"
-             image_overlay="icn_toolbar_search.tga" image_overlay_alignment="left"
-             image_selected="toolbar_btn_selected.tga"
-             image_unselected="toolbar_btn_enabled.tga"
-             image_disabled="toolbar_btn_disabled.tga" scale_image="true"
-               name="directory_btn"
-               tool_tip="Search for places, events, people, and more." width="50" follows="left|right" user_resize="false"/>
-    <icon image_name="spacer24.tga" width="2" height="2" follows="left|right" auto_resize="false" color="0,0,0,0" />
-    <button bottom="0" font="SansSerif" height="24" label="Build" left="0" name="build_btn"
-                         image_overlay="icn_toolbar_build.tga" image_overlay_alignment="left"
-                        image_selected="toolbar_btn_selected.tga"
-             image_unselected="toolbar_btn_enabled.tga"
-             image_disabled="toolbar_btn_disabled.tga" scale_image="true"
-               tool_tip="Create new objects." width="50" follows="left|right" user_resize="false"/>
-    <icon image_name="spacer24.tga" width="2" height="2" follows="left|right" auto_resize="false" color="0,0,0,0" />
-    <button bottom="0" font="SansSerif" height="24" label="Map" left="0" name="map_btn"
-                         image_overlay="icn_toolbar_map.tga" image_overlay_alignment="left"
-                        image_selected="toolbar_btn_selected.tga"
-             image_unselected="toolbar_btn_enabled.tga"
-             image_disabled="toolbar_btn_disabled.tga" scale_image="true"
-               tool_tip="Map of the world. (Ctrl-M)" width="50" follows="left|right" user_resize="false"/>
-    <icon image_name="spacer24.tga" width="2" height="2" follows="left|right" auto_resize="false" color="0,0,0,0" />
-    <button bottom="0" font="SansSerif" height="24" label="Mini-Map" left="0"
-                         image_overlay="icn_toolbar_minimap.tga" image_overlay_alignment="left"
-                        image_selected="toolbar_btn_selected.tga"
-             image_unselected="toolbar_btn_enabled.tga"
-             image_disabled="toolbar_btn_disabled.tga" scale_image="true"
-               name="radar_btn" tool_tip="Map of the area around you. (Ctrl-Shift-M)"
-               width="50" follows="left|right" user_resize="false"/>
-    <icon image_name="spacer24.tga" width="2" height="2" follows="left|right" auto_resize="false" color="0,0,0,0" />
-    <button bottom="0" font="SansSerif" height="24" label="Inventory" left="0"
-                         image_overlay="icn_toolbar_inventory.tga" image_overlay_alignment="left"
-                        image_selected="toolbar_btn_selected.tga"
-             image_unselected="toolbar_btn_enabled.tga"
-             image_disabled="toolbar_btn_disabled.tga" scale_image="true"
-               name="inventory_btn" tool_tip="Your items. (Ctrl-I)" width="50" follows="left|right" user_resize="false"/>
-    <icon image_name="spacer24.tga" width="2" height="2" follows="left|right" auto_resize="false" color="0,0,0,0" />
-  </layout_stack>
-
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

+<panel background_opaque="false" background_visible="false" bottom="0" can_close="true"

+     can_minimize="false" can_resize="false" follows="left|right|bottom"

+     height="28" name="toolbar" width="1024">

+    

+  <string name="Redock Windows">Redock Windows</string>

+  <panel bottom="0" filename="panel_bg_toolbar.xml" height="28" left="0" width="1024" />

+  <layout_stack name="toolbar_stack" follows="left|right|bottom|top" bottom="2" left="1" width="1022" height="26" min_width="200" min_height="26"  orientation="horizontal" border_size="0">

+    <icon image_name="spacer24.tga" width="2" height="2" follows="left|right" auto_resize="false" color="0,0,0,0" left="0" />

+    <button bottom="0" font="SansSerif" height="24"

+               image_selected="btn_chatbar_selected.tga" scale_image="true"

+               image_unselected="btn_chatbar.tga" label="" left="2" name="chat_btn"

+               image_overlay="icn_chatbar.tga" tool_tip="Show Chat Bar. (Enter)"

+               width="50" auto_resize="false" follows="left|right" user_resize="false"/>

+    <icon image_name="spacer24.tga" left_delta="2" width="2" height="2" follows="left|right" auto_resize="false" color="0,0,0,0"/>

+     <flyout_button bottom="0" font="SansSerif" height="24" label="Communicate" left="0"

+               name="communicate_btn" tool_tip="Communicate with your Friends and Groups."

+               list_position="above"

+               width="50" follows="left|right" user_resize="false"/>

+    <icon image_name="spacer24.tga" width="2" height="2" follows="left|right" auto_resize="false" color="0,0,0,0"/>

+    <button bottom="0" font="SansSerif" height="24" label="Fly"

+        image_overlay="icn_toolbar_fly.tga" image_overlay_alignment="left"

+                        image_selected="toolbar_btn_selected.tga"

+             image_unselected="toolbar_btn_enabled.tga"

+             image_disabled="toolbar_btn_disabled.tga" scale_image="true"

+               label_selected="Stop Flying" left="0" name="fly_btn"

+               tool_tip="Start flying. Use E/C or PgUp/PgDn to fly up and down."

+               width="50" follows="left|right" user_resize="false"/>

+    <icon image_name="spacer24.tga" width="2" height="2" follows="left|right" auto_resize="false" color="0,0,0,0" />

+    <button bottom="0" font="SansSerif" height="24" label="Snapshot" left="0"

+             image_overlay="icn_toolbar_snapshot.tga" image_overlay_alignment="left"

+                        image_selected="toolbar_btn_selected.tga"

+             image_unselected="toolbar_btn_enabled.tga"

+             image_disabled="toolbar_btn_disabled.tga" scale_image="true"

+               name="snapshot_btn" tool_tip="Save a screen shot to disk or inventory."

+               width="50" follows="left|right" user_resize="false"/>

+    <icon image_name="spacer24.tga" width="2" height="2" follows="left|right" auto_resize="false" color="0,0,0,0" />

+    <button bottom="0" font="SansSerif" height="24" label="Search" left="0"

+             image_overlay="icn_toolbar_search.tga" image_overlay_alignment="left"

+             image_selected="toolbar_btn_selected.tga"

+             image_unselected="toolbar_btn_enabled.tga"

+             image_disabled="toolbar_btn_disabled.tga" scale_image="true"

+               name="directory_btn"

+               tool_tip="Search for places, events, people, and more." width="50" follows="left|right" user_resize="false"/>

+    <icon image_name="spacer24.tga" width="2" height="2" follows="left|right" auto_resize="false" color="0,0,0,0" />

+    <button bottom="0" font="SansSerif" height="24" label="Build" left="0" name="build_btn"

+                         image_overlay="icn_toolbar_build.tga" image_overlay_alignment="left"

+                        image_selected="toolbar_btn_selected.tga"

+             image_unselected="toolbar_btn_enabled.tga"

+             image_disabled="toolbar_btn_disabled.tga" scale_image="true"

+               tool_tip="Create new objects." width="50" follows="left|right" user_resize="false"/>

+    <icon image_name="spacer24.tga" width="2" height="2" follows="left|right" auto_resize="false" color="0,0,0,0" />

+    <button bottom="0" font="SansSerif" height="24" label="Map" left="0" name="map_btn"

+                         image_overlay="icn_toolbar_map.tga" image_overlay_alignment="left"

+                        image_selected="toolbar_btn_selected.tga"

+             image_unselected="toolbar_btn_enabled.tga"

+             image_disabled="toolbar_btn_disabled.tga" scale_image="true"

+               tool_tip="Map of the world. (Ctrl-M)" width="50" follows="left|right" user_resize="false"/>

+    <icon image_name="spacer24.tga" width="2" height="2" follows="left|right" auto_resize="false" color="0,0,0,0" />

+    <button bottom="0" font="SansSerif" height="24" label="Mini-Map" left="0"

+                         image_overlay="icn_toolbar_minimap.tga" image_overlay_alignment="left"

+                        image_selected="toolbar_btn_selected.tga"

+             image_unselected="toolbar_btn_enabled.tga"

+             image_disabled="toolbar_btn_disabled.tga" scale_image="true"

+               name="radar_btn" tool_tip="Map of the area around you. (Ctrl-Shift-M)"

+               width="50" follows="left|right" user_resize="false"/>

+    <icon image_name="spacer24.tga" width="2" height="2" follows="left|right" auto_resize="false" color="0,0,0,0" />

+    <button bottom="0" font="SansSerif" height="24" label="Inventory" left="0"

+                         image_overlay="icn_toolbar_inventory.tga" image_overlay_alignment="left"

+                        image_selected="toolbar_btn_selected.tga"

+             image_unselected="toolbar_btn_enabled.tga"

+             image_disabled="toolbar_btn_disabled.tga" scale_image="true"

+               name="inventory_btn" tool_tip="Your items. (Ctrl-I)" width="50" follows="left|right" user_resize="false"/>

+    <icon image_name="spacer24.tga" width="2" height="2" follows="left|right" auto_resize="false" color="0,0,0,0" />

+  </layout_stack>

+

+</panel>

diff --git a/linden/indra/newview/skins/xui/en-us/panel_voice_controls.xml b/linden/indra/newview/skins/silver/xui/en-us/panel_voice_controls.xml
index ee476f2..ee476f2 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_voice_controls.xml
+++ b/linden/indra/newview/skins/silver/xui/en-us/panel_voice_controls.xml
diff --git a/linden/indra/newview/skins/textures/textures.xml b/linden/indra/newview/skins/textures/textures.xml
deleted file mode 100644
index 4dbbdf0..0000000
--- a/linden/indra/newview/skins/textures/textures.xml
+++ /dev/null
@@ -1,386 +0,0 @@
-<textures version="101">
-  <sm_rounded_corners_simple.tga>
-        <scale_rect left="4" top="4" bottom="4" right="4"/>
-  </sm_rounded_corners_simple.tga>
-  
-  <icn_textfield_enabled.tga>
-        <scale_rect left="5" top="5" bottom="5" right="5"/>
-  </icn_textfield_enabled.tga>
-  <button_disabled_32x128.tga   preload="true">
-    <scale_rect left="8" top="16" right="120" bottom="8"/>
-  </button_disabled_32x128.tga>
-  <button_enabled_32x128.tga    preload="true">
-    <scale_rect left="8" top="16" right="120" bottom="8"/>
-  </button_enabled_32x128.tga>
-  <toolbar_btn_enabled.tga>
-        <scale_rect left="26" top="24" right="102" bottom="0" />
-                </toolbar_btn_enabled.tga>
-
-  <progressbar_fill.tga preload="true">
-    <scale_rect left="4" top="7" right="71" bottom="7"/>
-    </progressbar_fill.tga>
-  <progressbar_track.tga        preload="true">
-    <scale_rect left="3" top="7" right="87" bottom="7"/>
-    </progressbar_track.tga>
-
-
-  <toolbar_btn_disabled.tga>
-        <scale_rect left="26" top="24" right="102" bottom="0" />
-                </toolbar_btn_disabled.tga>
-  <toolbar_btn_selected.tga>
-        <scale_rect left="26" top="24" right="102" bottom="0" />
-                </toolbar_btn_selected.tga>
-  <button_enabled_selected_32x128.tga   preload="true">
-    <scale_rect left="12" top="12" right="118" bottom="14"/>
-  </button_enabled_selected_32x128.tga>
-  <checkbox_disabled_false.tga  preload="true"/>
-  <checkbox_disabled_true.tga   preload="true"/>
-  <checkbox_enabled_false.tga   preload="true"/>
-  <checkbox_enabled_true.tga    preload="true"/>
-  <close_in_blue.tga    preload="true"/>
-  <combobox_arrow.tga   preload="true"/>
-  <minimize.tga preload="true"/>
-  <minimize_pressed.tga preload="true"/>
-  <radio_active_false.tga       preload="true"/>
-  <radio_active_true.tga        preload="true"/>
-  <radio_inactive_false.tga     preload="true"/>
-  <radio_inactive_true.tga      preload="true"/>
-  <resize_handle_bottom_right_blue.tga preload="true"/>
-  <rounded_square.tga   preload="true">
-    <scale_rect left="8" top="16" right="120" bottom="8"/>
-  </rounded_square.tga>
-  <rounded_square_soft.tga      preload="true">
-    <scale_rect left="8" top="16" right="120" bottom="8"/>
-  </rounded_square_soft.tga>
-  <toolbar_tab.tga      preload="true">
-    <scale_rect left="6" top="42" right="104" bottom="8"/>
-  </toolbar_tab.tga>
-  <toolbar_bg.tga       preload="true">
-    <scale_rect left="6" top="42" right="96" bottom="16"/>
-  </toolbar_bg.tga>
-  <scrollbutton_down_in_blue.tga        preload="true"/>
-  <scrollbutton_down_out_blue.tga       preload="true"/>
-  <scrollbutton_left_in_blue.tga        preload="true"/>
-  <scrollbutton_left_out_blue.tga       preload="true"/>
-  <scrollbutton_right_in_blue.tga       preload="true"/>
-  <scrollbutton_right_out_blue.tga      preload="true"/>
-  <scrollbutton_up_in_blue.tga  preload="true"/>
-  <scrollbutton_up_out_blue.tga preload="true"/>
-  <spin_down_in_blue.tga        preload="true"/>
-  <spin_down_out_blue.tga       preload="true"/>
-  <spin_up_in_blue.tga  preload="true"/>
-  <spin_up_out_blue.tga preload="true"/>
-  <square_btn_32x128.tga        preload="true">
-    <scale_rect left="8" top="10" right="120" bottom="10"/>
-  </square_btn_32x128.tga>
-  <square_btn_selected_32x128.tga       preload="true">
-    <scale_rect left="2" top="10" right="126" bottom="10"/>
-  </square_btn_selected_32x128.tga>
-  <tab_bottom_blue.tga  preload="true">
-    <scale_rect left="8" top="8" right="120" bottom="9"/>
-  </tab_bottom_blue.tga>
-  <tab_bottom_selected_blue.tga preload="true">
-    <scale_rect left="8" top="8" right="96" bottom="9"/>
-  </tab_bottom_selected_blue.tga>
-  <tab_left.tga preload="true">
-    <scale_rect left="8" top="8" right="120" bottom="9"/>
-  </tab_left.tga>
-  <tab_left_selected.tga        preload="true">
-    <scale_rect left="8" top="8" right="96" bottom="9"/>
-  </tab_left_selected.tga>
-  <tab_top_blue.tga     preload="true">
-    <scale_rect left="8" top="8" right="120" bottom="9"/>
-  </tab_top_blue.tga>
-  <tab_top_selected_blue.tga preload="true">
-    <scale_rect left="8" top="8" right="96" bottom="9"/>
-  </tab_top_selected_blue.tga>
-  <startup_logo.j2c preload="true"/>
-  <color_swatch_alpha.tga preload="true"/>
-
-  <active_voice_tab.tga/>
-  <button_anim_pause.tga/>
-  <button_anim_pause_selected.tga/>
-  <button_anim_play.tga/>
-  <button_anim_play_selected.tga/>
-  <button_anim_stop.tga/>
-  <button_anim_stop_selected.tga/>
-  <crosshairs.tga/>
-  <direction_arrow.tga/>
-  <cloud-particle.j2c use_mips="true"/>
-  <foot_shadow.j2c use_mips="true"/>
-
-  <icon_auction.tga/>
-  <icon_avatar_offline.tga/>
-  <icon_avatar_online.tga/>
-  <icon_day_cycle.tga/>
-  <icon_diurnal.tga/>
-  <icon_event.tga/>
-  <icon_event_mature.tga/>
-  <icon_for_sale.tga/>
-  <icon_group.tga/>
-  <icon_groupnotice.tga/>
-  <icon_groupnoticeinventory.tga/>
-  <icon_lock.tga/>
-  <icon_place.tga/>
-  <icon_top_pick.tga/>
-
-  <inv_folder_animation.tga/>
-  <inv_folder_bodypart.tga/>
-  <inv_folder_callingcard.tga/>
-  <inv_folder_clothing.tga/>
-  <inv_folder_gesture.tga/>
-  <inv_folder_landmark.tga/>
-  <inv_folder_lostandfound.tga/>
-  <inv_folder_notecard.tga/>
-  <inv_folder_object.tga/>
-  <inv_folder_plain_closed.tga/>
-  <inv_folder_script.tga/>
-  <inv_folder_snapshot.tga/>
-  <inv_folder_sound.tga/>
-  <inv_folder_texture.tga/>
-  <inv_folder_trash.tga/>
-  <inv_item_animation.tga/>
-  <inv_item_skin.tga/>
-  <inv_item_callingcard_offline.tga/>
-  <inv_item_callingcard_online.tga/>
-  <inv_item_eyes.tga/>
-  <inv_item_gesture.tga/>
-  <inv_item_gloves.tga/>
-  <inv_item_hair.tga/>
-  <inv_item_jacket.tga/>
-  <inv_item_landmark.tga/>
-  <inv_item_landmark_visited.tga/>
-  <inv_item_notecard.tga/>
-  <inv_item_object.tga/>
-  <inv_item_object_multi.tga/>
-  <inv_item_pants.tga/>
-  <inv_item_script.tga/>
-  <inv_item_shape.tga/>
-  <inv_item_shirt.tga/>
-  <inv_item_shoes.tga/>
-  <inv_item_skirt.tga/>
-  <inv_item_snapshot.tga/>
-  <inv_item_socks.tga/>
-  <inv_item_sound.tga/>
-  <inv_item_texture.tga/>
-  <inv_item_underpants.tga/>
-  <inv_item_undershirt.tga/>
-  <lag_status_critical.tga/>
-  <lag_status_good.tga/>
-  <lag_status_warning.tga/>
-  <legend.tga/>
-  <map_avatar_16.tga/>
-  <map_avatar_8.tga/>
-  <map_avatar_you_8.tga/>
-  <map_event.tga/>
-  <map_event_mature.tga/>
-  <map_home.tga/>
-  <map_infohub.tga/>
-  <map_telehub.tga/>
-  <map_track_16.tga/>
-  <media_icon.tga file_name="icn_label_media.tga" />
-  <music_icon.tga file_name="icn_label_music.tga" />
-  <noentrylines.j2c use_mips="true"/>
-  <noentrypasslines.j2c use_mips="true"/>
-  <notify_tip_icon.tga/>
-  <notify_caution_icon.tga/>
-  <notify_box_icon.tga/>
-  <object_cone.tga/>
-  <object_cone_active.tga/>
-  <object_cube.tga/>
-  <object_cube_active.tga/>
-  <object_cylinder.tga/>
-  <object_cylinder_active.tga/>
-  <object_grass.tga/>
-  <object_grass_active.tga/>
-  <object_hemi_cone.tga/>
-  <object_hemi_cone_active.tga/>
-  <object_hemi_cylinder.tga/>
-  <object_hemi_cylinder_active.tga/>
-  <object_hemi_sphere.tga/>
-  <object_hemi_sphere_active.tga/>
-  <object_prism.tga/>
-  <object_prism_active.tga/>
-  <object_pyramid.tga/>
-  <object_pyramid_active.tga/>
-  <object_ring.tga/>
-  <object_ring_active.tga/>
-  <object_sphere.tga/>
-  <object_sphere_active.tga/>
-  <object_tetrahedron.tga/>
-  <object_tetrahedron_active.tga/>
-  <object_torus.tga/>
-  <object_torus_active.tga/>
-  <object_tree.tga/>
-  <object_tree_active.tga/>
-  <object_tube.tga/>
-  <object_tube_active.tga/>
-  <pixiesmall.j2c use_mips="true"/>
-  <script_error.j2c use_mips="true"/>
-  <silhouette.j2c use_mips="true"/>
-  <status_no_build.tga/>
-  <status_voice.tga/>
-  <status_buy_currency.tga/>
-  <status_buy_currency_pressed.tga/>
-  <status_buy_land.tga/>
-  <status_buy_land_pressed.tga/>
-  <status_no_fly.tga/>
-  <status_health.tga/>
-  <status_no_push.tga/>
-  <status_no_scripts.tga/>
-  <tool_dozer.tga/>
-  <tool_dozer_active.tga/>
-  <tool_zoom.tga/>
-  <tool_zoom_active.tga/>
-  <icn_active-speakers-dot-lvl0.tga/>
-  <icn_active-speakers-dot-lvl1.tga/>
-  <icn_active-speakers-dot-lvl2.tga/>
-  <icn_active-speakers-typing1.tga/>
-  <icn_active-speakers-typing2.tga/>
-  <icn_active-speakers-typing3.tga/>
-  <icn_voice_ptt-off.tga/>
-  <icn_voice_ptt-on.tga/>
-  <icn_voice_ptt-on-lvl1.tga/>
-  <icn_voice_ptt-on-lvl2.tga/>
-  <icn_voice_ptt-on-lvl3.tga/>
-  <icn_voice-call-end.tga/>
-  <icn_voice-call-start.tga/>
-  <mute_icon.tga/>
-  <icn_slide-groove_dark.tga>
-    <scale_rect left="2" top="5" right="29" bottom="4"/>
-  </icn_slide-groove_dark.tga>
-  <icn_slide-highlight.tga>
-    <scale_rect left="2" top="5" right="29" bottom="4"/>
-  </icn_slide-highlight.tga>
-  <icn_slide-thumb_dark.tga>
-    <scale_rect left="2" top="5" right="29" bottom="4"/>
-  </icn_slide-thumb_dark.tga>
-  <icn_speaker-muted_dark.tga/>
-  <icn_speaker_dark.tga/>
-  <icn_voice-localchat.tga/>
-  <icn_voice-groupfocus.tga/>
-  <icn_voice-pvtfocus.tga/>
-  <icn_media-pause.tga/>
-  <icn_media-play.tga/>
-  <icn_music-play.tga/>
-  <icn_music-pause.tga/>
-  <icn_media_web.tga preload="true"/>
-  <icn_media_movie.tga preload="true"/>
-  <icn_chatbar.tga/>
-  <btn_chatbar.tga>
-    <scale_rect left="16" top="24" right="48" bottom="0"/>
-  </btn_chatbar.tga>
-  <btn_chatbar_selected.tga>
-    <scale_rect left="16" top="24" right="48" bottom="0"/>
-  </btn_chatbar_selected.tga>
-  <icn_rounded-text-field.tga/>
-
-  <flyout_btn_right_selected.tga>
-    <scale_rect left="6" top="12" right="26" bottom="12"/>
-  </flyout_btn_right_selected.tga>
-  <flyout_btn_right.tga>
-    <scale_rect left="6" top="12" right="26" bottom="12"/>
-  </flyout_btn_right.tga>
-  <flyout_btn_right_disabled.tga>
-    <scale_rect left="6" top="12" right="122" bottom="12"/>
-  </flyout_btn_right_disabled.tga>  
-  <flyout_btn_left_selected.tga>
-    <scale_rect left="6" top="12" right="122" bottom="12"/>
-  </flyout_btn_left_selected.tga>
-  <flyout_btn_left.tga>
-    <scale_rect left="6" top="12" right="122" bottom="12"/>
-  </flyout_btn_left.tga>
- <flyout_btn_left_disabled.tga>
-    <scale_rect left="6" top="12" right="122" bottom="12"/>
-  </flyout_btn_left_disabled.tga>
-
-  <UIImgResizeBottomRightUUID file_name="resize_handle_bottom_right_blue.tga"/>
-
-  <UIImgBtnForwardOutUUID file_name="move_forward_out.tga" preload="true"/>
-  <UIImgBtnForwardInUUID file_name="move_forward_in.tga" preload="true"/>
-  <UIImgBtnSlideLeftOutUUID file_name="move_left_out.tga" preload="true"/>
-  <UIImgBtnSlideLeftInUUID file_name="move_left_in.tga" preload="true"/>
-  <UIImgBtnLeftOutUUID  file_name="move_turn_left_out.tga" preload="true"/>
-  <UIImgBtnLeftInUUID   file_name="move_turn_left_in.tga" preload="true"/>
-  <UIImgBtnRightOutUUID file_name="move_turn_right_out.tga" preload="true"/>
-  <UIImgBtnRightInUUID  file_name="move_turn_right_in.tga" preload="true"/>
-  <UIImgBtnSlideRightOutUUID file_name="move_right_out.tga" preload="true"/>
-  <UIImgBtnSlideRightInUUID file_name="move_right_in.tga" preload="true"/>
-  <UIImgBtnMoveUpInUUID file_name="move_up_in.tga" preload="true"/>
-  <UIImgBtnMoveUpOutUUID file_name="move_up_out.tga" preload="true"/>
-  <UIImgBtnMoveDownInUUID file_name="move_down_in.tga" preload="true"/>
-  <UIImgBtnMoveDownOutUUID file_name="move_down_out.tga" preload="true"/>
-
-  <UIImgBtnScrollUpOutUUID file_name="scrollbutton_up_out_blue.tga"/>
-  <UIImgBtnScrollUpInUUID file_name="scrollbutton_up_in_blue.tga"/>
-  <UIImgBtnScrollDownOutUUID file_name="scrollbutton_down_out_blue.tga"/>
-  <UIImgBtnScrollDownInUUID file_name="scrollbutton_down_in_blue.tga"/>
-  <UIImgBtnScrollLeftOutUUID file_name="scrollbutton_left_out_blue.tga"/>
-  <UIImgBtnScrollLeftInUUID file_name="scrollbutton_left_in_blue.tga"/>
-  <UIImgBtnScrollRightOutUUID file_name="scrollbutton_right_out_blue.tga"/>
-  <UIImgBtnScrollRightInUUID file_name="scrollbutton_right_in_blue.tga"/>
-
-  <UIImgBtnJumpLeftOutUUID    file_name="3c18c87e-5f50-14e2-e744-f44734aa365f.tga"/>
-    <UIImgBtnJumpLeftInUUID    file_name="9cad3e6d-2d6d-107d-f8ab-5ba272b5bfe1.tga"/>
-  <UIImgBtnJumpRightOutUUID file_name="ff9a71eb-7414-4cf8-866e-a701deb7c3cf.tga"/>
-  <UIImgBtnJumpRightInUUID    file_name="7dabc040-ec13-2309-ddf7-4f161f6de2f4.tga"/>
-
-  <UIImgBtnSpinUpOutUUID        file_name="spin_up_out_blue.tga"/>
-  <UIImgBtnSpinUpInUUID         file_name="spin_up_in_blue.tga"/>
-  <UIImgBtnSpinDownOutUUID      file_name="spin_down_out_blue.tga"/>
-  <UIImgBtnSpinDownInUUID       file_name="spin_down_in_blue.tga"/>
-
-  <UIImgRadioActiveUUID         file_name="radio_active_false.tga"/>
-  <UIImgRadioActiveSelectedUUID file_name="radio_active_true.tga"/>
-  <UIImgRadioInactiveUUID       file_name="radio_inactive_false.tga"/>
-  <UIImgRadioInactiveSelectedUUID file_name="radio_inactive_true.tga"/>
-
-  <UIImgCheckboxActiveUUID      file_name="checkbox_enabled_false.tga"/>
-  <UIImgCheckboxActiveSelectedUUID file_name="checkbox_enabled_true.tga"/>
-  <UIImgCheckboxInactiveUUID file_name="checkbox_disabled_false.tga"/>
-  <UIImgCheckboxInactiveSelectedUUID file_name="checkbox_disabled_true.tga"/>
-
-  <UIImgBtnTabTopOutUUID        file_name="tab_top_blue.tga"/>
-  <UIImgBtnTabTopInUUID         file_name="tab_top_selected_blue.tga"/>
-  <UIImgBtnTabBottomOutUUID file_name="tab_bottom_blue.tga"/>
-  <UIImgBtnTabBottomInUUID      file_name="tab_bottom_selected_blue.tga"/>
-
-  <UIImgGrabUUID                        file_name="c63f124c-6340-4fbf-b59e-0869a44adb64.tga"/>
-  <UIImgGrabSelectedUUID        file_name="c1e21504-f136-451d-b8e9-929037812f1d.tga"/>
-
-  <!--<UIImgScaleUUID                   file_name="88a90fef-b448-4883-9344-ecf378a60433.tga"/>-->
-
-  <UIImgFaceUUID                        file_name="ce15fd63-b0b6-463c-a37d-ea6393208b3e.tga"/>
-  <UIImgFaceSelectedUUID        file_name="b4870163-6208-42a9-9801-93133bf9a6cd.tga"/>
-
-  <UIImgCreateUUID                      file_name="7a0b1bdb-b5d9-4df5-bac2-ba230da93b5b.tga"/>
-  <UIImgCreateSelectedUUID      file_name="0098b015-3daf-4cfe-a72f-915369ea97c2.tga"/>
-  
-  <UIImgBtnCloseInactiveUUID file_name="close_inactive_blue.tga"/>
-  <UIImgBtnCloseActiveUUID      file_name="closebox.tga"/>
-  <UIImgBtnClosePressedUUID file_name="close_in_blue.tga"/>
-  <icn_clear_lineeditor.tga />
-  <icn_scrollbar_thumb.tga    preload="true">
-        <scale_rect top="7" left="4" bottom="8" right="4" />
-</icn_scrollbar_thumb.tga>
-  <icn_scrollbar_bg.tga    preload="true">
-        <scale_rect top="7" left="4" bottom="8
-        " right="4" />
-</icn_scrollbar_bg.tga>
-
-  <UIImgBtnMinimizeInactiveUUID file_name="minimize_inactive.tga"/>
-  <UIImgBtnMinimizeActiveUUID file_name="minimize.tga"/>
-  <UIImgBtnMinimizePressedUUID file_name="minimize_pressed.tga"/>
-
-  <UIImgBtnRestoreInactiveUUID file_name="restore_inactive.tga"/>
-  <UIImgBtnRestoreActiveUUID file_name="restore.tga"/>
-  <UIImgBtnRestorePressedUUID file_name="restore_pressed.tga"/>
-
-  <UIImgBtnTearOffInactiveUUID file_name="tearoffbox.tga"/>
-  <UIImgBtnTearOffActiveUUID file_name="tearoffbox.tga"/>
-  <UIImgBtnTearOffPressedUUID file_name="tearoff_pressed.tga"/>
-
-  <UIImgCrosshairsUUID file_name="crosshairs.tga"/>
-  <icn_label_music.tga/>
-  <icn_label_media.tga/>
-</textures>
diff --git a/linden/indra/newview/skins/words.korean.txt b/linden/indra/newview/skins/words.korean.txt
deleted file mode 100644
index 0e3b653..0000000
--- a/linden/indra/newview/skins/words.korean.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-File    파일

-Edit    편집

-View    보기

-World   세상

-Tools   도구

-Help    도움말

-Chat    채팅

-Friends 친구

-Fly     플라이

-Snapshot        스냅샷

-Events  이벤트

diff --git a/linden/indra/newview/skins/words.spanish.txt b/linden/indra/newview/skins/words.spanish.txt
deleted file mode 100644
index 499b0fe..0000000
--- a/linden/indra/newview/skins/words.spanish.txt
+++ /dev/null
@@ -1,222 +0,0 @@
-Yes     Sí
-No      No
-Quit    Salir
-Create  Crear
-Build   Crear
-Camera  Cámara
-Viewer  Cámara
-Appearance      Aspecto
-Clothing        Ropa
-Sit Down        Siéntate
-Fly     Volar
-Land    Aterrizar
-Gesture Haz gestos
-Gestures        Gestos
-Map     Mapa
-Chat    Chatear
-Sit Here        Siéntate aquí
-Stand Up        Párate
-Go Here Ven aquí
-Go To   Ven aquí
-Create  Crea
-Edit    Cambia
-Wear    Ponte
-Say     Dilo
-Body Parts      Partes del cuerpo
-Shape   Forma
-Skin    Piel
-Hair    Cabello
-Eyes    Ojos
-Clothes Ropa
-Shirt   Camisa
-Pants   Pantalones
-Skirt   Falda
-Male    Varón
-Female  Hembra
-Body    Cuerpo
-Head    Cabeza
-Eyes    Ojos
-Nose    Nariz
-Mouth   Boca
-Skin Color      Color de la piel
-Hair Color      Color del cabello
-Eye Color       Color de los ojos
-Style   Peinado
-Eyebrows        Cejas
-Facial  Vello facial
-Torso   Tronco
-Legs    Piernas
-Squash Head     Menos
-Stretch Head    Más
-Full Hair Sides Cabello a los lados
-Mowhawk Corto
-Full Sides      Largo
-Shear Front     Cabello en la frente
-Full Front      Voluminoso
-Sheared Front   Calvo
-Rumpled Hair    Rizado del cabello
-Smooth Hair     Lacio
-Pigtails        Coletas
-Short Pigtails  Cortas
-Long Pigtails   Largas
-Sideburns       Patillas
-Short Sideburns Cortas
-Mutton Chops    Largas
-Nose Thickness  Grosor de la nariz
-Bulbous Nose    Gruesa
-Thin Nose       Delgada
-Spiked Hair     Pelos parados
-Big Spikes      Muy parados
-No Spikes       No parados
-Eyebrow Size    Tamaño de las cejas
-Thin Eyebrows   Delgadas
-Bushy Eyebrows  Pobladas
-Moustache       Bigote
-Chaplin Tipo Chaplin
-Handlebars      Ancho
-Soulpatch       Punta de la barba
-More Soul       Más
-Less Soul       Menos
-Chin Curtains   Lado de la barba
-More Curtains   Más barbudo
-Less Curtains   Más lampiño
-Type to chat:   Escribir para chatear:
-Texture Pintura
-Shoulders       Hombros
-Broad   Anchos
-Take Off        Quitar
-Delete  Borrar
-Focus   Enfocar
-Position        Colocar
-Rotate  Rotar
-Stretch Estirar
-Paint   Pintura
-Transparency    Transparencia
-Repeats Per Meter       Repeticiones por metro
-Rotation        Rotación
-Degrees Grados
-Apply   Aplicar
-Close   Cerrar
-Fabric  Tela
-Trigger Gatillo
-Name    Nombre
-Play    Empezar
-All White       Puras canas
-Beard Side      Lado de la barba
-Beard Tip       Punta de la barba
-Big Eyes        Grandes
-Big Head        Grande
-Black   Negro
-Blonde Hair     Cabello rubio
-Blonde  Rubio
-Body Fat        Grasa corporal
-Body Thickness  Contextura
-Bulging Saltones
-Chin Heavy      Barbilla gruesa
-Close Set Eyes  Ojos cercanos
-Collar  Cuello
-Collar Front    Cuello
-Color   Color
-Color/Tint      Color
-Corner Down     Rabillo hacia abajo
-Corner Up       Rabillo hacia arriba
-Cuff Flare      Ancho de los pantalones
-Dark    Oscura
-Darker  Más oscuros
-Egg Head        Forma de huevo
-Eye Color       Color de ojos
-Eye Depth       Profundidad de los ojos
-Eye Lightness   Claridad de los ojos
-Eye Opening     Abertura de los ojos
-Eye Size        Tamaño de los ojos
-Eye Spacing     Separación de los ojos
-Eyebrow Height  Altura de las cejas
-Far Set Eyes    Ojos espaciados
-Flared Cuffs    Acampanados
-Forehead Heavy  Frente amplia
-Hair Back       Cabello en la parte posterior
-Hair Volume     Volumen del cabello
-Head Shape      Forma de la cabeza
-Head Size       Tamaño de la cabeza
-Head Stretch    Estiramiento de la cabeza
-Height  Estatura
-High    Alto
-Higher  Más altas
-Inner Eye Corner        Rabillo interior
-Large   Grande
-Leg Muscles     Músculos de las piernas
-Less Body Fat   Menos grasa
-Less Full       Menos carnosos
-Less Muscular   Menos musculares
-Less Volume     Menos volumen
-Less    Menos
-Light   Clara
-Lighter Más claros
-Lip Fullness    Grosor de los labios
-Lip Ratio       Relación entre los labios
-Lip Width       Ancho de los labios
-Long    Largo
-Loose   Suelta
-Loose Shirt     Suelta
-Loose Sleeves   Suelta
-Loose Pants     Sueltos
-Low     Bajo
-Lower Cheeks    Mejillas
-Lower   Más bajas
-More Body Fat   Más grasa
-More Full       Más carnosos
-More Lower Lip  Más labio inferior
-More Muscular   Más musculares
-More Round      Más redonda
-More Square     Más cuadrada
-More Upper Lip  Más labio superior
-More Volume     Más volumen
-More    Más
-Mouth Position  Posición de la boca
-Narrow  Angosta
-Narrow Lips     Angostos
-Natural Natural
-No Red  Sin tonos rojizos
-No White        Sin canas
-None    Ninguno
-Nose Size       Tamaño de la nariz
-Nose Width      Ancho de la nariz
-Outer Eye Corner        Rabillo exterior
-Pale    Pálida
-Pants Fit       Ajuste de los pantalones
-Pants Length    Largo de los pantalones
-Pigment Pigmentación
-Rainbow Color   Color de arco iris
-Red Hair        Cabello rojizo
-Ruddiness       Tez
-Ruddy   Rubicunda
-Rumpled Rizado
-Shirt Fit       Ajuste de la camisa
-Short   Corto
-Sideburns       Patillas
-Skirt Fit       Ajuste de la falda
-Skirt Length    Largo de la falda
-Sleeve Length   Largo de la manga
-Sleeve Looseness        Holgura de la manga
-Small Eyes      Pequeños
-Small Head      Pequeña
-Small   Pequeña
-Smooth  Lacio
-Sunken  Hundidos
-Tall    Alta
-Thick   Gruesa
-Body Thick      Gruesa
-Body Thin       Delgada
-Tight   Apretada
-Tight Pants     Apretados
-Tight Shirt     Apretada
-Tight Sleeves   Apretada
-Tight Cuffs     Estrechos
-Torso Muscles   Músculos del tronco
-Unnatural       No natural
-Very Red        Muy pelirrojo
-Well-Fed        Regordetas
-White Hair      Canas
-Wide    Ancho
-Wide Lips       Anchos
-Wild    Salvaje
diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py
index 1286c68..27c12dd 100755
--- a/linden/indra/newview/viewer_manifest.py
+++ b/linden/indra/newview/viewer_manifest.py
@@ -73,22 +73,27 @@ class ViewerManifest(LLManifest):
                         self.path("*.txt")
                         self.end_prefix("fonts")
 
-                # XUI
+                # skins
                 if self.prefix(src="skins"):
-                        # include the entire textures directory recursively
-                        self.path("textures")
                         self.path("paths.xml")
-                        self.path("xui/*/*.xml")
-                        self.path('words.*.txt')
-
+                        # 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"):
+                        if self.prefix(src="*/html"):
                                 self.path("*.png")
                                 self.path("*/*/*.html")
                                 self.path("*/*/*.gif")
-                                self.end_prefix("html")
+                                self.end_prefix("*/html")
                         self.end_prefix("skins")
-
                 self.path("releasenotes.txt")
                 self.path("lsl_guide.html")
                 self.path("gpu_table.txt")