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
                 parameters.Add(_Database.CreateParameter("PassTouches", 0));
             parameters.Add(_Database.CreateParameter("LinkNumber", prim.LinkNum));
             parameters.Add(_Database.CreateParameter("MediaURL", prim.MediaUrl));
-            parameters.Add(_Database.CreateParameter("DynAttrs", prim.DynAttrs.ToXml()));
+            
+            if (prim.DynAttrs.Count > 0)
+                parameters.Add(_Database.CreateParameter("DynAttrs", prim.DynAttrs.ToXml()));
+            else
+                parameters.Add(_Database.CreateParameter("DynAttrs", null));
 
             return parameters.ToArray();
         }
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
 
             cmd.Parameters.AddWithValue("LinkNumber", prim.LinkNum);
             cmd.Parameters.AddWithValue("MediaURL", prim.MediaUrl);
-            cmd.Parameters.AddWithValue("DynAttrs", prim.DynAttrs.ToXml());
+
+            if (prim.DynAttrs.Count > 0)
+                cmd.Parameters.AddWithValue("DynAttrs", prim.DynAttrs.ToXml());
+            else
+                cmd.Parameters.AddWithValue("DynAttrs", null);
         }
 
         /// <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
                 row["VolumeDetect"] = 0;
 
             row["MediaURL"] = prim.MediaUrl;
-            row["DynAttrs"] = prim.DynAttrs.ToXml();
+
+            if (prim.DynAttrs.Count > 0)
+                row["DynAttrs"] = prim.DynAttrs.ToXml();
+            else
+                row["DynAttrs"] = null;
         }
 
         /// <summary>