diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-04-03 19:21:14 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-04-03 19:21:14 +0000 |
| commit | b5936a4b1d8780b5b8cd425998eacd2c64ffa693 (patch) | |
| tree | c1581bcf34e96a897c6e1d9a4aed95f353713baa /indra/llimage/llimagedxt.cpp | |
| parent | 55c25229b79b1755c989e5996c8e8d118f369721 (diff) | |
1.19.1 Viewer merge: QAR_367, QAR-374, QAR-408, QAR-426
QAR_367 (RC1) - merge Branch_1-19-1-Viewer -r 81609 : 81993 -> release
QAR-374 (RC2) - merge Branch_1-19-1-Viewer -r 81993 : 82589 -> release
QAR-408 (RC3) - merge Branch_1-19-1-Viewer -r 82589 : 83128 -> release
QAR-426 (rc4) - merge Branch_1-19-1-Viewer -r 83125 : 83719 -> release
(Actual merge: release@83793 Branch_1-19-1-Viewer-merge@83953 -> release)
Diffstat (limited to 'indra/llimage/llimagedxt.cpp')
| -rw-r--r-- | indra/llimage/llimagedxt.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llimage/llimagedxt.cpp b/indra/llimage/llimagedxt.cpp index 6feece4ad9..be9de3be49 100644 --- a/indra/llimage/llimagedxt.cpp +++ b/indra/llimage/llimagedxt.cpp @@ -308,7 +308,7 @@ BOOL LLImageDXT::getMipData(LLPointer<LLImageRaw>& raw, S32 discard) return TRUE; } -BOOL LLImageDXT::encode(const LLImageRaw* raw_image, F32 time, bool explicit_mips) +BOOL LLImageDXT::encodeDXT(const LLImageRaw* raw_image, F32 time, bool explicit_mips) { llassert_always(raw_image); @@ -396,7 +396,7 @@ BOOL LLImageDXT::encode(const LLImageRaw* raw_image, F32 time, bool explicit_mip // virtual BOOL LLImageDXT::encode(const LLImageRaw* raw_image, F32 time) { - return encode(raw_image, time, false); + return encodeDXT(raw_image, time, false); } // virtual |