Merge branch 'master' into DRTVWR-521-maint

# Conflicts:
#	indra/newview/llappviewer.cpp

1 files changed, 15 insertions, 11 deletions

diff --git a/indra/newview/llfloaterimcontainer.cpp b/indra/newview/llfloaterimcontainer.cpp
index 2a05f82f94..c6e9069d09 100644
--- a/indra/newview/llfloaterimcontainer.cpp
+++ b/indra/newview/llfloaterimcontainer.cpp
@@ -454,19 +454,23 @@ void LLFloaterIMContainer::idleUpdate()
         const LLConversationItem *current_session = getCurSelectedViewModelItem();
         if (current_session)
         {
-            // Update moderator options visibility
-            LLFolderViewModelItemCommon::child_list_t::const_iterator current_participant_model = current_session->getChildrenBegin();
-            LLFolderViewModelItemCommon::child_list_t::const_iterator end_participant_model = current_session->getChildrenEnd();
-            bool is_moderator = isGroupModerator();
-            bool can_ban = haveAbilityToBan();
-            while (current_participant_model != end_participant_model)
+            if (current_session->getType() == LLConversationItem::CONV_SESSION_GROUP)
             {
-                LLConversationItemParticipant* participant_model = dynamic_cast<LLConversationItemParticipant*>(*current_participant_model);
-                participant_model->setModeratorOptionsVisible(is_moderator);
-                participant_model->setGroupBanVisible(can_ban && participant_model->getUUID() != gAgentID);
-
-                current_participant_model++;
+                // Update moderator options visibility
+                LLFolderViewModelItemCommon::child_list_t::const_iterator current_participant_model = current_session->getChildrenBegin();
+                LLFolderViewModelItemCommon::child_list_t::const_iterator end_participant_model = current_session->getChildrenEnd();
+                bool is_moderator = isGroupModerator();
+                bool can_ban = haveAbilityToBan();
+                while (current_participant_model != end_participant_model)
+                {
+                    LLConversationItemParticipant* participant_model = dynamic_cast<LLConversationItemParticipant*>(*current_participant_model);
+                    participant_model->setModeratorOptionsVisible(is_moderator);
+                    participant_model->setGroupBanVisible(can_ban && participant_model->getUUID() != gAgentID);
+
+                    current_participant_model++;
+                }
             }
+
             // Update floater's title as required by the currently selected session or use the default title
             LLFloaterIMSession * conversation_floaterp = LLFloaterIMSession::findInstance(current_session->getUUID());
             setTitle(conversation_floaterp && conversation_floaterp->needsTitleOverwrite() ? conversation_floaterp->getTitle() : mGeneralTitle);