summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXiaohong Bao <bao@lindenlab.com>2010-08-05 08:55:31 -0600
committerXiaohong Bao <bao@lindenlab.com>2010-08-05 08:55:31 -0600
commit0e673902f4d3ba257299cfc9552dcbf4977cf4a9 (patch)
tree24320f133f4f8bee8835a4e8cb3ea85748656fac
parenteef6ababcdd9ae4c9cbdc5dc295420fa66e753ab (diff)
parentcd628d8ea82cc61bb4dd57a74e2f7d63847480bb (diff)
Automated merge with ssh://hg.lindenlab.com/q/viewer-release
-rw-r--r--indra/llimage/llimage.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llimage/llimage.cpp b/indra/llimage/llimage.cpp
index 0fc5ca1ad6..1566389e30 100644
--- a/indra/llimage/llimage.cpp
+++ b/indra/llimage/llimage.cpp
@@ -1553,6 +1553,7 @@ void LLImageFormatted::appendData(U8 *data, S32 size)
S32 newsize = cursize + size;
reallocateData(newsize);
memcpy(getData() + cursize, data, size);
+ delete[] data;
}
}
}