1 files changed, 9 insertions, 40 deletions

diff --git a/linden/indra/newview/lltexlayer.h b/linden/indra/newview/lltexlayer.h
index 742b484..69132fe 100644
--- a/linden/indra/newview/lltexlayer.h
+++ b/linden/indra/newview/lltexlayer.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -211,9 +211,8 @@ public:
         virtual void                    postRender(BOOL success);
         virtual BOOL                    render();
         BOOL                                    updateImmediate();
-        virtual void                    bindTexture();
         void                                    bindBumpTexture( U32 stage );
-        BOOL                                    isInitialized()                                                 { return mInitialized; }  // Initialized here means that we've done at least one render
+        bool                                    isInitialized(void) const;
         BOOL                                    needsRender();
         void                                    requestUpdate();
         void                                    requestUpload();
@@ -221,23 +220,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;
-        BOOL                                    mInitialized;
-        LLGLuint                                mBumpTexName;   // zero if none
+        LLPointer<LLImageGL>    mBumpTex;       // zero if none
 
         static S32                              sGLByteCount;
         static S32                              sGLBumpByteCount;
@@ -529,41 +533,6 @@ public:
 };
 
 
-//-----------------------------------------------------------------------------
-// LLGradientPaletteList
-// A static set of ramp grayscale palettes.  The "effective_weight" is used 
-// to determine the x position of the ramp (offset)
-//
-// "Domain" isn't really the right word.  It refers to the width of the 
-// ramp portion of the function that relates input and output pixel values.
-// A domain of 0 gives a step function.
-// 
-//   |                      /----------------
-//  O|                     / |
-//  u|                    /  |
-//  t|                   /   |
-//  p|------------------/    |
-//  u|                  |    | 
-//  t|<---------------->|<-->|
-//   |  "offset"         "domain"
-//   |
-// --+---Input--------------------------------
-//   |
-//-----------------------------------------------------------------------------
-class LLGradientPaletteList
-{
-public:
-        LLGradientPaletteList() {}
-        ~LLGradientPaletteList();
-
-        void             initPalette(F32 domain);
-        void             setHardwarePalette(F32 domain, F32 effective_weight);
-        
-private:
-        typedef std::map<F32, U8*> palette_map_t;
-        palette_map_t           mPaletteMap;
-};
-
 // Used by LLTexLayerSetBuffer for a callback.
 class LLBakedUploadData
 {