Innitial commit of experimental v2 texture system port work. Compiles and runs on windows, at least. Fixing bugs as they come.
Need to test: localassetbrowser preview related floaters hgfloatertexteditor maps media textures! Currently very hacky web browser alpha masks on avatars bumpmaps Are all sky components appearing? LLViewerDynamicTexture (texture baking, browser, animated textures, anim previews, etc) Snapshot related features Customize avatar vfs floater UI textures in general Texture priority issues
This commit is contained in:
@@ -35,7 +35,7 @@
|
||||
|
||||
#include "llcontainerview.h"
|
||||
|
||||
class LLViewerImage;
|
||||
class LLViewerFetchedTexture;
|
||||
class LLTextureBar;
|
||||
class LLGLTexMemBar;
|
||||
|
||||
@@ -52,12 +52,12 @@ public:
|
||||
/*virtual*/ BOOL handleMouseUp(S32 x, S32 y, MASK mask);
|
||||
/*virtual*/ BOOL handleKey(KEY key, MASK mask, BOOL called_from_parent);
|
||||
|
||||
static void addDebugImage(LLViewerImage* image) { sDebugImages.insert(image); }
|
||||
static void removeDebugImage(LLViewerImage* image) { sDebugImages.insert(image); }
|
||||
static void addDebugImage(LLViewerFetchedTexture* image) { sDebugImages.insert(image); }
|
||||
static void removeDebugImage(LLViewerFetchedTexture* image) { sDebugImages.insert(image); }
|
||||
static void clearDebugImages() { sDebugImages.clear(); }
|
||||
|
||||
private:
|
||||
BOOL addBar(LLViewerImage *image, BOOL hilight = FALSE);
|
||||
BOOL addBar(LLViewerFetchedTexture *image, BOOL hilight = FALSE);
|
||||
void removeAllBars();
|
||||
|
||||
private:
|
||||
@@ -73,7 +73,7 @@ private:
|
||||
LLGLTexMemBar* mGLTexMemBar;
|
||||
|
||||
public:
|
||||
static std::set<LLViewerImage*> sDebugImages;
|
||||
static std::set<LLViewerFetchedTexture*> sDebugImages;
|
||||
};
|
||||
|
||||
class LLGLTexSizeBar;
|
||||
|
||||
Reference in New Issue
Block a user