summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorMaximB ProductEngine <mberezhnoy@productengine.com>2012-10-30 18:16:56 +0200
committerMaximB ProductEngine <mberezhnoy@productengine.com>2012-10-30 18:16:56 +0200
commitd2087bdd8a6591cafc6c8d8de7582a9dda6ea352 (patch)
tree294adce662f2820ba1039185b219969c4289b18a /indra/newview
parent2b27e33bc8af54ed86d54430e3a98d262d6186c2 (diff)
CHUI-437 (Conversation floater shows as transparent after being minimized and unminimized)
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llimfloatercontainer.cpp14
-rw-r--r--indra/newview/llimfloatercontainer.h2
2 files changed, 0 insertions, 16 deletions
diff --git a/indra/newview/llimfloatercontainer.cpp b/indra/newview/llimfloatercontainer.cpp
index b98558c47b..83233cdd13 100644
--- a/indra/newview/llimfloatercontainer.cpp
+++ b/indra/newview/llimfloatercontainer.cpp
@@ -343,20 +343,6 @@ LLIMFloaterContainer* LLIMFloaterContainer::getInstance()
return LLFloaterReg::getTypedInstance<LLIMFloaterContainer>("im_container");
}
-void LLIMFloaterContainer::setMinimized(BOOL b)
-{
- if (isMinimized() == b) return;
-
- LLMultiFloater::setMinimized(b);
-
- if (isMinimized()) return;
-
- if (getActiveFloater())
- {
- getActiveFloater()->setVisible(TRUE);
- }
-}
-
// Update all participants in the conversation lists
void LLIMFloaterContainer::processParticipantsStyleUpdate()
{
diff --git a/indra/newview/llimfloatercontainer.h b/indra/newview/llimfloatercontainer.h
index 7d13b37b31..05ea94019b 100644
--- a/indra/newview/llimfloatercontainer.h
+++ b/indra/newview/llimfloatercontainer.h
@@ -76,8 +76,6 @@ public:
static void onCurrentChannelChanged(const LLUUID& session_id);
- virtual void setMinimized(BOOL b);
-
void collapseMessagesPane(bool collapse);
// Callbacks