diff options
| author | Aura Linden <aura@lindenlab.com> | 2014-03-13 21:55:22 +0000 |
|---|---|---|
| committer | Aura Linden <aura@lindenlab.com> | 2014-03-13 21:55:22 +0000 |
| commit | 706ec08deb3feaea9c5c3516dea657b86b0474c3 (patch) | |
| tree | a918eac8a10e43b78d156cb0620520420f0dfc62 /indra/llui/lldraghandle.cpp | |
| parent | d2bb4dae980a887a30b206875d8f9419901ed66a (diff) | |
| parent | cb91708332b8b8ddfe27808602ec5f43f11c24c2 (diff) | |
Merged in viewer-release
Diffstat (limited to 'indra/llui/lldraghandle.cpp')
| -rwxr-xr-x | indra/llui/lldraghandle.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/llui/lldraghandle.cpp b/indra/llui/lldraghandle.cpp index 5f69c6af31..304d21d0df 100755 --- a/indra/llui/lldraghandle.cpp +++ b/indra/llui/lldraghandle.cpp @@ -315,14 +315,15 @@ BOOL LLDragHandle::handleHover(S32 x, S32 y, MASK mask) S32 delta_y = screen_y - mDragLastScreenY; // if dragging a docked floater we want to undock - if (((LLFloater*)getParent())->isDocked()) + LLFloater * parent = dynamic_cast<LLFloater *>(getParent()); + if (parent && parent->isDocked()) { const S32 SLOP = 12; if (delta_y <= -SLOP || delta_y >= SLOP) { - ((LLFloater*)getParent())->setDocked(false, false); + parent->setDocked(false, false); return TRUE; } else |