diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2009-12-08 15:27:20 +0200 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2009-12-08 15:27:20 +0200 |
| commit | d87c492d721c448ce8676dc568731ae389df46f3 (patch) | |
| tree | 209c898da569532711fb6a981e548c3948caa279 /indra/newview/llscreenchannel.cpp | |
| parent | 75993e09bf90e8a9d380192268cd6e0e149a70e2 (diff) | |
| parent | 06429722acae74a856589ccf92d31c2e10b0832d (diff) | |
Merge from default branch.
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llscreenchannel.cpp')
| -rw-r--r-- | indra/newview/llscreenchannel.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llscreenchannel.cpp b/indra/newview/llscreenchannel.cpp index a1ea7aeb96..64f57f24f9 100644 --- a/indra/newview/llscreenchannel.cpp +++ b/indra/newview/llscreenchannel.cpp @@ -141,7 +141,7 @@ void LLScreenChannel::updatePositionAndSize(LLRect old_world_rect, LLRect new_wo S32 right_delta = old_world_rect.mRight - new_world_rect.mRight; LLRect this_rect = getRect(); - this_rect.mTop = new_world_rect.getHeight() * getHeightRatio(); + this_rect.mTop = (S32) (new_world_rect.getHeight() * getHeightRatio()); switch(mChannelAlignment) { case CA_LEFT : |