summaryrefslogtreecommitdiff
path: root/indra/llimage
diff options
context:
space:
mode:
authorGlenn Glazer <coyot@lindenlab.com>2017-05-12 08:18:22 -0700
committerGlenn Glazer <coyot@lindenlab.com>2017-05-12 08:18:22 -0700
commit9b3166ffc0cb3a686ea1f3007110976fbf81ea1c (patch)
tree5884820ab4bd08b66d9ba28c134feef197131038 /indra/llimage
parent1dcc9e3e1163b93d7654fc776d8e81252f15a6e1 (diff)
parentb92ab8f7e659de66140cc6f538c74c1fc81e6a73 (diff)
pull from v64 gate
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;