From 73303d918465090b8e2a39514f4d9db49d0ff109 Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Mon, 2 Nov 2020 19:35:31 +0200
Subject: SL-14075 Allow bulk download of textures/pictures

---
 indra/newview/llinventoryfunctions.cpp | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

(limited to 'indra/newview/llinventoryfunctions.cpp')

diff --git a/indra/newview/llinventoryfunctions.cpp b/indra/newview/llinventoryfunctions.cpp
index 646d92b9e1..9f54feb3d7 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"
@@ -2444,6 +2445,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;
@@ -2471,6 +2476,32 @@ 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::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;
+        LLInvFVBridge* bridge = (LLInvFVBridge*)folder_item->getViewModelItem();
+        if(!bridge) continue;
+        bridge->performAction(model, "save_selected_as");
+    }
+
+    LLFloater::setFloaterHost(NULL);
+    if (multi_previewp)
+    {
+        multi_previewp->openFloater(LLSD());
+    }
+}
+
 void LLInventoryAction::removeItemFromDND(LLFolderView* root)
 {
     if(gAgent.isDoNotDisturb())
-- 
cgit v1.2.3


From 66793abc716d86660e2fa4c7731e235881525c69 Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Fri, 2 Jul 2021 16:11:39 +0300
Subject: SL-14075 allow exporting multiple textures with the same name

---
 indra/newview/llinventoryfunctions.cpp | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'indra/newview/llinventoryfunctions.cpp')

diff --git a/indra/newview/llinventoryfunctions.cpp b/indra/newview/llinventoryfunctions.cpp
index 5049174a8b..9cc67766ca 100644
--- a/indra/newview/llinventoryfunctions.cpp
+++ b/indra/newview/llinventoryfunctions.cpp
@@ -2558,13 +2558,22 @@ void LLInventoryAction::saveMultipleTextures(const std::vector<std::string>& fil
 
     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;
-        LLInvFVBridge* bridge = (LLInvFVBridge*)folder_item->getViewModelItem();
+        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");
     }
 
-- 
cgit v1.2.3