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/lltemplatemessagereader.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/lltemplatemessagereader.cpp')
| -rw-r--r-- | indra/llmessage/lltemplatemessagereader.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/llmessage/lltemplatemessagereader.cpp b/indra/llmessage/lltemplatemessagereader.cpp index 822051d363..5016665343 100644 --- a/indra/llmessage/lltemplatemessagereader.cpp +++ b/indra/llmessage/lltemplatemessagereader.cpp @@ -791,7 +791,6 @@ bool LLTemplateMessageReader::isTrusted() const return mCurrentRMessageTemplate->getTrust() == MT_TRUST; } -//virtual bool LLTemplateMessageReader::isBanned(bool trustedSource) const { return mCurrentRMessageTemplate->isBanned(trustedSource); @@ -799,7 +798,7 @@ bool LLTemplateMessageReader::isBanned(bool trustedSource) const bool LLTemplateMessageReader::isUdpBanned() const { - return mCurrentRMessageTemplate->isUdpBanned(); + return mCurrentRMessageTemplate->isUdpBanned(); } //virtual |