diff options
| author | Loren Shih <seraph@lindenlab.com> | 2011-01-14 14:16:07 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2011-01-14 14:16:07 -0500 |
| commit | d82da834fa4026f2912406e9d39196ec7287f785 (patch) | |
| tree | 173094ca3fc90abbea3686d274c8a2dcb7adabd6 /indra/newview/llappviewerlinux.cpp | |
| parent | 584c7ecb4ed02e9ab039c6254ffc33331c31058c (diff) | |
| parent | 939e8d8f74687e7cb857c55bb6a8082226f1202b (diff) | |
Automated merge up 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() && |