summaryrefslogtreecommitdiff
path: root/indra/newview/lltoast.cpp
diff options
context:
space:
mode:
authorAlexei Arabadji <aarabadji@productengine.com>2010-06-30 18:32:11 +0300
committerAlexei Arabadji <aarabadji@productengine.com>2010-06-30 18:32:11 +0300
commit0e937f5f48a9fb027a64c0147691bb0485e2b844 (patch)
treeeec25c2de0cee3901b8ec2269cf053486731eb90 /indra/newview/lltoast.cpp
parent9ddf271cfdf69ab6685c827669414c899852ed86 (diff)
EXT-8044 FIXED Prevented incorrect displaying of toasts in mouselook mode.
Added virtual method LLToast::reshape to prevent calling LLModalDialog::reshape method that changes toasts position. Toasts position should be controlled by toast screen channel. Ideally toasts should have different implementation for alerts and other kind of toasts, but it will leads to vast unwilling for 2.1 changes. reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/666/ --HG-- branch : product-engine
Diffstat (limited to 'indra/newview/lltoast.cpp')
-rw-r--r--indra/newview/lltoast.cpp8
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()
{