From 1c495c56c1011f4514d96b75cbcfb5a8256de78f Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Thu, 5 Nov 2009 17:12:18 -0600
Subject: Fix for crash on teleport to mesh enabled region. Fix for flashing
 meshes on LOD switch.

---
 indra/llprimitive/llprimitive.cpp | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'indra/llprimitive')

diff --git a/indra/llprimitive/llprimitive.cpp b/indra/llprimitive/llprimitive.cpp
index da1cfc2074..52265e7ad5 100644
--- a/indra/llprimitive/llprimitive.cpp
+++ b/indra/llprimitive/llprimitive.cpp
@@ -744,6 +744,7 @@ BOOL LLPrimitive::setVolume(const LLVolumeParams &volume_params, const S32 detai
 		return TRUE;
 	}
 	
+#if 0
 	U32 old_face_mask = mVolumep->mFaceMask;
 
 	S32 face_bit = 0;
@@ -941,6 +942,9 @@ BOOL LLPrimitive::setVolume(const LLVolumeParams &volume_params, const S32 detai
 			setTE(te_num, *(old_tes.getTexture(face_mapping[face_bit])));
 		}
 	}
+#else
+	setNumTEs(mVolumep->getNumFaces());
+#endif
 	return TRUE;
 }
 
-- 
cgit v1.2.3