Skip to content
Snippets Groups Projects
Commit d584d58e authored by maxim_productengine's avatar maxim_productengine
Browse files

mac build fixes

parent bbc49ea0
No related branches found
No related tags found
No related merge requests found
...@@ -92,7 +92,7 @@ LLDirPicker::~LLDirPicker() ...@@ -92,7 +92,7 @@ LLDirPicker::~LLDirPicker()
// nothing // nothing
} }
BOOL LLDirPicker::getDir(std::string filename, bool blocking) BOOL LLDirPicker::getDir(std::string* filename, bool blocking)
{ {
if( mLocked ) if( mLocked )
{ {
...@@ -175,7 +175,7 @@ void LLDirPicker::reset() ...@@ -175,7 +175,7 @@ void LLDirPicker::reset()
//static //static
BOOL LLDirPicker::getDir(std::string* filename) BOOL LLDirPicker::getDir(std::string* filename, bool blocking)
{ {
LLFilePicker::ELoadFilter filter=LLFilePicker::FFLOAD_DIRECTORY; LLFilePicker::ELoadFilter filter=LLFilePicker::FFLOAD_DIRECTORY;
...@@ -209,7 +209,7 @@ void LLDirPicker::reset() ...@@ -209,7 +209,7 @@ void LLDirPicker::reset()
mFilePicker->reset(); mFilePicker->reset();
} }
BOOL LLDirPicker::getDir(std::string* filename) BOOL LLDirPicker::getDir(std::string* filename, bool blocking)
{ {
reset(); reset();
...@@ -264,7 +264,7 @@ void LLDirPicker::reset() ...@@ -264,7 +264,7 @@ void LLDirPicker::reset()
{ {
} }
BOOL LLDirPicker::getDir(std::string* filename) BOOL LLDirPicker::getDir(std::string* filename, bool blocking)
{ {
return FALSE; return FALSE;
} }
...@@ -300,7 +300,7 @@ void LLDirPickerThread::run() ...@@ -300,7 +300,7 @@ void LLDirPickerThread::run()
LLDirPicker picker; LLDirPicker picker;
if (picker.getDir(mProposedName, blocking)) if (picker.getDir(&mProposedName, blocking))
{ {
mResponses.push_back(picker.getDirName()); mResponses.push_back(picker.getDirName());
} }
......
...@@ -60,7 +60,7 @@ public: ...@@ -60,7 +60,7 @@ public:
// calling this before main() is undefined // calling this before main() is undefined
static LLDirPicker& instance( void ) { return sInstance; } static LLDirPicker& instance( void ) { return sInstance; }
BOOL getDir(std::string filename, bool blocking = true); BOOL getDir(std::string* filename, bool blocking = true);
std::string getDirName(); std::string getDirName();
// clear any lists of buffers or whatever, and make sure the dir // clear any lists of buffers or whatever, and make sure the dir
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment