diff options
| author | Don Kjer <don@lindenlab.com> | 2011-02-18 23:16:38 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2011-02-18 23:16:38 +0000 |
| commit | 774405e92bec6bdfa9e2be28e04b4b47fd71615e (patch) | |
| tree | b31140c5fe134fa95fdae03cbac3aec44916f55c /indra/newview/llselectmgr.cpp | |
| parent | a4de39381ffcfeb455c3860ace7e7da7f756f774 (diff) | |
Cleanup of headless client (was: DisableRendering mode)
* Now called 'HeadlessClient' instead of 'DisableRendering'
* Removed most cases where we skipped certain behaviors in the client when in this mode. This gets us closer to a 'true' client, for testing purposes.
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 |