diff options
-rw-r--r-- | indra/newview/lllocalbitmaps.cpp | 22 | ||||
-rw-r--r-- | indra/newview/lllocalbitmaps.h | 1 | ||||
-rw-r--r-- | indra/newview/lllocalgltfmaterials.cpp | 23 | ||||
-rw-r--r-- | indra/newview/lllocalgltfmaterials.h | 1 |
4 files changed, 0 insertions, 47 deletions
diff --git a/indra/newview/lllocalbitmaps.cpp b/indra/newview/lllocalbitmaps.cpp index c3e3fd5c1b..860c2899d3 100644 --- a/indra/newview/lllocalbitmaps.cpp +++ b/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; diff --git a/indra/newview/lllocalbitmaps.h b/indra/newview/lllocalbitmaps.h index 362d47142d..2bc216708a 100644 --- a/indra/newview/lllocalbitmaps.h +++ b/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); diff --git a/indra/newview/lllocalgltfmaterials.cpp b/indra/newview/lllocalgltfmaterials.cpp index ef488e9ef4..2334ea47be 100644 --- a/indra/newview/lllocalgltfmaterials.cpp +++ b/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; diff --git a/indra/newview/lllocalgltfmaterials.h b/indra/newview/lllocalgltfmaterials.h index 7f5b06e10a..3fc700c30f 100644 --- a/indra/newview/lllocalgltfmaterials.h +++ b/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); |