diff options
author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-07-02 16:26:43 +0300 |
---|---|---|
committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-07-02 16:26:43 +0300 |
commit | 9f4dc3adf413f76346cc2c64392671d3255d629b (patch) | |
tree | 0ca49f2c9abfe11f892d76de95e41fbb1eb390ea /indra/newview/lltoast.cpp | |
parent | d5bed7df3545f0765e6767c085f64a0a04136e7e (diff) | |
parent | 9cef95ca2bf8a7194c6ce80ba744d9c936695e86 (diff) |
Merge from default branch
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/lltoast.cpp')
-rw-r--r-- | indra/newview/lltoast.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/indra/newview/lltoast.cpp b/indra/newview/lltoast.cpp index 9abfab300c..2bb573c263 100644 --- a/indra/newview/lltoast.cpp +++ b/indra/newview/lltoast.cpp @@ -112,6 +112,14 @@ LLToast::LLToast(const LLToast::Params& p) mOnMouseEnterSignal.connect(p.on_mouse_enter()); } +void LLToast::reshape(S32 width, S32 height, BOOL called_from_parent) +{ + // We shouldn't use reshape from LLModalDialog since it changes toasts position. + // Toasts position should be controlled only by toast screen channel, see LLScreenChannelBase. + // see EXT-8044 + LLFloater::reshape(width, height, called_from_parent); +} + //-------------------------------------------------------------------------- BOOL LLToast::postBuild() { |