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/llviewerobjectlist.cpp | |
| parent | 12ac04231b8d358e70c830f7958f7efbc0f7c0d1 (diff) | |
merge -r 56779:58057 /branches/selection_management
Diffstat (limited to 'indra/newview/llviewerobjectlist.cpp')
| -rw-r--r-- | indra/newview/llviewerobjectlist.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/indra/newview/llviewerobjectlist.cpp b/indra/newview/llviewerobjectlist.cpp index b630572a9b..f4c733299f 100644 --- a/indra/newview/llviewerobjectlist.cpp +++ b/indra/newview/llviewerobjectlist.cpp @@ -211,7 +211,7 @@ void LLViewerObjectList::processUpdateCore(LLViewerObject* objectp, && update_type != OUT_TERSE_IMPROVED && objectp->mCreateSelected) { - if ( gToolMgr->getCurrentTool( gKeyboard->currentMask(TRUE) ) != gToolPie ) + if ( gToolMgr->getCurrentTool() != gToolPie ) { //llinfos << "DEBUG selecting " << objectp->mID << " " // << objectp->mLocalID << llendl; @@ -565,7 +565,8 @@ void LLViewerObjectList::updateApparentAngles(LLAgent &agent) } // Selected - for (objectp = gSelectMgr->getFirstRootObject(); objectp; objectp = gSelectMgr->getNextRootObject()) + LLObjectSelectionHandle selection = gSelectMgr->getSelection(); + for (objectp = selection->getFirstRootObject(); objectp; objectp = selection->getNextRootObject()) { objectp->boostTexturePriority(); } @@ -1421,7 +1422,7 @@ void LLViewerObjectList::findOrphans(LLViewerObject* objectp, U32 ip, U32 port) if (orphans_found && objectp->isSelected()) { - LLSelectNode* nodep = gSelectMgr->findSelectNode(objectp); + LLSelectNode* nodep = gSelectMgr->getSelection()->findNode(objectp); if (nodep && !nodep->mIndividualSelection) { // rebuild selection with orphans |