36 files changed, 733 insertions, 154 deletions

diff --git a/linden/indra/llwindow/llwindow.h b/linden/indra/llwindow/llwindow.h
index 0acbcb9..0004e92 100644
--- a/linden/indra/llwindow/llwindow.h
+++ b/linden/indra/llwindow/llwindow.h
@@ -202,6 +202,7 @@ public:
         virtual void updateLanguageTextInputArea() {}
         virtual void interruptLanguageTextInput() {}
         virtual void spawnWebBrowser(const std::string& escaped_url) {};
+        virtual void ShellEx(const std::string& command) {};
 
         static std::string getFontListSans();
 
diff --git a/linden/indra/llwindow/llwindowwin32.cpp b/linden/indra/llwindow/llwindowwin32.cpp
index 2944511..a9c7758 100644
--- a/linden/indra/llwindow/llwindowwin32.cpp
+++ b/linden/indra/llwindow/llwindowwin32.cpp
@@ -2885,6 +2885,18 @@ S32 OSMessageBoxWin32(const std::string& text, const std::string& caption, U32 t
         return retval;
 }
 
+void LLWindowWin32::ShellEx(const std::string& command )
+{
+        LLWString url_wstring = utf8str_to_wstring( command );
+        llutf16string url_utf16 = wstring_to_utf16str( url_wstring );
+
+        SHELLEXECUTEINFO sei = { sizeof( sei ) };
+        sei.fMask = SEE_MASK_FLAG_DDEWAIT;
+        sei.nShow = SW_SHOWNORMAL;
+        sei.lpVerb = L"open";
+        sei.lpFile = url_utf16.c_str();
+        ShellExecuteEx( &sei );
+}
 
 void LLWindowWin32::spawnWebBrowser(const std::string& escaped_url )
 {
diff --git a/linden/indra/llwindow/llwindowwin32.h b/linden/indra/llwindow/llwindowwin32.h
index 795fc79..bea55c6 100644
--- a/linden/indra/llwindow/llwindowwin32.h
+++ b/linden/indra/llwindow/llwindowwin32.h
@@ -110,6 +110,7 @@ public:
         /*virtual*/ void updateLanguageTextInputArea();
         /*virtual*/ void interruptLanguageTextInput();
         /*virtual*/ void spawnWebBrowser(const std::string& escaped_url);
+        /*virtual*/ void ShellEx(const std::string& command);
 
         static std::string getFontListSans();
 
diff --git a/linden/indra/newview/llfilepicker.cpp b/linden/indra/newview/llfilepicker.cpp
index 954a274..ece30dd 100644
--- a/linden/indra/newview/llfilepicker.cpp
+++ b/linden/indra/newview/llfilepicker.cpp
@@ -327,6 +327,18 @@ BOOL LLFilePicker::getSaveFile(ESaveFilter filter, const std::string& filename)
                         L"Targa, Bitmap Images (*.tga; *.bmp)\0*.tga;*.bmp\0" \
                         L"\0";
                 break;
+        case FFSAVE_TEXT:
+                if (filename.empty())
+                {
+                        wcsncpy( mFilesW,L"untitled.txt", FILENAME_BUFFER_SIZE);        /*Flawfinder: ignore*/
+                }
+                mOFN.lpstrDefExt = L"txt";
+                mOFN.lpstrFilter = 
+                        L"Text files (*.txt)\0*.txt\0"
+                        L"RTF Files (*.rtf)\0*.rtf\0"
+                        L"LSL Files (*.lsl)\0*.lsl\0"
+                        L"\0";
+                break;
         case FFSAVE_WAV:
                 if (filename.empty())
                 {
diff --git a/linden/indra/newview/llfilepicker.h b/linden/indra/newview/llfilepicker.h
index aea414a..f9f859f 100644
--- a/linden/indra/newview/llfilepicker.h
+++ b/linden/indra/newview/llfilepicker.h
@@ -90,6 +90,7 @@ public:
                 FFLOAD_XML = 6,
                 FFLOAD_SLOBJECT = 7,
                 FFLOAD_RAW = 8,
+                FFLOAD_TEXT = 9,
         };
 
         enum ESaveFilter
@@ -109,6 +110,8 @@ public:
                 FFSAVE_J2C = 12,
                 FFSAVE_PNG = 13,
                 FFSAVE_JPEG = 14,
+                FFSAVE_HPA = 15,
+                FFSAVE_TEXT = 16,
         };
 
         // open the dialog. This is a modal operation
diff --git a/linden/indra/newview/llfloatercustomize.cpp b/linden/indra/newview/llfloatercustomize.cpp
index b9deb6c..4bcc823 100644
--- a/linden/indra/newview/llfloatercustomize.cpp
+++ b/linden/indra/newview/llfloatercustomize.cpp
@@ -245,6 +245,8 @@ public:
 
                 childSetAction("Save", onSave, this ); 
                 childSetAction("Cancel", onCancel, this ); 
+                childSetAction("Check All", onCheckAll, this );
+                childSetAction("Uncheck All", onUncheckAll, this );
         }
 
         BOOL getRenameClothing()
@@ -325,6 +327,26 @@ public:
                 LLMakeOutfitDialog* self = (LLMakeOutfitDialog*) userdata;
                 self->close(); // destroys this object
         }
+
+        static void onCheckAll( void* userdata )
+        {
+                LLMakeOutfitDialog* self = (LLMakeOutfitDialog*) userdata;
+                for( S32 i = 0; i < (S32)(self->mCheckBoxList.size()); i++)
+                {
+                        std::string name = self->mCheckBoxList[i].first;
+                        if(self->childIsEnabled(name))self->childSetValue(name,TRUE);
+                }
+        }
+
+        static void onUncheckAll( void* userdata )
+        {
+                LLMakeOutfitDialog* self = (LLMakeOutfitDialog*) userdata;
+                for( S32 i = 0; i < (S32)(self->mCheckBoxList.size()); i++)
+                {
+                        std::string name = self->mCheckBoxList[i].first;
+                        if(self->childIsEnabled(name))self->childSetValue(name,FALSE);
+                }
+        }
 };
 
 /////////////////////////////////////////////////////////////////////
@@ -536,10 +558,26 @@ void LLPanelEditWearable::setSubpart( ESubpart subpart )
                 item = (LLViewerInventoryItem*)gAgent.getWearableInventoryItem(mType);
                 U32 perm_mask = 0x0;
                 BOOL is_complete = FALSE;
+                bool can_export = false;
+                bool can_import = false;
                 if(item)
                 {
                         perm_mask = item->getPermissions().getMaskOwner();
                         is_complete = item->isComplete();
+                        
+                        if (subpart <= 18) // body parts only
+                        {
+                                can_import = true;
+
+                                if (is_complete && 
+                                        gAgent.getID() == item->getPermissions().getOwner() &&
+                                        gAgent.getID() == item->getPermissions().getCreator() &&
+                                        (PERM_ITEM_UNRESTRICTED &
+                                        perm_mask) == PERM_ITEM_UNRESTRICTED)
+                                {
+                                        can_export = true;
+                                }
+                        }
                 }
                 setUIPermissions(perm_mask, is_complete);
                 BOOL editable = ((perm_mask & PERM_MODIFY) && is_complete) ? TRUE : FALSE;
@@ -563,7 +601,8 @@ void LLPanelEditWearable::setSubpart( ESubpart subpart )
                 }
                 gFloaterCustomize->generateVisualParamHints(NULL, sorted_params);
                 gFloaterCustomize->updateScrollingPanelUI();
-
+                gFloaterCustomize->childSetEnabled("Export", can_export);
+                gFloaterCustomize->childSetEnabled("Import", can_import);
 
                 // Update the camera
                 gMorphView->setCameraTargetJoint( gAgent.getAvatarObject()->getJoint( part->mTargetJoint ) );
