From 854e4c475b7095afab90d0efa3df70a1b3ebe00a Mon Sep 17 00:00:00 2001 From: Kitty Barnett Date: Thu, 17 Nov 2011 17:08:22 +0100 Subject: [PATCH] - fixed : clicking the "Chat" toolbar button doesn't hide the conversations floater when the nearby chat floater is tabbed --HG-- branch : Chat-NearbyChat --- indra/llui/llfloaterreg.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/indra/llui/llfloaterreg.cpp b/indra/llui/llfloaterreg.cpp index 4ee3811f80..7f56d86fdc 100644 --- a/indra/llui/llfloaterreg.cpp +++ b/indra/llui/llfloaterreg.cpp @@ -508,7 +508,14 @@ void LLFloaterReg::toggleInstanceOrBringToFront(const LLSD& sdname, const LLSD& } else { - instance->closeFloater(); +// instance->closeFloater(); +// [SL:KB] - Patch: Chat-NearbyChatBar | Checked: 2011-11-17 (Catznip-3.2.0a) | Added: Catznip-3.2.0a + // When toggling *visibility*, close the host instead of the floater when hosted + if (instance->getHost()) + instance->getHost()->closeFloater(); + else + instance->closeFloater(); +// [/SL:KB] } }