From b807e3df990e6fad25cd0bca94d2959dac042b13 Mon Sep 17 00:00:00 2001 From: Mark Palange Date: Wed, 8 Oct 2008 00:22:32 +0000 Subject: merge r97380-98701 branches/viewer/viewer_1-21 (Viewer RC5 and security fixes) merge to trunk (for real) --- indra/llmessage/llmessagetemplateparser.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/llmessage/llmessagetemplateparser.cpp') 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 -- cgit v1.2.3