From ea8fb7238e6f12383ee4bc081475fa6235637581 Mon Sep 17 00:00:00 2001 From: Josh Bell Date: Sat, 31 Mar 2007 01:41:19 +0000 Subject: svn merge -r 59364:59813 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release --- indra/newview/llface.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'indra/newview/llface.cpp') diff --git a/indra/newview/llface.cpp b/indra/newview/llface.cpp index 280abcd541..b3e68e24df 100644 --- a/indra/newview/llface.cpp +++ b/indra/newview/llface.cpp @@ -231,8 +231,6 @@ void LLFace::setDrawable(LLDrawable *drawable) void LLFace::setSize(const S32 num_vertices, const S32 num_indices) { - LLMemType mt1(LLMemType::MTYPE_DRAWABLE); - mGeomCount = num_vertices; mIndicesCount = num_indices; } @@ -950,17 +948,17 @@ BOOL LLFace::getGeometryVolume(const LLVolume& volume, } else { - if (mode & LLViewerTextureAnim::TRANSLATE) + //if (mode & LLViewerTextureAnim::TRANSLATE) { os = ot = 0.f; } - if (mode & LLViewerTextureAnim::ROTATE) + //if (mode & LLViewerTextureAnim::ROTATE) { r = 0.f; cos_ang = 1.f; sin_ang = 0.f; } - if (mode & LLViewerTextureAnim::SCALE) + //if (mode & LLViewerTextureAnim::SCALE) { ms = mt = 1.f; } -- cgit v1.2.3