diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-03-25 19:42:08 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-03-25 19:42:08 -0400 |
| commit | 8a75b90709d461149586db0f0e4fbe0adcda8d6b (patch) | |
| tree | d13e6a96bdcaa6beb8a3e5347313ce753f44000a | |
| parent | 853d9e44534f568d4a17033c7b8ecbafddf7bd69 (diff) | |
EXT-6536 : Make LLVOAvatarSelf a singleton
Minor superficial cleanup to use proper naming conventions.
| -rw-r--r-- | indra/newview/llvoiceclient.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/indra/newview/llvoiceclient.cpp b/indra/newview/llvoiceclient.cpp index 5ba13efca2..0984769a07 100644 --- a/indra/newview/llvoiceclient.cpp +++ b/indra/newview/llvoiceclient.cpp @@ -60,6 +60,7 @@ #include "llappviewer.h" // for gDisconnected, gDisableVoice #include "llmutelist.h" // to check for muted avatars #include "llagent.h" +#include "llvoavatarself.h" #include "llcachename.h" #include "llimview.h" // for LLIMMgr #include "llparcel.h" @@ -5866,9 +5867,9 @@ void LLVoiceClient::updatePosition(void) if(gVoiceClient) { - LLVOAvatar *agent = gAgent.getAvatarObject(); + LLVOAvatarSelf *avatarp = gAgent.getAvatarObject(); LLViewerRegion *region = gAgent.getRegion(); - if(region && agent) + if(region && avatarp) { LLMatrix3 rot; LLVector3d pos; @@ -5886,9 +5887,9 @@ void LLVoiceClient::updatePosition(void) rot); // rotation matrix // Send the current avatar position to the voice code - rot = agent->getRootJoint()->getWorldRotation().getMatrix3(); + rot = avatarp->getRootJoint()->getWorldRotation().getMatrix3(); - pos = agent->getPositionGlobal(); + pos = avatarp->getPositionGlobal(); // TODO: Can we get the head offset from outside the LLVOAvatar? // pos += LLVector3d(mHeadOffset); pos += LLVector3d(0.f, 0.f, 1.f); |