summaryrefslogtreecommitdiff
path: root/indra/newview/lltoast.cpp
diff options
context:
space:
mode:
authorYuri Chebotarev <ychebotarev@productengine.com>2010-06-30 19:30:31 +0300
committerYuri Chebotarev <ychebotarev@productengine.com>2010-06-30 19:30:31 +0300
commitde8e429aa76daba335ff2c2168bdaac654d153fa (patch)
treeb737c6df34e40c4187dad4d892d1ed991d1a55ae /indra/newview/lltoast.cpp
parentaabffa4d082d688c1e13105266a9093f7905db3f (diff)
parent8e7fd534aa27a3cd4b63b60fbc7a7dbb41f109cb (diff)
merge
--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()
{