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/Environment/Modules/Avatar | |
parent | Stopgap measure: To use gridlaunch, or GUI, start opensim with (diff) | |
download | opensim-SC-180be7de07014aa33bc6066f12a0819b731c1c9d.zip opensim-SC-180be7de07014aa33bc6066f12a0819b731c1c9d.tar.gz opensim-SC-180be7de07014aa33bc6066f12a0819b731c1c9d.tar.bz2 opensim-SC-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/Avatar/AvatarFactory/AvatarFactoryModule.cs (renamed from OpenSim/Region/Environment/Modules/Avatar/AvatarFactory/AvatarFactoryModule.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs (renamed from OpenSim/Region/Environment/Modules/Avatar/Chat/ChatModule.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs (renamed from OpenSim/Region/Environment/Modules/Avatar/Combat/CombatModule.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs (renamed from OpenSim/Region/Environment/Modules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs (renamed from OpenSim/Region/Environment/Modules/Avatar/Dialog/DialogModule.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs (renamed from OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Gestures/GesturesModule.cs (renamed from OpenSim/Region/Environment/Modules/Avatar/Gestures/GesturesModule.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Groups/GroupsModule.cs (renamed from OpenSim/Region/Environment/Modules/Avatar/Groups/GroupsModule.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs (renamed from OpenSim/Region/Environment/Modules/Avatar/InstantMessage/InstantMessageModule.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs (renamed from OpenSim/Region/Environment/Modules/Avatar/InstantMessage/MessageTransferModule.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/InstantMessage/PresenceModule.cs (renamed from OpenSim/Region/Environment/Modules/Avatar/InstantMessage/PresenceModule.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs (renamed from OpenSim/Region/Environment/Modules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs) | 6 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs (renamed from OpenSim/Region/Environment/Modules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs) | 4 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs (renamed from OpenSim/Region/Environment/Modules/Avatar/Inventory/Transfer/InventoryTransferModule.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs (renamed from OpenSim/Region/Environment/Modules/Avatar/Lure/LureModule.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/ObjectCaps/ObjectAdd.cs (renamed from OpenSim/Region/Environment/Modules/Avatar/ObjectCaps/ObjectAdd.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Profiles/AvatarProfilesModule.cs (renamed from OpenSim/Region/Environment/Modules/Avatar/Profiles/AvatarProfilesModule.cs) | 2 | ||||
-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 |
25 files changed, 28 insertions, 28 deletions
diff --git a/OpenSim/Region/Environment/Modules/Avatar/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs index 1ac0807..d084dbd 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/AvatarFactory/AvatarFactoryModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs | |||
@@ -38,7 +38,7 @@ using OpenSim.Framework.Communications.Cache; | |||
38 | using OpenSim.Region.Framework.Interfaces; | 38 | using OpenSim.Region.Framework.Interfaces; |
39 | using OpenSim.Region.Framework.Scenes; | 39 | using OpenSim.Region.Framework.Scenes; |
40 | 40 | ||
41 | namespace OpenSim.Region.Environment.Modules.Avatar.AvatarFactory | 41 | namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory |
42 | { | 42 | { |
43 | public class AvatarFactoryModule : IAvatarFactory, IRegionModule | 43 | public class AvatarFactoryModule : IAvatarFactory, IRegionModule |
44 | { | 44 | { |
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Chat/ChatModule.cs b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs index f234b75..f036faf 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/Chat/ChatModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs | |||
@@ -39,7 +39,7 @@ using OpenSim.Framework; | |||
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 | 41 | ||
42 | namespace OpenSim.Region.Environment.Modules.Avatar.Chat | 42 | namespace OpenSim.Region.CoreModules.Avatar.Chat |
43 | { | 43 | { |
44 | public class ChatModule : IRegionModule | 44 | public class ChatModule : IRegionModule |
45 | { | 45 | { |
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Combat/CombatModule.cs b/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs index f032319..1ed608a 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/Combat/CombatModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs | |||
@@ -41,7 +41,7 @@ using OpenSim.Region.Framework.Interfaces; | |||
41 | using OpenSim.Region.Framework.Scenes; | 41 | using OpenSim.Region.Framework.Scenes; |
42 | using OpenSim.Framework.Communications.Cache; | 42 | using OpenSim.Framework.Communications.Cache; |
43 | 43 | ||
44 | namespace OpenSim.Region.Environment.Modules.Avatar.Combat.CombatModule | 44 | namespace OpenSim.Region.CoreModules.Avatar.Combat.CombatModule |
45 | { | 45 | { |
46 | public class CombatModule : IRegionModule | 46 | public class CombatModule : IRegionModule |
47 | { | 47 | { |
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs b/OpenSim/Region/CoreModules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs index 1ec5e9b..0a1de44 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs | |||
@@ -42,7 +42,7 @@ using OpenSim.Framework.Servers; | |||
42 | using OpenSim.Region.Framework.Interfaces; | 42 | using OpenSim.Region.Framework.Interfaces; |
43 | using OpenSim.Region.Framework.Scenes; | 43 | using OpenSim.Region.Framework.Scenes; |
44 | 44 | ||
45 | namespace OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney | 45 | namespace OpenSim.Region.CoreModules.Avatar.Currency.SampleMoney |
46 | { | 46 | { |
47 | /// <summary> | 47 | /// <summary> |
48 | /// Demo Economy/Money Module. This is not a production quality money/economy module! | 48 | /// Demo Economy/Money Module. This is not a production quality money/economy module! |
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Dialog/DialogModule.cs b/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs index d3ac2c0..7326373 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/Dialog/DialogModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs | |||
@@ -34,7 +34,7 @@ using OpenSim.Framework; | |||
34 | using OpenSim.Region.Framework.Interfaces; | 34 | using OpenSim.Region.Framework.Interfaces; |
35 | using OpenSim.Region.Framework.Scenes; | 35 | using OpenSim.Region.Framework.Scenes; |
36 | 36 | ||
37 | namespace OpenSim.Region.Environment.Modules.Avatar.Dialog | 37 | namespace OpenSim.Region.CoreModules.Avatar.Dialog |
38 | { | 38 | { |
39 | public class DialogModule : IRegionModule, IDialogModule | 39 | public class DialogModule : IRegionModule, IDialogModule |
40 | { | 40 | { |
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs index 0ed962e..fb4d08a 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs | |||
@@ -39,7 +39,7 @@ using OpenSim.Framework.Servers; | |||
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 | 41 | ||
42 | namespace OpenSim.Region.Environment.Modules.Avatar.Friends | 42 | namespace OpenSim.Region.CoreModules.Avatar.Friends |
43 | { | 43 | { |
44 | /* | 44 | /* |
45 | This module handles adding/removing friends, and the the presence | 45 | This module handles adding/removing friends, and the the presence |
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Gestures/GesturesModule.cs b/OpenSim/Region/CoreModules/Avatar/Gestures/GesturesModule.cs index 969c1d8..a3a642f 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/Gestures/GesturesModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Gestures/GesturesModule.cs | |||
@@ -35,7 +35,7 @@ using OpenSim.Region.Framework.Interfaces; | |||
35 | using OpenSim.Region.Framework.Scenes; | 35 | using OpenSim.Region.Framework.Scenes; |
36 | using System.Reflection; | 36 | using System.Reflection; |
37 | 37 | ||
38 | namespace OpenSim.Region.Environment.Modules.Avatar.Gestures | 38 | namespace OpenSim.Region.CoreModules.Avatar.Gestures |
39 | { | 39 | { |
40 | public class GesturesModule : IRegionModule | 40 | public class GesturesModule : IRegionModule |
41 | { | 41 | { |
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Groups/GroupsModule.cs b/OpenSim/Region/CoreModules/Avatar/Groups/GroupsModule.cs index e654912..92d0fdd 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/Groups/GroupsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Groups/GroupsModule.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.Groups | 38 | namespace OpenSim.Region.CoreModules.Avatar.Groups |
39 | { | 39 | { |
40 | public class GroupsModule : IRegionModule | 40 | public class GroupsModule : IRegionModule |
41 | { | 41 | { |
diff --git a/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/InstantMessageModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs index 3a1b282..3ad2c91 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/InstantMessageModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs | |||
@@ -39,7 +39,7 @@ using OpenSim.Framework.Client; | |||
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 | 41 | ||
42 | namespace OpenSim.Region.Environment.Modules.Avatar.InstantMessage | 42 | namespace OpenSim.Region.CoreModules.Avatar.InstantMessage |
43 | { | 43 | { |
44 | public class InstantMessageModule : IRegionModule | 44 | public class InstantMessageModule : IRegionModule |
45 | { | 45 | { |
diff --git a/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/MessageTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs index 347c305..91c22eb 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/MessageTransferModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs | |||
@@ -39,7 +39,7 @@ using OpenSim.Framework.Client; | |||
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 | 41 | ||
42 | namespace OpenSim.Region.Environment.Modules.Avatar.InstantMessage | 42 | namespace OpenSim.Region.CoreModules.Avatar.InstantMessage |
43 | { | 43 | { |
44 | public class MessageTransferModule : IRegionModule, IMessageTransferModule | 44 | public class MessageTransferModule : IRegionModule, IMessageTransferModule |
45 | { | 45 | { |
diff --git a/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/PresenceModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/PresenceModule.cs index c84d3d5..49fd70a 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/PresenceModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/PresenceModule.cs | |||
@@ -39,7 +39,7 @@ using OpenSim.Framework.Client; | |||
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 | 41 | ||
42 | namespace OpenSim.Region.Environment.Modules.Avatar.InstantMessage | 42 | namespace OpenSim.Region.CoreModules.Avatar.InstantMessage |
43 | { | 43 | { |
44 | public class PresenceModule : IRegionModule, IPresenceModule | 44 | public class PresenceModule : IRegionModule, IPresenceModule |
45 | { | 45 | { |
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs index 3a58202..49006a2 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs | |||
@@ -33,15 +33,15 @@ using System.Reflection; | |||
33 | using System.Xml; | 33 | using System.Xml; |
34 | using OpenMetaverse; | 34 | using OpenMetaverse; |
35 | using OpenSim.Region.Framework.Scenes; | 35 | using OpenSim.Region.Framework.Scenes; |
36 | using OpenSim.Region.Environment.Modules.World.Archiver; | 36 | using OpenSim.Region.CoreModules.World.Archiver; |
37 | using OpenSim.Region.CoreModules.World.Serialiser; | ||
37 | using OpenSim.Framework; | 38 | using OpenSim.Framework; |
38 | using OpenSim.Framework.Communications; | 39 | using OpenSim.Framework.Communications; |
39 | using OpenSim.Framework.Communications.Cache; | 40 | using OpenSim.Framework.Communications.Cache; |
40 | using log4net; | 41 | using log4net; |
41 | using OpenSim.Region.Environment.Modules.World.Serialiser; | ||
42 | 42 | ||
43 | 43 | ||
44 | namespace OpenSim.Region.Environment.Modules.Avatar.Inventory.Archiver | 44 | namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver |
45 | { | 45 | { |
46 | public class InventoryArchiveReadRequest | 46 | public class InventoryArchiveReadRequest |
47 | { | 47 | { |
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs index e23f2a8..f548296 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs | |||
@@ -33,14 +33,14 @@ using System.Reflection; | |||
33 | using System.Xml; | 33 | using System.Xml; |
34 | using OpenMetaverse; | 34 | using OpenMetaverse; |
35 | using OpenSim.Region.Framework.Scenes; | 35 | using OpenSim.Region.Framework.Scenes; |
36 | using OpenSim.Region.Environment.Modules.World.Archiver; | 36 | using OpenSim.Region.CoreModules.World.Archiver; |
37 | using OpenSim.Framework; | 37 | using OpenSim.Framework; |
38 | using OpenSim.Framework.Communications; | 38 | using OpenSim.Framework.Communications; |
39 | using OpenSim.Framework.Communications.Cache; | 39 | using OpenSim.Framework.Communications.Cache; |
40 | using log4net; | 40 | using log4net; |
41 | 41 | ||
42 | 42 | ||
43 | namespace OpenSim.Region.Environment.Modules.Avatar.Inventory.Archiver | 43 | namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver |
44 | { | 44 | { |
45 | public class InventoryArchiveWriteRequest | 45 | public class InventoryArchiveWriteRequest |
46 | { | 46 | { |
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Inventory/Transfer/InventoryTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs index 62fb3a2..d2cf6c9 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/Inventory/Transfer/InventoryTransferModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs | |||
@@ -37,7 +37,7 @@ using OpenSim.Region.Framework.Interfaces; | |||
37 | using OpenSim.Region.Framework.Scenes; | 37 | using OpenSim.Region.Framework.Scenes; |
38 | using OpenSim.Framework.Communications.Cache; | 38 | using OpenSim.Framework.Communications.Cache; |
39 | 39 | ||
40 | namespace OpenSim.Region.Environment.Modules.Avatar.Inventory.Transfer | 40 | namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer |
41 | { | 41 | { |
42 | public class InventoryTransferModule : IInventoryTransferModule, IRegionModule | 42 | public class InventoryTransferModule : IInventoryTransferModule, IRegionModule |
43 | { | 43 | { |
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Lure/LureModule.cs b/OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs index 79d5409..ebf4f0a 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/Lure/LureModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs | |||
@@ -40,7 +40,7 @@ using OpenSim.Framework.Client; | |||
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.Lure | 43 | namespace OpenSim.Region.CoreModules.Avatar.Lure |
44 | { | 44 | { |
45 | public class LureModule : IRegionModule | 45 | public class LureModule : IRegionModule |
46 | { | 46 | { |
diff --git a/OpenSim/Region/Environment/Modules/Avatar/ObjectCaps/ObjectAdd.cs b/OpenSim/Region/CoreModules/Avatar/ObjectCaps/ObjectAdd.cs index c853582..193307d 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/ObjectCaps/ObjectAdd.cs +++ b/OpenSim/Region/CoreModules/Avatar/ObjectCaps/ObjectAdd.cs | |||
@@ -38,7 +38,7 @@ using OpenSim.Region.Framework.Interfaces; | |||
38 | using OpenSim.Region.Framework.Scenes; | 38 | using OpenSim.Region.Framework.Scenes; |
39 | using Caps = OpenSim.Framework.Communications.Capabilities.Caps; | 39 | using Caps = OpenSim.Framework.Communications.Capabilities.Caps; |
40 | 40 | ||
41 | namespace OpenSim.Region.Environment.Modules.Avatar.ObjectCaps | 41 | namespace OpenSim.Region.CoreModules.Avatar.ObjectCaps |
42 | { | 42 | { |
43 | public class ObjectAdd : IRegionModule | 43 | public class ObjectAdd : IRegionModule |
44 | { | 44 | { |
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Profiles/AvatarProfilesModule.cs b/OpenSim/Region/CoreModules/Avatar/Profiles/AvatarProfilesModule.cs index a7e9849..6ea5b56 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/Profiles/AvatarProfilesModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Profiles/AvatarProfilesModule.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.Profiles | 38 | namespace OpenSim.Region.CoreModules.Avatar.Profiles |
39 | { | 39 | { |
40 | public class AvatarProfilesModule : IRegionModule | 40 | public class AvatarProfilesModule : IRegionModule |
41 | { | 41 | { |
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 | { |