diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-03-29 18:07:39 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-03-29 18:07:39 +0100 |
| commit | a85139cd7deaf87493012f6c7589f93ef40730d2 (patch) | |
| tree | 056501dbea279f8b828d3ee4231e1e2d8c86da10 /indra/newview/lltoolselect.cpp | |
| parent | 6507534ad49fd1207c77d3b2f2b4cdcc4b28ee6b (diff) | |
| parent | eb0aaff4aac1dcf9f238242c107df650584efdf9 (diff) | |
merge.
Diffstat (limited to 'indra/newview/lltoolselect.cpp')
| -rw-r--r-- | indra/newview/lltoolselect.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/lltoolselect.cpp b/indra/newview/lltoolselect.cpp index 6e0c6663e9..2065ba1791 100644 --- a/indra/newview/lltoolselect.cpp +++ b/indra/newview/lltoolselect.cpp @@ -169,8 +169,8 @@ LLObjectSelectionHandle LLToolSelect::handleObjectSelection(const LLPickInfo& pi } if (!gAgentCamera.getFocusOnAvatar() && // if camera not glued to avatar - LLVOAvatar::findAvatarFromAttachment(object) != gAgent.getAvatarObject() && // and it's not one of your attachments - object != gAgent.getAvatarObject()) // and it's not you + LLVOAvatar::findAvatarFromAttachment(object) != gAgentAvatarp && // and it's not one of your attachments + object != gAgentAvatarp) // and it's not you { // have avatar turn to face the selected object(s) LLVector3d selection_center = LLSelectMgr::getInstance()->getSelectionCenterGlobal(); |