Second Life viewer sources 1.22.5-RC

31 files changed, 229 insertions, 120 deletions

diff --git a/linden/indra/llrender/llcubemap.cpp b/linden/indra/llrender/llcubemap.cpp
index 878ae17..60215f0 100644
--- a/linden/indra/llrender/llcubemap.cpp
+++ b/linden/indra/llrender/llcubemap.cpp
@@ -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
diff --git a/linden/indra/llrender/llcubemap.h b/linden/indra/llrender/llcubemap.h
index 15ca7db..8c83e6e 100644
--- a/linden/indra/llrender/llcubemap.h
+++ b/linden/indra/llrender/llcubemap.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
diff --git a/linden/indra/llrender/llfont.cpp b/linden/indra/llrender/llfont.cpp
index bcd0aca..d7310bd 100644
--- a/linden/indra/llrender/llfont.cpp
+++ b/linden/indra/llrender/llfont.cpp
@@ -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
diff --git a/linden/indra/llrender/llfont.h b/linden/indra/llrender/llfont.h
index 2054832..bce8d76 100644
--- a/linden/indra/llrender/llfont.h
+++ b/linden/indra/llrender/llfont.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
diff --git a/linden/indra/llrender/llfontgl.cpp b/linden/indra/llrender/llfontgl.cpp
index 2705516..526f1a9 100644
--- a/linden/indra/llrender/llfontgl.cpp
+++ b/linden/indra/llrender/llfontgl.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/llrender/llfontgl.h b/linden/indra/llrender/llfontgl.h
index 3f88e62..97bdd1a 100644
--- a/linden/indra/llrender/llfontgl.h
+++ b/linden/indra/llrender/llfontgl.h
@@ -5,7 +5,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/llrender/llgl.cpp b/linden/indra/llrender/llgl.cpp
index 67d258e..a9cf073 100644
--- a/linden/indra/llrender/llgl.cpp
+++ b/linden/indra/llrender/llgl.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/llrender/llgl.h b/linden/indra/llrender/llgl.h
index 8433348..011fd63 100644
--- a/linden/indra/llrender/llgl.h
+++ b/linden/indra/llrender/llgl.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/llrender/llgldbg.cpp b/linden/indra/llrender/llgldbg.cpp
index 526215b..27b45a9 100644
--- a/linden/indra/llrender/llgldbg.cpp
+++ b/linden/indra/llrender/llgldbg.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/llrender/llgldbg.h b/linden/indra/llrender/llgldbg.h
index 0e1c986..73ab7fc 100644
--- a/linden/indra/llrender/llgldbg.h
+++ b/linden/indra/llrender/llgldbg.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/llrender/llglheaders.h b/linden/indra/llrender/llglheaders.h
index f047262..20a420b 100644
--- a/linden/indra/llrender/llglheaders.h
+++ b/linden/indra/llrender/llglheaders.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/llrender/llglimmediate.cpp b/linden/indra/llrender/llglimmediate.cpp
index 9b60e49..bade1aa 100644
--- a/linden/indra/llrender/llglimmediate.cpp
+++ b/linden/indra/llrender/llglimmediate.cpp
@@ -7,7 +7,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/llrender/llglimmediate.h b/linden/indra/llrender/llglimmediate.h
index cd2af8b..690abe0 100644
--- a/linden/indra/llrender/llglimmediate.h
+++ b/linden/indra/llrender/llglimmediate.h
@@ -12,7 +12,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/llrender/llglslshader.cpp b/linden/indra/llrender/llglslshader.cpp
index 5d7375c..6683916 100644
--- a/linden/indra/llrender/llglslshader.cpp
+++ b/linden/indra/llrender/llglslshader.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2005&license=viewergpl$
  * 
- * Copyright (c) 2005-2008, Linden Research, Inc.
+ * Copyright (c) 2005-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/llrender/llglslshader.h b/linden/indra/llrender/llglslshader.h
index cd787cc..66c53df 100644
--- a/linden/indra/llrender/llglslshader.h
+++ b/linden/indra/llrender/llglslshader.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/llrender/llglstates.h b/linden/indra/llrender/llglstates.h
index bb8b8df..94d136e 100644
--- a/linden/indra/llrender/llglstates.h
+++ b/linden/indra/llrender/llglstates.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/llrender/llgltypes.h b/linden/indra/llrender/llgltypes.h
index d22d5fa..5809b9c 100644
--- a/linden/indra/llrender/llgltypes.h
+++ b/linden/indra/llrender/llgltypes.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2006&license=viewergpl$
  * 
