diff options
author | Jacek Antonelli | 2011-03-18 21:05:23 -0500 |
---|---|---|
committer | Jacek Antonelli | 2011-03-18 21:50:25 -0500 |
commit | e67e3f216fdb0868d05c35f105dd83c5358dd3b0 (patch) | |
tree | 4de6be204ab09d635c1e4ca2215abd2c17ae6671 /linden/indra/newview/llviewerparceloverlay.cpp | |
parent | Fix a bug that only occurs when not running in a debugger. (diff) | |
download | meta-impy-e67e3f216fdb0868d05c35f105dd83c5358dd3b0.zip meta-impy-e67e3f216fdb0868d05c35f105dd83c5358dd3b0.tar.gz meta-impy-e67e3f216fdb0868d05c35f105dd83c5358dd3b0.tar.bz2 meta-impy-e67e3f216fdb0868d05c35f105dd83c5358dd3b0.tar.xz |
Fixed bad line endings (CRLF) in many files.
Windows users, please set "autocrlf = input" or "autocrlf = true" in
your .git/config [core] section to avoid this in the future.
Diffstat (limited to 'linden/indra/newview/llviewerparceloverlay.cpp')
-rw-r--r-- | linden/indra/newview/llviewerparceloverlay.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/linden/indra/newview/llviewerparceloverlay.cpp b/linden/indra/newview/llviewerparceloverlay.cpp index a31f153..4ae3253 100644 --- a/linden/indra/newview/llviewerparceloverlay.cpp +++ b/linden/indra/newview/llviewerparceloverlay.cpp | |||
@@ -58,7 +58,7 @@ const U8 OVERLAY_IMG_COMPONENTS = 4; | |||
58 | LLViewerParcelOverlay::LLViewerParcelOverlay(LLViewerRegion* region, F32 region_width_meters) | 58 | LLViewerParcelOverlay::LLViewerParcelOverlay(LLViewerRegion* region, F32 region_width_meters) |
59 | : mRegion( region ), | 59 | : mRegion( region ), |
60 | mParcelGridsPerEdge( S32( region_width_meters / PARCEL_GRID_STEP_METERS ) ), | 60 | mParcelGridsPerEdge( S32( region_width_meters / PARCEL_GRID_STEP_METERS ) ), |
61 | mRegionSize(S32(region_width_meters)), | 61 | mRegionSize(S32(region_width_meters)), |
62 | mDirty( FALSE ), | 62 | mDirty( FALSE ), |
63 | mTimeSinceLastUpdate(), | 63 | mTimeSinceLastUpdate(), |
64 | mOverlayTextureIdx(-1), | 64 | mOverlayTextureIdx(-1), |
@@ -300,8 +300,8 @@ void LLViewerParcelOverlay::uncompressLandOverlay(S32 chunk, U8 *packed_overlay) | |||
300 | { | 300 | { |
301 | // Unpack the message data into the ownership array | 301 | // Unpack the message data into the ownership array |
302 | S32 size = mParcelGridsPerEdge * mParcelGridsPerEdge; | 302 | S32 size = mParcelGridsPerEdge * mParcelGridsPerEdge; |
303 | S32 mParcelOverLayChunks = mRegionSize * mRegionSize / (128 * 128); | 303 | S32 mParcelOverLayChunks = mRegionSize * mRegionSize / (128 * 128); |
304 | S32 chunk_size = size / mParcelOverLayChunks; | 304 | S32 chunk_size = size / mParcelOverLayChunks; |
305 | 305 | ||
306 | memcpy(mOwnership + chunk*chunk_size, packed_overlay, chunk_size); /*Flawfinder: ignore*/ | 306 | memcpy(mOwnership + chunk*chunk_size, packed_overlay, chunk_size); /*Flawfinder: ignore*/ |
307 | 307 | ||