diff options
| author | Don Kjer <don@lindenlab.com> | 2011-03-01 02:13:55 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2011-03-01 02:13:55 +0000 |
| commit | 627c28da811f00ddd02a5c2af0762f427ac02a1b (patch) | |
| tree | 13e1deab87b9a3c56595b796bd17347e47a93658 /indra/newview/llselectmgr.cpp | |
| parent | f2764d24a3b3563d66a683c84af22b61648755cb (diff) | |
| parent | 0929315ab103433275a71f26a4900ee0615932e9 (diff) | |
Merge with viewer-headless
Diffstat (limited to 'indra/newview/llselectmgr.cpp')
| -rw-r--r-- | indra/newview/llselectmgr.cpp | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp index da891d1c51..81f4dd802a 100644 --- a/indra/newview/llselectmgr.cpp +++ b/indra/newview/llselectmgr.cpp @@ -516,17 +516,15 @@ BOOL LLSelectMgr::removeObjectFromSelections(const LLUUID &id) { BOOL object_found = FALSE; LLTool *tool = NULL; - if (!gNoRender) - { - tool = LLToolMgr::getInstance()->getCurrentTool(); - // It's possible that the tool is editing an object that is not selected - LLViewerObject* tool_editing_object = tool->getEditingObject(); - if( tool_editing_object && tool_editing_object->mID == id) - { - tool->stopEditing(); - object_found = TRUE; - } + tool = LLToolMgr::getInstance()->getCurrentTool(); + + // It's possible that the tool is editing an object that is not selected + LLViewerObject* tool_editing_object = tool->getEditingObject(); + if( tool_editing_object && tool_editing_object->mID == id) + { + tool->stopEditing(); + object_found = TRUE; } // Iterate through selected objects list and kill the object |