diff options
| 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/MySQL/MySQLSimulationData.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-ffcee82b1d62150b772464841023a29acc334c84.zip opensim-SC-ffcee82b1d62150b772464841023a29acc334c84.tar.gz opensim-SC-ffcee82b1d62150b772464841023a29acc334c84.tar.bz2 opensim-SC-ffcee82b1d62150b772464841023a29acc334c84.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Data/MySQL/MySQLSimulationData.cs
OpenSim/Region/Framework/Scenes/EventManager.cs
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
Diffstat (limited to 'OpenSim/Data/MySQL/MySQLSimulationData.cs')
| -rw-r--r-- | OpenSim/Data/MySQL/MySQLSimulationData.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Data/MySQL/MySQLSimulationData.cs b/OpenSim/Data/MySQL/MySQLSimulationData.cs index 537ec85..feacbb2 100644 --- a/OpenSim/Data/MySQL/MySQLSimulationData.cs +++ b/OpenSim/Data/MySQL/MySQLSimulationData.cs | |||
| @@ -1730,7 +1730,7 @@ namespace OpenSim.Data.MySQL | |||
| 1730 | else | 1730 | else |
| 1731 | cmd.Parameters.AddWithValue("Vehicle", String.Empty); | 1731 | cmd.Parameters.AddWithValue("Vehicle", String.Empty); |
| 1732 | 1732 | ||
| 1733 | if (prim.DynAttrs.Count > 0) | 1733 | if (prim.DynAttrs.CountNamespaces > 0) |
| 1734 | cmd.Parameters.AddWithValue("DynAttrs", prim.DynAttrs.ToXml()); | 1734 | cmd.Parameters.AddWithValue("DynAttrs", prim.DynAttrs.ToXml()); |
| 1735 | else | 1735 | else |
| 1736 | cmd.Parameters.AddWithValue("DynAttrs", null); | 1736 | cmd.Parameters.AddWithValue("DynAttrs", null); |