Automated merge with https://hg.productengine.com/secondlife/viewer-trunk/

--HG--
branch : product-engine

indra/newview/llparticipantlist.cpp

@@ -655,6 +655,7 @@ LLContextMenu* LLParticipantList::LLParticipantListMenu::createMenu()
 	bool is_sort_visible = (mParent.mAvatarList && mParent.mAvatarList->size() > 1);
 	main_menu->setItemVisible("SortByName", is_sort_visible);
 	main_menu->setItemVisible("SortByRecentSpeakers", is_sort_visible);
+	main_menu->setItemVisible("Moderator Options Separator", isGroupModerator());
 	main_menu->setItemVisible("Moderator Options", isGroupModerator());
 	main_menu->setItemVisible("View Icons Separator", mParent.mAvatarListToggleIconsConnection.connected());
 	main_menu->setItemVisible("View Icons", mParent.mAvatarListToggleIconsConnection.connected());

indra/newview/skins/default/xui/en/menu_participant_list.xml

@@ -127,7 +127,8 @@
          parameter="can_mute_text" />
     </menu_item_check>
     <menu_item_separator
-     layout="topleft" />
+     layout="topleft" 
+     name="Moderator Options Separator"/>
     <context_menu
      label="Moderator Options &gt;"
      layout="topleft"