summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelpick.cpp
diff options
context:
space:
mode:
authorandreykproductengine <akleshchev@productengine.com>2015-04-29 15:28:21 +0300
committerandreykproductengine <akleshchev@productengine.com>2015-04-29 15:28:21 +0300
commit5f397bdd1831b1be593982ca8fc88dbe1a0cad07 (patch)
tree1d0b8a8973a30bf3c65f09da653b0e7c009053fd /indra/newview/llpanelpick.cpp
parent1382e9bae647d6b548cd9a1fc78339e5929ea202 (diff)
parentfde0868231a25b8c9ce03a86cb53f1738d35688d (diff)
Merge from viewer-release
Diffstat (limited to 'indra/newview/llpanelpick.cpp')
-rwxr-xr-xindra/newview/llpanelpick.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llpanelpick.cpp b/indra/newview/llpanelpick.cpp
index 44cca21a76..8fa9aac024 100755
--- a/indra/newview/llpanelpick.cpp
+++ b/indra/newview/llpanelpick.cpp
@@ -284,9 +284,9 @@ std::string LLPanelPickInfo::createLocationText(const std::string& owner_name, c
if (!pos_global.isNull())
{
- S32 region_x = llround((F32)pos_global.mdV[VX]) % REGION_WIDTH_UNITS;
- S32 region_y = llround((F32)pos_global.mdV[VY]) % REGION_WIDTH_UNITS;
- S32 region_z = llround((F32)pos_global.mdV[VZ]);
+ S32 region_x = ll_round((F32)pos_global.mdV[VX]) % REGION_WIDTH_UNITS;
+ S32 region_y = ll_round((F32)pos_global.mdV[VY]) % REGION_WIDTH_UNITS;
+ S32 region_z = ll_round((F32)pos_global.mdV[VZ]);
location_text.append(llformat(" (%d, %d, %d)", region_x, region_y, region_z));
}
return location_text;