From facf67ae3226105910c983a8fa8760414bf703e9 Mon Sep 17 00:00:00 2001 From: Don Kjer Date: Wed, 5 Dec 2007 23:43:56 +0000 Subject: EFFECTIVE MERGE: svn merge -r 71520:73420 svn+ssh://svn/svn/linden/branches/maintenance-3 into release ACTUAL MERGE: svn merge -r 75074:75114 svn+ssh://svn/svn/linden/qa/maintenance-3-merge-75067 into release --- indra/llui/llmenugl.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/llui/llmenugl.cpp') diff --git a/indra/llui/llmenugl.cpp b/indra/llui/llmenugl.cpp index d150f8954e..46f9f515d7 100644 --- a/indra/llui/llmenugl.cpp +++ b/indra/llui/llmenugl.cpp @@ -632,7 +632,7 @@ public: }; LLMenuItemSeparatorGL::LLMenuItemSeparatorGL( const LLString &name ) : - LLMenuItemGL( SEPARATOR_NAME, SEPARATOR_LABEL ) + LLMenuItemGL( name, SEPARATOR_LABEL ) { } @@ -2832,7 +2832,7 @@ LLMenuItemGL* LLMenuGL::highlightNextItem(LLMenuItemGL* cur_item, BOOL skip_disa while(1) { // skip separators and disabled items - if ((*next_item_iter)->getEnabled() && (*next_item_iter)->getName() != SEPARATOR_NAME) + if ((*next_item_iter)->getEnabled() && (*next_item_iter)->getType() != SEPARATOR_NAME) { if (cur_item) { -- cgit v1.2.3