Merged working branch of 1.2 into LL 1.23 merge

1 files changed, 8 insertions, 1 deletions

diff --git a/linden/indra/newview/llfloaterchatterbox.h b/linden/indra/newview/llfloaterchatterbox.h
index ff2f243..552ef81 100644
--- a/linden/indra/newview/llfloaterchatterbox.h
+++ b/linden/indra/newview/llfloaterchatterbox.h
@@ -150,7 +150,14 @@ public:
         {
                 if (visible(instance, key))
                 {
-                        LLFloaterChatterBox::hideInstance();
+                        if(instance->getHost())
+                        {
+                                LLFloaterChatterBox::hideInstance();
+                        }
+                        else
+                        {
+                                VisibilityPolicy<LLFloater>::hide(instance, key);
+                        }
                 }
         }