diff options
author | McCabe Maxsted | 2009-09-11 00:33:33 -0700 |
---|---|---|
committer | McCabe Maxsted | 2009-09-11 00:33:33 -0700 |
commit | efa0d701845542e9ef555260fe6d2ad0beeb0760 (patch) | |
tree | 4527fe04a062d3353e4d1a77c547d1c2b1d475e9 /linden/indra/llui/llview.h | |
parent | Fixed missing 'm' for draw distance slider (diff) | |
download | meta-impy-efa0d701845542e9ef555260fe6d2ad0beeb0760.zip meta-impy-efa0d701845542e9ef555260fe6d2ad0beeb0760.tar.gz meta-impy-efa0d701845542e9ef555260fe6d2ad0beeb0760.tar.bz2 meta-impy-efa0d701845542e9ef555260fe6d2ad0beeb0760.tar.xz |
Backported clickable object names from 1.23
Diffstat (limited to 'linden/indra/llui/llview.h')
-rw-r--r-- | linden/indra/llui/llview.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/linden/indra/llui/llview.h b/linden/indra/llui/llview.h index da7f164..df34a3e 100644 --- a/linden/indra/llui/llview.h +++ b/linden/indra/llui/llview.h | |||
@@ -51,6 +51,7 @@ | |||
51 | #include "llxmlnode.h" | 51 | #include "llxmlnode.h" |
52 | #include "stdenums.h" | 52 | #include "stdenums.h" |
53 | #include "lluistring.h" | 53 | #include "lluistring.h" |
54 | #include "llcursortypes.h" | ||
54 | 55 | ||
55 | const U32 FOLLOWS_NONE = 0x00; | 56 | const U32 FOLLOWS_NONE = 0x00; |
56 | const U32 FOLLOWS_LEFT = 0x01; | 57 | const U32 FOLLOWS_LEFT = 0x01; |
@@ -653,7 +654,9 @@ private: | |||
653 | mutable dummy_widget_map_t mDummyWidgets; | 654 | mutable dummy_widget_map_t mDummyWidgets; |
654 | 655 | ||
655 | boost::signals::connection mControlConnection; | 656 | boost::signals::connection mControlConnection; |
656 | 657 | ||
658 | ECursorType mHoverCursor; | ||
659 | |||
657 | public: | 660 | public: |
658 | static BOOL sDebugRects; // Draw debug rects behind everything. | 661 | static BOOL sDebugRects; // Draw debug rects behind everything. |
659 | static BOOL sDebugKeys; | 662 | static BOOL sDebugKeys; |