@@ -1287,7 +1326,18 @@ void LLScrollingPanelParam::onSliderMoved(LLUICtrl* ctrl, void* userdata)
         F32 new_weight = self->percentToWeight( (F32)slider->getValue().asReal() );
         if (current_weight != new_weight )
         {
-                gAgent.getAvatarObject()->setVisualParamWeight( param, new_weight, TRUE);
+                LLFloaterCustomize* floater_customize = gFloaterCustomize;
+                if (!floater_customize) return;
+
+                //avatar height stuff -Patrick Sapinski (Wednesday, August 19, 2009)
+                LLVOAvatar* avatar = gAgent.getAvatarObject();
+                F32 avatar_size = (avatar->mBodySize.mV[VZ]) + (F32)0.17; //mBodySize is actually quite a bit off.
+                
+                floater_customize->getChild<LLTextBox>("HeightText")->setValue(llformat("%.2f", avatar_size) + "m");
+                floater_customize->getChild<LLTextBox>("HeightText2")->setValue(llformat("%.2f",llround(avatar_size / 0.3048)) + "'"
+                                                                                                                                          + llformat("%.2f",llround(avatar_size * 39.37) % 12) + "\"");
+
+                gAgent.getAvatarObject()->setVisualParamWeight( param, new_weight, FALSE);
                 gAgent.getAvatarObject()->updateVisualParams();
         }
 }
@@ -1563,6 +1613,10 @@ BOOL LLFloaterCustomize::postBuild()
         childSetAction("Save All", LLFloaterCustomize::onBtnSaveAll, (void*)this);
         childSetAction("Close", LLFloater::onClickClose, (void*)this);
 
+    // reX
+        childSetAction("Import", LLFloaterCustomize::onBtnImport, (void*)this);
+        childSetAction("Export", LLFloaterCustomize::onBtnExport, (void*)this);
+
         // Wearable panels
         initWearablePanels();
 
@@ -1623,6 +1677,157 @@ void LLFloaterCustomize::setCurrentWearableType( EWearableType type )
         }
 }
 
+
+// reX: new function
+void LLFloaterCustomize::onBtnImport( void* userdata )
+{
+        LLFilePicker& file_picker = LLFilePicker::instance();
+        if( !file_picker.getOpenFile( LLFilePicker::FFLOAD_XML ) )
+                {
+                        // User canceled import.
+                        return;
+                }
+
+        const std::string filename = file_picker.getFirstFile();
+
+        FILE* fp = LLFile::fopen(filename, "rb");
+
+        //char text_buffer[2048];               /* Flawfinder: ignore */
+        S32 c;
+        S32 typ;
+        S32 count;
+        S32 param_id=0;
+        F32 param_weight=0;
+        S32 fields_read;
+
+        for( S32 i=0; i < WT_COUNT; i++ )
+        {
+                fields_read = fscanf( fp, "type %d\n", &typ);
+                if( fields_read != 1 )
+                {
+                        llwarns << "Bad asset type: early end of file" << llendl;
+                        return;
+                }
+
+                fields_read = fscanf( fp, "parameters %d\n", &count);
+                if( fields_read != 1 )
+                {
+                        llwarns << "Bad parameters : early end of file" << llendl;
+                        return;
+                }
+                for(c=0;c<count;c++)
+                {
+                        fields_read = fscanf( fp, "%d %f\n", &param_id, &param_weight );
+                        if( fields_read != 2 )
+                        {
+                                llwarns << "Bad parameters list: early end of file" << llendl;
+                                return;
+                        }
+                        gAgent.getAvatarObject()->setVisualParamWeight( param_id, param_weight, TRUE);
+                        gAgent.getAvatarObject()->updateVisualParams();
+                }
+        }
+
+
+
+        //for( S32 i=0; i < WT_COUNT; i++ )
+        //{
+        //      fields_read = fscanf( fp, "type %d\n", &typ);
+        //      if( fields_read != 1 )
+        //      {
+        //              llwarns << "Bad asset type: early end of file" << llendl;
+        //              return;
+        //      }
+        //      fields_read = fscanf( fp, "textures %d\n", &count);
+        //      if( fields_read != 1 )
+        //      {
+        //                      llwarns << "Bad textures: early end of file" << llendl;
+        //                      return;
+        //      }
+    //
+        //      for(c=0;c<count;c++)
+        //      {
+        //              fields_read = fscanf( fp, "%d %2047s\n",text_buffer);
+        //              if( fields_read != 2 )
+        //              {
+        //                      llwarns << "Bad textures list: early end of file" << llendl;
+        //                      return;
+        //              }
+        //      }
+
+
+        fclose(fp);
+        return;
+}
+
+// reX: new function
+void LLFloaterCustomize::onBtnExport( void* userdata )
+{
+        LLFilePicker& file_picker = LLFilePicker::instance();
+        if( !file_picker.getSaveFile( LLFilePicker::FFSAVE_XML ) )
+                {
+                        // User canceled export.
+                        return;
+                }
+
+        LLViewerInventoryItem* item;
+        BOOL is_modifiable;
+
+        const std::string filename = file_picker.getFirstFile();
+
+        FILE* fp = LLFile::fopen(filename, "wb");
+
+        for( S32 i=0; i < WT_COUNT; i++ )
+        {
+                is_modifiable = FALSE;
+                LLWearable* old_wearable = gAgent.getWearable((EWearableType)i);
+                if( old_wearable )
+                {
+                        item = (LLViewerInventoryItem*)gAgent.getWearableInventoryItem((EWearableType)i);
+                        if(item)
+                        {
+                                const LLPermissions& perm = item->getPermissions();
+                                is_modifiable = perm.allowModifyBy(gAgent.getID(), gAgent.getGroupID());
+                        }
+                }
+                if (is_modifiable)
+                {
+                        old_wearable->FileExportParams(fp);
+                }
+                if (!is_modifiable)
+                {
+                        fprintf( fp, "type %d\n",i);
+                        fprintf( fp, "parameters 0\n");
+                }
+        }       
+
+        for( S32 i=0; i < WT_COUNT; i++ )
+        {
+                is_modifiable = FALSE;
+                LLWearable* old_wearable = gAgent.getWearable((EWearableType)i);
+                if( old_wearable )
+                {
+                        item = (LLViewerInventoryItem*)gAgent.getWearableInventoryItem((EWearableType)i);
+                        if(item)
+                        {
+                                const LLPermissions& perm = item->getPermissions();
+                                is_modifiable = perm.allowModifyBy(gAgent.getID(), gAgent.getGroupID());
+                        }
+                }
+                if (is_modifiable)
+                {
+                        old_wearable->FileExportTextures(fp);
+                }
+                if (!is_modifiable)
+                {
+                        fprintf( fp, "type %d\n",i);
+                        fprintf( fp, "textures 0\n");
+                }
+        }       
+
+        fclose(fp);
+}
+
 // static
 void LLFloaterCustomize::onBtnSaveAll( void* userdata )
 {
@@ -2122,6 +2327,21 @@ void LLFloaterCustomize::draw()
         // arrives. Figure out some way to avoid this if possible.
         updateInventoryUI();
 
+        LLFloaterCustomize* floater_customize = gFloaterCustomize;
+        if (!floater_customize) return;
+
+        //KOWs avatar height stuff
+        LLVOAvatar* avatar = gAgent.getAvatarObject();
+        F32 avatar_size = (avatar->mBodySize.mV[VZ]) + (F32)0.17; //mBodySize is actually quite a bit off.
+                
+        floater_customize->getChild<LLTextBox>("HeightText")->setValue(llformat("%.2f", avatar_size) + "m");
+        //inches = avatar_size * 39.37
+        //round(inches) + inches % 12
+        std::string temp = llformat("%.0f",(F32)llfloor(avatar_size / 0.3048));
+        std::string temp2 = llformat("%.0f",(F32)(llround(avatar_size * 39.37) % 12));
+        floater_customize->getChild<LLTextBox>("HeightText2")->setValue(temp + "'"
+                                                                                                                                  + temp2 + "\"");
+
         LLScrollingPanelParam::sUpdateDelayFrames = 0;
         
         childSetEnabled("Save All",  isDirty() );
diff --git a/linden/indra/newview/llfloatercustomize.h b/linden/indra/newview/llfloatercustomize.h
index 15fc8f1..ffa943a 100644
--- a/linden/indra/newview/llfloatercustomize.h
+++ b/linden/indra/newview/llfloatercustomize.h
@@ -107,6 +107,10 @@ public:
         static EWearableType getCurrentWearableType()                                   { return sCurrentWearableType; }
 
         // Callbacks
+        // reX: new function (thx dudes)
+        static void             onBtnImport( void* userdata );
+        // reX: new function    
+        static void             onBtnExport( void* userdata );
         static void             onBtnSaveAll( void* userdata );
         static void             onBtnSnapshot( void* userdata );
         static void             onBtnMakeOutfit( void* userdata );
diff --git a/linden/indra/newview/llfloaterwater.cpp b/linden/indra/newview/llfloaterwater.cpp
index c42b12b..7e2f188 100644
--- a/linden/indra/newview/llfloaterwater.cpp
+++ b/linden/indra/newview/llfloaterwater.cpp
@@ -168,7 +168,11 @@ void LLFloaterWater::initCallbacks(void) {
 
         LLTextureCtrl* textCtrl = getChild<LLTextureCtrl>("WaterNormalMap");
         textCtrl->setDefaultImageAssetID(DEFAULT_WATER_NORMAL);
-        childSetCommitCallback("WaterNormalMap", onNormalMapPicked, NULL);      
+        childSetCommitCallback("WaterNormalMap", onNormalMapPicked, NULL);
+
+        // next/prev buttons
+        childSetAction("next", onClickNext, this);
+        childSetAction("prev", onClickPrev, this);
 }
 
 void LLFloaterWater::onClickHelp(void* data)
@@ -237,6 +241,12 @@ void LLFloaterWater::syncMenu()
 
         LLWaterParamSet & current_params = param_mgr->mCurParams;
 
+        LLComboBox* comboBox = getChild<LLComboBox>("WaterPresetsCombo");
+        if (comboBox->getSelectedItemLabel() != current_params.mName)
+        {
+                comboBox->setSimple(current_params.mName);
+        }
+
         // blue horizon
         param_mgr->mFogColor = current_params.getVector4(param_mgr->mFogColor.mName, err);
 
@@ -306,14 +316,26 @@ LLFloaterWater* LLFloaterWater::instance()
 }
 void LLFloaterWater::show()
 {
-        LLFloaterWater* water = instance();
-        water->syncMenu();
-
-        // comment in if you want the menu to rebuild each time
-        //LLUICtrlFactory::getInstance()->buildFloater(water, "floater_water.xml");
-        //water->initCallbacks();
+        if (!sWaterMenu)
+        {
+                LLFloaterWater* water = instance();
+                water->syncMenu();
 
-        water->open();
+                // comment in if you want the menu to rebuild each time
+                //LLUICtrlFactory::getInstance()->buildFloater(water, "floater_water.xml");
+                //water->initCallbacks();
+        }
+        else
+        {
+                if (sWaterMenu->getVisible())
+                {
+                        sWaterMenu->close();
+                }
+                else
+                {
+                        sWaterMenu->open();
+                }
+        }
 }
 
 bool LLFloaterWater::isOpen()
