diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2016-10-10 23:26:58 +0300 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2016-10-10 23:26:58 +0300 |
| commit | 4617e07b3795e46c2037462f738ab81b35bd7294 (patch) | |
| tree | 9cd991fe86f65590f9bb5c87499fab1911e4aae5 /indra/newview/llworld.cpp | |
| parent | 5dd97bc2bd4924b0342068e697b5d45165225b76 (diff) | |
| parent | 086c1342152895da28d2e0130d09432152604ca8 (diff) | |
Merged in lindenlab/viewer-release
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++) |