From ae093e02a126666c9137d9eb6d9aeea0c1c73a8a Mon Sep 17 00:00:00 2001 From: Gilbert Gonzales Date: Tue, 16 Oct 2012 11:38:36 -0700 Subject: CHUI-380: Realized that the when clicking the participant/conversation item that the active session wasn't being stored. This caused the right side conversation floater to not change when selecting a participant under a conersation. Resolution: now when clicking on a conversation or participant the active session is stored using setActiveSession(). --- indra/newview/llconversationview.cpp | 6 ++++++ indra/newview/llimfloatercontainer.h | 1 + 2 files changed, 7 insertions(+) (limited to 'indra/newview') diff --git a/indra/newview/llconversationview.cpp b/indra/newview/llconversationview.cpp index b7ebb70e86..1b450665b3 100755 --- a/indra/newview/llconversationview.cpp +++ b/indra/newview/llconversationview.cpp @@ -242,6 +242,9 @@ void LLConversationViewSession::selectItem() // Set the focus on the selected floater session_floater->setFocus(TRUE); + // Store the active session + LLIMFloaterContainer::getInstance()->setSelectedSession(item->getUUID()); + LLFolderViewItem::selectItem(); } @@ -441,6 +444,9 @@ void LLConversationViewParticipant::selectItem() { LLIMFloater::show(vmi->getUUID()); } + + // Store the active session + container->setSelectedSession(vmi->getUUID()); } //Focus the current conversation floater (it is already visible so just focus it) else diff --git a/indra/newview/llimfloatercontainer.h b/indra/newview/llimfloatercontainer.h index 6643471d97..579f62c688 100644 --- a/indra/newview/llimfloatercontainer.h +++ b/indra/newview/llimfloatercontainer.h @@ -89,6 +89,7 @@ public: LLConversationViewModel& getRootViewModel() { return mConversationViewModel; } LLUUID getSelectedSession() { return mSelectedSession; } + void setSelectedSession(LLUUID sessionID) { mSelectedSession = sessionID; } private: typedef std::map avatarID_panel_map_t; -- cgit v1.2.3