summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorSeth ProductEngine <slitovchuk@productengine.com>2012-07-13 20:06:35 +0300
committerSeth ProductEngine <slitovchuk@productengine.com>2012-07-13 20:06:35 +0300
commit7f7a9b7cbae153b00b8a77d3d662257bf6152912 (patch)
tree56ed46fcc84eb5b3bba5960d943f872f3798b252 /indra
parentaf7de5dd9373a5a15c4d5ea107782e50eb3ce62c (diff)
CHUI-205 FIXED conversations selection in the conversations list.
Each conversation item is added to the folder view which lists all conversations.
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llimfloatercontainer.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llimfloatercontainer.cpp b/indra/newview/llimfloatercontainer.cpp
index bf0fc2f6c0..4f626cb5d2 100644
--- a/indra/newview/llimfloatercontainer.cpp
+++ b/indra/newview/llimfloatercontainer.cpp
@@ -438,6 +438,9 @@ void LLIMFloaterContainer::addConversationListItem(std::string name, const LLUUI
LLFolderViewItem* widget = createConversationItemWidget(item);
mConversationsWidgets[floaterp] = widget;
+ // Add a new conversation widget to the root folder of a folder view.
+ mConversationsRoot->addItem(widget);
+
// Add it to the UI
widget->setVisible(TRUE);
mConversationsListPanel->addChild(widget);
@@ -460,7 +463,7 @@ void LLIMFloaterContainer::removeConversationListItem(LLFloater* floaterp, bool
if (widget_it != mConversationsWidgets.end())
{
LLFolderViewItem* widget = widget_it->second;
- delete widget;
+ widget->destroyView();
}
// Suppress the conversation items and widgets from their respective maps