@@ -727,3 +749,50 @@ void LLFloaterWater::onChangePresetName(LLUICtrl* ctrl, void * userData)
         sWaterMenu->syncMenu();
 }
 
+void LLFloaterWater::onClickNext(void* user_data)
+{
+        LLWaterParamManager * param_mgr = LLWaterParamManager::instance();
+        LLWaterParamSet& currentParams = param_mgr->mCurParams;
+
+        // find place of current param
+        std::map<std::string, LLWaterParamSet>::iterator mIt = 
+                param_mgr->mParamList.find(currentParams.mName);
+
+        // if at the end, loop
+        std::map<std::string, LLWaterParamSet>::iterator last = param_mgr->mParamList.end(); --last;
+        if(mIt == last) 
+        {
+                mIt = param_mgr->mParamList.begin();
+        }
+        else
+        {
+                mIt++;
+        }
+        /*param_mgr->mAnimator.mIsRunning = false;
+        param_mgr->mAnimator.mUseLindenTime = false;*/
+        param_mgr->loadPreset(mIt->first, true);
+}
+
+void LLFloaterWater::onClickPrev(void* user_data)
+{
+        LLWaterParamManager * param_mgr = LLWaterParamManager::instance();
+        LLWaterParamSet & currentParams = param_mgr->mCurParams;
+
+        // find place of current param
+        std::map<std::string, LLWaterParamSet>::iterator mIt = 
+                param_mgr->mParamList.find(currentParams.mName);
+
+        // if at the beginning, loop
+        if(mIt == param_mgr->mParamList.begin()) 
+        {
+                std::map<std::string, LLWaterParamSet>::iterator last = param_mgr->mParamList.end(); --last;
+                mIt = last;
+        }
+        else
+        {
+                mIt--;
+        }
+        /*param_mgr->mAnimator.mIsRunning = false;
+        param_mgr->mAnimator.mUseLindenTime = false;*/
+        param_mgr->loadPreset(mIt->first, true);
+}
diff --git a/linden/indra/newview/llfloaterwater.h b/linden/indra/newview/llfloaterwater.h
index 5c1fced..40704f2 100644
--- a/linden/indra/newview/llfloaterwater.h
+++ b/linden/indra/newview/llfloaterwater.h
@@ -127,6 +127,9 @@ private:
         static LLFloaterWater* sWaterMenu;
 
         static std::set<std::string> sDefaultPresets;
+
+        static void onClickNext(void* user_data);
+        static void onClickPrev(void* user_data);
 };
 
 
diff --git a/linden/indra/newview/llfloaterwindlight.cpp b/linden/indra/newview/llfloaterwindlight.cpp
index 71e81fa..80090a0 100644
--- a/linden/indra/newview/llfloaterwindlight.cpp
+++ b/linden/indra/newview/llfloaterwindlight.cpp
@@ -46,6 +46,7 @@
 #include "llcombobox.h"
 #include "lllineeditor.h"
 #include "llfloaterdaycycle.h"
+#include "lltabcontainer.h"
 #include "llboost.h"
 
 #include "v4math.h"
@@ -1066,3 +1067,13 @@ void LLFloaterWindLight::onClickPrev(void* user_data)
         param_mgr->mAnimator.mUseLindenTime = false;
         param_mgr->loadPreset(mIt->first, true);
 }
+
+//static
+void LLFloaterWindLight::selectTab(std::string tab_name)
+{
+        if (!tab_name.empty())
+        {
+                LLTabContainer* tabs = LLFloaterWindLight::instance()->getChild<LLTabContainer>("WindLight Tabs");
+                tabs->selectTabByName(tab_name);
+        }
+}
diff --git a/linden/indra/newview/llfloaterwindlight.h b/linden/indra/newview/llfloaterwindlight.h
index 70e76c5..130a9a7 100644
--- a/linden/indra/newview/llfloaterwindlight.h
+++ b/linden/indra/newview/llfloaterwindlight.h
@@ -131,6 +131,8 @@ public:
         /// turn off animated skies
         static void deactivateAnimator();
 
+        static void selectTab(std::string tab_name);
+
 private:
         // one instance on the inside
         static LLFloaterWindLight* sWindLight;
diff --git a/linden/indra/newview/llfolderview.cpp b/linden/indra/newview/llfolderview.cpp
index 5407f06..61d7df0 100644
--- a/linden/indra/newview/llfolderview.cpp
+++ b/linden/indra/newview/llfolderview.cpp
@@ -297,11 +297,22 @@ void LLFolderViewItem::refreshFromListener()
                 else
                         mLabelCreator = creator_name;*/
                 
