merge changes for storm-1186

meow-7.2.2
Oz Linden 2011-08-09 10:18:43 -04:00
commit 53efce5b5a
1 changed files with 1 additions and 1 deletions

View File

@ -795,7 +795,7 @@ const char* LLTemplateMessageReader::getMessageName() const
{
if (!mCurrentRMessageTemplate)
{
llwarns << "no mCurrentRMessageTemplate" << llendl;
// no message currently being read
return "";
}
return mCurrentRMessageTemplate->mName;