1 files changed, 8 insertions, 1 deletions

diff --git a/linden/indra/newview/lltoolcomp.cpp b/linden/indra/newview/lltoolcomp.cpp
index 2c2c0fe..fd1152d 100644
--- a/linden/indra/newview/lltoolcomp.cpp
+++ b/linden/indra/newview/lltoolcomp.cpp
@@ -246,7 +246,14 @@ void LLToolCompTranslate::pickCallback(S32 x, S32 y, MASK mask)
                 {
                         gEditMenuHandler = gSelectMgr;
                 }
-                if(     LLManip::LL_NO_PART != gToolTranslate->mManip->getHighlightedPart() )
+
+                BOOL can_move = gToolTranslate->mManip->getSelection()->getObjectCount() != 0;
+                for (LLViewerObject* objectp = gToolTranslate->mManip->getSelection()->getFirstObject(); objectp; objectp = gToolTranslate->mManip->getSelection()->getNextObject())
+                {
+                        can_move = can_move && objectp->permMove() && (objectp->permModify() || gSavedSettings.getBOOL("SelectLinkedSet"));
+                }
+
+                if(     LLManip::LL_NO_PART != gToolTranslate->mManip->getHighlightedPart() && can_move)
                 {
                         gToolTranslate->setCurrentTool( gToolTranslate->mManip );
                         gToolTranslate->mManip->handleMouseDownOnPart( x, y, mask );