aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llviewerimage.h
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/newview/llviewerimage.h')
-rw-r--r--linden/indra/newview/llviewerimage.h14
1 files changed, 2 insertions, 12 deletions
diff --git a/linden/indra/newview/llviewerimage.h b/linden/indra/newview/llviewerimage.h
index 60d9fb8..523f66a 100644
--- a/linden/indra/newview/llviewerimage.h
+++ b/linden/indra/newview/llviewerimage.h
@@ -86,17 +86,6 @@ public:
86 static LLViewerImage * getImage(const LLUUID &image_id); 86 static LLViewerImage * getImage(const LLUUID &image_id);
87 // lightweight wrapper for gImageList.getImage() 87 // lightweight wrapper for gImageList.getImage()
88 88
89 static BOOL bindTexture(LLImageGL* image, const U32 stage = 0)
90 {
91 if (image)
92 {
93 return image->bind(stage);
94 }
95 else
96 {
97 return sDefaultImagep->bind(stage);
98 }
99 }
100 89
101 struct Compare 90 struct Compare
102 { 91 {
@@ -189,7 +178,8 @@ public:
189 178
190 /*virtual*/ void dump(); // debug info to llinfos 179 /*virtual*/ void dump(); // debug info to llinfos
191 180
192 /*virtual*/ BOOL bind(const S32 stage = 0) const; 181 /*virtual*/ bool bindError(const S32 stage = 0) const;
182 /*virtual*/ bool bindDefaultImage(const S32 stage = 0) const;
193 183
194 void reinit(BOOL usemipmaps = TRUE); 184 void reinit(BOOL usemipmaps = TRUE);
195 185