diff options
| author | Merov Linden <merov@lindenlab.com> | 2011-01-13 11:15:47 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2011-01-13 11:15:47 -0800 |
| commit | 804495ad41cbd0eb511c02d5306fc3b8f9be0b89 (patch) | |
| tree | a4b1f3995878302a9f62dc25e7cdbb2d53f8c3a3 /indra/newview/llappviewerlinux.cpp | |
| parent | 55322713fc071a3e171fd4cfbea989945dc8d084 (diff) | |
STORM-477 : backout changeset 6f5cb303d3e2
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() && |