diff --git a/indra/newview/llpanelobject.cpp b/indra/newview/llpanelobject.cpp
index 3fa71bea1..5946318e4 100644
--- a/indra/newview/llpanelobject.cpp
+++ b/indra/newview/llpanelobject.cpp
@@ -513,8 +513,9 @@ void LLPanelObject::getState( )
 	mCtrlPosX->setEnabled(enable_move);
 	mCtrlPosY->setEnabled(enable_move);
 	mCtrlPosZ->setEnabled(enable_move);
-	mBtnLinkObj->setEnabled((enable_move && !single_volume));
-	mBtnUnlinkObj->setEnabled((enable_move && (selected_count > 1)));
+	mBtnLinkObj->setEnabled(LLSelectMgr::getInstance()->enableLinkObjects());
+	mBtnUnlinkObj->setEnabled((LLSelectMgr::getInstance()->enableUnlinkObjects()
+							   && (selected_count > 1) && LLSelectMgr::getInstance()->getSelection()->getRootObjectCount()<=1));
 	mBtnCopyPos->setEnabled(enable_move);
 	mBtnPastePos->setEnabled(enable_move);
 	mBtnPastePosClip->setEnabled(enable_move);