diff options
author | Geenz <geenz@geenzo.com> | 2013-01-24 16:36:31 -0500 |
---|---|---|
committer | Geenz <geenz@geenzo.com> | 2013-01-24 16:36:31 -0500 |
commit | f39532c407229403f6d67312638bf5dc3514687d (patch) | |
tree | de0f376b3bbe03d585f989adf02c3eadb01347f2 /indra/newview/llvoavatarself.cpp | |
parent | a82ff3fcb7556bd810ec37c0b74c565b42e92250 (diff) | |
parent | a30a2c492d06c9ef843a43c0ff0be6f2826d6d0b (diff) |
Merged with latest viewer-dev.
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(); |