1 files changed, 11 insertions, 3 deletions

diff --git a/linden/indra/newview/llpanelobject.cpp b/linden/indra/newview/llpanelobject.cpp
index 9022c14..1f386bf 100644
--- a/linden/indra/newview/llpanelobject.cpp
+++ b/linden/indra/newview/llpanelobject.cpp
@@ -365,6 +365,17 @@ void LLPanelObject::getState( )
         BOOL enable_scale       = objectp->permMove() && objectp->permModify();
         BOOL enable_rotate      = objectp->permMove() && ( (objectp->permModify() && !objectp->isAttachment()) || !gSavedSettings.getBOOL("EditLinkedParts"));
 
+        S32 selected_count = LLSelectMgr::getInstance()->getSelection()->getObjectCount();
+        BOOL single_volume = (LLSelectMgr::getInstance()->selectionAllPCode( LL_PCODE_VOLUME ))
+                                                 && (selected_count == 1);
+
+        if (LLSelectMgr::getInstance()->getSelection()->getRootObjectCount() > 1)
+        {
+                enable_move = FALSE;
+                enable_scale = FALSE;
+                enable_rotate = FALSE;
+        }
+
         LLVector3 vec;
         if (enable_move)
         {
@@ -438,9 +449,6 @@ void LLPanelObject::getState( )
         // BUG? Check for all objects being editable?
         S32 roots_selected = LLSelectMgr::getInstance()->getSelection()->getRootObjectCount();
         BOOL editable = root_objectp->permModify();
-        S32 selected_count = LLSelectMgr::getInstance()->getSelection()->getObjectCount();
-        BOOL single_volume = (LLSelectMgr::getInstance()->selectionAllPCode( LL_PCODE_VOLUME ))
-                                                 && (selected_count == 1);
 
         // Select Single Message
         childSetVisible("select_single", FALSE);