diff options
| author | Karl Stiefvater (qarl) <qarl@lindenlab.com> | 2010-06-18 13:29:10 -0500 |
|---|---|---|
| committer | Karl Stiefvater (qarl) <qarl@lindenlab.com> | 2010-06-18 13:29:10 -0500 |
| commit | 07f9e9035e76f5d206bb7075a6f9ffac590976bc (patch) | |
| tree | 84109f78f89d3014eecfb1de4e7945c0d27969d3 /indra | |
| parent | d8ea11e1b89ad2c2fb2074fa3a29fa76a54b8ce8 (diff) | |
EXT-4388 Crash in octree line segment intersection code (getMask)
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llrender/llimagegl.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/llrender/llimagegl.cpp b/indra/llrender/llimagegl.cpp index ff47c57c70..2d408f8e10 100644 --- a/indra/llrender/llimagegl.cpp +++ b/indra/llrender/llimagegl.cpp @@ -1748,7 +1748,8 @@ 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); + // removing assert per EXT-4388 + // llassert(false); } if (LL_UNLIKELY(u < 0.f || u > 1.f || @@ -1756,7 +1757,8 @@ 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); + // removing assert per EXT-4388 + // llassert(false); } S32 x = llfloor(u * mPickMaskWidth); |