diff options
| author | Merov Linden <merov@lindenlab.com> | 2014-11-11 11:40:19 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2014-11-11 11:40:19 -0800 |
| commit | 4ea33a3b3cb7fa06cd3f84cbdc866cc8ad9bdefa (patch) | |
| tree | 753588ae96193cf376ec16f759bd12ea4407afdb /indra/newview/llviewermenu.cpp | |
| parent | b31f7381ae85a0aa6c4d9e93b1d8bac5854fdd01 (diff) | |
| parent | 2301cf800f40101baed7a5936683d0b1e4968be1 (diff) | |
Pull merge from lindenlanb/viewer-release
Diffstat (limited to 'indra/newview/llviewermenu.cpp')
| -rwxr-xr-x | indra/newview/llviewermenu.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 1daa74c68f..2fb1713062 100755 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -4,7 +4,7 @@ * * $LicenseInfo:firstyear=2002&license=viewerlgpl$ * Second Life Viewer Source Code - * Copyright (C) 2010, Linden Research, Inc. + * Copyright (C) 2014, Linden Research, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -7269,7 +7269,7 @@ class LLAdvancedClickRenderProfile: public view_listener_t } }; -void gpu_benchmark(); +F32 gpu_benchmark(); class LLAdvancedClickRenderBenchmark: public view_listener_t { @@ -8340,7 +8340,7 @@ class LLWorldEnableEnvSettings : public view_listener_t } else { - llwarns << "Unknown item" << llendl; + LL_WARNS() << "Unknown time-of-day item: " << tod << LL_ENDL; } } return result; |