diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2009-12-07 16:04:24 +0200 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2009-12-07 16:04:24 +0200 |
| commit | dc6ce7f7826592c37810efa686f64ec2cf8a15ee (patch) | |
| tree | e770ee51180e855c7da7d4b98fc631d0a06e95bc /indra/llui/llview.cpp | |
| parent | 6eee48e16e75c1f70bb1cbce9544bad63d9621cf (diff) | |
| parent | fefb08eef53da3cb0204d31f349aabfa6369f10b (diff) | |
Manual merge from default branch.
--HG--
branch : product-engine
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 d8ebe15dc0..8917e4b813 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 |