livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CID-399 

Checker: UNINIT_CTOR
Function: LLFilePicker::LLFilePicker()
File: /indra/newview/llfilepicker.cpp
meow-7.2.2
Tofu Linden 2010-01-26 17:35:25 -08:00
parent 03dbeb6f4d
commit 7ed71ecf71
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
indra/newview/llfilepicker.cpp
View File

@ -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.

3
indra/newview/llfilepicker.h
View File

@ -176,8 +176,7 @@ private:
std::vector<std::string> mFiles;
S32 mCurrentFile;
BOOL mLocked;
BOOL mMultiFile;
bool mLocked;
static LLFilePicker sInstance;