diff options
author | Geenz <geenz@geenzo.com> | 2013-01-25 17:54:38 -0500 |
---|---|---|
committer | Geenz <geenz@geenzo.com> | 2013-01-25 17:54:38 -0500 |
commit | 5f03e197f4cfb43de93dc42b16b54beafccd376a (patch) | |
tree | 77fe17e9c36021148c18f7f9f33aae5abcd100c0 /indra/llprimitive/lltextureentry.h | |
parent | cc7ae8fbd1fc249f77ced95171e5c22e48adedb6 (diff) |
Trying to set materials up for rendering! Yay!
Diffstat (limited to 'indra/llprimitive/lltextureentry.h')
-rw-r--r-- | indra/llprimitive/lltextureentry.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llprimitive/lltextureentry.h b/indra/llprimitive/lltextureentry.h index ff1cc65bba..c443ebcb30 100644 --- a/indra/llprimitive/lltextureentry.h +++ b/indra/llprimitive/lltextureentry.h @@ -124,6 +124,7 @@ public: S32 setMediaTexGen(U8 media); S32 setGlow(F32 glow); S32 setMaterialID(const LLMaterialID& pMaterialID); + S32 setMaterialParams(const LLMaterialPtr pMaterialParams); virtual const LLUUID &getID() const { return mID; } const LLColor4 &getColor() const { return mColor; } @@ -143,6 +144,7 @@ public: U8 getMediaTexGen() const { return mMediaFlags; } F32 getGlow() const { return mGlow; } const LLMaterialID& getMaterialID() const { return mMaterialID; }; + const LLMaterialPtr getMaterialParams() const { return mMaterial; }; // *NOTE: it is possible for hasMedia() to return true, but getMediaData() to return NULL. // CONVERSELY, it is also possible for hasMedia() to return false, but getMediaData() |