diff options
author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-21 11:32:15 +0100 |
---|---|---|
committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-21 11:32:15 +0100 |
commit | b95aef17ff696f94404ab507bd817f9a15d254cc (patch) | |
tree | 9f64128e7696c618899f81050ba6f0ae9c75e94f /indra/newview/llpaneloutfitedit.cpp | |
parent | db73037c2882af70a09ac768ddb3748d811c767a (diff) | |
parent | 3d313630009366261ab99527fdd6eb7bb5eb5d3c (diff) |
merge from viewer-trunk
Diffstat (limited to 'indra/newview/llpaneloutfitedit.cpp')
-rw-r--r-- | indra/newview/llpaneloutfitedit.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llpaneloutfitedit.cpp b/indra/newview/llpaneloutfitedit.cpp index ba6473839a..ce17e1d624 100644 --- a/indra/newview/llpaneloutfitedit.cpp +++ b/indra/newview/llpaneloutfitedit.cpp @@ -468,13 +468,14 @@ void LLPanelOutfitEdit::onOutfitItemSelectionChange(void) return; LLRect item_rect; - mLookContents->localRectToOtherView(item->getRect(), &item_rect, getChild<LLUICtrl>("outfit_wearables_panel")); + mLookContents->localRectToOtherView(item->getRect(), &item_rect, this); // TODO button(and item list) should be removed (when new widget is ready) LLRect btn_rect = mEditWearableBtn->getRect(); btn_rect.set(item_rect.mRight - btn_rect.getWidth(), item_rect.mTop, item_rect.mRight, item_rect.mBottom); mEditWearableBtn->setShape(btn_rect); + sendChildToFront(mEditWearableBtn); mEditWearableBtn->setEnabled(TRUE); if (!mEditWearableBtn->getVisible()) |