diff options
| author | callum_linden <none@none> | 2014-12-10 08:44:08 -0800 |
|---|---|---|
| committer | callum_linden <none@none> | 2014-12-10 08:44:08 -0800 |
| commit | 23711c927561ee85b6d46e7e741cdc652649686e (patch) | |
| tree | 4b8c89671594efb2241f894011f9548ae901df76 /indra/newview/llfloaterlandholdings.cpp | |
| parent | 6ad2b5f8d3e4c240a48452578d5c3101a2811053 (diff) | |
Rename llround(..) to ll_round(..) because of a collision with MS llround (long long round) in VS2013
Diffstat (limited to 'indra/newview/llfloaterlandholdings.cpp')
| -rwxr-xr-x | indra/newview/llfloaterlandholdings.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llfloaterlandholdings.cpp b/indra/newview/llfloaterlandholdings.cpp index cf03087afb..f34760a6bf 100755 --- a/indra/newview/llfloaterlandholdings.cpp +++ b/indra/newview/llfloaterlandholdings.cpp @@ -208,8 +208,8 @@ void LLFloaterLandHoldings::processPlacesReply(LLMessageSystem* msg, void**) self->mActualArea += actual_area; self->mBillableArea += billable_area; - S32 region_x = llround(global_x) % REGION_WIDTH_UNITS; - S32 region_y = llround(global_y) % REGION_WIDTH_UNITS; + S32 region_x = ll_round(global_x) % REGION_WIDTH_UNITS; + S32 region_y = ll_round(global_y) % REGION_WIDTH_UNITS; std::string location; location = llformat("%s (%d, %d)", sim_name.c_str(), region_x, region_y); |