diff options
| author | Igor Borovkov <iborovkov@productengine.com> | 2009-12-21 17:54:53 +0200 |
|---|---|---|
| committer | Igor Borovkov <iborovkov@productengine.com> | 2009-12-21 17:54:53 +0200 |
| commit | d08ff06230ecc723eb872117c3c0b1031c08d9fe (patch) | |
| tree | fbac1ee8ff1fa46494fa3802b802eaecdb11c63f /indra/newview/llpanelimcontrolpanel.cpp | |
| parent | eb4f026181c83dfd2106cce3ab1fde6a3fe60ec3 (diff) | |
| parent | c353e640fa80a335be741dd0edfdc9952ea3cdea (diff) | |
merge
--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); } |