diff options
| author | Rider Linden <rider@lindenlab.com> | 2016-10-17 14:58:29 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2016-10-17 14:58:29 -0700 |
| commit | 38d06dcce66ce3a7f5a7a1521f0305dbc0ea0bc5 (patch) | |
| tree | 38745f1a60a13b496014a64690e7afda14611830 /indra/newview/llworld.cpp | |
| parent | b2eded73b9bf55e2253a9c39113ff0598c2c18cb (diff) | |
| parent | 086c1342152895da28d2e0130d09432152604ca8 (diff) | |
Merged lindenlab/viewer-release into default
Diffstat (limited to 'indra/newview/llworld.cpp')
| -rw-r--r-- | indra/newview/llworld.cpp | 8 |
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++) |