diff options
| author | Don Kjer <don@lindenlab.com> | 2007-05-02 21:24:47 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2007-05-02 21:24:47 +0000 |
| commit | 1c909afe3998778e4cc045c9ab733e8afbf7c25b (patch) | |
| tree | 75c00a32a8e305280cbec253195d1113d628fc3e /indra/llui/llfloater.cpp | |
| parent | bc59c04653bf1404e8148a8169208b146a123b28 (diff) | |
svn merge -r 60342:61148 svn+ssh://svn/svn/linden/branches/maintenance into release
Diffstat (limited to 'indra/llui/llfloater.cpp')
| -rw-r--r-- | indra/llui/llfloater.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp index c3364a7a35..40c11c69cc 100644 --- a/indra/llui/llfloater.cpp +++ b/indra/llui/llfloater.cpp @@ -676,7 +676,13 @@ void LLFloater::translate(S32 x, S32 y) BOOL LLFloater::canSnapTo(LLView* other_view) { - if (other_view && other_view != getParent()) + if (NULL == other_view) + { + llwarns << "other_view is NULL" << llendl; + return FALSE; + } + + if (other_view != getParent()) { LLFloater* other_floaterp = (LLFloater*)other_view; @@ -2535,6 +2541,7 @@ void LLMultiFloater::addFloater(LLFloater* floaterp, BOOL select_added_floater, if (!mTabContainer) { llerrs << "Tab Container used without having been initialized." << llendl; + return; } if (floaterp->getHost() == this) @@ -2698,7 +2705,7 @@ void LLMultiFloater::setVisible(BOOL visible) BOOL LLMultiFloater::handleKeyHere(KEY key, MASK mask, BOOL called_from_parent) { if (getEnabled() - && mask == (MASK_CONTROL|MASK_SHIFT)) + && mask == MASK_CONTROL) { if (key == 'W') { |