diff options
author | McCabe Maxsted | 2009-09-11 21:55:39 -0700 |
---|---|---|
committer | McCabe Maxsted | 2009-09-11 21:55:39 -0700 |
commit | 88b6b456b30480b8a8fae8b86dc0d2c56e6e200f (patch) | |
tree | 36be98393df4e82d8519d6419841df426d914e69 /linden | |
parent | Merged in 1.2.0-objectnames (diff) | |
download | meta-impy-88b6b456b30480b8a8fae8b86dc0d2c56e6e200f.zip meta-impy-88b6b456b30480b8a8fae8b86dc0d2c56e6e200f.tar.gz meta-impy-88b6b456b30480b8a8fae8b86dc0d2c56e6e200f.tar.bz2 meta-impy-88b6b456b30480b8a8fae8b86dc0d2c56e6e200f.tar.xz |
Applied patch by Latif Khalifa for VWR-5370 (Detached Contacts panel cannot be hidden/closed via menu or shortcut (Ctrl/Cmd-Shift-F))
Diffstat (limited to 'linden')
-rw-r--r-- | linden/indra/newview/llfloaterchatterbox.h | 9 |
1 files changed, 8 insertions, 1 deletions
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: | |||
149 | { | 149 | { |
150 | if (visible(instance, key)) | 150 | if (visible(instance, key)) |
151 | { | 151 | { |
152 | LLFloaterChatterBox::hideInstance(); | 152 | if(instance->getHost()) |
153 | { | ||
154 | LLFloaterChatterBox::hideInstance(); | ||
155 | } | ||
156 | else | ||
157 | { | ||
158 | VisibilityPolicy<LLFloater>::hide(instance, key); | ||
159 | } | ||
153 | } | 160 | } |
154 | } | 161 | } |
155 | 162 | ||