summaryrefslogtreecommitdiff
path: root/indra/llui/llfloater.cpp
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2013-02-23 11:22:09 -0800
committerMerov Linden <merov@lindenlab.com>2013-02-23 11:22:09 -0800
commit7f51bd7897a3ced0edc74a32b9148febd7866721 (patch)
tree3e98aa8bc6f23d69afa01549c680c2989930192b /indra/llui/llfloater.cpp
parent86150b4019d1a84b4af73f0ea18c47baff955562 (diff)
CHUI-568 : Fixed! Implemented Ctrl-H for Nearby Chat, taking into account the existence of other conversations and docked/torn off state
Diffstat (limited to 'indra/llui/llfloater.cpp')
-rw-r--r--indra/llui/llfloater.cpp6
1 files changed, 0 insertions, 6 deletions
diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp
index bf424883b3..27dd7f5b32 100644
--- a/indra/llui/llfloater.cpp
+++ b/indra/llui/llfloater.cpp
@@ -818,12 +818,10 @@ void LLFloater::closeHostedFloater()
// When toggling *visibility*, close the host instead of the floater when hosted
if (getHost())
{
- llinfos << "Merov debug : closeHostedFloater : host " << llendl;
getHost()->closeFloater();
}
else
{
- llinfos << "Merov debug : closeHostedFloater : floater " << llendl;
closeFloater();
}
}
@@ -1628,13 +1626,11 @@ void LLFloater::setVisibleAndFrontmost(BOOL take_focus)
LLMultiFloater* hostp = getHost();
if (hostp)
{
- llinfos << "Merov debug : setVisibleAndFrontmost : hostp->setFrontmost " << llendl;
hostp->setVisible(TRUE);
hostp->setFrontmost(take_focus);
}
else
{
- llinfos << "Merov debug : setVisibleAndFrontmost : setFrontmost " << llendl;
setVisible(TRUE);
setFrontmost(take_focus);
}
@@ -1645,14 +1641,12 @@ void LLFloater::setFrontmost(BOOL take_focus)
LLMultiFloater* hostp = getHost();
if (hostp)
{
- llinfos << "Merov debug : setFrontmost : hostp->showFloater " << llendl;
// this will bring the host floater to the front and select
// the appropriate panel
hostp->showFloater(this);
}
else
{
- llinfos << "Merov debug : setFrontmost : bringToFront " << llendl;
// there are more than one floater view
// so we need to query our parent directly
((LLFloaterView*)getParent())->bringToFront(this, take_focus);