ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-05 00:46:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into careminster

Browse Source 
Conflicts:
	OpenSim/Data/MySQL/MySQLSimulationData.cs
	OpenSim/Region/Framework/Scenes/EventManager.cs
	OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
This commit is contained in:
Melanie
2013-06-30 18:27:30 +01:00
parent f70357eaa3 e377abcc35
commit ffcee82b1d
26 changed files with 514 additions and 269 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
View File

@@ -1346,7 +1346,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
if (sop.MediaUrl != null)
writer.WriteElementString("MediaUrl", sop.MediaUrl.ToString());
if (sop.DynAttrs.Count > 0)
if (sop.DynAttrs.CountNamespaces > 0)
{
writer.WriteStartElement("DynAttrs");
sop.DynAttrs.WriteXml(writer);