get rid of PrimitiveBaseShape.MediaRaw staging post

using an OSD serialization rather than auto forces serialization code to be placed in OpenSim.Framework
this makes the media texture raw data staging post in PrimitiveBaseShape redundant, now we just directly call the code in PrimitiveBaseShape.MediaList itself

1 files changed, 5 insertions, 3 deletions

diff --git a/OpenSim/Data/SQLite/SQLiteRegionData.cs b/OpenSim/Data/SQLite/SQLiteRegionData.cs
index f63d35e..4208050 100644
--- a/OpenSim/Data/SQLite/SQLiteRegionData.cs
+++ b/OpenSim/Data/SQLite/SQLiteRegionData.cs
@@ -1346,7 +1346,7 @@ namespace OpenSim.Data.SQLite
             
             if (!(row["MediaURL"] is System.DBNull))
             {
-                m_log.DebugFormat("[SQLITE]: MediaUrl type [{0}]", row["MediaURL"].GetType());
+                //m_log.DebugFormat("[SQLITE]: MediaUrl type [{0}]", row["MediaURL"].GetType());
                 prim.MediaUrl = (string)row["MediaURL"];
             }
 
@@ -1861,7 +1861,7 @@ namespace OpenSim.Data.SQLite
             s.ExtraParams = (byte[]) row["ExtraParams"];
             
             if (!(row["Media"] is System.DBNull))
-                s.MediaRaw = (string)row["Media"];
+                s.Media = PrimitiveBaseShape.MediaList.FromXml((string)row["Media"]);
                         
             return s;
         }
@@ -1906,7 +1906,9 @@ namespace OpenSim.Data.SQLite
 
             row["Texture"] = s.TextureEntry;
             row["ExtraParams"] = s.ExtraParams;
-            row["Media"] = s.MediaRaw;
+            
+            if (s.Media != null)
+                row["Media"] = s.Media.ToXml();
         }
 
         /// <summary>