diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-05-12 10:35:05 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-05-12 10:35:05 -0400 |
| commit | e8810421252c6ff89d00b9a18fa6f118b4b5ac64 (patch) | |
| tree | 0fa3705b3d2d4284c0caa02d198a028fedbbdadc /indra/newview/llappviewerlinux.cpp | |
| parent | 6fcf9e4817a5c245f7779dd030b0ba75dab10e5e (diff) | |
| parent | e213a36f703629dcfe27ed65ac1f66a5a5194b67 (diff) | |
merge changes for storm-477
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() && |