diff options
author | Don Kjer <don@lindenlab.com> | 2011-03-23 01:26:03 +0000 |
---|---|---|
committer | Don Kjer <don@lindenlab.com> | 2011-03-23 01:26:03 +0000 |
commit | 1e0608ff51efc69a14010f2ce5dba3acabe16e49 (patch) | |
tree | 326e829b4233658ba8698e06ff17267618e93a62 /indra/llui/llview.h | |
parent | becc9d09970755f9cc0d95c46b9f2d81d5b856b5 (diff) | |
parent | e4a4d75104916968ce03337094b1194e0daff438 (diff) |
Merge with viewer-development
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 d2bbd663b8..61dc4b8030 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; |