DRTVWR-209 Merge of viewer-development with SH-3316 drano-http code.

This was yet another refresh from v-d because of significant changes
to lltexturefetch that would not have been resolvable by casual
application of any merge tool.  There are still a few questions
outstanding but this is the initial, optimistic merge.

2 files changed, 60 insertions, 36 deletions

diff --git a/indra/llwindow/llwindowmacosx.cpp b/indra/llwindow/llwindowmacosx.cpp
index 32bb84cba5..97637c937f 100644
--- a/indra/llwindow/llwindowmacosx.cpp
+++ b/indra/llwindow/llwindowmacosx.cpp
@@ -2809,42 +2809,48 @@ const char* cursorIDToName(int id)
 {
 	switch (id)
 	{
-		case UI_CURSOR_ARROW:			return "UI_CURSOR_ARROW";
-		case UI_CURSOR_WAIT:			return "UI_CURSOR_WAIT";
-		case UI_CURSOR_HAND:			return "UI_CURSOR_HAND";
-		case UI_CURSOR_IBEAM:			return "UI_CURSOR_IBEAM";
-		case UI_CURSOR_CROSS:			return "UI_CURSOR_CROSS";
-		case UI_CURSOR_SIZENWSE:		return "UI_CURSOR_SIZENWSE";
-		case UI_CURSOR_SIZENESW:		return "UI_CURSOR_SIZENESW";
-		case UI_CURSOR_SIZEWE:			return "UI_CURSOR_SIZEWE";
-		case UI_CURSOR_SIZENS:			return "UI_CURSOR_SIZENS";
-		case UI_CURSOR_NO:				return "UI_CURSOR_NO";
-		case UI_CURSOR_WORKING:			return "UI_CURSOR_WORKING";
-		case UI_CURSOR_TOOLGRAB:		return "UI_CURSOR_TOOLGRAB";
-		case UI_CURSOR_TOOLLAND:		return "UI_CURSOR_TOOLLAND";
-		case UI_CURSOR_TOOLFOCUS:		return "UI_CURSOR_TOOLFOCUS";
-		case UI_CURSOR_TOOLCREATE:		return "UI_CURSOR_TOOLCREATE";
-		case UI_CURSOR_ARROWDRAG:		return "UI_CURSOR_ARROWDRAG";
-		case UI_CURSOR_ARROWCOPY:		return "UI_CURSOR_ARROWCOPY";
-		case UI_CURSOR_ARROWDRAGMULTI:	return "UI_CURSOR_ARROWDRAGMULTI";
-		case UI_CURSOR_ARROWCOPYMULTI:	return "UI_CURSOR_ARROWCOPYMULTI";
-		case UI_CURSOR_NOLOCKED:		return "UI_CURSOR_NOLOCKED";
-		case UI_CURSOR_ARROWLOCKED:		return "UI_CURSOR_ARROWLOCKED";
-		case UI_CURSOR_GRABLOCKED:		return "UI_CURSOR_GRABLOCKED";
-		case UI_CURSOR_TOOLTRANSLATE:	return "UI_CURSOR_TOOLTRANSLATE";
-		case UI_CURSOR_TOOLROTATE:		return "UI_CURSOR_TOOLROTATE";
-		case UI_CURSOR_TOOLSCALE:		return "UI_CURSOR_TOOLSCALE";
-		case UI_CURSOR_TOOLCAMERA:		return "UI_CURSOR_TOOLCAMERA";
-		case UI_CURSOR_TOOLPAN:			return "UI_CURSOR_TOOLPAN";
-		case UI_CURSOR_TOOLZOOMIN:		return "UI_CURSOR_TOOLZOOMIN";
-		case UI_CURSOR_TOOLPICKOBJECT3:	return "UI_CURSOR_TOOLPICKOBJECT3";
-		case UI_CURSOR_TOOLPLAY:		return "UI_CURSOR_TOOLPLAY";
-		case UI_CURSOR_TOOLPAUSE:		return "UI_CURSOR_TOOLPAUSE";
-		case UI_CURSOR_TOOLMEDIAOPEN:	return "UI_CURSOR_TOOLMEDIAOPEN";
-		case UI_CURSOR_PIPETTE:			return "UI_CURSOR_PIPETTE";
-		case UI_CURSOR_TOOLSIT:			return "UI_CURSOR_TOOLSIT";
-		case UI_CURSOR_TOOLBUY:			return "UI_CURSOR_TOOLBUY";
-		case UI_CURSOR_TOOLOPEN:		return "UI_CURSOR_TOOLOPEN";
+		case UI_CURSOR_ARROW:							return "UI_CURSOR_ARROW";
+		case UI_CURSOR_WAIT:							return "UI_CURSOR_WAIT";
+		case UI_CURSOR_HAND:							return "UI_CURSOR_HAND";
+		case UI_CURSOR_IBEAM:							return "UI_CURSOR_IBEAM";
+		case UI_CURSOR_CROSS:							return "UI_CURSOR_CROSS";
+		case UI_CURSOR_SIZENWSE:						return "UI_CURSOR_SIZENWSE";
+		case UI_CURSOR_SIZENESW:						return "UI_CURSOR_SIZENESW";
+		case UI_CURSOR_SIZEWE:							return "UI_CURSOR_SIZEWE";
+		case UI_CURSOR_SIZENS:							return "UI_CURSOR_SIZENS";
+		case UI_CURSOR_NO:								return "UI_CURSOR_NO";
+		case UI_CURSOR_WORKING:							return "UI_CURSOR_WORKING";
+		case UI_CURSOR_TOOLGRAB:						return "UI_CURSOR_TOOLGRAB";
+		case UI_CURSOR_TOOLLAND:						return "UI_CURSOR_TOOLLAND";
+		case UI_CURSOR_TOOLFOCUS:						return "UI_CURSOR_TOOLFOCUS";
+		case UI_CURSOR_TOOLCREATE:						return "UI_CURSOR_TOOLCREATE";
+		case UI_CURSOR_ARROWDRAG:						return "UI_CURSOR_ARROWDRAG";
+		case UI_CURSOR_ARROWCOPY:						return "UI_CURSOR_ARROWCOPY";
+		case UI_CURSOR_ARROWDRAGMULTI:					return "UI_CURSOR_ARROWDRAGMULTI";
+		case UI_CURSOR_ARROWCOPYMULTI:					return "UI_CURSOR_ARROWCOPYMULTI";
+		case UI_CURSOR_NOLOCKED:						return "UI_CURSOR_NOLOCKED";
+		case UI_CURSOR_ARROWLOCKED:						return "UI_CURSOR_ARROWLOCKED";
+		case UI_CURSOR_GRABLOCKED:						return "UI_CURSOR_GRABLOCKED";
+		case UI_CURSOR_TOOLTRANSLATE:					return "UI_CURSOR_TOOLTRANSLATE";
+		case UI_CURSOR_TOOLROTATE:						return "UI_CURSOR_TOOLROTATE";
+		case UI_CURSOR_TOOLSCALE:						return "UI_CURSOR_TOOLSCALE";
+		case UI_CURSOR_TOOLCAMERA:						return "UI_CURSOR_TOOLCAMERA";
+		case UI_CURSOR_TOOLPAN:							return "UI_CURSOR_TOOLPAN";
+		case UI_CURSOR_TOOLZOOMIN:						return "UI_CURSOR_TOOLZOOMIN";
+		case UI_CURSOR_TOOLPICKOBJECT3:					return "UI_CURSOR_TOOLPICKOBJECT3";
+		case UI_CURSOR_TOOLPLAY:						return "UI_CURSOR_TOOLPLAY";
+		case UI_CURSOR_TOOLPAUSE:						return "UI_CURSOR_TOOLPAUSE";
+		case UI_CURSOR_TOOLMEDIAOPEN:					return "UI_CURSOR_TOOLMEDIAOPEN";
+		case UI_CURSOR_PIPETTE:							return "UI_CURSOR_PIPETTE";
+		case UI_CURSOR_TOOLSIT:							return "UI_CURSOR_TOOLSIT";
+		case UI_CURSOR_TOOLBUY:							return "UI_CURSOR_TOOLBUY";
+		case UI_CURSOR_TOOLOPEN:						return "UI_CURSOR_TOOLOPEN";
+		case UI_CURSOR_TOOLPATHFINDING:					return "UI_CURSOR_PATHFINDING";
+		case UI_CURSOR_TOOLPATHFINDING_PATH_START:		return "UI_CURSOR_PATHFINDING_START";
+		case UI_CURSOR_TOOLPATHFINDING_PATH_START_ADD:	return "UI_CURSOR_PATHFINDING_START_ADD";
+		case UI_CURSOR_TOOLPATHFINDING_PATH_END:		return "UI_CURSOR_PATHFINDING_END";
+		case UI_CURSOR_TOOLPATHFINDING_PATH_END_ADD:	return "UI_CURSOR_PATHFINDING_END_ADD";
+		case UI_CURSOR_TOOLNO:							return "UI_CURSOR_NO";
 	}
 
 	llerrs << "cursorIDToName: unknown cursor id" << id << llendl;
@@ -2950,6 +2956,12 @@ void LLWindowMacOSX::updateCursor()
 	case UI_CURSOR_TOOLSIT:
 	case UI_CURSOR_TOOLBUY:
 	case UI_CURSOR_TOOLOPEN:
+	case UI_CURSOR_TOOLPATHFINDING:
+	case UI_CURSOR_TOOLPATHFINDING_PATH_START:
+	case UI_CURSOR_TOOLPATHFINDING_PATH_START_ADD:
+	case UI_CURSOR_TOOLPATHFINDING_PATH_END:
+	case UI_CURSOR_TOOLPATHFINDING_PATH_END_ADD:
+	case UI_CURSOR_TOOLNO:
 		result = setImageCursor(gCursors[mNextCursor]);
 		break;
 
@@ -2994,6 +3006,12 @@ void LLWindowMacOSX::initCursors()
 	initPixmapCursor(UI_CURSOR_TOOLSIT, 20, 15);
 	initPixmapCursor(UI_CURSOR_TOOLBUY, 20, 15);
 	initPixmapCursor(UI_CURSOR_TOOLOPEN, 20, 15);
+	initPixmapCursor(UI_CURSOR_TOOLPATHFINDING, 16, 16);
+	initPixmapCursor(UI_CURSOR_TOOLPATHFINDING_PATH_START, 16, 16);
+	initPixmapCursor(UI_CURSOR_TOOLPATHFINDING_PATH_START_ADD, 16, 16);
+	initPixmapCursor(UI_CURSOR_TOOLPATHFINDING_PATH_END, 16, 16);
+	initPixmapCursor(UI_CURSOR_TOOLPATHFINDING_PATH_END_ADD, 16, 16);
+	initPixmapCursor(UI_CURSOR_TOOLNO, 8, 8);
 
 	initPixmapCursor(UI_CURSOR_SIZENWSE, 10, 10);
 	initPixmapCursor(UI_CURSOR_SIZENESW, 10, 10);
diff --git a/indra/llwindow/llwindowsdl.cpp b/indra/llwindow/llwindowsdl.cpp
index 3d33af9d9b..3bf4a48cb6 100644
--- a/indra/llwindow/llwindowsdl.cpp
+++ b/indra/llwindow/llwindowsdl.cpp
@@ -2117,6 +2117,12 @@ void LLWindowSDL::initCursors()
 	mSDLCursors[UI_CURSOR_TOOLSIT] = makeSDLCursorFromBMP("toolsit.BMP",20,15);
 	mSDLCursors[UI_CURSOR_TOOLBUY] = makeSDLCursorFromBMP("toolbuy.BMP",20,15);
 	mSDLCursors[UI_CURSOR_TOOLOPEN] = makeSDLCursorFromBMP("toolopen.BMP",20,15);
+	mSDLCursors[UI_CURSOR_TOOLPATHFINDING] = makeSDLCursorFromBMP("lltoolpathfinding.BMP", 16, 16);
+	mSDLCursors[UI_CURSOR_TOOLPATHFINDING_PATH_START] = makeSDLCursorFromBMP("lltoolpathfindingpathstart.BMP", 16, 16);
+	mSDLCursors[UI_CURSOR_TOOLPATHFINDING_PATH_START_ADD] = makeSDLCursorFromBMP("lltoolpathfindingpathstartadd.BMP", 16, 16);
+	mSDLCursors[UI_CURSOR_TOOLPATHFINDING_PATH_END] = makeSDLCursorFromBMP("lltoolpathfindingpathend.BMP", 16, 16);
+	mSDLCursors[UI_CURSOR_TOOLPATHFINDING_PATH_END_ADD] = makeSDLCursorFromBMP("lltoolpathfindingpathendadd.BMP", 16, 16);
+	mSDLCursors[UI_CURSOR_TOOLNO] = makeSDLCursorFromBMP("llno.BMP",8,8);
 
 	if (getenv("LL_ATI_MOUSE_CURSOR_BUG") != NULL) {
 		llinfos << "Disabling cursor updating due to LL_ATI_MOUSE_CURSOR_BUG" << llendl;