+                //Label for desc search
+                std::string desc;
+                if(item)
+                {
+                        if(!item->getDescription().empty())
+                        {
+                                desc = item->getDescription();
+                        }
+                }
+                mLabelDesc = desc;
+
                 //Label for name search
                 mLabel = mListener->getDisplayName();
 
                 //Build label for combined search - RK
-                mLabelAll = mLabel + " " + mLabelCreator;
+                mLabelAll = mLabel + " " + mLabelCreator + " " + mLabelDesc;
 
                 setIcon(mListener->getIcon());
                 time_t creation_date = mListener->getCreationDate();
@@ -321,32 +332,53 @@ void LLFolderViewItem::refresh()
         
         std::string searchable_label(mLabel);
         std::string searchable_label_creator(mLabelCreator);
+        std::string searchable_label_desc(mLabelDesc);
         std::string searchable_label_all(mLabelAll);
 
         //add the (no modify), (no transfer) etc stuff to each label.
         searchable_label.append(mLabelSuffix);
         searchable_label_creator.append(mLabelSuffix);
+        searchable_label_desc.append(mLabelSuffix);
         searchable_label_all.append(mLabelSuffix);
 
         //all labels need to be uppercase.
         LLStringUtil::toUpper(searchable_label);
         LLStringUtil::toUpper(searchable_label_creator);
+        LLStringUtil::toUpper(searchable_label_desc);
         LLStringUtil::toUpper(searchable_label_all);
 
-        if (mSearchableLabel.compare(searchable_label) || 
-                mSearchableLabelCreator.compare(searchable_label_creator))
+        if (mSearchableLabel.compare(searchable_label) ||
+                mSearchableLabelCreator.compare(searchable_label_creator) ||
+                mSearchableLabelDesc.compare(searchable_label_creator))
         {
                 mSearchableLabel.assign(searchable_label);
                 mSearchableLabelCreator.assign(searchable_label_creator);
+                mSearchableLabelDesc.assign(searchable_label_desc);
                 mSearchableLabelAll.assign(searchable_label_all);
 
                 dirtyFilter();
-                // some part of label has changed, so overall width has potentially changed
+                //some part of label has changed, so overall width has potentially changed
                 if (mParentFolder)
-                {
                         mParentFolder->requestArrange();
-                }
         }
+        
+        /*if(mSearchableLabelCreator.compare(searchable_label_creator))
+        {
+                mSearchableLabelCreator.assign(searchable_label_creator);
+
+                dirtyFilter();
+                if(mParentFolder)
+                        mParentFolder->requestArrange();
+        }
+
+        if(mSearchableLabelDesc.compare(searchable_label_desc))
+        {
+                mSearchableLabelDesc.assign(searchable_label_desc);
+
+                dirtyFilter();
+                if(mParentFolder)
+                        mParentFolder->requestArrange();
+        }*/
 
         S32 label_width = sFont->getWidth(mLabel);
         if( mLabelSuffix.size() )   
@@ -621,11 +653,12 @@ void LLFolderViewItem::rename(const std::string& new_name)
         }
 }
 
-const std::string& LLFolderViewItem::getSearchableLabel() const
+const std::string& LLFolderViewItem::getSearchableLabel(U32 search_type = 0) const
 {
-        U32 search_type = gSavedSettings.getU32("InventorySearchType");
-        if(search_type == 4)
+        if(search_type == 3)
                 return mSearchableLabelAll;
+        else if(search_type == 2)
+                return mSearchableLabelDesc;
         else if(search_type == 1)
                 return mSearchableLabelCreator;
         else
@@ -4564,11 +4597,13 @@ BOOL LLInventoryFilter::check(LLFolderViewItem* item)
         }
         LLFolderViewEventListener* listener = item->getListener();
         const LLUUID& item_id = listener->getUUID();
-        mSubStringMatchOffset = mFilterSubString.size() ? item->getSearchableLabel().find(mFilterSubString) : std::string::npos;
+
+        U32 search_type = gSavedSettings.getU32("InventorySearchType");
+        mSubStringMatchOffset = mFilterSubString.size() ? item->getSearchableLabel(search_type).find(mFilterSubString) : std::string::npos;
         BOOL passed = (listener->getNInventoryType() & mFilterOps.mFilterTypes || listener->getNInventoryType() == LLInventoryType::NIT_NONE)
                                         && (mFilterSubString.size() == 0 || mSubStringMatchOffset != std::string::npos)
                                         && (mFilterWorn == false || gAgent.isWearingItem(item_id) ||
-                                                gAgent.getAvatarObject() && gAgent.getAvatarObject()->isWearingAttachment(item_id))
+                                                (gAgent.getAvatarObject() && gAgent.getAvatarObject()->isWearingAttachment(item_id)))
                                         && ((listener->getPermissionMask() & mFilterOps.mPermissions) == mFilterOps.mPermissions)
                                         && (listener->getCreationDate() >= earliest && listener->getCreationDate() <= mFilterOps.mMaxDate);
         return passed;
diff --git a/linden/indra/newview/llfolderview.h b/linden/indra/newview/llfolderview.h
index 25b4362..82a1951 100644
--- a/linden/indra/newview/llfolderview.h
+++ b/linden/indra/newview/llfolderview.h
@@ -338,11 +338,16 @@ protected:
 
         std::string                                     mLabel;
         std::string                                     mSearchableLabel;
-        std::string                                     mLabelAll;
-        std::string                                     mSearchableLabelAll;
+
         std::string                                     mLabelCreator;
         std::string                                     mSearchableLabelCreator;
 
+        std::string                                     mLabelDesc;
+        std::string                                     mSearchableLabelDesc;
+
+        std::string                                     mLabelAll;
+        std::string                                     mSearchableLabelAll;
+
         std::string                                     mType;
         S32                                                     mLabelWidth;
         U32                                                     mCreationDate;
@@ -469,7 +474,7 @@ public:
         // viewed. This method will ask the viewed object itself.
         const std::string& getName( void ) const;
 
-        const std::string& getSearchableLabel( void ) const;
+        const std::string& getSearchableLabel( U32 search_type ) const;
 
         // This method returns the label displayed on the view. This
         // method was primarily added to allow sorting on the folder
diff --git a/linden/indra/newview/llimpanel.cpp b/linden/indra/newview/llimpanel.cpp
index 014c050..25d0b63 100644
--- a/linden/indra/newview/llimpanel.cpp
+++ b/linden/indra/newview/llimpanel.cpp
@@ -73,6 +73,7 @@
 #include "llhttpclient.h"
 #include "llmutelist.h"
 #include "llstylemap.h"
+#include <sys/stat.h>
 
 //
 // Constants
@@ -1255,6 +1256,10 @@ BOOL LLFloaterIMPanel::postBuild()
         requires<LLLineEditor>("chat_editor");
         requires<LLTextEditor>("im_history");
 
+#if LL_LINUX || LL_DARWIN
+        childSetVisible("history_btn", false);
+#endif
+
         if (checkRequirements())
         {
                 mInputEditor = getChild<LLLineEditor>("chat_editor");
@@ -1269,6 +1274,7 @@ BOOL LLFloaterIMPanel::postBuild()
 
                 childSetAction("profile_callee_btn", onClickProfile, this);
                 childSetAction("group_info_btn", onClickGroupInfo, this);
+                childSetAction("history_btn", onClickHistory, this);
 
                 childSetAction("start_call_btn", onClickStartCall, this);
                 childSetAction("end_call_btn", onClickEndCall, this);
@@ -1800,6 +1806,41 @@ void LLFloaterIMPanel::onClickProfile( void* userdata )
 }
 
 // static
