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, 6 insertions, 2 deletions

diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp
index e83bc2d..8a92963 100644
--- a/linden/indra/newview/llviewermenu.cpp
+++ b/linden/indra/newview/llviewermenu.cpp
@@ -4618,7 +4618,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;
@@ -6720,7 +6721,10 @@ void handle_selected_texture_info(void*)
                         S32 height = img->getHeight();
                         S32 width = img->getWidth();
                         S32 components = img->getComponents();
-                        msg = llformat("%dx%d %s on face ",
+                        std::string image_id_string = image_id.asString();
+                        image_id_string = image_id_string.replace(24, 35, 12, '*') + " "; // hide last segment to discourage theft
+                        msg = llformat("%s%dx%d %s on face ",
+                                                                image_id_string.c_str(),
                                                                 width,
                                                                 height,
                                                                 (components == 4 ? "alpha" : "opaque"));