Merge branch 'master' into DRTVWR-527-maint

# Conflicts:
#	autobuild.xml
#	indra/newview/installers/windows/lang_pl.nsi
#	indra/newview/llfloaterpreference.cpp
#	indra/newview/llinventorymodel.cpp

1 files changed, 40 insertions, 0 deletions

diff --git a/indra/newview/llinventoryfunctions.cpp b/indra/newview/llinventoryfunctions.cpp
index f2e06d19f3..9cc67766ca 100644
--- a/indra/newview/llinventoryfunctions.cpp
+++ b/indra/newview/llinventoryfunctions.cpp
@@ -47,6 +47,7 @@
 #include "llappviewer.h"
 #include "llavataractions.h"
 #include "llclipboard.h"
+#include "lldirpicker.h"
 #include "lldonotdisturbnotificationstorage.h"
 #include "llfloatersidepanelcontainer.h"
 #include "llfocusmgr.h"
@@ -2517,6 +2518,10 @@ void LLInventoryAction::doToSelected(LLInventoryModel* model, LLFolderView* root
     {
         LLAppearanceMgr::instance().removeItemsFromAvatar(ids);
     }
+    else if ("save_selected_as" == action)
+    {
+        (new LLDirPickerThread(boost::bind(&LLInventoryAction::saveMultipleTextures, _1, selected_items, model), std::string()))->getFile();
+    }
     else
     {
         std::set<LLFolderViewItem*>::iterator set_iter;
@@ -2544,6 +2549,41 @@ void LLInventoryAction::doToSelected(LLInventoryModel* model, LLFolderView* root
 	}
 }
 
+void LLInventoryAction::saveMultipleTextures(const std::vector<std::string>& filenames, std::set<LLFolderViewItem*> selected_items, LLInventoryModel* model)
+{
+    gSavedSettings.setString("TextureSaveLocation", filenames[0]);
+ 
+    LLMultiPreview* multi_previewp = new LLMultiPreview();
+    gFloaterView->addChild(multi_previewp);
+
+    LLFloater::setFloaterHost(multi_previewp);
+
+    std::map<std::string, S32> tex_names_map;
+    std::set<LLFolderViewItem*>::iterator set_iter;
+   
+    for (set_iter = selected_items.begin(); set_iter != selected_items.end(); ++set_iter)
+    {
+        LLFolderViewItem* folder_item = *set_iter;
+        if(!folder_item) continue;
+        LLTextureBridge* bridge = (LLTextureBridge*)folder_item->getViewModelItem();
+        if(!bridge) continue;
+
+        std::string tex_name = bridge->getName();
+        if(!tex_names_map.insert(std::pair<std::string, S32>(tex_name, 0)).second) 
+        { 
+            tex_names_map[tex_name]++;
+            bridge->setFileName(tex_name + llformat("_%.3d", tex_names_map[tex_name]));            
+        }
+        bridge->performAction(model, "save_selected_as");
+    }
+
+    LLFloater::setFloaterHost(NULL);
+    if (multi_previewp)
+    {
+        multi_previewp->openFloater(LLSD());
+    }
+}
+
 void LLInventoryAction::removeItemFromDND(LLFolderView* root)
 {
     if(gAgent.isDoNotDisturb())