From 3c89527b222c2ddc50553ce1c49f22e9f05db11b Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 5 Mar 2011 00:06:51 +0000
Subject: Fix bug where llSetPrimMediaParams() reported success but never set
 the media texture.

We weren't setting the TextureEntryFace.MediaFlags = true when a media texture was set directly via a script.  This was being done when the viewer was setting them directly.
---
 .../Region/CoreModules/World/Media/Moap/MoapModule.cs   | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/OpenSim/Region/CoreModules/World/Media/Moap/MoapModule.cs b/OpenSim/Region/CoreModules/World/Media/Moap/MoapModule.cs
index 7c5d044..9132753 100644
--- a/OpenSim/Region/CoreModules/World/Media/Moap/MoapModule.cs
+++ b/OpenSim/Region/CoreModules/World/Media/Moap/MoapModule.cs
@@ -227,15 +227,24 @@ namespace OpenSim.Region.CoreModules.Media.Moap
         
         public void SetMediaEntry(SceneObjectPart part, int face, MediaEntry me)
         {
+//            m_log.DebugFormat("[MOAP]: SetMediaEntry for {0}, face {1}", part.Name, face);
+            
             CheckFaceParam(part, face);
             
             if (null == part.Shape.Media)
                 part.Shape.Media = new PrimitiveBaseShape.MediaList(new MediaEntry[part.GetNumberOfSides()]);
-                
+
             lock (part.Shape.Media)
-                part.Shape.Media[face] = me;
+                part.Shape.Media[face] = me;                      
             
             UpdateMediaUrl(part, UUID.Zero);
+            
+            // Temporary code to fix llSetPrimMediaParams() bug, pending refactoring
+            Primitive.TextureEntry te = part.Shape.Textures;
+            Primitive.TextureEntryFace teFace = te.CreateFace((uint)face);
+            teFace.MediaFlags = true;
+            part.Shape.Textures = te;
+            
             part.ScheduleFullUpdate();
             part.TriggerScriptChangedEvent(Changed.MEDIA);
         }
@@ -333,7 +342,7 @@ namespace OpenSim.Region.CoreModules.Media.Moap
             }
             
 //            m_log.DebugFormat("[MOAP]: Received {0} media entries for prim {1}", omu.FaceMedia.Length, primId);
-                       
+//                       
 //            for (int i = 0; i < omu.FaceMedia.Length; i++)
 //            {
 //                MediaEntry me = omu.FaceMedia[i];
@@ -380,6 +389,8 @@ namespace OpenSim.Region.CoreModules.Media.Moap
             }
             else
             {
+//                m_log.DebugFormat("[MOAP]: Setting existing media list for {0}", part.Name);
+                
                 // We need to go through the media textures one at a time to make sure that we have permission 
                 // to change them
                 
-- 
cgit v1.1