diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2011-02-23 10:44:59 -0700 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2011-02-23 10:44:59 -0700 |
| commit | 01cdeb0cdd8c48b76a229d42ced4e5563cd18c5c (patch) | |
| tree | e7b7ca976f17c8af3c8a2648a801030594e94c8c /indra/newview/llappviewerlinux.cpp | |
| parent | 7daa3d1ca10199468946feef0ce8eb67489deee0 (diff) | |
| parent | ff5e3f5c2e566f3a8e86efaa763f7b12e07eeb53 (diff) | |
Merge from 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() && |