diff options
author | Dr Scofield | 2009-02-10 13:10:57 +0000 |
---|---|---|
committer | Dr Scofield | 2009-02-10 13:10:57 +0000 |
commit | 180be7de07014aa33bc6066f12a0819b731c1c9d (patch) | |
tree | 3aa13af3cda4b808fa9453655875327699b61311 /OpenSim/Region/CoreModules/World/Archiver | |
parent | Stopgap measure: To use gridlaunch, or GUI, start opensim with (diff) | |
download | opensim-SC_OLD-180be7de07014aa33bc6066f12a0819b731c1c9d.zip opensim-SC_OLD-180be7de07014aa33bc6066f12a0819b731c1c9d.tar.gz opensim-SC_OLD-180be7de07014aa33bc6066f12a0819b731c1c9d.tar.bz2 opensim-SC_OLD-180be7de07014aa33bc6066f12a0819b731c1c9d.tar.xz |
this is step 2 of 2 of the OpenSim.Region.Environment refactor.
NOTHING has been deleted or moved off to forge at this point. what
has happened is that OpenSim.Region.Environment.Modules has been split
in two:
- OpenSim.Region.CoreModules: all those modules that are either
directly or indirectly referenced from other OpenSim packages, or
that provide functionality that the OpenSim developer community
considers core functionality:
CoreModules/Agent/AssetTransaction
CoreModules/Agent/Capabilities
CoreModules/Agent/TextureDownload
CoreModules/Agent/TextureSender
CoreModules/Agent/TextureSender/Tests
CoreModules/Agent/Xfer
CoreModules/Avatar/AvatarFactory
CoreModules/Avatar/Chat/ChatModule
CoreModules/Avatar/Combat
CoreModules/Avatar/Currency/SampleMoney
CoreModules/Avatar/Dialog
CoreModules/Avatar/Friends
CoreModules/Avatar/Gestures
CoreModules/Avatar/Groups
CoreModules/Avatar/InstantMessage
CoreModules/Avatar/Inventory
CoreModules/Avatar/Inventory/Archiver
CoreModules/Avatar/Inventory/Transfer
CoreModules/Avatar/Lure
CoreModules/Avatar/ObjectCaps
CoreModules/Avatar/Profiles
CoreModules/Communications/Local
CoreModules/Communications/REST
CoreModules/Framework/EventQueue
CoreModules/Framework/InterfaceCommander
CoreModules/Hypergrid
CoreModules/InterGrid
CoreModules/Scripting/DynamicTexture
CoreModules/Scripting/EMailModules
CoreModules/Scripting/HttpRequest
CoreModules/Scripting/LoadImageURL
CoreModules/Scripting/VectorRender
CoreModules/Scripting/WorldComm
CoreModules/Scripting/XMLRPC
CoreModules/World/Archiver
CoreModules/World/Archiver/Tests
CoreModules/World/Estate
CoreModules/World/Land
CoreModules/World/Permissions
CoreModules/World/Serialiser
CoreModules/World/Sound
CoreModules/World/Sun
CoreModules/World/Terrain
CoreModules/World/Terrain/DefaultEffects
CoreModules/World/Terrain/DefaultEffects/bin
CoreModules/World/Terrain/DefaultEffects/bin/Debug
CoreModules/World/Terrain/Effects
CoreModules/World/Terrain/FileLoaders
CoreModules/World/Terrain/FloodBrushes
CoreModules/World/Terrain/PaintBrushes
CoreModules/World/Terrain/Tests
CoreModules/World/Vegetation
CoreModules/World/Wind
CoreModules/World/WorldMap
- OpenSim.Region.OptionalModules: all those modules that are not core
modules:
OptionalModules/Avatar/Chat/IRC-stuff
OptionalModules/Avatar/Concierge
OptionalModules/Avatar/Voice/AsterixVoice
OptionalModules/Avatar/Voice/SIPVoice
OptionalModules/ContentManagementSystem
OptionalModules/Grid/Interregion
OptionalModules/Python
OptionalModules/SvnSerialiser
OptionalModules/World/NPC
OptionalModules/World/TreePopulator
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Archiver/ArchiveConstants.cs (renamed from OpenSim/Region/Environment/Modules/World/Archiver/ArchiveConstants.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs (renamed from OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs) | 4 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestExecution.cs (renamed from OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestExecution.cs) | 6 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs (renamed from OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestPreparation.cs) | 6 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs (renamed from OpenSim/Region/Environment/Modules/World/Archiver/ArchiverModule.cs) | 4 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/World/Archiver/AssetsArchiver.cs (renamed from OpenSim/Region/Environment/Modules/World/Archiver/AssetsArchiver.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/World/Archiver/AssetsDearchiver.cs (renamed from OpenSim/Region/Environment/Modules/World/Archiver/AssetsDearchiver.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs (renamed from OpenSim/Region/Environment/Modules/World/Archiver/AssetsRequest.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/World/Archiver/RegionSettingsSerializer.cs (renamed from OpenSim/Region/Environment/Modules/World/Archiver/RegionSettingsSerializer.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/World/Archiver/TarArchiveReader.cs (renamed from OpenSim/Region/Environment/Modules/World/Archiver/TarArchiveReader.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/World/Archiver/TarArchiveWriter.cs (renamed from OpenSim/Region/Environment/Modules/World/Archiver/TarArchiveWriter.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs (renamed from OpenSim/Region/Environment/Modules/World/Archiver/Tests/ArchiverTests.cs) | 8 |
12 files changed, 21 insertions, 21 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveConstants.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveConstants.cs index 4151c88..179d1a2 100644 --- a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveConstants.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveConstants.cs | |||
@@ -28,7 +28,7 @@ | |||
28 | using System.Collections.Generic; | 28 | using System.Collections.Generic; |
29 | using OpenMetaverse; | 29 | using OpenMetaverse; |
30 | 30 | ||
31 | namespace OpenSim.Region.Environment.Modules.World.Archiver | 31 | namespace OpenSim.Region.CoreModules.World.Archiver |
32 | { | 32 | { |
33 | /// <summary> | 33 | /// <summary> |
34 | /// Constants for the archiving module | 34 | /// Constants for the archiving module |
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs index b507c52..3218abc 100644 --- a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs | |||
@@ -38,9 +38,9 @@ using OpenSim.Framework; | |||
38 | using OpenSim.Framework.Communications.Cache; | 38 | using OpenSim.Framework.Communications.Cache; |
39 | using OpenSim.Region.Framework.Interfaces; | 39 | using OpenSim.Region.Framework.Interfaces; |
40 | using OpenSim.Region.Framework.Scenes; | 40 | using OpenSim.Region.Framework.Scenes; |
41 | using OpenSim.Region.Environment.Modules.World.Terrain; | 41 | using OpenSim.Region.CoreModules.World.Terrain; |
42 | 42 | ||
43 | namespace OpenSim.Region.Environment.Modules.World.Archiver | 43 | namespace OpenSim.Region.CoreModules.World.Archiver |
44 | { | 44 | { |
45 | /// <summary> | 45 | /// <summary> |
46 | /// Handles an individual archive read request | 46 | /// Handles an individual archive read request |
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestExecution.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestExecution.cs index 9a06bf7..d3c2cd1 100644 --- a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestExecution.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestExecution.cs | |||
@@ -35,10 +35,10 @@ using log4net; | |||
35 | using OpenSim.Framework; | 35 | using OpenSim.Framework; |
36 | using OpenSim.Region.Framework.Interfaces; | 36 | using OpenSim.Region.Framework.Interfaces; |
37 | using OpenSim.Region.Framework.Scenes; | 37 | using OpenSim.Region.Framework.Scenes; |
38 | using OpenSim.Region.Environment.Modules.World.Serialiser; | 38 | using OpenSim.Region.CoreModules.World.Serialiser; |
39 | using OpenSim.Region.Environment.Modules.World.Terrain; | 39 | using OpenSim.Region.CoreModules.World.Terrain; |
40 | 40 | ||
41 | namespace OpenSim.Region.Environment.Modules.World.Archiver | 41 | namespace OpenSim.Region.CoreModules.World.Archiver |
42 | { | 42 | { |
43 | /// <summary> | 43 | /// <summary> |
44 | /// Method called when all the necessary assets for an archive request have been received. | 44 | /// Method called when all the necessary assets for an archive request have been received. |
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestPreparation.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs index 56604d6..ee0ec69 100644 --- a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestPreparation.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs | |||
@@ -29,8 +29,8 @@ using OpenSim.Framework; | |||
29 | using OpenSim.Framework.Communications.Cache; | 29 | using OpenSim.Framework.Communications.Cache; |
30 | using OpenSim.Region.Framework.Interfaces; | 30 | using OpenSim.Region.Framework.Interfaces; |
31 | using OpenSim.Region.Framework.Scenes; | 31 | using OpenSim.Region.Framework.Scenes; |
32 | using OpenSim.Region.Environment.Modules.World.Serialiser; | 32 | using OpenSim.Region.CoreModules.World.Serialiser; |
33 | using OpenSim.Region.Environment.Modules.World.Terrain; | 33 | using OpenSim.Region.CoreModules.World.Terrain; |
34 | using System; | 34 | using System; |
35 | using System.Collections.Generic; | 35 | using System.Collections.Generic; |
36 | using System.IO; | 36 | using System.IO; |
@@ -42,7 +42,7 @@ using OpenMetaverse; | |||
42 | using log4net; | 42 | using log4net; |
43 | using Nini.Config; | 43 | using Nini.Config; |
44 | 44 | ||
45 | namespace OpenSim.Region.Environment.Modules.World.Archiver | 45 | namespace OpenSim.Region.CoreModules.World.Archiver |
46 | { | 46 | { |
47 | /// <summary> | 47 | /// <summary> |
48 | /// Prepare to write out an archive. | 48 | /// Prepare to write out an archive. |
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiverModule.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs index cd81169..c1f5b18 100644 --- a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiverModule.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs | |||
@@ -35,9 +35,9 @@ using Nini.Config; | |||
35 | using OpenSim.Framework.Communications.Cache; | 35 | using OpenSim.Framework.Communications.Cache; |
36 | using OpenSim.Region.Framework.Interfaces; | 36 | using OpenSim.Region.Framework.Interfaces; |
37 | using OpenSim.Region.Framework.Scenes; | 37 | using OpenSim.Region.Framework.Scenes; |
38 | using OpenSim.Region.Environment.Modules.World.Serialiser; | 38 | using OpenSim.Region.CoreModules.World.Serialiser; |
39 | 39 | ||
40 | namespace OpenSim.Region.Environment.Modules.World.Archiver | 40 | namespace OpenSim.Region.CoreModules.World.Archiver |
41 | { | 41 | { |
42 | /// <summary> | 42 | /// <summary> |
43 | /// This module loads and saves OpenSimulator archives | 43 | /// This module loads and saves OpenSimulator archives |
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/AssetsArchiver.cs b/OpenSim/Region/CoreModules/World/Archiver/AssetsArchiver.cs index 36a60f3..76d27ce 100644 --- a/OpenSim/Region/Environment/Modules/World/Archiver/AssetsArchiver.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/AssetsArchiver.cs | |||
@@ -33,7 +33,7 @@ using OpenMetaverse; | |||
33 | using log4net; | 33 | using log4net; |
34 | using OpenSim.Framework; | 34 | using OpenSim.Framework; |
35 | 35 | ||
36 | namespace OpenSim.Region.Environment.Modules.World.Archiver | 36 | namespace OpenSim.Region.CoreModules.World.Archiver |
37 | { | 37 | { |
38 | /// <summary> | 38 | /// <summary> |
39 | /// Archives assets | 39 | /// Archives assets |
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/AssetsDearchiver.cs b/OpenSim/Region/CoreModules/World/Archiver/AssetsDearchiver.cs index 95ff468..f9909d9 100644 --- a/OpenSim/Region/Environment/Modules/World/Archiver/AssetsDearchiver.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/AssetsDearchiver.cs | |||
@@ -35,7 +35,7 @@ using log4net; | |||
35 | using OpenSim.Framework; | 35 | using OpenSim.Framework; |
36 | using OpenSim.Framework.Communications.Cache; | 36 | using OpenSim.Framework.Communications.Cache; |
37 | 37 | ||
38 | namespace OpenSim.Region.Environment.Modules.World.Archiver | 38 | namespace OpenSim.Region.CoreModules.World.Archiver |
39 | { | 39 | { |
40 | /// <summary> | 40 | /// <summary> |
41 | /// Dearchives assets | 41 | /// Dearchives assets |
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/AssetsRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs index b7fd170..8971b6e 100644 --- a/OpenSim/Region/Environment/Modules/World/Archiver/AssetsRequest.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs | |||
@@ -36,7 +36,7 @@ using OpenSim.Framework.Communications.Cache; | |||
36 | using OpenSim.Region.Framework.Interfaces; | 36 | using OpenSim.Region.Framework.Interfaces; |
37 | using OpenSim.Region.Framework.Scenes; | 37 | using OpenSim.Region.Framework.Scenes; |
38 | 38 | ||
39 | namespace OpenSim.Region.Environment.Modules.World.Archiver | 39 | namespace OpenSim.Region.CoreModules.World.Archiver |
40 | { | 40 | { |
41 | /// <summary> | 41 | /// <summary> |
42 | /// Encapsulate the asynchronous requests for the assets required for an archive operation | 42 | /// Encapsulate the asynchronous requests for the assets required for an archive operation |
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/RegionSettingsSerializer.cs b/OpenSim/Region/CoreModules/World/Archiver/RegionSettingsSerializer.cs index e12d0ec..2580316 100644 --- a/OpenSim/Region/Environment/Modules/World/Archiver/RegionSettingsSerializer.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/RegionSettingsSerializer.cs | |||
@@ -32,7 +32,7 @@ using System.Xml; | |||
32 | using OpenMetaverse; | 32 | using OpenMetaverse; |
33 | using OpenSim.Framework; | 33 | using OpenSim.Framework; |
34 | 34 | ||
35 | namespace OpenSim.Region.Environment.Modules.World.Archiver | 35 | namespace OpenSim.Region.CoreModules.World.Archiver |
36 | { | 36 | { |
37 | /// <summary> | 37 | /// <summary> |
38 | /// Serialize and deserialize region settings for an archive file format. | 38 | /// Serialize and deserialize region settings for an archive file format. |
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/TarArchiveReader.cs b/OpenSim/Region/CoreModules/World/Archiver/TarArchiveReader.cs index 3862546..506d770 100644 --- a/OpenSim/Region/Environment/Modules/World/Archiver/TarArchiveReader.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/TarArchiveReader.cs | |||
@@ -31,7 +31,7 @@ using System.Reflection; | |||
31 | using System.Text; | 31 | using System.Text; |
32 | using log4net; | 32 | using log4net; |
33 | 33 | ||
34 | namespace OpenSim.Region.Environment.Modules.World.Archiver | 34 | namespace OpenSim.Region.CoreModules.World.Archiver |
35 | { | 35 | { |
36 | /// <summary> | 36 | /// <summary> |
37 | /// Temporary code to do the bare minimum required to read a tar archive for our purposes | 37 | /// Temporary code to do the bare minimum required to read a tar archive for our purposes |
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/TarArchiveWriter.cs b/OpenSim/Region/CoreModules/World/Archiver/TarArchiveWriter.cs index 8fd247c..437939e 100644 --- a/OpenSim/Region/Environment/Modules/World/Archiver/TarArchiveWriter.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/TarArchiveWriter.cs | |||
@@ -32,7 +32,7 @@ using System.Text; | |||
32 | using System.Reflection; | 32 | using System.Reflection; |
33 | using log4net; | 33 | using log4net; |
34 | 34 | ||
35 | namespace OpenSim.Region.Environment.Modules.World.Archiver | 35 | namespace OpenSim.Region.CoreModules.World.Archiver |
36 | { | 36 | { |
37 | /// <summary> | 37 | /// <summary> |
38 | /// Temporary code to produce a tar archive in tar v7 format | 38 | /// Temporary code to produce a tar archive in tar v7 format |
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/Tests/ArchiverTests.cs b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs index e265252..a14e0f6 100644 --- a/OpenSim/Region/Environment/Modules/World/Archiver/Tests/ArchiverTests.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs | |||
@@ -33,13 +33,13 @@ using NUnit.Framework.SyntaxHelpers; | |||
33 | using OpenMetaverse; | 33 | using OpenMetaverse; |
34 | using OpenSim.Framework; | 34 | using OpenSim.Framework; |
35 | using OpenSim.Region.Framework.Interfaces; | 35 | using OpenSim.Region.Framework.Interfaces; |
36 | using OpenSim.Region.Environment.Modules.World.Archiver; | 36 | using OpenSim.Region.CoreModules.World.Archiver; |
37 | using OpenSim.Region.Environment.Modules.World.Serialiser; | 37 | using OpenSim.Region.CoreModules.World.Serialiser; |
38 | using OpenSim.Region.Environment.Modules.World.Terrain; | 38 | using OpenSim.Region.CoreModules.World.Terrain; |
39 | using OpenSim.Region.Framework.Scenes; | 39 | using OpenSim.Region.Framework.Scenes; |
40 | using OpenSim.Tests.Common.Setup; | 40 | using OpenSim.Tests.Common.Setup; |
41 | 41 | ||
42 | namespace OpenSim.Region.Environment.Modules.World.Archiver.Tests | 42 | namespace OpenSim.Region.CoreModules.World.Archiver.Tests |
43 | { | 43 | { |
44 | [TestFixture] | 44 | [TestFixture] |
45 | public class ArchiverTests | 45 | public class ArchiverTests |