summaryrefslogtreecommitdiff
path: root/indra/newview/llworld.cpp
diff options
context:
space:
mode:
authorNicky <sl.nicky.ml@googlemail.com>2016-06-01 22:30:12 +0200
committerNicky <sl.nicky.ml@googlemail.com>2016-06-01 22:30:12 +0200
commit254fbd69a65ccbdfbf3678f1f99bda292b4cfc59 (patch)
tree2fecedc534d8956e994f82cc7e387d18fffd9204 /indra/newview/llworld.cpp
parentb61d62bbf405774c3fa51a490e6d13c4288a567c (diff)
GCC compile fix, array initialization needs proper type.
Diffstat (limited to 'indra/newview/llworld.cpp')
-rw-r--r--indra/newview/llworld.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llworld.cpp b/indra/newview/llworld.cpp
index 11d3706821..cee47a591e 100644
--- a/indra/newview/llworld.cpp
+++ b/indra/newview/llworld.cpp
@@ -957,10 +957,10 @@ void LLWorld::updateWaterObjects()
center_y = min_y + (wy >> 1);
S32 add_boundary[4] = {
- 512 - (max_x - region_x),
- 512 - (max_y - region_y),
- 512 - (region_x - min_x),
- 512 - (region_y - min_y) };
+ (S32)(512 - (max_x - region_x)),
+ (S32)(512 - (max_y - region_y)),
+ (S32)(512 - (region_x - min_x)),
+ (S32)(512 - (region_y - min_y)) };
S32 dir;
for (dir = 0; dir < 8; dir++)