diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-05-08 10:18:03 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-05-08 10:18:03 -0700 |
| commit | 60f602d5e12a50623b51b13e097992f79006823f (patch) | |
| tree | 386e3cf5b25f3292e3ba7c8a9b0524c5bfbb9589 /indra/llui/llview.h | |
| parent | 29da931051202a10ea71db56e47acecae1603a5d (diff) | |
| parent | ccb86a2a6675b21dda6267d4a850e5a09acbafa4 (diff) | |
Pull from VirLinden/drano
Diffstat (limited to 'indra/llui/llview.h')
| -rw-r--r-- | indra/llui/llview.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llui/llview.h b/indra/llui/llview.h index f1fac5f69c..fd19309a56 100644 --- a/indra/llui/llview.h +++ b/indra/llui/llview.h @@ -370,8 +370,8 @@ public: virtual void reshape(S32 width, S32 height, BOOL called_from_parent = TRUE); virtual void translate( S32 x, S32 y ); void setOrigin( S32 x, S32 y ) { mRect.translate( x - mRect.mLeft, y - mRect.mBottom ); } - BOOL translateIntoRect( const LLRect& constraint, BOOL allow_partial_outside ); - BOOL translateIntoRectWithExclusion( const LLRect& inside, const LLRect& exclude, BOOL allow_partial_outside ); + BOOL translateIntoRect( const LLRect& constraint, S32 min_overlap_pixels = S32_MAX); + BOOL translateIntoRectWithExclusion( const LLRect& inside, const LLRect& exclude, S32 min_overlap_pixels = S32_MAX); void centerWithin(const LLRect& bounds); void setShape(const LLRect& new_rect, bool by_user = false); |