From 92403b4ea1c02d378a1157e8912f1e3976ba3772 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Wed, 2 Mar 2011 21:05:03 -0800
Subject: SOCIAL-593 FIX Profile Window cannot be resized in minimal skin
floater view snapping rectangle is now driven by floater_snap_region view
---
indra/llui/llview.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'indra/llui/llview.cpp')
diff --git a/indra/llui/llview.cpp b/indra/llui/llview.cpp
index 267640a226..acf7953906 100644
--- a/indra/llui/llview.cpp
+++ b/indra/llui/llview.cpp
@@ -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;
--
cgit v1.2.3
From 7cecf9ed8dcd1d6b657e7565c47ff6b64f1f77d8 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Wed, 9 Mar 2011 15:26:56 -0800
Subject: SOCIAL-659 WIP Viewer crash when selecting report option from
mini-inspector in minimal and standard skin turned error into warning when
removing non-existent child
---
indra/llui/llview.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'indra/llui/llview.cpp')
diff --git a/indra/llui/llview.cpp b/indra/llui/llview.cpp
index acf7953906..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();
}
--
cgit v1.2.3