summaryrefslogtreecommitdiff
path: root/indra/llimage
diff options
context:
space:
mode:
authorRichard Linden <none@none>2010-08-12 12:20:47 -0700
committerRichard Linden <none@none>2010-08-12 12:20:47 -0700
commit00e4fb0ac8431bda3705c218a548557cfca7e749 (patch)
treedd006c79cad8cdf9309290272597d9d2a0e93e8b /indra/llimage
parent657e462b6a46bee09fe91e84ea37763db79c868c (diff)
parentbd897431e14aff091d5f45425816ddec4b2538c7 (diff)
Automated merge with http://10.1.4.28:8000/
Diffstat (limited to 'indra/llimage')
-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;
}
}
}