summaryrefslogtreecommitdiff
path: root/indra/llui/llfloater.cpp
diff options
context:
space:
mode:
authorVadim Savchuk <vsavchuk@productengine.com>2010-01-14 14:27:25 +0200
committerVadim Savchuk <vsavchuk@productengine.com>2010-01-14 14:27:25 +0200
commitb278de94c9afe3a5b838b57bd380fd28c04b29f1 (patch)
treeb5da76ed707dff7c93d2f7ad7cf4cf47ec177db8 /indra/llui/llfloater.cpp
parente727800829be2ecf236b726b1ec7693a3adad908 (diff)
parent0556c2c047e38d9b5e18cd31b219764c3dc89aa4 (diff)
Merge from default branch.
--HG-- branch : product-engine
Diffstat (limited to 'indra/llui/llfloater.cpp')
-rw-r--r--indra/llui/llfloater.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp
index 845203b420..a35d279500 100644
--- a/indra/llui/llfloater.cpp
+++ b/indra/llui/llfloater.cpp
@@ -878,9 +878,11 @@ void LLFloater::setSnappedTo(const LLView* snap_view)
else
{
//RN: assume it's a floater as it must be a sibling to our parent floater
- LLFloater* floaterp = (LLFloater*)snap_view;
-
- setSnapTarget(floaterp->getHandle());
+ const LLFloater* floaterp = dynamic_cast<const LLFloater*>(snap_view);
+ if (floaterp)
+ {
+ setSnapTarget(floaterp->getHandle());
+ }
}
}