diff options
author | Tofu Buzzard <no-email> | 2011-03-16 22:44:29 +0000 |
---|---|---|
committer | Tofu Buzzard <no-email> | 2011-03-16 22:44:29 +0000 |
commit | 0671b6abc5acee0e7df879f9a10506aa42c2169c (patch) | |
tree | baf736cc9a5f9de8fb1fa9f9bf95be0dacc7b72f /indra/llui/llview.h | |
parent | 1dffa1c78cd623fe8c930e128312260647bf91e7 (diff) | |
parent | 752b3fdbe044069635a2c6cd000c481561985954 (diff) |
merge
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 7e84eafce4..9ab0797f9e 100644 --- a/indra/llui/llview.h +++ b/indra/llui/llview.h @@ -406,8 +406,8 @@ public: BOOL blockMouseEvent(S32 x, S32 y) const; // See LLMouseHandler virtuals for screenPointToLocal and localPointToScreen - BOOL localPointToOtherView( S32 x, S32 y, S32 *other_x, S32 *other_y, LLView* other_view) const; - BOOL localRectToOtherView( const LLRect& local, LLRect* other, LLView* other_view ) const; + BOOL localPointToOtherView( S32 x, S32 y, S32 *other_x, S32 *other_y, const LLView* other_view) const; + BOOL localRectToOtherView( const LLRect& local, LLRect* other, const LLView* other_view ) const; void screenRectToLocal( const LLRect& screen, LLRect* local ) const; void localRectToScreen( const LLRect& local, LLRect* screen ) const; |