1 files changed, 28 insertions, 0 deletions

diff --git a/linden/indra/newview/llglsandbox.cpp b/linden/indra/newview/llglsandbox.cpp
index 2b51948..296cdaa 100644
--- a/linden/indra/newview/llglsandbox.cpp
+++ b/linden/indra/newview/llglsandbox.cpp
@@ -166,6 +166,13 @@ extern BOOL gDebugSelect;
 // Returns true if you got at least one object
 void LLToolSelectRect::handleRectangleSelection(S32 x, S32 y, MASK mask)
 {
+// [RLVa:KB] - Checked: 2009-07-04 (RLVa-1.0.0b)
+        if (gRlvHandler.hasBehaviour(RLV_BHVR_EDIT))
+        {
+                return;
+        }
+// [/RLVa:KB]
+
         LLVector3 av_pos = gAgent.getPositionAgent();
         F32 select_dist_squared = gSavedSettings.getF32("MaxSelectDistance");
         select_dist_squared = select_dist_squared * select_dist_squared;
@@ -230,6 +237,27 @@ void LLToolSelectRect::handleRectangleSelection(S32 x, S32 y, MASK mask)
                 LLViewerCamera::getInstance()->setFar(new_far);
                 LLViewerCamera::getInstance()->setNear(new_near);
         }
+// [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g)
+        if (gRlvHandler.hasBehaviour(RLV_BHVR_FARTOUCH))
+        {
+                // We'll allow drag selection under fartouch, but only within the fartouch range
+                // (just copy/paste the code above us to make that work, thank you Lindens!)
+                LLVector3 relative_av_pos = av_pos;
+                relative_av_pos -= LLViewerCamera::getInstance()->getOrigin();
+
+                F32 new_far = relative_av_pos * LLViewerCamera::getInstance()->getAtAxis() + 1.5f;
+                F32 new_near = relative_av_pos * LLViewerCamera::getInstance()->getAtAxis() - 1.5f;
+
+                new_near = llmax(new_near, 0.1f);
+
+                LLViewerCamera::getInstance()->setFar(new_far);
+                LLViewerCamera::getInstance()->setNear(new_near);
+
+                // Usurp these two
+                limit_select_distance = TRUE;
+                select_dist_squared = 1.5f * 1.5f;
+        }
+// [/RLVa:KB]
         LLViewerCamera::getInstance()->setPerspective(FOR_SELECTION, 
                                                         center_x-width/2, center_y-height/2, width, height, 
                                                         limit_select_distance);