1 files changed, 24 insertions, 5 deletions

diff --git a/linden/indra/newview/llselectmgr.cpp b/linden/indra/newview/llselectmgr.cpp
index 808eb07..e4f914f 100644
--- a/linden/indra/newview/llselectmgr.cpp
+++ b/linden/indra/newview/llselectmgr.cpp
@@ -107,6 +107,7 @@ BOOL gHideSelectedObjects = FALSE;
 BOOL gAllowSelectAvatar = FALSE;
 
 BOOL LLSelectMgr::sRectSelectInclusive = TRUE;
+BOOL LLSelectMgr::sRenderSelectionHighlights = TRUE;
 BOOL LLSelectMgr::sRenderHiddenSelections = TRUE;
 BOOL LLSelectMgr::sRenderLightRadius = FALSE;
 F32     LLSelectMgr::sHighlightThickness = 0.f;
@@ -3430,18 +3431,26 @@ void LLSelectMgr::deselectAllIfTooFar()
 
         // HACK: Don't deselect when we're navigating to rate an object's
         // owner or creator.  JC
-        if (gPieObject->getVisible() || gPieRate->getVisible() )
+        if (gPieObject->getVisible())
         {
                 return;
         }
 
         LLVector3d selectionCenter = getSelectionCenterGlobal();
-        if (gSavedSettings.getBOOL("LimitSelectDistance")
+
+//      if (gSavedSettings.getBOOL("LimitSelectDistance")
+// [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g) | Modified: RLVa-0.2.0f
+        BOOL fRlvFartouch = gRlvHandler.hasBehaviour(RLV_BHVR_FARTOUCH) && gFloaterTools->getVisible();
+        if ( (gSavedSettings.getBOOL("LimitSelectDistance") || (fRlvFartouch) )
+// [/RLVa:KB]
                 && (!mSelectedObjects->getPrimaryObject() || !mSelectedObjects->getPrimaryObject()->isAvatar())
                 && !mSelectedObjects->isAttachment()
                 && !selectionCenter.isExactlyZero())
         {
-                F32 deselect_dist = gSavedSettings.getF32("MaxSelectDistance");
+//              F32 deselect_dist = gSavedSettings.getF32("MaxSelectDistance");
+// [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g) | Modified: RLVa-0.2.0f
+                F32 deselect_dist = (!fRlvFartouch) ? gSavedSettings.getF32("MaxSelectDistance") : 1.5f;
+// [/RLVa:KB]
                 F32 deselect_dist_sq = deselect_dist * deselect_dist;
 
                 LLVector3d select_delta = gAgent.getPositionGlobal() - selectionCenter;
@@ -4537,6 +4546,11 @@ extern LLGLdouble	gGLModelView[16];
 
 void LLSelectMgr::updateSilhouettes()
 {
+        if (!mRenderSilhouettes || !LLSelectMgr::sRenderSelectionHighlights)
+        {
+                return;
+        }
+
         S32 num_sils_genned = 0;
 
         LLVector3d      cameraPos = gAgent.getCameraPositionGlobal();
@@ -4809,7 +4823,7 @@ void LLSelectMgr::updateSilhouettes()
 
 void LLSelectMgr::renderSilhouettes(BOOL for_hud)
 {
-        if (!mRenderSilhouettes)
+        if (!mRenderSilhouettes || !LLSelectMgr::sRenderSelectionHighlights)
         {
                 return;
         }
@@ -5492,6 +5506,10 @@ void LLSelectMgr::updateSelectionCenter()
 
                 std::vector < LLViewerObject *> jointed_objects;
 
+                // Initialize the bounding box to the root prim, so the BBox orientation
+                // matches the root prim's (affecting the orientation of the manipulators).
+                bbox.addBBoxAgent( (mSelectedObjects->getFirstRootObject(TRUE))->getBoundingBoxAgent() );
+
                 for (LLObjectSelection::iterator iter = mSelectedObjects->begin();
                          iter != mSelectedObjects->end(); iter++)
                 {
@@ -5738,7 +5756,8 @@ BOOL LLSelectMgr::canSelectObject(LLViewerObject* object)
         }
 
         if ((gSavedSettings.getBOOL("SelectOwnedOnly") && !object->permYouOwner()) ||
-                (gSavedSettings.getBOOL("SelectMovableOnly") && !object->permMove()))
+                (gSavedSettings.getBOOL("SelectMovableOnly") && !object->permMove()) ||
+                (gSavedSettings.getBOOL("SelectCopyableOnly") && !object->permCopy()))
         {
                 // only select my own objects
                 return FALSE;