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/llinventorybridge.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 '')
| -rw-r--r-- | linden/indra/newview/llinventorybridge.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/newview/llinventorybridge.cpp b/linden/indra/newview/llinventorybridge.cpp index 0d5625c..5060d21 100644 --- a/linden/indra/newview/llinventorybridge.cpp +++ b/linden/indra/newview/llinventorybridge.cpp | |||
| @@ -2943,7 +2943,7 @@ void open_notecard(LLViewerInventoryItem* inv_item, | |||
| 2943 | BOOL take_focus) | 2943 | BOOL take_focus) |
| 2944 | { | 2944 | { |
| 2945 | // [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c) | 2945 | // [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c) |
| 2946 | if ( (rlv_handler_t::isEnabled()) && (gRlvHandler.hasBehaviour("viewnote")) ) | 2946 | if ( (rlv_handler_t::isEnabled()) && (gRlvHandler.hasBehaviour(RLV_BHVR_VIEWNOTE)) ) |
| 2947 | { | 2947 | { |
| 2948 | return; | 2948 | return; |
| 2949 | } | 2949 | } |