From d584d58e13ced5ec18de23fb12f5956a6ae022cf Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Tue, 19 Jun 2018 13:50:22 +0300
Subject: [PATCH] mac build fixes
---
indra/newview/lldirpicker.cpp | 24 ++++++++++++------------
indra/newview/lldirpicker.h | 2 +-
2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/indra/newview/lldirpicker.cpp b/indra/newview/lldirpicker.cpp
index 768b1c20219..5443afe60c1 100644
--- a/indra/newview/lldirpicker.cpp
+++ b/indra/newview/lldirpicker.cpp
@@ -77,13 +77,13 @@ LLDirPicker::LLDirPicker() :
mFileName(NULL),
mLocked(false)
{
- bi.hwndOwner = NULL;
- bi.pidlRoot = NULL;
- bi.pszDisplayName = NULL;
- bi.lpszTitle = NULL;
- bi.ulFlags = BIF_USENEWUI;
- bi.lpfn = NULL;
- bi.lParam = NULL;
+ bi.hwndOwner = NULL;
+ bi.pidlRoot = NULL;
+ bi.pszDisplayName = NULL;
+ bi.lpszTitle = NULL;
+ bi.ulFlags = BIF_USENEWUI;
+ bi.lpfn = NULL;
+ bi.lParam = NULL;
bi.iImage = 0;
}
@@ -92,7 +92,7 @@ LLDirPicker::~LLDirPicker()
// nothing
}
-BOOL LLDirPicker::getDir(std::string filename, bool blocking)
+BOOL LLDirPicker::getDir(std::string* filename, bool blocking)
{
if( mLocked )
{
@@ -175,7 +175,7 @@ void LLDirPicker::reset()
//static
-BOOL LLDirPicker::getDir(std::string* filename)
+BOOL LLDirPicker::getDir(std::string* filename, bool blocking)
{
LLFilePicker::ELoadFilter filter=LLFilePicker::FFLOAD_DIRECTORY;
@@ -209,7 +209,7 @@ void LLDirPicker::reset()
mFilePicker->reset();
}
-BOOL LLDirPicker::getDir(std::string* filename)
+BOOL LLDirPicker::getDir(std::string* filename, bool blocking)
{
reset();
@@ -264,7 +264,7 @@ void LLDirPicker::reset()
{
}
-BOOL LLDirPicker::getDir(std::string* filename)
+BOOL LLDirPicker::getDir(std::string* filename, bool blocking)
{
return FALSE;
}
@@ -300,7 +300,7 @@ void LLDirPickerThread::run()
LLDirPicker picker;
- if (picker.getDir(mProposedName, blocking))
+ if (picker.getDir(&mProposedName, blocking))
{
mResponses.push_back(picker.getDirName());
}
diff --git a/indra/newview/lldirpicker.h b/indra/newview/lldirpicker.h
index c1087c70acf..c7dba12130b 100644
--- a/indra/newview/lldirpicker.h
+++ b/indra/newview/lldirpicker.h
@@ -60,7 +60,7 @@ class LLDirPicker
// calling this before main() is undefined
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();
// clear any lists of buffers or whatever, and make sure the dir
--
GitLab