Merge remote branch 'mccabe/1.2.0-next' into next

Conflicts:
	linden/indra/newview/llfloaterchat.cpp
	linden/indra/newview/llfloatermap.cpp
	linden/indra/newview/llinventorybridge.cpp
	linden/indra/newview/llnetmap.cpp
	linden/indra/newview/llviewermessage.cpp
	linden/indra/newview/llviewerobjectlist.cpp

1 files changed, 2 insertions, 1 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;