diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-09-29 19:14:50 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-09-29 19:14:50 +0000 |
| commit | d725e5b24075b2171f8a5b263969991e9b475078 (patch) | |
| tree | f1422064fd0ab676dfa66d39b5d0f0b9e8ff1086 /indra/llui/llfloater.cpp | |
| parent | 66739da16407a8e56accc236bd3996c1963a6bcf (diff) | |
QAR-872 Viewer 1.21 RC 3
merge viewer_1-21 96116-97380 -> release
Diffstat (limited to 'indra/llui/llfloater.cpp')
| -rw-r--r-- | indra/llui/llfloater.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp index 7f8f54a44a..78a4362618 100644 --- a/indra/llui/llfloater.cpp +++ b/indra/llui/llfloater.cpp @@ -724,9 +724,8 @@ BOOL LLFloater::canSnapTo(const LLView* other_view) if (other_view != getParent()) { - LLFloater* other_floaterp = (LLFloater*)other_view; - - if (other_floaterp->getSnapTarget() == getHandle() && mDependents.find(other_floaterp->getHandle()) != mDependents.end()) + const LLFloater* other_floaterp = dynamic_cast<const LLFloater*>(other_view); + if (other_floaterp && other_floaterp->getSnapTarget() == getHandle() && mDependents.find(other_floaterp->getHandle()) != mDependents.end()) { // this is a dependent that is already snapped to us, so don't snap back to it return FALSE; |