aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/SQLite
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2010-08-03 16:26:27 +0100
committerJustin Clark-Casey (justincc)2010-08-03 16:26:27 +0100
commit9d8a67fe1348419c41374d1be77737bfa048106c (patch)
tree5d29a07998c697a901cfdadf20e2e2cc579300cf /OpenSim/Data/SQLite
parentremove duplicated serialization code (diff)
downloadopensim-SC_OLD-9d8a67fe1348419c41374d1be77737bfa048106c.zip
opensim-SC_OLD-9d8a67fe1348419c41374d1be77737bfa048106c.tar.gz
opensim-SC_OLD-9d8a67fe1348419c41374d1be77737bfa048106c.tar.bz2
opensim-SC_OLD-9d8a67fe1348419c41374d1be77737bfa048106c.tar.xz
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
Diffstat (limited to 'OpenSim/Data/SQLite')
-rw-r--r--OpenSim/Data/SQLite/SQLiteRegionData.cs8
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
1346 1346
1347 if (!(row["MediaURL"] is System.DBNull)) 1347 if (!(row["MediaURL"] is System.DBNull))
1348 { 1348 {
1349 m_log.DebugFormat("[SQLITE]: MediaUrl type [{0}]", row["MediaURL"].GetType()); 1349 //m_log.DebugFormat("[SQLITE]: MediaUrl type [{0}]", row["MediaURL"].GetType());
1350 prim.MediaUrl = (string)row["MediaURL"]; 1350 prim.MediaUrl = (string)row["MediaURL"];
1351 } 1351 }
1352 1352
@@ -1861,7 +1861,7 @@ namespace OpenSim.Data.SQLite
1861 s.ExtraParams = (byte[]) row["ExtraParams"]; 1861 s.ExtraParams = (byte[]) row["ExtraParams"];
1862 1862
1863 if (!(row["Media"] is System.DBNull)) 1863 if (!(row["Media"] is System.DBNull))
1864 s.MediaRaw = (string)row["Media"]; 1864 s.Media = PrimitiveBaseShape.MediaList.FromXml((string)row["Media"]);
1865 1865
1866 return s; 1866 return s;
1867 } 1867 }
@@ -1906,7 +1906,9 @@ namespace OpenSim.Data.SQLite
1906 1906
1907 row["Texture"] = s.TextureEntry; 1907 row["Texture"] = s.TextureEntry;
1908 row["ExtraParams"] = s.ExtraParams; 1908 row["ExtraParams"] = s.ExtraParams;
1909 row["Media"] = s.MediaRaw; 1909
1910 if (s.Media != null)
1911 row["Media"] = s.Media.ToXml();
1910 } 1912 }
1911 1913
1912 /// <summary> 1914 /// <summary>