diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-03-29 19:19:24 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-03-29 19:19:24 -0400 |
| commit | 9c0757511ec4ed12b47c6d3fd2ef20fca6828a6e (patch) | |
| tree | f1e08f8c3ade8afc4c83a1574c0d54ac6c224ed1 /indra/llui/llview.cpp | |
| parent | 32012f9fd4e9a5cb37f3a91d79873b79b9e6531e (diff) | |
| parent | 6faf2f8ee101162fdb1fe5959204055c9885968f (diff) | |
merge changes for storm-1077
Diffstat (limited to 'indra/llui/llview.cpp')
| -rw-r--r-- | indra/llui/llview.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llui/llview.cpp b/indra/llui/llview.cpp index 267640a226..d73e87129e 100644 --- a/indra/llui/llview.cpp +++ b/indra/llui/llview.cpp @@ -338,7 +338,7 @@ void LLView::removeChild(LLView* child) } else { - llerrs << "LLView::removeChild called with non-child" << llendl; + llwarns << child->getName() << "is not a child of " << getName() << llendl; } updateBoundingRect(); } @@ -1958,7 +1958,7 @@ void LLView::centerWithin(const LLRect& bounds) translate( left - getRect().mLeft, bottom - getRect().mBottom ); } -BOOL LLView::localPointToOtherView( S32 x, S32 y, S32 *other_x, S32 *other_y, LLView* other_view) const +BOOL LLView::localPointToOtherView( S32 x, S32 y, S32 *other_x, S32 *other_y, const LLView* other_view) const { const LLView* cur_view = this; const LLView* root_view = NULL; @@ -2001,7 +2001,7 @@ BOOL LLView::localPointToOtherView( S32 x, S32 y, S32 *other_x, S32 *other_y, LL return FALSE; } -BOOL LLView::localRectToOtherView( const LLRect& local, LLRect* other, LLView* other_view ) const +BOOL LLView::localRectToOtherView( const LLRect& local, LLRect* other, const LLView* other_view ) const { LLRect cur_rect = local; const LLView* cur_view = this; |