diff options
| author | Mnikolenko ProductEngine <mnikolenko@productengine.com> | 2015-04-28 13:36:35 +0300 |
|---|---|---|
| committer | Mnikolenko ProductEngine <mnikolenko@productengine.com> | 2015-04-28 13:36:35 +0300 |
| commit | bb87365c37047a35bf524a98d5a48cdb2d56948e (patch) | |
| tree | 5b44b30944f794c2e2f78a0990cf56f81d27fa78 /indra/newview/llpanelplaceprofile.cpp | |
| parent | a89f3f29a0af37c7f3e78e38acb78f78e99dae78 (diff) | |
| parent | fde0868231a25b8c9ce03a86cb53f1738d35688d (diff) | |
Merge viewer-release, become version 3.7.29
Diffstat (limited to 'indra/newview/llpanelplaceprofile.cpp')
| -rwxr-xr-x | indra/newview/llpanelplaceprofile.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llpanelplaceprofile.cpp b/indra/newview/llpanelplaceprofile.cpp index 31238fdd48..1a665d4c1d 100755 --- a/indra/newview/llpanelplaceprofile.cpp +++ b/indra/newview/llpanelplaceprofile.cpp @@ -567,7 +567,7 @@ void LLPanelPlaceProfile::displaySelectedParcelInfo(LLParcel* parcel, // Can't have more than region max tasks, regardless of parcel // object bonus factor. - S32 primitives = llmin(llround(parcel->getMaxPrimCapacity() * parcel->getParcelPrimBonus()), + S32 primitives = llmin(ll_round(parcel->getMaxPrimCapacity() * parcel->getParcelPrimBonus()), (S32)region->getMaxTasks()); const U8* available = (U8*)getString("available").c_str(); |