diff options
author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2009-12-04 17:03:34 -0500 |
---|---|---|
committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2009-12-04 17:03:34 -0500 |
commit | 938c51d2a483962556ee183c24e2b3f635f2c56b (patch) | |
tree | 962440abff0e5aa3dfa0fdf34b25f96780bcb3be /indra/llui/llview.cpp | |
parent | 01f61d4d9e7763cbbf9e21673cb23f71a792e9c4 (diff) | |
parent | fa8b2135f5eaf92b24abe79f908a62e7e2c0a076 (diff) |
merge to pull viewer-2 changes into avp
--HG--
branch : avatar-pipeline
Diffstat (limited to 'indra/llui/llview.cpp')
-rw-r--r-- | indra/llui/llview.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llui/llview.cpp b/indra/llui/llview.cpp index 23e4131e6d..6f8455774d 100644 --- a/indra/llui/llview.cpp +++ b/indra/llui/llview.cpp @@ -2533,6 +2533,7 @@ void LLView::setupParams(LLView::Params& p, LLView* parent) else { p.rect.left = p.rect.left + parent_rect.getWidth()/2 - p.rect.width/2; + p.rect.right.setProvided(false); // recalculate the right } } else @@ -2553,6 +2554,7 @@ void LLView::setupParams(LLView::Params& p, LLView* parent) else { p.rect.bottom = p.rect.bottom + parent_rect.getHeight()/2 - p.rect.height/2; + p.rect.top.setProvided(false); // recalculate the top } } else |