This changeset is the step 1 of 2 in refactoring

OpenSim.Region.Environment into a "framework" part and a modules only part. This first changeset refactors OpenSim.Region.Environment.Scenes, OpenSim.Region.Environment.Interfaces, and OpenSim.Region.Interfaces into OpenSim.Region.Framework.{Interfaces,Scenes} leaving only region modules in OpenSim.Region.Environment. The next step will be to move region modules up from OpenSim.Region.Environment.Modules to OpenSim.Region.CoreModules and then sort out which modules are really core modules and which should move out to forge. I've been very careful to NOT BREAK anything. i hope i've succeeded. as this is the work of a whole week i hope i managed to keep track with the applied patches of the last week --- could any of you that did check in stuff have a look at whether it survived? thx!
author: Dr Scofield 2009-02-06 16:55:34 +0000
committer: Dr Scofield 2009-02-06 16:55:34 +0000
commit: 9b66108081a8c8cf79faaa6c541554091c40850e (patch)
tree: 095a232ae5a9de3a9244bcd34da08294f61eeea5 /OpenSim/Region/Environment/Modules
parent: * removed superfluous constants class (diff)
download: opensim-SC_OLD-9b66108081a8c8cf79faaa6c541554091c40850e.zip
opensim-SC_OLD-9b66108081a8c8cf79faaa6c541554091c40850e.tar.gz
opensim-SC_OLD-9b66108081a8c8cf79faaa6c541554091c40850e.tar.bz2
opensim-SC_OLD-9b66108081a8c8cf79faaa6c541554091c40850e.tar.xz
132 files changed, 502 insertions, 1052 deletions
diff --git a/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AgentAssetTransactionsManager.cs b/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AgentAssetTransactionsManager.cs
index f9f44f0..82325b7 100644
--- a/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AgentAssetTransactionsManager.cs
+++ b/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AgentAssetTransactionsManager.cs
@@ -30,8 +30,8 @@ using System.Collections.Generic;
 //using log4net;
 using OpenMetaverse;
 using OpenSim.Framework;
