diff options
| author | Eric M. Tulla (BigPapi) <tulla@lindenlab.com> | 2009-11-03 14:52:05 -0500 |
|---|---|---|
| committer | Eric M. Tulla (BigPapi) <tulla@lindenlab.com> | 2009-11-03 14:52:05 -0500 |
| commit | e87975284e2b50c81d95bbb9672678ae262288be (patch) | |
| tree | c081cf1087ac2aa055d0e69737f936138578a2c4 /indra/newview/llselectmgr.cpp | |
| parent | 0dd9871012f50d6201217a79b65bedd28368efae (diff) | |
| parent | 3f8c129a1f4caefcc25c895a6612aaaaa0c6aaa3 (diff) | |
update from viewer2 and merge into avp
--HG--
branch : avatar-pipeline
Diffstat (limited to 'indra/newview/llselectmgr.cpp')
| -rw-r--r-- | indra/newview/llselectmgr.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp index d68897b64f..759c86f3a0 100644 --- a/indra/newview/llselectmgr.cpp +++ b/indra/newview/llselectmgr.cpp @@ -801,6 +801,8 @@ LLObjectSelectionHandle LLSelectMgr::setHoverObject(LLViewerObject *objectp, S32 return NULL; } + mHoverObjects->mPrimaryObject = objectp; + objectp = objectp->getRootEdit(); // is the requested object the same as the existing hover object root? @@ -834,6 +836,11 @@ LLSelectNode *LLSelectMgr::getHoverNode() return mHoverObjects->getFirstRootNode(); } +LLSelectNode *LLSelectMgr::getPrimaryHoverNode() +{ + return mHoverObjects->mSelectNodeMap[mHoverObjects->mPrimaryObject]; +} + void LLSelectMgr::highlightObjectOnly(LLViewerObject* objectp) { if (!objectp) |