Applied RLVa-1.1.2-Imprudence.patch by Kitty Barnett

1 files changed, 32 insertions, 4 deletions

diff --git a/linden/indra/newview/llviewerwindow.cpp b/linden/indra/newview/llviewerwindow.cpp
index 3a68f0f..401e62d 100644
--- a/linden/indra/newview/llviewerwindow.cpp
+++ b/linden/indra/newview/llviewerwindow.cpp
@@ -187,6 +187,10 @@
 #include "llfloatertest.h" // HACK!
 #include "llfloaternotificationsconsole.h"
 
+// [RLVa:KB]
+#include "rlvhandler.h"
+// [/RLVa:KB]
+
 #if LL_WINDOWS
 #include <tchar.h> // For Unicode conversion methods
 #endif
@@ -3473,17 +3477,41 @@ LLViewerObject* LLViewerWindow::cursorIntersect(S32 mouse_x, S32 mouse_y, F32 de
                         }
 
         else // check ALL objects
-                        {
+        {
                 found = gPipeline.lineSegmentIntersectInHUD(mouse_hud_start, mouse_hud_end, pick_transparent,
                                                                                                         face_hit, intersection, uv, normal, binormal);
 
-                if (!found) // if not found in HUD, look in world:
+// [RLVa:KB] - Checked: 2009-12-28 (RLVa-1.1.0k) | Modified: RLVa-1.1.0k
+                if ( (rlv_handler_t::isEnabled()) && (LLToolCamera::getInstance()->hasMouseCapture()) && (gKeyboard->currentMask(TRUE) & MASK_ALT) )
+                {
+                        found = NULL;
+                }
+// [/RLVa:KB]
 
-                        {
+                if (!found) // if not found in HUD, look in world:
+                {
                         found = gPipeline.lineSegmentIntersectInWorld(mouse_world_start, mouse_world_end, pick_transparent,
                                                                                                                   face_hit, intersection, uv, normal, binormal);
-                        }
 
+// [RLVa:KB] - Checked: 2010-01-02 (RLVa-1.1.0l) | Added: RLVa-1.1.0l
+#ifdef RLV_EXTENSION_CMD_INTERACT
+                        if ( (rlv_handler_t::isEnabled()) && (found) && (gRlvHandler.hasBehaviour(RLV_BHVR_INTERACT)) )
+                        {
+                                // Allow picking if:
+                                //   - the drag-and-drop tool is active (allows inventory offers)
+                                //   - the camera tool is active
+                                //   - the pie tool is active *and* we picked our own avie (allows "mouse steering" and the self pie menu)
+                                LLTool* pCurTool = LLToolMgr::getInstance()->getCurrentTool();
+                                if ( (LLToolDragAndDrop::getInstance() != pCurTool) &&
+                                         (!LLToolCamera::getInstance()->hasMouseCapture()) &&
+                                         ((LLToolPie::getInstance() != pCurTool) || (gAgent.getID() != found->getID())) )
+                                {
+                                        found = NULL;
+                                }
+                        }
+#endif // RLV_EXTENSION_CMD_INTERACT
+// [/RLVa:KB]
+                }
         }
 
         return found;