From 88b6b456b30480b8a8fae8b86dc0d2c56e6e200f Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Fri, 11 Sep 2009 21:55:39 -0700 Subject: Applied patch by Latif Khalifa for VWR-5370 (Detached Contacts panel cannot be hidden/closed via menu or shortcut (Ctrl/Cmd-Shift-F)) --- ChangeLog.txt | 5 +++++ linden/indra/newview/llfloaterchatterbox.h | 9 ++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index 14ed9be..bdda6bd 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -48,6 +48,11 @@ modified: indra/newview/skins/default/xui/en-us/panel_avatar.xml + + * Applied patch by Latif Khalifa for VWR-5370 (Detached "Contacts" panel cannot be hidden/closed via menu or shortcut (Ctrl/Cmd-Shift-F)) + + modified: linden/indra/newview/llfloaterchatterbox.h + 2009-09-10 McCabe Maxsted diff --git a/linden/indra/newview/llfloaterchatterbox.h b/linden/indra/newview/llfloaterchatterbox.h index 39e1025..04833ab 100644 --- a/linden/indra/newview/llfloaterchatterbox.h +++ b/linden/indra/newview/llfloaterchatterbox.h @@ -149,7 +149,14 @@ public: { if (visible(instance, key)) { - LLFloaterChatterBox::hideInstance(); + if(instance->getHost()) + { + LLFloaterChatterBox::hideInstance(); + } + else + { + VisibilityPolicy::hide(instance, key); + } } } -- cgit v1.1