Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer

indra/aistatemachine/aistatemachine.cpp

@@ -615,7 +615,7 @@ void AIStateMachine::multiplex(event_type event)
 				// If the state is bs_multiplex we only need to run again when need_run was set again in the meantime or when this state machine isn't idle.
 				need_new_run = sub_state_r->need_run || !sub_state_r->idle;
 				// If this fails then the run state didn't change and neither idle() nor yield() was called.
-				llassert_always(!(need_new_run && !mYieldEngine && sub_state_r->run_state == run_state));
+				llassert_always(!(need_new_run && !sub_state_r->skip_idle && !mYieldEngine && sub_state_r->run_state == run_state));
 			  }
 			  break;
 			case bs_abort:

indra/llwindow/llwindowsdl.cpp

@@ -2068,7 +2068,7 @@ void LLWindowSDL::initCursors()
 	mSDLCursors[UI_CURSOR_SIZEWE] = makeSDLCursorFromBMP("sizewe.BMP",16,14);
 	mSDLCursors[UI_CURSOR_SIZENS] = makeSDLCursorFromBMP("sizens.BMP",17,16);
 	mSDLCursors[UI_CURSOR_NO] = makeSDLCursorFromBMP("llno.BMP",8,8);
-	mSDLCursors[UI_CURSOR_WORKING] = makeSDLCursorFromBMP("working.BMP",12,15);
+	mSDLCursors[UI_CURSOR_WORKING] = makeSDLCursorFromBMP("working.BMP",0,0);
 	mSDLCursors[UI_CURSOR_TOOLGRAB] = makeSDLCursorFromBMP("lltoolgrab.BMP",2,13);
 	mSDLCursors[UI_CURSOR_TOOLLAND] = makeSDLCursorFromBMP("lltoolland.BMP",1,6);
 	mSDLCursors[UI_CURSOR_TOOLFOCUS] = makeSDLCursorFromBMP("lltoolfocus.BMP",8,5);

indra/newview/llinventorypanel.cpp

@@ -871,8 +871,7 @@ BOOL LLInventoryPanel::handleHover(S32 x, S32 y, MASK mask)
 	BOOL handled = LLView::handleHover(x, y, mask);
 	if(handled)
 	{
-		ECursorType cursor = getWindow()->getCursor();
-		if (LLInventoryModelBackgroundFetch::instance().folderFetchActive() && cursor == UI_CURSOR_ARROW)
+		if (LLInventoryModelBackgroundFetch::instance().folderFetchActive())
 		{
 			// replace arrow cursor with arrow and hourglass cursor
 			getWindow()->setCursor(UI_CURSOR_WORKING);