- * Copyright (c) 2006-2008, Linden Research, Inc.
+ * Copyright (c) 2006-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/llrender/llimagegl.cpp b/linden/indra/llrender/llimagegl.cpp
index 9a392d7..8195eee 100644
--- a/linden/indra/llrender/llimagegl.cpp
+++ b/linden/indra/llrender/llimagegl.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -61,8 +61,56 @@ S32 LLImageGL::sCount					= 0;
 BOOL LLImageGL::sGlobalUseAnisotropic   = FALSE;
 F32 LLImageGL::sLastFrameTime                   = 0.f;
 
+S32 LLImageGL::sMaxTextureSize          = 0 ;
+
 std::set<LLImageGL*> LLImageGL::sImageList;
 
+//**************************************************************************************
+//below are functions for debug use
+//do not delete them even though they are not currently being used.
+void check_all_images()
+{
+        for (std::set<LLImageGL*>::iterator iter = LLImageGL::sImageList.begin();
+                 iter != LLImageGL::sImageList.end(); iter++)
+        {
+                LLImageGL* glimage = *iter;
+                if (glimage->getTexName() && glimage->isGLTextureCreated())
+                {
+                        gGL.getTexUnit(0)->bind(glimage) ;
+                        glimage->checkTexSize() ;
+                        gGL.getTexUnit(0)->unbind(glimage->getTarget()) ;
+                }
+        }
+}
+
+void LLImageGL::checkTexSize() const
+{
+        if (gDebugGL && mTarget == GL_TEXTURE_2D)
+        {
+                GLint texname;
+                glGetIntegerv(GL_TEXTURE_BINDING_2D, &texname);
+                if (texname != mTexName)
+                {
+                        llerrs << "Invalid texture bound!" << llendl;
+                }
+                stop_glerror() ;
+                LLGLint x = 0, y = 0 ;
+                glGetTexLevelParameteriv(mTarget, 0, GL_TEXTURE_WIDTH, (GLint*)&x);
+                glGetTexLevelParameteriv(mTarget, 0, GL_TEXTURE_HEIGHT, (GLint*)&y) ;
+                stop_glerror() ;
+                if(!x || !y)
+                {
+                        return ;
+                }
+                if(x != (mWidth >> mCurrentDiscardLevel) || y != (mHeight >> mCurrentDiscardLevel))
+                {
+                        llerrs << "wrong texture size and discard level!" << llendl ;
+                }
+        }
+}
+//end of debug functions
+//**************************************************************************************
+
 //----------------------------------------------------------------------------
 
 //static
@@ -148,17 +196,22 @@ void LLImageGL::destroyGL(BOOL save_state)
         {
                 gGL.getTexUnit(stage)->unbind(LLTexUnit::TT_TEXTURE);
         }
