Skip to content
Snippets Groups Projects
Commit 53efce5b authored by Oz Linden's avatar Oz Linden
Browse files

merge changes for storm-1186

parents 4ab5831b 3a82169e
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
indra/llmessage/lltemplatemessagereader.cpp
+ 1
− 1
View file @ 53efce5b
...@@ -795,7 +795,7 @@ const char* LLTemplateMessageReader::getMessageName() const ...@@ -795,7 +795,7 @@ const char* LLTemplateMessageReader::getMessageName() const
{ {
if (!mCurrentRMessageTemplate) if (!mCurrentRMessageTemplate)
{ {
llwarns << "no mCurrentRMessageTemplate" << llendl; // no message currently being read
return ""; return "";
} }
return mCurrentRMessageTemplate->mName; return mCurrentRMessageTemplate->mName;
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment