summaryrefslogtreecommitdiff
path: root/indra/llimage
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2017-05-18 15:33:58 -0400
committerOz Linden <oz@lindenlab.com>2017-05-18 15:33:58 -0400
commit013f34ccdd1df275a02e6ca56f8f19b51413b35a (patch)
treee9a88852afc69ef7b4642cb9820e1c31772c1c40 /indra/llimage
parentab3742a2a944ee8535e314ebfad52a980e079a70 (diff)
parent4bf1f1d618d61f0cc2ec0dd22cea7d1c5b909b8f (diff)
merge latest updates from coyot
Diffstat (limited to 'indra/llimage')
-rw-r--r--indra/llimage/llimagetga.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llimage/llimagetga.cpp b/indra/llimage/llimagetga.cpp
index 5ad7658ec1..7c75aa1e2a 100644
--- a/indra/llimage/llimagetga.cpp
+++ b/indra/llimage/llimagetga.cpp
@@ -811,7 +811,7 @@ bool LLImageTGA::decodeTruecolorRle32( LLImageRaw* raw_image, bool &alpha_opaque
}
src += 4;
- register U32 value = rgba;
+ U32 value = rgba;
do
{
*dst_pixels = value;