SL-17653 Clean up unneeded filepicker dependency.

indra/newview/lllocalbitmaps.cpp

@@ -47,7 +47,6 @@
 
 /* misc headers */
 #include "llscrolllistctrl.h"
-#include "llfilepicker.h"
 #include "lllocaltextureobject.h"
 #include "llviewertexturelist.h"
 #include "llviewerobjectlist.h"
@@ -920,27 +919,6 @@ LLLocalBitmapMgr::~LLLocalBitmapMgr()
     mBitmapList.clear();
 }
 
-bool LLLocalBitmapMgr::addUnit()
-{
-	bool add_successful = false;
-
-	LLFilePicker& picker = LLFilePicker::instance();
-	if (picker.getMultipleOpenFiles(LLFilePicker::FFLOAD_IMAGE))
-	{
-		mTimer.stopTimer();
-
-		std::string filename = picker.getFirstFile();
-		while(!filename.empty())
-		{
-            add_successful |= addUnit(filename);
-			filename = picker.getNextFile();
-		}
-		
-		mTimer.startTimer();
-	}
-
-	return add_successful;
-}
 bool LLLocalBitmapMgr::addUnit(const std::vector<std::string>& filenames)
 {
     bool add_successful = false;

indra/newview/lllocalbitmaps.h

@@ -115,7 +115,6 @@ class LLLocalBitmapMgr : public LLSingleton<LLLocalBitmapMgr>
 	LLSINGLETON(LLLocalBitmapMgr);
 	~LLLocalBitmapMgr();
 public:
-	bool         addUnit();
     bool         addUnit(const std::vector<std::string>& filenames);
     bool         addUnit(const std::string& filename);
 	void         delUnit(LLUUID tracking_id);

indra/newview/lllocalgltfmaterials.cpp

@@ -39,7 +39,6 @@
 #include <ctime>
 
 /* misc headers */
-#include "llfilepicker.h"
 #include "llgltfmateriallist.h"
 #include "llimage.h"
 #include "llinventoryicon.h"
@@ -363,28 +362,6 @@ LLLocalGLTFMaterialMgr::~LLLocalGLTFMaterialMgr()
     mMaterialList.clear();
 }
 
-bool LLLocalGLTFMaterialMgr::addUnit()
-{
-    bool add_successful = false;
-
-    LLFilePicker& picker = LLFilePicker::instance();
-    if (picker.getMultipleOpenFiles(LLFilePicker::FFLOAD_MATERIAL))
-    {
-        mTimer.stopTimer();
-
-        std::string filename = picker.getFirstFile();
-        while (!filename.empty())
-        {
-            add_successful |= addUnit(filename);
-            filename = picker.getNextFile();
-        }
-
-        mTimer.startTimer();
-    }
-
-    return add_successful;
-}
-
 bool LLLocalGLTFMaterialMgr::addUnit(const std::vector<std::string>& filenames)
 {
     bool add_successful = false;

indra/newview/lllocalgltfmaterials.h

@@ -103,7 +103,6 @@ class LLLocalGLTFMaterialMgr : public LLSingleton<LLLocalGLTFMaterialMgr>
     LLSINGLETON(LLLocalGLTFMaterialMgr);
     ~LLLocalGLTFMaterialMgr();
 public:
-    bool         addUnit();
     bool         addUnit(const std::vector<std::string>& filenames);
     bool         addUnit(const std::string& filename);
     void         delUnit(LLUUID tracking_id);