diff options
| author | Oz Linden <oz@lindenlab.com> | 2010-12-04 09:14:58 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2010-12-04 09:14:58 -0500 |
| commit | efa42a6aab6d3ada198072c0e2be2b7d9b4e1eb5 (patch) | |
| tree | 39a949e1570c3524c8560522b693328fc7d9afbf /indra/newview/llsplitbutton.cpp | |
| parent | eed7b7201188e01a452c7f4c511c0cb157dc7a5f (diff) | |
| parent | 7549df0eaf347e9f490f9cfaf4950dd623a08237 (diff) | |
merge up to viewer-development
Diffstat (limited to 'indra/newview/llsplitbutton.cpp')
| -rw-r--r-- | indra/newview/llsplitbutton.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llsplitbutton.cpp b/indra/newview/llsplitbutton.cpp index 7db42214e1..790305103d 100644 --- a/indra/newview/llsplitbutton.cpp +++ b/indra/newview/llsplitbutton.cpp @@ -220,7 +220,7 @@ LLSplitButton::LLSplitButton(const LLSplitButton::Params& p) addChild(mItemsPanel); - LLInitParam::ParamIterator<ItemParams>::const_iterator it = p.items().begin(); + LLInitParam::ParamIterator<ItemParams>::const_iterator it = p.items.begin(); //processing shown item button mShownItem = prepareItemButton(*it); @@ -231,7 +231,7 @@ LLSplitButton::LLSplitButton(const LLSplitButton::Params& p) //processing hidden item buttons S32 item_top = mItemsPanel->getRect().getHeight(); - for (++it; it != p.items().end(); ++it) + for (++it; it != p.items.end(); ++it) { LLButton* hidden_button = prepareItemButton(*it); hidden_button->setRect(LLRect(btn_left, item_top, btn_right, item_top - rc.getHeight())); |