summaryrefslogtreecommitdiff
path: root/indra/llimage
diff options
context:
space:
mode:
authorMonroe Linden <monroe@lindenlab.com>2010-08-09 17:17:49 -0700
committerMonroe Linden <monroe@lindenlab.com>2010-08-09 17:17:49 -0700
commit235afd7836d74305292067cd6c29fe0192d6201d (patch)
tree2cb0f2f9c817b9f70db8e115aaf69990555210ea /indra/llimage
parentc90a90407c30415bf9700d3b037a0b8918e261d3 (diff)
parent011c3686a6e10edfe40adb67105298033188c1d6 (diff)
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience
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;
}
}
}