diff --git a/indra/newview/fsfloaterimcontainer.cpp b/indra/newview/fsfloaterimcontainer.cpp index 5e76f55c14..fb64cb5aec 100644 --- a/indra/newview/fsfloaterimcontainer.cpp +++ b/indra/newview/fsfloaterimcontainer.cpp @@ -356,22 +356,6 @@ FSFloaterIMContainer* FSFloaterIMContainer::getInstance() return LLFloaterReg::getTypedInstance("fs_im_container"); } -void FSFloaterIMContainer::setMinimized(BOOL b) -{ - if (isMinimized() == b) return; - - LLMultiFloater::setMinimized(b); - // Hide minimized floater (see EXT-5315) - setVisible(!b); - - if (isMinimized()) return; - - if (getActiveFloater()) - { - getActiveFloater()->setVisible(TRUE); - } -} - void FSFloaterIMContainer::setVisible(BOOL b) { LLMultiFloater::setVisible(b); diff --git a/indra/newview/fsfloaterimcontainer.h b/indra/newview/fsfloaterimcontainer.h index 655d9c082b..f2f2c33627 100644 --- a/indra/newview/fsfloaterimcontainer.h +++ b/indra/newview/fsfloaterimcontainer.h @@ -64,7 +64,6 @@ public: static FSFloaterIMContainer* findInstance(); static FSFloaterIMContainer* getInstance(); - virtual void setMinimized(BOOL b); virtual void setVisible(BOOL b); void onNewMessageReceived(const LLSD& data); // public so nearbychat can call it directly. TODO: handle via callback. -AO diff --git a/indra/newview/skins/default/xui/en/floater_fs_im_container.xml b/indra/newview/skins/default/xui/en/floater_fs_im_container.xml index 98eac40fa4..bb4f0dc1e8 100644 --- a/indra/newview/skins/default/xui/en/floater_fs_im_container.xml +++ b/indra/newview/skins/default/xui/en/floater_fs_im_container.xml @@ -1,7 +1,7 @@