From 5aa3f3c808976c3b709bd8141d4338e910c49691 Mon Sep 17 00:00:00 2001
From: Graham Madarasz <graham@lindenlab.com>
Date: Thu, 9 May 2013 15:41:07 -0700
Subject: NORSPEC-164 fix TE copy ctor and operator= to include material
 pointer in addition to ID

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

(limited to 'indra')

diff --git a/indra/llprimitive/lltextureentry.cpp b/indra/llprimitive/lltextureentry.cpp
index 691216e035..53816266eb 100755
--- a/indra/llprimitive/lltextureentry.cpp
+++ b/indra/llprimitive/lltextureentry.cpp
@@ -85,7 +85,7 @@ LLTextureEntry::LLTextureEntry(const LLTextureEntry &rhs)
 	mMediaFlags = rhs.mMediaFlags;
 	mGlow = rhs.mGlow;
 	mMaterialID = rhs.mMaterialID;
-
+	mMaterial = rhs.mMaterial;
 	if (rhs.mMediaEntry != NULL) {
 		// Make a copy
 		mMediaEntry = new LLMediaEntry(*rhs.mMediaEntry);
@@ -107,6 +107,7 @@ LLTextureEntry &LLTextureEntry::operator=(const LLTextureEntry &rhs)
 		mMediaFlags = rhs.mMediaFlags;
 		mGlow = rhs.mGlow;
 		mMaterialID = rhs.mMaterialID;
+		mMaterial = rhs.mMaterial;
 		if (mMediaEntry != NULL) {
 			delete mMediaEntry;
 		}
-- 
cgit v1.2.3