From 8a75b90709d461149586db0f0e4fbe0adcda8d6b Mon Sep 17 00:00:00 2001
From: Loren Shih <seraph@lindenlab.com>
Date: Thu, 25 Mar 2010 19:42:08 -0400
Subject: [PATCH] EXT-6536 : Make LLVOAvatarSelf a singleton
Minor superficial cleanup to use proper naming conventions.
---
indra/newview/llvoiceclient.cpp | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/indra/newview/llvoiceclient.cpp b/indra/newview/llvoiceclient.cpp
index 5ba13efca29..0984769a07c 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);
--
GitLab