diff options
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/llface.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linden/indra/newview/llface.h b/linden/indra/newview/llface.h index 0501dcc..e4ff28f 100644 --- a/linden/indra/newview/llface.h +++ b/linden/indra/newview/llface.h | |||
@@ -4,7 +4,7 @@ | |||
4 | * | 4 | * |
5 | * $LicenseInfo:firstyear=2001&license=viewergpl$ | 5 | * $LicenseInfo:firstyear=2001&license=viewergpl$ |
6 | * | 6 | * |
7 | * Copyright (c) 2001-2008, Linden Research, Inc. | 7 | * Copyright (c) 2001-2009, Linden Research, Inc. |
8 | * | 8 | * |
9 | * Second Life Viewer Source Code | 9 | * Second Life Viewer Source Code |
10 | * The source code in this file ("Source Code") is provided by Linden Lab | 10 | * The source code in this file ("Source Code") is provided by Linden Lab |
@@ -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); |