diff options
author | Richard Linden <none@none> | 2010-09-23 14:08:50 -0700 |
---|---|---|
committer | Richard Linden <none@none> | 2010-09-23 14:08:50 -0700 |
commit | 58ac85223e976556b060ca0ff345f1a96d8f7848 (patch) | |
tree | 1e8901e1a47304829d67e5e71b178a5f47142c7c /indra/llui/llcombobox.cpp | |
parent | 92195c479f597538a55dfa8b2e02c1b4908a2259 (diff) | |
parent | fbcbfb88059b0d669592407205dd4167257a2395 (diff) |
merge
Diffstat (limited to 'indra/llui/llcombobox.cpp')
-rw-r--r-- | indra/llui/llcombobox.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llui/llcombobox.cpp b/indra/llui/llcombobox.cpp index 910bab9a97..edd2cd340b 100644 --- a/indra/llui/llcombobox.cpp +++ b/indra/llui/llcombobox.cpp @@ -139,8 +139,8 @@ LLComboBox::LLComboBox(const LLComboBox::Params& p) // Grab the mouse-up event and make sure the button state is correct mList->setMouseUpCallback(boost::bind(&LLComboBox::onListMouseUp, this)); - for (LLInitParam::ParamIterator<ItemParams>::const_iterator it = p.items().begin(); - it != p.items().end(); + for (LLInitParam::ParamIterator<ItemParams>::const_iterator it = p.items.begin(); + it != p.items.end(); ++it) { LLScrollListItem::Params item_params = *it; |