diff options
| author | dolphin <dolphin@lindenlab.com> | 2014-11-06 16:27:14 -0800 |
|---|---|---|
| committer | dolphin <dolphin@lindenlab.com> | 2014-11-06 16:27:14 -0800 |
| commit | fb9e603e3498ec56a65e858c68347d218421afbc (patch) | |
| tree | a4fdb476d62c44de666c09fb30e149fa5db49777 /indra/newview/llviewermenu.cpp | |
| parent | c2a516aee1f8c1e26124a77f62962944137ef960 (diff) | |
| parent | 02e2235277a90f2e291557a429ae4e5de3e0d3b6 (diff) | |
Merge with 3.7.19-release
Diffstat (limited to 'indra/newview/llviewermenu.cpp')
| -rwxr-xr-x | indra/newview/llviewermenu.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 38aaff9279..faf929d8f9 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 @@ -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; |