diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2009-11-02 14:11:07 -0800 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2009-11-02 14:11:07 -0800 |
| commit | 43c5ab0be2bf165c660439c3449247454d37e368 (patch) | |
| tree | abff0df76c30c0f45a1626db3b49dfc95c4ed1f5 /indra/newview/llselectmgr.cpp | |
| parent | d28e37b9fc0413a24e75a2a7c78a109abbe67330 (diff) | |
EXT-1744 1-click Sit object not spawning an object inspector
EXT-1810 Right clicking own avatar displayed semi-transparent menus
EXT-1927 Hook up Push-to-talk in Preferences > Advanced
reviewed by richard
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) |