diff options
| author | Dave Parks <davep@lindenlab.com> | 2010-06-10 15:16:08 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2010-06-10 15:16:08 -0500 |
| commit | aab53dc25021dfb9b0a734480233e352a82486cd (patch) | |
| tree | de9c71677f9955112c0b01bf8c064404bd862f53 /indra/llrender/llimagegl.cpp | |
| parent | 1d92a950df91d7e6d3a34e925f445bc389a3fa93 (diff) | |
| parent | 3ea0018dc6f94c029d7dbf13bdd5b0bc0558c8d8 (diff) | |
merge
Diffstat (limited to 'indra/llrender/llimagegl.cpp')
| -rw-r--r-- | indra/llrender/llimagegl.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llrender/llimagegl.cpp b/indra/llrender/llimagegl.cpp index 2f02ccf30b..2579bad0b6 100644 --- a/indra/llrender/llimagegl.cpp +++ b/indra/llrender/llimagegl.cpp @@ -1813,7 +1813,7 @@ BOOL LLImageGL::getMask(const LLVector2 &tc) { LL_WARNS_ONCE("render") << "Ugh, non-finite u/v in mask pick" << LL_ENDL; u = v = 0.f; - llassert(false); + //llassert(false); } if (LL_UNLIKELY(u < 0.f || u > 1.f || @@ -1821,7 +1821,7 @@ BOOL LLImageGL::getMask(const LLVector2 &tc) { LL_WARNS_ONCE("render") << "Ugh, u/v out of range in image mask pick" << LL_ENDL; u = v = 0.f; - llassert(false); + //llassert(false); } S32 x = llfloor(u * mPickMaskWidth); |