diff options
| author | Jonathan Freedman | 2010-10-17 18:45:25 -0400 |
|---|---|---|
| committer | Jonathan Freedman | 2010-10-17 18:45:25 -0400 |
| commit | 4e4fb93fae6c13ca6c6ac521991c4e4969b0fe65 (patch) | |
| tree | 79142f2364b658f52b63e3ae688a5521290e2a4f /OpenSim/Region/CoreModules/World/Serialiser/SerialiserModule.cs | |
| parent | * more url / hg cleanup (diff) | |
| parent | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC_OLD-4e4fb93fae6c13ca6c6ac521991c4e4969b0fe65.zip opensim-SC_OLD-4e4fb93fae6c13ca6c6ac521991c4e4969b0fe65.tar.gz opensim-SC_OLD-4e4fb93fae6c13ca6c6ac521991c4e4969b0fe65.tar.bz2 opensim-SC_OLD-4e4fb93fae6c13ca6c6ac521991c4e4969b0fe65.tar.xz | |
Merge branch 'master' of git://opensimulator.org/git/opensim
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Serialiser/SerialiserModule.cs')
| -rw-r--r-- | OpenSim/Region/CoreModules/World/Serialiser/SerialiserModule.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/World/Serialiser/SerialiserModule.cs b/OpenSim/Region/CoreModules/World/Serialiser/SerialiserModule.cs index 04062b0..ec97acd 100644 --- a/OpenSim/Region/CoreModules/World/Serialiser/SerialiserModule.cs +++ b/OpenSim/Region/CoreModules/World/Serialiser/SerialiserModule.cs | |||
| @@ -160,9 +160,9 @@ namespace OpenSim.Region.CoreModules.World.Serialiser | |||
| 160 | return SceneXmlLoader.DeserializeGroupFromXml2(xmlString); | 160 | return SceneXmlLoader.DeserializeGroupFromXml2(xmlString); |
| 161 | } | 161 | } |
| 162 | 162 | ||
| 163 | public string SerializeGroupToXml2(SceneObjectGroup grp) | 163 | public string SerializeGroupToXml2(SceneObjectGroup grp, Dictionary<string, object> options) |
| 164 | { | 164 | { |
| 165 | return SceneXmlLoader.SaveGroupToXml2(grp); | 165 | return SceneXmlLoader.SaveGroupToXml2(grp, options); |
| 166 | } | 166 | } |
| 167 | 167 | ||
| 168 | public void SavePrimListToXml2(EntityBase[] entityList, string fileName) | 168 | public void SavePrimListToXml2(EntityBase[] entityList, string fileName) |