livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Let's see if there are side-effects when making the conversations floater minimizable

master
Ansariel 2015-09-04 20:09:37 +02:00
parent 364d69d27c
commit 213f3f00ec
4 changed files with 2 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
indra/newview/fsfloaterimcontainer.cpp
View File

@ -356,22 +356,6 @@ FSFloaterIMContainer* FSFloaterIMContainer::getInstance()
return LLFloaterReg::getTypedInstance<FSFloaterIMContainer>("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);

1
indra/newview/fsfloaterimcontainer.h
View File

@ -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

2
indra/newview/skins/default/xui/en/floater_fs_im_container.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<multi_floater
can_close="true"
can_minimize="false"
can_minimize="true"
can_resize="true"
height="390"
layout="topleft"

2
indra/newview/skins/vintage/xui/en/floater_im_container.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<multi_floater
can_close="true"
can_minimize="false"
can_minimize="true"
can_resize="true"
height="390"
layout="topleft"