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/llpanelinventory.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/llpanelinventory.cpp')
| -rw-r--r-- | linden/indra/newview/llpanelinventory.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/newview/llpanelinventory.cpp b/linden/indra/newview/llpanelinventory.cpp index 7ab850f..0ae2aec 100644 --- a/linden/indra/newview/llpanelinventory.cpp +++ b/linden/indra/newview/llpanelinventory.cpp | |||
| @@ -1377,7 +1377,7 @@ void LLTaskNotecardBridge::openItem() | |||
| 1377 | return; | 1377 | return; |
| 1378 | } | 1378 | } |
| 1379 | // [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c) | 1379 | // [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c) |
| 1380 | if ( (rlv_handler_t::isEnabled()) && ((gRlvHandler.hasBehaviour("viewnote")) || (!gRlvHandler.isDetachable(object))) ) | 1380 | if ( (rlv_handler_t::isEnabled()) && ((gRlvHandler.hasBehaviour(RLV_BHVR_VIEWNOTE)) || (!gRlvHandler.isDetachable(object))) ) |
| 1381 | { | 1381 | { |
| 1382 | return; | 1382 | return; |
| 1383 | } | 1383 | } |