diff options
| author | Brad Kittenbrink <brad@lindenlab.com> | 2009-02-18 21:10:16 +0000 |
|---|---|---|
| committer | Brad Kittenbrink <brad@lindenlab.com> | 2009-02-18 21:10:16 +0000 |
| commit | abdc99f21b542c4fea67030ddbd7166c9d1c6c63 (patch) | |
| tree | 3e984e405adfdec189ca8a047daca5250737ffbf /indra/newview/llagent.cpp | |
| parent | 34412f0530cf6a411b4de906a8e9da59cbcb3a85 (diff) | |
Merge of QAR-1267 to trunk. This was a combo merge of QAR-1175 (maint-render-9) and QAR-1236 (dll-msvcrt-2)
svn merge -r 109838:112264 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-render/maint-render-9-merge-r109833
Diffstat (limited to 'indra/newview/llagent.cpp')
| -rw-r--r-- | indra/newview/llagent.cpp | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp index 7ef757f1ba..569de267e7 100644 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -358,7 +358,6 @@ LLAgent::LLAgent() : mFrameAgent(), - mCrouching(FALSE), mIsBusy(FALSE), mAtKey(0), // Either 1, 0, or -1... indicates that movement-key is pressed @@ -477,8 +476,16 @@ void LLAgent::cleanup() { setSitCamera(LLUUID::null); mAvatarObject = NULL; - mLookAt = NULL; - mPointAt = NULL; + if(mLookAt) + { + mLookAt->markDead() ; + mLookAt = NULL; + } + if(mPointAt) + { + mPointAt->markDead() ; + mPointAt = NULL; + } mRegionp = NULL; setFocusObject(NULL); } @@ -2726,7 +2733,7 @@ BOOL LLAgent::needsRenderAvatar() // TRUE if we need to render your own avatar's head. BOOL LLAgent::needsRenderHead() { - return mShowAvatar && !cameraMouselook(); + return (LLVOAvatar::sVisibleInFirstPerson && LLPipeline::sReflectionRender) || (mShowAvatar && !cameraMouselook()); } //----------------------------------------------------------------------------- |