summaryrefslogtreecommitdiff
path: root/indra/llui
diff options
context:
space:
mode:
authorMaximB ProductEngine <mberezhnoy@productengine.com>2012-10-26 19:33:31 +0300
committerMaximB ProductEngine <mberezhnoy@productengine.com>2012-10-26 19:33:31 +0300
commita815585fd7de0f5aba60739127f473fd9d22ccfc (patch)
treebcec71c1e365ba8d43cc04e1b0ac8fb75ca33502 /indra/llui
parent7127ea071922ee703cab56439a379f475cd5e4e7 (diff)
CHUI-439 (Conversation floater is automatically unminimized when a selected user is removed from nearby chat participant list after teleport)
CHUI-438 (Conversation remains transparent after teleport with a participant selected in nearby chat)
Diffstat (limited to 'indra/llui')
-rwxr-xr-xindra/llui/llfolderviewitem.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llui/llfolderviewitem.cpp b/indra/llui/llfolderviewitem.cpp
index 0b04288950..4825fc613c 100755
--- a/indra/llui/llfolderviewitem.cpp
+++ b/indra/llui/llfolderviewitem.cpp
@@ -1473,6 +1473,8 @@ void LLFolderViewFolder::destroyView()
// doesn't delete it.
void LLFolderViewFolder::extractItem( LLFolderViewItem* item )
{
+ if (item->isSelected())
+ getRoot()->clearSelection();
items_t::iterator it = std::find(mItems.begin(), mItems.end(), item);
if(it == mItems.end())
{