diff options
| author | richard <none@none> | 2010-01-15 11:25:10 -0800 |
|---|---|---|
| committer | richard <none@none> | 2010-01-15 11:25:10 -0800 |
| commit | c9cf84913d306103da51dc83e5932ff3fb308d32 (patch) | |
| tree | 9ecb21f9376f29264db9fce33310ffa3a66fc8ab /indra/newview/llpanelimcontrolpanel.cpp | |
| parent | aaef23d7eb1c17ea744fe5737af91b1ed228d416 (diff) | |
| parent | 1d1f51db971271c42d68fa12032d6f85a7e35bd8 (diff) | |
merge
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) |