diff options
author | Justin Clarke Casey | 2008-12-19 19:07:11 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-12-19 19:07:11 +0000 |
commit | eb6cca4750e1fff2c1d8e0be93564b5f122571d9 (patch) | |
tree | 8c57e209eb1470f27e0b5aef0bbf03ff08686e99 /OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs | |
parent | Reset Expire date for tempOnRez objects on rez. Fixes Mantis#2848 (diff) | |
download | opensim-SC_OLD-eb6cca4750e1fff2c1d8e0be93564b5f122571d9.zip opensim-SC_OLD-eb6cca4750e1fff2c1d8e0be93564b5f122571d9.tar.gz opensim-SC_OLD-eb6cca4750e1fff2c1d8e0be93564b5f122571d9.tar.bz2 opensim-SC_OLD-eb6cca4750e1fff2c1d8e0be93564b5f122571d9.tar.xz |
* refactor: Rename IRegionSerialiser and move into interfaces namespace
Diffstat (limited to 'OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs')
-rw-r--r-- | OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs index 3cd0652..e04662f 100644 --- a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs +++ b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs | |||
@@ -25,11 +25,6 @@ | |||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | */ | 26 | */ |
27 | 27 | ||
28 | using OpenSim.Framework; | ||
29 | using OpenSim.Region.Environment.Scenes; | ||
30 | using OpenSim.Region.Environment.Modules.World.Serialiser; | ||
31 | using OpenSim.Region.Environment.Modules.World.Terrain; | ||
32 | using OpenSim.Framework.Communications.Cache; | ||
33 | using System; | 28 | using System; |
34 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
35 | using System.IO; | 30 | using System.IO; |
@@ -39,6 +34,11 @@ using System.Xml; | |||
39 | using System.Net; | 34 | using System.Net; |
40 | using OpenMetaverse; | 35 | using OpenMetaverse; |
41 | using log4net; | 36 | using log4net; |
37 | using OpenSim.Framework; | ||
38 | using OpenSim.Framework.Communications.Cache; | ||
39 | using OpenSim.Region.Environment.Interfaces; | ||
40 | using OpenSim.Region.Environment.Scenes; | ||
41 | using OpenSim.Region.Environment.Modules.World.Terrain; | ||
42 | 42 | ||
43 | namespace OpenSim.Region.Environment.Modules.World.Archiver | 43 | namespace OpenSim.Region.Environment.Modules.World.Archiver |
44 | { | 44 | { |
@@ -124,7 +124,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver | |||
124 | // Reload serialized prims | 124 | // Reload serialized prims |
125 | m_log.InfoFormat("[ARCHIVER]: Loading {0} scene objects. Please wait.", serialisedSceneObjects.Count); | 125 | m_log.InfoFormat("[ARCHIVER]: Loading {0} scene objects. Please wait.", serialisedSceneObjects.Count); |
126 | 126 | ||
127 | IRegionSerialiser serialiser = m_scene.RequestModuleInterface<IRegionSerialiser>(); | 127 | IRegionSerialiserModule serialiser = m_scene.RequestModuleInterface<IRegionSerialiserModule>(); |
128 | ICollection<SceneObjectGroup> sceneObjects = new List<SceneObjectGroup>(); | 128 | ICollection<SceneObjectGroup> sceneObjects = new List<SceneObjectGroup>(); |
129 | 129 | ||
130 | foreach (string serialisedSceneObject in serialisedSceneObjects) | 130 | foreach (string serialisedSceneObject in serialisedSceneObjects) |