diff options
| author | Aura Linden <aura@lindenlab.com> | 2014-03-27 11:59:35 -0700 |
|---|---|---|
| committer | Aura Linden <aura@lindenlab.com> | 2014-03-27 11:59:35 -0700 |
| commit | dfd78e83d91832b486a5bba6b1bb1cce621163ab (patch) | |
| tree | 5d27537583ea1f06c0e7b469f83ed65c93f70d15 /indra/llui/lldraghandle.cpp | |
| parent | 22ea5ac41ca3a1f7a884b56526791f611834f76b (diff) | |
| parent | 31a3a3da5db077c4d9b8fe06a18de98c822db6ab (diff) | |
Pulled merge from 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 |