diff options
| author | Eric Tulla <tulla@lindenlab.com> | 2009-03-05 00:29:27 +0000 |
|---|---|---|
| committer | Eric Tulla <tulla@lindenlab.com> | 2009-03-05 00:29:27 +0000 |
| commit | 6db6d81b0a90fe7b48a3ccf64ba768e5772397c8 (patch) | |
| tree | c3b9f11fbbfa29cd23b7de22543fd80285ad810d /indra/newview/lltoolfocus.cpp | |
| parent | c0af95e18c57a7e0578df780697042f8a6221431 (diff) | |
Merging in Avatar Pipeline work for Viewer 1.23 (QAR-1272).
No conflicts in the merge.
Result of:
svn merge -r113372:113479 $branches/avatar-pipeline/avatar-pipeline-merge-r113370 .
Diffstat (limited to 'indra/newview/lltoolfocus.cpp')
| -rw-r--r-- | indra/newview/lltoolfocus.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/lltoolfocus.cpp b/indra/newview/lltoolfocus.cpp index 6069f1ffc6..351c02b4c0 100644 --- a/indra/newview/lltoolfocus.cpp +++ b/indra/newview/lltoolfocus.cpp @@ -221,7 +221,7 @@ void LLToolCamera::pickCallback(const LLPickInfo& pick_info) gViewerWindow->getLeftMouseDown() && !gSavedSettings.getBOOL("FreezeTime") && (hit_obj == gAgent.getAvatarObject() || - (hit_obj && hit_obj->isAttachment() && LLVOAvatar::findAvatarFromAttachment(hit_obj)->mIsSelf))) + (hit_obj && hit_obj->isAttachment() && LLVOAvatar::findAvatarFromAttachment(hit_obj)->isSelf()))) { LLToolCamera::getInstance()->mMouseSteering = TRUE; } |