svn merge -r106055-107012 svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer_1-22/

merge RC5 changes into trunk, plus add'l localization xml (all newly added) files that should have been added with RC0-RC4 merge, but weren't.

1 files changed, 7 insertions, 1 deletions

diff --git a/indra/newview/lltexlayer.h b/indra/newview/lltexlayer.h
index b838415d22..97b55a3d06 100644
--- a/indra/newview/lltexlayer.h
+++ b/indra/newview/lltexlayer.h
@@ -221,22 +221,28 @@ public:
 	BOOL					uploadPending() { return mUploadPending; }
 	BOOL					render( S32 x, S32 y, S32 width, S32 height );
 	void					readBackAndUpload(U8* baked_bump_data);
+	void                    createBumpTexture() ;
+
 	static void				onTextureUploadComplete( const LLUUID& uuid,
 													 void* userdata,
 													 S32 result, LLExtStat ext_status);
 	static void				dumpTotalByteCount();
 
+	virtual void restoreGLTexture() ;
+	virtual void destroyGLTexture() ;
+
 private:
 	void					pushProjection();
 	void					popProjection();
 
 private:
+	BOOL                    mHasBump ;
 	BOOL					mNeedsUpdate;
 	BOOL					mNeedsUpload;
 	BOOL					mUploadPending;
 	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)
 	LLTexLayerSet*			mTexLayerSet;
-	LLGLuint				mBumpTexName;	// zero if none
+	LLPointer<LLImageGL>	mBumpTex;	// zero if none
 
 	static S32				sGLByteCount;
 	static S32				sGLBumpByteCount;