diff options
| author | Callum Prentice <callum@lindenlab.com> | 2016-06-02 14:00:36 -0700 |
|---|---|---|
| committer | Callum Prentice <callum@lindenlab.com> | 2016-06-02 14:00:36 -0700 |
| commit | a24e24fb50e2bbf0a73ccd53ff2ba64124dabeba (patch) | |
| tree | 526dc07621a65fd46c635ed875145a30c9e21432 /indra/newview/llworld.cpp | |
| parent | 4796f717c2a2c5756b91fa5281019ff23a10a613 (diff) | |
| parent | 336121312b9ea30fcc46a033f3b6c4b23358ab1b (diff) | |
Merged in NickyD/viewer-release-vlc (pull request #2)
Linux media_plugin_libvlc
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++) |