diff options
Diffstat (limited to 'indra/newview/lldirpicker.cpp')
| -rw-r--r-- | indra/newview/lldirpicker.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/lldirpicker.cpp b/indra/newview/lldirpicker.cpp index 0799d90ce8..032433434d 100644 --- a/indra/newview/lldirpicker.cpp +++ b/indra/newview/lldirpicker.cpp @@ -124,6 +124,8 @@ bool LLDirPicker::getDir(std::string* filename, bool blocking) { windowHandle = nfdwindowhandle_t(); } +#elif LL_WINDOWS + windowHandle = { NFD_WINDOW_HANDLE_TYPE_WINDOWS, gViewerWindow->getWindow()->getPlatformWindow() }; #endif // show the dialog @@ -379,7 +381,7 @@ std::queue<LLDirPickerThread*> LLDirPickerThread::sDeadQ; void LLDirPickerThread::getFile() { -#if (LL_WINDOWS && !LL_NFD) || (LL_LINUX && LL_NFD) +#if LL_WINDOWS || (LL_NFD && !LL_DARWIN) start(); #else run(); @@ -389,7 +391,7 @@ void LLDirPickerThread::getFile() //virtual void LLDirPickerThread::run() { -#if (LL_WINDOWS && !LL_NFD) || (LL_LINUX && LL_NFD) +#if LL_WINDOWS || (LL_NFD && !LL_DARWIN) bool blocking = false; #else bool blocking = true; // modal |