diff options
| author | Neal Orman <nyx@lindenlab.com> | 2009-10-16 17:56:30 +0000 |
|---|---|---|
| committer | Neal Orman <nyx@lindenlab.com> | 2009-10-16 17:56:30 +0000 |
| commit | d08b0b6ae8bcd452a3d707ac153107d0f1523df8 (patch) | |
| tree | 3caac3468a18b105e5aa5eb53cd13ed416c1a48d /indra/llui | |
| parent | 087897b1f837872fc02822595e5dd47fabf3b7e8 (diff) | |
merging in new wearable infrastructure to get a step closer to eventually supporting multiple wearables per type. Merge tested and compiles/working on linux and windows - no obvious regressions on appearance or appearance editor. Merge generated no conflicts due to being tested in fresh re-branch in avatar-pipeline/multiple-textures-12. Merge perfomed with following command:
svn merge -r 136489:136510 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/multiple-textures-12 .
Progress can be tracked in DEV-32551.
-Nyx
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/llscrollingpanellist.cpp | 4 | ||||
| -rw-r--r-- | indra/llui/llscrollingpanellist.h | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/indra/llui/llscrollingpanellist.cpp b/indra/llui/llscrollingpanellist.cpp index 13fbe1d576..4f55c0507c 100644 --- a/indra/llui/llscrollingpanellist.cpp +++ b/indra/llui/llscrollingpanellist.cpp @@ -50,7 +50,7 @@ void LLScrollingPanelList::clearPanels() reshape( 1, 1, FALSE ); } -void LLScrollingPanelList::addPanel( LLScrollingPanel* panel ) +S32 LLScrollingPanelList::addPanel( LLScrollingPanel* panel ) { addChildInBack( panel ); mPanelList.push_front( panel ); @@ -79,6 +79,8 @@ void LLScrollingPanelList::addPanel( LLScrollingPanel* panel ) childp->translate( -childp->getRect().mLeft, cur_y - childp->getRect().mBottom); cur_y -= GAP_BETWEEN_PANELS; } + + return total_height; } void LLScrollingPanelList::removePanel(LLScrollingPanel* panel) diff --git a/indra/llui/llscrollingpanellist.h b/indra/llui/llscrollingpanellist.h index 9da15822d0..3abfbcbbe7 100644 --- a/indra/llui/llscrollingpanellist.h +++ b/indra/llui/llscrollingpanellist.h @@ -77,7 +77,7 @@ public: virtual void draw(); void clearPanels(); - void addPanel( LLScrollingPanel* panel ); + S32 addPanel( LLScrollingPanel* panel ); void removePanel( LLScrollingPanel* panel ); void removePanel( U32 panel_index ); void updatePanels(BOOL allow_modify); |