summaryrefslogtreecommitdiff
path: root/indra/llmessage/lltemplatemessagereader.cpp
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2011-08-10 17:53:11 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2011-08-10 17:53:11 -0400
commit6732f5fbca2dc83ec1cf6fcb31b5a6657e8d040f (patch)
tree48165a2aa3aed2133d1d79742e3d64cce3ca2b01 /indra/llmessage/lltemplatemessagereader.cpp
parent20c3d8485480487d38500c9b18846ca96d1d6f83 (diff)
parentc7b6a25728cd360348d1c3da5ace0971767206a4 (diff)
merge viewer-development to mesh-development
Diffstat (limited to 'indra/llmessage/lltemplatemessagereader.cpp')
-rw-r--r--indra/llmessage/lltemplatemessagereader.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llmessage/lltemplatemessagereader.cpp b/indra/llmessage/lltemplatemessagereader.cpp
index f470e1b2a5..ab91f74abe 100644
--- a/indra/llmessage/lltemplatemessagereader.cpp
+++ b/indra/llmessage/lltemplatemessagereader.cpp
@@ -795,7 +795,7 @@ const char* LLTemplateMessageReader::getMessageName() const
{
if (!mCurrentRMessageTemplate)
{
- llwarns << "no mCurrentRMessageTemplate" << llendl;
+ // no message currently being read
return "";
}
return mCurrentRMessageTemplate->mName;