3 files changed, 10 insertions, 2 deletions

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 6c4cf5e..1e0f109 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -7,6 +7,12 @@
                 modified:   linden/indra/newview/llviewermenu.cpp
                 
                 
+     * Fixed unlink option enabling when selecting textures.
+         
+                modified:   linden/indra/newview/llfloatertools.cpp
+                modified:   linden/indra/newview/llviewermenu.cpp
+                
+                
 2009-09-08  McCabe Maxsted  <hakushakukun@gmail.com>
 
      * Created my own version of Emerald's chat channel tool. 
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;