diff options
author | mberezhnoy <mberezhnoy@productengine.com> | 2013-02-01 01:00:52 +0200 |
---|---|---|
committer | mberezhnoy <mberezhnoy@productengine.com> | 2013-02-01 01:00:52 +0200 |
commit | 8fbc0aada88c6a3743f61dfc57018385a31802f0 (patch) | |
tree | 56888fe7f24736cce1980e08d349d20f84b814ed /indra/newview/llvoavatarself.cpp | |
parent | a12200b91b0ca20dfff2df8aa71c6f53ac0603ee (diff) | |
parent | d2a17e20ca889851406f22907df35b17f5030279 (diff) |
merging
Diffstat (limited to 'indra/newview/llvoavatarself.cpp')
-rw-r--r--[-rwxr-xr-x] | indra/newview/llvoavatarself.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/indra/newview/llvoavatarself.cpp b/indra/newview/llvoavatarself.cpp index 7a81063f83..e32fd3c3c8 100755..100644 --- a/indra/newview/llvoavatarself.cpp +++ b/indra/newview/llvoavatarself.cpp @@ -257,8 +257,6 @@ BOOL LLVOAvatarSelf::loadAvatarSelf() BOOL LLVOAvatarSelf::buildSkeletonSelf(const LLVOAvatarSkeletonInfo *info) { - LLMemType mt(LLMemType::MTYPE_AVATAR); - // add special-purpose "screen" joint mScreenp = new LLViewerJoint("mScreen", NULL); // for now, put screen at origin, as it is only used during special @@ -652,8 +650,6 @@ BOOL LLVOAvatarSelf::loadLayersets() // virtual BOOL LLVOAvatarSelf::updateCharacter(LLAgent &agent) { - LLMemType mt(LLMemType::MTYPE_AVATAR); - // update screen joint size if (mScreenp) { @@ -1008,8 +1004,6 @@ void LLVOAvatarSelf::idleUpdateTractorBeam() // virtual void LLVOAvatarSelf::restoreMeshData() { - LLMemType mt(LLMemType::MTYPE_AVATAR); - //llinfos << "Restoring" << llendl; mMeshValid = TRUE; updateJointLODs(); |