aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs
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/MySQL/MySQLLegacyRegionData.cs
parentremove duplicated serialization code (diff)
downloadopensim-SC-9d8a67fe1348419c41374d1be77737bfa048106c.zip
opensim-SC-9d8a67fe1348419c41374d1be77737bfa048106c.tar.gz
opensim-SC-9d8a67fe1348419c41374d1be77737bfa048106c.tar.bz2
opensim-SC-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/MySQL/MySQLLegacyRegionData.cs')
-rw-r--r--OpenSim/Data/MySQL/MySQLLegacyRegionData.cs8
1 files changed, 5 insertions, 3 deletions
diff --git a/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs b/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs
index f17e8ae..50fcd96 100644
--- a/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs
+++ b/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs
@@ -1701,8 +1701,8 @@ namespace OpenSim.Data.MySQL
1701 1701
1702 s.State = (byte)(int)row["State"]; 1702 s.State = (byte)(int)row["State"];
1703 1703
1704 if (!(row["Media"] is System.DBNull)) 1704 if (!(row["Media"] is System.DBNull))
1705 s.MediaRaw = (string)row["Media"]; 1705 s.Media = PrimitiveBaseShape.MediaList.FromXml((string)row["Media"]);
1706 1706
1707 return s; 1707 return s;
1708 } 1708 }
@@ -1746,7 +1746,9 @@ namespace OpenSim.Data.MySQL
1746 cmd.Parameters.AddWithValue("Texture", s.TextureEntry); 1746 cmd.Parameters.AddWithValue("Texture", s.TextureEntry);
1747 cmd.Parameters.AddWithValue("ExtraParams", s.ExtraParams); 1747 cmd.Parameters.AddWithValue("ExtraParams", s.ExtraParams);
1748 cmd.Parameters.AddWithValue("State", s.State); 1748 cmd.Parameters.AddWithValue("State", s.State);
1749 cmd.Parameters.AddWithValue("Media", s.MediaRaw); 1749
1750 if (s.Media != null)
1751 cmd.Parameters.AddWithValue("Media", s.Media.ToXml());
1750 } 1752 }
1751 1753
1752 public void StorePrimInventory(UUID primID, ICollection<TaskInventoryItem> items) 1754 public void StorePrimInventory(UUID primID, ICollection<TaskInventoryItem> items)