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/OptionalModules | |
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/OptionalModules/Avatar/Chat/ChannelState.cs (renamed from OpenSim/Region/Environment/Modules/Avatar/Chat/ChannelState.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/OptionalModules/Avatar/Chat/IRCBridgeModule.cs (renamed from OpenSim/Region/Environment/Modules/Avatar/Chat/IRCBridgeModule.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/OptionalModules/Avatar/Chat/IRCConnector.cs (renamed from OpenSim/Region/Environment/Modules/Avatar/Chat/IRCConnector.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/OptionalModules/Avatar/Chat/RegionState.cs (renamed from OpenSim/Region/Environment/Modules/Avatar/Chat/RegionState.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeModule.cs (renamed from OpenSim/Region/Environment/Modules/Avatar/Concierge/ConciergeModule.cs) | 4 | ||||
-rwxr-xr-x | OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeServer.py (renamed from OpenSim/Region/Environment/Modules/Avatar/Concierge/ConciergeServer.py) | 0 | ||||
-rw-r--r-- | OpenSim/Region/OptionalModules/Avatar/Voice/AsterixVoice/AsteriskVoiceModule.cs (renamed from OpenSim/Region/Environment/Modules/Avatar/Voice/AsterixVoice/AsteriskVoiceModule.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/OptionalModules/Avatar/Voice/SIPVoice/SIPVoiceModule.cs (renamed from OpenSim/Region/Environment/Modules/Avatar/Voice/SIPVoice/SIPVoiceModule.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/OptionalModules/ContentManagementSystem/AuraMetaEntity.cs (renamed from OpenSim/Region/Environment/Modules/ContentManagementSystem/AuraMetaEntity.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/OptionalModules/ContentManagementSystem/BeamMetaEntity.cs (renamed from OpenSim/Region/Environment/Modules/ContentManagementSystem/BeamMetaEntity.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/OptionalModules/ContentManagementSystem/CMController.cs (renamed from OpenSim/Region/Environment/Modules/ContentManagementSystem/CMController.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/OptionalModules/ContentManagementSystem/CMEntityCollection.cs (renamed from OpenSim/Region/Environment/Modules/ContentManagementSystem/CMEntityCollection.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/OptionalModules/ContentManagementSystem/CMModel.cs (renamed from OpenSim/Region/Environment/Modules/ContentManagementSystem/CMModel.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/OptionalModules/ContentManagementSystem/CMView.cs (renamed from OpenSim/Region/Environment/Modules/ContentManagementSystem/CMView.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/OptionalModules/ContentManagementSystem/ContentManagementEntity.cs (renamed from OpenSim/Region/Environment/Modules/ContentManagementSystem/ContentManagementEntity.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/OptionalModules/ContentManagementSystem/ContentManagementModule.cs (renamed from OpenSim/Region/Environment/Modules/ContentManagementSystem/ContentManagementModule.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/OptionalModules/ContentManagementSystem/FileSystemDatabase.cs (renamed from OpenSim/Region/Environment/Modules/ContentManagementSystem/FileSystemDatabase.cs) | 6 | ||||
-rw-r--r-- | OpenSim/Region/OptionalModules/ContentManagementSystem/GitDatabase.cs (renamed from OpenSim/Region/Environment/Modules/ContentManagementSystem/GitDatabase.cs) | 6 | ||||
-rw-r--r-- | OpenSim/Region/OptionalModules/ContentManagementSystem/IContentDatabase.cs (renamed from OpenSim/Region/Environment/Modules/ContentManagementSystem/IContentDatabase.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/OptionalModules/ContentManagementSystem/MetaEntity.cs (renamed from OpenSim/Region/Environment/Modules/ContentManagementSystem/MetaEntity.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/OptionalModules/ContentManagementSystem/PointMetaEntity.cs (renamed from OpenSim/Region/Environment/Modules/ContentManagementSystem/PointMetaEntity.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/OptionalModules/ContentManagementSystem/README (renamed from OpenSim/Region/Environment/Modules/ContentManagementSystem/README) | 0 | ||||
-rw-r--r-- | OpenSim/Region/OptionalModules/ContentManagementSystem/SceneObjectGroupDiff.cs (renamed from OpenSim/Region/Environment/Modules/ContentManagementSystem/SceneObjectGroupDiff.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/OptionalModules/Grid/Interregion/IInterregionModule.cs (renamed from OpenSim/Region/Environment/Modules/Grid/Interregion/IInterregionModule.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/OptionalModules/Grid/Interregion/InterregionModule.cs (renamed from OpenSim/Region/Environment/Modules/Grid/Interregion/InterregionModule.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/OptionalModules/Grid/Interregion/RemotingObject.cs (renamed from OpenSim/Region/Environment/Modules/Grid/Interregion/RemotingObject.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/OptionalModules/Python/PythonAPI/Console.cs (renamed from OpenSim/Region/Modules/Python/PythonAPI/Console.cs) | 0 | ||||
-rw-r--r-- | OpenSim/Region/OptionalModules/Python/PythonModule.cs (renamed from OpenSim/Region/Modules/Python/PythonModule.cs) | 0 | ||||
-rw-r--r-- | OpenSim/Region/OptionalModules/README | 9 | ||||
-rw-r--r-- | OpenSim/Region/OptionalModules/SvnSerialiser/Properties/AssemblyInfo.cs (renamed from OpenSim/Region/Modules/SvnSerialiser/Properties/AssemblyInfo.cs) | 0 | ||||
-rw-r--r-- | OpenSim/Region/OptionalModules/SvnSerialiser/SvnBackupModule.cs (renamed from OpenSim/Region/Modules/SvnSerialiser/SvnBackupModule.cs) | 6 | ||||
-rw-r--r-- | OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs (renamed from OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs (renamed from OpenSim/Region/Environment/Modules/World/NPC/NPCModule.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/OptionalModules/World/TreePopulator/TreePopulatorModule.cs (renamed from OpenSim/Region/Environment/Modules/World/TreePopulator/TreePopulatorModule.cs) | 2 |
34 files changed, 44 insertions, 35 deletions
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Chat/ChannelState.cs b/OpenSim/Region/OptionalModules/Avatar/Chat/ChannelState.cs index dfa1caa..167f0cc 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/Chat/ChannelState.cs +++ b/OpenSim/Region/OptionalModules/Avatar/Chat/ChannelState.cs | |||
@@ -35,7 +35,7 @@ using OpenSim.Framework; | |||
35 | using OpenSim.Region.Framework.Interfaces; | 35 | using OpenSim.Region.Framework.Interfaces; |
36 | using OpenSim.Region.Framework.Scenes; | 36 | using OpenSim.Region.Framework.Scenes; |
37 | 37 | ||
38 | namespace OpenSim.Region.Environment.Modules.Avatar.Chat | 38 | namespace OpenSim.Region.OptionalModules.Avatar.Chat |
39 | { | 39 | { |
40 | 40 | ||
41 | // An instance of this class exists for each unique combination of | 41 | // An instance of this class exists for each unique combination of |
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Chat/IRCBridgeModule.cs b/OpenSim/Region/OptionalModules/Avatar/Chat/IRCBridgeModule.cs index ccd81c7..0facc14 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/Chat/IRCBridgeModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/Chat/IRCBridgeModule.cs | |||
@@ -36,7 +36,7 @@ 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 | 38 | ||
39 | namespace OpenSim.Region.Environment.Modules.Avatar.Chat | 39 | namespace OpenSim.Region.OptionalModules.Avatar.Chat |
40 | { | 40 | { |
41 | public class IRCBridgeModule : IRegionModule | 41 | public class IRCBridgeModule : IRegionModule |
42 | { | 42 | { |
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Chat/IRCConnector.cs b/OpenSim/Region/OptionalModules/Avatar/Chat/IRCConnector.cs index c3cafb0..f5c324d 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/Chat/IRCConnector.cs +++ b/OpenSim/Region/OptionalModules/Avatar/Chat/IRCConnector.cs | |||
@@ -40,7 +40,7 @@ using OpenSim.Framework; | |||
40 | using OpenSim.Region.Framework.Interfaces; | 40 | using OpenSim.Region.Framework.Interfaces; |
41 | using OpenSim.Region.Framework.Scenes; | 41 | using OpenSim.Region.Framework.Scenes; |
42 | 42 | ||
43 | namespace OpenSim.Region.Environment.Modules.Avatar.Chat | 43 | namespace OpenSim.Region.OptionalModules.Avatar.Chat |
44 | { | 44 | { |
45 | public class IRCConnector | 45 | public class IRCConnector |
46 | { | 46 | { |
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Chat/RegionState.cs b/OpenSim/Region/OptionalModules/Avatar/Chat/RegionState.cs index 78f4265..6733120 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/Chat/RegionState.cs +++ b/OpenSim/Region/OptionalModules/Avatar/Chat/RegionState.cs | |||
@@ -35,7 +35,7 @@ using OpenSim.Framework; | |||
35 | using OpenSim.Region.Framework.Interfaces; | 35 | using OpenSim.Region.Framework.Interfaces; |
36 | using OpenSim.Region.Framework.Scenes; | 36 | using OpenSim.Region.Framework.Scenes; |
37 | 37 | ||
38 | namespace OpenSim.Region.Environment.Modules.Avatar.Chat | 38 | namespace OpenSim.Region.OptionalModules.Avatar.Chat |
39 | { | 39 | { |
40 | // An instance of this class exists for every active region | 40 | // An instance of this class exists for every active region |
41 | 41 | ||
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Concierge/ConciergeModule.cs b/OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeModule.cs index 5ac5dbe..bb46b11 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/Concierge/ConciergeModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeModule.cs | |||
@@ -43,9 +43,9 @@ using OpenSim.Framework; | |||
43 | using OpenSim.Framework.Servers; | 43 | using OpenSim.Framework.Servers; |
44 | using OpenSim.Region.Framework.Interfaces; | 44 | using OpenSim.Region.Framework.Interfaces; |
45 | using OpenSim.Region.Framework.Scenes; | 45 | using OpenSim.Region.Framework.Scenes; |
46 | using OpenSim.Region.Environment.Modules.Avatar.Chat; | 46 | using OpenSim.Region.CoreModules.Avatar.Chat; |
47 | 47 | ||
48 | namespace OpenSim.Region.Environment.Modules.Avatar.Concierge | 48 | namespace OpenSim.Region.OptionalModules.Avatar.Concierge |
49 | { | 49 | { |
50 | public class ConciergeModule : ChatModule, IRegionModule | 50 | public class ConciergeModule : ChatModule, IRegionModule |
51 | { | 51 | { |
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Concierge/ConciergeServer.py b/OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeServer.py index 1c088fb..1c088fb 100755 --- a/OpenSim/Region/Environment/Modules/Avatar/Concierge/ConciergeServer.py +++ b/OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeServer.py | |||
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Voice/AsterixVoice/AsteriskVoiceModule.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/AsterixVoice/AsteriskVoiceModule.cs index 33d7135..c827214 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/Voice/AsterixVoice/AsteriskVoiceModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/Voice/AsterixVoice/AsteriskVoiceModule.cs | |||
@@ -40,7 +40,7 @@ using OpenSim.Region.Framework.Interfaces; | |||
40 | using OpenSim.Region.Framework.Scenes; | 40 | using OpenSim.Region.Framework.Scenes; |
41 | using Caps=OpenSim.Framework.Communications.Capabilities.Caps; | 41 | using Caps=OpenSim.Framework.Communications.Capabilities.Caps; |
42 | 42 | ||
43 | namespace OpenSim.Region.Environment.Modules.Avatar.Voice.AsterixVoice | 43 | namespace OpenSim.Region.OptionalModules.Avatar.Voice.AsterixVoice |
44 | { | 44 | { |
45 | public class AsteriskVoiceModule : IRegionModule | 45 | public class AsteriskVoiceModule : IRegionModule |
46 | { | 46 | { |
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Voice/SIPVoice/SIPVoiceModule.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/SIPVoice/SIPVoiceModule.cs index e4d9b7c..3e8a433 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/Voice/SIPVoice/SIPVoiceModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/Voice/SIPVoice/SIPVoiceModule.cs | |||
@@ -39,7 +39,7 @@ using OpenSim.Region.Framework.Interfaces; | |||
39 | using OpenSim.Region.Framework.Scenes; | 39 | using OpenSim.Region.Framework.Scenes; |
40 | using Caps=OpenSim.Framework.Communications.Capabilities.Caps; | 40 | using Caps=OpenSim.Framework.Communications.Capabilities.Caps; |
41 | 41 | ||
42 | namespace OpenSim.Region.Environment.Modules.Avatar.Voice.SIPVoice | 42 | namespace OpenSim.Region.OptionalModules.Avatar.Voice.SIPVoice |
43 | { | 43 | { |
44 | public class SIPVoiceModule : IRegionModule | 44 | public class SIPVoiceModule : IRegionModule |
45 | { | 45 | { |
diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/AuraMetaEntity.cs b/OpenSim/Region/OptionalModules/ContentManagementSystem/AuraMetaEntity.cs index 9695fb8..d4acc34 100644 --- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/AuraMetaEntity.cs +++ b/OpenSim/Region/OptionalModules/ContentManagementSystem/AuraMetaEntity.cs | |||
@@ -50,7 +50,7 @@ using OpenSim.Region.Physics.Manager; | |||
50 | 50 | ||
51 | using log4net; | 51 | using log4net; |
52 | 52 | ||
53 | namespace OpenSim.Region.Environment.Modules.ContentManagement | 53 | namespace OpenSim.Region.OptionalModules.ContentManagement |
54 | { | 54 | { |
55 | public class AuraMetaEntity : PointMetaEntity | 55 | public class AuraMetaEntity : PointMetaEntity |
56 | { | 56 | { |
diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/BeamMetaEntity.cs b/OpenSim/Region/OptionalModules/ContentManagementSystem/BeamMetaEntity.cs index 3b1a45e..c0a0603 100644 --- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/BeamMetaEntity.cs +++ b/OpenSim/Region/OptionalModules/ContentManagementSystem/BeamMetaEntity.cs | |||
@@ -50,7 +50,7 @@ using OpenSim.Region.Physics.Manager; | |||
50 | 50 | ||
51 | using log4net; | 51 | using log4net; |
52 | 52 | ||
53 | namespace OpenSim.Region.Environment.Modules.ContentManagement | 53 | namespace OpenSim.Region.OptionalModules.ContentManagement |
54 | { | 54 | { |
55 | public class BeamMetaEntity : PointMetaEntity | 55 | public class BeamMetaEntity : PointMetaEntity |
56 | { | 56 | { |
diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMController.cs b/OpenSim/Region/OptionalModules/ContentManagementSystem/CMController.cs index 5a86d48..80989a7 100644 --- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMController.cs +++ b/OpenSim/Region/OptionalModules/ContentManagementSystem/CMController.cs | |||
@@ -49,7 +49,7 @@ using OpenSim.Region.Physics.Manager; | |||
49 | 49 | ||
50 | using log4net; | 50 | using log4net; |
51 | 51 | ||
52 | namespace OpenSim.Region.Environment.Modules.ContentManagement | 52 | namespace OpenSim.Region.OptionalModules.ContentManagement |
53 | { | 53 | { |
54 | /// <summary> | 54 | /// <summary> |
55 | /// The controller in a Model-View-Controller framework. This controller catches actions by the avatars, creates work packets, loops through these work packets in a separate thread, | 55 | /// The controller in a Model-View-Controller framework. This controller catches actions by the avatars, creates work packets, loops through these work packets in a separate thread, |
diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMEntityCollection.cs b/OpenSim/Region/OptionalModules/ContentManagementSystem/CMEntityCollection.cs index cfd5cde..d5cf596 100644 --- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMEntityCollection.cs +++ b/OpenSim/Region/OptionalModules/ContentManagementSystem/CMEntityCollection.cs | |||
@@ -52,7 +52,7 @@ using OpenSim.Region.Physics.Manager; | |||
52 | 52 | ||
53 | using log4net; | 53 | using log4net; |
54 | 54 | ||
55 | namespace OpenSim.Region.Environment.Modules.ContentManagement | 55 | namespace OpenSim.Region.OptionalModules.ContentManagement |
56 | { | 56 | { |
57 | public class CMEntityCollection | 57 | public class CMEntityCollection |
58 | { | 58 | { |
diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMModel.cs b/OpenSim/Region/OptionalModules/ContentManagementSystem/CMModel.cs index 6399608..761dca9 100644 --- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMModel.cs +++ b/OpenSim/Region/OptionalModules/ContentManagementSystem/CMModel.cs | |||
@@ -49,7 +49,7 @@ using OpenSim.Region.Physics.Manager; | |||
49 | 49 | ||
50 | using log4net; | 50 | using log4net; |
51 | 51 | ||
52 | namespace OpenSim.Region.Environment.Modules.ContentManagement | 52 | namespace OpenSim.Region.OptionalModules.ContentManagement |
53 | { | 53 | { |
54 | public class CMModel | 54 | public class CMModel |
55 | { | 55 | { |
diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMView.cs b/OpenSim/Region/OptionalModules/ContentManagementSystem/CMView.cs index e5c9bb3..a1a4d94 100644 --- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMView.cs +++ b/OpenSim/Region/OptionalModules/ContentManagementSystem/CMView.cs | |||
@@ -49,7 +49,7 @@ using OpenSim.Region.Physics.Manager; | |||
49 | 49 | ||
50 | using log4net; | 50 | using log4net; |
51 | 51 | ||
52 | namespace OpenSim.Region.Environment.Modules.ContentManagement | 52 | namespace OpenSim.Region.OptionalModules.ContentManagement |
53 | { | 53 | { |
54 | public class CMView | 54 | public class CMView |
55 | { | 55 | { |
diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/ContentManagementEntity.cs b/OpenSim/Region/OptionalModules/ContentManagementSystem/ContentManagementEntity.cs index 2ea5ebc..4d65038 100644 --- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/ContentManagementEntity.cs +++ b/OpenSim/Region/OptionalModules/ContentManagementSystem/ContentManagementEntity.cs | |||
@@ -49,7 +49,7 @@ using OpenSim.Region.Physics.Manager; | |||
49 | 49 | ||
50 | using log4net; | 50 | using log4net; |
51 | 51 | ||
52 | namespace OpenSim.Region.Environment.Modules.ContentManagement | 52 | namespace OpenSim.Region.OptionalModules.ContentManagement |
53 | { | 53 | { |
54 | public class ContentManagementEntity : MetaEntity | 54 | public class ContentManagementEntity : MetaEntity |
55 | { | 55 | { |
diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/ContentManagementModule.cs b/OpenSim/Region/OptionalModules/ContentManagementSystem/ContentManagementModule.cs index 417cbce..21bc8b2 100644 --- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/ContentManagementModule.cs +++ b/OpenSim/Region/OptionalModules/ContentManagementSystem/ContentManagementModule.cs | |||
@@ -48,7 +48,7 @@ using OpenSim.Region.Physics.Manager; | |||
48 | 48 | ||
49 | using log4net; | 49 | using log4net; |
50 | 50 | ||
51 | namespace OpenSim.Region.Environment.Modules.ContentManagement | 51 | namespace OpenSim.Region.OptionalModules.ContentManagement |
52 | { | 52 | { |
53 | public class ContentManagementModule : IRegionModule | 53 | public class ContentManagementModule : IRegionModule |
54 | { | 54 | { |
diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/FileSystemDatabase.cs b/OpenSim/Region/OptionalModules/ContentManagementSystem/FileSystemDatabase.cs index 65db153..6a50906 100644 --- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/FileSystemDatabase.cs +++ b/OpenSim/Region/OptionalModules/ContentManagementSystem/FileSystemDatabase.cs | |||
@@ -47,13 +47,13 @@ using Nini.Config; | |||
47 | using OpenSim.Framework; | 47 | using OpenSim.Framework; |
48 | using OpenSim.Region.Framework.Interfaces; | 48 | using OpenSim.Region.Framework.Interfaces; |
49 | using OpenSim.Region.Framework.Scenes; | 49 | using OpenSim.Region.Framework.Scenes; |
50 | using OpenSim.Region.Environment.Modules.World.Serialiser; | 50 | using OpenSim.Region.CoreModules.World.Serialiser; |
51 | using OpenSim.Region.Environment.Modules.World.Terrain; | 51 | using OpenSim.Region.CoreModules.World.Terrain; |
52 | using OpenSim.Region.Physics.Manager; | 52 | using OpenSim.Region.Physics.Manager; |
53 | 53 | ||
54 | using log4net; | 54 | using log4net; |
55 | 55 | ||
56 | namespace OpenSim.Region.Environment.Modules.ContentManagement | 56 | namespace OpenSim.Region.OptionalModules.ContentManagement |
57 | { | 57 | { |
58 | public class FileSystemDatabase : IContentDatabase | 58 | public class FileSystemDatabase : IContentDatabase |
59 | { | 59 | { |
diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/GitDatabase.cs b/OpenSim/Region/OptionalModules/ContentManagementSystem/GitDatabase.cs index 4209dab..d24747c 100644 --- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/GitDatabase.cs +++ b/OpenSim/Region/OptionalModules/ContentManagementSystem/GitDatabase.cs | |||
@@ -48,13 +48,13 @@ using Nini.Config; | |||
48 | using OpenSim.Framework; | 48 | using OpenSim.Framework; |
49 | using OpenSim.Region.Framework.Interfaces; | 49 | using OpenSim.Region.Framework.Interfaces; |
50 | using OpenSim.Region.Framework.Scenes; | 50 | using OpenSim.Region.Framework.Scenes; |
51 | using OpenSim.Region.Environment.Modules.World.Serialiser; | 51 | using OpenSim.Region.CoreModules.World.Serialiser; |
52 | using OpenSim.Region.Environment.Modules.World.Terrain; | 52 | using OpenSim.Region.CoreModules.World.Terrain; |
53 | using OpenSim.Region.Physics.Manager; | 53 | using OpenSim.Region.Physics.Manager; |
54 | 54 | ||
55 | using log4net; | 55 | using log4net; |
56 | 56 | ||
57 | namespace OpenSim.Region.Environment.Modules.ContentManagement | 57 | namespace OpenSim.Region.OptionalModules.ContentManagement |
58 | { | 58 | { |
59 | /// <summary> | 59 | /// <summary> |
60 | /// Just a stub :-( | 60 | /// Just a stub :-( |
diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/IContentDatabase.cs b/OpenSim/Region/OptionalModules/ContentManagementSystem/IContentDatabase.cs index 79dc86e..7a25fa5 100644 --- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/IContentDatabase.cs +++ b/OpenSim/Region/OptionalModules/ContentManagementSystem/IContentDatabase.cs | |||
@@ -40,7 +40,7 @@ using OpenMetaverse; | |||
40 | using OpenSim.Region.Framework.Scenes; | 40 | using OpenSim.Region.Framework.Scenes; |
41 | using Nini.Config; | 41 | using Nini.Config; |
42 | 42 | ||
43 | namespace OpenSim.Region.Environment.Modules.ContentManagement | 43 | namespace OpenSim.Region.OptionalModules.ContentManagement |
44 | { | 44 | { |
45 | public interface IContentDatabase | 45 | public interface IContentDatabase |
46 | { | 46 | { |
diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/MetaEntity.cs b/OpenSim/Region/OptionalModules/ContentManagementSystem/MetaEntity.cs index c8f8c2f..63c74e1 100644 --- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/MetaEntity.cs +++ b/OpenSim/Region/OptionalModules/ContentManagementSystem/MetaEntity.cs | |||
@@ -50,7 +50,7 @@ using OpenSim.Region.Physics.Manager; | |||
50 | 50 | ||
51 | using log4net; | 51 | using log4net; |
52 | 52 | ||
53 | namespace OpenSim.Region.Environment.Modules.ContentManagement | 53 | namespace OpenSim.Region.OptionalModules.ContentManagement |
54 | { | 54 | { |
55 | public class MetaEntity | 55 | public class MetaEntity |
56 | { | 56 | { |
diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/PointMetaEntity.cs b/OpenSim/Region/OptionalModules/ContentManagementSystem/PointMetaEntity.cs index d6ba92f..22f09fd 100644 --- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/PointMetaEntity.cs +++ b/OpenSim/Region/OptionalModules/ContentManagementSystem/PointMetaEntity.cs | |||
@@ -50,7 +50,7 @@ using OpenSim.Region.Physics.Manager; | |||
50 | 50 | ||
51 | using log4net; | 51 | using log4net; |
52 | 52 | ||
53 | namespace OpenSim.Region.Environment.Modules.ContentManagement | 53 | namespace OpenSim.Region.OptionalModules.ContentManagement |
54 | { | 54 | { |
55 | public class PointMetaEntity : MetaEntity | 55 | public class PointMetaEntity : MetaEntity |
56 | { | 56 | { |
diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/README b/OpenSim/Region/OptionalModules/ContentManagementSystem/README index 1a69fef..1a69fef 100644 --- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/README +++ b/OpenSim/Region/OptionalModules/ContentManagementSystem/README | |||
diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/SceneObjectGroupDiff.cs b/OpenSim/Region/OptionalModules/ContentManagementSystem/SceneObjectGroupDiff.cs index 225a682..8957e8f 100644 --- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/SceneObjectGroupDiff.cs +++ b/OpenSim/Region/OptionalModules/ContentManagementSystem/SceneObjectGroupDiff.cs | |||
@@ -48,7 +48,7 @@ using OpenSim.Region.Physics.Manager; | |||
48 | 48 | ||
49 | using log4net; | 49 | using log4net; |
50 | 50 | ||
51 | namespace OpenSim.Region.Environment.Modules.ContentManagement | 51 | namespace OpenSim.Region.OptionalModules.ContentManagement |
52 | { | 52 | { |
53 | #region Enumerations | 53 | #region Enumerations |
54 | 54 | ||
diff --git a/OpenSim/Region/Environment/Modules/Grid/Interregion/IInterregionModule.cs b/OpenSim/Region/OptionalModules/Grid/Interregion/IInterregionModule.cs index edf1231..a2c98a4 100644 --- a/OpenSim/Region/Environment/Modules/Grid/Interregion/IInterregionModule.cs +++ b/OpenSim/Region/OptionalModules/Grid/Interregion/IInterregionModule.cs | |||
@@ -28,7 +28,7 @@ | |||
28 | using OpenSim.Framework; | 28 | using OpenSim.Framework; |
29 | using OpenSim.Region.Framework.Scenes; | 29 | using OpenSim.Region.Framework.Scenes; |
30 | 30 | ||
31 | namespace OpenSim.Region.Environment.Modules.Grid.Interregion | 31 | namespace OpenSim.Region.CoreModules.Grid.Interregion |
32 | { | 32 | { |
33 | public interface IInterregionModule | 33 | public interface IInterregionModule |
34 | { | 34 | { |
diff --git a/OpenSim/Region/Environment/Modules/Grid/Interregion/InterregionModule.cs b/OpenSim/Region/OptionalModules/Grid/Interregion/InterregionModule.cs index cb571e4..21df83c 100644 --- a/OpenSim/Region/Environment/Modules/Grid/Interregion/InterregionModule.cs +++ b/OpenSim/Region/OptionalModules/Grid/Interregion/InterregionModule.cs | |||
@@ -35,7 +35,7 @@ using OpenSim.Framework; | |||
35 | using OpenSim.Region.Framework.Interfaces; | 35 | using OpenSim.Region.Framework.Interfaces; |
36 | using OpenSim.Region.Framework.Scenes; | 36 | using OpenSim.Region.Framework.Scenes; |
37 | 37 | ||
38 | namespace OpenSim.Region.Environment.Modules.Grid.Interregion | 38 | namespace OpenSim.Region.CoreModules.Grid.Interregion |
39 | { | 39 | { |
40 | public class InterregionModule : IInterregionModule, IRegionModule | 40 | public class InterregionModule : IInterregionModule, IRegionModule |
41 | { | 41 | { |
diff --git a/OpenSim/Region/Environment/Modules/Grid/Interregion/RemotingObject.cs b/OpenSim/Region/OptionalModules/Grid/Interregion/RemotingObject.cs index 47357d2..b09c848 100644 --- a/OpenSim/Region/Environment/Modules/Grid/Interregion/RemotingObject.cs +++ b/OpenSim/Region/OptionalModules/Grid/Interregion/RemotingObject.cs | |||
@@ -29,7 +29,7 @@ using System; | |||
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using OpenSim.Framework; | 30 | using OpenSim.Framework; |
31 | 31 | ||
32 | namespace OpenSim.Region.Environment.Modules.Grid.Interregion | 32 | namespace OpenSim.Region.CoreModules.Grid.Interregion |
33 | { | 33 | { |
34 | public class RemotingObject : MarshalByRefObject | 34 | public class RemotingObject : MarshalByRefObject |
35 | { | 35 | { |
diff --git a/OpenSim/Region/Modules/Python/PythonAPI/Console.cs b/OpenSim/Region/OptionalModules/Python/PythonAPI/Console.cs index 215a9ad..215a9ad 100644 --- a/OpenSim/Region/Modules/Python/PythonAPI/Console.cs +++ b/OpenSim/Region/OptionalModules/Python/PythonAPI/Console.cs | |||
diff --git a/OpenSim/Region/Modules/Python/PythonModule.cs b/OpenSim/Region/OptionalModules/Python/PythonModule.cs index 5dedac2..5dedac2 100644 --- a/OpenSim/Region/Modules/Python/PythonModule.cs +++ b/OpenSim/Region/OptionalModules/Python/PythonModule.cs | |||
diff --git a/OpenSim/Region/OptionalModules/README b/OpenSim/Region/OptionalModules/README new file mode 100644 index 0000000..0fe7b87 --- /dev/null +++ b/OpenSim/Region/OptionalModules/README | |||
@@ -0,0 +1,9 @@ | |||
1 | = OpenSim.Region.OptionalModules = | ||
2 | |||
3 | The modules in this part of the OpenSim source tree are candidates for forge. For the time being, until we have reached consensus on | ||
4 | |||
5 | (a) what should be core or optional | ||
6 | (b) that we have reached a stable API | ||
7 | (c) how to maintain optional modules | ||
8 | |||
9 | we will keep these modules in-tree. \ No newline at end of file | ||
diff --git a/OpenSim/Region/Modules/SvnSerialiser/Properties/AssemblyInfo.cs b/OpenSim/Region/OptionalModules/SvnSerialiser/Properties/AssemblyInfo.cs index 165fcea..165fcea 100644 --- a/OpenSim/Region/Modules/SvnSerialiser/Properties/AssemblyInfo.cs +++ b/OpenSim/Region/OptionalModules/SvnSerialiser/Properties/AssemblyInfo.cs | |||
diff --git a/OpenSim/Region/Modules/SvnSerialiser/SvnBackupModule.cs b/OpenSim/Region/OptionalModules/SvnSerialiser/SvnBackupModule.cs index 6e3b620..c4fc584 100644 --- a/OpenSim/Region/Modules/SvnSerialiser/SvnBackupModule.cs +++ b/OpenSim/Region/OptionalModules/SvnSerialiser/SvnBackupModule.cs | |||
@@ -33,12 +33,12 @@ using System.Timers; | |||
33 | using log4net; | 33 | using log4net; |
34 | using Nini.Config; | 34 | using Nini.Config; |
35 | using OpenSim.Region.Framework.Interfaces; | 35 | using OpenSim.Region.Framework.Interfaces; |
36 | using OpenSim.Region.Environment.Modules.World.Serialiser; | 36 | using OpenSim.Region.CoreModules.World.Serialiser; |
37 | using OpenSim.Region.Environment.Modules.World.Terrain; | 37 | using OpenSim.Region.CoreModules.World.Terrain; |
38 | using OpenSim.Region.Framework.Scenes; | 38 | using OpenSim.Region.Framework.Scenes; |
39 | using PumaCode.SvnDotNet.AprSharp; | 39 | using PumaCode.SvnDotNet.AprSharp; |
40 | using PumaCode.SvnDotNet.SubversionSharp; | 40 | using PumaCode.SvnDotNet.SubversionSharp; |
41 | using Slash=System.IO.Path; | 41 | using Slash = System.IO.Path; |
42 | 42 | ||
43 | namespace OpenSim.Region.Modules.SvnSerialiser | 43 | namespace OpenSim.Region.Modules.SvnSerialiser |
44 | { | 44 | { |
diff --git a/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs index 9165554..3ba8a97 100644 --- a/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs +++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs | |||
@@ -33,7 +33,7 @@ using OpenMetaverse.Packets; | |||
33 | using OpenSim.Framework; | 33 | using OpenSim.Framework; |
34 | using OpenSim.Region.Framework.Scenes; | 34 | using OpenSim.Region.Framework.Scenes; |
35 | 35 | ||
36 | namespace OpenSim.Region.Environment.Modules.World.NPC | 36 | namespace OpenSim.Region.OptionalModules.World.NPC |
37 | { | 37 | { |
38 | public class NPCAvatar : IClientAPI | 38 | public class NPCAvatar : IClientAPI |
39 | { | 39 | { |
diff --git a/OpenSim/Region/Environment/Modules/World/NPC/NPCModule.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs index 2e7b16c..9dace33 100644 --- a/OpenSim/Region/Environment/Modules/World/NPC/NPCModule.cs +++ b/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs | |||
@@ -30,7 +30,7 @@ using Nini.Config; | |||
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 | 32 | ||
33 | namespace OpenSim.Region.Environment.Modules.World.NPC | 33 | namespace OpenSim.Region.OptionalModules.World.NPC |
34 | { | 34 | { |
35 | public class NPCModule : IRegionModule | 35 | public class NPCModule : IRegionModule |
36 | { | 36 | { |
diff --git a/OpenSim/Region/Environment/Modules/World/TreePopulator/TreePopulatorModule.cs b/OpenSim/Region/OptionalModules/World/TreePopulator/TreePopulatorModule.cs index 8a49540..94ebcac 100644 --- a/OpenSim/Region/Environment/Modules/World/TreePopulator/TreePopulatorModule.cs +++ b/OpenSim/Region/OptionalModules/World/TreePopulator/TreePopulatorModule.cs | |||
@@ -36,7 +36,7 @@ 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 | 38 | ||
39 | namespace OpenSim.Region.Environment.Modules.World.TreePopulator | 39 | namespace OpenSim.Region.OptionalModules.World.TreePopulator |
40 | { | 40 | { |
41 | /// <summary> | 41 | /// <summary> |
42 | /// Version 2.0 - Very hacky compared to the original. Will fix original and release as 0.3 later. | 42 | /// Version 2.0 - Very hacky compared to the original. Will fix original and release as 0.3 later. |