2 files changed, 15 insertions, 2 deletions

diff --git a/OpenSim/Data/SQLite/SQLiteRegionData.cs b/OpenSim/Data/SQLite/SQLiteRegionData.cs
index fc9667b..51f4cef 100644
--- a/OpenSim/Data/SQLite/SQLiteRegionData.cs
+++ b/OpenSim/Data/SQLite/SQLiteRegionData.cs
@@ -1867,7 +1867,10 @@ namespace OpenSim.Data.SQLite
                 
                 List<MediaEntry> mediaEntries = new List<MediaEntry>();
                 foreach (OSD osdMe in osdMeArray)
-                    mediaEntries.Add(MediaEntry.FromOSD(osdMe));
+                {
+                    MediaEntry me = (osdMe is OSDMap ? MediaEntry.FromOSD(osdMe) : new MediaEntry());
+                    mediaEntries.Add(me);
+                }
                 
                 s.Media = mediaEntries;
             }
@@ -1918,7 +1921,10 @@ namespace OpenSim.Data.SQLite
             
             OSDArray meArray = new OSDArray();
             foreach (MediaEntry me in s.Media)
-                meArray.Add(me.GetOSD());
+            {
+                OSD osd = (null == me ? new OSD() : me.GetOSD());
+                meArray.Add(osd);
+            }
             
             row["Media"] = OSDParser.SerializeLLSDXmlString(meArray);
         }
diff --git a/OpenSim/Region/CoreModules/World/Media/Moap/MoapModule.cs b/OpenSim/Region/CoreModules/World/Media/Moap/MoapModule.cs
index 242ff6c..93a1ae8 100644
--- a/OpenSim/Region/CoreModules/World/Media/Moap/MoapModule.cs
+++ b/OpenSim/Region/CoreModules/World/Media/Moap/MoapModule.cs
@@ -212,6 +212,13 @@ 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];
+//                string v = (null == me ? "null": OSDParser.SerializeLLSDXmlString(me.GetOSD()));
+//                m_log.DebugFormat("[MOAP]: Face {0} [{1}]", i, v);
+//            }
             
             part.Shape.Media = new List<MediaEntry>(omu.FaceMedia);