serialize media textures to inventory with a largely osd representation rather than .net auto-serialization

THIS WILL BREAK ANY EXISTING MEDIA TEXTURE SERIALIZATIONS.  If you're testing this, please start with new databases.
This makes media textures serialized in the same way, which is probably better in the long term.

1 files changed, 4 insertions, 4 deletions

diff --git a/OpenSim/Region/CoreModules/World/Media/Moap/MoapModule.cs b/OpenSim/Region/CoreModules/World/Media/Moap/MoapModule.cs
index e9d723b..339a979 100644
--- a/OpenSim/Region/CoreModules/World/Media/Moap/MoapModule.cs
+++ b/OpenSim/Region/CoreModules/World/Media/Moap/MoapModule.cs
@@ -219,7 +219,7 @@ namespace OpenSim.Region.CoreModules.Media.Moap
                     
                     OSDArray osdMeArray = (OSDArray)OSDParser.DeserializeLLSDXml(xtr.ReadInnerXml());
                     
-                    List<MediaEntry> mediaEntries = new List<MediaEntry>();
+                    PrimitiveBaseShape.MediaList mediaEntries = new PrimitiveBaseShape.MediaList();
                     foreach (OSD osdMe in osdMeArray)
                     {
                         MediaEntry me = (osdMe is OSDMap ? MediaEntry.FromOSD(osdMe) : new MediaEntry());
@@ -270,7 +270,7 @@ namespace OpenSim.Region.CoreModules.Media.Moap
         {            
             if (original.Shape.Media != null)
             {
-                List<MediaEntry> dupeMedia = new List<MediaEntry>();
+                PrimitiveBaseShape.MediaList dupeMedia = new PrimitiveBaseShape.MediaList();
                 
                 foreach (MediaEntry me in original.Shape.Media)
                 {
@@ -315,7 +315,7 @@ namespace OpenSim.Region.CoreModules.Media.Moap
             CheckFaceParam(part, face);          
             
             if (null == part.Shape.Media)
-                part.Shape.Media = new List<MediaEntry>(new MediaEntry[part.GetNumberOfSides()]);
+                part.Shape.Media = new PrimitiveBaseShape.MediaList(new MediaEntry[part.GetNumberOfSides()]);
                         
             part.Shape.Media[face] = me;                                   
             UpdateMediaUrl(part, UUID.Zero);                      
@@ -439,7 +439,7 @@ namespace OpenSim.Region.CoreModules.Media.Moap
             if (null == media)
             {
 //                m_log.DebugFormat("[MOAP]: Setting all new media list for {0}", part.Name);
-                part.Shape.Media = new List<MediaEntry>(omu.FaceMedia);
+                part.Shape.Media = new PrimitiveBaseShape.MediaList(omu.FaceMedia);
                 
                 for (int i = 0; i < omu.FaceMedia.Length; i++)
                 {