diff options
| author | Aimee Linden <aimee@lindenlab.com> | 2010-03-29 17:53:21 +0100 |
|---|---|---|
| committer | Aimee Linden <aimee@lindenlab.com> | 2010-03-29 17:53:21 +0100 |
| commit | eb0aaff4aac1dcf9f238242c107df650584efdf9 (patch) | |
| tree | b07b612c33f23e820492b06488a8c406856b64c8 /indra/newview/lltoolselect.cpp | |
| parent | fc0906d6e8c1238fe7fd21c185957ca89511e76e (diff) | |
| parent | b6e7850c0a3d65ed0a1501e19a1655055000e32f (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(); |