diff options
| author | andreykproductengine <akleshchev@productengine.com> | 2015-04-29 15:28:21 +0300 |
|---|---|---|
| committer | andreykproductengine <akleshchev@productengine.com> | 2015-04-29 15:28:21 +0300 |
| commit | 5f397bdd1831b1be593982ca8fc88dbe1a0cad07 (patch) | |
| tree | 1d0b8a8973a30bf3c65f09da653b0e7c009053fd /indra/newview/llsurface.cpp | |
| parent | 1382e9bae647d6b548cd9a1fc78339e5929ea202 (diff) | |
| parent | fde0868231a25b8c9ce03a86cb53f1738d35688d (diff) | |
Merge from viewer-release
Diffstat (limited to 'indra/newview/llsurface.cpp')
| -rwxr-xr-x | indra/newview/llsurface.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/indra/newview/llsurface.cpp b/indra/newview/llsurface.cpp index e75af8db53..503dd6747d 100755 --- a/indra/newview/llsurface.cpp +++ b/indra/newview/llsurface.cpp @@ -1232,10 +1232,10 @@ BOOL LLSurface::generateWaterTexture(const F32 x, const F32 y, S32 x_begin, y_begin, x_end, y_end; - x_begin = llround(x * scale_inv); - y_begin = llround(y * scale_inv); - x_end = llround((x + width) * scale_inv); - y_end = llround((y + width) * scale_inv); + x_begin = ll_round(x * scale_inv); + y_begin = ll_round(y * scale_inv); + x_end = ll_round((x + width) * scale_inv); + y_end = ll_round((y + width) * scale_inv); if (x_end > tex_width) { @@ -1283,9 +1283,9 @@ BOOL LLSurface::generateWaterTexture(const F32 x, const F32 y, // Want non-linear curve for transparency gradient coloru = MAX_WATER_COLOR; const F32 frac = 1.f - 2.f/(2.f - (height - WATER_HEIGHT)); - S32 alpha = 64 + llround((255-64)*frac); + S32 alpha = 64 + ll_round((255-64)*frac); - alpha = llmin(llround((F32)MAX_WATER_COLOR.mV[3]), alpha); + alpha = llmin(ll_round((F32)MAX_WATER_COLOR.mV[3]), alpha); alpha = llmax(64, alpha); coloru.mV[3] = alpha; |