aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llchatbar.cpp
diff options
context:
space:
mode:
authorMcCabe Maxsted2010-08-19 10:54:12 -0700
committerMcCabe Maxsted2010-08-26 11:22:52 -0700
commitfee791f808c6adcb114302f39aacce4d5834edf5 (patch)
tree8328ae00e6af4163f68adfaf12e0947e91b84135 /linden/indra/newview/llchatbar.cpp
parentDisable ParticleChat by default, as it's a privacy concern. (diff)
downloadmeta-impy-fee791f808c6adcb114302f39aacce4d5834edf5.zip
meta-impy-fee791f808c6adcb114302f39aacce4d5834edf5.tar.gz
meta-impy-fee791f808c6adcb114302f39aacce4d5834edf5.tar.bz2
meta-impy-fee791f808c6adcb114302f39aacce4d5834edf5.tar.xz
Applied RLVa-1.0.5e_fix.patch by Kitty Barnett to fix RLVa up to 1.0.5.e
Diffstat (limited to 'linden/indra/newview/llchatbar.cpp')
-rw-r--r--linden/indra/newview/llchatbar.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/linden/indra/newview/llchatbar.cpp b/linden/indra/newview/llchatbar.cpp
index 5a7586e..3c977dd 100644
--- a/linden/indra/newview/llchatbar.cpp
+++ b/linden/indra/newview/llchatbar.cpp
@@ -558,16 +558,16 @@ void LLChatBar::onInputEditorKeystroke( LLLineEditor* caller, void* userdata )
558 558
559 S32 length = raw_text.length(); 559 S32 length = raw_text.length();
560 560
561 //if( (length > 0) && (raw_text[0] != '/') ) // forward slash is used for escape (eg. emote) sequences 561 if( (length > 0) && (raw_text[0] != '/') ) // forward slash is used for escape (eg. emote) sequences
562// [RLVa:KB] - Checked: 2009-07-07 (RLVa-1.0.0d)
563 if ( (length > 0) && (raw_text[0] != '/') && (!gRlvHandler.hasBehaviour(RLV_BHVR_REDIRCHAT)) )
564// [/RLVa:KB]
565 { 562 {
566 if (self->mChanCtrlEnabled && (S32)(self->mChannelControl->get()) != 0) 563 if (self->mChanCtrlEnabled && (S32)(self->mChannelControl->get()) != 0)
567 { 564 {
568 gAgent.stopTyping(); 565 gAgent.stopTyping();
569 } 566 }
570 else 567// else
568// [RLVa:KB] - Checked: 2009-07-07 (RLVa-1.0.0d)
569 else if (!gRlvHandler.hasBehaviour(RLV_BHVR_REDIRCHAT))
570// [/RLVa:KB]
571 { 571 {
572 gAgent.startTyping(); 572 gAgent.startTyping();
573 } 573 }