diff options
| author | Jacek Antonelli | 2008-10-17 19:06:47 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2008-10-17 19:07:46 -0500 |
| commit | 8f50d81693ff9463ae49c36935977a2b70e6bf45 (patch) | |
| tree | c9cfff9baa90394b8a3866c5696c84352f19bba6 /linden/indra/llui/llfloater.cpp | |
| parent | Fixed bad panel_overlay XML from a sloppy merge. (diff) | |
| parent | Second Life viewer sources 1.21.6 (diff) | |
| download | meta-impy-8f50d81693ff9463ae49c36935977a2b70e6bf45.zip meta-impy-8f50d81693ff9463ae49c36935977a2b70e6bf45.tar.gz meta-impy-8f50d81693ff9463ae49c36935977a2b70e6bf45.tar.bz2 meta-impy-8f50d81693ff9463ae49c36935977a2b70e6bf45.tar.xz | |
Updated source to SL version 1.21.6.
Diffstat (limited to 'linden/indra/llui/llfloater.cpp')
| -rw-r--r-- | linden/indra/llui/llfloater.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/linden/indra/llui/llfloater.cpp b/linden/indra/llui/llfloater.cpp index e795ad2..9f8cd65 100644 --- a/linden/indra/llui/llfloater.cpp +++ b/linden/indra/llui/llfloater.cpp | |||
| @@ -724,9 +724,8 @@ BOOL LLFloater::canSnapTo(const LLView* other_view) | |||
| 724 | 724 | ||
| 725 | if (other_view != getParent()) | 725 | if (other_view != getParent()) |
| 726 | { | 726 | { |
| 727 | LLFloater* other_floaterp = (LLFloater*)other_view; | 727 | const LLFloater* other_floaterp = dynamic_cast<const LLFloater*>(other_view); |
| 728 | 728 | if (other_floaterp && other_floaterp->getSnapTarget() == getHandle() && mDependents.find(other_floaterp->getHandle()) != mDependents.end()) | |
| 729 | if (other_floaterp->getSnapTarget() == getHandle() && mDependents.find(other_floaterp->getHandle()) != mDependents.end()) | ||
| 730 | { | 729 | { |
| 731 | // this is a dependent that is already snapped to us, so don't snap back to it | 730 | // this is a dependent that is already snapped to us, so don't snap back to it |
| 732 | return FALSE; | 731 | return FALSE; |