aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/MySQL/MySQLSimulationData.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Data/MySQL/MySQLSimulationData.cs')
-rw-r--r--OpenSim/Data/MySQL/MySQLSimulationData.cs16
1 files changed, 14 insertions, 2 deletions
diff --git a/OpenSim/Data/MySQL/MySQLSimulationData.cs b/OpenSim/Data/MySQL/MySQLSimulationData.cs
index d562783..b7f39fb 100644
--- a/OpenSim/Data/MySQL/MySQLSimulationData.cs
+++ b/OpenSim/Data/MySQL/MySQLSimulationData.cs
@@ -202,7 +202,7 @@ namespace OpenSim.Data.MySQL
202 "?SaleType, ?ColorR, ?ColorG, " + 202 "?SaleType, ?ColorR, ?ColorG, " +
203 "?ColorB, ?ColorA, ?ParticleSystem, " + 203 "?ColorB, ?ColorA, ?ParticleSystem, " +
204 "?ClickAction, ?Material, ?CollisionSound, " + 204 "?ClickAction, ?Material, ?CollisionSound, " +
205 "?CollisionSoundVolume, ?PassTouches, ?LinkNumber, ?MediaURL)"; 205 "?CollisionSoundVolume, ?PassTouches, ?LinkNumber, ?MediaURL, ?DynAttrs)";
206 206
207 FillPrimCommand(cmd, prim, obj.UUID, regionUUID); 207 FillPrimCommand(cmd, prim, obj.UUID, regionUUID);
208 208
@@ -230,7 +230,7 @@ namespace OpenSim.Data.MySQL
230 "?PathTwistBegin, ?ProfileBegin, " + 230 "?PathTwistBegin, ?ProfileBegin, " +
231 "?ProfileEnd, ?ProfileCurve, " + 231 "?ProfileEnd, ?ProfileCurve, " +
232 "?ProfileHollow, ?Texture, ?ExtraParams, " + 232 "?ProfileHollow, ?Texture, ?ExtraParams, " +
233 "?State, ?Media)"; 233 "?State, ?Media, ?DynAttrs)";
234 234
235 FillShapeCommand(cmd, prim); 235 FillShapeCommand(cmd, prim);
236 236
@@ -1291,6 +1291,11 @@ namespace OpenSim.Data.MySQL
1291 1291
1292 if (!(row["MediaURL"] is System.DBNull)) 1292 if (!(row["MediaURL"] is System.DBNull))
1293 prim.MediaUrl = (string)row["MediaURL"]; 1293 prim.MediaUrl = (string)row["MediaURL"];
1294
1295 if (!(row["DynAttrs"] is System.DBNull))
1296 prim.DynAttrs = DynAttrsOSDMap.FromXml((string)row["DynAttrs"]);
1297 else
1298 prim.DynAttrs = new DynAttrsOSDMap();
1294 1299
1295 return prim; 1300 return prim;
1296 } 1301 }
@@ -1637,6 +1642,7 @@ namespace OpenSim.Data.MySQL
1637 1642
1638 cmd.Parameters.AddWithValue("LinkNumber", prim.LinkNum); 1643 cmd.Parameters.AddWithValue("LinkNumber", prim.LinkNum);
1639 cmd.Parameters.AddWithValue("MediaURL", prim.MediaUrl); 1644 cmd.Parameters.AddWithValue("MediaURL", prim.MediaUrl);
1645 cmd.Parameters.AddWithValue("DynAttrs", prim.DynAttrs.ToXml());
1640 } 1646 }
1641 1647
1642 /// <summary> 1648 /// <summary>
@@ -1829,6 +1835,11 @@ namespace OpenSim.Data.MySQL
1829 1835
1830 if (!(row["Media"] is System.DBNull)) 1836 if (!(row["Media"] is System.DBNull))
1831 s.Media = PrimitiveBaseShape.MediaList.FromXml((string)row["Media"]); 1837 s.Media = PrimitiveBaseShape.MediaList.FromXml((string)row["Media"]);
1838
1839 if (!(row["DynAttrs"] is System.DBNull))
1840 s.DynAttrs = DynAttrsOSDMap.FromXml((string)row["DynAttrs"]);
1841 else
1842 s.DynAttrs = new DynAttrsOSDMap();
1832 1843
1833 return s; 1844 return s;
1834 } 1845 }
@@ -1873,6 +1884,7 @@ namespace OpenSim.Data.MySQL
1873 cmd.Parameters.AddWithValue("ExtraParams", s.ExtraParams); 1884 cmd.Parameters.AddWithValue("ExtraParams", s.ExtraParams);
1874 cmd.Parameters.AddWithValue("State", s.State); 1885 cmd.Parameters.AddWithValue("State", s.State);
1875 cmd.Parameters.AddWithValue("Media", null == s.Media ? null : s.Media.ToXml()); 1886 cmd.Parameters.AddWithValue("Media", null == s.Media ? null : s.Media.ToXml());
1887 cmd.Parameters.AddWithValue("DynAttrs", s.DynAttrs.ToXml());
1876 } 1888 }
1877 1889
1878 public void StorePrimInventory(UUID primID, ICollection<TaskInventoryItem> items) 1890 public void StorePrimInventory(UUID primID, ICollection<TaskInventoryItem> items)