summaryrefslogtreecommitdiff
path: root/indra/newview/lltoast.cpp
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2010-07-01 16:55:19 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2010-07-01 16:55:19 -0400
commitddf87b874a0841a65ec95d2d8ed4764412cd394c (patch)
tree956fedc2cc55b74c3959b9f9c1a8de9c12206178 /indra/newview/lltoast.cpp
parent5cda3ccad729f21dee0ea5517be4dcd8304943fe (diff)
parenteed8e6adc93ed85ce9fe15f946fb4035672f6190 (diff)
merge
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()
{