summaryrefslogtreecommitdiff
path: root/indra/newview/lltoolselect.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/lltoolselect.cpp')
-rw-r--r--indra/newview/lltoolselect.cpp5
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);