aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llselectmgr.cpp
diff options
context:
space:
mode:
authorMcCabe Maxsted2010-10-09 03:27:47 -0700
committerMcCabe Maxsted2010-10-09 03:27:47 -0700
commit1866bc2af39189c17b636970d4df7edc983c1830 (patch)
treee60963a49832280cf3d2d9b5a8b589853469caee /linden/indra/newview/llselectmgr.cpp
parentUse all those cores for compile (diff)
downloadmeta-impy-1866bc2af39189c17b636970d4df7edc983c1830.zip
meta-impy-1866bc2af39189c17b636970d4df7edc983c1830.tar.gz
meta-impy-1866bc2af39189c17b636970d4df7edc983c1830.tar.bz2
meta-impy-1866bc2af39189c17b636970d4df7edc983c1830.tar.xz
Applied RLVa-1.1.2-Imprudence.patch by Kitty Barnett
Diffstat (limited to 'linden/indra/newview/llselectmgr.cpp')
-rw-r--r--linden/indra/newview/llselectmgr.cpp15
1 files changed, 15 insertions, 0 deletions
diff --git a/linden/indra/newview/llselectmgr.cpp b/linden/indra/newview/llselectmgr.cpp
index 1634950..f154de9 100644
--- a/linden/indra/newview/llselectmgr.cpp
+++ b/linden/indra/newview/llselectmgr.cpp
@@ -87,6 +87,10 @@
87 87
88#include "llglheaders.h" 88#include "llglheaders.h"
89 89
90// [RLVa:KB]
91#include "rlvhandler.h"
92// [/RLVa:KB]
93
90LLViewerObject* getSelectedParentObject(LLViewerObject *object) ; 94LLViewerObject* getSelectedParentObject(LLViewerObject *object) ;
91// 95//
92// Consts 96// Consts
@@ -3446,6 +3450,17 @@ void LLSelectMgr::deselectAllIfTooFar()
3446 return; 3450 return;
3447 } 3451 }
3448 3452
3453// [RLVa:KB] - Checked: 2010-01-02 (RLVa-1.1.0l) | Modified: RLVa-1.1.0l
3454#ifdef RLV_EXTENSION_CMD_INTERACT
3455 // [Fall-back code] Don't allow an active selection (except for HUD attachments - see above) when @interact=n restricted
3456 if (gRlvHandler.hasBehaviour(RLV_BHVR_INTERACT))
3457 {
3458 deselectAll();
3459 return;
3460 }
3461#endif // RLV_EXTENSION_CMD_INTERACT
3462// [/RLVa:KB]
3463
3449 // HACK: Don't deselect when we're navigating to rate an object's 3464 // HACK: Don't deselect when we're navigating to rate an object's
3450 // owner or creator. JC 3465 // owner or creator. JC
3451 if (gPieObject->getVisible()) 3466 if (gPieObject->getVisible())