From 1b550aaec246063090fe7143145d69eebfbd4680 Mon Sep 17 00:00:00 2001
From: Don Kjer <don@lindenlab.com>
Date: Thu, 11 Oct 2007 00:28:42 +0000
Subject: EFFECTIVE MERGE: svn merge -r 69928:70806
 svn+ssh://svn/svn/linden/branches/maintenance-1 && svn merge -r 70948:70949
 svn+ssh://svn/svn/linden/branches/maintenance-1-qa into release ACTUAL MERGE:
 svn merge -r 71430:71431
 svn+ssh://svn/svn/linden/qa/maintenance-1-merge-71429 into release

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

(limited to 'indra/llprimitive/llprimitive.cpp')

diff --git a/indra/llprimitive/llprimitive.cpp b/indra/llprimitive/llprimitive.cpp
index 628f7f8cc8..b41879380f 100644
--- a/indra/llprimitive/llprimitive.cpp
+++ b/indra/llprimitive/llprimitive.cpp
@@ -863,6 +863,7 @@ void LLPrimitive::copyTEs(const LLPrimitive *primitivep)
 		setTERotation(i, tep->getRotation());
 		setTEBumpShinyFullbright(i, tep->getBumpShinyFullbright());
 		setTEMediaTexGen(i, tep->getMediaTexGen());
+		setTEGlow(i, tep->getGlow());
 	}
 }
 
-- 
cgit v1.2.3