diff options
| author | Steve Bennetts <steve@lindenlab.com> | 2009-11-23 20:11:02 -0800 |
|---|---|---|
| committer | Steve Bennetts <steve@lindenlab.com> | 2009-11-23 20:11:02 -0800 |
| commit | 8de68b4a58df9882a39872a873d4d0b78b433682 (patch) | |
| tree | 0fc6e002f4be34b5fd58b997a86f7221f10121ab /indra/newview/llscreenchannel.cpp | |
| parent | db1631e4c0986a07cb9290ff4e910ba1d15f5fe9 (diff) | |
| parent | 9135bb7b0f7d194b8ffc0db3374a7e882fe39a94 (diff) | |
Merge from product-engine
Diffstat (limited to 'indra/newview/llscreenchannel.cpp')
| -rw-r--r-- | indra/newview/llscreenchannel.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llscreenchannel.cpp b/indra/newview/llscreenchannel.cpp index 24505f6bd6..fb9db42cf6 100644 --- a/indra/newview/llscreenchannel.cpp +++ b/indra/newview/llscreenchannel.cpp @@ -46,6 +46,7 @@ #include "lldockablefloater.h" #include "llsyswellwindow.h" #include "llimfloater.h" +#include "llscriptfloater.h" #include <algorithm> @@ -686,7 +687,8 @@ void LLScreenChannel::updateShowToastsState() } // for IM floaters showed in a docked state - prohibit showing of ani toast - if(dynamic_cast<LLIMFloater*>(floater)) + if(dynamic_cast<LLIMFloater*>(floater) + || dynamic_cast<LLScriptFloater*>(floater) ) { setShowToasts(!(floater->getVisible() && floater->isDocked())); if (!getShowToasts()) |