diff options
| author | Dave Parks <davep@lindenlab.com> | 2014-04-16 13:21:06 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2014-04-16 13:21:06 -0500 |
| commit | 816e8578f9b63640afde942df282ccf5ed1385a5 (patch) | |
| tree | 8b229f6311f46b66ce1e4163776438e392593b23 /indra/newview/llviewerparceloverlay.cpp | |
| parent | 678e8621794e774dc6ecc14b9fc3628583e4b935 (diff) | |
Backed out changeset: d0dfe3cda5b1
Diffstat (limited to 'indra/newview/llviewerparceloverlay.cpp')
| -rwxr-xr-x | indra/newview/llviewerparceloverlay.cpp | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/indra/newview/llviewerparceloverlay.cpp b/indra/newview/llviewerparceloverlay.cpp index fad77bce25..a1c12c5cd6 100755 --- a/indra/newview/llviewerparceloverlay.cpp +++ b/indra/newview/llviewerparceloverlay.cpp @@ -76,13 +76,10 @@ LLViewerParcelOverlay::LLViewerParcelOverlay(LLViewerRegion* region, F32 region_ // // Create the base texture. U8 *raw = mImageRaw->getData(); - if (raw) + const S32 COUNT = mParcelGridsPerEdge * mParcelGridsPerEdge * OVERLAY_IMG_COMPONENTS; + for (S32 i = 0; i < COUNT; i++) { - const S32 COUNT = mParcelGridsPerEdge * mParcelGridsPerEdge * OVERLAY_IMG_COMPONENTS; - for (S32 i = 0; i < COUNT; i++) - { - raw[i] = 0; - } + raw[i] = 0; } //mTexture->setSubImage(mImageRaw, 0, 0, mParcelGridsPerEdge, mParcelGridsPerEdge); @@ -383,13 +380,10 @@ void LLViewerParcelOverlay::updateOverlayTexture() break; } - if (raw) - { - raw[pixel_index + 0] = (U8)r; - raw[pixel_index + 1] = (U8)g; - raw[pixel_index + 2] = (U8)b; - raw[pixel_index + 3] = (U8)a; - } + raw[pixel_index + 0] = (U8)r; + raw[pixel_index + 1] = (U8)g; + raw[pixel_index + 2] = (U8)b; + raw[pixel_index + 3] = (U8)a; pixel_index += OVERLAY_IMG_COMPONENTS; } |