1 files changed, 6 insertions, 1 deletions

diff --git a/linden/indra/newview/llselectmgr.cpp b/linden/indra/newview/llselectmgr.cpp
index 2e4983c..7547dd2 100644
--- a/linden/indra/newview/llselectmgr.cpp
+++ b/linden/indra/newview/llselectmgr.cpp
@@ -5499,6 +5499,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++)
                 {
@@ -5745,7 +5749,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;