diff options
| author | Oz Linden <oz@lindenlab.com> | 2015-06-08 16:33:02 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2015-06-08 16:33:02 -0400 |
| commit | 949942c730b0b7463338c2cb3bc411ac12f4f648 (patch) | |
| tree | 159b9cf6bb6a9de9b538f17e3d721be25a15b79a /indra/llrender/lluiimage.cpp | |
| parent | a219cf1c98527faa0e7addeb9660f679208bb0e7 (diff) | |
| parent | f3c58f765c0168f25bb13c4427e34b4bdad2f671 (diff) | |
merge changes for 3.7.29-release
Diffstat (limited to 'indra/llrender/lluiimage.cpp')
| -rw-r--r-- | indra/llrender/lluiimage.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llrender/lluiimage.cpp b/indra/llrender/lluiimage.cpp index 6f1fae92cd..5d8f92b2e6 100644 --- a/indra/llrender/lluiimage.cpp +++ b/indra/llrender/lluiimage.cpp @@ -149,13 +149,13 @@ void LLUIImage::draw3D(const LLVector3& origin_agent, const LLVector3& x_axis, c S32 LLUIImage::getWidth() const { // return clipped dimensions of actual image area - return llround((F32)mImage->getWidth(0) * mClipRegion.getWidth()); + return ll_round((F32)mImage->getWidth(0) * mClipRegion.getWidth()); } S32 LLUIImage::getHeight() const { // return clipped dimensions of actual image area - return llround((F32)mImage->getHeight(0) * mClipRegion.getHeight()); + return ll_round((F32)mImage->getHeight(0) * mClipRegion.getHeight()); } S32 LLUIImage::getTextureWidth() const |