From 7092a07045e0bc17c503c0bc81e3f038bd1516e8 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Mon, 16 Jan 2012 14:35:00 -0800
Subject: [PATCH] Fix Mac build issue
---
indra/llui/lllayoutstack.cpp | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/indra/llui/lllayoutstack.cpp b/indra/llui/lllayoutstack.cpp
index b67030dc34e..a1e8eebb47a 100644
--- a/indra/llui/lllayoutstack.cpp
+++ b/indra/llui/lllayoutstack.cpp
@@ -116,9 +116,9 @@ F32 LLLayoutPanel::getVisibleAmount() const
S32 LLLayoutPanel::getLayoutDim() const
{
- return llround((mOrientation == LLLayoutStack::HORIZONTAL)
+ return llround((F32)((mOrientation == LLLayoutStack::HORIZONTAL)
? getRect().getWidth()
- : getRect().getHeight());
+ : getRect().getHeight()));
}
S32 LLLayoutPanel::getVisibleDim() const
@@ -132,9 +132,9 @@ S32 LLLayoutPanel::getVisibleDim() const
void LLLayoutPanel::setOrientation( LLLayoutStack::ELayoutOrientation orientation )
{
mOrientation = orientation;
- S32 layout_dim = llround((mOrientation == LLLayoutStack::HORIZONTAL)
+ S32 layout_dim = llround((F32)((mOrientation == LLLayoutStack::HORIZONTAL)
? getRect().getWidth()
- : getRect().getHeight());
+ : getRect().getHeight()));
if (mMinDim == -1)
{
--
GitLab