diff options
author | Jacek Antonelli | 2008-12-01 17:39:58 -0600 |
---|---|---|
committer | Jacek Antonelli | 2008-12-01 17:40:06 -0600 |
commit | 7abecb48babe6a6f09bf6692ba55076546cfced9 (patch) | |
tree | 8d18a88513fb97adf32c10aae78f4be1984942db /linden/indra/newview/llface.h | |
parent | Second Life viewer sources 1.21.6 (diff) | |
download | meta-impy-7abecb48babe6a6f09bf6692ba55076546cfced9.zip meta-impy-7abecb48babe6a6f09bf6692ba55076546cfced9.tar.gz meta-impy-7abecb48babe6a6f09bf6692ba55076546cfced9.tar.bz2 meta-impy-7abecb48babe6a6f09bf6692ba55076546cfced9.tar.xz |
Second Life viewer sources 1.22.0-RC
Diffstat (limited to 'linden/indra/newview/llface.h')
-rw-r--r-- | linden/indra/newview/llface.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/newview/llface.h b/linden/indra/newview/llface.h index 0501dcc..497b93c 100644 --- a/linden/indra/newview/llface.h +++ b/linden/indra/newview/llface.h | |||
@@ -101,7 +101,6 @@ public: | |||
101 | void setPixelArea(F32 area) { mPixelArea = area; } | 101 | void setPixelArea(F32 area) { mPixelArea = area; } |
102 | F32 getVirtualSize() const { return mVSize; } | 102 | F32 getVirtualSize() const { return mVSize; } |
103 | F32 getPixelArea() const { return mPixelArea; } | 103 | F32 getPixelArea() const { return mPixelArea; } |
104 | void bindTexture(S32 stage = 0) const { LLViewerImage::bindTexture(mTexture, stage); } | ||
105 | 104 | ||
106 | void renderSetColor() const; | 105 | void renderSetColor() const; |
107 | S32 renderElements(const U16 *index_array) const; | 106 | S32 renderElements(const U16 *index_array) const; |
@@ -120,6 +119,7 @@ public: | |||
120 | LLVertexBuffer* getVertexBuffer() const { return mVertexBuffer; } | 119 | LLVertexBuffer* getVertexBuffer() const { return mVertexBuffer; } |
121 | void setPoolType(U32 type) { mPoolType = type; } | 120 | void setPoolType(U32 type) { mPoolType = type; } |
122 | S32 getTEOffset() { return mTEOffset; } | 121 | S32 getTEOffset() { return mTEOffset; } |
122 | LLViewerImage* getTexture() { return mTexture; } | ||
123 | 123 | ||
124 | void setViewerObject(LLViewerObject* object); | 124 | void setViewerObject(LLViewerObject* object); |
125 | void setPool(LLFacePool *pool, LLViewerImage *texturep); | 125 | void setPool(LLFacePool *pool, LLViewerImage *texturep); |