summaryrefslogtreecommitdiff
path: root/indra/newview/llface.h
diff options
context:
space:
mode:
authorTonya Souther <tonya.souther@gmail.com>2013-01-31 11:40:16 -0600
committerTonya Souther <tonya.souther@gmail.com>2013-01-31 11:40:16 -0600
commitc1b110dd1d002b2bcb340dad9350b9717e1ca325 (patch)
tree6466c6c9a1481ef1ced85d5a1a22bdd0978a11ec /indra/newview/llface.h
parentd53f69b67f2aed05fd763932f25cc8b5c40ec774 (diff)
parentd1b224158da7b2e6f7329eadfbd555e9941e1bf9 (diff)
Merging in main repository.
Diffstat (limited to 'indra/newview/llface.h')
-rw-r--r--indra/newview/llface.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llface.h b/indra/newview/llface.h
index de4d03351c..cb76c6e8a6 100644
--- a/indra/newview/llface.h
+++ b/indra/newview/llface.h
@@ -111,6 +111,8 @@ public:
void setTextureIndex(U8 index);
U8 getTextureIndex() const { return mTextureIndex; }
void setTexture(LLViewerTexture* tex) ;
+ void setNormalMap(LLViewerTexture* tex);
+ void setSpecularMap(LLViewerTexture* tex);
void switchTexture(LLViewerTexture* new_texture);
void dirtyTexture();
LLXformMatrix* getXform() const { return mXform; }
@@ -266,6 +268,8 @@ public:
F32 mLastSkinTime;
F32 mLastMoveTime;
LLMatrix4* mTextureMatrix;
+ LLMatrix4* mSpecMapMatrix;
+ LLMatrix4* mNormalMapMatrix;
LLDrawInfo* mDrawInfo;
private:
@@ -285,6 +289,8 @@ private:
LLXformMatrix* mXform;
LLPointer<LLViewerTexture> mTexture;
+ LLPointer<LLViewerTexture> mSpecMap;
+ LLPointer<LLViewerTexture> mNormalMap;
LLPointer<LLDrawable> mDrawablep;
LLPointer<LLViewerObject> mVObjp;
S32 mTEOffset;