diff options
author | Dave SIMmONs <simon@lindenlab.com> | 2010-11-19 13:22:07 -0800 |
---|---|---|
committer | Dave SIMmONs <simon@lindenlab.com> | 2010-11-19 13:22:07 -0800 |
commit | 2eec4949cc49f3c59cdc278be0e7eed1e092b167 (patch) | |
tree | c46a24bf021dccd724ba199bcf48a9b9b6ff0aca /indra/newview/llappviewerlinux.cpp | |
parent | 9053aa7d1cb53445f7c7e8d929e3850807b52228 (diff) | |
parent | 1139584b026db86fd20364d0eb21b6e2351f8fb1 (diff) |
Merge latest from lindenlab/viewer-development
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() && |