diff options
| author | Justin Clark-Casey (justincc) | 2010-08-04 20:23:18 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2010-08-04 20:23:18 +0100 |
| commit | 7f3f1bfe885a373d4a74fc13d49236113a69f727 (patch) | |
| tree | cc4151e53efc45cf2f59fd029eb5fa93f8267846 /OpenSim/Data/MySQL | |
| parent | Implement MediaUrl persistence for MySQL and MsSQL (diff) | |
| download | opensim-SC-7f3f1bfe885a373d4a74fc13d49236113a69f727.zip opensim-SC-7f3f1bfe885a373d4a74fc13d49236113a69f727.tar.gz opensim-SC-7f3f1bfe885a373d4a74fc13d49236113a69f727.tar.bz2 opensim-SC-7f3f1bfe885a373d4a74fc13d49236113a69f727.tar.xz | |
fix mysql/mssql prim serialization problem
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Data/MySQL/MySQLLegacyRegionData.cs | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs b/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs index 9c67e3a..d8debc5 100644 --- a/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs +++ b/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs | |||
| @@ -1524,9 +1524,7 @@ namespace OpenSim.Data.MySQL | |||
| 1524 | cmd.Parameters.AddWithValue("PassTouches", 0); | 1524 | cmd.Parameters.AddWithValue("PassTouches", 0); |
| 1525 | 1525 | ||
| 1526 | cmd.Parameters.AddWithValue("LinkNumber", prim.LinkNum); | 1526 | cmd.Parameters.AddWithValue("LinkNumber", prim.LinkNum); |
| 1527 | 1527 | cmd.Parameters.AddWithValue("MediaURL", prim.MediaUrl); | |
| 1528 | if (prim.MediaUrl != null) | ||
| 1529 | cmd.Parameters.AddWithValue("MediaURL", prim.MediaUrl); | ||
| 1530 | } | 1528 | } |
| 1531 | 1529 | ||
| 1532 | /// <summary> | 1530 | /// <summary> |
| @@ -1752,9 +1750,7 @@ namespace OpenSim.Data.MySQL | |||
| 1752 | cmd.Parameters.AddWithValue("Texture", s.TextureEntry); | 1750 | cmd.Parameters.AddWithValue("Texture", s.TextureEntry); |
| 1753 | cmd.Parameters.AddWithValue("ExtraParams", s.ExtraParams); | 1751 | cmd.Parameters.AddWithValue("ExtraParams", s.ExtraParams); |
| 1754 | cmd.Parameters.AddWithValue("State", s.State); | 1752 | cmd.Parameters.AddWithValue("State", s.State); |
| 1755 | 1753 | cmd.Parameters.AddWithValue("Media", null == s.Media ? null : s.Media.ToXml()); | |
| 1756 | if (s.Media != null) | ||
| 1757 | cmd.Parameters.AddWithValue("Media", s.Media.ToXml()); | ||
| 1758 | } | 1754 | } |
| 1759 | 1755 | ||
| 1760 | public void StorePrimInventory(UUID primID, ICollection<TaskInventoryItem> items) | 1756 | public void StorePrimInventory(UUID primID, ICollection<TaskInventoryItem> items) |