diff options
| author | Alexei Arabadji <aarabadji@productengine.com> | 2009-12-17 11:46:02 +0200 |
|---|---|---|
| committer | Alexei Arabadji <aarabadji@productengine.com> | 2009-12-17 11:46:02 +0200 |
| commit | 11adf324c7c163b286e42da759767f9aa779aaaf (patch) | |
| tree | daf13a35e59b5e5ddec632b8c78d5a51d8a2737b /indra/llui | |
| parent | fdf9f9d779c019c68528b4de2bb5776806b0dec4 (diff) | |
implemented EXT-3395 “Docked IM/Chat windows shouldn't hide when voice control
panel is opened”,
reverted changes from 6658:6a7714959726;
made LLCallFloater non-unique dockable;
added LLCallFloater to control list of Transient Manager;
--HG--
branch : product-engine
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/lldockablefloater.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/indra/llui/lldockablefloater.cpp b/indra/llui/lldockablefloater.cpp index 9dc7861992..63faf44f9d 100644 --- a/indra/llui/lldockablefloater.cpp +++ b/indra/llui/lldockablefloater.cpp @@ -38,8 +38,6 @@ //static LLHandle<LLFloater> LLDockableFloater::sInstanceHandle; -static const std::string VOICE_FLOATER("floater_voice_controls"), IM_FLOATER("panel_im"); - //static void LLDockableFloater::init(LLDockableFloater* thiz) { @@ -116,11 +114,9 @@ void LLDockableFloater::resetInstance() { if (mUniqueDocking && sInstanceHandle.get() != this) { - if (sInstanceHandle.get() != NULL && sInstanceHandle.get()->isDocked() - && (getName() != VOICE_FLOATER || sInstanceHandle.get()->getName() != IM_FLOATER) - && (getName() != IM_FLOATER || sInstanceHandle.get()->getName() != VOICE_FLOATER)) + if (sInstanceHandle.get() != NULL && sInstanceHandle.get()->isDocked()) { - sInstanceHandle.get()->setVisible(FALSE); + sInstanceHandle.get()->setVisible(FALSE); } sInstanceHandle = getHandle(); } |