aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorOren Hurvitz2013-01-22 08:55:15 +0200
committerJustin Clark-Casey (justincc)2013-01-25 04:03:24 +0000
commit86802bcf937e19ea99c2f9b7bc757b4e9daf3d16 (patch)
tree6692d40a62a3fc12b7296744e8d35bc51f217590
parentStopped storing dynamic attributes in the PrimShape (diff)
downloadopensim-SC_OLD-86802bcf937e19ea99c2f9b7bc757b4e9daf3d16.zip
opensim-SC_OLD-86802bcf937e19ea99c2f9b7bc757b4e9daf3d16.tar.gz
opensim-SC_OLD-86802bcf937e19ea99c2f9b7bc757b4e9daf3d16.tar.bz2
opensim-SC_OLD-86802bcf937e19ea99c2f9b7bc757b4e9daf3d16.tar.xz
Store NULL in the 'DynAttrs' column if the prim doesn't have any dynamic attributes
-rw-r--r--OpenSim/Data/MSSQL/MSSQLSimulationData.cs6
-rw-r--r--OpenSim/Data/MySQL/MySQLSimulationData.cs6
-rw-r--r--OpenSim/Data/SQLite/SQLiteSimulationData.cs6
3 files changed, 15 insertions, 3 deletions
diff --git a/OpenSim/Data/MSSQL/MSSQLSimulationData.cs b/OpenSim/Data/MSSQL/MSSQLSimulationData.cs
index 24252ad..276a190 100644
--- a/OpenSim/Data/MSSQL/MSSQLSimulationData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLSimulationData.cs
@@ -2090,7 +2090,11 @@ VALUES
2090 parameters.Add(_Database.CreateParameter("PassTouches", 0)); 2090 parameters.Add(_Database.CreateParameter("PassTouches", 0));
2091 parameters.Add(_Database.CreateParameter("LinkNumber", prim.LinkNum)); 2091 parameters.Add(_Database.CreateParameter("LinkNumber", prim.LinkNum));
2092 parameters.Add(_Database.CreateParameter("MediaURL", prim.MediaUrl)); 2092 parameters.Add(_Database.CreateParameter("MediaURL", prim.MediaUrl));
2093 parameters.Add(_Database.CreateParameter("DynAttrs", prim.DynAttrs.ToXml())); 2093
2094 if (prim.DynAttrs.Count > 0)
2095 parameters.Add(_Database.CreateParameter("DynAttrs", prim.DynAttrs.ToXml()));
2096 else
2097 parameters.Add(_Database.CreateParameter("DynAttrs", null));
2094 2098
2095 return parameters.ToArray(); 2099 return parameters.ToArray();
2096 } 2100 }
diff --git a/OpenSim/Data/MySQL/MySQLSimulationData.cs b/OpenSim/Data/MySQL/MySQLSimulationData.cs
index 1a6a0fb..c95311e 100644
--- a/OpenSim/Data/MySQL/MySQLSimulationData.cs
+++ b/OpenSim/Data/MySQL/MySQLSimulationData.cs
@@ -1645,7 +1645,11 @@ namespace OpenSim.Data.MySQL
1645 1645
1646 cmd.Parameters.AddWithValue("LinkNumber", prim.LinkNum); 1646 cmd.Parameters.AddWithValue("LinkNumber", prim.LinkNum);
1647 cmd.Parameters.AddWithValue("MediaURL", prim.MediaUrl); 1647 cmd.Parameters.AddWithValue("MediaURL", prim.MediaUrl);
1648 cmd.Parameters.AddWithValue("DynAttrs", prim.DynAttrs.ToXml()); 1648
1649 if (prim.DynAttrs.Count > 0)
1650 cmd.Parameters.AddWithValue("DynAttrs", prim.DynAttrs.ToXml());
1651 else
1652 cmd.Parameters.AddWithValue("DynAttrs", null);
1649 } 1653 }
1650 1654
1651 /// <summary> 1655 /// <summary>
diff --git a/OpenSim/Data/SQLite/SQLiteSimulationData.cs b/OpenSim/Data/SQLite/SQLiteSimulationData.cs
index fda7728..91fc704 100644
--- a/OpenSim/Data/SQLite/SQLiteSimulationData.cs
+++ b/OpenSim/Data/SQLite/SQLiteSimulationData.cs
@@ -2145,7 +2145,11 @@ namespace OpenSim.Data.SQLite
2145 row["VolumeDetect"] = 0; 2145 row["VolumeDetect"] = 0;
2146 2146
2147 row["MediaURL"] = prim.MediaUrl; 2147 row["MediaURL"] = prim.MediaUrl;
2148 row["DynAttrs"] = prim.DynAttrs.ToXml(); 2148
2149 if (prim.DynAttrs.Count > 0)
2150 row["DynAttrs"] = prim.DynAttrs.ToXml();
2151 else
2152 row["DynAttrs"] = null;
2149 } 2153 }
2150 2154
2151 /// <summary> 2155 /// <summary>