diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-08-09 10:18:43 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-08-09 10:18:43 -0400 |
| commit | 53efce5b5a430223dba310a77b430fa2c677ad95 (patch) | |
| tree | 3a350831594ae7b91ac17b5b5e6f5bdb60865fe3 /indra/llmessage | |
| parent | 4ab5831b3eed23c06d2ccd3cf55f6c018613c788 (diff) | |
| parent | 3a82169e2e985f1275426eab73683d973dccca29 (diff) | |
merge changes for storm-1186
Diffstat (limited to 'indra/llmessage')
| -rw-r--r-- | indra/llmessage/lltemplatemessagereader.cpp | 2 |
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; |