diff options
Diffstat (limited to 'linden/indra/newview/lltexlayer.h')
-rw-r--r-- | linden/indra/newview/lltexlayer.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/linden/indra/newview/lltexlayer.h b/linden/indra/newview/lltexlayer.h index bd59c66..69132fe 100644 --- a/linden/indra/newview/lltexlayer.h +++ b/linden/indra/newview/lltexlayer.h | |||
@@ -4,7 +4,7 @@ | |||
4 | * | 4 | * |
5 | * $LicenseInfo:firstyear=2002&license=viewergpl$ | 5 | * $LicenseInfo:firstyear=2002&license=viewergpl$ |
6 | * | 6 | * |
7 | * Copyright (c) 2002-2008, Linden Research, Inc. | 7 | * Copyright (c) 2002-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 |
@@ -220,22 +220,28 @@ public: | |||
220 | BOOL uploadPending() { return mUploadPending; } | 220 | BOOL uploadPending() { return mUploadPending; } |
221 | BOOL render( S32 x, S32 y, S32 width, S32 height ); | 221 | BOOL render( S32 x, S32 y, S32 width, S32 height ); |
222 | void readBackAndUpload(U8* baked_bump_data); | 222 | void readBackAndUpload(U8* baked_bump_data); |
223 | void createBumpTexture() ; | ||
224 | |||
223 | static void onTextureUploadComplete( const LLUUID& uuid, | 225 | static void onTextureUploadComplete( const LLUUID& uuid, |
224 | void* userdata, | 226 | void* userdata, |
225 | S32 result, LLExtStat ext_status); | 227 | S32 result, LLExtStat ext_status); |
226 | static void dumpTotalByteCount(); | 228 | static void dumpTotalByteCount(); |
227 | 229 | ||
230 | virtual void restoreGLTexture() ; | ||
231 | virtual void destroyGLTexture() ; | ||
232 | |||
228 | private: | 233 | private: |
229 | void pushProjection(); | 234 | void pushProjection(); |
230 | void popProjection(); | 235 | void popProjection(); |
231 | 236 | ||
232 | private: | 237 | private: |
238 | BOOL mHasBump ; | ||
233 | BOOL mNeedsUpdate; | 239 | BOOL mNeedsUpdate; |
234 | BOOL mNeedsUpload; | 240 | BOOL mNeedsUpload; |
235 | BOOL mUploadPending; | 241 | BOOL mUploadPending; |
236 | LLUUID mUploadID; // Identifys the current upload process (null if none). Used to avoid overlaps (eg, when the user rapidly makes two changes outside of Face Edit) | 242 | LLUUID mUploadID; // Identifys the current upload process (null if none). Used to avoid overlaps (eg, when the user rapidly makes two changes outside of Face Edit) |
237 | LLTexLayerSet* mTexLayerSet; | 243 | LLTexLayerSet* mTexLayerSet; |
238 | LLGLuint mBumpTexName; // zero if none | 244 | LLPointer<LLImageGL> mBumpTex; // zero if none |
239 | 245 | ||
240 | static S32 sGLByteCount; | 246 | static S32 sGLByteCount; |
241 | static S32 sGLBumpByteCount; | 247 | static S32 sGLBumpByteCount; |