diff options
| author | simon <none@none> | 2014-02-27 13:36:05 -0800 |
|---|---|---|
| committer | simon <none@none> | 2014-02-27 13:36:05 -0800 |
| commit | 8b28593c107145af24f860b3f8d55568987ac6c0 (patch) | |
| tree | 35d6ba52d6cba46830e2527f2557da85915f9946 /indra/llui/lldraghandle.cpp | |
| parent | 16aec9dca7836505b58f5d4306ccf64b096c9fcd (diff) | |
| parent | 3f9f8bb8bf62c5d861edf32042d59bc2cea12fdc (diff) | |
Merge downstream code
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 |