diff options
| author | Melinda Green <melinda@lindenlab.com> | 2008-12-15 21:21:19 +0000 |
|---|---|---|
| committer | Melinda Green <melinda@lindenlab.com> | 2008-12-15 21:21:19 +0000 |
| commit | e1d8dac25a93db837c780428a23f81cbf9109270 (patch) | |
| tree | a0bcaec0cec1ba6b3ce813764650eada61fcde4f /indra/newview/llfilepicker.cpp | |
| parent | 9c0dbb123376608e464fcd8d1a2e288e01d78a3f (diff) | |
svn merge -r105329:105903 svn+ssh://svn/svn/linden/branches/featurettes/featurettes-batch4-merge
Resolving QAR-1051 Merge featurettes batch #4
Diffstat (limited to 'indra/newview/llfilepicker.cpp')
| -rw-r--r-- | indra/newview/llfilepicker.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/indra/newview/llfilepicker.cpp b/indra/newview/llfilepicker.cpp index 7ac50d7610..91f88277a4 100644 --- a/indra/newview/llfilepicker.cpp +++ b/indra/newview/llfilepicker.cpp @@ -115,7 +115,7 @@ const std::string LLFilePicker::getFirstFile() const std::string LLFilePicker::getNextFile() { - if (mCurrentFile >= (S32)mFiles.size()) + if (mCurrentFile >= getFileCount()) { mLocked = FALSE; return std::string(); @@ -128,7 +128,7 @@ const std::string LLFilePicker::getNextFile() const std::string LLFilePicker::getCurFile() { - if (mCurrentFile >= (S32)mFiles.size()) + if (mCurrentFile >= getFileCount()) { mLocked = FALSE; return std::string(); @@ -824,7 +824,7 @@ BOOL LLFilePicker::getOpenFile(ELoadFilter filter) send_agent_resume(); if (error == noErr) { - if (mFiles.size()) + if (getFileCount()) success = true; } @@ -853,9 +853,9 @@ BOOL LLFilePicker::getMultipleOpenFiles(ELoadFilter filter) send_agent_resume(); if (error == noErr) { - if (mFiles.size()) + if (getFileCount()) success = true; - if (mFiles.size() > 1) + if (getFileCount() > 1) mLocked = TRUE; } @@ -883,7 +883,7 @@ BOOL LLFilePicker::getSaveFile(ESaveFilter filter, const std::string& filename) send_agent_resume(); if (error == noErr) { - if (mFiles.size()) + if (getFileCount()) success = true; } @@ -1147,7 +1147,7 @@ BOOL LLFilePicker::getSaveFile( ESaveFilter filter, const std::string& filename gtk_widget_show_all(GTK_WIDGET(picker)); gtk_main(); - rtn = (mFiles.size() == 1); + rtn = (getFileCount() == 1); } gViewerWindow->mWindow->afterDialog(); @@ -1191,7 +1191,7 @@ BOOL LLFilePicker::getOpenFile( ELoadFilter filter ) gtk_widget_show_all(GTK_WIDGET(picker)); gtk_main(); - rtn = (mFiles.size() == 1); + rtn = (getFileCount() == 1); } gViewerWindow->mWindow->afterDialog(); |