summaryrefslogtreecommitdiff
path: root/indra/newview/lltoolselectland.cpp
diff options
context:
space:
mode:
authorcallum_linden <none@none>2014-12-10 08:44:08 -0800
committercallum_linden <none@none>2014-12-10 08:44:08 -0800
commit23711c927561ee85b6d46e7e741cdc652649686e (patch)
tree4b8c89671594efb2241f894011f9548ae901df76 /indra/newview/lltoolselectland.cpp
parent6ad2b5f8d3e4c240a48452578d5c3101a2811053 (diff)
Rename llround(..) to ll_round(..) because of a collision with MS llround (long long round) in VS2013
Diffstat (limited to 'indra/newview/lltoolselectland.cpp')
-rwxr-xr-xindra/newview/lltoolselectland.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/lltoolselectland.cpp b/indra/newview/lltoolselectland.cpp
index 44c0cb3124..ff991dc9fd 100755
--- a/indra/newview/lltoolselectland.cpp
+++ b/indra/newview/lltoolselectland.cpp
@@ -219,8 +219,8 @@ void LLToolSelectLand::handleDeselect()
void LLToolSelectLand::roundXY(LLVector3d &vec)
{
- vec.mdV[VX] = llround( vec.mdV[VX], (F64)PARCEL_GRID_STEP_METERS );
- vec.mdV[VY] = llround( vec.mdV[VY], (F64)PARCEL_GRID_STEP_METERS );
+ vec.mdV[VX] = ll_round( vec.mdV[VX], (F64)PARCEL_GRID_STEP_METERS );
+ vec.mdV[VY] = ll_round( vec.mdV[VY], (F64)PARCEL_GRID_STEP_METERS );
}