summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorWilliam Todd Stinson <stinson@lindenlab.com>2012-07-30 21:44:18 -0700
committerWilliam Todd Stinson <stinson@lindenlab.com>2012-07-30 21:44:18 -0700
commit8f7871911deba87e5ceed8f6f36c1cb2b429efe8 (patch)
tree839549a5bccc74969e057e64b73fbd2a7d323f17 /indra
parent61fe64d31e8f4d519ecc1428720e30dbbd5d8900 (diff)
parentc8bc6a9d663c3abcaeec270eb443e30a9108afc4 (diff)
Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer-chui.
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llimfloatercontainer.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llimfloatercontainer.cpp b/indra/newview/llimfloatercontainer.cpp
index adcd840dfc..405a2b3255 100644
--- a/indra/newview/llimfloatercontainer.cpp
+++ b/indra/newview/llimfloatercontainer.cpp
@@ -418,6 +418,7 @@ void LLIMFloaterContainer::repositioningWidgets()
widget_it++, ++index)
{
LLFolderViewItem* widget = widget_it->second;
+ widget->setVisible(TRUE);
widget->setRect(LLRect(0,
panel_rect.getHeight() - item_height*index,
panel_rect.getWidth(),
@@ -461,7 +462,7 @@ void LLIMFloaterContainer::addConversationListItem(std::string name, const LLUUI
widget->setVisible(TRUE);
repositioningWidgets();
-
+
mConversationsListPanel->addChild(widget);
return;