diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2007-03-02 21:25:50 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2007-03-02 21:25:50 +0000 |
| commit | 4dabd9c0472deb49573fdafef2fa413e59703f19 (patch) | |
| tree | 06c680d6a2047e03838d6548bccd26c7baf9d652 /indra/llimage/llimagedxt.h | |
| parent | d4462963c6ba5db2088723bbedc7b60f1184c594 (diff) | |
merge release@58699 beta-1-14-0@58707 -> release
Diffstat (limited to 'indra/llimage/llimagedxt.h')
| -rw-r--r-- | indra/llimage/llimagedxt.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/llimage/llimagedxt.h b/indra/llimage/llimagedxt.h index 88d28a2958..e286d03e1e 100644 --- a/indra/llimage/llimagedxt.h +++ b/indra/llimage/llimagedxt.h @@ -82,12 +82,11 @@ public: BOOL encode(const LLImageRaw* raw_image, F32 time, bool explicit_mips); /*virtual*/ BOOL encode(const LLImageRaw* raw_image, F32 time=0.0); - /*virtual*/ BOOL requestDecodedData(LLPointer<LLImageRaw>& raw, S32 discard=-1, F32 decode_time=0.0); - /*virtual*/ void releaseDecodedData(); - /*virtual*/ S32 calcHeaderSize(); /*virtual*/ S32 calcDataSize(S32 discard_level = 0); + BOOL getMipData(LLPointer<LLImageRaw>& raw, S32 discard=-1); + void setFormat(); S32 getMipOffset(S32 discard); |