diff options
| author | Denis Serdjuk <dserduk@productengine.com> | 2009-12-21 14:43:09 +0200 |
|---|---|---|
| committer | Denis Serdjuk <dserduk@productengine.com> | 2009-12-21 14:43:09 +0200 |
| commit | 40e9c253fc6888e3e1b150dc265d79652e9ec26c (patch) | |
| tree | e187fe8561a836b332ac91927201f1b6d70646ac /indra/newview/llpanelimcontrolpanel.cpp | |
| parent | 1c3d7eec895a7038d9aa5ffb1e9571a172f27e72 (diff) | |
additional commit to major task EXT-3509 User's own name should appear in the Group chat participant list
1. agent will be appear in ad-hoc conference too.
2. Disabling block/unblock yourself.
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llpanelimcontrolpanel.cpp')
| -rw-r--r-- | indra/newview/llpanelimcontrolpanel.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llpanelimcontrolpanel.cpp b/indra/newview/llpanelimcontrolpanel.cpp index 70e4798079..ae1c28c7ab 100644 --- a/indra/newview/llpanelimcontrolpanel.cpp +++ b/indra/newview/llpanelimcontrolpanel.cpp @@ -282,8 +282,9 @@ void LLPanelGroupControlPanel::setSessionId(const LLUUID& session_id) mGroupID = LLIMModel::getInstance()->getOtherParticipantID(session_id); + // for group and Ad-hoc chat we need to include agent into list if(!mParticipantList) - mParticipantList = new LLParticipantList(mSpeakerManager, getChild<LLAvatarList>("speakers_list")); + mParticipantList = new LLParticipantList(mSpeakerManager, getChild<LLAvatarList>("speakers_list"), true,false); } |