diff options
author | Dave Parks <davep@lindenlab.com> | 2010-12-02 21:34:01 -0600 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2010-12-02 21:34:01 -0600 |
commit | 98802a1ef99b7e5fb586dc259118fd58dc34631a (patch) | |
tree | 51e183db55f7c3dfbc60bcc4ab09e700d8f7f51a /indra/newview/llappviewerlinux.cpp | |
parent | 0be7fcf2a95a6d885bbef583966757d12fc9d18c (diff) | |
parent | 680328dd78e1d31a2f8836919a0f6140a76af5f4 (diff) |
Merge
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() && |