Merge remote branch 'mccabe/1.2.0-next' into next

Conflicts:
	linden/indra/newview/llfloaterchat.cpp
	linden/indra/newview/llfloatermap.cpp
	linden/indra/newview/llinventorybridge.cpp
	linden/indra/newview/llnetmap.cpp
	linden/indra/newview/llviewermessage.cpp
	linden/indra/newview/llviewerobjectlist.cpp

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 @@
 #include "llxmlnode.h"
 #include "stdenums.h"
 #include "lluistring.h"
+#include "llcursortypes.h"
 
 const U32       FOLLOWS_NONE    = 0x00;
 const U32       FOLLOWS_LEFT    = 0x01;
@@ -653,7 +654,9 @@ private:
         mutable dummy_widget_map_t mDummyWidgets;
 
         boost::signals::connection mControlConnection;
-        
+
+        ECursorType mHoverCursor;
+
 public:
         static BOOL     sDebugRects;    // Draw debug rects behind everything.
         static BOOL sDebugKeys;