diff options
| -rw-r--r-- | indra/llappearance/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | indra/llrender/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | indra/llrender/lltexturemanagerbridge.cpp (renamed from indra/llappearance/lltexturemanagerbridge.cpp) | 0 | ||||
| -rw-r--r-- | indra/llrender/lltexturemanagerbridge.h (renamed from indra/llappearance/lltexturemanagerbridge.h) | 1 | ||||
| -rw-r--r-- | indra/llui/lliconctrl.h | 4 | ||||
| -rw-r--r-- | indra/newview/llthumbnailctrl.cpp | 2 | 
6 files changed, 5 insertions, 6 deletions
diff --git a/indra/llappearance/CMakeLists.txt b/indra/llappearance/CMakeLists.txt index 268849ad74..b3f6c7e32c 100644 --- a/indra/llappearance/CMakeLists.txt +++ b/indra/llappearance/CMakeLists.txt @@ -40,7 +40,6 @@ set(llappearance_SOURCE_FILES      lltexglobalcolor.cpp      lltexlayer.cpp      lltexlayerparams.cpp -    lltexturemanagerbridge.cpp      llwearable.cpp      llwearabledata.cpp      llwearabletype.cpp @@ -63,7 +62,6 @@ set(llappearance_HEADER_FILES      lltexglobalcolor.h      lltexlayer.h      lltexlayerparams.h -    lltexturemanagerbridge.h      llwearable.h      llwearabledata.h      llwearabletype.h diff --git a/indra/llrender/CMakeLists.txt b/indra/llrender/CMakeLists.txt index baab09a104..94b09127be 100644 --- a/indra/llrender/CMakeLists.txt +++ b/indra/llrender/CMakeLists.txt @@ -48,6 +48,7 @@ set(llrender_SOURCE_FILES      llrendertarget.cpp      llshadermgr.cpp      lltexture.cpp +    lltexturemanagerbridge.cpp      lluiimage.cpp      llvertexbuffer.cpp      llglcommonfunc.cpp @@ -77,6 +78,7 @@ set(llrender_HEADER_FILES      llrendersphere.h      llshadermgr.h      lltexture.h +    lltexturemanagerbridge.h      lluiimage.h      lluiimage.inl      llvertexbuffer.h diff --git a/indra/llappearance/lltexturemanagerbridge.cpp b/indra/llrender/lltexturemanagerbridge.cpp index 33f2185e4f..33f2185e4f 100644 --- a/indra/llappearance/lltexturemanagerbridge.cpp +++ b/indra/llrender/lltexturemanagerbridge.cpp diff --git a/indra/llappearance/lltexturemanagerbridge.h b/indra/llrender/lltexturemanagerbridge.h index 101704b162..f61433ea4d 100644 --- a/indra/llappearance/lltexturemanagerbridge.h +++ b/indra/llrender/lltexturemanagerbridge.h @@ -27,7 +27,6 @@  #ifndef LL_TEXTUREMANAGERBRIDGE_H  #define LL_TEXTUREMANAGERBRIDGE_H -#include "llavatarappearancedefines.h"  #include "llpointer.h"  #include "llgltexture.h" diff --git a/indra/llui/lliconctrl.h b/indra/llui/lliconctrl.h index 9c3b517bca..b5aad17ca6 100644 --- a/indra/llui/lliconctrl.h +++ b/indra/llui/lliconctrl.h @@ -39,7 +39,9 @@ class LLUICtrlFactory;  // Classes  // -//  +// Class for diplaying named UI textures +// Do not use for displaying textures from network, +// UI textures are stored permanently!  class LLIconCtrl  : public LLUICtrl  { diff --git a/indra/newview/llthumbnailctrl.cpp b/indra/newview/llthumbnailctrl.cpp index 35bf9cb04c..8f51f2c80d 100644 --- a/indra/newview/llthumbnailctrl.cpp +++ b/indra/newview/llthumbnailctrl.cpp @@ -100,9 +100,7 @@ void LLThumbnailCtrl::draw()              gl_rect_2d_checkerboard( draw_rect, alpha );          } -        //LLRectf uv_rect(0, 0, draw_rect.getWidth()/32.f, draw_rect.getHeight()/32.f);          gl_draw_scaled_image( draw_rect.mLeft, draw_rect.mBottom, draw_rect.getWidth(), draw_rect.getHeight(), mTexturep, UI_VERTEX_COLOR % alpha); -        //mTexturep->addTextureStats( (F32)(draw_rect.getWidth() * draw_rect.getHeight()) );          mTexturep->setKnownDrawSize(draw_rect.getWidth(), draw_rect.getHeight());      }  | 
