diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-06-23 14:03:12 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-06-23 14:03:12 -0400 |
| commit | 498a0e36e560ca243286c4efeeecc1d11ac82235 (patch) | |
| tree | e7613db3983170a2bc2a204603ee200826feb6c4 /indra/newview/llfilepicker.cpp | |
| parent | 8d2e0fb3a047e349b88db80afa09fc97a7f4ff74 (diff) | |
| parent | c7057ef56efc1cca5683ca22e2ad410198d131e8 (diff) | |
merge changes for 3.7.10-release
Diffstat (limited to 'indra/newview/llfilepicker.cpp')
| -rwxr-xr-x | indra/newview/llfilepicker.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/indra/newview/llfilepicker.cpp b/indra/newview/llfilepicker.cpp index a7f5cd9dac..5debf71744 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 \ @@ -580,6 +581,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; @@ -778,7 +783,7 @@ 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; } |