diff options
| author | Mark Palange <palange@lindenlab.com> | 2008-10-08 00:22:32 +0000 |
|---|---|---|
| committer | Mark Palange <palange@lindenlab.com> | 2008-10-08 00:22:32 +0000 |
| commit | b807e3df990e6fad25cd0bca94d2959dac042b13 (patch) | |
| tree | aa8b185cac406abe412d76d90a903b450191d84d /indra/llmessage/llmessagetemplateparser.cpp | |
| parent | 4296542cd062af425d7744c88d6dd2bd00daf532 (diff) | |
merge r97380-98701 branches/viewer/viewer_1-21 (Viewer RC5 and security fixes) merge to trunk (for real)
Diffstat (limited to 'indra/llmessage/llmessagetemplateparser.cpp')
| -rw-r--r-- | indra/llmessage/llmessagetemplateparser.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llmessage/llmessagetemplateparser.cpp b/indra/llmessage/llmessagetemplateparser.cpp index 86662c5342..750c6a0180 100644 --- a/indra/llmessage/llmessagetemplateparser.cpp +++ b/indra/llmessage/llmessagetemplateparser.cpp @@ -528,7 +528,7 @@ LLMessageTemplate * LLTemplateParser::parseMessage(LLTemplateTokenizer & tokens) else if (tokens.want("UDPBlackListed")) { templatep->setDeprecation(MD_UDPBLACKLISTED); - } + } else if (tokens.want("NotDeprecated")) { // this is the default value, but it can't hurt to set it twice |