diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-11-14 22:32:54 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-11-14 22:32:54 -0500 |
| commit | 6b4916fc758ba1ab70cced59b8fb959e241b984a (patch) | |
| tree | 9b72b24291554abe87456776ebaaa56e6c3f8ad7 /indra/newview/llviewermenu.cpp | |
| parent | dbdbcbbd3cc3ba21b255f992fae291ab3f13edcf (diff) | |
| parent | cfb1779e26d1ab15acdbc9d2fc5982b84af56765 (diff) | |
merge up to tip of viewer-tools-update
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 38aaff9279..3abeba4b43 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 @@ -7216,7 +7216,7 @@ class LLAdvancedClickRenderProfile: public view_listener_t } }; -void gpu_benchmark(); +F32 gpu_benchmark(); class LLAdvancedClickRenderBenchmark: public view_listener_t { @@ -8287,7 +8287,7 @@ class LLWorldEnableEnvSettings : public view_listener_t } else { - llwarns << "Unknown item" << llendl; + LL_WARNS() << "Unknown time-of-day item: " << tod << LL_ENDL; } } return result; |