diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2019-08-21 21:51:56 +0100 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2019-08-21 21:51:56 +0100 |
| commit | 63f82fc44b721b0ec437845d41b5a2055a44be68 (patch) | |
| tree | 3d3caee52df32234073c0e2da18b9f7eed7722d3 /indra/newview/llfilepicker.cpp | |
| parent | 755b396045fd464dd2d7fc10239bf775cc54d074 (diff) | |
| parent | e9ead7cc2ee9970b468ef6de0ba57726bb203ef4 (diff) | |
merge
Diffstat (limited to 'indra/newview/llfilepicker.cpp')
| -rw-r--r-- | indra/newview/llfilepicker.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llfilepicker.cpp b/indra/newview/llfilepicker.cpp index 0f22b6200f..b6fd70452e 100644 --- a/indra/newview/llfilepicker.cpp +++ b/indra/newview/llfilepicker.cpp @@ -101,6 +101,8 @@ LLFilePicker::LLFilePicker() mOFN.lpfnHook = NULL; mOFN.lpTemplateName = NULL; mFilesW[0] = '\0'; +#elif LL_DARWIN + mPickOptions = 0; #endif } |