diff options
| author | Richard Nelson <richard@lindenlab.com> | 2007-02-17 03:02:16 +0000 |
|---|---|---|
| committer | Richard Nelson <richard@lindenlab.com> | 2007-02-17 03:02:16 +0000 |
| commit | 73bc0fb42b5bcd80030d9f30d5cb57ec2397ba08 (patch) | |
| tree | e7c0b2e22d4719123fd688e49a16b76a084c3f77 /indra/newview/lltoolselect.cpp | |
| parent | 12ac04231b8d358e70c830f7958f7efbc0f7c0d1 (diff) | |
merge -r 56779:58057 /branches/selection_management
Diffstat (limited to 'indra/newview/lltoolselect.cpp')
| -rw-r--r-- | indra/newview/lltoolselect.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/lltoolselect.cpp b/indra/newview/lltoolselect.cpp index a303776ade..14ffb00158 100644 --- a/indra/newview/lltoolselect.cpp +++ b/indra/newview/lltoolselect.cpp @@ -174,9 +174,10 @@ void LLToolSelect::handleObjectSelection(LLViewerObject *object, MASK mask, BOOL if (!already_selected) { LLViewerObject* root_object = (LLViewerObject*)object->getRootEdit(); + LLObjectSelectionHandle selection = gSelectMgr->getSelection(); // this is just a temporary selection - LLSelectNode* select_node = gSelectMgr->findSelectNode(root_object); + LLSelectNode* select_node = selection->findNode(root_object); if (select_node) { select_node->setTransient(TRUE); @@ -184,7 +185,7 @@ void LLToolSelect::handleObjectSelection(LLViewerObject *object, MASK mask, BOOL for (S32 i = 0; i < (S32)root_object->mChildList.size(); i++) { - select_node = gSelectMgr->findSelectNode(root_object->mChildList[i]); + select_node = selection->findNode(root_object->mChildList[i]); if (select_node) { select_node->setTransient(TRUE); |