diff options
| author | Anchor <none@none> | 2019-05-10 12:22:29 -0600 |
|---|---|---|
| committer | Anchor <none@none> | 2019-05-10 12:22:29 -0600 |
| commit | 504a138cb147f6a01573c7c6453a411c330e5f73 (patch) | |
| tree | 5a89d6ff115263c9e0764f94122a86dee099b718 /indra/newview/llfilepicker.cpp | |
| parent | f9f129f93d8eab94e58ff2229a13d68bee23f959 (diff) | |
| parent | 34322f8f37380df868703051230f2a4109602b3f (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 } |