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/SQLite | |
| 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 | |
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/SQLite')
| -rw-r--r-- | OpenSim/Data/SQLite/SQLiteSimulationData.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Data/SQLite/SQLiteSimulationData.cs b/OpenSim/Data/SQLite/SQLiteSimulationData.cs index a369b2b..52502b3 100644 --- a/OpenSim/Data/SQLite/SQLiteSimulationData.cs +++ b/OpenSim/Data/SQLite/SQLiteSimulationData.cs | |||
| @@ -2176,7 +2176,7 @@ namespace OpenSim.Data.SQLite | |||
| 2176 | 2176 | ||
| 2177 | row["MediaURL"] = prim.MediaUrl; | 2177 | row["MediaURL"] = prim.MediaUrl; |
| 2178 | 2178 | ||
| 2179 | if (prim.DynAttrs.Count > 0) | 2179 | if (prim.DynAttrs.CountNamespaces > 0) |
| 2180 | row["DynAttrs"] = prim.DynAttrs.ToXml(); | 2180 | row["DynAttrs"] = prim.DynAttrs.ToXml(); |
| 2181 | else | 2181 | else |
| 2182 | row["DynAttrs"] = null; | 2182 | row["DynAttrs"] = null; |