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, 1 insertions, 42 deletions

diff --git a/linden/indra/llwindow/llwindow.h b/linden/indra/llwindow/llwindow.h
index 821de2f..0acbcb9 100644
--- a/linden/indra/llwindow/llwindow.h
+++ b/linden/indra/llwindow/llwindow.h
@@ -35,48 +35,7 @@
 #include "llrect.h"
 #include "llcoord.h"
 #include "llstring.h"
-
-
-enum ECursorType {
-        UI_CURSOR_ARROW,
-        UI_CURSOR_WAIT,
-        UI_CURSOR_HAND,
-        UI_CURSOR_IBEAM,
-        UI_CURSOR_CROSS,
-        UI_CURSOR_SIZENWSE,
-        UI_CURSOR_SIZENESW,
-        UI_CURSOR_SIZEWE,
-        UI_CURSOR_SIZENS,
-        UI_CURSOR_NO,
-        UI_CURSOR_WORKING,
-        UI_CURSOR_TOOLGRAB,
-        UI_CURSOR_TOOLLAND,
-        UI_CURSOR_TOOLFOCUS,
-        UI_CURSOR_TOOLCREATE,
-        UI_CURSOR_ARROWDRAG,
-        UI_CURSOR_ARROWCOPY,    // drag with copy
-        UI_CURSOR_ARROWDRAGMULTI,
-        UI_CURSOR_ARROWCOPYMULTI,       // drag with copy
-        UI_CURSOR_NOLOCKED,
-        UI_CURSOR_ARROWLOCKED,
-        UI_CURSOR_GRABLOCKED,
-        UI_CURSOR_TOOLTRANSLATE,
-        UI_CURSOR_TOOLROTATE,
-        UI_CURSOR_TOOLSCALE,
-        UI_CURSOR_TOOLCAMERA,
-        UI_CURSOR_TOOLPAN,
-        UI_CURSOR_TOOLZOOMIN,
-        UI_CURSOR_TOOLPICKOBJECT3,
-        UI_CURSOR_TOOLSIT,
-        UI_CURSOR_TOOLBUY,
-        UI_CURSOR_TOOLPAY,
-        UI_CURSOR_TOOLOPEN,
-        UI_CURSOR_TOOLPLAY,
-        UI_CURSOR_TOOLPAUSE,
-        UI_CURSOR_TOOLMEDIAOPEN,
-        UI_CURSOR_PIPETTE,
-        UI_CURSOR_COUNT                 // Number of elements in this enum (NOT a cursor)
-};
+#include "llcursortypes.h"
 
 class LLSplashScreen;