-using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Framework.Scenes;
-using OpenSim.Region.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
 namespace OpenSim.Region.Environment.Modules.Agent.AssetTransaction
 {
diff --git a/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AgentAssetsTransactions.cs b/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AgentAssetsTransactions.cs
index 7f4bb0b..adfbbad 100644
--- a/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AgentAssetsTransactions.cs
+++ b/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AgentAssetsTransactions.cs
@@ -29,7 +29,7 @@ using System;
 using System.Collections.Generic;
 using OpenMetaverse;
 using OpenSim.Framework;
-using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Framework.Scenes;
 using OpenSim.Framework.Communications.Cache;
 namespace OpenSim.Region.Environment.Modules.Agent.AssetTransaction
diff --git a/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AssetTransactionModule.cs b/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AssetTransactionModule.cs
index d98d07d..1eb6795 100644
--- a/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AssetTransactionModule.cs
+++ b/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AssetTransactionModule.cs
@@ -30,9 +30,8 @@ using System.Collections.Generic;
 using OpenMetaverse;
 using Nini.Config;
 using OpenSim.Framework;
-using OpenSim.Region.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Framework.Scenes;
-using OpenSim.Region.Environment.Scenes;
 namespace OpenSim.Region.Environment.Modules.Agent.AssetTransaction
 {
diff --git a/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AssetXferUploader.cs b/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AssetXferUploader.cs
index 5387165..e1e1065 100644
--- a/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AssetXferUploader.cs
+++ b/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AssetXferUploader.cs
@@ -33,7 +33,7 @@ using OpenMetaverse;
 using OpenMetaverse.Packets;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications.Cache;
-using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Framework.Scenes;
 namespace OpenSim.Region.Environment.Modules.Agent.AssetTransaction
 {
diff --git a/OpenSim/Region/Environment/Modules/Agent/Capabilities/CapabilitiesModule.cs b/OpenSim/Region/Environment/Modules/Agent/Capabilities/CapabilitiesModule.cs
index 76b60fd..861e9f4 100644
--- a/OpenSim/Region/Environment/Modules/Agent/Capabilities/CapabilitiesModule.cs
+++ b/OpenSim/Region/Environment/Modules/Agent/Capabilities/CapabilitiesModule.cs
@@ -34,8 +34,8 @@ using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications.Cache;
 using OpenSim.Framework.Communications.Capabilities;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Framework.Scenes;
 using Caps = OpenSim.Framework.Communications.Capabilities.Caps;
 namespace OpenSim.Region.Environment.Modules.Agent.Capabilities
@@ -100,7 +100,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.Capabilities
            caps.ItemUpdatedCall = m_scene.CapsUpdateInventoryItemAsset;
            caps.TaskScriptUpdatedCall = m_scene.CapsUpdateTaskInventoryScriptAsset;
            caps.CAPSFetchInventoryDescendents = m_scene.HandleFetchInventoryDescendentsCAPS;
-            caps.GetClient = m_scene.m_sceneGraph.GetControllingClient;
+            caps.GetClient = m_scene.SceneContents.GetControllingClient;
            
            m_capsHandlers[agentId] = caps;
        }
diff --git a/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureDownloadModule.cs b/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureDownloadModule.cs
index 6bb61e2..4790295 100644
--- a/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureDownloadModule.cs
+++ b/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureDownloadModule.cs
@@ -31,10 +31,10 @@ using System.Threading;
 using OpenMetaverse;
 using Nini.Config;
 using OpenSim.Framework;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Framework.Scenes;
 using OpenSim.Framework.Communications.Cache;
-using BlockingQueue = OpenSim.Framework.BlockingQueue<OpenSim.Region.Environment.Interfaces.ITextureSender>;
+using BlockingQueue = OpenSim.Framework.BlockingQueue<OpenSim.Region.Framework.Interfaces.ITextureSender>;
 namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload
 {
diff --git a/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureNotFoundSender.cs b/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureNotFoundSender.cs
index 34ddee6..51aa48e 100644
--- a/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureNotFoundSender.cs
+++ b/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureNotFoundSender.cs
@@ -30,7 +30,7 @@ using log4net;
 using OpenMetaverse;
 using OpenMetaverse.Packets;
 using OpenSim.Framework;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
 namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload
 {
diff --git a/OpenSim/Region/Environment/Modules/Agent/TextureDownload/UserTextureDownloadService.cs b/OpenSim/Region/Environment/Modules/Agent/TextureDownload/UserTextureDownloadService.cs
index e0790a2..38d96db 100644
--- a/OpenSim/Region/Environment/Modules/Agent/TextureDownload/UserTextureDownloadService.cs
+++ b/OpenSim/Region/Environment/Modules/Agent/TextureDownload/UserTextureDownloadService.cs
@@ -32,8 +32,8 @@ using log4net;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications.Limit;
 using OpenSim.Framework.Statistics;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Framework.Scenes;
 namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload
 {
diff --git a/OpenSim/Region/Environment/Modules/Agent/TextureSender/J2KDecoderModule.cs b/OpenSim/Region/Environment/Modules/Agent/TextureSender/J2KDecoderModule.cs
index cf76ebc..8524592 100644
--- a/OpenSim/Region/Environment/Modules/Agent/TextureSender/J2KDecoderModule.cs
+++ b/OpenSim/Region/Environment/Modules/Agent/TextureSender/J2KDecoderModule.cs
@@ -36,8 +36,8 @@ using Nini.Config;
 using OpenMetaverse;
 using OpenMetaverse.Imaging;
 using OpenSim.Framework;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Framework.Scenes;
 namespace OpenSim.Region.Environment.Modules.Agent.TextureSender
 {
diff --git a/OpenSim/Region/Environment/Modules/Agent/TextureSender/TextureSender.cs b/OpenSim/Region/Environment/Modules/Agent/TextureSender/TextureSender.cs
index f9a10bf..7d7efda 100644
--- a/OpenSim/Region/Environment/Modules/Agent/TextureSender/TextureSender.cs
+++ b/OpenSim/Region/Environment/Modules/Agent/TextureSender/TextureSender.cs
@@ -30,7 +30,7 @@ using System.Reflection;
 using OpenMetaverse.Packets;
 using log4net;
 using OpenSim.Framework;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
 namespace OpenSim.Region.Environment.Modules.Agent.TextureSender
 {
diff --git a/OpenSim/Region/Environment/Modules/Agent/Xfer/XferModule.cs b/OpenSim/Region/Environment/Modules/Agent/Xfer/XferModule.cs
index 5b6c2a6..1d18b4b 100644
--- a/OpenSim/Region/Environment/Modules/Agent/Xfer/XferModule.cs
+++ b/OpenSim/Region/Environment/Modules/Agent/Xfer/XferModule.cs
@@ -30,8 +30,8 @@ using System.Collections.Generic;
 using OpenMetaverse;
 using Nini.Config;
 using OpenSim.Framework;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Framework.Scenes;
 namespace OpenSim.Region.Environment.Modules.Agent.Xfer
 {
diff --git a/OpenSim/Region/Environment/Modules/Avatar/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/Environment/Modules/Avatar/AvatarFactory/AvatarFactoryModule.cs
index 013301a..1ac0807 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/AvatarFactory/AvatarFactoryModule.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/AvatarFactory/AvatarFactoryModule.cs
@@ -35,8 +35,8 @@ using log4net;
 using Nini.Config;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications.Cache;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Framework.Scenes;
 namespace OpenSim.Region.Environment.Modules.Avatar.AvatarFactory
 {
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Chat/ChannelState.cs b/OpenSim/Region/Environment/Modules/Avatar/Chat/ChannelState.cs
index 8f1ad00..dfa1caa 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Chat/ChannelState.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/Chat/ChannelState.cs
@@ -32,8 +32,8 @@ using System.Text.RegularExpressions;
 using log4net;
 using Nini.Config;
 using OpenSim.Framework;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Framework.Scenes;
 namespace OpenSim.Region.Environment.Modules.Avatar.Chat
 {
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Chat/ChatModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Chat/ChatModule.cs
index 1109166..f234b75 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Chat/ChatModule.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/Chat/ChatModule.cs
@@ -36,8 +36,8 @@ using OpenMetaverse;
 using log4net;
 using Nini.Config;
 using OpenSim.Framework;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Framework.Scenes;
 namespace OpenSim.Region.Environment.Modules.Avatar.Chat
 {
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Chat/IRCBridgeModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Chat/IRCBridgeModule.cs
index 2fafe9b..ccd81c7 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Chat/IRCBridgeModule.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/Chat/IRCBridgeModule.cs
@@ -33,8 +33,8 @@ using log4net;
 using Nini.Config;
 using Nwc.XmlRpc;
 using OpenSim.Framework;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Framework.Scenes;
 namespace OpenSim.Region.Environment.Modules.Avatar.Chat
 {
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Chat/IRCConnector.cs b/OpenSim/Region/Environment/Modules/Avatar/Chat/IRCConnector.cs
index e1c0ac4..c3cafb0 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Chat/IRCConnector.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/Chat/IRCConnector.cs
@@ -37,8 +37,8 @@ using OpenMetaverse;
 using log4net;
 using Nini.Config;
 using OpenSim.Framework;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Framework.Scenes;
 namespace OpenSim.Region.Environment.Modules.Avatar.Chat
 {
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Chat/RegionState.cs b/OpenSim/Region/Environment/Modules/Avatar/Chat/RegionState.cs
index b5cc3be..78f4265 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Chat/RegionState.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/Chat/RegionState.cs
@@ -32,8 +32,8 @@ using System.Text.RegularExpressions;
 using log4net;
 using Nini.Config;
 using OpenSim.Framework;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Framework.Scenes;
 namespace OpenSim.Region.Environment.Modules.Avatar.Chat
 {
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Combat/CombatModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Combat/CombatModule.cs
index 6a09f2b..f032319 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Combat/CombatModule.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/Combat/CombatModule.cs
@@ -37,9 +37,8 @@ using log4net;
 using Nini.Config;
 using Nwc.XmlRpc;
 using OpenSim.Framework;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Interfaces;
+using OpenSim.Region.Framework.Scenes;
-using OpenSim.Region.Environment.Scenes;
 using OpenSim.Framework.Communications.Cache;
 namespace OpenSim.Region.Environment.Modules.Avatar.Combat.CombatModule
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Concierge/ConciergeModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Concierge/ConciergeModule.cs
index 7cfe2f9..5ac5dbe 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Concierge/ConciergeModule.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/Concierge/ConciergeModule.cs
@@ -41,8 +41,8 @@ using Nwc.XmlRpc;
 using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Framework.Servers;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Framework.Scenes;
 using OpenSim.Region.Environment.Modules.Avatar.Chat;
 namespace OpenSim.Region.Environment.Modules.Avatar.Concierge
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs
index 07e62e2..1ec5e9b 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs
@@ -39,9 +39,8 @@ using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications.Cache;
 using OpenSim.Framework.Servers;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Interfaces;
+using OpenSim.Region.Framework.Scenes;
-using OpenSim.Region.Environment.Scenes;
 namespace OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney
 {
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Dialog/DialogModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Dialog/DialogModule.cs
index 4f8da9a..d3ac2c0 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Dialog/DialogModule.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/Dialog/DialogModule.cs
@@ -31,8 +31,8 @@ using log4net;
 using Nini.Config;
 using OpenMetaverse;
 using OpenSim.Framework;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Framework.Scenes;
 namespace OpenSim.Region.Environment.Modules.Avatar.Dialog
 {
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs
index d54cf27..0ed962e 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs
@@ -36,9 +36,8 @@ using Nwc.XmlRpc;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications.Cache;
 using OpenSim.Framework.Servers;
-using OpenSim.Region.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Framework.Scenes;
-using OpenSim.Region.Environment.Scenes;
 namespace OpenSim.Region.Environment.Modules.Avatar.Friends
 {
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Gestures/GesturesModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Gestures/GesturesModule.cs
index 5ff6202..969c1d8 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Gestures/GesturesModule.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/Gestures/GesturesModule.cs
@@ -31,8 +31,8 @@ using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications;
 using OpenSim.Framework.Communications.Cache;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Framework.Scenes;
 using System.Reflection;
 namespace OpenSim.Region.Environment.Modules.Avatar.Gestures
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Groups/GroupsModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Groups/GroupsModule.cs
index dbb645e..e654912 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Groups/GroupsModule.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/Groups/GroupsModule.cs
@@ -32,8 +32,8 @@ using OpenMetaverse;
 using log4net;
 using Nini.Config;
 using OpenSim.Framework;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Framework.Scenes;
 namespace OpenSim.Region.Environment.Modules.Avatar.Groups
 {
diff --git a/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/InstantMessageModule.cs b/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/InstantMessageModule.cs
index 747469b..3a1b282 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/InstantMessageModule.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/InstantMessageModule.cs
@@ -36,9 +36,8 @@ using Nini.Config;
 using Nwc.XmlRpc;
 using OpenSim.Framework;
 using OpenSim.Framework.Client;
-using OpenSim.Region.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Framework.Scenes;
-using OpenSim.Region.Environment.Scenes;
 namespace OpenSim.Region.Environment.Modules.Avatar.InstantMessage
 {
diff --git a/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/MessageTransferModule.cs b/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/MessageTransferModule.cs
index dec4ca0..347c305 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/MessageTransferModule.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/MessageTransferModule.cs
@@ -36,9 +36,8 @@ using Nini.Config;
 using Nwc.XmlRpc;
 using OpenSim.Framework;
 using OpenSim.Framework.Client;
-using OpenSim.Region.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Framework.Scenes;
-using OpenSim.Region.Environment.Scenes;
 namespace OpenSim.Region.Environment.Modules.Avatar.InstantMessage
 {
diff --git a/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/PresenceModule.cs b/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/PresenceModule.cs
index a7816b0..c84d3d5 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/PresenceModule.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/PresenceModule.cs
@@ -36,9 +36,8 @@ using Nini.Config;
 using Nwc.XmlRpc;
 using OpenSim.Framework;
 using OpenSim.Framework.Client;
-using OpenSim.Region.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Framework.Scenes;
-using OpenSim.Region.Environment.Scenes;
 namespace OpenSim.Region.Environment.Modules.Avatar.InstantMessage
 {
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs b/OpenSim/Region/Environment/Modules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
index dcfcba3..3a58202 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
@@ -32,7 +32,7 @@ using System.IO.Compression;
 using System.Reflection;
 using System.Xml;
 using OpenMetaverse;
-using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Framework.Scenes;
 using OpenSim.Region.Environment.Modules.World.Archiver;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications;
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs b/OpenSim/Region/Environment/Modules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs
index 017ebcc..e23f2a8 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs
@@ -32,7 +32,7 @@ using System.IO.Compression;
 using System.Reflection;
 using System.Xml;
 using OpenMetaverse;
-using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Framework.Scenes;
 using OpenSim.Region.Environment.Modules.World.Archiver;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications;
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Inventory/Transfer/InventoryTransferModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
index 20ea030..62fb3a2 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
@@ -33,9 +33,8 @@ using OpenMetaverse;
 using log4net;
 using Nini.Config;
 using OpenSim.Framework;
-using OpenSim.Region.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Framework.Scenes;
-using OpenSim.Region.Environment.Scenes;
 using OpenSim.Framework.Communications.Cache;
 namespace OpenSim.Region.Environment.Modules.Avatar.Inventory.Transfer
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Lure/LureModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Lure/LureModule.cs
index 7bb6843..79d5409 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Lure/LureModule.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/Lure/LureModule.cs
@@ -37,9 +37,8 @@ using Nini.Config;
 using Nwc.XmlRpc;
 using OpenSim.Framework;
 using OpenSim.Framework.Client;
-using OpenSim.Region.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Framework.Scenes;
-using OpenSim.Region.Environment.Scenes;
 namespace OpenSim.Region.Environment.Modules.Avatar.Lure
 {
diff --git a/OpenSim/Region/Environment/Modules/Avatar/ObjectCaps/ObjectAdd.cs b/OpenSim/Region/Environment/Modules/Avatar/ObjectCaps/ObjectAdd.cs
index 56b6d75..c853582 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/ObjectCaps/ObjectAdd.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/ObjectCaps/ObjectAdd.cs
@@ -34,8 +34,8 @@ using OpenMetaverse;
 using OpenMetaverse.StructuredData;
 using OpenSim.Framework;
 using OpenSim.Framework.Servers;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Framework.Scenes;
 using Caps = OpenSim.Framework.Communications.Capabilities.Caps;
 namespace OpenSim.Region.Environment.Modules.Avatar.ObjectCaps
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Profiles/AvatarProfilesModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Profiles/AvatarProfilesModule.cs
index a9415ce..a7e9849 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Profiles/AvatarProfilesModule.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/Profiles/AvatarProfilesModule.cs
@@ -32,8 +32,8 @@ using OpenMetaverse;
 using log4net;
 using Nini.Config;
 using OpenSim.Framework;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Framework.Scenes;
 namespace OpenSim.Region.Environment.Modules.Avatar.Profiles
 {
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Voice/AsterixVoice/AsteriskVoiceModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Voice/AsterixVoice/AsteriskVoiceModule.cs
index e3a9a45..33d7135 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Voice/AsterixVoice/AsteriskVoiceModule.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/Voice/AsterixVoice/AsteriskVoiceModule.cs
@@ -36,8 +36,8 @@ using OpenSim.Framework;
 using OpenSim.Framework.Communications.Cache;
 using OpenSim.Framework.Communications.Capabilities;
 using OpenSim.Framework.Servers;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Framework.Scenes;
 using Caps=OpenSim.Framework.Communications.Capabilities.Caps;
 namespace OpenSim.Region.Environment.Modules.Avatar.Voice.AsterixVoice
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Voice/SIPVoice/SIPVoiceModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Voice/SIPVoice/SIPVoiceModule.cs
index bd89175..e4d9b7c 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Voice/SIPVoice/SIPVoiceModule.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/Voice/SIPVoice/SIPVoiceModule.cs
@@ -35,8 +35,8 @@ using OpenSim.Framework;
 using OpenSim.Framework.Communications.Cache;
 using OpenSim.Framework.Communications.Capabilities;
 using OpenSim.Framework.Servers;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Framework.Scenes;
 using Caps=OpenSim.Framework.Communications.Capabilities.Caps;
 namespace OpenSim.Region.Environment.Modules.Avatar.Voice.SIPVoice
diff --git a/OpenSim/Region/Environment/Modules/Communications/Local/LocalInterregionComms.cs b/OpenSim/Region/Environment/Modules/Communications/Local/LocalInterregionComms.cs
index 62f6df0..cb60d3f 100644
--- a/OpenSim/Region/Environment/Modules/Communications/Local/LocalInterregionComms.cs
+++ b/OpenSim/Region/Environment/Modules/Communications/Local/LocalInterregionComms.cs
@@ -38,9 +38,8 @@ using Nini.Config;
 using Nwc.XmlRpc;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications.Cache;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Interfaces;
+using OpenSim.Region.Framework.Scenes;
-using OpenSim.Region.Environment.Scenes;
 namespace OpenSim.Region.Environment.Modules.Communications.Local
 {
diff --git a/OpenSim/Region/Environment/Modules/Communications/REST/RESTInterregionComms.cs b/OpenSim/Region/Environment/Modules/Communications/REST/RESTInterregionComms.cs
index b4302fd..cfcd618 100644
--- a/OpenSim/Region/Environment/Modules/Communications/REST/RESTInterregionComms.cs
+++ b/OpenSim/Region/Environment/Modules/Communications/REST/RESTInterregionComms.cs
@@ -42,10 +42,9 @@ using OpenSim.Framework;
 using OpenSim.Framework.Communications;
 using OpenSim.Framework.Communications.Cache;
 using OpenSim.Framework.Servers;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Interfaces;
+using OpenSim.Region.Framework.Scenes;
-using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Framework.Scenes.Hypergrid;
-using OpenSim.Region.Environment.Scenes.Hypergrid;
 using OpenSim.Region.Environment.Modules.Communications.Local;
 namespace OpenSim.Region.Environment.Modules.Communications.REST
diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/AuraMetaEntity.cs b/OpenSim/Region/Environment/Modules/ContentManagementSystem/AuraMetaEntity.cs
index 64b48fe..9695fb8 100644
--- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/AuraMetaEntity.cs
+++ b/OpenSim/Region/Environment/Modules/ContentManagementSystem/AuraMetaEntity.cs
@@ -44,8 +44,8 @@ using OpenMetaverse;
 using Nini.Config;
 using OpenSim.Framework;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Framework.Scenes;
 using OpenSim.Region.Physics.Manager;
 using log4net;
diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/BeamMetaEntity.cs b/OpenSim/Region/Environment/Modules/ContentManagementSystem/BeamMetaEntity.cs
index d0015f7..3b1a45e 100644
--- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/BeamMetaEntity.cs
+++ b/OpenSim/Region/Environment/Modules/ContentManagementSystem/BeamMetaEntity.cs
@@ -44,8 +44,8 @@ using OpenMetaverse;
 using Nini.Config;
 using OpenSim.Framework;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Framework.Scenes;
 using OpenSim.Region.Physics.Manager;
 using log4net;
diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMController.cs b/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMController.cs
index dfca655..5a86d48 100644
--- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMController.cs
+++ b/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMController.cs
@@ -43,8 +43,8 @@ using OpenMetaverse;
 using OpenSim;
 using OpenSim.Framework;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Framework.Scenes;
 using OpenSim.Region.Physics.Manager;
 using log4net;
diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMEntityCollection.cs b/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMEntityCollection.cs
index c1f8a8a..cfd5cde 100644
--- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMEntityCollection.cs
+++ b/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMEntityCollection.cs
@@ -46,8 +46,8 @@ using Nini.Config;
 using OpenSim;
 using OpenSim.Framework;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Framework.Scenes;
 using OpenSim.Region.Physics.Manager;
 using log4net;
diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMModel.cs b/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMModel.cs
index 02e77bb..6399608 100644
--- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMModel.cs
+++ b/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMModel.cs
@@ -43,8 +43,8 @@ using OpenMetaverse;
 using OpenSim;
 using OpenSim.Framework;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Framework.Scenes;
 using OpenSim.Region.Physics.Manager;
 using log4net;
diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMView.cs b/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMView.cs
index 88f4a67..e5c9bb3 100644
--- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMView.cs
+++ b/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMView.cs
@@ -43,8 +43,8 @@ using OpenMetaverse;
 using OpenSim;
 using OpenSim.Framework;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Framework.Scenes;
 using OpenSim.Region.Physics.Manager;
 using log4net;
diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/ContentManagementEntity.cs b/OpenSim/Region/Environment/Modules/ContentManagementSystem/ContentManagementEntity.cs
index d0b5929..2ea5ebc 100644
--- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/ContentManagementEntity.cs
+++ b/OpenSim/Region/Environment/Modules/ContentManagementSystem/ContentManagementEntity.cs
@@ -43,8 +43,8 @@ using OpenMetaverse;
 using Nini.Config;
 using OpenSim.Framework;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Framework.Scenes;
 using OpenSim.Region.Physics.Manager;
 using log4net;
diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/ContentManagementModule.cs b/OpenSim/Region/Environment/Modules/ContentManagementSystem/ContentManagementModule.cs
index f52c3b8..417cbce 100644
--- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/ContentManagementModule.cs
+++ b/OpenSim/Region/Environment/Modules/ContentManagementSystem/ContentManagementModule.cs
@@ -42,8 +42,8 @@ using Nini.Config;
 using OpenSim;
 using OpenSim.Framework;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Framework.Scenes;
 using OpenSim.Region.Physics.Manager;
 using log4net;
diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/FileSystemDatabase.cs b/OpenSim/Region/Environment/Modules/ContentManagementSystem/FileSystemDatabase.cs
index 3a8e374..65db153 100644
--- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/FileSystemDatabase.cs
+++ b/OpenSim/Region/Environment/Modules/ContentManagementSystem/FileSystemDatabase.cs
@@ -45,10 +45,10 @@ using OpenMetaverse;
 using Nini.Config;
 using OpenSim.Framework;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Scenes;
 using OpenSim.Region.Environment.Modules.World.Serialiser;
 using OpenSim.Region.Environment.Modules.World.Terrain;
-using OpenSim.Region.Environment.Scenes;
 using OpenSim.Region.Physics.Manager;
 using log4net;
diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/GitDatabase.cs b/OpenSim/Region/Environment/Modules/ContentManagementSystem/GitDatabase.cs
index 9fd542c..4209dab 100644
--- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/GitDatabase.cs
+++ b/OpenSim/Region/Environment/Modules/ContentManagementSystem/GitDatabase.cs
@@ -46,10 +46,10 @@ using OpenMetaverse;
 using Nini.Config;
 using OpenSim.Framework;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Scenes;
 using OpenSim.Region.Environment.Modules.World.Serialiser;
 using OpenSim.Region.Environment.Modules.World.Terrain;
-using OpenSim.Region.Environment.Scenes;
 using OpenSim.Region.Physics.Manager;
 using log4net;
diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/IContentDatabase.cs b/OpenSim/Region/Environment/Modules/ContentManagementSystem/IContentDatabase.cs
index 638172b..79dc86e 100644
--- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/IContentDatabase.cs
+++ b/OpenSim/Region/Environment/Modules/ContentManagementSystem/IContentDatabase.cs
@@ -37,7 +37,7 @@
 using System;
 using OpenMetaverse;
-using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Framework.Scenes;
 using Nini.Config;
 namespace OpenSim.Region.Environment.Modules.ContentManagement
diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/MetaEntity.cs b/OpenSim/Region/Environment/Modules/ContentManagementSystem/MetaEntity.cs
index d654a1a..c8f8c2f 100644
--- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/MetaEntity.cs
+++ b/OpenSim/Region/Environment/Modules/ContentManagementSystem/MetaEntity.cs
@@ -44,8 +44,8 @@ using OpenMetaverse;
 using Nini.Config;
 using OpenSim.Framework;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Framework.Scenes;
 using OpenSim.Region.Physics.Manager;
 using log4net;
diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/PointMetaEntity.cs b/OpenSim/Region/Environment/Modules/ContentManagementSystem/PointMetaEntity.cs
index 5db9545..d6ba92f 100644
--- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/PointMetaEntity.cs
+++ b/OpenSim/Region/Environment/Modules/ContentManagementSystem/PointMetaEntity.cs
@@ -44,8 +44,8 @@ using OpenMetaverse;
 using Nini.Config;
 using OpenSim.Framework;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Framework.Scenes;
 using OpenSim.Region.Physics.Manager;
 using log4net;
diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/SceneObjectGroupDiff.cs b/OpenSim/Region/Environment/Modules/ContentManagementSystem/SceneObjectGroupDiff.cs
index 79e970d..225a682 100644
--- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/SceneObjectGroupDiff.cs
+++ b/OpenSim/Region/Environment/Modules/ContentManagementSystem/SceneObjectGroupDiff.cs
@@ -42,8 +42,8 @@ using OpenMetaverse;
 using Nini.Config;
 using OpenSim.Framework;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Framework.Scenes;
 using OpenSim.Region.Physics.Manager;
 using log4net;
diff --git a/OpenSim/Region/Environment/Modules/Framework/EventQueue/EventQueueGetModule.cs b/OpenSim/Region/Environment/Modules/Framework/EventQueue/EventQueueGetModule.cs
index bc4c5b9..fb30321 100644
--- a/OpenSim/Region/Environment/Modules/Framework/EventQueue/EventQueueGetModule.cs
+++ b/OpenSim/Region/Environment/Modules/Framework/EventQueue/EventQueueGetModule.cs
@@ -34,6 +34,7 @@ using System.Reflection;
 using System.Threading;
 using System.Xml;
 using OpenMetaverse;
+using OpenMetaverse.Packets;
 using OpenMetaverse.StructuredData;
 using log4net;
 using Nini.Config;
@@ -42,9 +43,8 @@ using OpenSim.Framework;
 using OpenSim.Framework.Communications.Cache;
 using OpenSim.Framework.Communications.Capabilities;
 using OpenSim.Framework.Servers;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Interfaces;
+using OpenSim.Region.Framework.Scenes;
-using OpenSim.Region.Environment.Scenes;
 using OSD = OpenMetaverse.StructuredData.OSD;
 using OSDMap = OpenMetaverse.StructuredData.OSDMap;
@@ -555,5 +555,76 @@ namespace OpenSim.Region.Environment.Modules.Framework.EventQueue
            
            return new OSDString("shutdown404!");
        }
+        public void DisableSimulator(ulong handle, UUID avatarID)
+        {
+            OSD item = EventQueueHelper.DisableSimulator(handle);
+            Enqueue(item, avatarID);
+        }
+        public void EnableSimulator(ulong handle, IPEndPoint endPoint, UUID avatarID)
+        {
+            OSD item = EventQueueHelper.EnableSimulator(handle, endPoint);
+            Enqueue(item, avatarID);
+        }
+        public void EstablishAgentCommunication(UUID avatarID, IPEndPoint endPoint, string capsPath) 
+        {
+            OSD item = EventQueueHelper.EstablishAgentCommunication(avatarID, endPoint.ToString(), capsPath);
+            Enqueue(item, avatarID);
+        }
+        public void TeleportFinishEvent(ulong regionHandle, byte simAccess, 
+                                        IPEndPoint regionExternalEndPoint,
+                                        uint locationID, uint flags, string capsURL, 
+                                        UUID avatarID)
+        {
+            OSD item = EventQueueHelper.TeleportFinishEvent(regionHandle, simAccess, regionExternalEndPoint,
+                                                            locationID, flags, capsURL, avatarID);
+            Enqueue(item, avatarID);
+        }
+        public void CrossRegion(ulong handle, Vector3 pos, Vector3 lookAt,
+                                IPEndPoint newRegionExternalEndPoint,
+                                string capsURL, UUID avatarID, UUID sessionID)
+        {
+            OSD item = EventQueueHelper.CrossRegion(handle, pos, lookAt, newRegionExternalEndPoint,
+                                                    capsURL, avatarID, sessionID);
+            Enqueue(item, avatarID);
+        }
+        public void ChatterboxInvitation(UUID sessionID, string sessionName,
+                                         UUID fromAgent, string message, UUID toAgent, string fromName, byte dialog,
+                                         uint timeStamp, bool offline, int parentEstateID, Vector3 position,
+                                         uint ttl, UUID transactionID, bool fromGroup, byte[] binaryBucket)
+        {
+            OSD item = EventQueueHelper.ChatterboxInvitation(sessionID, sessionName, fromAgent, message, toAgent, fromName, dialog, 
+                                                             timeStamp, offline, parentEstateID, position, ttl, transactionID, 
+                                                             fromGroup, binaryBucket);
+            Enqueue(item, toAgent);
+            m_log.InfoFormat("########### eq ChatterboxInvitation #############\n{0}", item);
+        }
+        public void ChatterBoxSessionAgentListUpdates(UUID sessionID, UUID fromAgent, UUID toAgent, bool canVoiceChat, 
+                                                      bool isModerator, bool textMute)
+        {
+            OSD item = EventQueueHelper.ChatterBoxSessionAgentListUpdates(sessionID, fromAgent, canVoiceChat,
+                                                                          isModerator, textMute);
+            Enqueue(item, toAgent);
+            m_log.InfoFormat("########### eq ChatterBoxSessionAgentListUpdates #############\n{0}", item);
+        }
+        public void ParcelProperties(ParcelPropertiesPacket parcelPropertiesPacket, UUID avatarID)
+        {
+            OSD item = Environment.EventQueueHelper.ParcelProperties(parcelPropertiesPacket);
+            Enqueue(item, avatarID);
+        }
+        public void GroupMembership(AgentGroupDataUpdatePacket groupUpdate, UUID avatarID)
+        {
+            OSD item = EventQueueHelper.GroupMembership(groupUpdate);
+            Enqueue(item, avatarID);
+        }
    }
 }
diff --git a/OpenSim/Region/Environment/Modules/Framework/EventQueue/EventQueueHelper.cs b/OpenSim/Region/Environment/Modules/Framework/EventQueue/EventQueueHelper.cs
index 546d9d1..b38ddba 100644
--- a/OpenSim/Region/Environment/Modules/Framework/EventQueue/EventQueueHelper.cs
+++ b/OpenSim/Region/Environment/Modules/Framework/EventQueue/EventQueueHelper.cs
@@ -71,11 +71,11 @@ namespace OpenSim.Region.Environment
            return llsdEvent;
        }
-        public static OSD EnableSimulator(ulong Handle, IPEndPoint endPoint)
+        public static OSD EnableSimulator(ulong handle, IPEndPoint endPoint)
        {
            OSDMap llsdSimInfo = new OSDMap(3);
-            llsdSimInfo.Add("Handle", new OSDBinary(ulongToByteArray(Handle)));
+            llsdSimInfo.Add("Handle", new OSDBinary(ulongToByteArray(handle)));
            llsdSimInfo.Add("IP", new OSDBinary(endPoint.Address.GetAddressBytes()));
            llsdSimInfo.Add("Port", new OSDInteger(endPoint.Port));
@@ -88,11 +88,11 @@ namespace OpenSim.Region.Environment
            return buildEvent("EnableSimulator", llsdBody);
        }
-        public static OSD DisableSimulator(ulong Handle)
+        public static OSD DisableSimulator(ulong handle)
        {
            //OSDMap llsdSimInfo = new OSDMap(1);
-            //llsdSimInfo.Add("Handle", new OSDBinary(regionHandleToByteArray(Handle)));
+            //llsdSimInfo.Add("Handle", new OSDBinary(regionHandleToByteArray(handle)));
            //OSDArray arr = new OSDArray(1);
            //arr.Add(llsdSimInfo);
@@ -103,57 +103,57 @@ namespace OpenSim.Region.Environment
            return buildEvent("DisableSimulator", llsdBody);
        }
        
-        public static OSD CrossRegion(ulong Handle, Vector3 pos, Vector3 lookAt,
+        public static OSD CrossRegion(ulong handle, Vector3 pos, Vector3 lookAt,
-                                       IPEndPoint newRegionExternalEndPoint,
+                                      IPEndPoint newRegionExternalEndPoint,
-                                       string capsURL, UUID AgentID, UUID SessionID)
+                                      string capsURL, UUID agentID, UUID sessionID)
        {
-            OSDArray LookAtArr = new OSDArray(3);
+            OSDArray lookAtArr = new OSDArray(3);
-            LookAtArr.Add(OSD.FromReal(lookAt.X));
+            lookAtArr.Add(OSD.FromReal(lookAt.X));
-            LookAtArr.Add(OSD.FromReal(lookAt.Y));
+            lookAtArr.Add(OSD.FromReal(lookAt.Y));
-            LookAtArr.Add(OSD.FromReal(lookAt.Z));
+            lookAtArr.Add(OSD.FromReal(lookAt.Z));
-            OSDArray PositionArr = new OSDArray(3);
+            OSDArray positionArr = new OSDArray(3);
-            PositionArr.Add(OSD.FromReal(pos.X));
+            positionArr.Add(OSD.FromReal(pos.X));
-            PositionArr.Add(OSD.FromReal(pos.Y));
+            positionArr.Add(OSD.FromReal(pos.Y));
-            PositionArr.Add(OSD.FromReal(pos.Z));
+            positionArr.Add(OSD.FromReal(pos.Z));
-            OSDMap InfoMap = new OSDMap(2);
+            OSDMap infoMap = new OSDMap(2);
-            InfoMap.Add("LookAt", LookAtArr);
+            infoMap.Add("LookAt", lookAtArr);
-            InfoMap.Add("Position", PositionArr);
+            infoMap.Add("Position", positionArr);
-            OSDArray InfoArr = new OSDArray(1);
+            OSDArray infoArr = new OSDArray(1);
-            InfoArr.Add(InfoMap);
+            infoArr.Add(infoMap);
-            OSDMap AgentDataMap = new OSDMap(2);
+            OSDMap agentDataMap = new OSDMap(2);
-            AgentDataMap.Add("AgentID", OSD.FromUUID(AgentID));
+            agentDataMap.Add("AgentID", OSD.FromUUID(agentID));
-            AgentDataMap.Add("SessionID",  OSD.FromUUID(SessionID));
+            agentDataMap.Add("SessionID",  OSD.FromUUID(sessionID));
-            OSDArray AgentDataArr = new OSDArray(1);
+            OSDArray agentDataArr = new OSDArray(1);
-            AgentDataArr.Add(AgentDataMap);
+            agentDataArr.Add(agentDataMap);
-            OSDMap RegionDataMap = new OSDMap(4);
+            OSDMap regionDataMap = new OSDMap(4);
-            RegionDataMap.Add("RegionHandle", OSD.FromBinary(ulongToByteArray(Handle)));
+            regionDataMap.Add("RegionHandle", OSD.FromBinary(ulongToByteArray(handle)));
-            RegionDataMap.Add("SeedCapability", OSD.FromString(capsURL));
+            regionDataMap.Add("SeedCapability", OSD.FromString(capsURL));
-            RegionDataMap.Add("SimIP", OSD.FromBinary(newRegionExternalEndPoint.Address.GetAddressBytes()));
+            regionDataMap.Add("SimIP", OSD.FromBinary(newRegionExternalEndPoint.Address.GetAddressBytes()));
-            RegionDataMap.Add("SimPort", OSD.FromInteger(newRegionExternalEndPoint.Port));
+            regionDataMap.Add("SimPort", OSD.FromInteger(newRegionExternalEndPoint.Port));
-            OSDArray RegionDataArr = new OSDArray(1);
+            OSDArray regionDataArr = new OSDArray(1);
-            RegionDataArr.Add(RegionDataMap);
+            regionDataArr.Add(regionDataMap);
            OSDMap llsdBody = new OSDMap(3);
-            llsdBody.Add("Info", InfoArr);
+            llsdBody.Add("Info", infoArr);
-            llsdBody.Add("AgentData", AgentDataArr);
+            llsdBody.Add("AgentData", agentDataArr);
-            llsdBody.Add("RegionData", RegionDataArr);
+            llsdBody.Add("RegionData", regionDataArr);
            return buildEvent("CrossedRegion", llsdBody);
        }
        public static OSD TeleportFinishEvent(
            ulong regionHandle, byte simAccess, IPEndPoint regionExternalEndPoint,
-            uint locationID, uint flags, string capsURL, UUID AgentID)
+            uint locationID, uint flags, string capsURL, UUID agentID)
        {
            OSDMap info = new OSDMap();
-            info.Add("AgentID", OSD.FromUUID(AgentID));
+            info.Add("AgentID", OSD.FromUUID(agentID));
            info.Add("LocationID", OSD.FromInteger(4)); // TODO what is this?
            info.Add("RegionHandle", OSD.FromBinary(ulongToByteArray(regionHandle)));
            info.Add("SeedCapability", OSD.FromString(capsURL));
diff --git a/OpenSim/Region/Environment/Modules/Framework/InterfaceCommander/Command.cs b/OpenSim/Region/Environment/Modules/Framework/InterfaceCommander/Command.cs
index 6642bdc..0ad95ae 100644
--- a/OpenSim/Region/Environment/Modules/Framework/InterfaceCommander/Command.cs
+++ b/OpenSim/Region/Environment/Modules/Framework/InterfaceCommander/Command.cs
@@ -27,7 +27,7 @@
 using System;
 using System.Collections.Generic;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
 namespace OpenSim.Region.Environment.Modules.Framework.InterfaceCommander
 {
diff --git a/OpenSim/Region/Environment/Modules/Framework/InterfaceCommander/Commander.cs b/OpenSim/Region/Environment/Modules/Framework/InterfaceCommander/Commander.cs
index 1da1177..31a67f7 100644
--- a/OpenSim/Region/Environment/Modules/Framework/InterfaceCommander/Commander.cs
+++ b/OpenSim/Region/Environment/Modules/Framework/InterfaceCommander/Commander.cs
@@ -31,7 +31,7 @@ using System.Reflection;
 using System.Text;
 using log4net;
 using OpenSim.Framework;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
 namespace OpenSim.Region.Environment.Modules.Framework.InterfaceCommander
 {
diff --git a/OpenSim/Region/Environment/Modules/Grid/Interregion/IInterregionModule.cs b/OpenSim/Region/Environment/Modules/Grid/Interregion/IInterregionModule.cs
index b0d44d7..edf1231 100644
--- a/OpenSim/Region/Environment/Modules/Grid/Interregion/IInterregionModule.cs
+++ b/OpenSim/Region/Environment/Modules/Grid/Interregion/IInterregionModule.cs
@@ -26,7 +26,7 @@
 */
 using OpenSim.Framework;
-using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Framework.Scenes;
 namespace OpenSim.Region.Environment.Modules.Grid.Interregion
 {
diff --git a/OpenSim/Region/Environment/Modules/Grid/Interregion/InterregionModule.cs b/OpenSim/Region/Environment/Modules/Grid/Interregion/InterregionModule.cs
index acd0e5c..cb571e4 100644
--- a/OpenSim/Region/Environment/Modules/Grid/Interregion/InterregionModule.cs
+++ b/OpenSim/Region/Environment/Modules/Grid/Interregion/InterregionModule.cs
@@ -32,8 +32,8 @@ using System.Runtime.Remoting.Channels;
 using System.Runtime.Remoting.Channels.Tcp;
 using Nini.Config;
 using OpenSim.Framework;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Framework.Scenes;
 namespace OpenSim.Region.Environment.Modules.Grid.Interregion
 {
diff --git a/OpenSim/Region/Environment/Modules/Hypergrid/HGStandaloneAssetService.cs b/OpenSim/Region/Environment/Modules/Hypergrid/HGStandaloneAssetService.cs
index 285a019..4cb1c20 100644
--- a/OpenSim/Region/Environment/Modules/Hypergrid/HGStandaloneAssetService.cs
+++ b/OpenSim/Region/Environment/Modules/Hypergrid/HGStandaloneAssetService.cs
@@ -40,8 +40,8 @@ using OpenSim.Framework;
 using OpenSim.Framework.Communications;
 using OpenSim.Framework.Communications.Cache;
 using OpenSim.Framework.Servers;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Framework.Scenes;
 using OpenSim.Grid.AssetServer;
 using OpenSim.Data;
diff --git a/OpenSim/Region/Environment/Modules/Hypergrid/HGStandaloneInventoryService.cs b/OpenSim/Region/Environment/Modules/Hypergrid/HGStandaloneInventoryService.cs
index b10582b..54ba761 100644
--- a/OpenSim/Region/Environment/Modules/Hypergrid/HGStandaloneInventoryService.cs
+++ b/OpenSim/Region/Environment/Modules/Hypergrid/HGStandaloneInventoryService.cs
@@ -37,8 +37,8 @@ using OpenSim.Framework;
 using OpenSim.Framework.Communications;
 using OpenSim.Framework.Communications.Cache;
 using OpenSim.Framework.Servers;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Framework.Scenes;
 namespace OpenSim.Region.Environment.Modules.Hypergrid
 {
diff --git a/OpenSim/Region/Environment/Modules/Hypergrid/HGWorldMapModule.cs b/OpenSim/Region/Environment/Modules/Hypergrid/HGWorldMapModule.cs
index e642b7f..1d9182e 100644
--- a/OpenSim/Region/Environment/Modules/Hypergrid/HGWorldMapModule.cs
+++ b/OpenSim/Region/Environment/Modules/Hypergrid/HGWorldMapModule.cs
@@ -47,10 +47,10 @@ using OpenSim.Framework;
 using OpenSim.Framework.Communications.Cache;
 using OpenSim.Framework.Communications.Capabilities;
 using OpenSim.Framework.Servers;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Scenes;
+using OpenSim.Region.Framework.Scenes.Types;
 using OpenSim.Region.Environment.Modules.World.WorldMap;
-using OpenSim.Region.Environment.Scenes;
-using OpenSim.Region.Environment.Types;
 using Caps = OpenSim.Framework.Communications.Capabilities.Caps;
 using OSD = OpenMetaverse.StructuredData.OSD;
diff --git a/OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs b/OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs
index f5b2823..12a76de8 100644
--- a/OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs
+++ b/OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs
@@ -44,8 +44,8 @@ using Nini.Config;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications.Capabilities;
 using OpenSim.Framework.Servers;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Framework.Scenes;
 using OSD = OpenMetaverse.StructuredData.OSD;
 using OSDMap = OpenMetaverse.StructuredData.OSDMap;
diff --git a/OpenSim/Region/Environment/Modules/Scripting/DynamicTexture/DynamicTextureModule.cs b/OpenSim/Region/Environment/Modules/Scripting/DynamicTexture/DynamicTextureModule.cs
index bddf10d..f498f9a 100644
--- a/OpenSim/Region/Environment/Modules/Scripting/DynamicTexture/DynamicTextureModule.cs
+++ b/OpenSim/Region/Environment/Modules/Scripting/DynamicTexture/DynamicTextureModule.cs
@@ -33,8 +33,8 @@ using OpenMetaverse;
 using OpenMetaverse.Imaging;
 using Nini.Config;
 using OpenSim.Framework;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Framework.Scenes;
 namespace OpenSim.Region.Environment.Modules.Scripting.DynamicTexture
 {
diff --git a/OpenSim/Region/Environment/Modules/Scripting/EMailModules/EmailModule.cs b/OpenSim/Region/Environment/Modules/Scripting/EMailModules/EmailModule.cs
index 5a715f5..81ce761 100644
--- a/OpenSim/Region/Environment/Modules/Scripting/EMailModules/EmailModule.cs
+++ b/OpenSim/Region/Environment/Modules/Scripting/EMailModules/EmailModule.cs
@@ -31,8 +31,8 @@ using System.Collections.Generic;
 using System.Text.RegularExpressions;
 using OpenMetaverse;
 using OpenSim.Framework;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Framework.Scenes;
 using log4net;
 using Nini.Config;
 using DotNetOpenMail;
diff --git a/OpenSim/Region/Environment/Modules/Scripting/HttpRequest/ScriptsHttpRequests.cs b/OpenSim/Region/Environment/Modules/Scripting/HttpRequest/ScriptsHttpRequests.cs
index eb9b322..821c60e 100644
--- a/OpenSim/Region/Environment/Modules/Scripting/HttpRequest/ScriptsHttpRequests.cs
+++ b/OpenSim/Region/Environment/Modules/Scripting/HttpRequest/ScriptsHttpRequests.cs
@@ -35,8 +35,8 @@ using OpenMetaverse;
 using Nini.Config;
 using OpenSim.Framework;
 using OpenSim.Framework.Servers;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Framework.Scenes;
 using System.Collections;
 /*****************************************************
@@ -84,14 +84,14 @@ using System.Collections;
 namespace OpenSim.Region.Environment.Modules.Scripting.HttpRequest
 {
-    public class HttpRequestModule : IRegionModule, IHttpRequests
+    public class HttpRequestModule : IRegionModule, IHttpRequestModule
    {
        private object HttpListLock = new object();
        private int httpTimeout = 30000;
        private string m_name = "HttpScriptRequests";
-        private string m_proxyurl = "";
+    private string m_proxyurl = "";
-        private string m_proxyexcepts = "";
+    private string m_proxyexcepts = "";
        // <request id, HttpRequestClass>
        private Dictionary<UUID, HttpRequestClass> m_pendingRequests;
@@ -102,7 +102,7 @@ namespace OpenSim.Region.Environment.Modules.Scripting.HttpRequest
        {
        }
-        #region IHttpRequests Members
+        #region IHttpRequestModule Members
        public UUID MakeHttpRequest(string url, string parameters, string body)
        {
@@ -125,22 +125,22 @@ namespace OpenSim.Region.Environment.Modules.Scripting.HttpRequest
                {
                    switch (Int32.Parse(parms[i]))
                    {
-                        case HttpRequestClass.HTTP_METHOD:
+                        case (int)HttpRequestConstants.HTTP_METHOD:
-                            htc.httpMethod = parms[i + 1];
+                            htc.HttpMethod = parms[i + 1];
                            break;
-                        case HttpRequestClass.HTTP_MIMETYPE:
+                        case (int)HttpRequestConstants.HTTP_MIMETYPE:
-                            htc.httpMIMEType = parms[i + 1];
+                            htc.HttpMIMEType = parms[i + 1];
                            break;
-                        case HttpRequestClass.HTTP_BODY_MAXLENGTH:
+                        case (int)HttpRequestConstants.HTTP_BODY_MAXLENGTH:
                            // TODO implement me
                            break;
-                        case HttpRequestClass.HTTP_VERIFY_CERT:
+                        case (int)HttpRequestConstants.HTTP_VERIFY_CERT:
                            // TODO implement me
                            break;
@@ -148,22 +148,22 @@ namespace OpenSim.Region.Environment.Modules.Scripting.HttpRequest
                }
            }
-            htc.localID = localID;
+            htc.LocalID = localID;
-            htc.itemID = itemID;
+            htc.ItemID = itemID;
-            htc.url = url;
+            htc.Url = url;
-            htc.reqID = reqID;
+            htc.ReqID = reqID;
-            htc.httpTimeout = httpTimeout;
+            htc.HttpTimeout = httpTimeout;
-            htc.outbound_body = body;
+            htc.OutboundBody = body;
-            htc.response_headers = headers;
+            htc.ResponseHeaders = headers;
-            htc.proxyurl = m_proxyurl;
+        htc.proxyurl = m_proxyurl;
-            htc.proxyexcepts = m_proxyexcepts;
+        htc.proxyexcepts = m_proxyexcepts;
            lock (HttpListLock)
            {
                m_pendingRequests.Add(reqID, htc);
            }
-            htc.process();
+            htc.Process();
            return reqID;
        }
@@ -193,7 +193,7 @@ namespace OpenSim.Region.Environment.Modules.Scripting.HttpRequest
        * it will need some refactoring and this works 'enough' right now
        */
-        public HttpRequestClass GetNextCompletedRequest()
+        public IServiceRequest GetNextCompletedRequest()
        {
            lock (HttpListLock)
            {
@@ -203,7 +203,7 @@ namespace OpenSim.Region.Environment.Modules.Scripting.HttpRequest
                    if (m_pendingRequests.TryGetValue(luid, out tmpReq))
                    {
-                        if (tmpReq.finished)
+                        if (tmpReq.Finished)
                        {
                            return tmpReq;
                        }
@@ -235,10 +235,10 @@ namespace OpenSim.Region.Environment.Modules.Scripting.HttpRequest
        {
            m_scene = scene;
-            m_scene.RegisterModuleInterface<IHttpRequests>(this);
+            m_scene.RegisterModuleInterface<IHttpRequestModule>(this);
-            m_proxyurl = config.Configs["Startup"].GetString("HttpProxy");
+        m_proxyurl = config.Configs["Startup"].GetString("HttpProxy");
-            m_proxyexcepts = config.Configs["Startup"].GetString("HttpProxyExceptions");
+        m_proxyexcepts = config.Configs["Startup"].GetString("HttpProxyExceptions");
            m_pendingRequests = new Dictionary<UUID, HttpRequestClass>();
        }
@@ -264,45 +264,64 @@ namespace OpenSim.Region.Environment.Modules.Scripting.HttpRequest
        #endregion
    }
-    public class HttpRequestClass
+    public class HttpRequestClass: IServiceRequest
    {
        // Constants for parameters
-        public const int HTTP_BODY_MAXLENGTH = 2;
+        // public const int HTTP_BODY_MAXLENGTH = 2;
-        public const int HTTP_METHOD = 0;
+        // public const int HTTP_METHOD = 0;
-        public const int HTTP_MIMETYPE = 1;
+        // public const int HTTP_MIMETYPE = 1;
-        public const int HTTP_VERIFY_CERT = 3;
+        // public const int HTTP_VERIFY_CERT = 3;
-        public bool finished;
+        private bool _finished;
-        public int httpBodyMaxLen = 2048; // not implemented
+        public bool Finished
+        { 
+            get { return _finished; }
+        }
+        // public int HttpBodyMaxLen = 2048; // not implemented
        // Parameter members and default values
-        public string httpMethod = "GET";
+        public string HttpMethod  = "GET";
-        public string httpMIMEType = "text/plain;charset=utf-8";
+        public string HttpMIMEType = "text/plain;charset=utf-8";
+        public int HttpTimeout;
+        // public bool HttpVerifyCert = true; // not implemented
        private Thread httpThread;
-        public int httpTimeout;
-        public bool httpVerifyCert = true; // not implemented
        // Request info
-        public UUID itemID;
+        private UUID _itemID;
-        public uint localID;
+        public UUID ItemID 
-        public DateTime next;
+        {
-        public string outbound_body;
+            get { return _itemID; }
-        public UUID reqID;
+            set { _itemID = value; }
-        public HttpWebRequest request;
+        }
-        public string response_body;
+        private uint _localID;
-        public List<string> response_metadata;
+        public uint LocalID
-        public Dictionary<string, string> response_headers;
+        {
-        public int status;
+            get { return _localID; }
-        public string url;
+            set { _localID = value; }
+        }
+        public DateTime Next;
        public string proxyurl;
        public string proxyexcepts;
+        public string OutboundBody;
-        public void process()
+        private UUID _reqID;
+        public UUID ReqID 
+        {
+            get { return _reqID; }
+            set { _reqID = value; }
+        }
+        public HttpWebRequest Request;
+        public string ResponseBody;
+        public List<string> ResponseMetadata;
+        public Dictionary<string, string> ResponseHeaders;
+        public int Status;
+        public string Url;
+        public void Process()
        {
            httpThread = new Thread(SendRequest);
            httpThread.Name = "HttpRequestThread";
            httpThread.Priority = ThreadPriority.BelowNormal;
            httpThread.IsBackground = true;
-            finished = false;
+            _finished = false;
            httpThread.Start();
            ThreadTracker.Add(httpThread);
        }
@@ -322,37 +341,35 @@ namespace OpenSim.Region.Environment.Modules.Scripting.HttpRequest
            try
            {
-                request = (HttpWebRequest)
+                Request = (HttpWebRequest) WebRequest.Create(Url);
-                          WebRequest.Create(url);
+                Request.Method = HttpMethod;
-                request.Method = httpMethod;
+                Request.ContentType = HttpMIMEType;
-                request.ContentType = httpMIMEType;
+        if (proxyurl.Length > 0) 
-                if (proxyurl.Length > 0) 
+          {
-                  {
+            if (proxyexcepts.Length > 0) {
-                    if (proxyexcepts.Length > 0) {
+              string[] elist = proxyexcepts.Split(';');
-                      string[] elist = proxyexcepts.Split(';');
+              Request.Proxy = new WebProxy(proxyurl,true,elist);
-                      request.Proxy = new WebProxy(proxyurl,true,elist);
+            } else {
-                    } else {
+              Request.Proxy = new WebProxy(proxyurl,true);
-                      request.Proxy = new WebProxy(proxyurl,true);
+            }
-                    }
+          }
-                  }
+                foreach (KeyValuePair<string, string> entry in ResponseHeaders)
-                foreach (KeyValuePair<string, string> entry in response_headers)
+                    Request.Headers[entry.Key] = entry.Value;
-                    request.Headers[entry.Key] = entry.Value;
                // Encode outbound data
-                if (outbound_body.Length > 0) {
+                if (OutboundBody.Length > 0) {
-                    byte[] data = Encoding.UTF8.GetBytes(outbound_body);
+                    byte[] data = Encoding.UTF8.GetBytes(OutboundBody);
-                    request.ContentLength = data.Length;
+                    Request.ContentLength = data.Length;
-                    Stream bstream = request.GetRequestStream();
+                    Stream bstream = Request.GetRequestStream();
                    bstream.Write(data, 0, data.Length);
                    bstream.Close();
                }
-                request.Timeout = httpTimeout;
+                Request.Timeout = HttpTimeout;
                // execute the request
-                response = (HttpWebResponse)
+                response = (HttpWebResponse) Request.GetResponse();
-                           request.GetResponse();
                Stream resStream = response.GetResponseStream();
@@ -372,23 +389,23 @@ namespace OpenSim.Region.Environment.Modules.Scripting.HttpRequest
                    }
                } while (count > 0); // any more data to read?
-                response_body = sb.ToString();
+                ResponseBody = sb.ToString();
            }
            catch (Exception e)
            {
                if (e is WebException && ((WebException)e).Status == WebExceptionStatus.ProtocolError)
                {
                    HttpWebResponse webRsp = (HttpWebResponse)((WebException)e).Response;
-                    status = (int)webRsp.StatusCode;
+                    Status = (int)webRsp.StatusCode;
-                    response_body = webRsp.StatusDescription;
+                    ResponseBody = webRsp.StatusDescription;
                }
                else
                {
-                    status = (int)OSHttpStatusCode.ClientErrorJoker;
+                    Status = (int)OSHttpStatusCode.ClientErrorJoker;
-                    response_body = e.Message;
+                    ResponseBody = e.Message;
                }
-                finished = true;
+                _finished = true;
                return;
            }
            finally
@@ -397,8 +414,8 @@ namespace OpenSim.Region.Environment.Modules.Scripting.HttpRequest
                    response.Close();
            }
-            status = (int)OSHttpStatusCode.SuccessOk;
+            Status = (int)OSHttpStatusCode.SuccessOk;
-            finished = true;
+            _finished = true;
        }
        public void Stop()
diff --git a/OpenSim/Region/Environment/Modules/Scripting/LoadImageURL/LoadImageURLModule.cs b/OpenSim/Region/Environment/Modules/Scripting/LoadImageURL/LoadImageURLModule.cs
index 3d0afd1..af78c36 100644
--- a/OpenSim/Region/Environment/Modules/Scripting/LoadImageURL/LoadImageURLModule.cs
+++ b/OpenSim/Region/Environment/Modules/Scripting/LoadImageURL/LoadImageURLModule.cs
@@ -32,8 +32,8 @@ using System.Net;
 using OpenMetaverse;
 using OpenMetaverse.Imaging;
 using Nini.Config;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Framework.Scenes;
 namespace OpenSim.Region.Environment.Modules.Scripting.LoadImageURL
 {
diff --git a/OpenSim/Region/Environment/Modules/Scripting/VectorRender/VectorRenderModule.cs b/OpenSim/Region/Environment/Modules/Scripting/VectorRender/VectorRenderModule.cs
index 3b318a4..60806a7 100644
--- a/OpenSim/Region/Environment/Modules/Scripting/VectorRender/VectorRenderModule.cs
+++ b/OpenSim/Region/Environment/Modules/Scripting/VectorRender/VectorRenderModule.cs
@@ -34,8 +34,8 @@ using System.Net;
 using OpenMetaverse;
 using OpenMetaverse.Imaging;
 using Nini.Config;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Framework.Scenes;
 //using Cairo;
diff --git a/OpenSim/Region/Environment/Modules/Scripting/WorldComm/WorldCommModule.cs b/OpenSim/Region/Environment/Modules/Scripting/WorldComm/WorldCommModule.cs
index 99e3177..258734d 100644
--- a/OpenSim/Region/Environment/Modules/Scripting/WorldComm/WorldCommModule.cs
+++ b/OpenSim/Region/Environment/Modules/Scripting/WorldComm/WorldCommModule.cs
@@ -31,8 +31,8 @@ using System.Collections.Generic;
 using OpenMetaverse;
 using Nini.Config;
 using OpenSim.Framework;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Framework.Scenes;
 // using log4net;
 // using System.Reflection;
@@ -313,7 +313,7 @@ namespace OpenSim.Region.Environment.Modules.Scripting.WorldComm
        /// Pop the first availlable listen event from the queue
        /// </summary>
        /// <returns>ListenerInfo with filter filled in</returns>
-        public ListenerInfo GetNextMessage()
+        public IWorldCommListenerInfo GetNextMessage()
        {
            ListenerInfo li = null;
@@ -608,7 +608,7 @@ namespace OpenSim.Region.Environment.Modules.Scripting.WorldComm
        }
    }
-    public class ListenerInfo
+    public class ListenerInfo: IWorldCommListenerInfo
    {
        private bool m_active; // Listener is active or not
        private int m_handle; // Assigned handle of this listener
diff --git a/OpenSim/Region/Environment/Modules/Scripting/XMLRPC/XMLRPCModule.cs b/OpenSim/Region/Environment/Modules/Scripting/XMLRPC/XMLRPCModule.cs
index 28028bc..fb86731 100644
--- a/OpenSim/Region/Environment/Modules/Scripting/XMLRPC/XMLRPCModule.cs
+++ b/OpenSim/Region/Environment/Modules/Scripting/XMLRPC/XMLRPCModule.cs
@@ -37,8 +37,8 @@ using Nini.Config;
 using Nwc.XmlRpc;
 using OpenSim.Framework;
 using OpenSim.Framework.Servers;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Framework.Scenes;
 /*****************************************************
 *
@@ -302,7 +302,7 @@ namespace OpenSim.Region.Environment.Modules.Scripting.XMLRPC
            }
        }
-        public RPCRequestInfo GetNextCompletedRequest()
+        public IXmlRpcRequestInfo GetNextCompletedRequest()
        {
            if (m_rpcPending != null)
            {
@@ -345,10 +345,11 @@ namespace OpenSim.Region.Environment.Modules.Scripting.XMLRPC
                localID, itemID, channel, dest, idata, sdata
                );
            m_pendingSRDResponses.Add(req.GetReqID(), req);
-            return req.process();
+            req.Process();
+            return req.ReqID;
        }
-        public SendRemoteDataRequest GetNextCompletedSRDRequest()
+        public IServiceRequest GetNextCompletedSRDRequest()
        {
            if (m_pendingSRDResponses != null)
            {
@@ -360,7 +361,7 @@ namespace OpenSim.Region.Environment.Modules.Scripting.XMLRPC
                        if (m_pendingSRDResponses.TryGetValue(luid, out tmpReq))
                        {
-                            if (tmpReq.finished)
+                            if (tmpReq.Finished)
                                return tmpReq;
                        }
                    }
@@ -389,7 +390,7 @@ namespace OpenSim.Region.Environment.Modules.Scripting.XMLRPC
                {
                    foreach (SendRemoteDataRequest li in m_pendingSRDResponses.Values)
                    {
-                        if (li.m_itemID.Equals(itemID))
+                        if (li.ItemID.Equals(itemID))
                            m_pendingSRDResponses.Remove(li.GetReqID());
                    }
                }
@@ -460,7 +461,7 @@ namespace OpenSim.Region.Environment.Modules.Scripting.XMLRPC
        }
    }
-    public class RPCRequestInfo
+    public class RPCRequestInfo: IXmlRpcRequestInfo
    {
        private UUID m_ChannelKey;
        private string m_IntVal;
@@ -575,45 +576,64 @@ namespace OpenSim.Region.Environment.Modules.Scripting.XMLRPC
        }
    }
-    public class SendRemoteDataRequest
+    public class SendRemoteDataRequest: IServiceRequest
    {
        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        public string channel;
-        public string destURL;
+        public string Channel;
-        public bool finished;
+        public string DestURL;
+        private bool _finished;
+        public bool Finished
+        {
+            get { return _finished; }
+            set { _finished = value; }
+        }
        private Thread httpThread;
-        public int idata;
+        public int Idata;
-        public UUID m_itemID;
+        private UUID _itemID;
-        public uint m_localID;
+        public UUID ItemID 
-        public UUID reqID;
+        {
-        public XmlRpcRequest request;
+            get { return _itemID; }
-        public int response_idata;
+            set { _itemID = value; }
-        public string response_sdata;
+        }
-        public string sdata;
+        private uint _localID;
+        public uint LocalID
+        {
+            get { return _localID; }
+            set { _localID = value; }
+        }
+        private UUID _reqID;
+        public UUID ReqID 
+        {
+            get { return _reqID; }
+            set { _reqID = value; }
+        }
+        public XmlRpcRequest Request;
+        public int ResponseIdata;
+        public string ResponseSdata;
+        public string Sdata;
        public SendRemoteDataRequest(uint localID, UUID itemID, string channel, string dest, int idata, string sdata)
        {
-            this.channel = channel;
+            this.Channel = channel;
-            destURL = dest;
+            DestURL = dest;
-            this.idata = idata;
+            this.Idata = idata;
-            this.sdata = sdata;
+            this.Sdata = sdata;
-            m_itemID = itemID;
+            ItemID = itemID;
-            m_localID = localID;
+            LocalID = localID;
-            reqID = UUID.Random();
+            ReqID = UUID.Random();
        }
-        public UUID process()
+        public void Process()
        {
            httpThread = new Thread(SendRequest);
            httpThread.Name = "HttpRequestThread";
            httpThread.Priority = ThreadPriority.BelowNormal;
            httpThread.IsBackground = true;
-            finished = false;
+            _finished = false;
            httpThread.Start();
            ThreadTracker.Add(httpThread);
-            return reqID;
        }
        /*
@@ -629,21 +649,21 @@ namespace OpenSim.Region.Environment.Modules.Scripting.XMLRPC
            // if not, use as method name
            UUID parseUID;
            string mName = "llRemoteData";
-            if ((channel != null) && (channel != ""))
+            if ((Channel != null) && (Channel != ""))
-                if (!UUID.TryParse(channel, out parseUID))
+                if (!UUID.TryParse(Channel, out parseUID))
-                    mName = channel;
+                    mName = Channel;
                else
-                    param["Channel"] = channel;
+                    param["Channel"] = Channel;
-            param["StringValue"] = sdata;
+            param["StringValue"] = Sdata;
-            param["IntValue"] = Convert.ToString(idata);
+            param["IntValue"] = Convert.ToString(Idata);
            ArrayList parameters = new ArrayList();
            parameters.Add(param);
            XmlRpcRequest req = new XmlRpcRequest(mName, parameters);
            try
            {
-                XmlRpcResponse resp = req.Send(destURL, 30000);
+                XmlRpcResponse resp = req.Send(DestURL, 30000);
                if (resp != null)
                {
                    Hashtable respParms;
@@ -660,31 +680,31 @@ namespace OpenSim.Region.Environment.Modules.Scripting.XMLRPC
                    {
                        if (respParms.Contains("StringValue"))
                        {
-                            sdata = (string) respParms["StringValue"];
+                            Sdata = (string) respParms["StringValue"];
                        }
                        if (respParms.Contains("IntValue"))
                        {
-                            idata = Convert.ToInt32((string) respParms["IntValue"]);
+                            Idata = Convert.ToInt32((string) respParms["IntValue"]);
                        }
                        if (respParms.Contains("faultString"))
                        {
-                            sdata = (string) respParms["faultString"];
+                            Sdata = (string) respParms["faultString"];
                        }
                        if (respParms.Contains("faultCode"))
                        {
-                            idata = Convert.ToInt32(respParms["faultCode"]);
+                            Idata = Convert.ToInt32(respParms["faultCode"]);
                        }
                    }
                }
            }
            catch (Exception we)
            {
-                sdata = we.Message;
+                Sdata = we.Message;
                m_log.Warn("[SendRemoteDataRequest]: Request failed");
                m_log.Warn(we.StackTrace);
            }
-            finished = true;
+            _finished = true;
        }
        public void Stop()
@@ -700,7 +720,7 @@ namespace OpenSim.Region.Environment.Modules.Scripting.XMLRPC
        public UUID GetReqID()
        {
-            return reqID;
+            return ReqID;
        }
    }
 }
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs
index c860d01..b507c52 100644
--- a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs
+++ b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs
@@ -36,8 +36,8 @@ using OpenMetaverse;
 using log4net;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications.Cache;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Framework.Scenes;
 using OpenSim.Region.Environment.Modules.World.Terrain;
 namespace OpenSim.Region.Environment.Modules.World.Archiver
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestExecution.cs b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestExecution.cs
index 179b82a..9a06bf7 100644
--- a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestExecution.cs
+++ b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestExecution.cs
@@ -33,10 +33,10 @@ using System.Xml;
 using OpenMetaverse;
 using log4net;
 using OpenSim.Framework;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Scenes;
 using OpenSim.Region.Environment.Modules.World.Serialiser;
 using OpenSim.Region.Environment.Modules.World.Terrain;
-using OpenSim.Region.Environment.Scenes;
 namespace OpenSim.Region.Environment.Modules.World.Archiver
 {
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestPreparation.cs b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestPreparation.cs
index a5f4770..56604d6 100644
--- a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestPreparation.cs
+++ b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestPreparation.cs
@@ -27,10 +27,10 @@
 using OpenSim.Framework;
 using OpenSim.Framework.Communications.Cache;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Scenes;
 using OpenSim.Region.Environment.Modules.World.Serialiser;
 using OpenSim.Region.Environment.Modules.World.Terrain;
-using OpenSim.Region.Environment.Scenes;
 using System;
 using System.Collections.Generic;
 using System.IO;
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiverModule.cs b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiverModule.cs
index 9d9f81e..ed494fc 100644
--- a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiverModule.cs
+++ b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiverModule.cs
@@ -33,9 +33,9 @@ using OpenMetaverse;
 using log4net;
 using Nini.Config;
 using OpenSim.Framework.Communications.Cache;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Scenes;
 using OpenSim.Region.Environment.Modules.World.Serialiser;
-using OpenSim.Region.Environment.Scenes;
 namespace OpenSim.Region.Environment.Modules.World.Archiver
 {
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/AssetsRequest.cs b/OpenSim/Region/Environment/Modules/World/Archiver/AssetsRequest.cs
index 035651a..7a6c810 100644
--- a/OpenSim/Region/Environment/Modules/World/Archiver/AssetsRequest.cs
+++ b/OpenSim/Region/Environment/Modules/World/Archiver/AssetsRequest.cs
@@ -33,8 +33,8 @@ using OpenMetaverse;
 using log4net;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications.Cache;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Framework.Scenes;
 namespace OpenSim.Region.Environment.Modules.World.Archiver
 {
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/Tests/ArchiverTests.cs b/OpenSim/Region/Environment/Modules/World/Archiver/Tests/ArchiverTests.cs
index d7acd54..e265252 100644
--- a/OpenSim/Region/Environment/Modules/World/Archiver/Tests/ArchiverTests.cs
+++ b/OpenSim/Region/Environment/Modules/World/Archiver/Tests/ArchiverTests.cs
@@ -32,11 +32,11 @@ using NUnit.Framework;
 using NUnit.Framework.SyntaxHelpers;
 using OpenMetaverse;
 using OpenSim.Framework;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Environment.Modules.World.Archiver;
 using OpenSim.Region.Environment.Modules.World.Serialiser;
 using OpenSim.Region.Environment.Modules.World.Terrain;
-using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Framework.Scenes;
 using OpenSim.Tests.Common.Setup;
 namespace OpenSim.Region.Environment.Modules.World.Archiver.Tests
diff --git a/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs
index d906bbd..6b74c83 100644
--- a/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs
+++ b/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs
@@ -32,8 +32,8 @@ using OpenMetaverse;
 using log4net;
 using Nini.Config;
 using OpenSim.Framework;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Framework.Scenes;
 namespace OpenSim.Region.Environment.Modules.World.Estate
 {
diff --git a/OpenSim/Region/Environment/Modules/World/Estate/EstateTerrainXferHandler.cs b/OpenSim/Region/Environment/Modules/World/Estate/EstateTerrainXferHandler.cs
index 2ba4e34..267178e 100644
--- a/OpenSim/Region/Environment/Modules/World/Estate/EstateTerrainXferHandler.cs
+++ b/OpenSim/Region/Environment/Modules/World/Estate/EstateTerrainXferHandler.cs
@@ -32,7 +32,7 @@ using log4net;
 using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications.Cache;
-using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Framework.Scenes;
 namespace OpenSim.Region.Environment.Modules.World.Estate
diff --git a/OpenSim/Region/Environment/Modules/World/Land/LandChannel.cs b/OpenSim/Region/Environment/Modules/World/Land/LandChannel.cs
index 9de0181..76555d2 100644
--- a/OpenSim/Region/Environment/Modules/World/Land/LandChannel.cs
+++ b/OpenSim/Region/Environment/Modules/World/Land/LandChannel.cs
@@ -29,8 +29,8 @@ using System;
 using System.Collections.Generic;
 using OpenMetaverse;
 using OpenSim.Framework;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Framework.Scenes;
 namespace OpenSim.Region.Environment.Modules.World.Land
 {
diff --git a/OpenSim/Region/Environment/Modules/World/Land/LandManagementModule.cs b/OpenSim/Region/Environment/Modules/World/Land/LandManagementModule.cs
index 6f50102..58176e4 100644
--- a/OpenSim/Region/Environment/Modules/World/Land/LandManagementModule.cs
+++ b/OpenSim/Region/Environment/Modules/World/Land/LandManagementModule.cs
@@ -32,8 +32,8 @@ using System.Reflection;
 using OpenMetaverse;
 using log4net;
 using Nini.Config;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Framework.Scenes;
 using OpenSim.Framework;
 using OpenSim.Framework.Servers;
 using OpenSim.Framework.Communications.Capabilities;
diff --git a/OpenSim/Region/Environment/Modules/World/Land/LandObject.cs b/OpenSim/Region/Environment/Modules/World/Land/LandObject.cs
index 89256fa..b5f7225 100644
--- a/OpenSim/Region/Environment/Modules/World/Land/LandObject.cs
+++ b/OpenSim/Region/Environment/Modules/World/Land/LandObject.cs
@@ -31,8 +31,8 @@ using System.Reflection;
 using OpenMetaverse;
 using log4net;
 using OpenSim.Framework;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Framework.Scenes;
 namespace OpenSim.Region.Environment.Modules.World.Land
 {
diff --git a/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs b/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs
index f0d5de2..9165554 100644
--- a/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs
+++ b/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs
@@ -31,7 +31,7 @@ using System.Net;
 using OpenMetaverse;
 using OpenMetaverse.Packets;
 using OpenSim.Framework;
-using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Framework.Scenes;
 namespace OpenSim.Region.Environment.Modules.World.NPC
 {
diff --git a/OpenSim/Region/Environment/Modules/World/NPC/NPCModule.cs b/OpenSim/Region/Environment/Modules/World/NPC/NPCModule.cs
index 7227cf0..2e7b16c 100644
--- a/OpenSim/Region/Environment/Modules/World/NPC/NPCModule.cs
+++ b/OpenSim/Region/Environment/Modules/World/NPC/NPCModule.cs
@@ -27,8 +27,8 @@
 using OpenMetaverse;
 using Nini.Config;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Framework.Scenes;
 namespace OpenSim.Region.Environment.Modules.World.NPC
 {
diff --git a/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs
index f086396..060a4f4 100644
--- a/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs
+++ b/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs
@@ -33,10 +33,10 @@ using System.Collections.Generic;
 using System.Reflection;
 using log4net;
 using OpenSim.Framework;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Scenes;
 using OpenSim.Region.Environment.Modules.Framework;
 using OpenSim.Region.Environment.Modules.Framework.InterfaceCommander;
-using OpenSim.Region.Environment.Scenes;
 using OpenSim.Framework.Communications.Cache;
 namespace OpenSim.Region.Environment.Modules.World.Permissions
diff --git a/OpenSim/Region/Environment/Modules/World/Serialiser/IFileSerialiser.cs b/OpenSim/Region/Environment/Modules/World/Serialiser/IFileSerialiser.cs
index 40568e7..afad3cf 100644
--- a/OpenSim/Region/Environment/Modules/World/Serialiser/IFileSerialiser.cs
+++ b/OpenSim/Region/Environment/Modules/World/Serialiser/IFileSerialiser.cs
@@ -25,7 +25,7 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Framework.Scenes;
 namespace OpenSim.Region.Environment.Modules.World.Serialiser
 {
diff --git a/OpenSim/Region/Environment/Modules/World/Serialiser/SceneXmlLoader.cs b/OpenSim/Region/Environment/Modules/World/Serialiser/SceneXmlLoader.cs
deleted file mode 100644
index 2e9c551..0000000
--- a/OpenSim/Region/Environment/Modules/World/Serialiser/SceneXmlLoader.cs
+++ /dev/null
@@ -1,289 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSim Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Reflection;
-using System.Xml;
-using OpenMetaverse;
-using log4net;
-using OpenSim.Framework;
-using OpenSim.Region.Physics.Manager;
-namespace OpenSim.Region.Environment.Scenes
-{
-    /// <summary>
-    /// Static methods to serialize and deserialize scene objects to and from XML
-    /// </summary>
-    public class SceneXmlLoader
-    {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        public static void LoadPrimsFromXml(Scene scene, string fileName, bool newIDS, Vector3 loadOffset)
-        {
-            XmlDocument doc = new XmlDocument();
-            XmlNode rootNode;
-            if (fileName.StartsWith("http:") || File.Exists(fileName))
-            {
-                XmlTextReader reader = new XmlTextReader(fileName);
-                reader.WhitespaceHandling = WhitespaceHandling.None;
-                doc.Load(reader);
-                reader.Close();
-                rootNode = doc.FirstChild;
-                foreach (XmlNode aPrimNode in rootNode.ChildNodes)
-                {
-                    SceneObjectGroup obj = new SceneObjectGroup(aPrimNode.OuterXml, true);
-                    if (newIDS)
-                    {
-                        obj.ResetIDs();
-                    }
-                    //if we want this to be a import method then we need new uuids for the object to avoid any clashes
-                    //obj.RegenerateFullIDs();
-                    scene.AddNewSceneObject(obj, true);
-                }
-            }
-            else
-            {
-                throw new Exception("Could not open file " + fileName + " for reading");
-            }
-        }
-        public static void SavePrimsToXml(Scene scene, string fileName)
-        {
-            FileStream file = new FileStream(fileName, FileMode.Create);
-            StreamWriter stream = new StreamWriter(file);
-            int primCount = 0;
-            stream.WriteLine("<scene>\n");
-            List<EntityBase> EntityList = scene.GetEntities();
-            foreach (EntityBase ent in EntityList)
-            {
-                if (ent is SceneObjectGroup)
-                {
-                    stream.WriteLine(((SceneObjectGroup) ent).ToXmlString());
-                    primCount++;
-                }
-            }
-            stream.WriteLine("</scene>\n");
-            stream.Close();
-            file.Close();
-        }
-        public static string SaveGroupToXml2(SceneObjectGroup grp)
-        {
-            return grp.ToXmlString2();
-        }
-        public static SceneObjectGroup DeserializeGroupFromXml2(string xmlString)
-        {
-            XmlDocument doc = new XmlDocument();
-            XmlNode rootNode;
-            XmlTextReader reader = new XmlTextReader(new StringReader(xmlString));
-            reader.WhitespaceHandling = WhitespaceHandling.None;
-            doc.Load(reader);
-            reader.Close();
-            rootNode = doc.FirstChild;
-            // This is to deal with neighbouring regions that are still surrounding the group xml with the <scene>
-            // tag.  It should be possible to remove the first part of this if statement once we go past 0.5.9 (or
-            // when some other changes forces all regions to upgrade).
-            // This might seem rather pointless since prim crossing from this revision to an earlier revision remains
-            // broken.  But it isn't much work to accomodate the old format here.
-            if (rootNode.LocalName.Equals("scene"))
-            {
-                foreach (XmlNode aPrimNode in rootNode.ChildNodes)
-                {
-                    // There is only ever one prim.  This oddity should be removeable post 0.5.9
-                    return new SceneObjectGroup(aPrimNode.OuterXml);
-                }
-                return null;
-            }
-            else
-            {
-                return new SceneObjectGroup(rootNode.OuterXml);
-            }
-        }
-        /// <summary>
-        /// Load prims from the xml2 format
-        /// </summary>
-        /// <param name="scene"></param>
-        /// <param name="fileName"></param>
-        public static void LoadPrimsFromXml2(Scene scene, string fileName)
-        {
-            LoadPrimsFromXml2(scene, new XmlTextReader(fileName), false);
-        }
-        /// <summary>
-        /// Load prims from the xml2 format
-        /// </summary>
-        /// <param name="scene"></param>
-        /// <param name="reader"></param>
-        /// <param name="startScripts"></param>
-        public static void LoadPrimsFromXml2(Scene scene, TextReader reader, bool startScripts)
-        {
-            LoadPrimsFromXml2(scene, new XmlTextReader(reader), startScripts);
-        }
-        /// <summary>
-        /// Load prims from the xml2 format.  This method will close the reader
-        /// </summary>
-        /// <param name="scene"></param>
-        /// <param name="reader"></param>
-        /// <param name="startScripts"></param>
-        protected static void LoadPrimsFromXml2(Scene scene, XmlTextReader reader, bool startScripts)
-        {
-            XmlDocument doc = new XmlDocument();
-            reader.WhitespaceHandling = WhitespaceHandling.None;
-            doc.Load(reader);
-            reader.Close();
-            XmlNode rootNode = doc.FirstChild;
-            ICollection<SceneObjectGroup> sceneObjects = new List<SceneObjectGroup>();
-            foreach (XmlNode aPrimNode in rootNode.ChildNodes)
-            {
-                SceneObjectGroup obj = CreatePrimFromXml2(scene, aPrimNode.OuterXml);
-                if (obj != null && startScripts)
-                    sceneObjects.Add(obj);
-            }
-            foreach (SceneObjectGroup sceneObject in sceneObjects)
-            {
-                 sceneObject.CreateScriptInstances(0, true, scene.DefaultScriptEngine, 0);
-            }
-        }
-        /// <summary>
-        /// Create a prim from the xml2 representation.
-        /// </summary>
-        /// <param name="scene"></param>
-        /// <param name="xmlData"></param>
-        /// <returns>The scene object created.  null if the scene object already existed</returns>
-        protected static SceneObjectGroup CreatePrimFromXml2(Scene scene, string xmlData)
-        {
-            SceneObjectGroup obj = new SceneObjectGroup(xmlData);
-            if (scene.AddRestoredSceneObject(obj, true, false))
-                return obj;
-            else
-                return null;
-        }
-        public static void SavePrimsToXml2(Scene scene, string fileName)
-        {
-            List<EntityBase> EntityList = scene.GetEntities();
-            SavePrimListToXml2(EntityList, fileName);
-        }
-        public static void SavePrimsToXml2(Scene scene, TextWriter stream, Vector3 min, Vector3 max)
-        {
-            List<EntityBase> EntityList = scene.GetEntities();
-            SavePrimListToXml2(EntityList, stream, min, max);
-        }
-        
-        public static void SaveNamedPrimsToXml2(Scene scene, string primName, string fileName)
-        {
-            m_log.InfoFormat(
-                "[SERIALISER]: Saving prims with name {0} in xml2 format for region {1} to {2}", 
-                primName, scene.RegionInfo.RegionName, fileName);
-            List<EntityBase> entityList = scene.GetEntities();
-            List<EntityBase> primList = new List<EntityBase>();
-            foreach (EntityBase ent in entityList)
-            {
-                if (ent is SceneObjectGroup)
-                {
-                    if (ent.Name == primName)
-                    {
-                        primList.Add(ent);
-                    }
-                }
-            }
-            SavePrimListToXml2(primList, fileName);
-        }        
-        public static void SavePrimListToXml2(List<EntityBase> entityList, string fileName)
-        {
-            FileStream file = new FileStream(fileName, FileMode.Create);
-            try
-            {
-                StreamWriter stream = new StreamWriter(file);
-                try
-                {
-                    SavePrimListToXml2(entityList, stream, Vector3.Zero, Vector3.Zero);
-                }
-                finally
-                {
-                    stream.Close();
-                }
-            }
-            finally
-            {
-                file.Close();
-            }
-        }
-        public static void SavePrimListToXml2(List<EntityBase> entityList, TextWriter stream, Vector3 min, Vector3 max)
-        {
-            int primCount = 0;
-            stream.WriteLine("<scene>\n");
-            foreach (EntityBase ent in entityList)
-            {
-                if (ent is SceneObjectGroup)
-                {
-                    SceneObjectGroup g = (SceneObjectGroup)ent;
-                    if (!min.Equals(Vector3.Zero) || !max.Equals(Vector3.Zero))
-                    {
-                        Vector3 pos = g.RootPart.GetWorldPosition();
-                        if (min.X > pos.X || min.Y > pos.Y || min.Z > pos.Z)
-                            continue;
-                        if (max.X < pos.X || max.Y < pos.Y || max.Z < pos.Z)
-                            continue;
-                    }
-                    stream.WriteLine(g.ToXmlString2());
-                    primCount++;
-                }
-            }
-            stream.WriteLine("</scene>\n");
-            stream.Flush();
-        }
-    }
-}
diff --git a/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiseObjects.cs b/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiseObjects.cs
index 1fb78b6..8b3f2ce 100644
--- a/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiseObjects.cs
+++ b/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiseObjects.cs
@@ -30,7 +30,7 @@ using System.IO;
 using System.IO.Compression;
 using System.Text;
 using System.Xml;
-using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Framework.Scenes;
 namespace OpenSim.Region.Environment.Modules.World.Serialiser
 {
diff --git a/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiseTerrain.cs b/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiseTerrain.cs
index bd85264..d0ce3d8 100644
--- a/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiseTerrain.cs
+++ b/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiseTerrain.cs
@@ -27,7 +27,7 @@
 using OpenSim.Region.Environment.Modules.World.Terrain;
 using OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders;
-using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Framework.Scenes;
 namespace OpenSim.Region.Environment.Modules.World.Serialiser
 {
diff --git a/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiserModule.cs b/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiserModule.cs
index f939adf..0e7873c 100644
--- a/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiserModule.cs
+++ b/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiserModule.cs
@@ -30,9 +30,9 @@ using System.Collections.Generic;
 using System.IO;
 using OpenMetaverse;
 using Nini.Config;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Scenes;
 using OpenSim.Region.Environment.Modules.Framework.InterfaceCommander;
-using OpenSim.Region.Environment.Scenes;
 namespace OpenSim.Region.Environment.Modules.World.Serialiser
 {
diff --git a/OpenSim/Region/Environment/Modules/World/Sound/SoundModule.cs b/OpenSim/Region/Environment/Modules/World/Sound/SoundModule.cs
index 4547480..1713797 100644
--- a/OpenSim/Region/Environment/Modules/World/Sound/SoundModule.cs
+++ b/OpenSim/Region/Environment/Modules/World/Sound/SoundModule.cs
@@ -31,8 +31,8 @@ using Nini.Config;
 using log4net;
 using OpenMetaverse;
 using OpenSim.Framework;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Framework.Scenes;
 namespace OpenSim.Region.Environment.World.Sound
 {        
diff --git a/OpenSim/Region/Environment/Modules/World/Sun/SunModule.cs b/OpenSim/Region/Environment/Modules/World/Sun/SunModule.cs
index 9d8956e..ee96d58 100644
--- a/OpenSim/Region/Environment/Modules/World/Sun/SunModule.cs
+++ b/OpenSim/Region/Environment/Modules/World/Sun/SunModule.cs
@@ -30,8 +30,8 @@ using System.Collections.Generic;
 using OpenMetaverse;
 using Nini.Config;
 using OpenSim.Framework;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Framework.Scenes;
 namespace OpenSim.Region.Environment.Modules
 {
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/Effects/CookieCutter.cs b/OpenSim/Region/Environment/Modules/World/Terrain/Effects/CookieCutter.cs
index c5e99b5..83246fb 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/Effects/CookieCutter.cs
+++ b/OpenSim/Region/Environment/Modules/World/Terrain/Effects/CookieCutter.cs
@@ -25,7 +25,8 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 using System;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Scenes;
 using OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes;
 namespace OpenSim.Region.Environment.Modules.World.Terrain.Effects
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/Effects/DefaultTerrainGenerator.cs b/OpenSim/Region/Environment/Modules/World/Terrain/Effects/DefaultTerrainGenerator.cs
index 5bc6799..2082137 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/Effects/DefaultTerrainGenerator.cs
+++ b/OpenSim/Region/Environment/Modules/World/Terrain/Effects/DefaultTerrainGenerator.cs
@@ -25,7 +25,8 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 using OpenSim.Framework;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Scenes;
 namespace OpenSim.Region.Environment.Modules.World.Terrain.Effects
 {
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/BMP.cs b/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/BMP.cs
index 48da96d..a8e79d0 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/BMP.cs
+++ b/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/BMP.cs
@@ -28,7 +28,7 @@
 using System.Drawing;
 using System.Drawing.Imaging;
 using System.IO;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
 namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders
 {
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/GIF.cs b/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/GIF.cs
index accffd2..b76fe05 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/GIF.cs
+++ b/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/GIF.cs
@@ -28,7 +28,7 @@
 using System.Drawing;
 using System.Drawing.Imaging;
 using System.IO;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
 namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders
 {
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/GenericSystemDrawing.cs b/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/GenericSystemDrawing.cs
index 983ad29..80873d9 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/GenericSystemDrawing.cs
+++ b/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/GenericSystemDrawing.cs
@@ -29,7 +29,8 @@ using System;
 using System.Drawing;
 using System.Drawing.Imaging;
 using System.IO;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Scenes;
 namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders
 {
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/JPEG.cs b/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/JPEG.cs
index 35576c7..bea504d 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/JPEG.cs
+++ b/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/JPEG.cs
@@ -29,7 +29,7 @@ using System;
 using System.Drawing;
 using System.Drawing.Imaging;
 using System.IO;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
 namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders
 {
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/LLRAW.cs b/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/LLRAW.cs
index 5158525..e323e28 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/LLRAW.cs
+++ b/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/LLRAW.cs
@@ -27,7 +27,8 @@
 using System;
 using System.IO;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Scenes;
 namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders
 {
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/PNG.cs b/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/PNG.cs
index 19e181e..25967f3 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/PNG.cs
+++ b/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/PNG.cs
@@ -28,7 +28,7 @@
 using System.Drawing;
 using System.Drawing.Imaging;
 using System.IO;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
 namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders
 {
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/RAW32.cs b/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/RAW32.cs
index 758821a..7aff56a 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/RAW32.cs
+++ b/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/RAW32.cs
@@ -26,7 +26,8 @@
 */
 using System.IO;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Scenes;
 namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders
 {
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/TIFF.cs b/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/TIFF.cs
index 95b43b0..0503487 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/TIFF.cs
+++ b/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/TIFF.cs
@@ -28,7 +28,7 @@
 using System.Drawing;
 using System.Drawing.Imaging;
 using System.IO;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
 namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders
 {
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/Terragen.cs b/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/Terragen.cs
index 2bf029e..44d03e3 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/Terragen.cs
+++ b/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/Terragen.cs
@@ -28,7 +28,8 @@
 using System;
 using System.IO;
 using System.Text;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Scenes;
 namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders
 {
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/FlattenArea.cs b/OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/FlattenArea.cs
index f3c8a13..4d49a70 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/FlattenArea.cs
+++ b/OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/FlattenArea.cs
@@ -25,7 +25,7 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
 namespace OpenSim.Region.Environment.Modules.World.Terrain.FloodBrushes
 {
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/LowerArea.cs b/OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/LowerArea.cs
index 3646d61..64f9014 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/LowerArea.cs
+++ b/OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/LowerArea.cs
@@ -25,7 +25,7 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
 namespace OpenSim.Region.Environment.Modules.World.Terrain.FloodBrushes
 {
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/NoiseArea.cs b/OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/NoiseArea.cs
index f7c4893..2d44a3a 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/NoiseArea.cs
+++ b/OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/NoiseArea.cs
@@ -26,7 +26,8 @@
 */
 using OpenSim.Framework;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Scenes;
 namespace OpenSim.Region.Environment.Modules.World.Terrain.FloodBrushes
 {
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/RaiseArea.cs b/OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/RaiseArea.cs
index 5eff3d6..0c7d016 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/RaiseArea.cs
+++ b/OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/RaiseArea.cs
@@ -25,7 +25,7 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
 namespace OpenSim.Region.Environment.Modules.World.Terrain.FloodBrushes
 {
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/RevertArea.cs b/OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/RevertArea.cs
index 602a5cc..3f06d82 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/RevertArea.cs
+++ b/OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/RevertArea.cs
@@ -25,7 +25,7 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
 namespace OpenSim.Region.Environment.Modules.World.Terrain.FloodBrushes
 {
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/SmoothArea.cs b/OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/SmoothArea.cs
index 8fd805e..3881264 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/SmoothArea.cs
+++ b/OpenSim/Region/Environment/Modules/World/Terrain/FloodBrushes/SmoothArea.cs
@@ -25,7 +25,7 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
 namespace OpenSim.Region.Environment.Modules.World.Terrain.FloodBrushes
 {
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/ITerrainEffect.cs b/OpenSim/Region/Environment/Modules/World/Terrain/ITerrainEffect.cs
index bbbe2a3..4533e9e 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/ITerrainEffect.cs
+++ b/OpenSim/Region/Environment/Modules/World/Terrain/ITerrainEffect.cs
@@ -25,7 +25,7 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
 namespace OpenSim.Region.Environment.Modules.World.Terrain
 {
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/ITerrainFloodEffect.cs b/OpenSim/Region/Environment/Modules/World/Terrain/ITerrainFloodEffect.cs
index 9fe93a2..5bae84b 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/ITerrainFloodEffect.cs
+++ b/OpenSim/Region/Environment/Modules/World/Terrain/ITerrainFloodEffect.cs
@@ -26,7 +26,7 @@
 */
 using System;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
 namespace OpenSim.Region.Environment.Modules.World.Terrain
 {
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/ITerrainLoader.cs b/OpenSim/Region/Environment/Modules/World/Terrain/ITerrainLoader.cs
index 950b27b..21bda58 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/ITerrainLoader.cs
+++ b/OpenSim/Region/Environment/Modules/World/Terrain/ITerrainLoader.cs
@@ -26,7 +26,7 @@
 */
 using System.IO;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
 namespace OpenSim.Region.Environment.Modules.World.Terrain
 {
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/ITerrainPaintableEffect.cs b/OpenSim/Region/Environment/Modules/World/Terrain/ITerrainPaintableEffect.cs
index e2a9cde..7461560 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/ITerrainPaintableEffect.cs
+++ b/OpenSim/Region/Environment/Modules/World/Terrain/ITerrainPaintableEffect.cs
@@ -25,7 +25,7 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
 namespace OpenSim.Region.Environment.Modules.World.Terrain
 {
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/ErodeSphere.cs b/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/ErodeSphere.cs
index 3fa3f8a..4d694cc 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/ErodeSphere.cs
+++ b/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/ErodeSphere.cs
@@ -26,7 +26,8 @@
 */
 using System;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Scenes;
 namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes
 {
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/FlattenSphere.cs b/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/FlattenSphere.cs
index c103d99..91c030d 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/FlattenSphere.cs
+++ b/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/FlattenSphere.cs
@@ -26,7 +26,8 @@
 */
 using System;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Scenes;
 namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes
 {
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/LowerSphere.cs b/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/LowerSphere.cs
index 745d3da..d391e94 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/LowerSphere.cs
+++ b/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/LowerSphere.cs
@@ -26,7 +26,7 @@
 */
 using System;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
 namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes
 {
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/NoiseSphere.cs b/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/NoiseSphere.cs
index 23f7bc5..32a6869 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/NoiseSphere.cs
+++ b/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/NoiseSphere.cs
@@ -27,7 +27,8 @@
 using System;
 using OpenSim.Framework;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Scenes;
 namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes
 {
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/OlsenSphere.cs b/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/OlsenSphere.cs
index 42ec794..86d01d3 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/OlsenSphere.cs
+++ b/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/OlsenSphere.cs
@@ -26,7 +26,8 @@
 */
 using System;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Scenes;
 namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes
 {
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/RaiseSphere.cs b/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/RaiseSphere.cs
index 56813ab..a0ff262 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/RaiseSphere.cs
+++ b/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/RaiseSphere.cs
@@ -26,7 +26,8 @@
 */
 using System;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Scenes;
 namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes
 {
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/RevertSphere.cs b/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/RevertSphere.cs
index d3a1d3d..af6d94d 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/RevertSphere.cs
+++ b/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/RevertSphere.cs
@@ -26,7 +26,8 @@
 */
 using System;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Scenes;
 namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes
 {
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/SmoothSphere.cs b/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/SmoothSphere.cs
index 0b4996f..fe270f7 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/SmoothSphere.cs
+++ b/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/SmoothSphere.cs
@@ -25,7 +25,8 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Scenes;
 namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes
 {
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/WeatherSphere.cs b/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/WeatherSphere.cs
index 1288419..faba119 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/WeatherSphere.cs
+++ b/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/WeatherSphere.cs
@@ -25,7 +25,8 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Scenes;
 namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes
 {
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/TerrainChannel.cs b/OpenSim/Region/Environment/Modules/World/Terrain/TerrainChannel.cs
deleted file mode 100644
index 1534c4b..0000000
--- a/OpenSim/Region/Environment/Modules/World/Terrain/TerrainChannel.cs
+++ /dev/null
@@ -1,242 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSim Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-using OpenSim.Framework;
-using OpenSim.Region.Environment.Interfaces;
-using System;
-using System.Text;
-using System.Xml;
-using System.IO;
-using System.Xml.Serialization;
-namespace OpenSim.Region.Environment.Modules.World.Terrain
-{
-    /// <summary>
-    /// A new version of the old Channel class, simplified
-    /// </summary>
-    public class TerrainChannel : ITerrainChannel
-    {
-        private readonly bool[,] taint;
-        private double[,] map;
-        public TerrainChannel()
-        {
-            map = new double[Constants.RegionSize, Constants.RegionSize];
-            taint = new bool[Constants.RegionSize / 16,Constants.RegionSize / 16];
-            int x;
-            for (x = 0; x < Constants.RegionSize; x++)
-            {
-                int y;
-                for (y = 0; y < Constants.RegionSize; y++)
-                {
-                    map[x, y] = TerrainUtil.PerlinNoise2D(x, y, 2, 0.125) * 10;
-                    double spherFacA = TerrainUtil.SphericalFactor(x, y, Constants.RegionSize / 2.0, Constants.RegionSize / 2.0, 50) * 0.01;
-                    double spherFacB = TerrainUtil.SphericalFactor(x, y, Constants.RegionSize / 2.0, Constants.RegionSize / 2.0, 100) * 0.001;
-                    if (map[x, y] < spherFacA)
-                        map[x, y] = spherFacA;
-                    if (map[x, y] < spherFacB)
-                        map[x, y] = spherFacB;
-                }
-            }
-        }
-        public TerrainChannel(double[,] import)
-        {
-            map = import;
-            taint = new bool[import.GetLength(0),import.GetLength(1)];
-        }
-        public TerrainChannel(bool createMap)
-        {
-            if (createMap)
-            {
-                map = new double[Constants.RegionSize,Constants.RegionSize];
-                taint = new bool[Constants.RegionSize / 16,Constants.RegionSize / 16];
-            }
-        }
-        public TerrainChannel(int w, int h)
-        {
-            map = new double[w,h];
-            taint = new bool[w / 16,h / 16];
-        }
-        #region ITerrainChannel Members
-        public int Width
-        {
-            get { return map.GetLength(0); }
-        }
-        public int Height
-        {
-            get { return map.GetLength(1); }
-        }
-        public ITerrainChannel MakeCopy()
-        {
-            TerrainChannel copy = new TerrainChannel(false);
-            copy.map = (double[,]) map.Clone();
-            return copy;
-        }
-        public float[] GetFloatsSerialised()
-        {
-            // Move the member variables into local variables, calling
-            // member variables 256*256 times gets expensive
-            int w = Width;
-            int h = Height;
-            float[] heights = new float[w * h];
-            int i, j; // map coordinates
-            int idx = 0; // index into serialized array
-            for (i = 0; i < h; i++)
-            {
-                for (j = 0; j < w; j++)
-                {
-                    heights[idx++] = (float)map[j, i];
-                }
-            }
-            return heights;
-        }
-        public double[,] GetDoubles()
-        {
-            return map;
-        }
-        public double this[int x, int y]
-        {
-            get { return map[x, y]; }
-            set
-            {
-                // Will "fix" terrain hole problems. Although not fantastically.
-                if (Double.IsNaN(value) || Double.IsInfinity(value))
-                    return;
-                if (map[x, y] != value)
-                {
-                    taint[x / 16, y / 16] = true;
-                    map[x, y] = value;
-                }
-            }
-        }
-        public bool Tainted(int x, int y)
-        {
-            if (taint[x / 16, y / 16])
-            {
-                taint[x / 16, y / 16] = false;
-                return true;
-            }
-            return false;
-        }
-        #endregion
-        public TerrainChannel Copy()
-        {
-            TerrainChannel copy = new TerrainChannel(false);
-            copy.map = (double[,]) map.Clone();
-            return copy;
-        }
-        public string SaveToXmlString()
-        {
-            XmlWriterSettings settings = new XmlWriterSettings();
-            settings.Encoding = Encoding.UTF8;
-            using (StringWriter sw = new StringWriter())
-            {
-                using (XmlWriter writer = XmlWriter.Create(sw, settings))
-                {
-                    WriteXml(writer);
-                }
-                string output = sw.ToString();
-                return output;
-            }
-        }
-        private void WriteXml(XmlWriter writer)
-        {
-            writer.WriteStartElement(String.Empty, "TerrainMap", String.Empty);
-            ToXml(writer);
-            writer.WriteEndElement();
-        }
-        public void LoadFromXmlString(string data)
-        {
-            StringReader sr = new StringReader(data);
-            XmlTextReader reader = new XmlTextReader(sr);
-            reader.Read();
-            ReadXml(reader);
-            reader.Close();
-            sr.Close();
-        }
-        private void ReadXml(XmlReader reader)
-        {
-            reader.ReadStartElement("TerrainMap");
-            FromXml(reader);
-        }
-        private void ToXml(XmlWriter xmlWriter)
-        {
-            float[] mapData = GetFloatsSerialised();
-            byte[] buffer = new byte[mapData.Length * 4];
-            for (int i = 0; i < mapData.Length; i++)
-            {
-                byte[] value = BitConverter.GetBytes(mapData[i]);
-                Array.Copy(value, 0, buffer, (i * 4), 4);
-            }
-            XmlSerializer serializer = new XmlSerializer(typeof(byte[]));
-            serializer.Serialize(xmlWriter, buffer);
-        }
-        private void FromXml(XmlReader xmlReader)
-        {
-            XmlSerializer serializer = new XmlSerializer(typeof(byte[]));
-            byte[] dataArray = (byte[])serializer.Deserialize(xmlReader);
-            int index = 0;
-            for (int y = 0; y < Height; y++)
-            {
-                for (int x = 0; x < Width; x++)
-                {
-                    float value;
-                    value = BitConverter.ToSingle(dataArray, index);
-                    index += 4;
-                    this[x, y] = (double)value;
-                }
-            }
-        }
-    }
-}
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/TerrainModule.cs b/OpenSim/Region/Environment/Modules/World/Terrain/TerrainModule.cs
index 3c27872..bc601dc 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/TerrainModule.cs
+++ b/OpenSim/Region/Environment/Modules/World/Terrain/TerrainModule.cs
@@ -33,12 +33,12 @@ using OpenMetaverse;
 using log4net;
 using Nini.Config;
 using OpenSim.Framework;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Scenes;
 using OpenSim.Region.Environment.Modules.Framework.InterfaceCommander;
 using OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders;
 using OpenSim.Region.Environment.Modules.World.Terrain.FloodBrushes;
 using OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes;
-using OpenSim.Region.Environment.Scenes;
 namespace OpenSim.Region.Environment.Modules.World.Terrain
 {
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/TerrainUtil.cs b/OpenSim/Region/Environment/Modules/World/Terrain/TerrainUtil.cs
deleted file mode 100644
index b20ff42..0000000
--- a/OpenSim/Region/Environment/Modules/World/Terrain/TerrainUtil.cs
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSim Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-using System;
-using OpenSim.Region.Environment.Interfaces;
-namespace OpenSim.Region.Environment.Modules.World.Terrain
-{
-    public static class TerrainUtil
-    {
-        public static double MetersToSphericalStrength(double size)
-        {
-            //return Math.Pow(2, size);
-            return (size + 1) * 1.35; // MCP: a more useful brush size range
-        }
-        public static double SphericalFactor(double x, double y, double rx, double ry, double size)
-        {
-            return size * size - ((x - rx) * (x - rx) + (y - ry) * (y - ry));
-        }
-        public static double GetBilinearInterpolate(double x, double y, ITerrainChannel map)
-        {
-            int w = map.Width;
-            int h = map.Height;
-            if (x > w - 2.0)
-                x = w - 2.0;
-            if (y > h - 2.0)
-                y = h - 2.0;
-            if (x < 0.0)
-                x = 0.0;
-            if (y < 0.0)
-                y = 0.0;
-            const int stepSize = 1;
-            double h00 = map[(int) x, (int) y];
-            double h10 = map[(int) x + stepSize, (int) y];
-            double h01 = map[(int) x, (int) y + stepSize];
-            double h11 = map[(int) x + stepSize, (int) y + stepSize];
-            double h1 = h00;
-            double h2 = h10;
-            double h3 = h01;
-            double h4 = h11;
-            double a00 = h1;
-            double a10 = h2 - h1;
-            double a01 = h3 - h1;
-            double a11 = h1 - h2 - h3 + h4;
-            double partialx = x - (int) x;
-            double partialz = y - (int) y;
-            double hi = a00 + (a10 * partialx) + (a01 * partialz) + (a11 * partialx * partialz);
-            return hi;
-        }
-        private static double Noise(double x, double y)
-        {
-            int n = (int) x + (int) (y * 749);
-            n = (n << 13) ^ n;
-            return (1.0 - ((n * (n * n * 15731 + 789221) + 1376312589) & 0x7fffffff) / 1073741824.0);
-        }
-        private static double SmoothedNoise1(double x, double y)
-        {
-            double corners = (Noise(x - 1, y - 1) + Noise(x + 1, y - 1) + Noise(x - 1, y + 1) + Noise(x + 1, y + 1)) / 16;
-            double sides = (Noise(x - 1, y) + Noise(x + 1, y) + Noise(x, y - 1) + Noise(x, y + 1)) / 8;
-            double center = Noise(x, y) / 4;
-            return corners + sides + center;
-        }
-        private static double Interpolate(double x, double y, double z)
-        {
-            return (x * (1.0 - z)) + (y * z);
-        }
-        public static double InterpolatedNoise(double x, double y)
-        {
-            int integer_X = (int) (x);
-            double fractional_X = x - integer_X;
-            int integer_Y = (int) y;
-            double fractional_Y = y - integer_Y;
-            double v1 = SmoothedNoise1(integer_X, integer_Y);
-            double v2 = SmoothedNoise1(integer_X + 1, integer_Y);
-            double v3 = SmoothedNoise1(integer_X, integer_Y + 1);
-            double v4 = SmoothedNoise1(integer_X + 1, integer_Y + 1);
-            double i1 = Interpolate(v1, v2, fractional_X);
-            double i2 = Interpolate(v3, v4, fractional_X);
-            return Interpolate(i1, i2, fractional_Y);
-        }
-        public static double PerlinNoise2D(double x, double y, int octaves, double persistence)
-        {
-            double total = 0.0;
-            for (int i = 0; i < octaves; i++)
-            {
-                double frequency = Math.Pow(2, i);
-                double amplitude = Math.Pow(persistence, i);
-                total += InterpolatedNoise(x * frequency, y * frequency) * amplitude;
-            }
-            return total;
-        }
-    }
-}
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/Tests/TerrainTest.cs b/OpenSim/Region/Environment/Modules/World/Terrain/Tests/TerrainTest.cs
index 3511988..2acd5bc 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/Tests/TerrainTest.cs
+++ b/OpenSim/Region/Environment/Modules/World/Terrain/Tests/TerrainTest.cs
@@ -27,6 +27,7 @@
 using System;
 using NUnit.Framework;
+using OpenSim.Region.Framework.Scenes;
 using OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes;
 namespace OpenSim.Region.Environment.Modules.World.Terrain.Tests
diff --git a/OpenSim/Region/Environment/Modules/World/TreePopulator/TreePopulatorModule.cs b/OpenSim/Region/Environment/Modules/World/TreePopulator/TreePopulatorModule.cs
index f6b82a3..8a49540 100644
--- a/OpenSim/Region/Environment/Modules/World/TreePopulator/TreePopulatorModule.cs
+++ b/OpenSim/Region/Environment/Modules/World/TreePopulator/TreePopulatorModule.cs
@@ -33,8 +33,8 @@ using OpenMetaverse;
 using log4net;
 using Nini.Config;
 using OpenSim.Framework;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Framework.Scenes;
 namespace OpenSim.Region.Environment.Modules.World.TreePopulator
 {
diff --git a/OpenSim/Region/Environment/Modules/World/Vegetation/VegetationModule.cs b/OpenSim/Region/Environment/Modules/World/Vegetation/VegetationModule.cs
index a1c2192..4c4ca0d 100644
--- a/OpenSim/Region/Environment/Modules/World/Vegetation/VegetationModule.cs
+++ b/OpenSim/Region/Environment/Modules/World/Vegetation/VegetationModule.cs
@@ -33,8 +33,8 @@ using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications;
 using OpenSim.Framework.Communications.Cache;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Framework.Scenes;
 namespace OpenSim.Region.Environment.Modules.Avatar.Vegetation
 {
diff --git a/OpenSim/Region/Environment/Modules/World/Wind/WindModule.cs b/OpenSim/Region/Environment/Modules/World/Wind/WindModule.cs
index 52f52eb..8e54fd9 100644
--- a/OpenSim/Region/Environment/Modules/World/Wind/WindModule.cs
+++ b/OpenSim/Region/Environment/Modules/World/Wind/WindModule.cs
@@ -30,8 +30,8 @@ using System.Collections.Generic;
 using OpenMetaverse;
 using Nini.Config;
 using OpenSim.Framework;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Framework.Scenes;
 namespace OpenSim.Region.Environment.Modules
 {
diff --git a/OpenSim/Region/Environment/Modules/World/WorldMap/IMapTileTerrainRenderer.cs b/OpenSim/Region/Environment/Modules/World/WorldMap/IMapTileTerrainRenderer.cs
index bebcc52..cb0ac8c 100644
--- a/OpenSim/Region/Environment/Modules/World/WorldMap/IMapTileTerrainRenderer.cs
+++ b/OpenSim/Region/Environment/Modules/World/WorldMap/IMapTileTerrainRenderer.cs
@@ -26,7 +26,7 @@
 */
 using System.Drawing;
-using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Framework.Scenes;
 using Nini.Config;
 namespace OpenSim.Region.Environment
diff --git a/OpenSim/Region/Environment/Modules/World/WorldMap/MapImageModule.cs b/OpenSim/Region/Environment/Modules/World/WorldMap/MapImageModule.cs
index 1c43724..a806c7d 100644
--- a/OpenSim/Region/Environment/Modules/World/WorldMap/MapImageModule.cs
+++ b/OpenSim/Region/Environment/Modules/World/WorldMap/MapImageModule.cs
@@ -35,8 +35,8 @@ using System.Reflection;
 using Nini.Config;
 using OpenMetaverse.Imaging;
 using log4net;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Framework.Scenes;
 using OpenMetaverse;
 namespace OpenSim.Region.Environment.Modules.World.WorldMap
diff --git a/OpenSim/Region/Environment/Modules/World/WorldMap/MapSearchModule.cs b/OpenSim/Region/Environment/Modules/World/WorldMap/MapSearchModule.cs
index 6541571..fcac7e1 100644
--- a/OpenSim/Region/Environment/Modules/World/WorldMap/MapSearchModule.cs
+++ b/OpenSim/Region/Environment/Modules/World/WorldMap/MapSearchModule.cs
@@ -29,9 +29,9 @@ using System.Reflection;
 using System.Collections.Generic;
 using System.Net;
 using OpenSim.Framework;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Framework.Scenes;
-using OpenSim.Region.Environment.Scenes.Hypergrid;
+using OpenSim.Region.Framework.Scenes.Hypergrid;
 using OpenMetaverse;
 using log4net;
 using Nini.Config;
diff --git a/OpenSim/Region/Environment/Modules/World/WorldMap/ShadedMapTileRenderer.cs b/OpenSim/Region/Environment/Modules/World/WorldMap/ShadedMapTileRenderer.cs
index dffa72a..7fe538e 100644
--- a/OpenSim/Region/Environment/Modules/World/WorldMap/ShadedMapTileRenderer.cs
+++ b/OpenSim/Region/Environment/Modules/World/WorldMap/ShadedMapTileRenderer.cs
@@ -36,8 +36,8 @@ using OpenMetaverse;
 using OpenMetaverse.Imaging;
 using Nini.Config;
 using log4net;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Framework.Scenes;
 namespace OpenSim.Region.Environment.Modules.World.WorldMap
 {
diff --git a/OpenSim/Region/Environment/Modules/World/WorldMap/TexturedMapTileRenderer.cs b/OpenSim/Region/Environment/Modules/World/WorldMap/TexturedMapTileRenderer.cs
index d66bbdb..d23c352 100644
--- a/OpenSim/Region/Environment/Modules/World/WorldMap/TexturedMapTileRenderer.cs
+++ b/OpenSim/Region/Environment/Modules/World/WorldMap/TexturedMapTileRenderer.cs
@@ -37,8 +37,8 @@ using Nini.Config;
 using log4net;
 using OpenMetaverse.Imaging;
 using OpenSim.Framework;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Framework.Scenes;
 using OpenSim.Region.Environment.Modules.World.Terrain;
 namespace OpenSim.Region.Environment.Modules.World.WorldMap
diff --git a/OpenSim/Region/Environment/Modules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/Environment/Modules/World/WorldMap/WorldMapModule.cs
index cf1900b..37b4547 100644
--- a/OpenSim/Region/Environment/Modules/World/WorldMap/WorldMapModule.cs
+++ b/OpenSim/Region/Environment/Modules/World/WorldMap/WorldMapModule.cs
@@ -43,9 +43,9 @@ using OpenSim.Framework;
 using OpenSim.Framework.Communications.Cache;
 using OpenSim.Framework.Communications.Capabilities;
 using OpenSim.Framework.Servers;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Framework.Scenes;
-using OpenSim.Region.Environment.Types;
+using OpenSim.Region.Framework.Scenes.Types;
 using Caps = OpenSim.Framework.Communications.Capabilities.Caps;
 using OSD = OpenMetaverse.StructuredData.OSD;
author	Dr Scofield	2009-02-06 16:55:34 +0000
committer	Dr Scofield	2009-02-06 16:55:34 +0000
commit	9b66108081a8c8cf79faaa6c541554091c40850e (patch)
tree	095a232ae5a9de3a9244bcd34da08294f61eeea5 /OpenSim/Region/Environment/Modules
parent	* removed superfluous constants class (diff)
download	opensim-SC_OLD-9b66108081a8c8cf79faaa6c541554091c40850e.zip opensim-SC_OLD-9b66108081a8c8cf79faaa6c541554091c40850e.tar.gz opensim-SC_OLD-9b66108081a8c8cf79faaa6c541554091c40850e.tar.bz2 opensim-SC_OLD-9b66108081a8c8cf79faaa6c541554091c40850e.tar.xz