diff options
| author | James Cook <james@lindenlab.com> | 2010-01-15 12:02:56 -0800 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2010-01-15 12:02:56 -0800 |
| commit | 4acf56d2a79a4f3bb555977aeaef21e15e26f684 (patch) | |
| tree | ac0d8ff2225916323d9b942246edd458e04fd738 /indra/newview/llpanelimcontrolpanel.cpp | |
| parent | 3f83c05f7c71887825c907b0e148d81cd7de5324 (diff) | |
| parent | c9cf84913d306103da51dc83e5932ff3fb308d32 (diff) | |
Merge in viewer-2-0 changes
Diffstat (limited to 'indra/newview/llpanelimcontrolpanel.cpp')
| -rw-r--r-- | indra/newview/llpanelimcontrolpanel.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llpanelimcontrolpanel.cpp b/indra/newview/llpanelimcontrolpanel.cpp index b547997e7a..0cfe501fab 100644 --- a/indra/newview/llpanelimcontrolpanel.cpp +++ b/indra/newview/llpanelimcontrolpanel.cpp @@ -302,7 +302,7 @@ void LLPanelGroupControlPanel::setSessionId(const LLUUID& session_id) { LLPanelChatControlPanel::setSessionId(session_id); - mGroupID = LLIMModel::getInstance()->getOtherParticipantID(session_id); + mGroupID = session_id; // for group and Ad-hoc chat we need to include agent into list if(!mParticipantList) |