summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
Diffstat (limited to 'indra')
-rwxr-xr-xindra/llui/llmenugl.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/indra/llui/llmenugl.cpp b/indra/llui/llmenugl.cpp
index cb0b75ea48..31df853ab4 100755
--- a/indra/llui/llmenugl.cpp
+++ b/indra/llui/llmenugl.cpp
@@ -2114,10 +2114,13 @@ void LLMenuGL::arrange( void )
&& height + (*item_iter)->getNominalHeight() > max_height - spillover_item_height)
{
// don't show only one item
- int visible_items = std::count_if(item_iter, mItems.end(), [](LLMenuItemGL* itemp)
+ int visible_items = 0;
+ item_list_t::iterator count_iter;
+ for (count_iter = item_iter; count_iter != mItems.end(); ++count_iter)
{
- return itemp->getVisible();
- });
+ if((*count_iter)->getVisible())
+ visible_items++;
+ }
if (visible_items>1)
{
// no room for any more items