diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2010-09-27 17:54:52 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2010-09-27 17:54:52 -0700 |
| commit | a4b223248eac077c7d8e00c5fbb9f5fb067cc9bd (patch) | |
| tree | 760a282276c5bf6e4095b0944b1a08a3bfd32d87 /indra/newview/llsplitbutton.cpp | |
| parent | 7fc48fb1259d3dbceed5248d8ccda39048d6ba8d (diff) | |
| parent | e6688f993f82d2683e3eadce96c893959c94be2d (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())); |