diff options
| author | Seth ProductEngine <slitovchuk@productengine.com> | 2011-05-11 18:12:23 +0300 |
|---|---|---|
| committer | Seth ProductEngine <slitovchuk@productengine.com> | 2011-05-11 18:12:23 +0300 |
| commit | e213a36f703629dcfe27ed65ac1f66a5a5194b67 (patch) | |
| tree | 59a27b2c3552eb42139da0d2a45e4a9dde718f78 /indra/newview/llappviewerlinux.cpp | |
| parent | 662bc0803cc9306062a0106467fd8b83290b4bcf (diff) | |
STORM-477 Restored the backed out changeset: b62b260aa04d
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 523c2e3adf..714e0e6163 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() && |