summaryrefslogtreecommitdiff
path: root/indra/newview/llfilepicker.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/llfilepicker.cpp')
-rw-r--r--indra/newview/llfilepicker.cpp13
1 files changed, 7 insertions, 6 deletions
diff --git a/indra/newview/llfilepicker.cpp b/indra/newview/llfilepicker.cpp
index 8dfb333530..6a502e8d8c 100644
--- a/indra/newview/llfilepicker.cpp
+++ b/indra/newview/llfilepicker.cpp
@@ -70,7 +70,7 @@ LLFilePicker LLFilePicker::sInstance;
//
LLFilePicker::LLFilePicker()
: mCurrentFile(0),
- mLocked(FALSE)
+ mLocked(false)
{
reset();
@@ -94,6 +94,7 @@ LLFilePicker::LLFilePicker()
mOFN.lCustData = 0L;
mOFN.lpfnHook = NULL;
mOFN.lpTemplateName = NULL;
+ mFilesW[0] = '\0';
#endif
#if LL_DARWIN
@@ -122,7 +123,7 @@ const std::string LLFilePicker::getNextFile()
{
if (mCurrentFile >= getFileCount())
{
- mLocked = FALSE;
+ mLocked = false;
return std::string();
}
else
@@ -135,7 +136,7 @@ const std::string LLFilePicker::getCurFile()
{
if (mCurrentFile >= getFileCount())
{
- mLocked = FALSE;
+ mLocked = false;
return std::string();
}
else
@@ -146,7 +147,7 @@ const std::string LLFilePicker::getCurFile()
void LLFilePicker::reset()
{
- mLocked = FALSE;
+ mLocked = false;
mFiles.clear();
mCurrentFile = 0;
}
@@ -286,7 +287,7 @@ BOOL LLFilePicker::getMultipleOpenFiles(ELoadFilter filter)
}
else
{
- mLocked = TRUE;
+ mLocked = true;
WCHAR* tptrw = mFilesW;
std::string dirname;
while(1)
@@ -885,7 +886,7 @@ BOOL LLFilePicker::getMultipleOpenFiles(ELoadFilter filter)
if (getFileCount())
success = true;
if (getFileCount() > 1)
- mLocked = TRUE;
+ mLocked = true;
}
// Account for the fact that the app has been stalled.