diff options
| author | CG Linden <cg@lindenlab.com> | 2010-01-29 16:29:12 -0800 |
|---|---|---|
| committer | CG Linden <cg@lindenlab.com> | 2010-01-29 16:29:12 -0800 |
| commit | f6a59081a7959e21f952a93bc3809315f2fa361e (patch) | |
| tree | d77373c86810e505892cfb483001fe535201db46 /indra/newview/llfilepicker.cpp | |
| parent | b8856efd5ff0e4899bb369dfd0815e824cd3a432 (diff) | |
| parent | 682f8afcc073b62fed64a3fd2adc5f65793e1f3e (diff) | |
Merge in latest viewer-2-0 changes.
Diffstat (limited to 'indra/newview/llfilepicker.cpp')
| -rw-r--r-- | indra/newview/llfilepicker.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/indra/newview/llfilepicker.cpp b/indra/newview/llfilepicker.cpp index 028e1cc098..2873057c19 100644 --- a/indra/newview/llfilepicker.cpp +++ b/indra/newview/llfilepicker.cpp @@ -68,7 +68,7 @@ LLFilePicker LLFilePicker::sInstance; // LLFilePicker::LLFilePicker() : mCurrentFile(0), - mLocked(FALSE) + mLocked(false) { reset(); @@ -92,6 +92,7 @@ LLFilePicker::LLFilePicker() mOFN.lCustData = 0L; mOFN.lpfnHook = NULL; mOFN.lpTemplateName = NULL; + mFilesW[0] = '\0'; #endif #if LL_DARWIN @@ -120,7 +121,7 @@ const std::string LLFilePicker::getNextFile() { if (mCurrentFile >= getFileCount()) { - mLocked = FALSE; + mLocked = false; return std::string(); } else @@ -133,7 +134,7 @@ const std::string LLFilePicker::getCurFile() { if (mCurrentFile >= getFileCount()) { - mLocked = FALSE; + mLocked = false; return std::string(); } else @@ -144,7 +145,7 @@ const std::string LLFilePicker::getCurFile() void LLFilePicker::reset() { - mLocked = FALSE; + mLocked = false; mFiles.clear(); mCurrentFile = 0; } @@ -276,7 +277,7 @@ BOOL LLFilePicker::getMultipleOpenFiles(ELoadFilter filter) } else { - mLocked = TRUE; + mLocked = true; WCHAR* tptrw = mFilesW; std::string dirname; while(1) @@ -866,7 +867,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. |