diff options
| author | Merov Linden <merov@lindenlab.com> | 2011-01-12 12:07:03 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2011-01-12 12:07:03 -0800 |
| commit | 038b38c446f18f60916b5c859eea0711f0b420d0 (patch) | |
| tree | b1da90c24a8268dc659979eaee84c63bdc7777f5 /indra/newview/llappviewerlinux.cpp | |
| parent | c020c5c0f3454d4930078651f446e5494d6137b6 (diff) | |
| parent | 4af9db7b79f5721d1be6b8b94dd1e0ce97782d79 (diff) | |
STORM-477 : pull in 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() && |