summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authormberezhnoy <mberezhnoy@productengine.com>2013-05-03 13:01:00 +0300
committermberezhnoy <mberezhnoy@productengine.com>2013-05-03 13:01:00 +0300
commit5f05e5841f5e748984a7dd7ac4e18070fc716857 (patch)
treead8f86d4b2525c86828ee10cb8f7594c2cc33e4a /indra
parent043f2e0bfd40d29464175de838e3a36aad6e81df (diff)
CHUI-963 (Toggling chat fui button twice tears off nearby chat to lower left corner also deletes other open conversations)
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llfloaterimcontainer.cpp5
-rw-r--r--indra/newview/llfloaterimcontainer.h1
2 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llfloaterimcontainer.cpp b/indra/newview/llfloaterimcontainer.cpp
index b88888da3b..7626a3eab8 100644
--- a/indra/newview/llfloaterimcontainer.cpp
+++ b/indra/newview/llfloaterimcontainer.cpp
@@ -2081,6 +2081,11 @@ void LLFloaterIMContainer::onClickCloseBtn()
LLFloater::closeFloater();
}
+void LLFloaterIMContainer::closeHostedFloater()
+{
+ onClickCloseBtn();
+}
+
void LLFloaterIMContainer::closeFloater(bool app_quitting/* = false*/)
{
// Check for currently active session
diff --git a/indra/newview/llfloaterimcontainer.h b/indra/newview/llfloaterimcontainer.h
index 74c3640bad..259b28f952 100644
--- a/indra/newview/llfloaterimcontainer.h
+++ b/indra/newview/llfloaterimcontainer.h
@@ -133,6 +133,7 @@ private:
void processParticipantsStyleUpdate();
void onSpeakButtonClicked();
/*virtual*/ void onClickCloseBtn();
+ /*virtual*/ void closeHostedFloater();
void collapseConversationsPane(bool collapse, bool save_is_allowed=true);