summaryrefslogtreecommitdiff
path: root/indra/newview/llviewertexture.h
diff options
context:
space:
mode:
authorBjoseph Wombat <bjoseph@vivox.com>2015-05-11 14:57:57 +0100
committerBjoseph Wombat <bjoseph@vivox.com>2015-05-11 14:57:57 +0100
commitc6650c13306b0d049ecba02710645b9ca2d90c05 (patch)
tree54932d9221df41ec9c608b70eeb5379fcb1d72c3 /indra/newview/llviewertexture.h
parent7ec58ee04789a8cc819d1151529d843045651bc8 (diff)
parente611e35e033e99f619b0e4938f6879c8e387efd5 (diff)
updates from bitbucket repository
Diffstat (limited to 'indra/newview/llviewertexture.h')
-rwxr-xr-xindra/newview/llviewertexture.h11
1 files changed, 8 insertions, 3 deletions
diff --git a/indra/newview/llviewertexture.h b/indra/newview/llviewertexture.h
index 05912404e4..aed7e94945 100755
--- a/indra/newview/llviewertexture.h
+++ b/indra/newview/llviewertexture.h
@@ -169,9 +169,13 @@ public:
/*virtual*/ void updateBindStatsForTester() ;
protected:
void cleanup() ;
- void init(bool firstinit) ;
+ void init(bool firstinit) ;
void reorganizeFaceList() ;
void reorganizeVolumeList() ;
+
+ void notifyAboutMissingAsset();
+ void notifyAboutCreatingTexture();
+
private:
friend class LLBumpImageList;
friend class LLUIImageList;
@@ -307,10 +311,11 @@ public:
void addToCreateTexture();
+
// ONLY call from LLViewerTextureList
BOOL createTexture(S32 usename = 0);
- void destroyTexture() ;
-
+ void destroyTexture() ;
+
virtual void processTextureStats() ;
F32 calcDecodePriority() ;