diff options
author | Richard Linden <none@none> | 2013-11-11 19:17:49 -0800 |
---|---|---|
committer | Richard Linden <none@none> | 2013-11-11 19:17:49 -0800 |
commit | 17e9c872ada0cd1d3bf5c16887ee7f220f3a10c7 (patch) | |
tree | 93f36acc00695d7b4ee2e43d08ce790358966f38 /indra/newview/llworldmapmessage.cpp | |
parent | ebc9bcbf69f7a519677a6522979a6bf6cbb04bb8 (diff) | |
parent | 1983f52ce5211c02a55f5cabd86962eea3a22084 (diff) |
Automated merge with http://bitbucket.org/lindenlab/viewer-release
Diffstat (limited to 'indra/newview/llworldmapmessage.cpp')
-rwxr-xr-x | indra/newview/llworldmapmessage.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llworldmapmessage.cpp b/indra/newview/llworldmapmessage.cpp index 8307d32336..865292fa90 100755 --- a/indra/newview/llworldmapmessage.cpp +++ b/indra/newview/llworldmapmessage.cpp @@ -156,7 +156,7 @@ void LLWorldMapMessage::processMapBlockReply(LLMessageSystem* msg, void**) // There's only one flag that we ever use here if (agent_flags != LAYER_FLAG) { - llwarns << "Invalid map image type returned! layer = " << agent_flags << llendl; + LL_WARNS() << "Invalid map image type returned! layer = " << agent_flags << LL_ENDL; return; } |