summaryrefslogtreecommitdiff
path: root/indra/llprimitive
diff options
context:
space:
mode:
authorGeenz <geenz@geenzo.com>2013-01-11 06:37:21 -0500
committerGeenz <geenz@geenzo.com>2013-01-11 06:37:21 -0500
commiteda11a25a465dd87b187f63da661f2ce02925deb (patch)
treee77e33b4ee7b6f18f314576948be1560c3640ce9 /indra/llprimitive
parente8f6734d67ce1f61c5745bc1b25a9e5d1d599aca (diff)
Initial (largely complete) gamma correct rendering implementation.
Diffstat (limited to 'indra/llprimitive')
-rw-r--r--indra/llprimitive/lltextureentry.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llprimitive/lltextureentry.h b/indra/llprimitive/lltextureentry.h
index b681ce8ca7..ff1cc65bba 100644
--- a/indra/llprimitive/lltextureentry.h
+++ b/indra/llprimitive/lltextureentry.h
@@ -31,6 +31,7 @@
#include "v4color.h"
#include "llsd.h"
#include "llmaterialid.h"
+#include "llmaterial.h"
// These bits are used while unpacking TEM messages to tell which aspects of
// the texture entry changed.
@@ -197,6 +198,7 @@ protected:
U8 mMediaFlags; // replace with web page, movie, etc.
F32 mGlow;
LLMaterialID mMaterialID;
+ LLMaterialPtr mMaterial;
// Note the media data is not sent via the same message structure as the rest of the TE
LLMediaEntry* mMediaEntry; // The media data for the face