Fixed crash upon clicking media prim (disabled prim media control flo…

…ater for now). Fleshed out media browser replacement (LLFloaterWebContent).
siana · Jun 3, 2013 · 9c8cfcf · 9c8cfcf
1 parent c2cc65e
commit 9c8cfcf
Show file tree

Hide file tree

Showing 22 changed files with 200 additions and 759 deletions.
diff --git a/etc/message.xml b/etc/message.xml
@@ -718,7 +718,14 @@
 
 			<key>UploadBakedTexture</key>
 			<boolean>true</boolean>
-		</map>
+
+			<key>ObjectMedia</key>
+            		<boolean>false</boolean>
+
+            		<key>ObjectMediaNavigate</key>
+            		<boolean>false</boolean>
+
+      </map>
 
 		<key>messageBans</key>
 		<map>

diff --git a/indra/llplugin/llpluginclassmedia.cpp b/indra/llplugin/llpluginclassmedia.cpp
@@ -128,7 +128,7 @@ void LLPluginClassMedia::reset_impl(void)
 
 void LLPluginClassMedia::idle_impl(void)
 {
-	if((mMediaWidth == -1) || (!mTextureParamsReceived) || (mPlugin == NULL) || (mPlugin->isBlocked()))
+	if((mMediaWidth == -1) || (!mTextureParamsReceived) || (mPlugin == NULL) || (mPlugin->isBlocked()) || (mOwner == NULL))
 	{
 		// Can't process a size change at this time
 	}

diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
@@ -981,7 +981,6 @@ set(viewer_HEADER_FILES
     llviewerlayer.h
     llviewermedia.h
     llviewermediafocus.h
-    llviewermediaobserver.h
     llviewermenu.h
     llviewermenufile.h
     llviewermessage.h

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
@@ -2247,17 +2247,6 @@ This should be as low as possible, but too low may break functionality</string>
       <key>Value</key>
       <integer>1</integer>
     </map>
-    <key>AudioStreamingVideo</key>
-    <map>
-      <key>Comment</key>
-      <string>Enable streaming video</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>0</integer>
-    </map>
     <key>AuditTexture</key>
     <map>
       <key>Comment</key>