Applied patch by Latif Khalifa for VWR-5370 (Detached Contacts panel cannot be hidden/closed via menu or shortcut (Ctrl/Cmd-Shift-F))

2 files changed, 13 insertions, 1 deletions

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  <hakushakukun@gmail.com>
  
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<LLFloater>::hide(instance, key);
+                        }
                 }
         }