diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-06-27 21:02:01 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-06-27 21:02:01 +0000 |
| commit | 926ea0b39afd04cab469ca17b28f95ebf969e669 (patch) | |
| tree | 40d5653e19160f72e7a0b80fadb9bdb93ef3575c /indra/llrender | |
| parent | 41877d457ab9542dca22b99f3eddb1bfcfe7c1d6 (diff) | |
QAR-669 1.20 Viewer RC11
QAR-648 1.20 Viewer RC10
merge Branch_1-20-Viewer-2 -r 88724:90511 -> release
Diffstat (limited to 'indra/llrender')
| -rw-r--r-- | indra/llrender/llimagegl.cpp | 8 | ||||
| -rw-r--r-- | indra/llrender/llimagegl.h | 3 |
2 files changed, 1 insertions, 10 deletions
diff --git a/indra/llrender/llimagegl.cpp b/indra/llrender/llimagegl.cpp index f020730d4a..1c9b4d9693 100644 --- a/indra/llrender/llimagegl.cpp +++ b/indra/llrender/llimagegl.cpp @@ -61,8 +61,6 @@ S32 LLImageGL::sCount = 0; BOOL LLImageGL::sGlobalUseAnisotropic = FALSE; F32 LLImageGL::sLastFrameTime = 0.f; -BOOL LLImageGL::sRefCheck = TRUE ; - std::set<LLImageGL*> LLImageGL::sImageList; //---------------------------------------------------------------------------- @@ -279,9 +277,7 @@ LLImageGL::LLImageGL(const LLImageRaw* imageraw, BOOL usemipmaps) sImageList.insert(this); sCount++; - sRefCheck = FALSE ; createGLTexture(0, imageraw); - sRefCheck = TRUE ; } LLImageGL::~LLImageGL() @@ -426,9 +422,7 @@ void LLImageGL::dump() //---------------------------------------------------------------------------- BOOL LLImageGL::bindTextureInternal(const S32 stage) const -{ - llassert_always(!sRefCheck || (getNumRefs() > 0 && getNumRefs() < 100000)) ; - +{ if (gGLManager.mIsDisabled) { llwarns << "Trying to bind a texture while GL is disabled!" << llendl; diff --git a/indra/llrender/llimagegl.h b/indra/llrender/llimagegl.h index c5fe9b7299..8aeecb3627 100644 --- a/indra/llrender/llimagegl.h +++ b/indra/llrender/llimagegl.h @@ -207,9 +207,6 @@ public: #else BOOL getMissed() const { return FALSE; }; #endif - -private://paranoia error check - static BOOL sRefCheck ; }; #endif // LL_LLIMAGEGL_H |