diff options
| author | Erik Kundiman <erik@megapahit.org> | 2024-11-11 18:57:13 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2024-11-12 12:32:01 +0800 |
| commit | 6530f56b97f57cb7d80bb916a2b15af0b7f6c425 (patch) | |
| tree | 024f7870252fe309ebdef3fbd4f2a34f1e9bc5ee /indra/newview/llviewermenufile.cpp | |
| parent | 5704c81c1b6dc1da7ec3cfb5ee3979d0fc1db86d (diff) | |
| parent | 814d6d43f0720bda2e74a0ecedb560ad8fcf10a9 (diff) | |
Merge remote-tracking branch 'secondlife/release/maint-c' into maint-c
Diffstat (limited to 'indra/newview/llviewermenufile.cpp')
| -rw-r--r-- | indra/newview/llviewermenufile.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llviewermenufile.cpp b/indra/newview/llviewermenufile.cpp index 02667a3ff6..51f555b778 100644 --- a/indra/newview/llviewermenufile.cpp +++ b/indra/newview/llviewermenufile.cpp @@ -137,10 +137,10 @@ std::queue<LLFilePickerThread*> LLFilePickerThread::sDeadQ; void LLFilePickerThread::getFile() { -#if LL_WINDOWS +#if LL_WINDOWS || (LL_NFD && !LL_DARWIN) // Todo: get rid of LLFilePickerThread and make this modeless start(); -#elif LL_DARWIN +#elif LL_DARWIN && !LL_NFD runModeless(); #else run(); @@ -150,7 +150,7 @@ void LLFilePickerThread::getFile() //virtual void LLFilePickerThread::run() { -#if LL_WINDOWS +#if LL_WINDOWS || (LL_NFD && !LL_DARWIN) bool blocking = false; #else bool blocking = true; // modal |