1 files changed, 21 insertions, 17 deletions

diff --git a/linden/indra/newview/llface.h b/linden/indra/newview/llface.h
index 4893e82..9f76d6b 100644
--- a/linden/indra/newview/llface.h
+++ b/linden/indra/newview/llface.h
@@ -48,6 +48,7 @@
 #include "llviewerimage.h"
 #include "llstat.h"
 #include "lldrawable.h"
+#include "lltextureatlasmanager.h"
 
 class LLFacePool;
 class LLVolume;
@@ -56,6 +57,7 @@ class LLTextureEntry;
 class LLVertexProgram;
 class LLViewerImage;
 class LLGeometryManager;
+class LLTextureAtlasSlot;
 
 const F32 MIN_ALPHA_SIZE = 1024.f;
 const F32 MIN_TEX_ANIM_SIZE = 512.f;
@@ -189,14 +191,18 @@ public:
         void            setIndicesIndex(S32 idx) { mIndicesIndex = idx; }
         void            setDrawInfo(LLDrawInfo* draw_info);
 
-        F32         getTextureVirtualSize() ;
-        F32         getImportanceToCamera()const {return mImportanceToCamera ;}
-
-private:        
-        F32         adjustPartialOverlapPixelArea(F32 cos_angle_to_view_dir, F32 radius );
-        F32         calcPixelArea(F32& cos_angle_to_view_dir, F32& radius) ;
-public:
-        static F32  calcImportanceToCamera(F32 to_view_dir, F32 dist);
+     // KL was atlas S19
+        LLImageGL*            getGLTexture() const;
+        LLTextureAtlasSlot* getAtlasInfo() ;
+        void                  setAtlasInUse(BOOL flag);
+        void                  setAtlasInfo(LLTextureAtlasSlot* atlasp);
+        BOOL                  isAtlasInUse()const;
+        BOOL                  canUseAtlas() const;
+        const LLVector2*      getTexCoordScale() const ;
+        const LLVector2*      getTexCoordOffset()const;
+        const LLTextureAtlas* getAtlas()const ;
+        void                  removeAtlas() ;
+        BOOL                  switchTexture() ;
 
 public:
         
@@ -212,7 +218,7 @@ public:
         LLMatrix4*      mTextureMatrix;
         LLDrawInfo* mDrawInfo;
 
-private:
+protected:
         friend class LLGeometryManager;
         friend class LLVolumeGeometryManager;
 
@@ -242,12 +248,10 @@ private:
         F32                     mVSize;
         F32                     mPixelArea;
 
-        //importance factor, in the range [0, 1.0].
-        //1.0: the most important.
-        //based on the distance from the face to the view point and the angle from the face center to the view direction.
-        F32         mImportanceToCamera ; 
-        F32         mBoundingSphereRadius ;
-
+        //atlas
+        LLPointer<LLTextureAtlasSlot> mAtlasInfop ;
+        BOOL                              mUsingAtlas ;
+        
 protected:
         static BOOL     sSafeRenderSelect;
         
@@ -275,9 +279,9 @@ public:
                         const LLTextureEntry* lte = lhs->getTextureEntry();
                         const LLTextureEntry* rte = rhs->getTextureEntry();
 
-                        if (lhs->getTexture() != rhs->getTexture())
+                        if(lhs->getGLTexture() != rhs->getGLTexture()) // KL SD get GL
                         {
-                                return lhs->getTexture() < rhs->getTexture();
+                                return lhs->getGLTexture() < rhs->getGLTexture(); // not getTexture?
                         }
                         else if (lte->getBumpShinyFullbright() != rte->getBumpShinyFullbright())
                         {