summaryrefslogtreecommitdiff
path: root/indra/newview/lltoast.cpp
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-07-01 12:33:36 +0100
committerTofu Linden <tofu.linden@lindenlab.com>2010-07-01 12:33:36 +0100
commitaf4a85009011119e7787e2b30416919117edccf9 (patch)
tree54ca699fd2abe768c16f79effecead2b1c68cd7c /indra/newview/lltoast.cpp
parent43d51d4548916d37ec89f38d5209e20864c4885c (diff)
parent1a3b463af3b3b0668505f406162a7e2d3b557ee7 (diff)
merge from PE's viewer-release
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()
{