diff options
author | Dave Parks <davep@lindenlab.com> | 2022-03-09 12:49:16 -0600 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2022-03-09 12:49:16 -0600 |
commit | 5c6763fd39d83d4f680189edec61e4e6797687f1 (patch) | |
tree | 8754aab2cf7acacb9b6001b99da3b2b9586249ca /indra | |
parent | 0e954a9afd7cc300bdd4cadfc25baa7f2607e5a4 (diff) | |
parent | 5b67aa2c58a2c144d9013d4534520741e48596f5 (diff) |
Merge branch 'DRTVWR-546' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-546
Diffstat (limited to 'indra')
-rw-r--r-- | indra/llimage/llimage.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/llimage/llimage.cpp b/indra/llimage/llimage.cpp index 5fa19ce9c6..0fa027c9c3 100644 --- a/indra/llimage/llimage.cpp +++ b/indra/llimage/llimage.cpp @@ -884,8 +884,6 @@ void LLImageRaw::setDataAndSize(U8 *data, S32 width, S32 height, S8 components) LLImageBase::setSize(width, height, components) ; LLImageBase::setDataAndSize(data, width * height * components) ; - - sGlobalRawMemory += getDataSize(); } bool LLImageRaw::resize(U16 width, U16 height, S8 components) |