Merged working branch of 1.2 into LL 1.23 merge

1 files changed, 49 insertions, 0 deletions

diff --git a/linden/indra/newview/lltoolselect.cpp b/linden/indra/newview/lltoolselect.cpp
index 80e9917..02755d7 100644
--- a/linden/indra/newview/lltoolselect.cpp
+++ b/linden/indra/newview/lltoolselect.cpp
@@ -51,6 +51,10 @@
 #include "llvoavatar.h"
 #include "llworld.h"
 
+// [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g)
+#include "llfloatertools.h"
+// [/RLVa:KB]
+
 // Globals
 extern BOOL gAllowSelectAvatar;
 
@@ -83,6 +87,51 @@ LLObjectSelectionHandle LLToolSelect::handleObjectSelection(const LLPickInfo& pi
         {
                 object = object->getRootEdit();
         }
+
+// [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g) | Modified: RLVa-0.2.0f
+        if (rlv_handler_t::isEnabled())
+        {
+                if (gRlvHandler.hasBehaviour(RLV_BHVR_EDIT))
+                {
+                        if (!temp_select)
+                        {
+                                return LLSelectMgr::getInstance()->getSelection();
+                        }
+                        else
+                        {
+                                // Temporary selection, but if the build floater is open then it'll be permanent so get rid of the floater
+                                if (gFloaterTools->getVisible())
+                                {
+                                        // Copy/paste from toggle_build_mode()
+                                        gAgent.resetView(false);
+                                        gFloaterTools->close();
+                                        gViewerWindow->showCursor();
+                                }
+                        }
+                }
+                
+                if ( (gRlvHandler.hasBehaviour(RLV_BHVR_FARTOUCH)) && (object) && ((!object->isAttachment()) || (!object->permYouOwner())) &&
+                         (dist_vec_squared(gAgent.getPositionAgent(), object->getPositionRegion()) > 1.5f * 1.5f) )
+                {
+                        // NOTE-RLVa: see behaviour notes for a rather lengthy explanation of why we're doing things this way
+                        //if (dist_vec_squared(gAgent.getPositionAgent(), object->getPositionRegion() + pick.mObjectOffset) > 1.5f * 1.5f)
+                        if (dist_vec_squared(gAgent.getPositionAgent(), pick.mIntersection) > 1.5f * 1.5f)
+                        {
+                                if ( (gFloaterTools->getVisible()) && (pick.mKeyMask != MASK_SHIFT) && (pick.mKeyMask != MASK_CONTROL) )
+                                        LLSelectMgr::getInstance()->deselectAll();
+                                return LLSelectMgr::getInstance()->getSelection();
+                        }
+                        else if (gFloaterTools->getVisible())
+                        {
+                                // Copy/paste from toggle_build_mode()
+                                gAgent.resetView(false);
+                                gFloaterTools->close();
+                                gViewerWindow->showCursor();
+                        }
+                }
+        }
+// [/RLVa:KB]
+
         BOOL select_owned = gSavedSettings.getBOOL("SelectOwnedOnly");
         BOOL select_movable = gSavedSettings.getBOOL("SelectMovableOnly");