summaryrefslogtreecommitdiff
path: root/indra/newview/llfloateruipreview.cpp
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2013-12-18 11:12:46 -0800
committerMerov Linden <merov@lindenlab.com>2013-12-18 11:12:46 -0800
commitbe80b11d3063cc1b394ed604901418ba421cd86c (patch)
tree629e196842cee05af4d67b27fcb2b4892acd1e6a /indra/newview/llfloateruipreview.cpp
parent798d62a467035e255ef172e0be1f707ba15f5d04 (diff)
Fix FFLOAD_ALL issue in file picker, add FFLOAD_EXE to fix exe picking on Mac Cocoa
Diffstat (limited to 'indra/newview/llfloateruipreview.cpp')
-rwxr-xr-xindra/newview/llfloateruipreview.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/indra/newview/llfloateruipreview.cpp b/indra/newview/llfloateruipreview.cpp
index 0106a1615d..44649e6ca8 100755
--- a/indra/newview/llfloateruipreview.cpp
+++ b/indra/newview/llfloateruipreview.cpp
@@ -1020,12 +1020,11 @@ void LLFloaterUIPreview::onClickEditFloater()
// Respond to button click to browse for an executable with which to edit XML files
void LLFloaterUIPreview::onClickBrowseForEditor()
{
- // create load dialog box
- LLFilePicker::ELoadFilter type = (LLFilePicker::ELoadFilter)((intptr_t)((void*)LLFilePicker::FFLOAD_ALL)); // nothing for *.exe so just use all
+ // Let the user choose an executable through the file picker dialog box
LLFilePicker& picker = LLFilePicker::instance();
- if (!picker.getOpenFile(type)) // user cancelled -- do nothing
+ if (!picker.getOpenFile(LLFilePicker::FFLOAD_EXE))
{
- return;
+ return; // user cancelled -- do nothing
}
// put the selected path into text field