svn merge -r 79730:79944 svn+ssh://svn.lindenlab.com/svn/linden/branches/parcel_media/sl-parcelmedia-6 --> release

QAR-275 Parcel Media

Sam made me do it.

4 files changed, 37 insertions, 10 deletions

diff --git a/indra/llwindow/llwindow.h b/indra/llwindow/llwindow.h
index 8ef7066a31..0554d3a8db 100644
--- a/indra/llwindow/llwindow.h
+++ b/indra/llwindow/llwindow.h
@@ -73,6 +73,9 @@ enum ECursorType {
 	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)
 };
diff --git a/indra/llwindow/llwindowmacosx.cpp b/indra/llwindow/llwindowmacosx.cpp
index 0a2f9cfb6c..fe127b407e 100644
--- a/indra/llwindow/llwindowmacosx.cpp
+++ b/indra/llwindow/llwindowmacosx.cpp
@@ -2738,6 +2738,9 @@ const char* cursorIDToName(int id)
 		case UI_CURSOR_TOOLBUY:			return "UI_CURSOR_TOOLBUY";
 		case UI_CURSOR_TOOLPAY:			return "UI_CURSOR_TOOLPAY";
 		case UI_CURSOR_TOOLOPEN:		return "UI_CURSOR_TOOLOPEN";
+		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";		
 	}
 
@@ -2834,6 +2837,9 @@ void LLWindowMacOSX::setCursor(ECursorType cursor)
 	case UI_CURSOR_TOOLBUY:
 	case UI_CURSOR_TOOLPAY:
 	case UI_CURSOR_TOOLOPEN:
+	case UI_CURSOR_TOOLPLAY:
+	case UI_CURSOR_TOOLPAUSE:
+	case UI_CURSOR_TOOLMEDIAOPEN:
 		result = setImageCursor(gCursors[cursor]);
 		break;
 
@@ -2876,6 +2882,9 @@ void LLWindowMacOSX::initCursors()
 	initPixmapCursor(UI_CURSOR_TOOLBUY, 1, 1);
 	initPixmapCursor(UI_CURSOR_TOOLPAY, 1, 1);
 	initPixmapCursor(UI_CURSOR_TOOLOPEN, 1, 1);
+	initPixmapCursor(UI_CURSOR_TOOLPLAY, 1, 1);
+	initPixmapCursor(UI_CURSOR_TOOLPAUSE, 1, 1);
+	initPixmapCursor(UI_CURSOR_TOOLMEDIAOPEN, 1, 1);
 
 	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 cbf4b7dc3a..e7475d577d 100644
--- a/indra/llwindow/llwindowsdl.cpp
+++ b/indra/llwindow/llwindowsdl.cpp
@@ -116,7 +116,9 @@ BOOL ll_try_gtk_init(void)
 	if (!tried_gtk_init)
 	{
 		tried_gtk_init = TRUE;
+#if LL_GSTREAMER_ENABLED
 		if (!g_thread_supported ()) g_thread_init (NULL);
+#endif // LL_GSTREAMER_ENABLED
 		maybe_lock_display();
 		gtk_is_good = gtk_init_check(NULL, NULL);
 		maybe_unlock_display();
@@ -1985,7 +1987,7 @@ void LLWindowSDL::gatherInput()
     static Uint32 lastRightDown = 0;
     SDL_Event event;
 
-#if LL_GTK && LL_LIBXUL_ENABLED
+#if LL_GTK && LL_LLMOZLIB_ENABLED
     // Pump GTK events so embedded Gecko doesn't starve.
     if (ll_try_gtk_init())
     {
@@ -2004,7 +2006,7 @@ void LLWindowSDL::gatherInput()
 
 	    setlocale(LC_ALL, saved_locale.c_str() );
     }
-#endif // LL_GTK && LL_LIBXUL_ENABLED
+#endif // LL_GTK && LL_LLMOZLIB_ENABLED
 
     // Handle all outstanding SDL events
     while (SDL_PollEvent(&event))
@@ -2358,6 +2360,9 @@ void LLWindowSDL::initCursors()
 	mSDLCursors[UI_CURSOR_TOOLBUY] = makeSDLCursorFromBMP("toolbuy.BMP",0,0);
 	mSDLCursors[UI_CURSOR_TOOLPAY] = makeSDLCursorFromBMP("toolpay.BMP",0,0);
 	mSDLCursors[UI_CURSOR_TOOLOPEN] = makeSDLCursorFromBMP("toolopen.BMP",0,0);
+	mSDLCursors[UI_CURSOR_TOOLPLAY] = makeSDLCursorFromBMP("toolplay.BMP",0,0);
+	mSDLCursors[UI_CURSOR_TOOLPAUSE] = makeSDLCursorFromBMP("toolpause.BMP",0,0);
+	mSDLCursors[UI_CURSOR_TOOLMEDIAOPEN] = makeSDLCursorFromBMP("toolmediaopen.BMP",0,0);
 	mSDLCursors[UI_CURSOR_PIPETTE] = makeSDLCursorFromBMP("lltoolpipette.BMP",2,28);
 }
 
