summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorPaul ProductEngine <pguslisty@productengine.com>2011-12-02 19:05:22 +0200
committerPaul ProductEngine <pguslisty@productengine.com>2011-12-02 19:05:22 +0200
commit7359a5f34b0c51421cdb109854b0f305422ed20a (patch)
treee40703fc8312f7469e73f786e8be8c0ad00dad8a /indra
parent1ed694c210ffa0c648a7b832ac060ffe6eea26ba (diff)
EXP-1463 ADDITIONAL FIX (IM chiclets overlay Mini-Location bar)
- Don't let chiclet list left side to be out of chiclet_container
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llchicletbar.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llchicletbar.cpp b/indra/newview/llchicletbar.cpp
index 1bd5a571a5..a879651060 100644
--- a/indra/newview/llchicletbar.cpp
+++ b/indra/newview/llchicletbar.cpp
@@ -353,6 +353,8 @@ void LLChicletBar::fitWithTopInfoBar()
if (top_info_bar.getVisible())
{
S32 delta = top_info_bar.calcScreenRect().mRight - calcScreenRect().mLeft;
+ if (delta < 0 && rect.mLeft < llabs(delta))
+ delta = -rect.mLeft;
rect.setLeftTopAndSize(rect.mLeft + delta, rect.mTop, rect.getWidth(), rect.getHeight());
width = rect.getWidth() - delta;
}