summaryrefslogtreecommitdiff
path: root/indra/newview/llmorphview.cpp
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2010-03-26 14:33:48 -0400
committerLoren Shih <seraph@lindenlab.com>2010-03-26 14:33:48 -0400
commit46fe5d49caef6c8db3df9d88f0d0ec773ef28095 (patch)
tree87f8ae2f01d871b23b9d1c1ef9f9ce736dbc8c98 /indra/newview/llmorphview.cpp
parent0bcfbde3a4265d7963ea501622e512de8eab7f61 (diff)
EXT-6536 : Make LLVOAvatarSelf a singleton
Superficial cleanup so that all instances of gAgent.getAvatarObject() use "LLVOAvatarSelf *avatarp = gAgent.getAvatarObject".
Diffstat (limited to 'indra/newview/llmorphview.cpp')
-rw-r--r--indra/newview/llmorphview.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/newview/llmorphview.cpp b/indra/newview/llmorphview.cpp
index 28da9a2b90..cb48db15e4 100644
--- a/indra/newview/llmorphview.cpp
+++ b/indra/newview/llmorphview.cpp
@@ -89,7 +89,7 @@ void LLMorphView::initialize()
mCameraYaw = 0.f;
mCameraDist = -1.f;
- LLVOAvatar *avatarp = gAgent.getAvatarObject();
+ LLVOAvatarSelf *avatarp = gAgent.getAvatarObject();
if (!avatarp || avatarp->isDead())
{
gAgentCamera.changeCameraToDefault();
@@ -111,7 +111,7 @@ void LLMorphView::shutdown()
{
LLVOAvatarSelf::onCustomizeEnd();
- LLVOAvatar *avatarp = gAgent.getAvatarObject();
+ LLVOAvatarSelf *avatarp = gAgent.getAvatarObject();
if (avatarp && !avatarp->isDead())
{
avatarp->startMotion( ANIM_AGENT_BODY_NOISE );
@@ -167,12 +167,12 @@ void LLMorphView::updateCamera()
setCameraTargetJoint(gAgent.getAvatarObject()->getJoint("mHead"));
}
- LLVOAvatar* avatar = gAgent.getAvatarObject();
- if( !avatar )
+ LLVOAvatarSelf* avatarp = gAgent.getAvatarObject();
+ if (!avatarp)
{
return;
}
- LLJoint* root_joint = avatar->getRootJoint();
+ LLJoint* root_joint = avatarp->getRootJoint();
if( !root_joint )
{
return;