diff options
| author | Christian Goetze <cg@lindenlab.com> | 2008-10-01 00:42:47 +0000 |
|---|---|---|
| committer | Christian Goetze <cg@lindenlab.com> | 2008-10-01 00:42:47 +0000 |
| commit | b069bb9e71d31495f3f1312529d19fdb83c1779e (patch) | |
| tree | cf7575a0025224c1f9b93a47a9879d9b280a5299 /indra/llmessage/llmessagetemplateparser.cpp | |
| parent | d725e5b24075b2171f8a5b263969991e9b475078 (diff) | |
svn merge -r96886:98039 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-24-Server --> release
Diffstat (limited to 'indra/llmessage/llmessagetemplateparser.cpp')
| -rw-r--r-- | indra/llmessage/llmessagetemplateparser.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/llmessage/llmessagetemplateparser.cpp b/indra/llmessage/llmessagetemplateparser.cpp index 50f216ed6f..86662c5342 100644 --- a/indra/llmessage/llmessagetemplateparser.cpp +++ b/indra/llmessage/llmessagetemplateparser.cpp @@ -525,6 +525,10 @@ LLMessageTemplate * LLTemplateParser::parseMessage(LLTemplateTokenizer & tokens) { templatep->setDeprecation(MD_UDPDEPRECATED); } + 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 |