summaryrefslogtreecommitdiff
path: root/indra/llimage/llimage.cpp
diff options
context:
space:
mode:
authorEuclid Linden <euclid@lindenlab.com>2021-12-15 22:12:26 +0000
committerEuclid Linden <euclid@lindenlab.com>2021-12-15 22:12:26 +0000
commit23fc6ac098707830c219dd2d981af83f96c9714b (patch)
tree014c480a7dc85ea6365a486984aa9667fb7a4dce /indra/llimage/llimage.cpp
parent828e58432981e7c256618bd293f77906abaae699 (diff)
parent0952086eeb937707d1470989579611a1966cafbe (diff)
Merged in DV546-merge-6.5.2 (pull request #814)
DRTVWR-546 merge up to 6.5.2
Diffstat (limited to 'indra/llimage/llimage.cpp')
-rw-r--r--indra/llimage/llimage.cpp9
1 files changed, 0 insertions, 9 deletions
diff --git a/indra/llimage/llimage.cpp b/indra/llimage/llimage.cpp
index 2bf5f5492e..15b07e5318 100644
--- a/indra/llimage/llimage.cpp
+++ b/indra/llimage/llimage.cpp
@@ -2219,20 +2219,11 @@ bool LLImageFormatted::save(const std::string &filename)
return true;
}
-// bool LLImageFormatted::save(LLVFS *vfs, const LLUUID &uuid, LLAssetType::EType type)
-// Depricated to remove VFS dependency.
-// Use:
-// LLVFile::writeFile(image->getData(), image->getDataSize(), vfs, uuid, type);
-
-//----------------------------------------------------------------------------
-
S8 LLImageFormatted::getCodec() const
{
return mCodec;
}
-//============================================================================
-
static void avg4_colors4(const U8* a, const U8* b, const U8* c, const U8* d, U8* dst)
{
dst[0] = (U8)(((U32)(a[0]) + b[0] + c[0] + d[0])>>2);