2 files changed, 4 insertions, 2 deletions

diff --git a/linden/indra/newview/llfloatertools.cpp b/linden/indra/newview/llfloatertools.cpp
index b63138f..d2a8040 100644
--- a/linden/indra/newview/llfloatertools.cpp
+++ b/linden/indra/newview/llfloatertools.cpp
@@ -693,7 +693,8 @@ void LLFloaterTools::updatePopup(LLCoordGL center, MASK mask)
                 LLSelectMgr::getInstance()->getSelection()->getFirstEditableObject() &&
                 !LLSelectMgr::getInstance()->getSelection()->getFirstEditableObject()->isAttachment())
         {
-                if (LLSelectMgr::getInstance()->getSelection()->getRootObjectCount() != 
+                if (LLSelectMgr::getInstance()->getSelection()->getRootObjectCount() > 0 &&
+                        LLSelectMgr::getInstance()->getSelection()->getRootObjectCount() != 
                         LLSelectMgr::getInstance()->getSelection()->getObjectCount())
                 {
                         can_unlink = true;
diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp
index efadf67..ddebd97 100644
--- a/linden/indra/newview/llviewermenu.cpp
+++ b/linden/indra/newview/llviewermenu.cpp
@@ -4205,7 +4205,8 @@ class LLToolsEnableUnlink : public view_listener_t
                         LLSelectMgr::getInstance()->getSelection()->getFirstEditableObject() &&
                         !LLSelectMgr::getInstance()->getSelection()->getFirstEditableObject()->isAttachment())
                 {
-                        if (LLSelectMgr::getInstance()->getSelection()->getRootObjectCount() != 
+                        if (LLSelectMgr::getInstance()->getSelection()->getRootObjectCount() > 0 &&
+                                LLSelectMgr::getInstance()->getSelection()->getRootObjectCount() != 
                                 LLSelectMgr::getInstance()->getSelection()->getObjectCount())
                         {
                                 new_value = true;