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/llvfs/llvfs.cpp | |
| parent | d4462963c6ba5db2088723bbedc7b60f1184c594 (diff) | |
merge release@58699 beta-1-14-0@58707 -> release
Diffstat (limited to 'indra/llvfs/llvfs.cpp')
| -rw-r--r-- | indra/llvfs/llvfs.cpp | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/indra/llvfs/llvfs.cpp b/indra/llvfs/llvfs.cpp index 592f74dd02..e4749041ee 100644 --- a/indra/llvfs/llvfs.cpp +++ b/indra/llvfs/llvfs.cpp @@ -771,12 +771,17 @@ BOOL LLVFS::setMaxSize(const LLUUID &file_id, const LLAssetType::EType file_type } // round all sizes upward to KB increments - if (max_size & FILE_BLOCK_MASK) + // SJB: Need to not round for the new texture-pipeline code so we know the correct + // max file size. Need to investigate the potential problems with this... + if (file_type != LLAssetType::AT_TEXTURE) { - max_size += FILE_BLOCK_MASK; - max_size &= ~FILE_BLOCK_MASK; - } - + if (max_size & FILE_BLOCK_MASK) + { + max_size += FILE_BLOCK_MASK; + max_size &= ~FILE_BLOCK_MASK; + } + } + if (block && block->mLength > 0) { block->mAccessTime = (U32)time(NULL); @@ -1998,7 +2003,7 @@ LLString get_extension(LLAssetType::EType type) switch(type) { case LLAssetType::AT_TEXTURE: - extension = ".jp2"; // ".j2c"; // IrfanView recognizes .jp2 -sjb + extension = ".j2c"; break; case LLAssetType::AT_SOUND: extension = ".ogg"; |