diff options
| author | Don Kjer <don@lindenlab.com> | 2011-01-28 18:05:10 -0800 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2011-01-28 18:05:10 -0800 |
| commit | f2a1f0df3a3c8ce18179ea06992f5e5d07f2f773 (patch) | |
| tree | cd571814ec2e9d11ef05f8107e068ca6702df2a6 /indra/newview/lllogchat.cpp | |
| parent | 4a083db6c52d2cc5c1cd1f908270f5952ace6505 (diff) | |
| parent | b4b3f78c455a614d7738c29cdc6383e857d6028d (diff) | |
Merge from viewer-development
Diffstat (limited to 'indra/newview/lllogchat.cpp')
| -rw-r--r-- | indra/newview/lllogchat.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/indra/newview/lllogchat.cpp b/indra/newview/lllogchat.cpp index b09cfbe907..9adf374c71 100644 --- a/indra/newview/lllogchat.cpp +++ b/indra/newview/lllogchat.cpp @@ -32,7 +32,6 @@ #include "lltrans.h" #include "llviewercontrol.h" -#include "lldiriterator.h" #include "llinstantmessage.h" #include "llsingleton.h" // for LLSingleton @@ -602,8 +601,7 @@ std::string LLLogChat::oldLogFileName(std::string filename) //LL_INFOS("") << "Checking:" << directory << " for " << pattern << LL_ENDL;/* uncomment if you want to verify step, delete on commit */ std::vector<std::string> allfiles; - LLDirIterator iter(directory, pattern); - while (iter.next(scanResult)) + while (gDirUtilp->getNextFileInDir(directory, pattern, scanResult)) { //LL_INFOS("") << "Found :" << scanResult << LL_ENDL; allfiles.push_back(scanResult); |