diff options
| author | Eli Linden <eli@lindenlab.com> | 2010-02-08 11:16:11 -0800 |
|---|---|---|
| committer | Eli Linden <eli@lindenlab.com> | 2010-02-08 11:16:11 -0800 |
| commit | 19f4240f977fc26d97e686c4e3a1f13b063e191c (patch) | |
| tree | 092f10b05f0afb2f1e22212d9b6d6fd1d7e73e8b /indra | |
| parent | d0095124d534073db34b2f803f2beddf4e763370 (diff) | |
| parent | de2fabcf3d7ea45b51225cad7a0381eadf90d14e (diff) | |
Merge
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llimage/llimage.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/indra/llimage/llimage.cpp b/indra/llimage/llimage.cpp index e02be6c8c1..5649b4cab7 100644 --- a/indra/llimage/llimage.cpp +++ b/indra/llimage/llimage.cpp @@ -676,9 +676,6 @@ void LLImageRaw::copy(LLImageRaw* src) LLImageRaw* dst = this; // Just for clarity. - llassert( (3 == src->getComponents()) || (4 == src->getComponents()) ); - llassert( (3 == dst->getComponents()) || (4 == dst->getComponents()) ); - if( (src->getWidth() == dst->getWidth()) && (src->getHeight() == dst->getHeight()) ) { // No scaling needed |