diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-01-14 19:45:12 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-01-14 19:45:12 -0500 |
| commit | 056d2a82698406641e4930f7adf2fe31664c9266 (patch) | |
| tree | ddc678144c67e5467d07c2aebe4740cde6901630 /indra/newview/llpanelimcontrolpanel.cpp | |
| parent | 04f1a83b2e0517fb9f3730a31941d79adf603059 (diff) | |
| parent | e7b69ec8f8a69a437f821fb1c6b6ebeea80e28cc (diff) | |
automated merge viewer2.0->viewer2.0
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) |