From 63b9bd43ff41da01d549f630bd838caff0dffd97 Mon Sep 17 00:00:00 2001
From: Palmer <palmer@lindenlab.com>
Date: Mon, 2 Nov 2009 14:56:46 -0800
Subject: [PATCH] Repairing things that didn't quite merge properly.

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

diff --git a/indra/llprimitive/llprimitive.cpp b/indra/llprimitive/llprimitive.cpp
index c30ef0350f..da1cfc2074 100644
--- a/indra/llprimitive/llprimitive.cpp
+++ b/indra/llprimitive/llprimitive.cpp
@@ -743,6 +743,8 @@ BOOL LLPrimitive::setVolume(const LLVolumeParams &volume_params, const S32 detai
 		setNumTEs(mVolumep->getNumFaces());
 		return TRUE;
 	}
+	
+	U32 old_face_mask = mVolumep->mFaceMask;
 
 	S32 face_bit = 0;
 	S32 cur_mask = 0;
-- 
GitLab