diff options
| author | Oz Linden <oz@lindenlab.com> | 2010-11-09 15:18:51 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2010-11-09 15:18:51 -0500 |
| commit | eea9460ba5e18b081723a56d1d7d0bbf1f4edd85 (patch) | |
| tree | 064c76d04bd762387da065a6662972e8129f509a /indra/newview/llappviewerlinux.cpp | |
| parent | b657516f72f016a918e0ff627105dd380a94394c (diff) | |
| parent | 669cf170ceae2609202fb948d388b7492f8eb90a (diff) | |
merge storm-102 branch back to default
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() && |