Skip to content
Snippets Groups Projects
Commit fbccc098 authored by Andrey Kleshchev's avatar Andrey Kleshchev
Browse files

SL-17653 Clean up unneeded filepicker dependency.

parent 2158162b
No related branches found
No related tags found
No related merge requests found
...@@ -47,7 +47,6 @@ ...@@ -47,7 +47,6 @@
/* misc headers */ /* misc headers */
#include "llscrolllistctrl.h" #include "llscrolllistctrl.h"
#include "llfilepicker.h"
#include "lllocaltextureobject.h" #include "lllocaltextureobject.h"
#include "llviewertexturelist.h" #include "llviewertexturelist.h"
#include "llviewerobjectlist.h" #include "llviewerobjectlist.h"
...@@ -920,27 +919,6 @@ LLLocalBitmapMgr::~LLLocalBitmapMgr() ...@@ -920,27 +919,6 @@ LLLocalBitmapMgr::~LLLocalBitmapMgr()
mBitmapList.clear(); 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 LLLocalBitmapMgr::addUnit(const std::vector<std::string>& filenames)
{ {
bool add_successful = false; bool add_successful = false;
......
...@@ -115,7 +115,6 @@ class LLLocalBitmapMgr : public LLSingleton<LLLocalBitmapMgr> ...@@ -115,7 +115,6 @@ class LLLocalBitmapMgr : public LLSingleton<LLLocalBitmapMgr>
LLSINGLETON(LLLocalBitmapMgr); LLSINGLETON(LLLocalBitmapMgr);
~LLLocalBitmapMgr(); ~LLLocalBitmapMgr();
public: public:
bool addUnit();
bool addUnit(const std::vector<std::string>& filenames); bool addUnit(const std::vector<std::string>& filenames);
bool addUnit(const std::string& filename); bool addUnit(const std::string& filename);
void delUnit(LLUUID tracking_id); void delUnit(LLUUID tracking_id);
......
...@@ -39,7 +39,6 @@ ...@@ -39,7 +39,6 @@
#include <ctime> #include <ctime>
/* misc headers */ /* misc headers */
#include "llfilepicker.h"
#include "llgltfmateriallist.h" #include "llgltfmateriallist.h"
#include "llimage.h" #include "llimage.h"
#include "llinventoryicon.h" #include "llinventoryicon.h"
...@@ -363,28 +362,6 @@ LLLocalGLTFMaterialMgr::~LLLocalGLTFMaterialMgr() ...@@ -363,28 +362,6 @@ LLLocalGLTFMaterialMgr::~LLLocalGLTFMaterialMgr()
mMaterialList.clear(); 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 LLLocalGLTFMaterialMgr::addUnit(const std::vector<std::string>& filenames)
{ {
bool add_successful = false; bool add_successful = false;
......
...@@ -103,7 +103,6 @@ class LLLocalGLTFMaterialMgr : public LLSingleton<LLLocalGLTFMaterialMgr> ...@@ -103,7 +103,6 @@ class LLLocalGLTFMaterialMgr : public LLSingleton<LLLocalGLTFMaterialMgr>
LLSINGLETON(LLLocalGLTFMaterialMgr); LLSINGLETON(LLLocalGLTFMaterialMgr);
~LLLocalGLTFMaterialMgr(); ~LLLocalGLTFMaterialMgr();
public: public:
bool addUnit();
bool addUnit(const std::vector<std::string>& filenames); bool addUnit(const std::vector<std::string>& filenames);
bool addUnit(const std::string& filename); bool addUnit(const std::string& filename);
void delUnit(LLUUID tracking_id); void delUnit(LLUUID tracking_id);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment