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/llappviewerlinux.cpp | |
parent | 4a083db6c52d2cc5c1cd1f908270f5952ace6505 (diff) | |
parent | b4b3f78c455a614d7738c29cdc6383e857d6028d (diff) |
Merge from viewer-development
Diffstat (limited to 'indra/newview/llappviewerlinux.cpp')
-rw-r--r-- | indra/newview/llappviewerlinux.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/indra/newview/llappviewerlinux.cpp b/indra/newview/llappviewerlinux.cpp index fc7a27e5e0..898cc1c0ba 100644 --- a/indra/newview/llappviewerlinux.cpp +++ b/indra/newview/llappviewerlinux.cpp @@ -30,7 +30,6 @@ #include "llcommandlineparser.h" -#include "lldiriterator.h" #include "llmemtype.h" #include "llurldispatcher.h" // SLURL from other app instance #include "llviewernetwork.h" @@ -505,9 +504,7 @@ std::string LLAppViewerLinux::generateSerialNumber() // trawl /dev/disk/by-uuid looking for a good-looking UUID to grab std::string this_name; - - LLDirIterator iter(uuiddir, "*"); - while (iter.next(this_name)) + while (gDirUtilp->getNextFileInDir(uuiddir, "*", this_name)) { if (this_name.length() > best.length() || (this_name.length() == best.length() && |