diff options
author | Justin Clarke Casey | 2008-05-30 18:32:18 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-05-30 18:32:18 +0000 |
commit | bc56efd1d238de8f990563aec3a77036b1f28fcf (patch) | |
tree | fb3e17f8c40bec5e3d38f397469a78fcecdb4079 /OpenSim/Region/Environment/Modules/World/Serialiser/IRegionSerialiser.cs | |
parent | * Refactor: Change multiple requests for a module interface to use a stored r... (diff) | |
download | opensim-SC_OLD-bc56efd1d238de8f990563aec3a77036b1f28fcf.zip opensim-SC_OLD-bc56efd1d238de8f990563aec3a77036b1f28fcf.tar.gz opensim-SC_OLD-bc56efd1d238de8f990563aec3a77036b1f28fcf.tar.bz2 opensim-SC_OLD-bc56efd1d238de8f990563aec3a77036b1f28fcf.tar.xz |
* Hook up archive loading to load in prim xml data
* This now has equivalent functionality to load-xml2 - no asset data is restored yet
Diffstat (limited to 'OpenSim/Region/Environment/Modules/World/Serialiser/IRegionSerialiser.cs')
-rw-r--r-- | OpenSim/Region/Environment/Modules/World/Serialiser/IRegionSerialiser.cs | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/Serialiser/IRegionSerialiser.cs b/OpenSim/Region/Environment/Modules/World/Serialiser/IRegionSerialiser.cs index 752b5b6..b7ed9f9 100644 --- a/OpenSim/Region/Environment/Modules/World/Serialiser/IRegionSerialiser.cs +++ b/OpenSim/Region/Environment/Modules/World/Serialiser/IRegionSerialiser.cs | |||
@@ -27,6 +27,7 @@ | |||
27 | 27 | ||
28 | using libsecondlife; | 28 | using libsecondlife; |
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using System.IO; | ||
30 | using OpenSim.Region.Environment.Scenes; | 31 | using OpenSim.Region.Environment.Scenes; |
31 | 32 | ||
32 | namespace OpenSim.Region.Environment.Modules.World.Serialiser | 33 | namespace OpenSim.Region.Environment.Modules.World.Serialiser |
@@ -38,9 +39,21 @@ namespace OpenSim.Region.Environment.Modules.World.Serialiser | |||
38 | void LoadPrimsFromXml(Scene scene, string fileName, bool newIDS, LLVector3 loadOffset); | 39 | void LoadPrimsFromXml(Scene scene, string fileName, bool newIDS, LLVector3 loadOffset); |
39 | 40 | ||
40 | void SavePrimsToXml(Scene scene, string fileName); | 41 | void SavePrimsToXml(Scene scene, string fileName); |
41 | 42 | ||
43 | /// <summary> | ||
44 | /// Load prims from the xml2 format | ||
45 | /// </summary> | ||
46 | /// <param name="scene"></param> | ||
47 | /// <param name="fileName"></param> | ||
42 | void LoadPrimsFromXml2(Scene scene, string fileName); | 48 | void LoadPrimsFromXml2(Scene scene, string fileName); |
43 | 49 | ||
50 | /// <summary> | ||
51 | /// Load prims from the xml2 format | ||
52 | /// </summary> | ||
53 | /// <param name="scene"></param> | ||
54 | /// <param name="reader"></param> | ||
55 | void LoadPrimsFromXml2(Scene scene, TextReader reader); | ||
56 | |||
44 | void SavePrimsToXml2(Scene scene, string fileName); | 57 | void SavePrimsToXml2(Scene scene, string fileName); |
45 | 58 | ||
46 | void LoadGroupFromXml2String(Scene scene, string xmlString); | 59 | void LoadGroupFromXml2String(Scene scene, string xmlString); |