V3 merge. Supposedly improves baked texture loading on other avatars. Also increase discard bias on ati if vram starts running out.

2011-12-16 05:57:48 -06:00
parent 1bfa72fa7c
commit b607650d5c
3 changed files with 87 additions and 22 deletions
--- a/indra/newview/llviewertexture.h
+++ b/indra/newview/llviewertexture.h
@@ -277,6 +277,7 @@ private:
 	/*virtual*/ LLImageGL* getGLTexture() const ;
 	virtual void switchToCachedImage();
 	
+	static bool isMemoryForTextureLow() ;
 protected:
 	LLUUID mID;
 	S32 mBoostLevel;				// enum describing priority level
@@ -340,6 +341,7 @@ public:
 	//static BOOL sUseTextureAtlas ;

 	static LLPointer<LLViewerTexture> sNullImagep; // Null texture for non-textured objects.
+	static LLPointer<LLViewerTexture> sBlackImagep;	// Texture to show NOTHING (pure black)
 };