From fc0149cdbc67dfeec88d24edd19f216308f0ce3c Mon Sep 17 00:00:00 2001 From: Siana Gearz Date: Sat, 15 Sep 2012 08:16:35 +0200 Subject: [PATCH] Fix the Unlink button --- indra/newview/llpanelobject.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/indra/newview/llpanelobject.cpp b/indra/newview/llpanelobject.cpp index 796a535d7..ef6c5f138 100644 --- a/indra/newview/llpanelobject.cpp +++ b/indra/newview/llpanelobject.cpp @@ -514,8 +514,11 @@ void LLPanelObject::getState( ) mCtrlPosY->setEnabled(enable_move); mCtrlPosZ->setEnabled(enable_move); mBtnLinkObj->setEnabled(LLSelectMgr::getInstance()->enableLinkObjects()); - mBtnUnlinkObj->setEnabled((LLSelectMgr::getInstance()->enableUnlinkObjects() - && (selected_count > 1) && LLSelectMgr::getInstance()->getSelection()->getRootObjectCount()<=1)); + LLViewerObject* linkset_parent = objectp->getSubParent()? objectp->getSubParent() : objectp; + mBtnUnlinkObj->setEnabled( + LLSelectMgr::getInstance()->enableUnlinkObjects() + && (linkset_parent->numChildren() >= 1) + && LLSelectMgr::getInstance()->getSelection()->getRootObjectCount()<=1); mBtnCopyPos->setEnabled(enable_move); mBtnPastePos->setEnabled(enable_move); mBtnPastePosClip->setEnabled(enable_move);