diff options
| author | Merov Linden <merov@lindenlab.com> | 2013-12-18 11:12:46 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2013-12-18 11:12:46 -0800 |
| commit | be80b11d3063cc1b394ed604901418ba421cd86c (patch) | |
| tree | 629e196842cee05af4d67b27fcb2b4892acd1e6a /indra/newview/llfilepicker.cpp | |
| parent | 798d62a467035e255ef172e0be1f707ba15f5d04 (diff) | |
Fix FFLOAD_ALL issue in file picker, add FFLOAD_EXE to fix exe picking on Mac Cocoa
Diffstat (limited to 'indra/newview/llfilepicker.cpp')
| -rwxr-xr-x | indra/newview/llfilepicker.cpp | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/indra/newview/llfilepicker.cpp b/indra/newview/llfilepicker.cpp index 16eacc9392..f921dace84 100755 --- a/indra/newview/llfilepicker.cpp +++ b/indra/newview/llfilepicker.cpp @@ -167,7 +167,8 @@ BOOL LLFilePicker::setupFilter(ELoadFilter filter) BOOL res = TRUE; switch (filter) { - case FFLOAD_ALL: + case FFLOAD_ALL: + case FFLOAD_EXE: mOFN.lpstrFilter = L"All Files (*.*)\0*.*\0" \ SOUND_FILTER \ IMAGE_FILTER \ @@ -579,6 +580,10 @@ std::vector<std::string>* LLFilePicker::navOpenFilterProc(ELoadFilter filter) // allowedv->push_back("tpic"); allowedv->push_back("png"); break; + case FFLOAD_EXE: + allowedv->push_back("app"); + allowedv->push_back("exe"); + break; case FFLOAD_WAV: allowedv->push_back("wav"); break; @@ -777,9 +782,9 @@ BOOL LLFilePicker::getOpenFile(ELoadFilter filter, bool blocking) mPickOptions &= ~F_FILE; } - if(filter == FFLOAD_ALL) // allow application bundles etc. to be traversed; important for DEV-16869, but generally useful + if (filter == FFLOAD_ALL) // allow application bundles etc. to be traversed; important for DEV-16869, but generally useful { - mPickOptions &= F_NAV_SUPPORT; + mPickOptions |= F_NAV_SUPPORT; } if (blocking) |