diff options
author | Merov Linden <merov@lindenlab.com> | 2012-07-09 12:05:50 -0700 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2012-07-09 12:05:50 -0700 |
commit | 1d41ff232870428022006875e98df5be21731c68 (patch) | |
tree | 3e3f54f33795492ab3ac5a69ba46485444ba8034 /indra/llui/llfolderview.cpp | |
parent | b490266226ac79cc7570ff7ee921506e941cce16 (diff) | |
parent | c9e11635488720626601b7b4a7926f09031a6908 (diff) |
Pull from richard/viewer-chui-folderview
Diffstat (limited to 'indra/llui/llfolderview.cpp')
-rw-r--r-- | indra/llui/llfolderview.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/llfolderview.cpp b/indra/llui/llfolderview.cpp index 92e3b7a8e9..8ade17b763 100644 --- a/indra/llui/llfolderview.cpp +++ b/indra/llui/llfolderview.cpp @@ -1927,7 +1927,7 @@ void LLFolderView::updateRenamerPosition() screenPointToLocal( x, y, &x, &y ); mRenamer->setOrigin( x, y ); - LLRect scroller_rect(0, 0, LLUI::getWindowSize().mV[VX], 0); + LLRect scroller_rect(0, 0, (S32)LLUI::getWindowSize().mV[VX], 0); if (mScrollContainer) { scroller_rect = mScrollContainer->getContentWindowRect(); |