+void LLFloaterIMPanel::onClickHistory( void* userdata )
+{
+        LLFloaterIMPanel* self = (LLFloaterIMPanel*) userdata;
+        
+        if (self->mOtherParticipantUUID.notNull())
+        {
+                struct stat fileInfo;
+                int result;
+                
+                std::string fullname = self->getTitle();;
+                //gCacheName->getFullName(self->mOtherParticipantUUID, fullname);
+                //if(fullname == "(Loading...)")
+                std::string file_path = gDirUtilp->getPerAccountChatLogsDir() + "\\" + fullname + ".txt";
+
+                // check if file exists by trying to get its attributes
+                result = stat(file_path.c_str(), &fileInfo);
+                if(result == 0)
+                {
+                        char command[256];
+                        sprintf(command, "\"%s\\%s.txt\"", gDirUtilp->getPerAccountChatLogsDir().c_str(),fullname.c_str());
+                        gViewerWindow->getWindow()->ShellEx(command);
+
+                        llinfos << command << llendl;
+                }
+                else
+                {
+                        LLStringUtil::format_map_t args;
+                        args["[NAME]"] = fullname;
+                        gViewerWindow->alertXml("IMLogNotFound", args);
+                        llinfos << file_path << llendl;
+                }
+        }
+}
+
+// static
 void LLFloaterIMPanel::onClickGroupInfo( void* userdata )
 {
         //  Bring up the Profile window
diff --git a/linden/indra/newview/llimpanel.h b/linden/indra/newview/llimpanel.h
index 0f9c0f3..0699b12 100644
--- a/linden/indra/newview/llimpanel.h
+++ b/linden/indra/newview/llimpanel.h
@@ -230,6 +230,7 @@ public:
         static void             onTabClick( void* userdata );
 
         static void             onClickProfile( void* userdata );
+        static void             onClickHistory( void* userdata );
         static void             onClickGroupInfo( void* userdata );
         static void             onClickOfferTeleport( void* userdata );
         static void             onClickClose( void* userdata );
diff --git a/linden/indra/newview/llinventoryactions.cpp b/linden/indra/newview/llinventoryactions.cpp
index b598c83..25592c1 100644
--- a/linden/indra/newview/llinventoryactions.cpp
+++ b/linden/indra/newview/llinventoryactions.cpp
@@ -484,7 +484,8 @@ class SetSearchType : public inventory_listener_t
                         gSavedSettings.setU32("InventorySearchType", 0);
 
                         mPtr->getControl("Inventory.SearchByName")->setValue(TRUE);
-                        mPtr->getControl("Inventory.SearchByCreator")->setValue(FALSE);                 
+                        mPtr->getControl("Inventory.SearchByCreator")->setValue(FALSE); 
+                        mPtr->getControl("Inventory.SearchByDesc")->setValue(FALSE);
                         mPtr->getControl("Inventory.SearchByAll")->setValue(FALSE);
                 }
                 else if(search_type == "creator")
@@ -493,16 +494,31 @@ class SetSearchType : public inventory_listener_t
 
                         mPtr->getControl("Inventory.SearchByName")->setValue(FALSE);
                         mPtr->getControl("Inventory.SearchByCreator")->setValue(TRUE);
+                        mPtr->getControl("Inventory.SearchByDesc")->setValue(FALSE);
+                        mPtr->getControl("Inventory.SearchByAll")->setValue(FALSE);
+                }
+                else if(search_type == "desc")
+                {
+                        gSavedSettings.setU32("InventorySearchType", 2);
+
+                        mPtr->getControl("Inventory.SearchByName")->setValue(FALSE);
+                        mPtr->getControl("Inventory.SearchByCreator")->setValue(FALSE);
+                        mPtr->getControl("Inventory.SearchByDesc")->setValue(TRUE);
                         mPtr->getControl("Inventory.SearchByAll")->setValue(FALSE);
                 }
                 else if(search_type == "all")
                 {
-                        gSavedSettings.setU32("InventorySearchType", 4);
+                        gSavedSettings.setU32("InventorySearchType", 3);
 
                         mPtr->getControl("Inventory.SearchByName")->setValue(FALSE);
                         mPtr->getControl("Inventory.SearchByCreator")->setValue(FALSE);
+                        mPtr->getControl("Inventory.SearchByDesc")->setValue(FALSE);
                         mPtr->getControl("Inventory.SearchByAll")->setValue(TRUE);
                 }
+                
+                //Clear search when switching modes.
+                mPtr->getActivePanel()->setFilterSubString(LLStringUtil::null);
+                mPtr->getActivePanel()->setFilterTypes(LLInventoryType::NIT_ALL);
         return true;
         }
 };
diff --git a/linden/indra/newview/llinventoryview.cpp b/linden/indra/newview/llinventoryview.cpp
index 008d79d..b4a8b72 100644
--- a/linden/indra/newview/llinventoryview.cpp
+++ b/linden/indra/newview/llinventoryview.cpp
@@ -527,6 +527,7 @@ void LLInventoryView::init(LLInventoryModel* inventory)
 
         addBoolControl("Inventory.SearchByName", search_by_name);
         addBoolControl("Inventory.SearchByCreator", !search_by_name);
+        addBoolControl("Inventory.SearchByDesc", !search_by_name);
 
         addBoolControl("Inventory.SearchByAll", !search_by_name);
 
diff --git a/linden/indra/newview/llpreviewscript.cpp b/linden/indra/newview/llpreviewscript.cpp
index 1e9def3..6273011 100644
--- a/linden/indra/newview/llpreviewscript.cpp
+++ b/linden/indra/newview/llpreviewscript.cpp
@@ -436,6 +436,14 @@ void LLScriptEdCore::initMenu()
         menuItem->setMenuCallback(onBtnHelp, this);
         menuItem->setEnabledCallback(NULL);
 
+        menuItem = getChild<LLMenuItemCallGL>("Load from Disk");
+        menuItem->setMenuCallback(onBtnLoadFromDisc, this);
+        menuItem->setEnabledCallback(NULL);
+
+        menuItem = getChild<LLMenuItemCallGL>("Save to Disk");
+        menuItem->setMenuCallback(onBtnSaveToDisc, this);
+        menuItem->setEnabledCallback(NULL);
+
         menuItem = getChild<LLMenuItemCallGL>("LSL Wiki Help...");
         menuItem->setMenuCallback(onBtnDynamicHelp, this);
         menuItem->setEnabledCallback(NULL);
@@ -547,6 +555,7 @@ void LLScriptEdCore::setHelpPage(const std::string& help_string)
         if (!history_combo) return;
 
         LLUIString url_string = gSavedSettings.getString("LSLHelpURL");
+        url_string.setArg("[APP_DIRECTORY]", gDirUtilp->getWorkingDir());
         url_string.setArg("[LSL_STRING]", help_string);
 
         addHelpItemToHistory(help_string);
@@ -773,6 +782,7 @@ void LLScriptEdCore::onHelpComboCommit(LLUICtrl* ctrl, void* userdata)
 
                 LLWebBrowserCtrl* web_browser = live_help_floater->getChild<LLWebBrowserCtrl>("lsl_guide_html");
                 LLUIString url_string = gSavedSettings.getString("LSLHelpURL");
+                url_string.setArg("[APP_DIRECTORY]", gDirUtilp->getWorkingDir());
                 url_string.setArg("[LSL_STRING]", help_string);
                 web_browser->navigateTo(url_string);
         }
@@ -823,6 +833,60 @@ void LLScriptEdCore::onBtnUndoChanges( void* userdata )
         }
 }
 
