diff options
| author | Rick Pasetto <rick@lindenlab.com> | 2010-02-09 09:50:29 -0800 |
|---|---|---|
| committer | Rick Pasetto <rick@lindenlab.com> | 2010-02-09 09:50:29 -0800 |
| commit | cf09a48bb21d553c837186cc2e7198801f06691a (patch) | |
| tree | a668e28da71f9fafe6333784400dc8f24671fad6 /indra/llimage | |
| parent | 1c1ebd0365a115c736f62fadec37e006cbf43f44 (diff) | |
| parent | 8fdb199707979916d4d3c23cd19fec9fed411aba (diff) | |
Automated merge with ssh://rick@hg.lindenlab.com/rick/viewer-2-0-mediaclasses
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 |