Merge branch 'master' into careminster

Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Region/Framework/Scenes/EventManager.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
author: Melanie 2013-06-30 18:27:30 +0100
committer: Melanie 2013-06-30 18:27:30 +0100
commit: ffcee82b1d62150b772464841023a29acc334c84 (patch)
tree: 957d562be1f9e567daabb9bfdd25e779ec2c11a4 /OpenSim/Data/MSSQL/MSSQLSimulationData.cs
parent: Merge branch 'master' into careminster (diff)
parent: Groups V2: charge for group creation only after the group has been successful... (diff)
download: opensim-SC_OLD-ffcee82b1d62150b772464841023a29acc334c84.zip
opensim-SC_OLD-ffcee82b1d62150b772464841023a29acc334c84.tar.gz
opensim-SC_OLD-ffcee82b1d62150b772464841023a29acc334c84.tar.bz2
opensim-SC_OLD-ffcee82b1d62150b772464841023a29acc334c84.tar.xz
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Data/MSSQL/MSSQLSimulationData.cs b/OpenSim/Data/MSSQL/MSSQLSimulationData.cs
index 00af3a0..bc5beeb 100644
--- a/OpenSim/Data/MSSQL/MSSQLSimulationData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLSimulationData.cs
@@ -2100,7 +2100,7 @@ VALUES
            parameters.Add(_Database.CreateParameter("LinkNumber", prim.LinkNum));
            parameters.Add(_Database.CreateParameter("MediaURL", prim.MediaUrl));
            
-            if (prim.DynAttrs.Count > 0)
+            if (prim.DynAttrs.CountNamespaces > 0)
                parameters.Add(_Database.CreateParameter("DynAttrs", prim.DynAttrs.ToXml()));
            else
                parameters.Add(_Database.CreateParameter("DynAttrs", null));
author	Melanie	2013-06-30 18:27:30 +0100
committer	Melanie	2013-06-30 18:27:30 +0100
commit	ffcee82b1d62150b772464841023a29acc334c84 (patch)
tree	957d562be1f9e567daabb9bfdd25e779ec2c11a4 /OpenSim/Data/MSSQL/MSSQLSimulationData.cs
parent	Merge branch 'master' into careminster (diff)
parent	Groups V2: charge for group creation only after the group has been successful... (diff)
download	opensim-SC_OLD-ffcee82b1d62150b772464841023a29acc334c84.zip opensim-SC_OLD-ffcee82b1d62150b772464841023a29acc334c84.tar.gz opensim-SC_OLD-ffcee82b1d62150b772464841023a29acc334c84.tar.bz2 opensim-SC_OLD-ffcee82b1d62150b772464841023a29acc334c84.tar.xz

diff --git a/OpenSim/Data/MSSQL/MSSQLSimulationData.cs b/OpenSim/Data/MSSQL/MSSQLSimulationData.cs index 00af3a0..bc5beeb 100644 --- a/OpenSim/Data/MSSQL/MSSQLSimulationData.cs +++ b/OpenSim/Data/MSSQL/MSSQLSimulationData.cs
@@ -2100,7 +2100,7 @@ VALUES
2100	parameters.Add(_Database.CreateParameter("LinkNumber", prim.LinkNum));	2100	parameters.Add(_Database.CreateParameter("LinkNumber", prim.LinkNum));
2101	parameters.Add(_Database.CreateParameter("MediaURL", prim.MediaUrl));	2101	parameters.Add(_Database.CreateParameter("MediaURL", prim.MediaUrl));
2102		2102
2103	if (prim.DynAttrs.Count > 0)	2103	if (prim.DynAttrs.CountNamespaces > 0)
2104	parameters.Add(_Database.CreateParameter("DynAttrs", prim.DynAttrs.ToXml()));	2104	parameters.Add(_Database.CreateParameter("DynAttrs", prim.DynAttrs.ToXml()));
2105	else	2105	else
2106	parameters.Add(_Database.CreateParameter("DynAttrs", null));	2106	parameters.Add(_Database.CreateParameter("DynAttrs", null));