@@ -2744,20 +2749,27 @@ void spawn_web_browser(const char* escaped_url)
 
 void *LLWindowSDL::getPlatformWindow()
 {
-#if LL_GTK && LL_LIBXUL_ENABLED
+#if LL_GTK && LL_LLMOZLIB_ENABLED
 	if (ll_try_gtk_init())
 	{
 		maybe_lock_display();
-		GtkWidget *win = gtk_window_new(GTK_WINDOW_TOPLEVEL);
 
-		// show the hidden-widget while debugging (needs mozlib change)
-		//gtk_widget_show_all(GTK_WIDGET(win));
-
-		gtk_widget_realize(GTK_WIDGET(win));
+		GtkWidget *owin = gtk_window_new(GTK_WINDOW_POPUP);
+		// Why a layout widget?  A MozContainer would be ideal, but
+		// it involves exposing Mozilla headers to mozlib-using apps.
+		// A layout widget with a GtkWindow parent has the desired
+		// properties of being plain GTK, having a window, and being
+		// derived from a GtkContainer.
+		GtkWidget *rtnw = gtk_layout_new(NULL, NULL);
+		gtk_container_add(GTK_CONTAINER(owin), rtnw);
+		gtk_widget_realize(rtnw);
+		GTK_WIDGET_UNSET_FLAGS(GTK_WIDGET(rtnw), GTK_NO_WINDOW);
+		
 		maybe_unlock_display();
-		return win;
+		
+		return rtnw;
 	}
-#endif // LL_GTK && LL_LIBXUL_ENABLED
+#endif // LL_GTK && LL_LLMOZLIB_ENABLED
 	// Unixoid mozilla really needs GTK.
 	return NULL;
 }
diff --git a/indra/llwindow/llwindowwin32.cpp b/indra/llwindow/llwindowwin32.cpp
index 736ff9df97..7e93d3ecf4 100644
--- a/indra/llwindow/llwindowwin32.cpp
+++ b/indra/llwindow/llwindowwin32.cpp
@@ -1907,6 +1907,9 @@ void LLWindowWin32::initCursors()
 	mCursor[UI_CURSOR_TOOLBUY] = loadColorCursor(TEXT("TOOLBUY"));
 	mCursor[UI_CURSOR_TOOLPAY] = loadColorCursor(TEXT("TOOLPAY"));
 	mCursor[UI_CURSOR_TOOLOPEN] = loadColorCursor(TEXT("TOOLOPEN"));
+	mCursor[UI_CURSOR_TOOLPLAY] = loadColorCursor(TEXT("TOOLPLAY"));
+	mCursor[UI_CURSOR_TOOLPAUSE] = loadColorCursor(TEXT("TOOLPAUSE"));
+	mCursor[UI_CURSOR_TOOLMEDIAOPEN] = loadColorCursor(TEXT("TOOLMEDIAOPEN"));
 
 	// Note: custom cursors that are not found make LoadCursor() return NULL.
 	for( S32 i = 0; i < UI_CURSOR_COUNT; i++ )