diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2009-08-14 22:40:13 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2009-08-14 22:40:13 +0000 |
| commit | 3b65da1fad46eda2c97681879fce8880f7462082 (patch) | |
| tree | 9c9a5b69ea5f3d90883c39acdd0f856e75105fd1 /indra/newview/llpanelpicks.cpp | |
| parent | 73caee4208a4e05f66583de099502012fd8415ea (diff) | |
merge -r 1341-1350 https://svn.aws.productengine.com/secondlife/pe/stable-1 -> viewer-2.0.0-3
EXT-456 EXT-480 EXT-481 EXT-497 EXT-498 EXT-509 EXT-511
Diffstat (limited to 'indra/newview/llpanelpicks.cpp')
| -rw-r--r-- | indra/newview/llpanelpicks.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llpanelpicks.cpp b/indra/newview/llpanelpicks.cpp index afcd8c735c..051bf08c2f 100644 --- a/indra/newview/llpanelpicks.cpp +++ b/indra/newview/llpanelpicks.cpp @@ -204,6 +204,7 @@ void LLPanelPicks::reshapePicksList() reshapePickItem(childp, last_bottom,pickList->getRect().getWidth()); } + //*TODO move back panel reshaping before reshaping pick items, so it will be more durable to xui xml changes S32 height = pickList->getChildCount() * ((*child_first_it)->getRect().getHeight() + PICK_ITEMS_BETWEEN); LLRect rc = pickList->getRect(); rc.setLeftTopAndSize(rc.mLeft, rc.mTop, rc.getWidth(), height); |