aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llviewertexteditor.cpp
diff options
context:
space:
mode:
authorJacek Antonelli2009-10-26 13:56:50 -0500
committerJacek Antonelli2009-10-26 13:56:50 -0500
commit5f65f970b3e6321bf20d2570a0ff234dac88d99b (patch)
tree3a77883e6f3c767dc942abcf9ee579b815e31ed7 /linden/indra/newview/llviewertexteditor.cpp
parentMerge remote branch 'mccabe/next' into next (diff)
parentAdded Advanced menu option for AllowMultipleViewers for testing purposes (diff)
downloadmeta-impy-5f65f970b3e6321bf20d2570a0ff234dac88d99b.zip
meta-impy-5f65f970b3e6321bf20d2570a0ff234dac88d99b.tar.gz
meta-impy-5f65f970b3e6321bf20d2570a0ff234dac88d99b.tar.bz2
meta-impy-5f65f970b3e6321bf20d2570a0ff234dac88d99b.tar.xz
Merge remote branch 'mccabe/next' into next
Diffstat (limited to 'linden/indra/newview/llviewertexteditor.cpp')
-rw-r--r--linden/indra/newview/llviewertexteditor.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/newview/llviewertexteditor.cpp b/linden/indra/newview/llviewertexteditor.cpp
index 76b752c..8f4a944 100644
--- a/linden/indra/newview/llviewertexteditor.cpp
+++ b/linden/indra/newview/llviewertexteditor.cpp
@@ -96,7 +96,7 @@ public:
96 else 96 else
97 { 97 {
98// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c) 98// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c)
99 if ( (rlv_handler_t::isEnabled()) && (gRlvHandler.hasBehaviour("viewnote")) ) 99 if ( (rlv_handler_t::isEnabled()) && (gRlvHandler.hasBehaviour(RLV_BHVR_VIEWNOTE)) )
100 { 100 {
101 return; 101 return;
102 } 102 }