diff options
| author | Oz Linden <oz@lindenlab.com> | 2010-10-15 16:40:24 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2010-10-15 16:40:24 -0400 |
| commit | 18321756297bd9b04a4204abe4fbb0e3e8112186 (patch) | |
| tree | 01e58c48ac8be93161d4a7002232ea7974637a39 /indra/newview/llsplitbutton.cpp | |
| parent | cc902e3d24c88bd49c591e81506875c5e3782b08 (diff) | |
| parent | dd69516213fdf20cbc254214e651c4df26afbff7 (diff) | |
pull fix for STORM-279
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())); |