diff options
| author | Richard Linden <none@none> | 2013-03-22 10:57:19 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-03-22 10:57:19 -0700 |
| commit | f1539b727946956826c7c5fb0188b7770cfbdc24 (patch) | |
| tree | 8f6371c2d631f5ad26bd3a9c852fa92edee3b090 /indra/llimage | |
| parent | 5525257b8580df3dbc9860370564e19c9d6cbbaa (diff) | |
| parent | 21b7de56ad6c1efd81ad4406aba1428633b9356e (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-interesting
Diffstat (limited to 'indra/llimage')
| -rw-r--r-- | indra/llimage/llimage.cpp | 2 | ||||
| -rw-r--r--[-rwxr-xr-x] | indra/llimage/llimagej2c.cpp | 0 |
2 files changed, 1 insertions, 1 deletions
diff --git a/indra/llimage/llimage.cpp b/indra/llimage/llimage.cpp index f06547ed7d..e7e274ff03 100644 --- a/indra/llimage/llimage.cpp +++ b/indra/llimage/llimage.cpp @@ -158,7 +158,7 @@ void LLImageBase::sanityCheck() // virtual void LLImageBase::deleteData() { - FREE_MEM(sPrivatePoolp, mData); + FREE_MEM(sPrivatePoolp, mData) ; memDisclaim(mDataSize); mData = NULL; mDataSize = 0; diff --git a/indra/llimage/llimagej2c.cpp b/indra/llimage/llimagej2c.cpp index 5412f98ee5..5412f98ee5 100755..100644 --- a/indra/llimage/llimagej2c.cpp +++ b/indra/llimage/llimagej2c.cpp |