diff options
| author | Cho <cho@lindenlab.com> | 2014-06-26 19:31:55 +0100 |
|---|---|---|
| committer | Cho <cho@lindenlab.com> | 2014-06-26 19:31:55 +0100 |
| commit | 8ab5a25b12cb059c7408721ff5cf9556b47fb94a (patch) | |
| tree | e6a7a556e9cd88856c7fc44fd0dd8db9f4c8941b /indra/newview/llfilepicker.cpp | |
| parent | 9b6598388a5fa085d89b77b57f0b361d53a680cb (diff) | |
| parent | c7057ef56efc1cca5683ca22e2ad410198d131e8 (diff) | |
merge
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; } |