diff options
| author | Oz Linden <oz@lindenlab.com> | 2010-11-15 07:34:30 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2010-11-15 07:34:30 -0500 |
| commit | a9eb639511a09dc072e67e10d8885a0b4f7587da (patch) | |
| tree | 59403ee97fe873b3a6db42c9d6b3676c72b481f7 /indra/newview/llappviewerlinux.cpp | |
| parent | b2fcba25c8dd04318420af30f877b0984a524055 (diff) | |
| parent | e08250d0874247c7c2c0acb025602e4299244d83 (diff) | |
Automated merge with https://bitbucket.org/vadim_productengine/storm-52
Diffstat (limited to 'indra/newview/llappviewerlinux.cpp')
| -rw-r--r-- | indra/newview/llappviewerlinux.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llappviewerlinux.cpp b/indra/newview/llappviewerlinux.cpp index 7629265730..898cc1c0ba 100644 --- a/indra/newview/llappviewerlinux.cpp +++ b/indra/newview/llappviewerlinux.cpp @@ -504,8 +504,7 @@ std::string LLAppViewerLinux::generateSerialNumber() // trawl /dev/disk/by-uuid looking for a good-looking UUID to grab std::string this_name; - BOOL wrap = FALSE; - while (gDirUtilp->getNextFileInDir(uuiddir, "*", this_name, wrap)) + while (gDirUtilp->getNextFileInDir(uuiddir, "*", this_name)) { if (this_name.length() > best.length() || (this_name.length() == best.length() && |