diff options
Diffstat (limited to 'indra/newview/lllocalbitmaps.cpp')
-rw-r--r-- | indra/newview/lllocalbitmaps.cpp | 22 |
1 files changed, 0 insertions, 22 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; |