+void LLScriptEdCore::onBtnSaveToDisc( void* userdata )
+{
+
+        LLViewerStats::getInstance()->incStat( LLViewerStats::ST_LSL_SAVE_COUNT );
+
+   LLScriptEdCore* self = (LLScriptEdCore*) userdata;
+
+   if( self->mSaveCallback )
+   {
+      LLFilePicker& file_picker = LLFilePicker::instance();
+        if( !file_picker.getSaveFile( LLFilePicker::FFSAVE_TEXT ) )
+        {
+                return;
+        }
+        
+                std::string filename = file_picker.getFirstFile();
+      std::string scriptText=self->mEditor->getText();
+          std::ofstream fout(filename.c_str());
+      fout<<(scriptText);
+      fout.close();
+      self->mSaveCallback( self->mUserdata, FALSE );
+         
+   }
+        
+}
+void LLScriptEdCore::onBtnLoadFromDisc( void* data )
+{
+
+        LLScriptEdCore* self = (LLScriptEdCore*) data;
+        
+        LLFilePicker& file_picker = LLFilePicker::instance();
+        if( !file_picker.getOpenFile( LLFilePicker::FFLOAD_TEXT ) )
+        {
+                return;
+        }
+        
+        std::string filename = file_picker.getFirstFile();
+
+        std::ifstream fin(filename.c_str());
+        
+        std::string line;
+        std::string linetotal;
+        self->mEditor->clear();
+        while (!fin.eof())
+        { 
+                getline(fin,line);
+                line=line+"\n";
+                self->mEditor->insertText(line);
+
+        }
+        fin.close();
+        
+}
+
 void LLScriptEdCore::onSearchMenu(void* userdata)
 {
         LLScriptEdCore* sec = (LLScriptEdCore*)userdata;
diff --git a/linden/indra/newview/llpreviewscript.h b/linden/indra/newview/llpreviewscript.h
index 7026482..97e721d 100644
--- a/linden/indra/newview/llpreviewscript.h
+++ b/linden/indra/newview/llpreviewscript.h
@@ -95,6 +95,8 @@ public:
         static void             doSave( void* userdata, BOOL close_after_save );
         static void             onBtnSave(void*);
         static void             onBtnUndoChanges(void*);
+        static void             onBtnSaveToDisc(void*);
+        static void             onBtnLoadFromDisc(void*);
         static void             onSearchMenu(void* userdata);
 
         static void             onUndoMenu(void* userdata);
diff --git a/linden/indra/newview/llwearable.cpp b/linden/indra/newview/llwearable.cpp
index 6bdc50f..884cda5 100644
--- a/linden/indra/newview/llwearable.cpp
+++ b/linden/indra/newview/llwearable.cpp
@@ -150,41 +150,87 @@ EWearableType LLWearable::typeNameToType( const std::string& type_name )
         return WT_INVALID;
 }
 
-
-std::string terse_F32_to_string( F32 f )
+const char* terse_F32_to_string( F32 f, char s[MAX_STRING] )            /* Flawfinder: ignore */
 {
-        std::string r = llformat( "%.2f", f );
+        char* r = s;
+        S32 len = snprintf( s, MAX_STRING, "%.2f", f );         /* Flawfinder: ignore */
 
         // "1.20"  -> "1.2"
         // "24.00" -> "24."
-        S32 len = r.length();
-        while( len > 0 && '0' == r[len - 1] )
+        while( '0' == r[len - 1] )
         {
-                r.erase(len-1, 1);
-                len--;
+                len--;  
+                r[len] = '\0';
         }
 
         if( '.' == r[len - 1] )
         {
                 // "24." -> "24"
-                r.erase(len-1, 1);
+                len--;
+                r[len] = '\0';
         }
         else
         if( ('-' == r[0]) && ('0' == r[1]) )
         {
                 // "-0.59" -> "-.59"
-                r.erase(1, 1);
+                r++;
+                r[0] = '-';
         }
         else
         if( '0' == r[0] )
         {
                 // "0.59" -> ".59"
-                r.erase(0, 1);
+                r++;
         }
 
         return r;
 }
 
+// reX: new function
+BOOL LLWearable::FileExportParams( FILE* file )
+{
+        // wearable type 
+        S32 type = (S32)mType;
+        fprintf( file, "type %d\n", type );
+
+        // parameters
+        S32 num_parameters = mVisualParamMap.size();
+        fprintf( file, "parameters %d\n", num_parameters );
+
+        char s[ MAX_STRING ];           /* Flawfinder: ignore */
+        for (param_map_t::iterator iter = mVisualParamMap.begin();
+                 iter != mVisualParamMap.end(); ++iter)
+        {
+                S32 param_id = iter->first;
+                F32 param_weight = iter->second;
+                fprintf( file, "%d %s\n", param_id, terse_F32_to_string( param_weight, s ) );
+        }
+
+        return TRUE;
+}
+
+// reX: new function
+BOOL LLWearable::FileExportTextures( FILE* file )
+{
+        // wearable type 
+        S32 type = (S32)mType;
+        fprintf( file, "type %d\n", type );
+
+        // texture entries
+        S32 num_textures = mTEMap.size();
+        fprintf( file, "textures %d\n", num_textures );
+        
+        for (te_map_t::iterator iter = mTEMap.begin();
+                 iter != mTEMap.end(); ++iter)
+        {
+                S32 te = iter->first;
+                LLUUID& image_id = iter->second;
+                fprintf( file, "%d %s\n", te, image_id.asString().c_str() );
+    }
+
+        return TRUE;
+}
+
 BOOL LLWearable::exportFile( LLFILE* file )
 {
         // header and version
@@ -231,12 +277,13 @@ BOOL LLWearable::exportFile( LLFILE* file )
                 return FALSE;
         }
 
