diff options
author | Jacek Antonelli | 2009-10-26 13:56:50 -0500 |
---|---|---|
committer | Jacek Antonelli | 2009-10-26 13:56:50 -0500 |
commit | 5f65f970b3e6321bf20d2570a0ff234dac88d99b (patch) | |
tree | 3a77883e6f3c767dc942abcf9ee579b815e31ed7 /linden/indra/newview/llviewertexteditor.cpp | |
parent | Merge remote branch 'mccabe/next' into next (diff) | |
parent | Added Advanced menu option for AllowMultipleViewers for testing purposes (diff) | |
download | meta-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.cpp | 2 |
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 | } |