diff options
author | Kyle Ambroff <ambroff@lindenlab.com> | 2010-04-13 10:17:44 -0700 |
---|---|---|
committer | Kyle Ambroff <ambroff@lindenlab.com> | 2010-04-13 10:17:44 -0700 |
commit | 7cf4d9aae2224fd91d66ac3839e8625cb32f8a57 (patch) | |
tree | e38a0b80af54f2966508ef09aa43e78e182919b0 /indra | |
parent | 244418e6b2f4647d09995492f52180a0d3824cd2 (diff) | |
parent | 6a1677d9e5907b4e34a0e71084a95c1fa138569d (diff) |
Merge Tofu's fix for the build failure introduced in bd384ded4268
Diffstat (limited to 'indra')
-rw-r--r-- | indra/llrender/llimagegl.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/llrender/llimagegl.cpp b/indra/llrender/llimagegl.cpp index cd851cf8a3..8addee606b 100644 --- a/indra/llrender/llimagegl.cpp +++ b/indra/llrender/llimagegl.cpp @@ -1749,8 +1749,6 @@ BOOL LLImageGL::getMask(const LLVector2 &tc) llassert(false); } - llassert(mPickMaskWidth >= 0 && mPickMaskHeight >= 0); - S32 x = llfloor(u * mPickMaskWidth); S32 y = llfloor(v * mPickMaskHeight); |