diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-04-06 10:19:31 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-04-06 10:19:31 -0400 |
| commit | ec5bd9c857b4d817685b09f9a10da7434ebbb816 (patch) | |
| tree | b6400432fea054747130c183447599ced6709e5d /indra/newview/llpaneleditwearable.cpp | |
| parent | 785d4c34b62b7ca76b292e0001c516ba8fa738bc (diff) | |
| parent | 7187f08e89ca1d10fb872070dc6381a0a926f57d (diff) | |
automated merge
Diffstat (limited to 'indra/newview/llpaneleditwearable.cpp')
| -rw-r--r-- | indra/newview/llpaneleditwearable.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/indra/newview/llpaneleditwearable.cpp b/indra/newview/llpaneleditwearable.cpp index 805016f089..c0528da999 100644 --- a/indra/newview/llpaneleditwearable.cpp +++ b/indra/newview/llpaneleditwearable.cpp @@ -489,7 +489,6 @@ void LLPanelEditWearable::initializePanel() updateScrollingPanelUI(); } - } void LLPanelEditWearable::updateScrollingPanelUI() @@ -640,14 +639,9 @@ void LLPanelEditWearable::buildParamList(LLScrollingPanelList *panel_list, value { LLPanel::Params p; p.name("LLScrollingPanelParam"); - p.rect(LLRect(0, LLScrollingPanelParam::PARAM_PANEL_HEIGHT, LLScrollingPanelParam::PARAM_PANEL_WIDTH, 0 )); LLScrollingPanelParam* panel_param = new LLScrollingPanelParam( p, NULL, (*it).second, TRUE, this->getWearable()); height = panel_list->addPanel( panel_param ); } - - S32 width = tab->getRect().getWidth(); - - tab->reshape(width,height + tab->getHeaderHeight()+10,FALSE); } } |