+        char s[ MAX_STRING ];           /* Flawfinder: ignore */
         for (param_map_t::iterator iter = mVisualParamMap.begin();
                  iter != mVisualParamMap.end(); ++iter)
         {
                 S32 param_id = iter->first;
                 F32 param_weight = iter->second;
-                if( fprintf( file, "%d %s\n", param_id, terse_F32_to_string( param_weight ).c_str() ) < 0 )
+                if( fprintf( file, "%d %s\n", param_id, terse_F32_to_string( param_weight, s ) ) < 0 )
                 {
                         return FALSE;
                 }
diff --git a/linden/indra/newview/llwearable.h b/linden/indra/newview/llwearable.h
index ea16d20..9986e85 100644
--- a/linden/indra/newview/llwearable.h
+++ b/linden/indra/newview/llwearable.h
@@ -60,6 +60,10 @@ public:
 
         BOOL                            exportFile(LLFILE* file);
         BOOL                            importFile(LLFILE* file);
+        // reX: new function
+        BOOL                            FileExportParams(FILE* file);
+        // reX: new function
+        BOOL                            FileExportTextures(FILE* file);
 
         EWearableType           getType() const                                                 { return mType; }
         void                            setType( EWearableType type )                   { mType = type; }
diff --git a/linden/indra/newview/llwindlightremotectrl.cpp b/linden/indra/newview/llwindlightremotectrl.cpp
index ae9a90a..f805763 100644
--- a/linden/indra/newview/llwindlightremotectrl.cpp
+++ b/linden/indra/newview/llwindlightremotectrl.cpp
@@ -35,6 +35,7 @@
 #include "llbutton.h"
 #include "llcombobox.h"
 #include "llfloaterenvsettings.h"
+#include "llfloaterwater.h"
 #include "llfloaterwindlight.h"
 #include "lloverlaybar.h"
 #include "lluictrlfactory.h"
@@ -154,6 +155,11 @@ void LLWindlightRemoteCtrl::refreshPresets()
                 
                 // insert separator and add World menu options
                 mPresetsCombo->addSeparator(ADD_BOTTOM);
+                mPresetsCombo->addSimpleElement(getString("atmosphere"), ADD_BOTTOM);
+                mPresetsCombo->addSimpleElement(getString("lighting"), ADD_BOTTOM);
+                mPresetsCombo->addSimpleElement(getString("clouds"), ADD_BOTTOM);
+                mPresetsCombo->addSimpleElement(getString("advanced_water"), ADD_BOTTOM);
+                mPresetsCombo->addSeparator(ADD_BOTTOM);
                 mPresetsCombo->addSimpleElement(getString("sunrise"), ADD_BOTTOM);
                 mPresetsCombo->addSimpleElement(getString("noon"), ADD_BOTTOM);
                 mPresetsCombo->addSimpleElement(getString("sunset"), ADD_BOTTOM);
@@ -191,7 +197,35 @@ void LLWindlightRemoteCtrl::onCommitPreset(LLUICtrl* ctrl, void* data)
                 // check for World menu options; if none, apply preset
                 std::string selected = self->mPresetsCombo->getSelectedValue().asString();
 
-                if (selected == self->getString("sunrise"))
+                if (selected == self->getString("atmosphere"))
+                {
+                        if (!LLFloaterWindLight::instance()->getVisible())
+                        {
+                                LLFloaterWindLight::show();
+                        }
+                        LLFloaterWindLight::instance()->selectTab("Atmosphere");
+                }
+                else if (selected == self->getString("lighting"))
+                {
+                        if (!LLFloaterWindLight::instance()->getVisible())
+                        {
+                                LLFloaterWindLight::show();
+                        }
+                        LLFloaterWindLight::instance()->selectTab("Lighting");
+                }
+                else if (selected == self->getString("clouds"))
+                {
+                        if (!LLFloaterWindLight::instance()->getVisible())
+                        {
+                                LLFloaterWindLight::show();
+                        }
+                        LLFloaterWindLight::instance()->selectTab("Clouds");
+                }
+                else if (selected == self->getString("advanced_water"))
+                {
+                        LLFloaterWater::show();
+                }
+                else if (selected == self->getString("sunrise"))
                 {
                         // set the value, turn off animation
                         LLWLParamManager::instance()->mAnimator.setDayTime(0.25);
diff --git a/linden/indra/newview/pipeline.cpp b/linden/indra/newview/pipeline.cpp
index 67af961..efb5ff6 100644
--- a/linden/indra/newview/pipeline.cpp
+++ b/linden/indra/newview/pipeline.cpp
@@ -3596,6 +3596,11 @@ void LLPipeline::enableLightsAvatar()
 
 void LLPipeline::enableLightsAvatarEdit(const LLColor4& color)
 {
+        if (mLightingDetail < 1)
+        {
+                return;
+        }
+
         U32 mask = 0x2002; // Avatar backlight only, set ambient
         setupAvatarLights(TRUE);
         enableLights(mask);
diff --git a/linden/indra/newview/skins/default/xui/en-us/alerts.xml b/linden/indra/newview/skins/default/xui/en-us/alerts.xml
index edfe62c..24683f0 100644
--- a/linden/indra/newview/skins/default/xui/en-us/alerts.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/alerts.xml
@@ -5222,6 +5222,15 @@ WARNING: Don't restore if you aren't sure where the object will go!
                 </option>
         </alert>
 
+  <alert modal="true" name="IMLogNotFound">
+    <message name="message">
+      IM history could not be found for [NAME].
+    </message>
+    <option name="OK">
+      OK
+    </option>
+  </alert>
+
   <!-- [RLVa:KB] -->
         <alert modal="true" name="FirstRLVGiveToRLV">
                 <message name="message">
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_customize.xml b/linden/indra/newview/skins/default/xui/en-us/floater_customize.xml
index e7a7a7b..527ec4e 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_customize.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_customize.xml
@@ -1057,14 +1057,34 @@ scratch and wear it.
         </tab_container>
         <scroll_container bottom="-476" follows="left|top|right|bottom" height="382" left="197"
              mouse_opaque="false" name="panel_container" opaque="false" width="292" />
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+     bottom="-400" drop_shadow_visible="true" follows="left|top"
+     font="SansSerif" h_pad="0" halign="left" height="16"
+     left="8" mouse_opaque="true" name="AvatarHeightText" v_pad="0" width="140">
+    Avatar Height:
+  </text>
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+     bottom_delta="-18" drop_shadow_visible="true" follows="left|top"
+     font="SansSerif" h_pad="0" halign="left" height="16"
+     left="8" mouse_opaque="true" name="HeightText" v_pad="0" width="140">
+    Avatar Height
+  </text>
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+   bottom_delta="-18" drop_shadow_visible="true" follows="left|top"
+   font="SansSerif" h_pad="0" halign="left" height="16"
+   left="8" mouse_opaque="true" name="HeightText2" v_pad="0" width="140">
+    Avatar Height2
+  </text>
         <button bottom="-536" follows="right|bottom" font="SansSerif" halign="center"
              height="20" label="Close" label_selected="Close" mouse_opaque="true"
-             name="Close" right="-10" scale_image="true" width="100" />
+             name="Close" right="-10" scale_image="true" width="80" />
         <button bottom="-536" follows="right|bottom" font="SansSerif" halign="center"
              height="20" label="Save All" label_selected="Save All" mouse_opaque="true"
-             name="Save All" right="-116" scale_image="true" width="100" />
+             name="Save All" right="-100" scale_image="true" width="80" />
         <button bottom="-536" follows="right|bottom" font="SansSerif" halign="center"
              height="20" label="Make Outfit" label_selected="Make Outfit"
-             mouse_opaque="true" name="Make Outfit" right="-222" scale_image="true"
-             width="100" />
+             mouse_opaque="true" name="Make Outfit" right="-190" scale_image="true"
+             width="80" />
+  <button bottom="-536" follows="right|bottom" font="SansSerif" halign="center" height="20" hidden="false" label="Export" label_selected="Export" right="-280" mouse_opaque="true" name="Export" scale_image="true" width="80" />
+  <button bottom="-536" follows="right|bottom" font="SansSerif" halign="center" height="20" hidden="false" label="Import" label_selected="Import" right="-370" mouse_opaque="true" name="Import" scale_image="true" width="80" />
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_instant_message.xml b/linden/indra/newview/skins/default/xui/en-us/floater_instant_message.xml
index 9a60f57..b947fad 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_instant_message.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_instant_message.xml
@@ -46,6 +46,8 @@
              image_overlay="icn_voice-call-end.tga" image_overlay_alignment="left"
              label="End Call" left_delta="0" name="end_call_btn" pad_right="10"
              visible="false" width="100" />
+  <button bottom="-40" follows="left|top" halign="center" height="20" label="History" left_delta="105"
+          name="history_btn" visible="true" width="85" />
   <text bottom_delta="0" left="-240" height="14" width="230" name="inventory_send" halign="right" 
         text_color="LabelTextColor" follows="right|top" drop_shadow_visible="true"
         bg_visible="false" border_drop_shadow_visible="false" border_visible="false">
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_instant_message_group.xml b/linden/indra/newview/skins/default/xui/en-us/floater_instant_message_group.xml
index 1156e9d..2e97d64 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_instant_message_group.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_instant_message_group.xml
@@ -54,6 +54,8 @@
                              image_overlay="icn_voice-call-end.tga" image_overlay_alignment="left"
                              label="End Call" left_delta="0" name="end_call_btn" pad_right="12"
                              visible="false" width="92" />
+      <button bottom="-20" follows="left|top" halign="center" height="20" label="History" left_delta="97"
+              name="history_btn" visible="true" width="85" />
                         <button bottom_delta="0" follows="right|top" height="20" label="&lt; &lt;"
                              label_selected="&gt; &gt;" left="143" name="toggle_active_speakers_btn"
                              right="176"
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_inventory.xml b/linden/indra/newview/skins/default/xui/en-us/floater_inventory.xml
index f0c97f2..103a11e 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_inventory.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_inventory.xml
@@ -206,7 +206,7 @@
                         </menu_item_check>
                 </menu>
     <menu bottom_delta="64" drop_shadow="true" height="49"
-                     label="Search" left="0" mouse_opaque="false" name="Sort" opaque="true"
+                     label="Search" left="0" mouse_opaque="false" name="Search" opaque="true"
                      tear_off="true" width="118">
       <menu_item_check bottom_delta="-18" control_name="Inventory.SearchByName" height="18"
                              label="By Name" left="0" mouse_opaque="true" name="By Name" width="118">
@@ -216,6 +216,10 @@
            label="By Creator" left="0" mouse_opaque="true" name="By Creator" width="118">
         <on_click filter="" function="Inventory.SetSearchBy" userdata="creator" />
       </menu_item_check>
+      <menu_item_check bottom_delta="-18" control_name="Inventory.SearchByDesc" height="18"
+          label="By Description" left="0" mouse_opaque="true" name="By Description" width="118">
+        <on_click filter="" function="Inventory.SetSearchBy" userdata="desc" />
+      </menu_item_check>
       <menu_item_separator bottom_delta="-8" height="8" left="0" mouse_opaque="true" name="separator"
                              width="118" />
       <menu_item_check bottom_delta="-18" control_name="Inventory.SearchByAll" height="18"
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_new_outfit_dialog.xml b/linden/indra/newview/skins/default/xui/en-us/floater_new_outfit_dialog.xml
index 568f155..27a08c1 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_new_outfit_dialog.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_new_outfit_dialog.xml
@@ -225,6 +225,12 @@ now wearing into it.
              width="489">
                 Items to include in outfit:
         </text>
+  <button bottom_delta="0" enabled="true" font="SansSerif" halign="center" height="20"
+             label="Check All" left_delta="200" mouse_opaque="true"
+             name="Check All" scale_image="true" width="90" />
+  <button bottom_delta="0" enabled="true" font="SansSerif" halign="center" height="20"
+             label="Uncheck All" left_delta="100" mouse_opaque="true"
+             name="Uncheck All" scale_image="true" width="90" />
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom="-196" drop_shadow_visible="true" enabled="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="14" left="13"
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_postcard.xml b/linden/indra/newview/skins/default/xui/en-us/floater_postcard.xml
index 631db0d..9cf7b5f 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_postcard.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_postcard.xml
@@ -43,7 +43,7 @@
         <button bottom_delta="0" follows="right|bottom" height="20" label="Send"
              left_delta="-106" name="send_btn" width="100" />
         <string name="default_subject">
-                Postcard from Second Life.
+                Postcard from a virtual world.
         </string>
         <string name="default_message">
                 Check this out!
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
index b83a6df..653c75b 100644
--- 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
@@ -35,6 +35,12 @@
                              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_item_separator bottom_delta="-66" height="8" left="0" mouse_opaque="true" name="separator"
+     width="138" />
+      <menu_item_call bottom_delta="-76" height="20" label="Save to Disk" left="0"
+     mouse_opaque="true" name="Save to Disk" width="138" />
+      <menu_item_call bottom_delta="-96" height="20" label="Load from Disk" left="0"
+     mouse_opaque="true" name="Load from Disk" 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"
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
index 9dcb96e..7038c93 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_water.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_water.xml
@@ -11,17 +11,23 @@
              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"
+        <combo_box allow_text_entry="false" bottom="-52" follows="left|top" height="18"
+             left_delta="120" max_chars="20" mouse_opaque="true"
              name="WaterPresetsCombo" width="150" />
+  <button bottom="-53" enabled="true" font="SansSerif" halign="center" height="20"
+             label="" label_selected="" left_delta="-25" image_overlay="arrow_left.tga"
+             mouse_opaque="true" name="prev" scale_image="true" width="20" />
+  <button bottom="-53" enabled="true" font="SansSerif" halign="center" height="20"
+             label="" label_selected="" left_delta="180" image_overlay="arrow_right.tga"
+             mouse_opaque="true" name="next" scale_image="true" width="20" />
         <button bottom="-53" enabled="true" font="SansSerif" halign="center" height="20"
-             label="New" label_selected="New" left_delta="170"
+             label="New" label_selected="New" left_delta="40"
              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"
+             label="Save" label_selected="Save" left_delta="70"
              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"
+             label="Delete" label_selected="Delete" left_delta="70"
              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">
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_windlight_remote.xml b/linden/indra/newview/skins/default/xui/en-us/panel_windlight_remote.xml
index ead9ad7..8be72fc 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_windlight_remote.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_windlight_remote.xml
@@ -4,6 +4,18 @@
      name="windlight_remote" use_bounding_rect="true" width="182">
         <panel bottom="1" filename="panel_bg_tab.xml" name="panel_bg_tab" height="22" left="0" width="182" />
         <panel bottom="3" filename="panel_windlight_controls.xml" name="panel_windlight_controls" height="20" left="0" width="182" />
+  <string name="atmosphere">
+    Atmosphere
+  </string>
+  <string name="lighting">
+    Lighting
+  </string>
+    <string name="clouds">
+    Clouds
+  </string>
+    <string name="advanced_water">
+    Advanced Water
+  </string>
   <string name="sunrise">
     Sunrise
   </string>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_windlight_remote_expanded.xml b/linden/indra/newview/skins/default/xui/en-us/panel_windlight_remote_expanded.xml
index e7182fa..4cb49a3 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_windlight_remote_expanded.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_windlight_remote_expanded.xml
@@ -1,13 +1,19 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel bg_visible="false" border="false" border_visible="false" bottom="0"
-     follows="right|bottom" height="47" left="0" mouse_opaque="true"
+     follows="right|bottom" height="67" left="0" mouse_opaque="true"
      name="windlight_remote" use_bounding_rect="true" width="182">
-        <panel bottom="1" filename="panel_bg_tab.xml" name="panel_bg_tab" height="47" left="0" width="182" />
+        <panel bottom="1" filename="panel_bg_tab.xml" name="panel_bg_tab" height="67" left="0" width="182" />
         <slider bottom="-20" can_edit_text="false" control_name="RenderFarClip"
-             decimal_digits="0" enabled="true" height="18"
-             increment="8" initial_val="160" label="Draw Distance:"
-             label_width="78" left="6" max_val="512" min_val="32" mouse_opaque="true"
-             name="DrawDistance" show_text="true" width="170" />
+       decimal_digits="0" enabled="true" height="18"
+       increment="8" initial_val="160" label="Draw Distance:"
+       label_width="78" left="6" max_val="512" min_val="32" mouse_opaque="true"
+       name="DrawDistance" show_text="true" width="170" />
+  <slider bottom_delta="-20" can_edit_text="false" control_name="RenderMaxPartCount"
+       decimal_digits="0" enabled="true" follows="left|top" height="18"
+       increment="256" initial_val="4096"
+       label="Max. Particles:" label_width="78" left_delta="0"
+       max_val="8192" min_val="0" mouse_opaque="true" name="MaxParticleCount"
+       show_text="true" width="176" />
   <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom="-14" drop_shadow_visible="true" enabled="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="12"
@@ -16,6 +22,18 @@
     m
   </text>
         <panel bottom="13" filename="panel_windlight_controls.xml" left="0" width="182" />
+  <string name="atmosphere">
+    Atmosphere
+  </string>
+  <string name="lighting">
+    Lighting
+  </string>
+  <string name="clouds">
+    Clouds
+  </string>
+  <string name="advanced_water">
+    Advanced Water
+  </string>
   <string name="sunrise">
     Sunrise
   </string>
diff --git a/linden/indra/newview/skins/silver/xui/en-us/floater_script_ed_panel.xml b/linden/indra/newview/skins/silver/xui/en-us/floater_script_ed_panel.xml
deleted file mode 100644
index 12ae6dc..0000000
--- a/linden/indra/newview/skins/silver/xui/en-us/floater_script_ed_panel.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?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" show_line_numbers="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/silver/xui/en-us/floater_script_queue.xml b/linden/indra/newview/skins/silver/xui/en-us/floater_script_queue.xml
deleted file mode 100644
index c44457c..0000000
--- a/linden/indra/newview/skins/silver/xui/en-us/floater_script_queue.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?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>