diff options
| author | Rick Pasetto <rick@lindenlab.com> | 2009-11-03 09:44:09 -0800 |
|---|---|---|
| committer | Rick Pasetto <rick@lindenlab.com> | 2009-11-03 09:44:09 -0800 |
| commit | a0bbe8d8eb98aaba1dc55c7cbcb70d58125781ce (patch) | |
| tree | 279f3421a88280d6003d6973dcb5556702e2c52f /indra/newview/llselectmgr.cpp | |
| parent | c59e2d21174415842b1418c5f389becb7c013706 (diff) | |
| parent | c9d121dd01625790cb963372c861f8e4072430d2 (diff) | |
merge from remote repo
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) |