+        
         for (std::set<LLImageGL*>::iterator iter = sImageList.begin();
                  iter != sImageList.end(); iter++)
         {
                 LLImageGL* glimage = *iter;
-                if (glimage->mTexName && glimage->mComponents)
+                if (glimage->mTexName)
                 {
-                        if (save_state && glimage->isInitialized())
+                        if (save_state && glimage->isGLTextureCreated() && glimage->mComponents)
                         {
                                 glimage->mSaveData = new LLImageRaw;
-                                glimage->readBackRaw(glimage->mCurrentDiscardLevel, glimage->mSaveData, false);
+                                if(!glimage->readBackRaw(glimage->mCurrentDiscardLevel, glimage->mSaveData, false))
+                                {
+                                        glimage->mSaveData = NULL ;
+                                }
                         }
+
                         glimage->destroyGLTexture();
                         stop_glerror();
                 }
@@ -172,9 +225,13 @@ void LLImageGL::restoreGL()
                  iter != sImageList.end(); iter++)
         {
                 LLImageGL* glimage = *iter;
-                if (glimage->mSaveData.notNull() && glimage->mSaveData->getComponents())
+                if(glimage->getTexName())
+                {
+                        llerrs << "tex name is not 0." << llendl ;
+                }
+                if (glimage->mSaveData.notNull())
                 {
-                        if (glimage->getComponents())
+                        if (glimage->getComponents() && glimage->mSaveData->getComponents())
                         {
                                 glimage->createGLTexture(glimage->mCurrentDiscardLevel, glimage->mSaveData);
                                 stop_glerror();
@@ -282,7 +339,7 @@ void LLImageGL::init(BOOL usemipmaps)
         mFormatSwapBytes = FALSE;
         mHasExplicitFormat = FALSE;
 
-        mInitialized = true;
+        mGLTextureCreated = FALSE ;
 }
 
 void LLImageGL::cleanup()
@@ -321,6 +378,16 @@ void LLImageGL::setSize(S32 width, S32 height, S32 ncomponents)
 {
         if (width != mWidth || height != mHeight || ncomponents != mComponents)
         {
+                if(width > 1024 || height > 1024)
+                {
+                        llwarns << "texture size is big: width: " << width << " height: " << height << llendl ;
+                        if(!sMaxTextureSize)
+                        {
+                                glGetIntegerv(GL_MAX_TEXTURE_SIZE, (GLint*)&sMaxTextureSize) ;
+                        }
+                        llwarns << "max texture size is: " << sMaxTextureSize << llendl ;
+                }
+
                 // Check if dimensions are a power of two!
                 if (!checkSize(width,height))
                 {
@@ -644,7 +711,7 @@ void LLImageGL::setImage(const U8* data_in, BOOL data_hasmips)
                 mHasMipMaps = FALSE;
         }
         stop_glerror();
-        mInitialized = true;
+        mGLTextureCreated = true;
 }
 
 BOOL LLImageGL::setSubImage(const U8* datap, S32 data_width, S32 data_height, S32 x_pos, S32 y_pos, S32 width, S32 height)
@@ -734,9 +801,8 @@ BOOL LLImageGL::setSubImage(const U8* datap, S32 data_width, S32 data_height, S3
 
                 glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);
                 stop_glerror();
-                mInitialized = true;
+                mGLTextureCreated = true;
         }
-        
         return TRUE;
 }
 
@@ -751,7 +817,7 @@ BOOL LLImageGL::setSubImageFromFrameBuffer(S32 fb_x, S32 fb_y, S32 x_pos, S32 y_
         if (gGL.getTexUnit(0)->bind(this, true))
         {
                 glCopyTexSubImage2D(GL_TEXTURE_2D, 0, fb_x, fb_y, x_pos, y_pos, width, height);
-                mInitialized = true;
+                mGLTextureCreated = true;
                 stop_glerror();
                 return TRUE;
         }
@@ -761,6 +827,36 @@ BOOL LLImageGL::setSubImageFromFrameBuffer(S32 fb_x, S32 fb_y, S32 x_pos, S32 y_
         }
 }
 
+//create an empty GL texture: just create a texture name
+//the texture is assiciate with some image by calling glTexImage outside LLImageGL
+BOOL LLImageGL::createGLTexture()
+{
+        if (gGLManager.mIsDisabled)
+        {
+                llwarns << "Trying to create a texture while GL is disabled!" << llendl;
+                return FALSE;
+        }
+        
+        mGLTextureCreated = false ; //do not save this texture when gl is destroyed.
+
+        llassert(gGLManager.mInited);
+        stop_glerror();
+
+        if(mTexName)
+        {
+                glDeleteTextures(1, (reinterpret_cast<GLuint*>(&mTexName))) ;
+        }
+        
+        glGenTextures(1, (GLuint*)&mTexName);
+        stop_glerror();
+        if (!mTexName)
+        {
+                llerrs << "LLImageGL::createGLTexture failed to make an empty texture" << llendl;
+        }
+
+        return TRUE ;
+}
+
 BOOL LLImageGL::createGLTexture(S32 discard_level, const LLImageRaw* imageraw, S32 usename/*=0*/)
 {
         if (gGLManager.mIsDisabled)
@@ -768,6 +864,7 @@ BOOL LLImageGL::createGLTexture(S32 discard_level, const LLImageRaw* imageraw, S
                 llwarns << "Trying to create a texture while GL is disabled!" << llendl;
                 return FALSE;
         }
+        mGLTextureCreated = false ;
         llassert(gGLManager.mInited);
         stop_glerror();
 
@@ -873,7 +970,7 @@ BOOL LLImageGL::createGLTexture(S32 discard_level, const U8* data_in, BOOL data_
 #endif
         }
 
-        mCurrentDiscardLevel = discard_level;
+        mCurrentDiscardLevel = discard_level;   
 
         setImage(data_in, data_hasmips);
 
@@ -974,7 +1071,7 @@ BOOL LLImageGL::readBackRaw(S32 discard_level, LLImageRaw* imageraw, bool compre
                 discard_level = mCurrentDiscardLevel;
         }
         
-        if (mTexName == 0 || discard_level < mCurrentDiscardLevel)
+        if (mTexName == 0 || discard_level < mCurrentDiscardLevel || discard_level > mMaxDiscardLevel )
         {
                 return FALSE;
         }
@@ -985,18 +1082,8 @@ BOOL LLImageGL::readBackRaw(S32 discard_level, LLImageRaw* imageraw, bool compre
         gGL.getTexUnit(0)->unbind(mBindTarget);
         llverify(gGL.getTexUnit(0)->bind(this));        
 
-        if (gDebugGL)
-        {
-                if (mTarget == GL_TEXTURE_2D)
-                {
-                        GLint texname;
-                        glGetIntegerv(GL_TEXTURE_BINDING_2D, &texname);
-                        if (texname != mTexName)
-                        {
-                                llerrs << "Invalid texture bound!" << llendl;
-                        }
-                }
-        }
+        //debug code, leave it there commented.
+        //checkTexSize() ;
 
         LLGLint glwidth = 0;
         glGetTexLevelParameteriv(mTarget, gl_discard, GL_TEXTURE_WIDTH, (GLint*)&glwidth);
@@ -1005,7 +1092,7 @@ BOOL LLImageGL::readBackRaw(S32 discard_level, LLImageRaw* imageraw, bool compre
                 // No mip data smaller than current discard level
                 return FALSE;
         }
-
+        
         S32 width = getWidth(discard_level);
         S32 height = getHeight(discard_level);
         S32 ncomponents = getComponents();
@@ -1013,6 +1100,13 @@ BOOL LLImageGL::readBackRaw(S32 discard_level, LLImageRaw* imageraw, bool compre
         {
                 return FALSE;
         }
+        if(width < glwidth)
+        {
+                llwarns << "texture size is smaller than it should be." << llendl ;
+                llwarns << "width: " << width << " glwidth: " << glwidth << " mWidth: " << mWidth << 
+                        " mCurrentDiscardLevel: " << (S32)mCurrentDiscardLevel << " discard_level: " << (S32)discard_level << llendl ;
+                return FALSE ;
+        }
 
         if (width <= 0 || width > 2048 || height <= 0 || height > 2048 || ncomponents < 1 || ncomponents > 4)
         {
@@ -1098,7 +1192,7 @@ void LLImageGL::destroyGLTexture()
 
                 glDeleteTextures(1, (GLuint*)&mTexName);
                 mTexName = 0;
-
+                mGLTextureCreated = FALSE ;
                 stop_glerror();
         }
 }
diff --git a/linden/indra/llrender/llimagegl.h b/linden/indra/llrender/llimagegl.h
index dbe11da..e8c0a4a 100644
--- a/linden/indra/llrender/llimagegl.h
+++ b/linden/indra/llrender/llimagegl.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -90,6 +90,7 @@ public:
 
         void setSize(S32 width, S32 height, S32 ncomponents);
 
+        BOOL createGLTexture() ;
         BOOL createGLTexture(S32 discard_level, const LLImageRaw* imageraw, S32 usename = 0);
         BOOL createGLTexture(S32 discard_level, const U8* data, BOOL data_hasmips = FALSE, S32 usename = 0);
         void setImage(const LLImageRaw* imageraw);
@@ -113,6 +114,8 @@ public:
         S32      getDiscardLevel() const                { return mCurrentDiscardLevel; }
         S32      getMaxDiscardLevel() const             { return mMaxDiscardLevel; }
 
+        S32  getCurrentWidth() const { return mWidth ;}
+        S32  getCurrentHeight() const { return mHeight ;}
         S32      getWidth(S32 discard_level = -1) const;
         S32      getHeight(S32 discard_level = -1) const;
         U8       getComponents() const { return mComponents; }
@@ -134,8 +137,8 @@ public:
         void setTarget(const LLGLenum target, const LLTexUnit::eTextureType bind_target);
 
         LLTexUnit::eTextureType getTarget(void) const { return mBindTarget; }
-        bool isInitialized(void) const { return mInitialized; }
-        void setInitialized (bool initialized) { mInitialized = initialized; }
+        bool isGLTextureCreated(void) const { return mGLTextureCreated ; }
+        void setGLTextureCreated (bool initialized) { mGLTextureCreated = initialized; }
 
         BOOL getUseMipMaps() const { return mUseMipMaps; }
         void setUseMipMaps(BOOL usemips) { mUseMipMaps = usemips; }
@@ -147,6 +150,8 @@ public:
         void updatePickMask(S32 width, S32 height, const U8* data_in);
         BOOL getMask(const LLVector2 &tc);
 
+        void checkTexSize() const ;
+
 protected:
         void init(BOOL usemipmaps);
         virtual void cleanup(); // Clean up the LLImageGL so it can be reinitialized.  Be careful when using this in derived class destructors
@@ -164,21 +169,20 @@ private:
         S8 mHasExplicitFormat; // If false (default), GL format is f(mComponents)
         S8 mAutoGenMips;
         
+        bool     mGLTextureCreated ;
+        LLGLuint mTexName;
+        U16      mWidth;
+        U16      mHeight;       
+        S8       mCurrentDiscardLevel;
+
 protected:
         LLGLenum mTarget;               // Normally GL_TEXTURE2D, sometimes something else (ex. cube maps)
         LLTexUnit::eTextureType mBindTarget;    // Normally TT_TEXTURE, sometimes something else (ex. cube maps)
-        bool mInitialized;
-
-        LLGLuint mTexName;
-
+        
         LLGLboolean mIsResident;
-
-        U16 mWidth;
-        U16 mHeight;
         
         S8 mComponents;
-        S8 mMaxDiscardLevel;
-        S8 mCurrentDiscardLevel;
+        S8 mMaxDiscardLevel;    
         S8 mDontDiscard;                        // Keep full res version of this image (for UI, etc)
 
         S8 mClampS;                                     // Need to save clamp state
@@ -209,6 +213,7 @@ public:
         static U32 sUniqueCount;                                // Tracks number of unique texture binds for current frame
         static BOOL sGlobalUseAnisotropic;
 
+        static S32 sMaxTextureSize ;
 #if DEBUG_MISS
         BOOL mMissed; // Missed on last bind?
         BOOL getMissed() const { return mMissed; };
diff --git a/linden/indra/llrender/llpostprocess.cpp b/linden/indra/llrender/llpostprocess.cpp
index 0f1ad5c..92a0854 100644
--- a/linden/indra/llrender/llpostprocess.cpp
+++ b/linden/indra/llrender/llpostprocess.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2007&license=viewergpl$
  * 
- * Copyright (c) 2007-2008, Linden Research, Inc.
+ * Copyright (c) 2007-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -51,12 +51,14 @@ static const float LUMINANCE_B = 0.114f;
 static const char * const XML_FILENAME = "postprocesseffects.xml";
 
 LLPostProcess::LLPostProcess(void) : 
-                                        sceneRenderTexture(0), noiseTexture(0),
-                                        tempBloomTexture(0),
                                         initialized(false),  
                                         mAllEffects(LLSD::emptyMap()),
                                         screenW(1), screenH(1)
 {
+        mSceneRenderTexture = NULL ; 
+        mNoiseTexture = NULL ;
+        mTempBloomTexture = NULL ;
+                                        
         /*  Do nothing.  Needs to be updated to use our current shader system, and to work with the move into llrender.
         std::string pathName(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "windlight", XML_FILENAME));
         LL_DEBUGS2("AppInit", "Shaders") << "Loading PostProcess Effects settings from " << pathName << LL_ENDL;
@@ -110,9 +112,7 @@ LLPostProcess::LLPostProcess(void) :
 
 LLPostProcess::~LLPostProcess(void)
 {
-        glDeleteTextures(1, &sceneRenderTexture);
-        glDeleteTextures(1, &noiseTexture);
-        glDeleteTextures(1, &tempBloomTexture);
+        invalidate() ;
 }
 
 // static
@@ -157,6 +157,13 @@ void LLPostProcess::saveEffect(std::string const & effectName)
         formatter->format(mAllEffects, effectsXML);
         */
 }
+void LLPostProcess::invalidate()
+{
+        mSceneRenderTexture = NULL ;
+        mNoiseTexture = NULL ;
+        mTempBloomTexture = NULL ;
+        initialized = FALSE ;
+}
 
 void LLPostProcess::apply(unsigned int width, unsigned int height)
 {
@@ -172,7 +179,7 @@ void LLPostProcess::initialize(unsigned int width, unsigned int height)
 {
         screenW = width;
         screenH = height;
-        createTexture(sceneRenderTexture, screenW, screenH);
+        createTexture(mSceneRenderTexture, screenW, screenH);
         initialized = true;
 
         checkError();
@@ -198,16 +205,20 @@ void LLPostProcess::applyShaders(void)
         }       
         if (tweaks.useNightVisionShader()){
                 /// If any of the above shaders have been called update the frame buffer;
-                if (tweaks.useColorFilter()){
-                        copyFrameBuffer(sceneRenderTexture, screenW, screenH);
+                if (tweaks.useColorFilter())
+                {
+                        GLuint tex = mSceneRenderTexture->getTexName() ;
+                        copyFrameBuffer(tex, screenW, screenH);
                 }
                 applyNightVisionShader();
                 checkError();
         }
         if (tweaks.useBloomShader()){
                 /// If any of the above shaders have been called update the frame buffer;
-                if (tweaks.useColorFilter().asBoolean() || tweaks.useNightVisionShader().asBoolean()){
-                        copyFrameBuffer(sceneRenderTexture, screenW, screenH);
+                if (tweaks.useColorFilter().asBoolean() || tweaks.useNightVisionShader().asBoolean())
+                {
+                        GLuint tex = mSceneRenderTexture->getTexName() ;
+                        copyFrameBuffer(tex, screenW, screenH);
                 }
                 applyBloomShader();
                 checkError();
@@ -305,7 +316,7 @@ void LLPostProcess::createNightVisionShader(void)
         nightVisionUniforms["noiseStrength"] = 0;
         nightVisionUniforms["lumWeights"] = 0;  
 
-        createNoiseTexture(noiseTexture);
+        createNoiseTexture(mNoiseTexture);
 }
 
 void LLPostProcess::applyBloomShader(void)
@@ -315,7 +326,7 @@ void LLPostProcess::applyBloomShader(void)
 
 void LLPostProcess::createBloomShader(void)
 {
-        createTexture(tempBloomTexture, unsigned(screenW * 0.5), unsigned(screenH * 0.5));
+        createTexture(mTempBloomTexture, unsigned(screenW * 0.5), unsigned(screenH * 0.5));
 
         /// Create Bloom Extract Shader
         bloomExtractUniforms["RenderTexture"] = 0;
@@ -347,7 +358,10 @@ void LLPostProcess::doEffects(void)
         glPushClientAttrib(GL_ALL_ATTRIB_BITS);
 
         /// Copy the screen buffer to the render texture
-        copyFrameBuffer(sceneRenderTexture, screenW, screenH);
+        {
+                GLuint tex = mSceneRenderTexture->getTexName() ;
+                copyFrameBuffer(tex, screenW, screenH);
+        }
 
         /// Clear the frame buffer.
         glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
@@ -478,43 +492,42 @@ void LLPostProcess::changeOrthogonal(unsigned int width, unsigned int height)
         viewOrthogonal(width, height);
 }
 
-void LLPostProcess::createTexture(GLuint & texture, unsigned int width, unsigned int height)
+void LLPostProcess::createTexture(LLPointer<LLImageGL>& texture, unsigned int width, unsigned int height)
 {
-        if (texture != 0){
-                glDeleteTextures(1, &texture);
-        }
-
-        std::vector<GLubyte> data(width * height * 4, 0);
-
-        glGenTextures(1, &texture);
-        gGL.getTexUnit(0)->bindManual(LLTexUnit::TT_RECT_TEXTURE, texture);
-        glTexImage2D(GL_TEXTURE_RECTANGLE_ARB, 0, 4, width, height, 0,
-                GL_RGBA, GL_UNSIGNED_BYTE, &data[0]);
-        glTexParameteri(GL_TEXTURE_RECTANGLE_ARB,GL_TEXTURE_MIN_FILTER,GL_LINEAR);
-        glTexParameteri(GL_TEXTURE_RECTANGLE_ARB,GL_TEXTURE_MAG_FILTER,GL_LINEAR);
-        glTexParameteri(GL_TEXTURE_RECTANGLE_ARB,GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-        glTexParameteri(GL_TEXTURE_RECTANGLE_ARB,GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-}
+        std::vector<GLubyte> data(width * height * 4, 0) ;
 
-void LLPostProcess::createNoiseTexture(GLuint & texture)
-{
-        if (texture != 0){
-                glDeleteTextures(1, &texture);
+        texture = new LLImageGL(FALSE) ;        
+        if(texture->createGLTexture())
+        {
+                gGL.getTexUnit(0)->bindManual(LLTexUnit::TT_RECT_TEXTURE, texture->getTexName());
+                glTexImage2D(GL_TEXTURE_RECTANGLE_ARB, 0, 4, width, height, 0,
+                        GL_RGBA, GL_UNSIGNED_BYTE, &data[0]);
+                glTexParameteri(GL_TEXTURE_RECTANGLE_ARB,GL_TEXTURE_MIN_FILTER,GL_LINEAR);
+                glTexParameteri(GL_TEXTURE_RECTANGLE_ARB,GL_TEXTURE_MAG_FILTER,GL_LINEAR);
+                glTexParameteri(GL_TEXTURE_RECTANGLE_ARB,GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+                glTexParameteri(GL_TEXTURE_RECTANGLE_ARB,GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
         }
-        glGenTextures(1, &texture);
+}
 
+void LLPostProcess::createNoiseTexture(LLPointer<LLImageGL>& texture)
+{       
         std::vector<GLubyte> buffer(NOISE_SIZE * NOISE_SIZE);
         for (unsigned int i = 0; i < NOISE_SIZE; i++){
                 for (unsigned int k = 0; k < NOISE_SIZE; k++){
                         buffer[(i * NOISE_SIZE) + k] = (GLubyte)((double) rand() / ((double) RAND_MAX + 1.f) * 255.f);
                 }
         }
-        gGL.getTexUnit(0)->bindManual(LLTexUnit::TT_TEXTURE, texture);
-        glTexImage2D(GL_TEXTURE_2D, 0, GL_LUMINANCE, NOISE_SIZE, NOISE_SIZE, 0, GL_LUMINANCE, GL_UNSIGNED_BYTE, &buffer[0]);
-        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER,GL_LINEAR);
-        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER,GL_LINEAR);
-        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
-        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
+
+        texture = new LLImageGL(FALSE) ;
+        if(texture->createGLTexture())
+        {
+                gGL.getTexUnit(0)->bindManual(LLTexUnit::TT_TEXTURE, texture->getTexName());
+                glTexImage2D(GL_TEXTURE_2D, 0, GL_LUMINANCE, NOISE_SIZE, NOISE_SIZE, 0, GL_LUMINANCE, GL_UNSIGNED_BYTE, &buffer[0]);
+                glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER,GL_LINEAR);
+                glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER,GL_LINEAR);
+                glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
+                glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
+        }
 }
 
 bool LLPostProcess::checkError(void)
diff --git a/linden/indra/llrender/llpostprocess.h b/linden/indra/llrender/llpostprocess.h
index cd9f477..b191e9d 100644
--- a/linden/indra/llrender/llpostprocess.h
+++ b/linden/indra/llrender/llpostprocess.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2007&license=viewergpl$
  * 
- * Copyright (c) 2007-2008, Linden Research, Inc.
+ * Copyright (c) 2007-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -183,21 +183,24 @@ public:
 
         };
         
-        GLuint sceneRenderTexture;
-        GLuint noiseTexture;
-        GLuint tempBloomTexture;
         bool initialized;
         PostProcessTweaks tweaks;
 
         // the map of all availible effects
         LLSD mAllEffects;
 
+private:
+        LLPointer<LLImageGL> mSceneRenderTexture ;
+        LLPointer<LLImageGL> mNoiseTexture ;
+        LLPointer<LLImageGL> mTempBloomTexture ;
+
 public:
         LLPostProcess(void);
 
         ~LLPostProcess(void);
 
         void apply(unsigned int width, unsigned int height);
+        void invalidate() ;
 
         /// Perform global initialization for this class.
         static void initClass(void);
@@ -251,9 +254,9 @@ private:
 
         /// OpenGL Helper Functions
         void getShaderUniforms(glslUniforms & uniforms, GLhandleARB & prog);
-        void createTexture(GLuint & texture, unsigned int width, unsigned int height);
+        void createTexture(LLPointer<LLImageGL>& texture, unsigned int width, unsigned int height);
         void copyFrameBuffer(GLuint & texture, unsigned int width, unsigned int height);
-        void createNoiseTexture(GLuint & texture);
+        void createNoiseTexture(LLPointer<LLImageGL>& texture);
         bool checkError(void);
         void checkShaderError(GLhandleARB shader);
         void drawOrthoQuad(unsigned int width, unsigned int height, QuadType type);
diff --git a/linden/indra/llrender/llrender.cpp b/linden/indra/llrender/llrender.cpp
index fcd76d4..ff0a2db 100644
--- a/linden/indra/llrender/llrender.cpp
+++ b/linden/indra/llrender/llrender.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -186,17 +186,11 @@ bool LLTexUnit::bind(const LLImageGL* texture, bool forceBind)
                 llwarns << "NULL LLTexUnit::bind texture" << llendl;
                 return false;
         }
-
-        if (!texture->isInitialized() && !forceBind)
-        {
-                return texture->bindDefaultImage(mIndex);
-        }
-
+        
         if (!texture->getTexName()) //if texture does not exist
         {
                 return texture->bindDefaultImage(mIndex);
         }
-
         // Disabled caching of binding state.
         activate();
         enable(texture->getTarget());
diff --git a/linden/indra/llrender/llrender.h b/linden/indra/llrender/llrender.h
index 7dcb504..e949190 100644
--- a/linden/indra/llrender/llrender.h
+++ b/linden/indra/llrender/llrender.h
@@ -9,7 +9,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/llrender/llrendersphere.cpp b/linden/indra/llrender/llrendersphere.cpp
index 0c3cd19..6aaa03e 100644
--- a/linden/indra/llrender/llrendersphere.cpp
+++ b/linden/indra/llrender/llrendersphere.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/llrender/llrendersphere.h b/linden/indra/llrender/llrendersphere.h
index ace57e4..d48b917 100644
--- a/linden/indra/llrender/llrendersphere.h
+++ b/linden/indra/llrender/llrendersphere.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=internal$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * The following source code is PROPRIETARY AND CONFIDENTIAL. Use of
  * this source code is governed by the Linden Lab Source Code Disclosure
diff --git a/linden/indra/llrender/llrendertarget.cpp b/linden/indra/llrender/llrendertarget.cpp
index 9d693a7..392ec24 100644
--- a/linden/indra/llrender/llrendertarget.cpp
+++ b/linden/indra/llrender/llrendertarget.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/llrender/llrendertarget.h b/linden/indra/llrender/llrendertarget.h
index 65bab8b..38a41cb 100644
--- a/linden/indra/llrender/llrendertarget.h
+++ b/linden/indra/llrender/llrendertarget.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/llrender/llshadermgr.cpp b/linden/indra/llrender/llshadermgr.cpp
index d884c15..3046d19 100644
--- a/linden/indra/llrender/llshadermgr.cpp
+++ b/linden/indra/llrender/llshadermgr.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2005&license=viewergpl$
  * 
- * Copyright (c) 2005-2008, Linden Research, Inc.
+ * Copyright (c) 2005-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/llrender/llshadermgr.h b/linden/indra/llrender/llshadermgr.h
index 8918416..1f78e30 100644
--- a/linden/indra/llrender/llshadermgr.h
+++ b/linden/indra/llrender/llshadermgr.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/llrender/llvertexbuffer.cpp b/linden/indra/llrender/llvertexbuffer.cpp
index 465c4ca..cb7f352 100644
--- a/linden/indra/llrender/llvertexbuffer.cpp
+++ b/linden/indra/llrender/llvertexbuffer.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2003&license=viewergpl$
  * 
- * Copyright (c) 2003-2008, Linden Research, Inc.
+ * Copyright (c) 2003-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/llrender/llvertexbuffer.h b/linden/indra/llrender/llvertexbuffer.h
index a97c74e..aa1aafc 100644
--- a/linden/indra/llrender/llvertexbuffer.h
+++ b/linden/indra/llrender/llvertexbuffer.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2003&license=viewergpl$
  * 
- * Copyright (c) 2003-2008, Linden Research, Inc.
+ * Copyright (c) 2003-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab