diff options
| author | James Cook <james@lindenlab.com> | 2009-12-08 16:28:34 -0800 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2009-12-08 16:28:34 -0800 |
| commit | a65473957f16f9cfba8ed10b87218d65d64519ef (patch) | |
| tree | 7724f4a40ddd3fa148f07f87ac199e5d1cb79277 /indra/newview/llselectmgr.cpp | |
| parent | 5d4959e3a107a6a40014528dd8e17e46bf128540 (diff) | |
Back out EXT-2827 Unable to delete object when select face of object
May cause right-click delete to fail - testing that
Backed out changeset: 1f8e1e73f9f4
Diffstat (limited to 'indra/newview/llselectmgr.cpp')
| -rw-r--r-- | indra/newview/llselectmgr.cpp | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp index c8b86118be..1605838b94 100644 --- a/indra/newview/llselectmgr.cpp +++ b/indra/newview/llselectmgr.cpp @@ -5753,19 +5753,8 @@ void LLSelectMgr::redo() //----------------------------------------------------------------------------- BOOL LLSelectMgr::canDoDelete() const { - bool can_delete = false; - LLViewerObject* obj = const_cast<LLSelectMgr*>(this)->mSelectedObjects->getFirstDeleteableObject() ; // HACK: casting away constness - MG // Note: Can only delete root objects (see getFirstDeleteableObject() for more info) - if (obj!= NULL) - { - // all the faces needs to be selected - if(const_cast<LLSelectMgr*>(this)->mSelectedObjects->contains(obj,SELECT_ALL_TES )) - { - can_delete = true; - } - } - - return can_delete; + return const_cast<LLSelectMgr*>(this)->mSelectedObjects->getFirstDeleteableObject() != NULL; // HACK: casting away constness - MG } //----------------------------------------------------------------------------- |