1 files changed, 6 insertions, 20 deletions

diff --git a/linden/indra/newview/lltexlayer.cpp b/linden/indra/newview/lltexlayer.cpp
index fb5be84..5175cbb 100644
--- a/linden/indra/newview/lltexlayer.cpp
+++ b/linden/indra/newview/lltexlayer.cpp
@@ -813,19 +813,14 @@ void LLTexLayerSet::requestUpdate()
         if( mUpdatesEnabled )
         {
                 createComposite();
-                if (mComposite)
-                {
-                        mComposite->requestUpdate(); 
-                }
+                mComposite->requestUpdate(); 
         }
 }
 
 void LLTexLayerSet::requestUpload()
 {
-        if (mComposite)
-        {
-                mComposite->requestUpload();
-        }
+        createComposite();
+        mComposite->requestUpload();
 }
 
 void LLTexLayerSet::cancelUpload()
@@ -840,15 +835,6 @@ void LLTexLayerSet::createComposite()
 {
         if( !mComposite )
         {
-                gPipeline.markGLRebuild(this);
-        }
-   //updateGL();  // KL 
-}
-
-void LLTexLayerSet::updateGL()
-{
-        if (!mComposite)
-        {
                 S32 width = mInfo->mWidth;
                 S32 height = mInfo->mHeight;
                 // Composite other avatars at reduced resolution
@@ -879,7 +865,7 @@ void LLTexLayerSet::setUpdatesEnabled( BOOL b )
 void LLTexLayerSet::updateComposite()
 {
         createComposite();
-        //mComposite->updateImmediate();    //KL exception here this needs fixing for S19
+        mComposite->updateImmediate();
 }
 
 LLTexLayerSetBuffer* LLTexLayerSet::getComposite()
@@ -2118,7 +2104,7 @@ BOOL LLTexLayerParamAlpha::render( S32 x, S32 y, S32 width, S32 height )
                                 // Create the GL texture, and then hang onto it for future use.
                                 if( mNeedsCreateTexture )
                                 {
-                                        mCachedProcessedImageGL->createGLTexture(0, mStaticImageRaw, 0);
+                                        mCachedProcessedImageGL->createGLTexture(0, mStaticImageRaw, 0, TRUE, LLViewerImageBoostLevel::TEXLAYER_CACHE);
                                         mNeedsCreateTexture = FALSE;
                                         gGL.getTexUnit(0)->bind(mCachedProcessedImageGL);
                                         mCachedProcessedImageGL->setAddressMode(LLTexUnit::TAM_CLAMP);
@@ -2574,7 +2560,7 @@ LLImageGL* LLTexStaticImageList::getImageGL(const std::string& file_name, BOOL i
                                 image_gl->setExplicitFormat( GL_ALPHA8, GL_ALPHA );
                         }
 
-                        image_gl->createGLTexture(0, image_raw, 0);
+                        image_gl->createGLTexture(0, image_raw, 0, TRUE, LLViewerImageBoostLevel::OTHER);
 
                         gGL.getTexUnit(0)->bind(image_gl);
                         image_gl->setAddressMode(LLTexUnit::TAM_CLAMP);