From 37c416dee38a082aada799f0430022bd3051e54a Mon Sep 17 00:00:00 2001 From: Gilbert Gonzales Date: Mon, 5 Nov 2012 17:39:29 -0800 Subject: CHUI-479: Problem: The parent folder's view model did not store the session id. Because of this, the speaker indicator would be set to a session id of null (nearby chat). Solution: Now when the folder view model is created in the torn off list, pass in the session id. This allows the folder view model to know which session id it belongs to. Participants can then look at the parent folder (folder view) and retrieve the session id. --- indra/newview/llimconversation.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/newview/llimconversation.cpp b/indra/newview/llimconversation.cpp index de769d95ac..3e42e0b4ef 100644 --- a/indra/newview/llimconversation.cpp +++ b/indra/newview/llimconversation.cpp @@ -187,7 +187,7 @@ BOOL LLIMConversation::postBuild() mParticipantListPanel = getChild("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()); p.rect = LLRect(0, 0, getRect().getWidth(), 0); p.parent_panel = mParticipantListPanel; -- cgit v1.2.3