summaryrefslogtreecommitdiff
path: root/indra/llimage/llimage.cpp
diff options
context:
space:
mode:
authorXiaohong Bao <bao@lindenlab.com>2012-06-12 17:01:48 -0600
committerXiaohong Bao <bao@lindenlab.com>2012-06-12 17:01:48 -0600
commit0d80aced2477500ed5912a34e2bc4b6dbf8f719a (patch)
treeeb1688c9f32e7daa2596ee8f51b867ea07041897 /indra/llimage/llimage.cpp
parent8e5f12a43fdbdd377bd4362020c05a591dd2ffd8 (diff)
for SH-3073: implement a fast cache system for texture fetching
Diffstat (limited to 'indra/llimage/llimage.cpp')
-rw-r--r--indra/llimage/llimage.cpp9
1 files changed, 7 insertions, 2 deletions
diff --git a/indra/llimage/llimage.cpp b/indra/llimage/llimage.cpp
index 6775b005f4..e6b838c5b2 100644
--- a/indra/llimage/llimage.cpp
+++ b/indra/llimage/llimage.cpp
@@ -292,11 +292,16 @@ LLImageRaw::LLImageRaw(U16 width, U16 height, S8 components)
++sRawImageCount;
}
-LLImageRaw::LLImageRaw(U8 *data, U16 width, U16 height, S8 components)
+LLImageRaw::LLImageRaw(U8 *data, U16 width, U16 height, S8 components, bool no_copy)
: LLImageBase()
{
mMemType = LLMemType::MTYPE_IMAGERAW;
- if(allocateDataSize(width, height, components))
+
+ if(no_copy)
+ {
+ setDataAndSize(data, width, height, components);
+ }
+ else if(allocateDataSize(width, height, components))
{
memcpy(getData(), data, width*height*components);
}