livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

EXT-6536 : Make LLVOAvatarSelf a singleton 

Minor superficial cleanup to use proper naming conventions.
meow-7.2.2
Loren Shih 2010-03-25 19:42:08 -04:00
parent 853d9e4453
commit 8a75b90709
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
indra/newview/llvoiceclient.cpp
View File

@ -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);