summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorYuri Chebotarev <ychebotarev@productengine.com>2009-11-16 14:13:36 +0200
committerYuri Chebotarev <ychebotarev@productengine.com>2009-11-16 14:13:36 +0200
commiteeaeca81b9a0d35b12c047497dc388593b2e9f29 (patch)
treec172037a2c60bfef901b9eb10cf4503935088010 /indra
parent508097d0f691e9705ab25d0b42f13a8d02a90049 (diff)
fix for normal ticket EXT-2459 Nearby toasts aren't visible when nearby chat console is minimized
--HG-- branch : product-engine
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llnearbychat.cpp9
-rw-r--r--indra/newview/llnearbychat.h1
2 files changed, 9 insertions, 1 deletions
diff --git a/indra/newview/llnearbychat.cpp b/indra/newview/llnearbychat.cpp
index ac806d7106..8bf964f0a7 100644
--- a/indra/newview/llnearbychat.cpp
+++ b/indra/newview/llnearbychat.cpp
@@ -292,5 +292,12 @@ void LLNearbyChat::getAllowedRect(LLRect& rect)
{
rect = gViewerWindow->getWorldViewRectRaw();
}
-
+void LLNearbyChat::setMinimized (BOOL minimize)
+{
+ if(minimize && !isDocked())
+ {
+ setVisible(FALSE);
+ }
+ LLDockableFloater::setMinimized(minimize);
+}
diff --git a/indra/newview/llnearbychat.h b/indra/newview/llnearbychat.h
index cb4654654a..ac3f346538 100644
--- a/indra/newview/llnearbychat.h
+++ b/indra/newview/llnearbychat.h
@@ -57,6 +57,7 @@ public:
/*virtual*/ void onOpen (const LLSD& key);
virtual void setRect (const LLRect &rect);
+ virtual void setMinimized (BOOL minimize);
private:
virtual void applySavedVariables();