diff options
| author | Richard Linden <none@none> | 2010-09-22 19:11:29 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-09-22 19:11:29 -0700 |
| commit | abe758d45fa3dd3524a4c7a9667e4f02c3de8eac (patch) | |
| tree | 7ac140c51c22a42c693b0930898e0996a807ecb8 /indra/newview/llsplitbutton.cpp | |
| parent | 264b549bcb991f4cdd6889f06b8f7fbe8740e32a (diff) | |
| parent | b124d45b4ef714acfe629af554768950dcdd5f2c (diff) | |
merge
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())); |