diff options
| author | Don Kjer <don@lindenlab.com> | 2011-01-12 19:00:36 -0800 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2011-01-12 19:00:36 -0800 |
| commit | 756a4e26da6cec82d48a71d05b1f43623b56313d (patch) | |
| tree | 4dfa615e17c7941114679643e1aa5a2875583f29 /indra/newview/llappviewerlinux.cpp | |
| parent | d8b4363c1d3f60741422419b386b79df23a6da6a (diff) | |
| parent | 55322713fc071a3e171fd4cfbea989945dc8d084 (diff) | |
Merge with viewer-development
Diffstat (limited to 'indra/newview/llappviewerlinux.cpp')
| -rw-r--r-- | indra/newview/llappviewerlinux.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llappviewerlinux.cpp b/indra/newview/llappviewerlinux.cpp index 898cc1c0ba..fc7a27e5e0 100644 --- a/indra/newview/llappviewerlinux.cpp +++ b/indra/newview/llappviewerlinux.cpp @@ -30,6 +30,7 @@ #include "llcommandlineparser.h" +#include "lldiriterator.h" #include "llmemtype.h" #include "llurldispatcher.h" // SLURL from other app instance #include "llviewernetwork.h" @@ -504,7 +505,9 @@ std::string LLAppViewerLinux::generateSerialNumber() // trawl /dev/disk/by-uuid looking for a good-looking UUID to grab std::string this_name; - while (gDirUtilp->getNextFileInDir(uuiddir, "*", this_name)) + + LLDirIterator iter(uuiddir, "*"); + while (iter.next(this_name)) { if (this_name.length() > best.length() || (this_name.length() == best.length() && |