diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-10-28 10:01:40 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-10-28 10:01:40 -0400 |
| commit | cd0774a2174a5f5ef4871473afd175778db60980 (patch) | |
| tree | cf664f37d824005bd768a0ce9d02a45d246bd8f0 /indra/newview/llviewermenu.cpp | |
| parent | 286ed4a4c2b9a0333970f4a067be751f1703b218 (diff) | |
| parent | 02e2235277a90f2e291557a429ae4e5de3e0d3b6 (diff) | |
merge changes for 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 cd1857339c..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 @@ -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; |