aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llrender
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/llrender')
-rw-r--r--linden/indra/llrender/llimagegl.cpp8
-rw-r--r--linden/indra/llrender/llimagegl.h3
2 files changed, 1 insertions, 10 deletions
diff --git a/linden/indra/llrender/llimagegl.cpp b/linden/indra/llrender/llimagegl.cpp
index 454a5bb..a402814 100644
--- a/linden/indra/llrender/llimagegl.cpp
+++ b/linden/indra/llrender/llimagegl.cpp
@@ -61,8 +61,6 @@ S32 LLImageGL::sCount = 0;
61BOOL LLImageGL::sGlobalUseAnisotropic = FALSE; 61BOOL LLImageGL::sGlobalUseAnisotropic = FALSE;
62F32 LLImageGL::sLastFrameTime = 0.f; 62F32 LLImageGL::sLastFrameTime = 0.f;
63 63
64BOOL LLImageGL::sRefCheck = TRUE ;
65
66std::set<LLImageGL*> LLImageGL::sImageList; 64std::set<LLImageGL*> LLImageGL::sImageList;
67 65
68//---------------------------------------------------------------------------- 66//----------------------------------------------------------------------------
@@ -279,9 +277,7 @@ LLImageGL::LLImageGL(const LLImageRaw* imageraw, BOOL usemipmaps)
279 sImageList.insert(this); 277 sImageList.insert(this);
280 sCount++; 278 sCount++;
281 279
282 sRefCheck = FALSE ;
283 createGLTexture(0, imageraw); 280 createGLTexture(0, imageraw);
284 sRefCheck = TRUE ;
285} 281}
286 282
287LLImageGL::~LLImageGL() 283LLImageGL::~LLImageGL()
@@ -426,9 +422,7 @@ void LLImageGL::dump()
426//---------------------------------------------------------------------------- 422//----------------------------------------------------------------------------
427 423
428BOOL LLImageGL::bindTextureInternal(const S32 stage) const 424BOOL LLImageGL::bindTextureInternal(const S32 stage) const
429{ 425{
430 llassert_always(!sRefCheck || (getNumRefs() > 0 && getNumRefs() < 100000)) ;
431
432 if (gGLManager.mIsDisabled) 426 if (gGLManager.mIsDisabled)
433 { 427 {
434 llwarns << "Trying to bind a texture while GL is disabled!" << llendl; 428 llwarns << "Trying to bind a texture while GL is disabled!" << llendl;
diff --git a/linden/indra/llrender/llimagegl.h b/linden/indra/llrender/llimagegl.h
index 99a6e49..3f231ee 100644
--- a/linden/indra/llrender/llimagegl.h
+++ b/linden/indra/llrender/llimagegl.h
@@ -207,9 +207,6 @@ public:
207#else 207#else
208 BOOL getMissed() const { return FALSE; }; 208 BOOL getMissed() const { return FALSE; };
209#endif 209#endif
210
211private://paranoia error check
212 static BOOL sRefCheck ;
213}; 210};
214 211
215#endif // LL_LLIMAGEGL_H 212#endif // LL_LLIMAGEGL_H