Fixed 'Unlink' not toggling in Tools menu

2 files changed, 15 insertions, 2 deletions

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 00d8578..e33b240 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -5,6 +5,11 @@
                 modified:   linden/indra/newview/llfloatertools.cpp
                 modified:   linden/indra/newview/llfloatertools.h
                 modified:   linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
+                
+                
+        * Fixed 'Unlink' not toggling in Tools menu.
+                
+                modified:   linden/indra/newview/llviewermenu.cpp
 
 
 2009-06-10  McCabe Maxsted  <hakushakukun@gmail.com>
diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp
index b255883..7c556df 100644
--- a/linden/indra/newview/llviewermenu.cpp
+++ b/linden/indra/newview/llviewermenu.cpp
@@ -4188,9 +4188,17 @@ class LLToolsEnableUnlink : public view_listener_t
 {
         bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
         {
-                bool new_value = LLSelectMgr::getInstance()->selectGetAllRootsValid() &&
+                bool new_value = false;
+                if (LLSelectMgr::getInstance()->selectGetAllRootsValid() &&
                         LLSelectMgr::getInstance()->getSelection()->getFirstEditableObject() &&
-                        !LLSelectMgr::getInstance()->getSelection()->getFirstEditableObject()->isAttachment();
+                        !LLSelectMgr::getInstance()->getSelection()->getFirstEditableObject()->isAttachment())
+                {
+                        if (LLSelectMgr::getInstance()->getSelection()->getRootObjectCount() != 
+                                LLSelectMgr::getInstance()->getSelection()->getObjectCount())
+                        {
+                                new_value = true;
+                        }
+                }
                 gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
                 return true;
         }