summaryrefslogtreecommitdiff
path: root/indra/llui
diff options
context:
space:
mode:
authorIgor Borovkov <iborovkov@productengine.com>2009-11-17 18:42:51 +0200
committerIgor Borovkov <iborovkov@productengine.com>2009-11-17 18:42:51 +0200
commita66aa0fd9a7aa20484521bf9b3809297e31466b0 (patch)
tree7503006a704c94948888a2310d56015aba273613 /indra/llui
parent4f35650f0427f6d6db10da0058d2850c30f98904 (diff)
fixed major EXT-2551 Nearby Chat undocs after minimizing and opening (being docked before)
--HG-- branch : product-engine
Diffstat (limited to 'indra/llui')
-rw-r--r--indra/llui/lldockablefloater.cpp13
1 files changed, 1 insertions, 12 deletions
diff --git a/indra/llui/lldockablefloater.cpp b/indra/llui/lldockablefloater.cpp
index 9be3d49023..9a2f2ab4d3 100644
--- a/indra/llui/lldockablefloater.cpp
+++ b/indra/llui/lldockablefloater.cpp
@@ -136,21 +136,10 @@ void LLDockableFloater::setVisible(BOOL visible)
void LLDockableFloater::setMinimized(BOOL minimize)
{
- if(minimize && isDocked())
+ if(minimize)
{
setVisible(FALSE);
}
-
- if (minimize)
- {
- setCanDock(false);
- }
- else if (!minimize && mDockControl.get() != NULL && mDockControl.get()->isDockVisible())
- {
- setCanDock(true);
- }
-
- LLFloater::setMinimized(minimize);
}
LLView * LLDockableFloater::getDockWidget()