diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-03-18 19:56:37 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-03-18 19:56:37 -0400 |
| commit | 85ccab2d8178c508e585f987bb076951bf2e9ddb (patch) | |
| tree | 5fbdf54372657c2c9353d274cd81f62b1e4fdf02 /indra/llui/llview.h | |
| parent | 9f2a04f217d54344360edc554456d9804e17eeb7 (diff) | |
| parent | 6ef593580239df7b967cca59d4cfa9fcd8db6aec (diff) | |
Automated merge with file:///Users/oz/Work/viewer-vs2010
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; |