aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llfloatertools.cpp
diff options
context:
space:
mode:
authorMcCabe Maxsted2009-09-09 17:18:15 -0700
committerMcCabe Maxsted2009-09-09 19:22:45 -0700
commit967cec4e5ddf168ecb58da3d244a49fa6a28d808 (patch)
treeb7464daa41c6384a8e84eef70ae5f23d614be559 /linden/indra/newview/llfloatertools.cpp
parentApplied ReinstateShowTextureUUID Cool Viewer patch (reverts the fix for VWR-1... (diff)
downloadmeta-impy-967cec4e5ddf168ecb58da3d244a49fa6a28d808.zip
meta-impy-967cec4e5ddf168ecb58da3d244a49fa6a28d808.tar.gz
meta-impy-967cec4e5ddf168ecb58da3d244a49fa6a28d808.tar.bz2
meta-impy-967cec4e5ddf168ecb58da3d244a49fa6a28d808.tar.xz
Fixed unlink option enabling when selecting textures
Diffstat (limited to 'linden/indra/newview/llfloatertools.cpp')
-rw-r--r--linden/indra/newview/llfloatertools.cpp3
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)
693 LLSelectMgr::getInstance()->getSelection()->getFirstEditableObject() && 693 LLSelectMgr::getInstance()->getSelection()->getFirstEditableObject() &&
694 !LLSelectMgr::getInstance()->getSelection()->getFirstEditableObject()->isAttachment()) 694 !LLSelectMgr::getInstance()->getSelection()->getFirstEditableObject()->isAttachment())
695 { 695 {
696 if (LLSelectMgr::getInstance()->getSelection()->getRootObjectCount() != 696 if (LLSelectMgr::getInstance()->getSelection()->getRootObjectCount() > 0 &&
697 LLSelectMgr::getInstance()->getSelection()->getRootObjectCount() !=
697 LLSelectMgr::getInstance()->getSelection()->getObjectCount()) 698 LLSelectMgr::getInstance()->getSelection()->getObjectCount())
698 { 699 {
699 can_unlink = true; 700 can_unlink = true;