From 377c858824ff12ae14cc0e9a601c6d74dbd24f81 Mon Sep 17 00:00:00 2001 From: Kitty Barnett Date: Fri, 11 Nov 2016 22:21:47 +0100 Subject: [PATCH] [FIXED] FIRE-20072: @sendchannel_except doesn't block text sent on restricted channel --- indra/newview/fsnearbychathub.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/indra/newview/fsnearbychathub.cpp b/indra/newview/fsnearbychathub.cpp index 1cd4ef6a7e..eeb1177ffb 100644 --- a/indra/newview/fsnearbychathub.cpp +++ b/indra/newview/fsnearbychathub.cpp @@ -44,6 +44,7 @@ #include "llviewerkeyboard.h" #include "llviewerstats.h" #include "llworld.h" +#include "rlvactions.h" #include "rlvhandler.h" static const U32 NAME_PREDICTION_MINIMUM_LENGTH = 3; @@ -129,7 +130,7 @@ void send_chat_from_viewer(std::string utf8_out_text, EChatType type, S32 channe else { // Don't allow chat on a non-public channel if sendchannel restricted (unless the channel is an exception) - if ( (gRlvHandler.hasBehaviour(RLV_BHVR_SENDCHANNEL)) && (!gRlvHandler.isException(RLV_BHVR_SENDCHANNEL, channel)) ) + if (!RlvActions::canSendChannel(channel)) return; // Don't allow chat on debug channel if @sendchat, @redirchat or @rediremote restricted (shows as public chat on viewers)