diff options
| author | Jacek Antonelli | 2008-08-15 23:45:37 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2008-08-15 23:45:37 -0500 |
| commit | 31ba05810c641f14e8ab5da8ad2aaf527779f6c1 (patch) | |
| tree | c4b8d635dfb657fa4cfee7c285f8cadbf24afa90 /linden/indra/llui/llview.h | |
| parent | Second Life viewer sources 1.19.1.1 (diff) | |
| download | meta-impy-31ba05810c641f14e8ab5da8ad2aaf527779f6c1.zip meta-impy-31ba05810c641f14e8ab5da8ad2aaf527779f6c1.tar.gz meta-impy-31ba05810c641f14e8ab5da8ad2aaf527779f6c1.tar.bz2 meta-impy-31ba05810c641f14e8ab5da8ad2aaf527779f6c1.tar.xz | |
Second Life viewer sources 1.19.1.2
Diffstat (limited to 'linden/indra/llui/llview.h')
| -rw-r--r-- | linden/indra/llui/llview.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/linden/indra/llui/llview.h b/linden/indra/llui/llview.h index 52c7e3d..51c314a 100644 --- a/linden/indra/llui/llview.h +++ b/linden/indra/llui/llview.h | |||
| @@ -108,9 +108,9 @@ virtual void userSetShape(const LLRect& new_rect); | |||
| 108 | virtual LLView* findSnapRect(LLRect& new_rect, const LLCoordGL& mouse_dir, LLView::ESnapType snap_type, S32 threshold, S32 padding = 0); | 108 | virtual LLView* findSnapRect(LLRect& new_rect, const LLCoordGL& mouse_dir, LLView::ESnapType snap_type, S32 threshold, S32 padding = 0); |
| 109 | virtual LLView* findSnapEdge(S32& new_edge_val, const LLCoordGL& mouse_dir, ESnapEdge snap_edge, ESnapType snap_type, S32 threshold, S32 padding = 0); | 109 | virtual LLView* findSnapEdge(S32& new_edge_val, const LLCoordGL& mouse_dir, ESnapEdge snap_edge, ESnapType snap_type, S32 threshold, S32 padding = 0); |
| 110 | LLScrollListCtrl | 110 | LLScrollListCtrl |
| 111 | virtual BOOL canSnapTo(const LLView* other_view) const { return other_view != this && other_view->getVisible(); } | 111 | virtual BOOL canSnapTo(const LLView* other_view) { return other_view != this && other_view->getVisible(); } |
| 112 | LLFloater | 112 | LLFloater |
| 113 | virtual void snappedTo(LLView* snap_view) {} | 113 | virtual void snappedTo(const LLView* snap_view) {} |
| 114 | LLFloater | 114 | LLFloater |
| 115 | virtual BOOL handleKey(KEY key, MASK mask, BOOL called_from_parent); | 115 | virtual BOOL handleKey(KEY key, MASK mask, BOOL called_from_parent); |
| 116 | * | 116 | * |
| @@ -339,9 +339,9 @@ public: | |||
| 339 | virtual LLView* findSnapRect(LLRect& new_rect, const LLCoordGL& mouse_dir, LLView::ESnapType snap_type, S32 threshold, S32 padding = 0); | 339 | virtual LLView* findSnapRect(LLRect& new_rect, const LLCoordGL& mouse_dir, LLView::ESnapType snap_type, S32 threshold, S32 padding = 0); |
| 340 | virtual LLView* findSnapEdge(S32& new_edge_val, const LLCoordGL& mouse_dir, ESnapEdge snap_edge, ESnapType snap_type, S32 threshold, S32 padding = 0); | 340 | virtual LLView* findSnapEdge(S32& new_edge_val, const LLCoordGL& mouse_dir, ESnapEdge snap_edge, ESnapType snap_type, S32 threshold, S32 padding = 0); |
| 341 | 341 | ||
| 342 | virtual BOOL canSnapTo(const LLView* other_view) const; | 342 | virtual BOOL canSnapTo(const LLView* other_view); |
| 343 | 343 | ||
| 344 | virtual void snappedTo(LLView* snap_view); | 344 | virtual void snappedTo(const LLView* snap_view); |
| 345 | 345 | ||
| 346 | virtual BOOL handleKey(KEY key, MASK mask, BOOL called_from_parent); | 346 | virtual BOOL handleKey(KEY key, MASK mask, BOOL called_from_parent); |
| 347 | virtual BOOL handleUnicodeChar(llwchar uni_char, BOOL called_from_parent); | 347 | virtual BOOL handleUnicodeChar(llwchar uni_char, BOOL called_from_parent); |