diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-11-05 18:34:30 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-11-05 18:34:30 -0800 |
| commit | 2abe0fea5c048395a75dd266bb065d8e8abd95a5 (patch) | |
| tree | e0ab786625416abb5177bb63688611d44a3def97 /indra/newview | |
| parent | 2d9d44e31643214c80bde5ffee03f9b6af6af9d0 (diff) | |
| parent | 37c416dee38a082aada799f0430022bd3051e54a (diff) | |
Pull merge fom viewer-chui-441
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llimconversation.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llimconversation.cpp b/indra/newview/llimconversation.cpp index 62712a5c7c..f91c25ef8c 100644 --- a/indra/newview/llimconversation.cpp +++ b/indra/newview/llimconversation.cpp @@ -187,7 +187,7 @@ BOOL LLIMConversation::postBuild() mParticipantListPanel = getChild<LLLayoutPanel>("speakers_list_panel"); // Create a root view folder for all participants - LLConversationItem* base_item = new LLConversationItem(mConversationViewModel); + LLConversationItem* base_item = new LLConversationItem(mSessionID, mConversationViewModel); LLFolderView::Params p(LLUICtrlFactory::getDefaultParams<LLFolderView>()); p.rect = LLRect(0, 0, getRect().getWidth(), 0); p.parent_panel = mParticipantListPanel; |