diff options
| author | Oz Linden <oz@lindenlab.com> | 2010-11-12 14:15:21 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2010-11-12 14:15:21 -0500 |
| commit | 4839e79b20679560f697af96c11db4aef7e1d740 (patch) | |
| tree | ea5faa6268fbe23de23ee03ee43d367181fba5c9 /indra/newview/llappviewerlinux.cpp | |
| parent | 5b86f60a13f28f5978ff3a53371cb3bae7f0d837 (diff) | |
| parent | 2632565bbced3002eb9912270b1f7303c48a0b44 (diff) | |
merge STORM-102 to latest viewer-development prior to pull
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() && |