2 files changed, 55 insertions, 36 deletions

diff --git a/OpenSim/Framework/PrimitiveBaseShape.cs b/OpenSim/Framework/PrimitiveBaseShape.cs
index 9b52fe6..70a61cc 100644
--- a/OpenSim/Framework/PrimitiveBaseShape.cs
+++ b/OpenSim/Framework/PrimitiveBaseShape.cs
@@ -180,6 +180,7 @@ namespace OpenSim.Framework
         /// Entries to store media textures on each face
         /// </summary>
         /// Do not change this value directly - always do it through an IMoapModule.
+        /// Lock before manipulating.
         public MediaList Media { get; set; }
 
         public PrimitiveBaseShape()
@@ -1219,6 +1220,11 @@ namespace OpenSim.Framework
             return prim;
         }
         
+        /// <summary>
+        /// Encapsulates a list of media entries.
+        /// </summary>
+        /// This class is necessary because we want to replace auto-serialization of MediaEntry with something more 
+        /// OSD like and less vulnerable to change.
         public class MediaList : List<MediaEntry>, IXmlSerializable
         {        
             public const string MEDIA_TEXTURE_TYPE = "sl";
@@ -1240,10 +1246,9 @@ namespace OpenSim.Framework
                     {
                         using (XmlTextWriter xtw = new XmlTextWriter(sw))
                         {                
-                            xtw.WriteStartElement("osmedia");
+                            xtw.WriteStartElement("OSMedia");
                             xtw.WriteAttributeString("type", MEDIA_TEXTURE_TYPE);
-                            xtw.WriteAttributeString("major_version", "0");
-                            xtw.WriteAttributeString("minor_version", "1");
+                            xtw.WriteAttributeString("version", "0.1");
                             
                             OSDArray meArray = new OSDArray();
                             foreach (MediaEntry me in this)
@@ -1252,7 +1257,7 @@ namespace OpenSim.Framework
                                 meArray.Add(osd);
                             }              
                             
-                            xtw.WriteStartElement("osdata");
+                            xtw.WriteStartElement("OSData");
                             xtw.WriteRaw(OSDParser.SerializeLLSDXmlString(meArray));
                             xtw.WriteEndElement();
                             
@@ -1291,7 +1296,7 @@ namespace OpenSim.Framework
                         if (type != MEDIA_TEXTURE_TYPE)
                             return;                        
                         
-                        xtr.ReadStartElement("osmedia");    
+                        xtr.ReadStartElement("OSMedia");    
                         
                         OSDArray osdMeArray = (OSDArray)OSDParser.DeserializeLLSDXml(xtr.ReadInnerXml());
                         foreach (OSD osdMe in osdMeArray)
diff --git a/OpenSim/Region/CoreModules/World/Media/Moap/MoapModule.cs b/OpenSim/Region/CoreModules/World/Media/Moap/MoapModule.cs
index d7ce184..8549b36 100644
--- a/OpenSim/Region/CoreModules/World/Media/Moap/MoapModule.cs
+++ b/OpenSim/Region/CoreModules/World/Media/Moap/MoapModule.cs
@@ -185,13 +185,15 @@ namespace OpenSim.Region.CoreModules.Media.Moap
             if (original.Shape.Media != null)
             {
                 PrimitiveBaseShape.MediaList dupeMedia = new PrimitiveBaseShape.MediaList();
-                
-                foreach (MediaEntry me in original.Shape.Media)
+                lock (original.Shape.Media)
                 {
-                    if (me != null)
-                        dupeMedia.Add(MediaEntry.FromOSD(me.GetOSD()));
-                    else
-                        dupeMedia.Add(null);
+                    foreach (MediaEntry me in original.Shape.Media)
+                    {
+                        if (me != null)
+                            dupeMedia.Add(MediaEntry.FromOSD(me.GetOSD()));
+                        else
+                            dupeMedia.Add(null);
+                    }
                 }
                 
                 copy.Shape.Media = dupeMedia;
@@ -211,8 +213,9 @@ namespace OpenSim.Region.CoreModules.Media.Moap
                 me = null;
             }
             else
-            {                            
-                me = media[face];                
+            {     
+                lock (media)
+                    me = media[face];                
                 
                 // TODO: Really need a proper copy constructor down in libopenmetaverse
                 if (me != null)
@@ -230,11 +233,13 @@ namespace OpenSim.Region.CoreModules.Media.Moap
             
             if (null == part.Shape.Media)
                 part.Shape.Media = new PrimitiveBaseShape.MediaList(new MediaEntry[part.GetNumberOfSides()]);
-                        
-            part.Shape.Media[face] = me;                                   
+                
+            lock (part.Shape.Media)                
+                part.Shape.Media[face] = me;
+            
             UpdateMediaUrl(part, UUID.Zero);                      
             part.ScheduleFullUpdate();
-            part.TriggerScriptChangedEvent(Changed.MEDIA);
+            part.TriggerScriptChangedEvent(Changed.MEDIA);                
         }
         
         public void ClearMediaEntry(SceneObjectPart part, int face)
@@ -296,7 +301,10 @@ namespace OpenSim.Region.CoreModules.Media.Moap
             ObjectMediaResponse resp = new ObjectMediaResponse();
             
             resp.PrimID = primId;
-            resp.FaceMedia = part.Shape.Media.ToArray();
+            
+            lock (part.Shape.Media)
+                resp.FaceMedia = part.Shape.Media.ToArray();
+            
             resp.Version = part.MediaUrl;
            
             string rawResp = OSDParser.SerializeLLSDXmlString(resp.Serialize());
@@ -382,24 +390,27 @@ namespace OpenSim.Region.CoreModules.Media.Moap
                 // directly.
                 Primitive.TextureEntry te = part.Shape.Textures;
                 
-                for (int i = 0; i < media.Count; i++)
-                {                                    
-                    if (m_scene.Permissions.CanControlPrimMedia(agentId, part.UUID, i))
-                    {            
-                        media[i] = omu.FaceMedia[i];
-                        
-                        // When a face is cleared this is done by setting the MediaFlags in the TextureEntry via a normal
-                        // texture update, so we don't need to worry about clearing MediaFlags here.
-                        if (null == media[i])
-                            continue;                            
-                        
-                        Primitive.TextureEntryFace face = te.CreateFace((uint)i);
-                        face.MediaFlags = true;                     
-
-//                        m_log.DebugFormat(
-//                            "[MOAP]: Media flags for face {0} is {1}", 
-//                            i, face.MediaFlags);
-//                        m_log.DebugFormat("[MOAP]: Set media entry for face {0} on {1}", i, part.Name);
+                lock (media)
+                {
+                    for (int i = 0; i < media.Count; i++)
+                    {                                    
+                        if (m_scene.Permissions.CanControlPrimMedia(agentId, part.UUID, i))
+                        {            
+                            media[i] = omu.FaceMedia[i];
+                            
+                            // When a face is cleared this is done by setting the MediaFlags in the TextureEntry via a normal
+                            // texture update, so we don't need to worry about clearing MediaFlags here.
+                            if (null == media[i])
+                                continue;                            
+                            
+                            Primitive.TextureEntryFace face = te.CreateFace((uint)i);
+                            face.MediaFlags = true;                     
+    
+    //                        m_log.DebugFormat(
+    //                            "[MOAP]: Media flags for face {0} is {1}", 
+    //                            i, face.MediaFlags);
+    //                        m_log.DebugFormat("[MOAP]: Set media entry for face {0} on {1}", i, part.Name);
+                        }
                     }
                 }
                 
@@ -465,7 +476,10 @@ namespace OpenSim.Region.CoreModules.Media.Moap
             if (null == part.Shape.Media)
                 return string.Empty;
             
-            MediaEntry me = part.Shape.Media[omn.Face];
+            MediaEntry me = null;
+                
+            lock (part.Shape.Media)
+                me = part.Shape.Media[omn.Face];
             
             // Do the same if media has not been set up for a specific face
             if (null == me)