aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2010-08-04 20:23:18 +0100
committerJustin Clark-Casey (justincc)2010-08-04 20:23:18 +0100
commit7f3f1bfe885a373d4a74fc13d49236113a69f727 (patch)
treecc4151e53efc45cf2f59fd029eb5fa93f8267846 /OpenSim/Data
parentImplement MediaUrl persistence for MySQL and MsSQL (diff)
downloadopensim-SC_OLD-7f3f1bfe885a373d4a74fc13d49236113a69f727.zip
opensim-SC_OLD-7f3f1bfe885a373d4a74fc13d49236113a69f727.tar.gz
opensim-SC_OLD-7f3f1bfe885a373d4a74fc13d49236113a69f727.tar.bz2
opensim-SC_OLD-7f3f1bfe885a373d4a74fc13d49236113a69f727.tar.xz
fix mysql/mssql prim serialization problem
Diffstat (limited to 'OpenSim/Data')
-rw-r--r--OpenSim/Data/MSSQL/MSSQLLegacyRegionData.cs8
-rw-r--r--OpenSim/Data/MySQL/MySQLLegacyRegionData.cs8
2 files changed, 4 insertions, 12 deletions
diff --git a/OpenSim/Data/MSSQL/MSSQLLegacyRegionData.cs b/OpenSim/Data/MSSQL/MSSQLLegacyRegionData.cs
index 05b14bf..7c176c7 100644
--- a/OpenSim/Data/MSSQL/MSSQLLegacyRegionData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLLegacyRegionData.cs
@@ -1516,9 +1516,7 @@ VALUES
1516 else 1516 else
1517 parameters.Add(_Database.CreateParameter("PassTouches", 0)); 1517 parameters.Add(_Database.CreateParameter("PassTouches", 0));
1518 parameters.Add(_Database.CreateParameter("LinkNumber", prim.LinkNum)); 1518 parameters.Add(_Database.CreateParameter("LinkNumber", prim.LinkNum));
1519 1519 parameters.Add(_Database.CreateParameter("MediaURL", prim.MediaUrl));
1520 if (prim.MediaUrl != null)
1521 parameters.Add(_Database.CreateParameter("MediaURL", prim.MediaUrl));
1522 1520
1523 return parameters.ToArray(); 1521 return parameters.ToArray();
1524 } 1522 }
@@ -1566,9 +1564,7 @@ VALUES
1566 parameters.Add(_Database.CreateParameter("Texture", s.TextureEntry)); 1564 parameters.Add(_Database.CreateParameter("Texture", s.TextureEntry));
1567 parameters.Add(_Database.CreateParameter("ExtraParams", s.ExtraParams)); 1565 parameters.Add(_Database.CreateParameter("ExtraParams", s.ExtraParams));
1568 parameters.Add(_Database.CreateParameter("State", s.State)); 1566 parameters.Add(_Database.CreateParameter("State", s.State));
1569 1567 parameters.Add(_Database.CreateParameter("Media", null == s.Media ? null : s.Media.ToXml()));
1570 if (s.Media != null)
1571 parameters.Add(_Database.CreateParameter("Media", s.Media.ToXml()));
1572 1568
1573 return parameters.ToArray(); 1569 return parameters.ToArray();
1574 } 1570 }
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)