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

Conflicts:
	indra/newview/lldrawpoolavatar.cpp
	indra/newview/llviewertexturelist.cpp
	indra/newview/llworldmap.cpp
	indra/newview/pipeline.cpp

indra/llwindow/CMakeLists.txt

@@ -18,7 +18,6 @@ include(LLMath)
 include(LLRender)
 include(LLVFS)
 include(LLWindow)
-include(LLXML)
 include(UI)
 
 include_directories(
@@ -28,7 +27,6 @@ include_directories(
     ${LLRENDER_INCLUDE_DIRS}
     ${LLVFS_INCLUDE_DIRS}
     ${LLWINDOW_INCLUDE_DIRS}
-    ${LLXML_INCLUDE_DIRS}
     )
 
 set(llwindow_SOURCE_FILES

indra/llwindow/llwindowsdl.cpp

@@ -1515,7 +1515,8 @@ BOOL LLWindowSDL::SDLReallyCaptureInput(BOOL capture)
 
 	if (!mFullscreen) /* only bother if we're windowed anyway */
 	{
-#if LL_X11
+		// Capturing mouse makes UI debuggers unusable
+#if (LL_X11 && !_DEBUG && !LL_RELEASE_WITH_DEBUG_INFO)
 		if (mSDL_Display)
 		{
 			/* we dirtily mix raw X11 with SDL so that our pointer
@@ -1558,8 +1559,8 @@ BOOL LLWindowSDL::SDLReallyCaptureInput(BOOL capture)
 				newmode = SDL_GRAB_QUERY; // neutral
 			}
 		} else // not actually running on X11, for some reason
-			newmode = wantmode;
 #endif // LL_X11
+			newmode = wantmode;
 	} else {
 		// pretend we got what we wanted, when really we don't care.
 		newmode = wantmode;
@@ -1913,7 +1914,7 @@ void LLWindowSDL::gatherInput()
 				mIsMinimized = (!event.active.gain);
 
 				mCallbacks->handleActivate(this, !mIsMinimized);
-				llinfos << "SDL deiconification state switched to " << BOOL(event.active.gain) << llendl;
+				lldebugs << "SDL deiconification state switched to " << BOOL(event.active.gain) << llendl;
 			}
 			else
 			{