livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SL-17653 Clean up unneeded filepicker dependency.

master
Andrey Kleshchev 2022-08-31 00:18:51 +03:00
parent 2158162b50
commit fbccc0986d
4 changed files with 0 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
indra/newview/lllocalbitmaps.cpp
View File

@ -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;

1
indra/newview/lllocalbitmaps.h
View File

@ -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);

23
indra/newview/lllocalgltfmaterials.cpp
View File

@ -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;

1
indra/newview/lllocalgltfmaterials.h
View File

@ -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);