diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-09 16:33:58 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-09 16:33:58 +0000 |
| commit | d1efc0fd52c0e5dc59951f50435e121305fe9b69 (patch) | |
| tree | 7ac48a54efc4029b44a6743b08d351ecfd947801 /indra/llimage | |
| parent | 4d9bcc2c8f303464c3664a0a7304a1bc2d658e2e (diff) | |
| parent | c9b27bec33d601330afe854d0322d22fce9da76a (diff) | |
merge from viewer2 trunk.
Diffstat (limited to 'indra/llimage')
| -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 |