diff options
| author | McCabe Maxsted | 2009-09-09 17:18:15 -0700 |
|---|---|---|
| committer | McCabe Maxsted | 2009-09-09 19:22:45 -0700 |
| commit | 967cec4e5ddf168ecb58da3d244a49fa6a28d808 (patch) | |
| tree | b7464daa41c6384a8e84eef70ae5f23d614be559 /linden | |
| parent | Applied ReinstateShowTextureUUID Cool Viewer patch (reverts the fix for VWR-1... (diff) | |
| download | meta-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')
| -rw-r--r-- | linden/indra/newview/llfloatertools.cpp | 3 | ||||
| -rw-r--r-- | linden/indra/newview/llviewermenu.cpp | 3 |
2 files changed, 4 insertions, 2 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; |
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 | |||
| 4205 | LLSelectMgr::getInstance()->getSelection()->getFirstEditableObject() && | 4205 | LLSelectMgr::getInstance()->getSelection()->getFirstEditableObject() && |
| 4206 | !LLSelectMgr::getInstance()->getSelection()->getFirstEditableObject()->isAttachment()) | 4206 | !LLSelectMgr::getInstance()->getSelection()->getFirstEditableObject()->isAttachment()) |
| 4207 | { | 4207 | { |
| 4208 | if (LLSelectMgr::getInstance()->getSelection()->getRootObjectCount() != | 4208 | if (LLSelectMgr::getInstance()->getSelection()->getRootObjectCount() > 0 && |
| 4209 | LLSelectMgr::getInstance()->getSelection()->getRootObjectCount() != | ||
| 4209 | LLSelectMgr::getInstance()->getSelection()->getObjectCount()) | 4210 | LLSelectMgr::getInstance()->getSelection()->getObjectCount()) |
| 4210 | { | 4211 | { |
| 4211 | new_value = true; | 4212 | new_value = true; |