Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork

140 files changed, 6886 insertions, 4326 deletions

diff --git a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs
index 8a4fd8f..da1ff2e 100644
--- a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs
+++ b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs
@@ -57,39 +57,36 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
         }
 
         /// <summary>
-        /// Return a xfer uploader if one does not already exist.
+        /// Return the xfer uploader for the given transaction.
         /// </summary>
+        /// <remarks>
+        /// If an uploader does not already exist for this transaction then it is created, otherwise the existing
+        /// uploader is returned.
+        /// </remarks>
         /// <param name="transactionID"></param>
-        /// <param name="assetID">
-        /// We must transfer the new asset ID into the uploader on creation, otherwise
-        /// we can see race conditions with other threads which can retrieve an item before it is updated with the new
-        /// asset id.
-        /// </param>
-        /// <returns>
-        /// The xfer uploader requested.  Null if one is already in existence.
-        /// FIXME: This is a bizarre thing to do, and is probably meant to signal an error condition if multiple
-        /// transfers are made.  Needs to be corrected.
-        /// </returns>
-        public AssetXferUploader RequestXferUploader(UUID transactionID, UUID assetID)
+        /// <returns>The asset xfer uploader</returns>
+        public AssetXferUploader RequestXferUploader(UUID transactionID)
         {
+            AssetXferUploader uploader;
+
             lock (XferUploaders)
             {
                 if (!XferUploaders.ContainsKey(transactionID))
                 {
-                    AssetXferUploader uploader = new AssetXferUploader(this, m_Scene, assetID, m_dumpAssetsToFile);
+                    uploader = new AssetXferUploader(this, m_Scene, transactionID, m_dumpAssetsToFile);
 
 //                    m_log.DebugFormat(
 //                        "[AGENT ASSETS TRANSACTIONS]: Adding asset xfer uploader {0} since it didn't previously exist", transactionID);
 
                     XferUploaders.Add(transactionID, uploader);
-
-                    return uploader;
+                }
+                else
+                {
+                    uploader = XferUploaders[transactionID];
                 }
             }
 
-            m_log.WarnFormat("[AGENT ASSETS TRANSACTIONS]: Ignoring request for asset xfer uploader {0} since it already exists", transactionID);
-
-            return null;
+            return uploader;
         }
 
         public void HandleXfer(ulong xferID, uint packetID, byte[] data)
@@ -151,117 +148,30 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
                 string description, string name, sbyte invType,
                sbyte type, byte wearableType, uint nextOwnerMask)
         {
-            AssetXferUploader uploader = null;
-
-            lock (XferUploaders)
-            {
-                if (XferUploaders.ContainsKey(transactionID))
-                    uploader = XferUploaders[transactionID];
-            }
+            AssetXferUploader uploader = RequestXferUploader(transactionID);
 
-            if (uploader != null)
-            {
-                uploader.RequestCreateInventoryItem(
-                    remoteClient, transactionID, folderID,
-                    callbackID, description, name, invType, type,
-                    wearableType, nextOwnerMask);
+            uploader.RequestCreateInventoryItem(
+                remoteClient, folderID, callbackID,
+                description, name, invType, type, wearableType, nextOwnerMask);
 
-                return true;
-            }
-            
-            return false;
-        }
-
-        /// <summary>
-        /// Get an uploaded asset. If the data is successfully retrieved,
-        /// the transaction will be removed.
-        /// </summary>
-        /// <param name="transactionID"></param>
-        /// <returns>The asset if the upload has completed, null if it has not.</returns>
-        private AssetBase GetTransactionAsset(UUID transactionID)
-        {
-            lock (XferUploaders)
-            {
-                if (XferUploaders.ContainsKey(transactionID))
-                {
-                    AssetXferUploader uploader = XferUploaders[transactionID];
-                    AssetBase asset = uploader.GetAssetData();
-                    RemoveXferUploader(transactionID);
-
-                    return asset;
-                }
-            }
-
-            return null;
+            return true;
         }
 
         public void RequestUpdateTaskInventoryItem(IClientAPI remoteClient,
                 SceneObjectPart part, UUID transactionID,
                 TaskInventoryItem item)
         {
-            AssetXferUploader uploader = null;
-
-            lock (XferUploaders)
-            {
-                if (XferUploaders.ContainsKey(transactionID))
-                    uploader = XferUploaders[transactionID];
-            }
-
-            if (uploader != null)
-            {
-                AssetBase asset = GetTransactionAsset(transactionID);
-
-                // Only legacy viewers use this, and they prefer CAPS, which 
-                // we have, so this really never runs.
-                // Allow it, but only for "safe" types.
-                if ((InventoryType)item.InvType != InventoryType.Notecard &&
-                    (InventoryType)item.InvType != InventoryType.LSL)
-                    return;
+            AssetXferUploader uploader = RequestXferUploader(transactionID);
 
-                if (asset != null)
-                {
-//                    m_log.DebugFormat(
-//                        "[AGENT ASSETS TRANSACTIONS]: Updating item {0} in {1} for transaction {2}", 
-//                        item.Name, part.Name, transactionID);
-                    
-                    asset.FullID = UUID.Random();
-                    asset.Name = item.Name;
-                    asset.Description = item.Description;
-                    asset.Type = (sbyte)item.Type;
-                    item.AssetID = asset.FullID;
-
-                    m_Scene.AssetService.Store(asset);
-                }
-            }
-            else
-            {
-                m_log.ErrorFormat(
-                    "[AGENT ASSET TRANSACTIONS]: Could not find uploader with transaction ID {0} when handling request to update task inventory item {1} in {2}",
-                    transactionID, item.Name, part.Name);
-            }
+            uploader.RequestUpdateTaskInventoryItem(remoteClient, item);
         }
 
         public void RequestUpdateInventoryItem(IClientAPI remoteClient,
                 UUID transactionID, InventoryItemBase item)
         {
-            AssetXferUploader uploader = null;
-
-            lock (XferUploaders)
-            {
-                if (XferUploaders.ContainsKey(transactionID))
-                    uploader = XferUploaders[transactionID];
-            }
+            AssetXferUploader uploader = RequestXferUploader(transactionID);
 
-            if (uploader != null)
-            {
-                uploader.RequestUpdateInventoryItem(remoteClient, transactionID, item);
-            }
-            else
-            {
-                m_log.ErrorFormat(
-                    "[AGENT ASSET TRANSACTIONS]: Could not find uploader with transaction ID {0} when handling request to update inventory item {1} for {2}",
-                    transactionID, item.Name, remoteClient.Name);
-            }
+            uploader.RequestUpdateInventoryItem(remoteClient, item);
         }
     }
 }
diff --git a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetTransactionModule.cs b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetTransactionModule.cs
index 441c4ff..7332415 100644
--- a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetTransactionModule.cs
+++ b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetTransactionModule.cs
@@ -54,7 +54,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
         private Dictionary<UUID, AgentAssetTransactions> AgentTransactions =
             new Dictionary<UUID, AgentAssetTransactions>();
         
-        #region IRegionModule Members
+        #region Region Module interface
 
         public void Initialise(IConfigSource source)
         {
@@ -215,7 +215,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
             IClientAPI remoteClient, SceneObjectPart part, UUID transactionID, TaskInventoryItem item)
         {
             m_log.DebugFormat(
-                "[TRANSACTIONS MANAGER] Called HandleTaskItemUpdateFromTransaction with item {0} in {1} for {2} in {3}",
+                "[ASSET TRANSACTION MODULE] Called HandleTaskItemUpdateFromTransaction with item {0} in {1} for {2} in {3}",
                 item.Name, part.Name, remoteClient.Name, m_Scene.RegionInfo.RegionName);
 
             AgentAssetTransactions transactions =
@@ -274,13 +274,8 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
             }
 
             AgentAssetTransactions transactions = GetUserTransactions(remoteClient.AgentId);
-            AssetXferUploader uploader = transactions.RequestXferUploader(transaction, assetID);
-
-            if (uploader != null)
-            {
-                uploader.Initialise(remoteClient, assetID, transaction, type,
-                        data, storeLocal, tempFile);
-            }
+            AssetXferUploader uploader = transactions.RequestXferUploader(transaction);
+            uploader.StartUpload(remoteClient, assetID, transaction, type, data, storeLocal, tempFile);
         }
 
         /// <summary>
diff --git a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs
index 4cedfe6..0aa4693 100644
--- a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs
+++ b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs
@@ -49,39 +49,75 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         /// <summary>
+        /// Upload state.
+        /// </summary>
+        /// <remarks>
+        /// New -> Uploading -> Complete
+        /// </remarks>
+        private enum UploadState
+        {
+            New,
+            Uploading,
+            Complete
+        }
+
+        /// <summary>
         /// Reference to the object that holds this uploader.  Used to remove ourselves from it's list if we
         /// are performing a delayed update.
         /// </summary>
         AgentAssetTransactions m_transactions;
 
+        private UploadState m_uploadState = UploadState.New;
+
         private AssetBase m_asset;
         private UUID InventFolder = UUID.Zero;
         private sbyte invType = 0;
 
-        private bool m_createItem = false;
-        private uint m_createItemCallback = 0;
-        private bool m_updateItem = false;
+        private bool m_createItem;
+        private uint m_createItemCallback;
+
+        private bool m_updateItem;
         private InventoryItemBase m_updateItemData;
 
+        private bool m_updateTaskItem;
+        private TaskInventoryItem m_updateTaskItemData;
+
         private string m_description = String.Empty;
         private bool m_dumpAssetToFile;
-        private bool m_finished = false;
         private string m_name = String.Empty;
-        private bool m_storeLocal;
+//        private bool m_storeLocal;
         private uint nextPerm = 0;
         private IClientAPI ourClient;
-        private UUID TransactionID = UUID.Zero;
+
+        private UUID m_transactionID;
+
         private sbyte type = 0;
         private byte wearableType = 0;
         private byte[] m_oldData = null;
         public ulong XferID;
         private Scene m_Scene;
 
-        public AssetXferUploader(AgentAssetTransactions transactions, Scene scene, UUID assetID, bool dumpAssetToFile)
+        /// <summary>
+        /// AssetXferUploader constructor
+        /// </summary>
+        /// <param name='transactions'>/param>
+        /// <param name='scene'></param>
+        /// <param name='transactionID'></param>
+        /// <param name='dumpAssetToFile'>
+        /// If true then when the asset is uploaded it is dumped to a file with the format
+        /// String.Format("{6}_{7}_{0:d2}{1:d2}{2:d2}_{3:d2}{4:d2}{5:d2}.dat",
+        ///   now.Year, now.Month, now.Day, now.Hour, now.Minute,
+        ///   now.Second, m_asset.Name, m_asset.Type);
+        /// for debugging purposes.
+        /// </param>
+        public AssetXferUploader(
+            AgentAssetTransactions transactions, Scene scene, UUID transactionID, bool dumpAssetToFile)
         {
+            m_asset = new AssetBase();
+
             m_transactions = transactions;
+            m_transactionID = transactionID;
             m_Scene = scene;
-            m_asset = new AssetBase() { FullID = assetID };
             m_dumpAssetToFile = dumpAssetToFile;
         }
 
@@ -100,18 +136,27 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
 
             if (XferID == xferID)
             {
-                if (m_asset.Data.Length > 1)
-                {
-                    byte[] destinationArray = new byte[m_asset.Data.Length + data.Length];
-                    Array.Copy(m_asset.Data, 0, destinationArray, 0, m_asset.Data.Length);
-                    Array.Copy(data, 0, destinationArray, m_asset.Data.Length, data.Length);
-                    m_asset.Data = destinationArray;
-                }
-                else
+                lock (this)
                 {
-                    byte[] buffer2 = new byte[data.Length - 4];
-                    Array.Copy(data, 4, buffer2, 0, data.Length - 4);
-                    m_asset.Data = buffer2;
+                    int assetLength = m_asset.Data.Length;
+                    int dataLength = data.Length;
+
+                    if (m_asset.Data.Length > 1)
+                    {
+                        byte[] destinationArray = new byte[assetLength + dataLength];
+                        Array.Copy(m_asset.Data, 0, destinationArray, 0, assetLength);
+                        Array.Copy(data, 0, destinationArray, assetLength, dataLength);
+                        m_asset.Data = destinationArray;
+                    }
+                    else
+                    {
+                        if (dataLength > 4)
+                        {
+                            byte[] buffer2 = new byte[dataLength - 4];
+                            Array.Copy(data, 4, buffer2, 0, dataLength - 4);
+                            m_asset.Data = buffer2;
+                        }
+                    }
                 }
 
                 ourClient.SendConfirmXfer(xferID, packetID);
@@ -127,30 +172,50 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
         }
 
         /// <summary>
-        /// Initialise asset transfer from the client
+        /// Start asset transfer from the client
         /// </summary>
-        /// <param name="xferID"></param>
-        /// <param name="packetID"></param>
-        /// <param name="data"></param>
-        public void Initialise(IClientAPI remoteClient, UUID assetID,
-                UUID transaction, sbyte type, byte[] data, bool storeLocal,
-                bool tempFile)
+        /// <param name="remoteClient"></param>
+        /// <param name="assetID"></param>
+        /// <param name="transaction"></param>
+        /// <param name="type"></param>
+        /// <param name="data">
+        /// Optional data.  If present then the asset is created immediately with this data
+        /// rather than requesting an upload from the client.  The data must be longer than 2 bytes.
+        /// </param>
+        /// <param name="storeLocal"></param>
+        /// <param name="tempFile"></param>
+        public void StartUpload(
+            IClientAPI remoteClient, UUID assetID, UUID transaction, sbyte type, byte[] data, bool storeLocal,
+            bool tempFile)
         {
 //            m_log.DebugFormat(
 //                "[ASSET XFER UPLOADER]: Initialised xfer from {0}, asset {1}, transaction {2}, type {3}, storeLocal {4}, tempFile {5}, already received data length {6}",
 //                remoteClient.Name, assetID, transaction, type, storeLocal, tempFile, data.Length);
 
+            lock (this)
+            {
+                if (m_uploadState != UploadState.New)
+                {
+                    m_log.WarnFormat(
+                        "[ASSET XFER UPLOADER]: Tried to start upload of asset {0}, transaction {1} for {2} but this is already in state {3}.  Aborting.",
+                        assetID, transaction, remoteClient.Name, m_uploadState);
+
+                    return;
+                }
+
+                m_uploadState = UploadState.Uploading;
+            }
+
             ourClient = remoteClient;
-            m_asset.Name = "blank";
-            m_asset.Description = "empty";
+
+            m_asset.FullID = assetID;
             m_asset.Type = type;
             m_asset.CreatorID = remoteClient.AgentId.ToString();
             m_asset.Data = data;
             m_asset.Local = storeLocal;
             m_asset.Temporary = tempFile;
 
-            TransactionID = transaction;
-            m_storeLocal = storeLocal;
+//            m_storeLocal = storeLocal;
 
             if (m_asset.Data.Length > 2)
             {
@@ -175,36 +240,35 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
 
         protected void SendCompleteMessage()
         {
-            ourClient.SendAssetUploadCompleteMessage(m_asset.Type, true,
-                    m_asset.FullID);
-
             // We must lock in order to avoid a race with a separate thread dealing with an inventory item or create
             // message from other client UDP.
             lock (this)
             {
-                m_finished = true;
+                m_uploadState = UploadState.Complete;
+
+                ourClient.SendAssetUploadCompleteMessage(m_asset.Type, true, m_asset.FullID);
+
                 if (m_createItem)
                 {
-                    DoCreateItem(m_createItemCallback);
+                    CompleteCreateItem(m_createItemCallback);
                 }
                 else if (m_updateItem)
                 {
-                    StoreAssetForItemUpdate(m_updateItemData);
-    
-                    // Remove ourselves from the list of transactions if completion was delayed until the transaction
-                    // was complete.
-                    // TODO: Should probably do the same for create item.
-                    m_transactions.RemoveXferUploader(TransactionID);
+                    CompleteItemUpdate(m_updateItemData);
                 }
-                else if (m_storeLocal)
+                else if (m_updateTaskItem)
                 {
-                    m_Scene.AssetService.Store(m_asset);
+                    CompleteTaskItemUpdate(m_updateTaskItemData);
                 }
+//                else if (m_storeLocal)
+//                {
+//                    m_Scene.AssetService.Store(m_asset);
+//                }
             }
 
             m_log.DebugFormat(
                 "[ASSET XFER UPLOADER]: Uploaded asset {0} for transaction {1}",
-                m_asset.FullID, TransactionID);
+                m_asset.FullID, m_transactionID);
 
             if (m_dumpAssetToFile)
             {
@@ -232,40 +296,37 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
         }
 
         public void RequestCreateInventoryItem(IClientAPI remoteClient,
-                UUID transactionID, UUID folderID, uint callbackID,
+                UUID folderID, uint callbackID,
                 string description, string name, sbyte invType,
                 sbyte type, byte wearableType, uint nextOwnerMask)
         {
-            if (TransactionID == transactionID)
+            InventFolder = folderID;
+            m_name = name;
+            m_description = description;
+            this.type = type;
+            this.invType = invType;
+            this.wearableType = wearableType;
+            nextPerm = nextOwnerMask;
+            m_asset.Name = name;
+            m_asset.Description = description;
+            m_asset.Type = type;
+
+            // We must lock to avoid a race with a separate thread uploading the asset.
+            lock (this)
             {
-                InventFolder = folderID;
-                m_name = name;
-                m_description = description;
-                this.type = type;
-                this.invType = invType;
-                this.wearableType = wearableType;
-                nextPerm = nextOwnerMask;
-                m_asset.Name = name;
-                m_asset.Description = description;
-                m_asset.Type = type;
-
-                // We must lock to avoid a race with a separate thread uploading the asset.
-                lock (this)
+                if (m_uploadState == UploadState.Complete)
                 {
-                    if (m_finished)
-                    {
-                        DoCreateItem(callbackID);
-                    }
-                    else
-                    {
-                        m_createItem = true; //set flag so the inventory item is created when upload is complete
-                        m_createItemCallback = callbackID;
-                    }
+                    CompleteCreateItem(callbackID);
+                }
+                else
+                {
+                    m_createItem = true; //set flag so the inventory item is created when upload is complete
+                    m_createItemCallback = callbackID;
                 }
             }
         }
 
-        public void RequestUpdateInventoryItem(IClientAPI remoteClient, UUID transactionID, InventoryItemBase item)
+        public void RequestUpdateInventoryItem(IClientAPI remoteClient, InventoryItemBase item)
         {
             // We must lock to avoid a race with a separate thread uploading the asset.
             lock (this)
@@ -280,9 +341,9 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
                 item.AssetID = m_asset.FullID;
                 m_Scene.InventoryService.UpdateItem(item);
 
-                if (m_finished)
+                if (m_uploadState == UploadState.Complete)
                 {
-                    StoreAssetForItemUpdate(item);
+                    CompleteItemUpdate(item);
                 }
                 else
                 {
@@ -296,20 +357,59 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
             }
         }
 
+        public void RequestUpdateTaskInventoryItem(IClientAPI remoteClient, TaskInventoryItem taskItem)
+        {
+            // We must lock to avoid a race with a separate thread uploading the asset.
+            lock (this)
+            {
+                m_asset.Name = taskItem.Name;
+                m_asset.Description = taskItem.Description;
+                m_asset.Type = (sbyte)taskItem.Type;
+                taskItem.AssetID = m_asset.FullID;
+
+                if (m_uploadState == UploadState.Complete)
+                {
+                    CompleteTaskItemUpdate(taskItem);
+                }
+                else
+                {
+                    m_updateTaskItem = true;
+                    m_updateTaskItemData = taskItem;
+                }
+            }
+        }
+
         /// <summary>
-        /// Store the asset for the given item.
+        /// Store the asset for the given item when it has been uploaded.
         /// </summary>
         /// <param name="item"></param>
-        private void StoreAssetForItemUpdate(InventoryItemBase item)
+        private void CompleteItemUpdate(InventoryItemBase item)
         {
 //            m_log.DebugFormat(
 //                "[ASSET XFER UPLOADER]: Storing asset {0} for earlier item update for {1} for {2}",
 //                m_asset.FullID, item.Name, ourClient.Name);
 
             m_Scene.AssetService.Store(m_asset);
+
+            m_transactions.RemoveXferUploader(m_transactionID);
         }
 
-        private void DoCreateItem(uint callbackID)
+        /// <summary>
+        /// Store the asset for the given task item when it has been uploaded.
+        /// </summary>
+        /// <param name="taskItem"></param>
+        private void CompleteTaskItemUpdate(TaskInventoryItem taskItem)
+        {
+//            m_log.DebugFormat(
+//                "[ASSET XFER UPLOADER]: Storing asset {0} for earlier task item update for {1} for {2}",
+//                m_asset.FullID, taskItem.Name, ourClient.Name);
+
+            m_Scene.AssetService.Store(m_asset);
+
+            m_transactions.RemoveXferUploader(m_transactionID);
+        }
+
+        private void CompleteCreateItem(uint callbackID)
         {
             ValidateAssets();
             m_Scene.AssetService.Store(m_asset);
@@ -339,6 +439,8 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
                 ourClient.SendInventoryItemCreateUpdate(item, callbackID);
             else
                 ourClient.SendAlertMessage("Unable to create inventory item");
+
+            m_transactions.RemoveXferUploader(m_transactionID);
         }
 
         private void ValidateAssets()
@@ -416,7 +518,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
         /// <returns>null if the asset has not finished uploading</returns>
         public AssetBase GetAssetData()
         {
-            if (m_finished)
+            if (m_uploadState == UploadState.Complete)
             {
                 ValidateAssets();
                 return m_asset;
@@ -469,4 +571,3 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
         }
     }
 }
-
diff --git a/OpenSim/Region/CoreModules/Agent/IPBan/IPBanModule.cs b/OpenSim/Region/CoreModules/Agent/IPBan/IPBanModule.cs
index bfe2a71..4b457b1 100644
--- a/OpenSim/Region/CoreModules/Agent/IPBan/IPBanModule.cs
+++ b/OpenSim/Region/CoreModules/Agent/IPBan/IPBanModule.cs
@@ -29,6 +29,7 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Text;
+using Mono.Addins;
 using Nini.Config;
 using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
@@ -36,13 +37,18 @@ using OpenSim.Region.Framework.Scenes;
 
 namespace OpenSim.Region.CoreModules.Agent.IPBan
 {
-    public class IPBanModule : IRegionModule 
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "IPBanModule")]
+    public class IPBanModule : ISharedRegionModule 
     {
-        #region Implementation of IRegionModule
+        #region Implementation of ISharedRegionModule
 
         private List<string> m_bans = new List<string>();
 
-        public void Initialise(Scene scene, IConfigSource source)
+        public void Initialise(IConfigSource source)
+        {
+        }
+
+        public void AddRegion(Scene scene)
         {
             new SceneBanner(scene, m_bans);
 
@@ -50,7 +56,7 @@ namespace OpenSim.Region.CoreModules.Agent.IPBan
             {
                 foreach (EstateBan ban in scene.RegionInfo.EstateSettings.EstateBans)
                 {
-                    if (!String.IsNullOrEmpty(ban.BannedHostIPMask)) 
+                    if (!String.IsNullOrEmpty(ban.BannedHostIPMask))
                         m_bans.Add(ban.BannedHostIPMask);
                     if (!String.IsNullOrEmpty(ban.BannedHostNameMask))
                         m_bans.Add(ban.BannedHostNameMask);
@@ -58,6 +64,14 @@ namespace OpenSim.Region.CoreModules.Agent.IPBan
             }
         }
 
+        public void RemoveRegion(Scene scene)
+        {
+        }
+
+        public void RegionLoaded(Scene scene)
+        {
+        }
+
         public void PostInitialise()
         {
             if (File.Exists("bans.txt"))
@@ -80,9 +94,9 @@ namespace OpenSim.Region.CoreModules.Agent.IPBan
             get { return "IPBanModule"; }
         }
 
-        public bool IsSharedModule
+        public Type ReplaceableInterface
         {
-            get { return true; }
+            get { return null; }
         }
 
         #endregion
diff --git a/OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs b/OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs
index a1a2501..3764685 100644
--- a/OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs
+++ b/OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs
@@ -32,6 +32,7 @@ using System.Reflection;
 using System.Text;
 using System.Threading;
 using log4net;
+using Mono.Addins;
 using Nini.Config;
 using OpenMetaverse;
 using OpenMetaverse.Imaging;
@@ -45,7 +46,8 @@ namespace OpenSim.Region.CoreModules.Agent.TextureSender
 {
     public delegate void J2KDecodeDelegate(UUID assetID);
 
-    public class J2KDecoderModule : IRegionModule, IJ2KDecoder
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "J2KDecoderModule")]
+    public class J2KDecoderModule : ISharedRegionModule, IJ2KDecoder
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
@@ -55,27 +57,32 @@ namespace OpenSim.Region.CoreModules.Agent.TextureSender
         private readonly Dictionary<UUID, List<DecodedCallback>> m_notifyList = new Dictionary<UUID, List<DecodedCallback>>();
         /// <summary>Cache that will store decoded JPEG2000 layer boundary data</summary>
         private IImprovedAssetCache m_cache;
+        private IImprovedAssetCache Cache
+        {
+            get
+            {
+                if (m_cache == null)
+                    m_cache = m_scene.RequestModuleInterface<IImprovedAssetCache>();
+
+                return m_cache;
+            }
+        }
         /// <summary>Reference to a scene (doesn't matter which one as long as it can load the cache module)</summary>
+        private UUID m_CreatorID = UUID.Zero;
         private Scene m_scene;
 
-        #region IRegionModule
+        #region ISharedRegionModule
 
         private bool m_useCSJ2K = true;
 
         public string Name { get { return "J2KDecoderModule"; } }
-        public bool IsSharedModule { get { return true; } }
 
         public J2KDecoderModule()
         {
         }
 
-        public void Initialise(Scene scene, IConfigSource source)
+        public void Initialise(IConfigSource source)
         {
-            if (m_scene == null)
-                m_scene = scene;
-
-            scene.RegisterModuleInterface<IJ2KDecoder>(this);
-
             IConfig startupConfig = source.Configs["Startup"];
             if (startupConfig != null)
             {
@@ -83,16 +90,42 @@ namespace OpenSim.Region.CoreModules.Agent.TextureSender
             }
         }
 
+        public void AddRegion(Scene scene)
+        {
+            if (m_scene == null)
+            {
+                m_scene = scene;
+                m_CreatorID = scene.RegionInfo.RegionID;
+            }
+
+            scene.RegisterModuleInterface<IJ2KDecoder>(this);
+
+        }
+
+        public void RemoveRegion(Scene scene)
+        {
+            if (m_scene == scene)
+                m_scene = null;
+        }
+
         public void PostInitialise()
         {
-            m_cache = m_scene.RequestModuleInterface<IImprovedAssetCache>();
         }
 
         public void Close()
         {
         }
 
-        #endregion IRegionModule
+        public void RegionLoaded(Scene scene)
+        {
+        }
+
+        public Type ReplaceableInterface
+        {
+            get { return null; }
+        }
+
+        #endregion Region Module interface
 
         #region IJ2KDecoder
 
@@ -275,11 +308,11 @@ namespace OpenSim.Region.CoreModules.Agent.TextureSender
         {
             m_decodedCache.AddOrUpdate(AssetId, Layers, TimeSpan.FromMinutes(10));
 
-            if (m_cache != null)
+            if (Cache != null)
             {
                 string assetID = "j2kCache_" + AssetId.ToString();
 
-                AssetBase layerDecodeAsset = new AssetBase(assetID, assetID, (sbyte)AssetType.Notecard, m_scene.RegionInfo.RegionID.ToString());
+                AssetBase layerDecodeAsset = new AssetBase(assetID, assetID, (sbyte)AssetType.Notecard, m_CreatorID.ToString());
                 layerDecodeAsset.Local = true;
                 layerDecodeAsset.Temporary = true;
 
@@ -299,7 +332,7 @@ namespace OpenSim.Region.CoreModules.Agent.TextureSender
 
                 #endregion Serialize Layer Data
 
-                m_cache.Cache(layerDecodeAsset);
+                Cache.Cache(layerDecodeAsset);
             }
         }
 
@@ -309,10 +342,10 @@ namespace OpenSim.Region.CoreModules.Agent.TextureSender
             {
                 return true;
             }
-            else if (m_cache != null)
+            else if (Cache != null)
             {
                 string assetName = "j2kCache_" + AssetId.ToString();
-                AssetBase layerDecodeAsset = m_cache.Get(assetName);
+                AssetBase layerDecodeAsset = Cache.Get(assetName);
 
                 if (layerDecodeAsset != null)
                 {
@@ -324,7 +357,7 @@ namespace OpenSim.Region.CoreModules.Agent.TextureSender
                     if (lines.Length == 0)
                     {
                         m_log.Warn("[J2KDecodeCache]: Expiring corrupted layer data (empty) " + assetName);
-                        m_cache.Expire(assetName);
+                        Cache.Expire(assetName);
                         return false;
                     }
 
@@ -345,7 +378,7 @@ namespace OpenSim.Region.CoreModules.Agent.TextureSender
                             catch (FormatException)
                             {
                                 m_log.Warn("[J2KDecodeCache]: Expiring corrupted layer data (format) " + assetName);
-                                m_cache.Expire(assetName);
+                                Cache.Expire(assetName);
                                 return false;
                             }
 
@@ -356,7 +389,7 @@ namespace OpenSim.Region.CoreModules.Agent.TextureSender
                         else
                         {
                             m_log.Warn("[J2KDecodeCache]: Expiring corrupted layer data (layout) " + assetName);
-                            m_cache.Expire(assetName);
+                            Cache.Expire(assetName);
                             return false;
                         }
                     }
diff --git a/OpenSim/Region/CoreModules/Agent/Xfer/XferModule.cs b/OpenSim/Region/CoreModules/Agent/Xfer/XferModule.cs
index 78d597d..7113f4f 100644
--- a/OpenSim/Region/CoreModules/Agent/Xfer/XferModule.cs
+++ b/OpenSim/Region/CoreModules/Agent/Xfer/XferModule.cs
@@ -35,9 +35,12 @@ using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 
+using Mono.Addins;
+
 namespace OpenSim.Region.CoreModules.Agent.Xfer
 {
-    public class XferModule : IRegionModule, IXfer
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "XferModule")]
+    public class XferModule : INonSharedRegionModule, IXfer
     {
         private Scene m_scene;
         private Dictionary<string, FileData> NewFiles = new Dictionary<string, FileData>();
@@ -59,9 +62,13 @@ namespace OpenSim.Region.CoreModules.Agent.Xfer
             public int Count;
         }
        
-        #region IRegionModule Members
+        #region INonSharedRegionModule Members
+
+        public void Initialise(IConfigSource config)
+        {
+        }
 
-        public void Initialise(Scene scene, IConfigSource config)
+        public void AddRegion(Scene scene)
         {
             m_scene = scene;
             m_scene.EventManager.OnNewClient += NewClient;
@@ -69,22 +76,30 @@ namespace OpenSim.Region.CoreModules.Agent.Xfer
             m_scene.RegisterModuleInterface<IXfer>(this);
         }
 
-        public void PostInitialise()
+        public void RemoveRegion(Scene scene)
         {
+            m_scene.EventManager.OnNewClient -= NewClient;
+
+            m_scene.UnregisterModuleInterface<IXfer>(this);
+            m_scene = null;
         }
 
-        public void Close()
+        public void RegionLoaded(Scene scene)
         {
         }
 
-        public string Name
+        public Type ReplaceableInterface
         {
-            get { return "XferModule"; }
+            get { return null; }
         }
 
-        public bool IsSharedModule
+        public void Close()
         {
-            get { return false; }
+        }
+
+        public string Name
+        {
+            get { return "XferModule"; }
         }
 
         #endregion
diff --git a/OpenSim/Region/CoreModules/Asset/CenomeAssetCache.cs b/OpenSim/Region/CoreModules/Asset/CenomeAssetCache.cs
index b1b7b27..e40caec 100644
--- a/OpenSim/Region/CoreModules/Asset/CenomeAssetCache.cs
+++ b/OpenSim/Region/CoreModules/Asset/CenomeAssetCache.cs
@@ -28,6 +28,7 @@
 using System;
 using System.Reflection;
 using log4net;
+using Mono.Addins;
 using Nini.Config;
 using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
@@ -89,6 +90,7 @@ namespace OpenSim.Region.CoreModules.Asset
     /// ExpirationTime = 60
     /// </code>
     /// </example>
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "CenomeMemoryAssetCache")]
     public class CenomeMemoryAssetCache : IImprovedAssetCache, ISharedRegionModule
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
diff --git a/OpenSim/Region/CoreModules/Asset/CoreAssetCache.cs b/OpenSim/Region/CoreModules/Asset/CoreAssetCache.cs
index 7da5e7a..9742a5c 100644
--- a/OpenSim/Region/CoreModules/Asset/CoreAssetCache.cs
+++ b/OpenSim/Region/CoreModules/Asset/CoreAssetCache.cs
@@ -30,6 +30,7 @@ using System;
 using System.IO;
 using System.Collections.Generic;
 using System.Reflection;
+using Mono.Addins;
 using Nini.Config;
 using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
@@ -38,6 +39,7 @@ using OpenSim.Services.Interfaces;
 
 namespace OpenSim.Region.CoreModules.Asset
 {
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "CoreAssetCache")]
     public class CoreAssetCache : ISharedRegionModule, IImprovedAssetCache
     {
         private static readonly ILog m_log =
diff --git a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
index 7d7176f..b1bb56b 100644
--- a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
+++ b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
@@ -49,12 +49,12 @@ using OpenSim.Region.Framework.Scenes;
 using OpenSim.Services.Interfaces;
 
 
-[assembly: Addin("FlotsamAssetCache", "1.1")]
-[assembly: AddinDependency("OpenSim", "0.5")]
+//[assembly: Addin("FlotsamAssetCache", "1.1")]
+//[assembly: AddinDependency("OpenSim", "0.5")]
 
-namespace Flotsam.RegionModules.AssetCache
+namespace OpenSim.Region.CoreModules.Asset
 {
-    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "FlotsamAssetCache")]
     public class FlotsamAssetCache : ISharedRegionModule, IImprovedAssetCache, IAssetService
     {
         private static readonly ILog m_log =
@@ -107,8 +107,6 @@ namespace Flotsam.RegionModules.AssetCache
         private IAssetService m_AssetService;
         private List<Scene> m_Scenes = new List<Scene>();
 
-        private bool m_DeepScanBeforePurge;
-
         public FlotsamAssetCache()
         {
             m_InvalidChars.AddRange(Path.GetInvalidPathChars());
@@ -170,8 +168,6 @@ namespace Flotsam.RegionModules.AssetCache
                         m_CacheDirectoryTierLen = assetConfig.GetInt("CacheDirectoryTierLength", m_CacheDirectoryTierLen);
 
                         m_CacheWarnAt = assetConfig.GetInt("CacheWarnAt", m_CacheWarnAt);
-
-                        m_DeepScanBeforePurge = assetConfig.GetBoolean("DeepScanBeforePurge", m_DeepScanBeforePurge);
                     }
 
                     m_log.InfoFormat("[FLOTSAM ASSET CACHE]: Cache Directory {0}", m_CacheDirectory);
@@ -226,10 +222,6 @@ namespace Flotsam.RegionModules.AssetCache
                 scene.RegisterModuleInterface<IImprovedAssetCache>(this);
                 m_Scenes.Add(scene);
 
-                if (m_AssetService == null)
-                {
-                    m_AssetService = scene.RequestModuleInterface<IAssetService>();
-                }
             }
         }
 
@@ -244,6 +236,8 @@ namespace Flotsam.RegionModules.AssetCache
 
         public void RegionLoaded(Scene scene)
         {
+            if (m_Enabled && m_AssetService == null)
+                m_AssetService = scene.RequestModuleInterface<IAssetService>();
         }
 
         ////////////////////////////////////////////////////////////
@@ -519,13 +513,10 @@ namespace Flotsam.RegionModules.AssetCache
             // Purge all files last accessed prior to this point
             DateTime purgeLine = DateTime.Now - m_FileExpiration;
 
-            // An optional deep scan at this point will ensure assets present in scenes,
-            // or referenced by objects in the scene, but not recently accessed 
-            // are not purged.
-            if (m_DeepScanBeforePurge)
-            {
-                CacheScenes();
-            }
+            // An asset cache may contain local non-temporary assets that are not in the asset service.  Therefore,
+            // before cleaning up expired files we must scan the objects in the scene to make sure that we retain
+            // such local assets if they have not been recently accessed.
+            TouchAllSceneAssets(false);
 
             foreach (string dir in Directory.GetDirectories(m_CacheDirectory))
             {
@@ -718,11 +709,14 @@ namespace Flotsam.RegionModules.AssetCache
 
         /// <summary>
         /// Iterates through all Scenes, doing a deep scan through assets 
-        /// to cache all assets present in the scene or referenced by assets 
-        /// in the scene
+        /// to update the access time of all assets present in the scene or referenced by assets
+        /// in the scene.
         /// </summary>
-        /// <returns></returns>
-        private int CacheScenes()
+        /// <param name="storeUncached">
+        /// If true, then assets scanned which are not found in cache are added to the cache.
+        /// </param>
+        /// <returns>Number of distinct asset references found in the scene.</returns>
+        private int TouchAllSceneAssets(bool storeUncached)
         {
             UuidGatherer gatherer = new UuidGatherer(m_AssetService);
 
@@ -745,7 +739,7 @@ namespace Flotsam.RegionModules.AssetCache
                 {
                     File.SetLastAccessTime(filename, DateTime.Now);
                 }
-                else
+                else if (storeUncached)
                 {
                     m_AssetService.Get(assetID.ToString());
                 }
@@ -873,13 +867,14 @@ namespace Flotsam.RegionModules.AssetCache
 
                         break;
 
-
                     case "assets":
-                        m_log.Info("[FLOTSAM ASSET CACHE]: Caching all assets, in all scenes.");
+                        m_log.Info("[FLOTSAM ASSET CACHE]: Ensuring assets are cached for all scenes.");
 
                         Util.FireAndForget(delegate {
-                            int assetsCached = CacheScenes();
-                            m_log.InfoFormat("[FLOTSAM ASSET CACHE]: Completed Scene Caching, {0} assets found.", assetsCached);
+                            int assetReferenceTotal = TouchAllSceneAssets(true);
+                            m_log.InfoFormat(
+                                "[FLOTSAM ASSET CACHE]: Completed check with {0} assets.",
+                                assetReferenceTotal);
                         });
 
                         break;
diff --git a/OpenSim/Region/CoreModules/Asset/GlynnTuckerAssetCache.cs b/OpenSim/Region/CoreModules/Asset/GlynnTuckerAssetCache.cs
index 1365e69..9592ca0 100644
--- a/OpenSim/Region/CoreModules/Asset/GlynnTuckerAssetCache.cs
+++ b/OpenSim/Region/CoreModules/Asset/GlynnTuckerAssetCache.cs
@@ -31,6 +31,7 @@ using System.IO;
 using System.Collections.Generic;
 using System.Reflection;
 using GlynnTucker.Cache;
+using Mono.Addins;
 using Nini.Config;
 using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
@@ -39,6 +40,7 @@ using OpenSim.Services.Interfaces;
 
 namespace OpenSim.Region.CoreModules.Asset
 {
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "GlynnTuckerAssetCache")]
     public class GlynnTuckerAssetCache : ISharedRegionModule, IImprovedAssetCache
     {
         private static readonly ILog m_log =
diff --git a/OpenSim/Region/CoreModules/Asset/Tests/FlotsamAssetCacheTests.cs b/OpenSim/Region/CoreModules/Asset/Tests/FlotsamAssetCacheTests.cs
index c91b25f..1c2bfd0 100644
--- a/OpenSim/Region/CoreModules/Asset/Tests/FlotsamAssetCacheTests.cs
+++ b/OpenSim/Region/CoreModules/Asset/Tests/FlotsamAssetCacheTests.cs
@@ -35,7 +35,6 @@ using Nini.Config;
 using NUnit.Framework;
 using OpenMetaverse;
 using OpenMetaverse.Assets;
-using Flotsam.RegionModules.AssetCache;
 using OpenSim.Framework;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Region.Framework.Scenes.Serialization;
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
index 951afd7..acd156e 100644
--- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
@@ -286,6 +286,20 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
         
         public bool AttachObject(IScenePresence sp, SceneObjectGroup group, uint attachmentPt, bool silent, bool useAttachData, bool temp)
         {
+            if (!Enabled)
+                return false;
+
+            if (AttachObjectInternal(sp, group, attachmentPt, silent, useAttachData, temp))
+            {
+                m_scene.EventManager.TriggerOnAttach(group.LocalId, group.FromItemID, sp.UUID);
+                return true;
+            }
+
+            return false;
+        }
+        
+        private bool AttachObjectInternal(IScenePresence sp, SceneObjectGroup group, uint attachmentPt, bool silent, bool useAttachData, bool temp)
+        {
             lock (sp.AttachmentsSyncLock)
             {
 //                m_log.DebugFormat(
@@ -461,6 +475,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
 
         public void DetachSingleAttachmentToGround(IScenePresence sp, uint soLocalId)
         {
+            DetachSingleAttachmentToGround(sp, soLocalId, sp.AbsolutePosition, Quaternion.Identity);
+        }
+
+        public void DetachSingleAttachmentToGround(IScenePresence sp, uint soLocalId, Vector3 absolutePos, Quaternion absoluteRot)
+        {
             if (!Enabled)
                 return;
 
@@ -502,7 +521,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
                 so.FromItemID = UUID.Zero;
 
                 SceneObjectPart rootPart = so.RootPart;
-                so.AbsolutePosition = sp.AbsolutePosition;
+                so.AbsolutePosition = absolutePos;
+                if (absoluteRot != Quaternion.Identity)
+                {
+                    so.UpdateGroupRotationR(absoluteRot);
+                }
                 so.AttachedAvatar = UUID.Zero;
                 rootPart.SetParentLocalId(0);
                 so.ClearPartAttachmentData();
@@ -616,9 +639,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
 
             if (grp.HasGroupChanged)
             {
-//                m_log.DebugFormat(
-//                    "[ATTACHMENTS MODULE]: Updating asset for attachment {0}, attachpoint {1}",
-//                    grp.UUID, grp.AttachmentPoint);
+                m_log.DebugFormat(
+                    "[ATTACHMENTS MODULE]: Updating asset for attachment {0}, attachpoint {1}",
+                    grp.UUID, grp.AttachmentPoint);
 
                 string sceneObjectXml = SceneObjectSerializer.ToOriginalXmlFormat(grp, scriptedState);
 
@@ -862,7 +885,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
                     // This will throw if the attachment fails
                     try
                     {
-                        AttachObject(sp, objatt, attachmentPt, false, false, false);
+                        AttachObjectInternal(sp, objatt, attachmentPt, false, false, false);
                     }
                     catch (Exception e)
                     {
@@ -933,6 +956,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
 
             InventoryItemBase item = new InventoryItemBase(itemID, sp.UUID);
             item = m_scene.InventoryService.GetItem(item);
+            if (item == null)
+                return;
+
             bool changed = sp.Appearance.SetAttachment((int)AttachmentPt, itemID, item.AssetID);
             if (changed && m_scene.AvatarFactory != null)
             {
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
index d9a619d..4e9d3f9 100644
--- a/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
@@ -62,7 +62,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests
     public class AttachmentsModuleTests : OpenSimTestCase
     {
         private AutoResetEvent m_chatEvent = new AutoResetEvent(false);
-        private OSChatMessage m_osChatMessageReceived;
+//        private OSChatMessage m_osChatMessageReceived;
+
+        // Used to test whether the operations have fired the attach event.  Must be reset after each test.
+        private int m_numberOfAttachEventsFired;
 
         [TestFixtureSetUp]
         public void FixtureInit()
@@ -83,7 +86,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests
         {
 //            Console.WriteLine("Got chat [{0}]", oscm.Message);
 
-            m_osChatMessageReceived = oscm;
+//            m_osChatMessageReceived = oscm;
             m_chatEvent.Set();
         }
 
@@ -99,6 +102,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests
                     "attachments-test-scene", TestHelpers.ParseTail(999), 1000, 1000, config);
             SceneHelpers.SetupSceneModules(scene, config, modules.ToArray());
 
+            scene.EventManager.OnAttach += (localID, itemID, avatarID) => m_numberOfAttachEventsFired++;
+
             return scene;
         }
 
@@ -181,6 +186,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests
             TestHelpers.InMethod();
 //            TestHelpers.EnableLogging();
 
+            m_numberOfAttachEventsFired = 0;
+
             Scene scene = CreateTestScene();
             UserAccount ua1 = UserAccountHelpers.CreateUserWithInventory(scene, 0x1);
             ScenePresence sp = SceneHelpers.AddScenePresence(scene, ua1);
@@ -189,6 +196,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests
 
             SceneObjectGroup so = SceneHelpers.AddSceneObject(scene, attName, sp.UUID);
 
+            m_numberOfAttachEventsFired = 0;
             scene.AttachmentsModule.AttachObject(sp, so, (uint)AttachmentPoint.Chest, false, false, false);
 
             // Check status on scene presence
@@ -216,7 +224,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests
 
             Assert.That(scene.GetSceneObjectGroups().Count, Is.EqualTo(1));
 
-//            TestHelpers.DisableLogging();
+            // Check events
+            Assert.That(m_numberOfAttachEventsFired, Is.EqualTo(1));
         }
 
         /// <summary>
@@ -228,6 +237,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests
             TestHelpers.InMethod();
 //            TestHelpers.EnableLogging();
 
+            m_numberOfAttachEventsFired = 0;
+
             Scene scene = CreateTestScene();
             UserAccount ua1 = UserAccountHelpers.CreateUserWithInventory(scene, 0x1);
             ScenePresence sp = SceneHelpers.AddScenePresence(scene, ua1);
@@ -247,6 +258,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests
 
             Assert.That(sp.HasAttachments(), Is.False);
             Assert.That(scene.GetSceneObjectGroups().Count, Is.EqualTo(1));
+
+            // Check events
+            Assert.That(m_numberOfAttachEventsFired, Is.EqualTo(0));
         }
 
         [Test]
@@ -261,6 +275,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests
 
             InventoryItemBase attItem = CreateAttachmentItem(scene, ua1.PrincipalID, "att", 0x10, 0x20);
 
+            m_numberOfAttachEventsFired = 0;
             scene.AttachmentsModule.RezSingleAttachmentFromInventory(
                 sp, attItem.ID, (uint)AttachmentPoint.Chest);
 
@@ -280,6 +295,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests
             Assert.That(sp.Appearance.GetAttachpoint(attItem.ID), Is.EqualTo((int)AttachmentPoint.Chest));
 
             Assert.That(scene.GetSceneObjectGroups().Count, Is.EqualTo(1));
+
+            // Check events
+            Assert.That(m_numberOfAttachEventsFired, Is.EqualTo(1));
         }
 
         /// <summary>
@@ -338,6 +356,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests
             ISceneEntity so
                 = scene.AttachmentsModule.RezSingleAttachmentFromInventory(
                     sp, attItem.ID, (uint)AttachmentPoint.Chest);
+
+            m_numberOfAttachEventsFired = 0;
             scene.AttachmentsModule.DetachSingleAttachmentToGround(sp, so.LocalId);
 
             // Check scene presence status
@@ -353,6 +373,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests
 
             // Check object in scene
             Assert.That(scene.GetSceneObjectGroup("att"), Is.Not.Null);
+
+            // Check events
+            Assert.That(m_numberOfAttachEventsFired, Is.EqualTo(1));
         }
 
         [Test]
@@ -369,6 +392,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests
             SceneObjectGroup so
                 = (SceneObjectGroup)scene.AttachmentsModule.RezSingleAttachmentFromInventory(
                     sp, attItem.ID, (uint)AttachmentPoint.Chest);
+
+            m_numberOfAttachEventsFired = 0;
             scene.AttachmentsModule.DetachSingleAttachmentToInv(sp, so);
 
             // Check status on scene presence
@@ -380,6 +405,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests
             Assert.That(sp.Appearance.GetAttachpoint(attItem.ID), Is.EqualTo(0));
 
             Assert.That(scene.GetSceneObjectGroups().Count, Is.EqualTo(0));
+
+            // Check events
+            Assert.That(m_numberOfAttachEventsFired, Is.EqualTo(1));
         }
 
         /// <summary>
@@ -461,10 +489,14 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests
 
             SceneObjectGroup rezzedAtt = presence.GetAttachments()[0];
 
-            scene.IncomingCloseAgent(presence.UUID);
+            m_numberOfAttachEventsFired = 0;
+            scene.IncomingCloseAgent(presence.UUID, false);
 
             // Check that we can't retrieve this attachment from the scene.
             Assert.That(scene.GetSceneObjectGroup(rezzedAtt.UUID), Is.Null);
+
+            // Check events
+            Assert.That(m_numberOfAttachEventsFired, Is.EqualTo(0));
         }
 
         [Test]
@@ -480,6 +512,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests
             AgentCircuitData acd = SceneHelpers.GenerateAgentData(ua1.PrincipalID);
             acd.Appearance = new AvatarAppearance();
             acd.Appearance.SetAttachment((int)AttachmentPoint.Chest, attItem.ID, attItem.AssetID);
+
+            m_numberOfAttachEventsFired = 0;
             ScenePresence presence = SceneHelpers.AddScenePresence(scene, acd);
 
             Assert.That(presence.HasAttachments(), Is.True);
@@ -502,6 +536,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests
             Assert.That(presence.Appearance.GetAttachpoint(attItem.ID), Is.EqualTo((int)AttachmentPoint.Chest));
 
             Assert.That(scene.GetSceneObjectGroups().Count, Is.EqualTo(1));
+
+            // Check events.  We expect OnAttach to fire on login.
+            Assert.That(m_numberOfAttachEventsFired, Is.EqualTo(1));
         }
 
         [Test]
@@ -522,10 +559,14 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests
 
             Vector3 newPosition = new Vector3(1, 2, 4);
 
+            m_numberOfAttachEventsFired = 0;
             scene.SceneGraph.UpdatePrimGroupPosition(attSo.LocalId, newPosition, sp.ControllingClient);
 
             Assert.That(attSo.AbsolutePosition, Is.EqualTo(sp.AbsolutePosition));
             Assert.That(attSo.RootPart.AttachedPos, Is.EqualTo(newPosition));
+
+            // Check events
+            Assert.That(m_numberOfAttachEventsFired, Is.EqualTo(0));
         }
 
         [Test]
@@ -574,6 +615,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests
             Vector3 teleportPosition = new Vector3(10, 11, 12);
             Vector3 teleportLookAt = new Vector3(20, 21, 22);
 
+            m_numberOfAttachEventsFired = 0;
             sceneA.RequestTeleportLocation(
                 beforeTeleportSp.ControllingClient,
                 sceneB.RegionInfo.RegionHandle,
@@ -616,29 +658,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests
             Assert.That(actualSceneAAttachments.Count, Is.EqualTo(0));
 
             Assert.That(sceneA.GetSceneObjectGroups().Count, Is.EqualTo(0));
-        }
 
-        // I'm commenting this test because scene setup NEEDS InventoryService to 
-        // be non-null
-        //[Test]
-//        public void T032_CrossAttachments()
-//        {
-//            TestHelpers.InMethod();
-//
-//            ScenePresence presence = scene.GetScenePresence(agent1);
-//            ScenePresence presence2 = scene2.GetScenePresence(agent1);
-//            presence2.AddAttachment(sog1);
-//            presence2.AddAttachment(sog2);
-//
-//            ISharedRegionModule serialiser = new SerialiserModule();
-//            SceneHelpers.SetupSceneModules(scene, new IniConfigSource(), serialiser);
-//            SceneHelpers.SetupSceneModules(scene2, new IniConfigSource(), serialiser);
-//
-//            Assert.That(presence.HasAttachments(), Is.False, "Presence has attachments before cross");
-//
-//            //Assert.That(presence2.CrossAttachmentsIntoNewRegion(region1, true), Is.True, "Cross was not successful");
-//            Assert.That(presence2.HasAttachments(), Is.False, "Presence2 objects were not deleted");
-//            Assert.That(presence.HasAttachments(), Is.True, "Presence has not received new objects");
-//        }
+            // Check events
+            Assert.That(m_numberOfAttachEventsFired, Is.EqualTo(0));
+        }
     }
 }
diff --git a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
index 4cb4370..8496005 100644
--- a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
@@ -39,9 +39,12 @@ using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Services.Interfaces;
 
+using Mono.Addins;
+
 namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
 {
-    public class AvatarFactoryModule : IAvatarFactoryModule, IRegionModule
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "AvatarFactoryModule")]
+    public class AvatarFactoryModule : IAvatarFactoryModule, INonSharedRegionModule
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
@@ -59,12 +62,10 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
 
         private object m_setAppearanceLock = new object();
 
-        #region IRegionModule
+        #region Region Module interface
 
-        public void Initialise(Scene scene, IConfigSource config)
+        public void Initialise(IConfigSource config)
         {
-            scene.RegisterModuleInterface<IAvatarFactoryModule>(this);
-            scene.EventManager.OnNewClient += SubscribeToClientEvents;
 
             IConfig appearanceConfig = config.Configs["Appearance"];
             if (appearanceConfig != null)
@@ -74,11 +75,29 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
                 // m_log.InfoFormat("[AVFACTORY] configured for {0} save and {1} send",m_savetime,m_sendtime);
             }
 
+        }
+
+        public void AddRegion(Scene scene)
+        {
             if (m_scene == null)
-                m_scene = scene;          
+                m_scene = scene;
+
+            scene.RegisterModuleInterface<IAvatarFactoryModule>(this);
+            scene.EventManager.OnNewClient += SubscribeToClientEvents;
+        }
+
+        public void RemoveRegion(Scene scene)
+        {
+            if (scene == m_scene)
+            {
+                scene.UnregisterModuleInterface<IAvatarFactoryModule>(this);
+                scene.EventManager.OnNewClient -= SubscribeToClientEvents;
+            }
+
+            m_scene = null;
         }
 
-        public void PostInitialise()
+        public void RegionLoaded(Scene scene)
         {
             m_updateTimer.Enabled = false;
             m_updateTimer.AutoReset = true;
@@ -100,6 +119,12 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
             get { return false; }
         }
 
+        public Type ReplaceableInterface
+        {
+            get { return null; }
+        }
+
+
         private void SubscribeToClientEvents(IClientAPI client)
         {
             client.OnRequestWearables += Client_OnRequestWearables;
@@ -533,6 +558,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
                         // Ignore ruth's assets
                         if (appearance.Wearables[i][j].ItemID == AvatarWearable.DefaultWearables[i][0].ItemID)
                             continue;
+
                         InventoryItemBase baseItem = new InventoryItemBase(appearance.Wearables[i][j].ItemID, userID);
                         baseItem = invService.GetItem(baseItem);
 
diff --git a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
index dbbb0ae..4c3f1cc 100644
--- a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
@@ -30,6 +30,7 @@ using System.Collections.Generic;
 using System.Reflection;
 using log4net;
 using Nini.Config;
+using Mono.Addins;
 using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
@@ -37,6 +38,7 @@ using OpenSim.Region.Framework.Scenes;
 
 namespace OpenSim.Region.CoreModules.Avatar.Chat
 {
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "ChatModule")]
     public class ChatModule : ISharedRegionModule
     {
         private static readonly ILog m_log =
@@ -197,6 +199,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
             string fromName = c.From;
             string fromNamePrefix = "";
             UUID fromID = UUID.Zero;
+            UUID ownerID = UUID.Zero;
             string message = c.Message;
             IScene scene = c.Scene;
             UUID destination = c.Destination;
@@ -224,11 +227,16 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
                     fromNamePrefix = m_adminPrefix;
                 }
                 destination = UUID.Zero; // Avatars cant "SayTo"
+                ownerID = c.Sender.AgentId;
+
                 break;
 
             case ChatSourceType.Object:
                 fromID = c.SenderUUID;
 
+                if (c.SenderObject != null && c.SenderObject is SceneObjectPart)
+                    ownerID = ((SceneObjectPart)c.SenderObject).OwnerID;
+
                 break;
             }
 
@@ -262,8 +270,16 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
                             // objects on a parcel with access restrictions
                             if (c.Sender == null || Presencecheck.IsEitherBannedOrRestricted(c.Sender.AgentId) != true)
                             {
-                                if (TrySendChatMessage(presence, fromPos, regionPos, fromID, fromNamePrefix + fromName, c.Type, message, sourceType))
-                                    receiverIDs.Add(presence.UUID);
+                                if (destination != UUID.Zero)
+                                {
+                                    if (TrySendChatMessage(presence, fromPos, regionPos, fromID, ownerID, fromNamePrefix + fromName, c.Type, message, sourceType, true))
+                                        receiverIDs.Add(presence.UUID);
+                                }
+                                else
+                                {
+                                    if (TrySendChatMessage(presence, fromPos, regionPos, fromID, ownerID, fromNamePrefix + fromName, c.Type, message, sourceType, false))
+                                        receiverIDs.Add(presence.UUID);
+                                }
                             }
                         }
                     }
@@ -324,7 +340,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
                             (((SceneObjectPart)c.SenderObject).OwnerID != client.AgentId))
                             return;
                         
-                        client.SendChatMessage(c.Message, (byte)cType, CenterOfRegion, fromName, fromID, 
+                        client.SendChatMessage(c.Message, (byte)cType, CenterOfRegion, fromName, fromID, fromID,
                                                (byte)sourceType, (byte)ChatAudibleLevel.Fully);
                         receiverIDs.Add(client.AgentId);
                     }
@@ -341,15 +357,20 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
         /// <param name="fromPos"></param>
         /// <param name="regionPos">/param>
         /// <param name="fromAgentID"></param>
+        /// <param name='ownerID'>
+        /// Owner of the message.  For at least some messages from objects, this has to be correctly filled with the owner's UUID.
+        /// This is the case for script error messages in viewer 3 since LLViewer change EXT-7762
+        /// </param>
         /// <param name="fromName"></param>
         /// <param name="type"></param>
         /// <param name="message"></param>
         /// <param name="src"></param>
         /// <returns>true if the message was sent to the receiver, false if it was not sent due to failing a 
         /// precondition</returns>
-        protected virtual bool TrySendChatMessage(ScenePresence presence, Vector3 fromPos, Vector3 regionPos,
-                                                  UUID fromAgentID, string fromName, ChatTypeEnum type,
-                                                  string message, ChatSourceType src)
+        protected virtual bool TrySendChatMessage(
+            ScenePresence presence, Vector3 fromPos, Vector3 regionPos,
+            UUID fromAgentID, UUID ownerID, string fromName, ChatTypeEnum type,
+            string message, ChatSourceType src, bool ignoreDistance)
         {
             // don't send chat to child agents
             if (presence.IsChildAgent) return false;
@@ -369,8 +390,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
             }
 
             // TODO: should change so the message is sent through the avatar rather than direct to the ClientView
-            presence.ControllingClient.SendChatMessage(message, (byte) type, fromPos, fromName,
-                                                       fromAgentID, (byte)src, (byte)ChatAudibleLevel.Fully);
+            presence.ControllingClient.SendChatMessage(
+                message, (byte) type, fromPos, fromName,
+                fromAgentID, ownerID, (byte)src, (byte)ChatAudibleLevel.Fully);
             
             return true;
         }
diff --git a/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs b/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs
index 3a91465..343cdb5 100644
--- a/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs
@@ -33,9 +33,12 @@ using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 using OpenMetaverse;
 
+using Mono.Addins;
+
 namespace OpenSim.Region.CoreModules.Avatar.Combat.CombatModule
 {
-    public class CombatModule : IRegionModule
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "CombatModule")]
+    public class CombatModule : ISharedRegionModule
     {
         //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
@@ -54,7 +57,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Combat.CombatModule
         /// </summary>
         /// <param name="scene"></param>
         /// <param name="config"></param>
-        public void Initialise(Scene scene, IConfigSource config)
+        public void Initialise(IConfigSource config)
+        {
+        }
+
+        public void AddRegion(Scene scene)
         {
             lock (m_scenel)
             {
@@ -72,6 +79,19 @@ namespace OpenSim.Region.CoreModules.Avatar.Combat.CombatModule
             scene.EventManager.OnAvatarEnteringNewParcel += AvatarEnteringParcel;
         }
 
+        public void RemoveRegion(Scene scene)
+        {
+            if (m_scenel.ContainsKey(scene.RegionInfo.RegionHandle))
+                m_scenel.Remove(scene.RegionInfo.RegionHandle);
+
+            scene.EventManager.OnAvatarKilled -= KillAvatar;
+            scene.EventManager.OnAvatarEnteringNewParcel -= AvatarEnteringParcel;
+        }
+
+        public void RegionLoaded(Scene scene)
+        {
+        }
+
         public void PostInitialise()
         {
         }
@@ -85,11 +105,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Combat.CombatModule
             get { return "CombatModule"; }
         }
 
-        public bool IsSharedModule
+        public Type ReplaceableInterface
         {
-            get { return true; }
+            get { return null; }
         }
 
+
         private void KillAvatar(uint killerObjectLocalID, ScenePresence deadAvatar)
         {
             string deadAvatarMessage;
diff --git a/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs b/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs
index 3c294bb..0e7ab7e 100644
--- a/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs
@@ -32,6 +32,7 @@ using log4net;
 using Nini.Config;
 using OpenMetaverse;
 using OpenSim.Framework;
+using Mono.Addins;
 
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
@@ -39,16 +40,27 @@ using OpenSim.Services.Interfaces;
 
 namespace OpenSim.Region.CoreModules.Avatar.Dialog
 {
-    public class DialogModule : IRegionModule, IDialogModule
-    { 
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "DialogModule")]
+    public class DialogModule : IDialogModule, INonSharedRegionModule
+    {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        
+
         protected Scene m_scene;
-        
-        public void Initialise(Scene scene, IConfigSource source)
+
+        public void Initialise(IConfigSource source) { }
+
+        public Type ReplaceableInterface { get { return null; } }
+
+        public void AddRegion(Scene scene)
         {
             m_scene = scene;
             m_scene.RegisterModuleInterface<IDialogModule>(this);
+        }
+
+        public void RegionLoaded(Scene scene)
+        {
+            if (scene != m_scene)
+                return;
 
             m_scene.AddCommand(
                 "Users", this, "alert", "alert <message>",
@@ -56,46 +68,59 @@ namespace OpenSim.Region.CoreModules.Avatar.Dialog
                 HandleAlertConsoleCommand);
 
             m_scene.AddCommand(
-                "Users", this, "alert-user", "alert-user <first> <last> <message>",
+                "Users", this, "alert-user",
+                "alert-user <first> <last> <message>",
                 "Send an alert to a user",
                 HandleAlertConsoleCommand);
         }
-        
-        public void PostInitialise() {}
-        public void Close() {}
+
+        public void RemoveRegion(Scene scene)
+        {
+            if (scene != m_scene)
+                return;
+
+            m_scene.UnregisterModuleInterface<IDialogModule>(this);
+        }
+
+        public void Close() { }
         public string Name { get { return "Dialog Module"; } }
-        public bool IsSharedModule { get { return false; } }
-        
+
         public void SendAlertToUser(IClientAPI client, string message)
         {
             SendAlertToUser(client, message, false);
         }
-        
-        public void SendAlertToUser(IClientAPI client, string message, bool modal)
+
+        public void SendAlertToUser(IClientAPI client, string message,
+                bool modal)
         {
             client.SendAgentAlertMessage(message, modal);
-        } 
-        
+        }
+
         public void SendAlertToUser(UUID agentID, string message)
         {
             SendAlertToUser(agentID, message, false);
         }
-        
+
         public void SendAlertToUser(UUID agentID, string message, bool modal)
         {
             ScenePresence sp = m_scene.GetScenePresence(agentID);
-            
+
             if (sp != null)
                 sp.ControllingClient.SendAgentAlertMessage(message, modal);
         }
-        
-        public void SendAlertToUser(string firstName, string lastName, string message, bool modal)
+
+        public void SendAlertToUser(string firstName, string lastName,
+                string message, bool modal)
         {
-            ScenePresence presence = m_scene.GetScenePresence(firstName, lastName);
+            ScenePresence presence = m_scene.GetScenePresence(firstName,
+                    lastName);
             if (presence != null)
-                presence.ControllingClient.SendAgentAlertMessage(message, modal);
+            {
+                presence.ControllingClient.SendAgentAlertMessage(message,
+                        modal);
+            }
         }
-        
+
         public void SendGeneralAlert(string message)
         {
             m_scene.ForEachRootClient(delegate(IClientAPI client)
@@ -104,11 +129,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Dialog
             });
         }
 
-        public void SendDialogToUser(
-            UUID avatarID, string objectName, UUID objectID, UUID ownerID,
-            string message, UUID textureID, int ch, string[] buttonlabels)
+        public void SendDialogToUser(UUID avatarID, string objectName,
+                UUID objectID, UUID ownerID, string message, UUID textureID,
+                int ch, string[] buttonlabels)
         {
-            UserAccount account = m_scene.UserAccountService.GetUserAccount(m_scene.RegionInfo.ScopeID, ownerID);
+            UserAccount account = m_scene.UserAccountService.GetUserAccount(
+                    m_scene.RegionInfo.ScopeID, ownerID);
             string ownerFirstName, ownerLastName;
             if (account != null)
             {
@@ -123,29 +149,38 @@ namespace OpenSim.Region.CoreModules.Avatar.Dialog
 
             ScenePresence sp = m_scene.GetScenePresence(avatarID);
             if (sp != null)
-                sp.ControllingClient.SendDialog(
-                    objectName, objectID, ownerID, ownerFirstName, ownerLastName, message, textureID, ch, buttonlabels);
+            {
+                sp.ControllingClient.SendDialog(objectName, objectID, ownerID,
+                        ownerFirstName, ownerLastName, message, textureID, ch,
+                        buttonlabels);
+            }
         }
 
-        public void SendUrlToUser(
-            UUID avatarID, string objectName, UUID objectID, UUID ownerID, bool groupOwned, string message, string url)
+        public void SendUrlToUser(UUID avatarID, string objectName,
+                UUID objectID, UUID ownerID, bool groupOwned, string message,
+                string url)
         {
             ScenePresence sp = m_scene.GetScenePresence(avatarID);
-            
+
             if (sp != null)
-                sp.ControllingClient.SendLoadURL(objectName, objectID, ownerID, groupOwned, message, url);
+            {
+                sp.ControllingClient.SendLoadURL(objectName, objectID,
+                        ownerID, groupOwned, message, url);
+            }
         }
-        
-        public void SendTextBoxToUser(UUID avatarid, string message, int chatChannel, string name, UUID objectid, UUID ownerid)
+
+        public void SendTextBoxToUser(UUID avatarid, string message,
+                int chatChannel, string name, UUID objectid, UUID ownerid)
         {
-            UserAccount account = m_scene.UserAccountService.GetUserAccount(m_scene.RegionInfo.ScopeID, ownerid);
+            UserAccount account = m_scene.UserAccountService.GetUserAccount(
+                    m_scene.RegionInfo.ScopeID, ownerid);
             string ownerFirstName, ownerLastName;
-                        UUID ownerID = UUID.Zero;
+            UUID ownerID = UUID.Zero;
             if (account != null)
             {
                 ownerFirstName = account.FirstName;
                 ownerLastName = account.LastName;
-                                ownerID = account.PrincipalID;
+                ownerID = account.PrincipalID;
             }
             else
             {
@@ -154,29 +189,38 @@ namespace OpenSim.Region.CoreModules.Avatar.Dialog
             }
 
             ScenePresence sp = m_scene.GetScenePresence(avatarid);
-            
+
             if (sp != null)
-                sp.ControllingClient.SendTextBoxRequest(message, chatChannel, name, ownerID, ownerFirstName, ownerLastName, objectid);
+            {
+                sp.ControllingClient.SendTextBoxRequest(message, chatChannel,
+                        name, ownerID, ownerFirstName, ownerLastName,
+                        objectid);
+            }
         }
 
-        public void SendNotificationToUsersInRegion(
-            UUID fromAvatarID, string fromAvatarName, string message)
+        public void SendNotificationToUsersInRegion(UUID fromAvatarID,
+                string fromAvatarName, string message)
         {
             m_scene.ForEachRootClient(delegate(IClientAPI client)
             {
-                client.SendBlueBoxMessage(fromAvatarID, fromAvatarName, message);
+                client.SendBlueBoxMessage(fromAvatarID, fromAvatarName,
+                        message);
             });
         }
-        
+
         /// <summary>
         /// Handle an alert command from the console.
         /// </summary>
         /// <param name="module"></param>
         /// <param name="cmdparams"></param>
-        public void HandleAlertConsoleCommand(string module, string[] cmdparams)
+        public void HandleAlertConsoleCommand(string module,
+                string[] cmdparams)
         {
-            if (m_scene.ConsoleScene() != null && m_scene.ConsoleScene() != m_scene)
+            if (m_scene.ConsoleScene() != null &&
+                    m_scene.ConsoleScene() != m_scene)
+            {
                 return;
+            }
 
             string message = string.Empty;
 
@@ -184,7 +228,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Dialog
             {
                 message = CombineParams(cmdparams, 1);
                 m_log.InfoFormat("[DIALOG]: Sending general alert in region {0} with message {1}",
-                    m_scene.RegionInfo.RegionName, message);
+                        m_scene.RegionInfo.RegionName, message);
                 SendGeneralAlert(message);
             }
             else if (cmdparams.Length > 3)
@@ -192,9 +236,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Dialog
                 string firstName = cmdparams[1];
                 string lastName = cmdparams[2];
                 message = CombineParams(cmdparams, 3);
-                m_log.InfoFormat(
-                    "[DIALOG]: Sending alert in region {0} to {1} {2} with message {3}",
-                    m_scene.RegionInfo.RegionName, firstName, lastName, message);
+                m_log.InfoFormat("[DIALOG]: Sending alert in region {0} to {1} {2} with message {3}",
+                        m_scene.RegionInfo.RegionName, firstName, lastName,
+                        message);
                 SendAlertToUser(firstName, lastName, message, false);
             }
             else
@@ -212,7 +256,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Dialog
             {
                 result += commandParams[i] + " ";
             }
-            
+
             return result;
         }
     }
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/CallingCardModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/CallingCardModule.cs
index d942e87..5ec0ea9 100644
--- a/OpenSim/Region/CoreModules/Avatar/Friends/CallingCardModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Friends/CallingCardModule.cs
@@ -141,7 +141,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
                         client.FirstName+" "+client.LastName,
                         destID, (byte)211, false,
                         String.Empty,
-                        transactionID, false, new Vector3(), new byte[0]),
+                        transactionID, false, new Vector3(), new byte[0], true),
                         delegate(bool success) {} );
             }
         }
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
index 24ec435..8056030 100644
--- a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
@@ -28,12 +28,14 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Linq;
 using System.Reflection;
 using System.Threading;
 using log4net;
 using Nini.Config;
 using Nwc.XmlRpc;
 using OpenMetaverse;
+using Mono.Addins;
 using OpenSim.Framework;
 using OpenSim.Framework.Servers.HttpServer;
 using OpenSim.Framework.Communications;
@@ -49,6 +51,7 @@ using GridRegion = OpenSim.Services.Interfaces.GridRegion;
 
 namespace OpenSim.Region.CoreModules.Avatar.Friends
 {
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "FriendsModule")]
     public class FriendsModule : ISharedRegionModule, IFriendsModule
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@@ -482,9 +485,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
                 Util.FireAndForget(
                     delegate
                     {
-                        m_log.DebugFormat(
-                            "[FRIENDS MODULE]: Notifying {0} friends of {1} of online status {2}",
-                            friendList.Count, agentID, online);
+//                        m_log.DebugFormat(
+//                            "[FRIENDS MODULE]: Notifying {0} friends of {1} of online status {2}",
+//                            friendList.Count, agentID, online);
 
                         // Notify about this user status
                         StatusNotify(friendList, agentID, online);
@@ -495,42 +498,36 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
 
         protected virtual void StatusNotify(List<FriendInfo> friendList, UUID userID, bool online)
         {
-            foreach (FriendInfo friend in friendList)
+            List<string> friendStringIds = friendList.ConvertAll<string>(friend => friend.Friend);
+            List<string> remoteFriendStringIds = new List<string>();
+            foreach (string friendStringId in friendStringIds)
             {
-                UUID friendID;
-                if (UUID.TryParse(friend.Friend, out friendID))
+                UUID friendUuid;
+                if (UUID.TryParse(friendStringId, out friendUuid))
                 {
-                    // Try local
-                    if (LocalStatusNotification(userID, friendID, online))
+                    if (LocalStatusNotification(userID, friendUuid, online))
                         continue;
 
-                    // The friend is not here [as root]. Let's forward.
-                    PresenceInfo[] friendSessions = PresenceService.GetAgents(new string[] { friendID.ToString() });
-                    if (friendSessions != null && friendSessions.Length > 0)
-                    {
-                        PresenceInfo friendSession = null;
-                        foreach (PresenceInfo pinfo in friendSessions)
-                        {
-                            if (pinfo.RegionID != UUID.Zero) // let's guard against sessions-gone-bad
-                            {
-                                friendSession = pinfo;
-                                break;
-                            }
-                        }
-
-                        if (friendSession != null)
-                        {
-                            GridRegion region = GridService.GetRegionByUUID(m_Scenes[0].RegionInfo.ScopeID, friendSession.RegionID);
-                            //m_log.DebugFormat("[FRIENDS]: Remote Notify to region {0}", region.RegionName);
-                            m_FriendsSimConnector.StatusNotify(region, userID, friendID, online);
-                        }
-                    }
-
-                    // Friend is not online. Ignore.
+                    remoteFriendStringIds.Add(friendStringId);
                 }
                 else
                 {
-                    m_log.WarnFormat("[FRIENDS]: Error parsing friend ID {0}", friend.Friend);
+                    m_log.WarnFormat("[FRIENDS]: Error parsing friend ID {0}", friendStringId);
+                }
+            }
+
+            // We do this regrouping so that we can efficiently send a single request rather than one for each
+            // friend in what may be a very large friends list.
+            PresenceInfo[] friendSessions = PresenceService.GetAgents(remoteFriendStringIds.ToArray());
+
+            foreach (PresenceInfo friendSession in friendSessions)
+            {
+                // let's guard against sessions-gone-bad
+                if (friendSession.RegionID != UUID.Zero)
+                {
+                    GridRegion region = GridService.GetRegionByUUID(m_Scenes[0].RegionInfo.ScopeID, friendSession.RegionID);
+                    //m_log.DebugFormat("[FRIENDS]: Remote Notify to region {0}", region.RegionName);
+                    m_FriendsSimConnector.StatusNotify(region, userID, friendSession.UserID, online);
                 }
             }
         }
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs
index 06f27e2..bf5c0bb 100644
--- a/OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs
@@ -46,6 +46,7 @@ using GridRegion = OpenSim.Services.Interfaces.GridRegion;
 
 namespace OpenSim.Region.CoreModules.Avatar.Friends
 {
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "HGFriendsModule")]
     public class HGFriendsModule : FriendsModule, ISharedRegionModule, IFriendsModule, IFriendsSimConnector
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
diff --git a/OpenSim/Region/CoreModules/Avatar/Gestures/GesturesModule.cs b/OpenSim/Region/CoreModules/Avatar/Gestures/GesturesModule.cs
index 7df2beb..095c57b 100644
--- a/OpenSim/Region/CoreModules/Avatar/Gestures/GesturesModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Gestures/GesturesModule.cs
@@ -25,6 +25,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+using System;
 using System.Reflection;
 using log4net;
 using Nini.Config;
@@ -35,26 +36,46 @@ using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Services.Interfaces;
 
+using Mono.Addins;
+
 namespace OpenSim.Region.CoreModules.Avatar.Gestures
 {
-    public class GesturesModule : IRegionModule
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "GesturesModule")]
+    public class GesturesModule : INonSharedRegionModule
     { 
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
         
         protected Scene m_scene;
         
-        public void Initialise(Scene scene, IConfigSource source)
+        public void Initialise(IConfigSource source)
+        {
+        }
+
+        public void AddRegion(Scene scene)
         {
             m_scene = scene;
-            
+
             m_scene.EventManager.OnNewClient += OnNewClient;
         }
+
+        public void RegionLoaded(Scene scene)
+        {
+        }
+
+        public void RemoveRegion(Scene scene)
+        {
+            m_scene.EventManager.OnNewClient -= OnNewClient;
+            m_scene = null;
+        }
         
-        public void PostInitialise() {}
         public void Close() {}
         public string Name { get { return "Gestures Module"; } }
-        public bool IsSharedModule { get { return false; } }
-        
+
+        public Type ReplaceableInterface
+        {
+            get { return null; }
+        }
+
         private void OnNewClient(IClientAPI client)
         {
             client.OnActivateGesture += ActivateGesture;
diff --git a/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs b/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
index 716cc69..9fa9be1 100644
--- a/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
@@ -25,6 +25,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+using System;
 using System.Collections.Generic;
 using Nini.Config;
 using OpenMetaverse;
@@ -50,9 +51,12 @@ using Caps = OpenSim.Framework.Capabilities.Caps;
 using OSDArray = OpenMetaverse.StructuredData.OSDArray;
 using OSDMap = OpenMetaverse.StructuredData.OSDMap;
 
+using Mono.Addins;
+
 namespace OpenSim.Region.CoreModules.Avatar.Gods
 {
-    public class GodsModule : IRegionModule, IGodsModule
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "GodsModule")]
+    public class GodsModule : INonSharedRegionModule, IGodsModule
     {
         private static readonly ILog m_log =
             LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@@ -66,10 +70,24 @@ namespace OpenSim.Region.CoreModules.Avatar.Gods
         protected Dictionary<UUID, string> m_capsDict =
                 new Dictionary<UUID, string>();
         
-        public void Initialise(Scene scene, IConfigSource source)
+        protected IDialogModule DialogModule
+        {
+            get
+            {
+                if (m_dialogModule == null)
+                    m_dialogModule = m_scene.RequestModuleInterface<IDialogModule>();
+
+                return m_dialogModule;
+            }
+        }
+
+        public void Initialise(IConfigSource source)
+        {
+        }
+
+        public void AddRegion(Scene scene)
         {
             m_scene = scene;
-            m_dialogModule = m_scene.RequestModuleInterface<IDialogModule>();
             m_scene.RegisterModuleInterface<IGodsModule>(this);
             m_scene.EventManager.OnNewClient += SubscribeToClientEvents;
             m_scene.EventManager.OnRegisterCaps += OnRegisterCaps;
@@ -77,12 +95,26 @@ namespace OpenSim.Region.CoreModules.Avatar.Gods
             scene.EventManager.OnIncomingInstantMessage +=
                     OnIncomingInstantMessage;
         }
-        
-        public void PostInitialise() {}
+
+        public void RemoveRegion(Scene scene)
+        {
+            m_scene.UnregisterModuleInterface<IGodsModule>(this);
+            m_scene.EventManager.OnNewClient -= SubscribeToClientEvents;
+            m_scene = null;
+        }
+
+        public void RegionLoaded(Scene scene)
+        {
+        }
+
         public void Close() {}
         public string Name { get { return "Gods Module"; } }
-        public bool IsSharedModule { get { return false; } }
-        
+
+        public Type ReplaceableInterface
+        {
+            get { return null; }
+        }
+
         public void SubscribeToClientEvents(IClientAPI client)
         {
             client.OnGodKickUser += KickUser;
@@ -172,8 +204,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Gods
                 }
                 else
                 {
-                    if (m_dialogModule != null)
-                        m_dialogModule.SendAlertToUser(agentID, "Request for god powers denied");
+                    if (DialogModule != null)
+                        DialogModule.SendAlertToUser(agentID, "Request for god powers denied");
                 }
             }
         }
@@ -206,7 +238,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Gods
                     transferModule.SendInstantMessage(new GridInstantMessage(
                             m_scene, godID, "God", agentID, (byte)250, false,
                             Utils.BytesToString(reason), UUID.Zero, true,
-                            new Vector3(), new byte[] {(byte)kickflags}),
+                            new Vector3(), new byte[] {(byte)kickflags}, true),
                             delegate(bool success) {} );
                 }
                 return;
diff --git a/OpenSim/Region/CoreModules/Avatar/Groups/GroupsModule.cs b/OpenSim/Region/CoreModules/Avatar/Groups/GroupsModule.cs
index b258e13..af54c1a 100644
--- a/OpenSim/Region/CoreModules/Avatar/Groups/GroupsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Groups/GroupsModule.cs
@@ -25,6 +25,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+using System;
 using System.Collections.Generic;
 using System.Reflection;
 using log4net;
@@ -34,9 +35,12 @@ using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 
+using Mono.Addins;
+
 namespace OpenSim.Region.CoreModules.Avatar.Groups
 {
-    public class GroupsModule : IRegionModule
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "GroupsModule")]
+    public class GroupsModule : ISharedRegionModule
     {
         private static readonly ILog m_log =
             LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@@ -55,9 +59,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Groups
         private static GroupMembershipData osGroup =
                 new GroupMembershipData();
 
-        #region IRegionModule Members
+        private bool m_Enabled = false;
+
+        #region ISharedRegionModule Members
 
-        public void Initialise(Scene scene, IConfigSource config)
+        public void Initialise(IConfigSource config)
         {
             IConfig groupsConfig = config.Configs["Groups"];
 
@@ -67,7 +73,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Groups
             }
             else
             {
-                if (!groupsConfig.GetBoolean("Enabled", false))
+                m_Enabled = groupsConfig.GetBoolean("Enabled", false);
+                if (!m_Enabled)
                 {
                     m_log.Info("[GROUPS]: Groups disabled in configuration");
                     return;
@@ -77,6 +84,13 @@ namespace OpenSim.Region.CoreModules.Avatar.Groups
                     return;
             }
 
+        }
+
+        public void AddRegion(Scene scene)
+        {
+            if (!m_Enabled)
+                return;
+
             lock (m_SceneList)
             {
                 if (!m_SceneList.Contains(scene))
@@ -96,7 +110,26 @@ namespace OpenSim.Region.CoreModules.Avatar.Groups
 
             scene.EventManager.OnNewClient += OnNewClient;
             scene.EventManager.OnClientClosed += OnClientClosed;
-//            scene.EventManager.OnIncomingInstantMessage += OnGridInstantMessage;
+            //            scene.EventManager.OnIncomingInstantMessage += OnGridInstantMessage;
+        }
+
+        public void RemoveRegion(Scene scene)
+        {
+            if (!m_Enabled)
+                return;
+
+            lock (m_SceneList)
+            {
+                if (m_SceneList.Contains(scene))
+                    m_SceneList.Remove(scene);
+            }
+
+            scene.EventManager.OnNewClient -= OnNewClient;
+            scene.EventManager.OnClientClosed -= OnClientClosed;
+        }
+
+        public void RegionLoaded(Scene scene)
+        {
         }
 
         public void PostInitialise()
@@ -105,6 +138,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Groups
 
         public void Close()
         {
+            if (!m_Enabled)
+                return;
+
 //            m_log.Debug("[GROUPS]: Shutting down group module.");
             
             lock (m_ClientMap)
@@ -123,9 +159,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Groups
             get { return "GroupsModule"; }
         }
 
-        public bool IsSharedModule
+        public Type ReplaceableInterface
         {
-            get { return true; }
+            get { return null; }
         }
 
         #endregion
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/HGMessageTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/HGMessageTransferModule.cs
index bf1d787..7bf19c2 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/HGMessageTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/HGMessageTransferModule.cs
@@ -48,7 +48,7 @@ using OpenSim.Server.Handlers.Hypergrid;
 
 namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
 {
-    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "HGMessageTransferModule")]
     public class HGMessageTransferModule : ISharedRegionModule, IMessageTransferModule, IInstantMessageSimConnector
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs
index 727f1c9..55e30a0 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs
@@ -29,6 +29,7 @@ using System.Collections.Generic;
 using System.Reflection;
 using System.Timers;
 using log4net;
+using Mono.Addins;
 using Nini.Config;
 using OpenMetaverse;
 using OpenSim.Framework;
@@ -38,6 +39,7 @@ using OpenSim.Region.Framework.Scenes;
 
 namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
 {
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "InstantMessageModule")]
     public class InstantMessageModule : ISharedRegionModule
     {
         private static readonly ILog m_log = LogManager.GetLogger(
@@ -54,7 +56,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
         
         private readonly List<Scene> m_scenes = new List<Scene>();
 
-        #region IRegionModule Members
+        #region Region Module interface
 
         private IMessageTransferModule m_TransferModule = null;
 
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
index edd9707..cc266df 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
@@ -30,6 +30,7 @@ using System.Collections.Generic;
 using System.Net;
 using System.Reflection;
 using log4net;
+using Mono.Addins;
 using Nini.Config;
 using Nwc.XmlRpc;
 using OpenMetaverse;
@@ -43,6 +44,7 @@ using OpenSim.Services.Interfaces;
 
 namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
 {
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "MessageTransferModule")]
     public class MessageTransferModule : ISharedRegionModule, IMessageTransferModule
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MuteListModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MuteListModule.cs
index 24cbaeb..7ce2813 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MuteListModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MuteListModule.cs
@@ -29,6 +29,7 @@ using System.Collections.Generic;
 using System.Reflection;
 using log4net;
 using Nini.Config;
+using Mono.Addins;
 using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications;
@@ -39,6 +40,7 @@ using OpenSim.Region.Framework.Scenes;
 
 namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
 {
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "MuteListModule")]
     public class MuteListModule : ISharedRegionModule
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
index b27b07d..3a44cc5 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
@@ -28,6 +28,7 @@ using System;
 using System.Collections.Generic;
 using System.Reflection;
 using log4net;
+using Mono.Addins;
 using Nini.Config;
 using OpenMetaverse;
 using OpenSim.Framework;
@@ -39,6 +40,7 @@ using OpenSim.Region.Framework.Scenes;
 
 namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
 {
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "OfflineMessageModule")]
     public class OfflineMessageModule : ISharedRegionModule
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/PresenceModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/PresenceModule.cs
index dd17f3c..4c678c2 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/PresenceModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/PresenceModule.cs
@@ -33,6 +33,7 @@ using log4net;
 using Nini.Config;
 using Nwc.XmlRpc;
 using OpenMetaverse;
+using Mono.Addins;
 using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
@@ -42,6 +43,7 @@ using PresenceInfo = OpenSim.Services.Interfaces.PresenceInfo;
 
 namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
 {
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "PresenceModule")]
     public class PresenceModule : ISharedRegionModule, IPresenceModule
     {
         private static readonly ILog m_log = LogManager.GetLogger(
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
index 0833154..dc2b0e0 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
@@ -411,18 +411,17 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
             {
 //                m_log.DebugFormat("[INVENTORY ARCHIVER]: Found creator {0} via OSPA resolution", ospResolvedId);
                 
-                item.CreatorIdAsUuid = ospResolvedId;
+//                item.CreatorIdAsUuid = ospResolvedId;
 
                 // Don't preserve the OSPA in the creator id (which actually gets persisted to the
                 // database).  Instead, replace with the UUID that we found.
                 item.CreatorId = ospResolvedId.ToString();
-
                 item.CreatorData = string.Empty;
             }
             else if (item.CreatorData == null || item.CreatorData == String.Empty)
             {
                 item.CreatorId = m_userInfo.PrincipalID.ToString();
-                item.CreatorIdAsUuid = new UUID(item.CreatorId);
+//                item.CreatorIdAsUuid = new UUID(item.CreatorId);
             }
 
             item.Owner = m_userInfo.PrincipalID;
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs
index 6587ead..d0e88f6 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs
@@ -166,7 +166,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
 
             if (options.ContainsKey("verbose"))
                 m_log.InfoFormat(
-                    "[INVENTORY ARCHIVER]: Saving item {0} {1} with asset {2}",
+                    "[INVENTORY ARCHIVER]: Saving item {0} {1} (asset UUID {2})",
                     inventoryItem.ID, inventoryItem.Name, inventoryItem.AssetID);
 
             string filename = path + CreateArchiveItemName(inventoryItem);
@@ -337,11 +337,14 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                 {
                     m_log.DebugFormat("[INVENTORY ARCHIVER]: Saving {0} assets for items", m_assetUuids.Count);
 
-                    new AssetsRequest(
-                        new AssetsArchiver(m_archiveWriter),
-                        m_assetUuids, m_scene.AssetService,
-                        m_scene.UserAccountService, m_scene.RegionInfo.ScopeID,
-                        options, ReceivedAllAssets).Execute();
+                    AssetsRequest ar
+                        = new AssetsRequest(
+                            new AssetsArchiver(m_archiveWriter),
+                            m_assetUuids, m_scene.AssetService,
+                            m_scene.UserAccountService, m_scene.RegionInfo.ScopeID,
+                            options, ReceivedAllAssets);
+
+                    Util.FireAndForget(o => ar.Execute());
                 }
                 else
                 {
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
index 7d1fe68..f4f9e2d 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
@@ -35,23 +35,22 @@ using Nini.Config;
 using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications;
+using OpenSim.Framework.Console;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Services.Interfaces;
+using Mono.Addins;
 
 namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
 {
     /// <summary>
     /// This module loads and saves OpenSimulator inventory archives
     /// </summary>
-    public class InventoryArchiverModule : IRegionModule, IInventoryArchiverModule
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "InventoryArchiverModule")]
+    public class InventoryArchiverModule : ISharedRegionModule, IInventoryArchiverModule
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
-        public string Name { get { return "Inventory Archiver Module"; } }
-
-        public bool IsSharedModule { get { return true; } }
-
         /// <value>
         /// Enable or disable checking whether the iar user is actually logged in
         /// </value>
@@ -98,9 +97,15 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
 //        public InventoryArchiverModule(bool disablePresenceChecks)
 //        {
 //            DisablePresenceChecks = disablePresenceChecks;
-//        }
+        //        }
+
+        #region ISharedRegionModule
+
+        public void Initialise(IConfigSource source)
+        {
+        }
 
-        public void Initialise(Scene scene, IConfigSource source)
+        public void AddRegion(Scene scene)
         {
             if (m_scenes.Count == 0)
             {
@@ -143,10 +148,29 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
             m_scenes[scene.RegionInfo.RegionID] = scene;
         }
 
-        public void PostInitialise() {}
+        public void RemoveRegion(Scene scene)
+        {
+        }
 
         public void Close() {}
 
+        public void RegionLoaded(Scene scene)
+        {
+        }
+
+        public void PostInitialise()
+        {
+        }
+
+        public Type ReplaceableInterface
+        {
+            get { return null; }
+        }
+
+        public string Name { get { return "Inventory Archiver Module"; } }
+
+        #endregion 
+
         /// <summary>
         /// Trigger the inventory archive saved event.
         /// </summary>
@@ -209,6 +233,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
             Guid id, string firstName, string lastName, string invPath, string pass, string savePath,
             Dictionary<string, object> options)
         {
+//            if (!ConsoleUtil.CheckFileDoesNotExist(MainConsole.Instance, savePath))
+//                return false;
+
             if (m_scenes.Count > 0)
             {
                 UserAccount userInfo = GetUserInfo(firstName, lastName, pass);
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveTestCase.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveTestCase.cs
index 1056865..db78da9 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveTestCase.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveTestCase.cs
@@ -82,7 +82,25 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
         
         protected string m_item1Name = "Ray Gun Item";
         protected string m_coaItemName = "Coalesced Item";
-        
+
+        [TestFixtureSetUp]
+        public void FixtureSetup()
+        {
+            // Don't allow tests to be bamboozled by asynchronous events.  Execute everything on the same thread.
+            Util.FireAndForgetMethod = FireAndForgetMethod.RegressionTest;
+
+            ConstructDefaultIarBytesForTestLoad();
+        }
+
+        [TestFixtureTearDown]
+        public void TearDown()
+        {
+            // We must set this back afterwards, otherwise later tests will fail since they're expecting multiple
+            // threads.  Possibly, later tests should be rewritten so none of them require async stuff (which regression
+            // tests really shouldn't).
+            Util.FireAndForgetMethod = Util.DefaultFireAndForgetMethod;
+        }
+
         [SetUp]
         public override void SetUp()
         {
@@ -90,12 +108,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
             m_iarStream = new MemoryStream(m_iarStreamBytes);
         }
         
-        [TestFixtureSetUp]
-        public void FixtureSetup()
-        {
-            ConstructDefaultIarBytesForTestLoad();
-        }
-        
         protected void ConstructDefaultIarBytesForTestLoad()
         {
 //            log4net.Config.XmlConfigurator.Configure();
@@ -122,7 +134,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
             item1.ID = UUID.Parse("00000000-0000-0000-0000-000000000020");            
             item1.AssetID = asset1.FullID;
             item1.GroupID = UUID.Random();
-            item1.CreatorIdAsUuid = m_uaLL1.PrincipalID;
+            item1.CreatorId = m_uaLL1.PrincipalID.ToString();
             item1.Owner = m_uaLL1.PrincipalID;
             item1.Folder = scene.InventoryService.GetRootFolder(m_uaLL1.PrincipalID).ID;            
             scene.AddInventoryItem(item1);
@@ -145,7 +157,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
             coaItem.ID = UUID.Parse("00000000-0000-0000-0000-000000000180");            
             coaItem.AssetID = coaAsset.FullID;
             coaItem.GroupID = UUID.Random();
-            coaItem.CreatorIdAsUuid = m_uaLL1.PrincipalID;
+            coaItem.CreatorId = m_uaLL1.PrincipalID.ToString();
             coaItem.Owner = m_uaLL1.PrincipalID;
             coaItem.Folder = scene.InventoryService.GetRootFolder(m_uaLL1.PrincipalID).ID;            
             scene.AddInventoryItem(coaItem);            
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
index b112b6d..06f6e49 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
@@ -49,7 +49,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
 {
     [TestFixture]
     public class InventoryArchiverTests : InventoryArchiveTestCase
-    {   
+    {
         protected TestScene m_scene;
         protected InventoryArchiverModule m_archiverModule;
             
@@ -69,7 +69,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
         public void TestLoadCoalesecedItem()
         {
             TestHelpers.InMethod();
-//            log4net.Config.XmlConfigurator.Configure();
+//            TestHelpers.EnableLogging();
             
             UserAccountHelpers.CreateUserWithInventory(m_scene, m_uaLL1, "password");
             m_archiverModule.DearchiveInventory(m_uaLL1.FirstName, m_uaLL1.LastName, "/", "password", m_iarStream);            
@@ -350,38 +350,38 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
             Assert.That(sog1.RootPart.CreatorID, Is.EqualTo(m_uaLL1.PrincipalID));            
         }
         
-        /// <summary>
-        /// Test loading a V0.1 OpenSim Inventory Archive (subject to change since there is no fixed format yet) where
-        /// an account exists with the same name as the creator, though not the same id.
-        /// </summary>
-        [Test]
-        public void TestLoadIarV0_1SameNameCreator()
-        {
-            TestHelpers.InMethod();
-//            log4net.Config.XmlConfigurator.Configure();
-
-            UserAccountHelpers.CreateUserWithInventory(m_scene, m_uaMT, "meowfood");
-            UserAccountHelpers.CreateUserWithInventory(m_scene, m_uaLL2, "hampshire");
-            
-            m_archiverModule.DearchiveInventory(m_uaMT.FirstName, m_uaMT.LastName, "/", "meowfood", m_iarStream);            
-            InventoryItemBase foundItem1
-                = InventoryArchiveUtils.FindItemByPath(m_scene.InventoryService, m_uaMT.PrincipalID, m_item1Name);
-
-            Assert.That(
-                foundItem1.CreatorId, Is.EqualTo(m_uaLL2.PrincipalID.ToString()), 
-                "Loaded item non-uuid creator doesn't match original");            
-            Assert.That(
-                foundItem1.CreatorIdAsUuid, Is.EqualTo(m_uaLL2.PrincipalID), 
-                "Loaded item uuid creator doesn't match original");
-            Assert.That(foundItem1.Owner, Is.EqualTo(m_uaMT.PrincipalID),
-                "Loaded item owner doesn't match inventory reciever");
-            
-            AssetBase asset1 = m_scene.AssetService.Get(foundItem1.AssetID.ToString());            
-            string xmlData = Utils.BytesToString(asset1.Data);
-            SceneObjectGroup sog1 = SceneObjectSerializer.FromOriginalXmlFormat(xmlData);
-            
-            Assert.That(sog1.RootPart.CreatorID, Is.EqualTo(m_uaLL2.PrincipalID));
-        }
+//        /// <summary>
+//        /// Test loading a V0.1 OpenSim Inventory Archive (subject to change since there is no fixed format yet) where
+//        /// an account exists with the same name as the creator, though not the same id.
+//        /// </summary>
+//        [Test]
+//        public void TestLoadIarV0_1SameNameCreator()
+//        {
+//            TestHelpers.InMethod();
+//            TestHelpers.EnableLogging();
+//
+//            UserAccountHelpers.CreateUserWithInventory(m_scene, m_uaMT, "meowfood");
+//            UserAccountHelpers.CreateUserWithInventory(m_scene, m_uaLL2, "hampshire");
+//            
+//            m_archiverModule.DearchiveInventory(m_uaMT.FirstName, m_uaMT.LastName, "/", "meowfood", m_iarStream);            
+//            InventoryItemBase foundItem1
+//                = InventoryArchiveUtils.FindItemByPath(m_scene.InventoryService, m_uaMT.PrincipalID, m_item1Name);
+//
+//            Assert.That(
+//                foundItem1.CreatorId, Is.EqualTo(m_uaLL2.PrincipalID.ToString()), 
+//                "Loaded item non-uuid creator doesn't match original");            
+//            Assert.That(
+//                foundItem1.CreatorIdAsUuid, Is.EqualTo(m_uaLL2.PrincipalID), 
+//                "Loaded item uuid creator doesn't match original");
+//            Assert.That(foundItem1.Owner, Is.EqualTo(m_uaMT.PrincipalID),
+//                "Loaded item owner doesn't match inventory reciever");
+//            
+//            AssetBase asset1 = m_scene.AssetService.Get(foundItem1.AssetID.ToString());            
+//            string xmlData = Utils.BytesToString(asset1.Data);
+//            SceneObjectGroup sog1 = SceneObjectSerializer.FromOriginalXmlFormat(xmlData);
+//            
+//            Assert.That(sog1.RootPart.CreatorID, Is.EqualTo(m_uaLL2.PrincipalID));
+//        }
 
         /// <summary>
         /// Test loading a V0.1 OpenSim Inventory Archive (subject to change since there is no fixed format yet) where
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
index c14cb17..4cfa33d 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
@@ -29,6 +29,7 @@ using System;
 using System.Collections.Generic;
 using System.Reflection;
 using log4net;
+using Mono.Addins;
 using Nini.Config;
 using OpenMetaverse;
 using OpenSim.Framework;
@@ -38,20 +39,21 @@ using OpenSim.Services.Interfaces;
 
 namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
 {
-    public class InventoryTransferModule : IInventoryTransferModule, ISharedRegionModule
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "InventoryTransferModule")]
+    public class InventoryTransferModule : ISharedRegionModule
     {
         private static readonly ILog m_log
             = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         /// <summary>
         private List<Scene> m_Scenelist = new List<Scene>();
-        private Dictionary<UUID, Scene> m_AgentRegions =
-                new Dictionary<UUID, Scene>();
+//        private Dictionary<UUID, Scene> m_AgentRegions =
+//                new Dictionary<UUID, Scene>();
 
         private IMessageTransferModule m_TransferModule = null;
         private bool m_Enabled = true;
 
-        #region IRegionModule Members
+        #region Region Module interface
 
         public void Initialise(IConfigSource config)
         {
@@ -76,12 +78,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
 
             m_Scenelist.Add(scene);
 
-            scene.RegisterModuleInterface<IInventoryTransferModule>(this);
+//            scene.RegisterModuleInterface<IInventoryTransferModule>(this);
 
             scene.EventManager.OnNewClient += OnNewClient;
-            scene.EventManager.OnClientClosed += ClientLoggedOut;
+//            scene.EventManager.OnClientClosed += ClientLoggedOut;
             scene.EventManager.OnIncomingInstantMessage += OnGridInstantMessage;
-            scene.EventManager.OnSetRootAgentScene += OnSetRootAgentScene;
+//            scene.EventManager.OnSetRootAgentScene += OnSetRootAgentScene;
         }
 
         public void RegionLoaded(Scene scene)
@@ -96,9 +98,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
 
                     m_Scenelist.Clear();
                     scene.EventManager.OnNewClient -= OnNewClient;
-                    scene.EventManager.OnClientClosed -= ClientLoggedOut;
+//                    scene.EventManager.OnClientClosed -= ClientLoggedOut;
                     scene.EventManager.OnIncomingInstantMessage -= OnGridInstantMessage;
-                    scene.EventManager.OnSetRootAgentScene -= OnSetRootAgentScene;
+//                    scene.EventManager.OnSetRootAgentScene -= OnSetRootAgentScene;
                 }
             }
         }
@@ -106,9 +108,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
         public void RemoveRegion(Scene scene)
         {
             scene.EventManager.OnNewClient -= OnNewClient;
-            scene.EventManager.OnClientClosed -= ClientLoggedOut;
+//            scene.EventManager.OnClientClosed -= ClientLoggedOut;
             scene.EventManager.OnIncomingInstantMessage -= OnGridInstantMessage;
-            scene.EventManager.OnSetRootAgentScene -= OnSetRootAgentScene;
+//            scene.EventManager.OnSetRootAgentScene -= OnSetRootAgentScene;
             m_Scenelist.Remove(scene);
         }
 
@@ -138,10 +140,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
             client.OnInstantMessage += OnInstantMessage;
         }
         
-        protected void OnSetRootAgentScene(UUID id, Scene scene)
-        {
-            m_AgentRegions[id] = scene;
-        }
+//        protected void OnSetRootAgentScene(UUID id, Scene scene)
+//        {
+//            m_AgentRegions[id] = scene;
+//        }
 
         private Scene FindClientScene(UUID agentId)
         {
@@ -313,45 +315,77 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
                         m_TransferModule.SendInstantMessage(im, delegate(bool success) {});
                 }
             }
-            else if (im.dialog == (byte) InstantMessageDialog.TaskInventoryAccepted)
-            {
-                UUID destinationFolderID = UUID.Zero;
-
-                if (im.binaryBucket != null && im.binaryBucket.Length >= 16)
-                {
-                    destinationFolderID = new UUID(im.binaryBucket, 0);
-                }
-
-                if (destinationFolderID != UUID.Zero)
-                {
-                    IInventoryService invService = scene.InventoryService;
-
-                    UUID inventoryID = new UUID(im.imSessionID); // The inventory item/folder, back from it's trip
 
-                    InventoryItemBase item = new InventoryItemBase(inventoryID, client.AgentId);
-                    item = invService.GetItem(item);
-                    InventoryFolderBase folder = null;
-
-                    if (item != null) // It's an item
-                    {
-                        item.Folder = destinationFolderID;
-
-                        invService.DeleteItems(item.Owner, new List<UUID>() { item.ID });
-                        scene.AddInventoryItem(client, item);
-                    }
-                    else
-                    {
-                        folder = new InventoryFolderBase(inventoryID, client.AgentId);
-                        folder = invService.GetFolder(folder);
-
-                        if (folder != null) // It's a folder
-                        {
-                            folder.ParentID = destinationFolderID;
-                            invService.MoveFolder(folder);
-                        }
-                    }
-                }
-            }
+            // Disabled for now as it looks like http://opensimulator.org/mantis/view.php?id=6311 was fixed by fixes
+            // to inventory folder versioning allowing the viewer to move the received folder itself as happens on the 
+            // LL grid.  Doing it again server-side then wrongly does a second create and move
+//            // XXX: This code was placed here to try and accomdate RLV which moves given folders named #RLV/~<name>
+//            // to a folder called name in #RLV.  However, this approach may not be ultimately correct - from analysis
+//            // of Firestorm 4.2.2 on sending an InventoryOffered instead of TaskInventoryOffered (as was previously
+//            // done), the viewer itself would appear to move and rename the folder, rather than the simulator doing it here.
+//            else if (im.dialog == (byte) InstantMessageDialog.TaskInventoryAccepted)
+//            {
+//                UUID destinationFolderID = UUID.Zero;
+//
+//                if (im.binaryBucket != null && im.binaryBucket.Length >= 16)
+//                {
+//                    destinationFolderID = new UUID(im.binaryBucket, 0);
+//                }
+//
+//                if (destinationFolderID != UUID.Zero)
+//                {
+//                    InventoryFolderBase destinationFolder = new InventoryFolderBase(destinationFolderID, client.AgentId);
+//                    if (destinationFolder == null)
+//                    {
+//                        m_log.WarnFormat(
+//                            "[INVENTORY TRANSFER]: TaskInventoryAccepted message from {0} in {1} specified folder {2} which does not exist",
+//                            client.Name, scene.Name, destinationFolderID);
+//
+//                        return;
+//                    }
+//
+//                    IInventoryService invService = scene.InventoryService;
+//
+//                    UUID inventoryID = new UUID(im.imSessionID); // The inventory item/folder, back from it's trip
+//
+//                    InventoryItemBase item = new InventoryItemBase(inventoryID, client.AgentId);
+//                    item = invService.GetItem(item);
+//                    InventoryFolderBase folder = null;
+//                    UUID? previousParentFolderID = null;
+//
+//                    if (item != null) // It's an item
+//                    {
+//                        previousParentFolderID = item.Folder;
+//                        item.Folder = destinationFolderID;
+//
+//                        invService.DeleteItems(item.Owner, new List<UUID>() { item.ID });
+//                        scene.AddInventoryItem(client, item);
+//                    }
+//                    else
+//                    {
+//                        folder = new InventoryFolderBase(inventoryID, client.AgentId);
+//                        folder = invService.GetFolder(folder);
+//
+//                        if (folder != null) // It's a folder
+//                        {
+//                            previousParentFolderID = folder.ParentID;
+//                            folder.ParentID = destinationFolderID;
+//                            invService.MoveFolder(folder);
+//                        }
+//                    }
+//
+//                    // Tell client about updates to original parent and new parent (this should probably be factored with existing move item/folder code).
+//                    if (previousParentFolderID != null)
+//                    {
+//                        InventoryFolderBase previousParentFolder
+//                            = new InventoryFolderBase((UUID)previousParentFolderID, client.AgentId);
+//                        previousParentFolder = invService.GetFolder(previousParentFolder);
+//                        scene.SendInventoryUpdate(client, previousParentFolder, true, true);
+//
+//                        scene.SendInventoryUpdate(client, destinationFolder, true, true);
+//                    }
+//                }
+//            }
             else if (
                 im.dialog == (byte)InstantMessageDialog.InventoryDeclined
                 || im.dialog == (byte)InstantMessageDialog.TaskInventoryDeclined)
@@ -370,9 +404,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
                 InventoryItemBase item = new InventoryItemBase(inventoryID, client.AgentId);
                 item = invService.GetItem(item);
                 InventoryFolderBase folder = null;
+                UUID? previousParentFolderID = null;
                 
                 if (item != null && trashFolder != null)
                 {
+                    previousParentFolderID = item.Folder;
                     item.Folder = trashFolder.ID;
 
                     // Diva comment: can't we just update this item???
@@ -388,6 +424,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
                     
                     if (folder != null & trashFolder != null)
                     {
+                        previousParentFolderID = folder.ParentID;
                         folder.ParentID = trashFolder.ID;
                         invService.MoveFolder(folder);
                         client.SendBulkUpdateInventory(folder);
@@ -408,84 +445,97 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
                     client.SendAgentAlertMessage("Unable to delete "+
                             "received inventory" + reason, false);
                 }
-
-                ScenePresence user = scene.GetScenePresence(new UUID(im.toAgentID));
-
-                if (user != null) // Local
+                // Tell client about updates to original parent and new parent (this should probably be factored with existing move item/folder code).
+                else if (previousParentFolderID != null)
                 {
-                    user.ControllingClient.SendInstantMessage(im);
-                }
-                else
-                {
-                    if (m_TransferModule != null)
-                        m_TransferModule.SendInstantMessage(im, delegate(bool success) {});
-                }
-            }
-        }
+                    InventoryFolderBase previousParentFolder
+                        = new InventoryFolderBase((UUID)previousParentFolderID, client.AgentId);
+                    previousParentFolder = invService.GetFolder(previousParentFolder);
+                    scene.SendInventoryUpdate(client, previousParentFolder, true, true);
 
-        public bool NeedSceneCacheClear(UUID agentID, Scene scene)
-        {
-            if (!m_AgentRegions.ContainsKey(agentID))
-            {
-                // Since we can get here two ways, we need to scan
-                // the scenes here. This is somewhat more expensive
-                // but helps avoid a nasty bug
-                //
+                    scene.SendInventoryUpdate(client, trashFolder, true, true);
+                }
 
-                foreach (Scene s in m_Scenelist)
+                if (im.dialog == (byte)InstantMessageDialog.InventoryDeclined)
                 {
-                    ScenePresence presence;
+                    ScenePresence user = scene.GetScenePresence(new UUID(im.toAgentID));
 
-                    if (s.TryGetScenePresence(agentID, out presence))
+                    if (user != null) // Local
                     {
-                        // If the agent is in this scene, then we
-                        // are being called twice in a single
-                        // teleport. This is wasteful of cycles
-                        // but harmless due to this 2nd level check
-                        //
-                        // If the agent is found in another scene
-                        // then the list wasn't current
-                        //
-                        // If the agent is totally unknown, then what
-                        // are we even doing here??
-                        //
-                        if (s == scene)
-                        {
-                            //m_log.Debug("[INVTRANSFERMOD]: s == scene. Returning true in " + scene.RegionInfo.RegionName);
-                            return true;
-                        }
-                        else
-                        {
-                            //m_log.Debug("[INVTRANSFERMOD]: s != scene. Returning false in " + scene.RegionInfo.RegionName);
-                            return false;
-                        }
+                        user.ControllingClient.SendInstantMessage(im);
+                    }
+                    else
+                    {
+                        if (m_TransferModule != null)
+                            m_TransferModule.SendInstantMessage(im, delegate(bool success) { });
                     }
                 }
-                //m_log.Debug("[INVTRANSFERMOD]: agent not in scene. Returning true in " + scene.RegionInfo.RegionName);
-                return true;
             }
-
-            // The agent is left in current Scene, so we must be
-            // going to another instance
-            //
-            if (m_AgentRegions[agentID] == scene)
-            {
-                //m_log.Debug("[INVTRANSFERMOD]: m_AgentRegions[agentID] == scene. Returning true in " + scene.RegionInfo.RegionName);
-                m_AgentRegions.Remove(agentID);
-                return true;
-            }
-
-            // Another region has claimed the agent
-            //
-            //m_log.Debug("[INVTRANSFERMOD]: last resort. Returning false in " + scene.RegionInfo.RegionName);
-            return false;
         }
 
-        public void ClientLoggedOut(UUID agentID, Scene scene)
-        {
-            if (m_AgentRegions.ContainsKey(agentID))
-                m_AgentRegions.Remove(agentID);
-        }
+//        public bool NeedSceneCacheClear(UUID agentID, Scene scene)
+//        {
+//            if (!m_AgentRegions.ContainsKey(agentID))
+//            {
+//                // Since we can get here two ways, we need to scan
+//                // the scenes here. This is somewhat more expensive
+//                // but helps avoid a nasty bug
+//                //
+//
+//                foreach (Scene s in m_Scenelist)
+//                {
+//                    ScenePresence presence;
+//
+//                    if (s.TryGetScenePresence(agentID, out presence))
+//                    {
+//                        // If the agent is in this scene, then we
+//                        // are being called twice in a single
+//                        // teleport. This is wasteful of cycles
+//                        // but harmless due to this 2nd level check
+//                        //
+//                        // If the agent is found in another scene
+//                        // then the list wasn't current
+//                        //
+//                        // If the agent is totally unknown, then what
+//                        // are we even doing here??
+//                        //
+//                        if (s == scene)
+//                        {
+//                            //m_log.Debug("[INVTRANSFERMOD]: s == scene. Returning true in " + scene.RegionInfo.RegionName);
+//                            return true;
+//                        }
+//                        else
+//                        {
+//                            //m_log.Debug("[INVTRANSFERMOD]: s != scene. Returning false in " + scene.RegionInfo.RegionName);
+//                            return false;
+//                        }
+//                    }
+//                }
+//                //m_log.Debug("[INVTRANSFERMOD]: agent not in scene. Returning true in " + scene.RegionInfo.RegionName);
+//                return true;
+//            }
+//
+//            // The agent is left in current Scene, so we must be
+//            // going to another instance
+//            //
+//            if (m_AgentRegions[agentID] == scene)
+//            {
+//                //m_log.Debug("[INVTRANSFERMOD]: m_AgentRegions[agentID] == scene. Returning true in " + scene.RegionInfo.RegionName);
+//                m_AgentRegions.Remove(agentID);
+//                return true;
+//            }
+//
+//            // Another region has claimed the agent
+//            //
+//            //m_log.Debug("[INVTRANSFERMOD]: last resort. Returning false in " + scene.RegionInfo.RegionName);
+//            return false;
+//        }
+//
+//        public void ClientLoggedOut(UUID agentID, Scene scene)
+//        {
+//            if (m_AgentRegions.ContainsKey(agentID))
+//                m_AgentRegions.Remove(agentID);
+//        }
 
         /// <summary>
         ///
diff --git a/OpenSim/Region/CoreModules/Avatar/Lure/HGLureModule.cs b/OpenSim/Region/CoreModules/Avatar/Lure/HGLureModule.cs
index 92cf9d1..232a4fe 100644
--- a/OpenSim/Region/CoreModules/Avatar/Lure/HGLureModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Lure/HGLureModule.cs
@@ -42,7 +42,7 @@ using GridRegion = OpenSim.Services.Interfaces.GridRegion;
 
 namespace OpenSim.Region.CoreModules.Avatar.Lure
 {
-    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "HGLureModule")]
     public class HGLureModule : ISharedRegionModule
     {
         private static readonly ILog m_log = LogManager.GetLogger(
@@ -186,7 +186,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Lure
                     client.FirstName+" "+client.LastName, targetid,
                     (byte)InstantMessageDialog.RequestTeleport, false,
                     message, sessionID, false, presence.AbsolutePosition,
-                    new Byte[0]);
+                    new Byte[0], true);
             m.RegionID = client.Scene.RegionInfo.RegionID.Guid;
 
             m_log.DebugFormat("[HG LURE MODULE]: RequestTeleport sessionID={0}, regionID={1}, message={2}", m.imSessionID, m.RegionID, m.message);
diff --git a/OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs b/OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs
index a889984..f3adb95 100644
--- a/OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs
@@ -29,6 +29,7 @@ using System;
 using System.Collections.Generic;
 using System.Reflection;
 using log4net;
+using Mono.Addins;
 using Nini.Config;
 using OpenMetaverse;
 using OpenSim.Framework;
@@ -37,6 +38,7 @@ using OpenSim.Region.Framework.Scenes;
 
 namespace OpenSim.Region.CoreModules.Avatar.Lure
 {
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "LureModule")]
     public class LureModule : ISharedRegionModule
     {
         private static readonly ILog m_log = LogManager.GetLogger(
@@ -173,7 +175,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Lure
                         client.FirstName+" "+client.LastName, targetid,
                         (byte)InstantMessageDialog.GodLikeRequestTeleport, false,
                         message, dest, false, presence.AbsolutePosition,
-                        new Byte[0]);
+                        new Byte[0], true);
             }
             else
             {
@@ -181,7 +183,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Lure
                         client.FirstName+" "+client.LastName, targetid,
                         (byte)InstantMessageDialog.RequestTeleport, false,
                         message, dest, false, presence.AbsolutePosition,
-                        new Byte[0]);
+                        new Byte[0], true);
             }
 
             if (m_TransferModule != null)
diff --git a/OpenSim/Region/CoreModules/Avatar/Profile/BasicProfileModule.cs b/OpenSim/Region/CoreModules/Avatar/Profile/BasicProfileModule.cs
index 87ca327..bf24030 100644
--- a/OpenSim/Region/CoreModules/Avatar/Profile/BasicProfileModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Profile/BasicProfileModule.cs
@@ -42,7 +42,7 @@ using OpenSim.Services.Interfaces;
 
 namespace OpenSim.Region.CoreModules.Avatar.Profile
 {
-    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "BasicProfileModule")]
     public class BasicProfileModule : IProfileModule, ISharedRegionModule
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
diff --git a/OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs b/OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
index dbe75b5..7f30e5a 100644
--- a/OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
@@ -43,7 +43,7 @@ using Caps=OpenSim.Framework.Capabilities.Caps;
 
 namespace OpenSim.Region.CoreModules.Framework
 {
-    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "CapabilitiesModule")]
     public class CapabilitiesModule : INonSharedRegionModule, ICapabilitiesModule
     { 
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index 880b2cc..7e72d47 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -43,9 +43,11 @@ using GridRegion = OpenSim.Services.Interfaces.GridRegion;
 using OpenMetaverse;
 using log4net;
 using Nini.Config;
+using Mono.Addins;
 
 namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
 {
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "EntityTransferModule")]
     public class EntityTransferModule : INonSharedRegionModule, IEntityTransferModule
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@@ -327,6 +329,14 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                     return;
                 }
 
+                // Validate assorted conditions
+                string reason = string.Empty;
+                if (!ValidateGenericConditions(sp, reg, finalDestination, teleportFlags, out reason))
+                {
+                    sp.ControllingClient.SendTeleportFailed(reason);
+                    return;
+                }
+
                 //
                 // This is it
                 //
@@ -358,6 +368,13 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             }
         }
 
+        // Nothing to validate here
+        protected virtual bool ValidateGenericConditions(ScenePresence sp, GridRegion reg, GridRegion finalDestination, uint teleportFlags, out string reason)
+        {
+            reason = String.Empty;
+            return true;
+        }
+
         /// <summary>
         /// Determines whether this instance is within the max transfer distance.
         /// </summary>
@@ -473,10 +490,11 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             // both regions
             if (sp.ParentID != (uint)0)
                 sp.StandUp();
-
             else if (sp.Flying)
                 teleportFlags |= (uint)TeleportFlags.IsFlying;
 
+            // At least on LL 3.3.4, this is not strictly necessary - a teleport will succeed without sending this to
+            // the viewer.  However, it might mean that the viewer does not see the black teleport screen (untested).
             sp.ControllingClient.SendTeleportStart(teleportFlags);
 
             // the avatar.Close below will clear the child region list. We need this below for (possibly)
@@ -552,8 +570,11 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                     // So let's wait
                     Thread.Sleep(200);
 
+                    // At least on LL 3.3.4 for teleports between different regions on the same simulator this appears
+                    // unnecessary - teleport will succeed and SEED caps will be requested without it (though possibly
+                    // only on TeleportFinish).  This is untested for region teleport between different simulators
+                    // though this probably also works.
                     m_eqModule.EstablishAgentCommunication(sp.UUID, endPoint, capsPath);
-
                 }
                 else
                 {
@@ -574,7 +595,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
 
             //sp.ControllingClient.SendTeleportProgress(teleportFlags, "Updating agent...");
 
-            if (!UpdateAgent(reg, finalDestination, agent))
+            if (!UpdateAgent(reg, finalDestination, agent, sp))
             {
                 // Region doesn't take it
                 m_log.WarnFormat(
@@ -650,7 +671,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 // an agent cannot teleport back to this region if it has teleported away.
                 Thread.Sleep(3000);
 
-                sp.Scene.IncomingCloseAgent(sp.UUID);
+                sp.Scene.IncomingCloseAgent(sp.UUID, false);
             }
             else
             {
@@ -658,13 +679,14 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 sp.Reset();
             }
 
-            // REFACTORING PROBLEM. Well, not a problem, but this method is HORRIBLE!
-            if (sp.Scene.NeedSceneCacheClear(sp.UUID))
-            {
-                m_log.DebugFormat(
-                    "[ENTITY TRANSFER MODULE]: User {0} is going to another region, profile cache removed",
-                    sp.UUID);
-            }
+            // Commented pending deletion since this method no longer appears to do anything at all
+//            // REFACTORING PROBLEM. Well, not a problem, but this method is HORRIBLE!
+//            if (sp.Scene.NeedSceneCacheClear(sp.UUID))
+//            {
+//                m_log.DebugFormat(
+//                    "[ENTITY TRANSFER MODULE]: User {0} is going to another region, profile cache removed",
+//                    sp.UUID);
+//            }
 
             m_entityTransferStateMachine.ResetFromTransit(sp.UUID);
         }
@@ -701,7 +723,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             return success;
         }
 
-        protected virtual bool UpdateAgent(GridRegion reg, GridRegion finalDestination, AgentData agent)
+        protected virtual bool UpdateAgent(GridRegion reg, GridRegion finalDestination, AgentData agent, ScenePresence sp)
         {
             return Scene.SimulationService.UpdateAgent(finalDestination, agent);
         }
@@ -1013,6 +1035,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             Scene initiatingScene)
         {
             Thread.Sleep(10000);
+            
             IMessageTransferModule im = initiatingScene.RequestModuleInterface<IMessageTransferModule>();
             if (im != null)
             {
@@ -1025,11 +1048,22 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                     (uint)(int)position.X,
                     (uint)(int)position.Y,
                     (uint)(int)position.Z);
-                GridInstantMessage m = new GridInstantMessage(initiatingScene, UUID.Zero,
-                "Region", agent.UUID,
-                (byte)InstantMessageDialog.GodLikeRequestTeleport, false,
-                "", gotoLocation, false, new Vector3(127, 0, 0),
-                new Byte[0]);
+
+                GridInstantMessage m
+                    = new GridInstantMessage(
+                        initiatingScene,
+                        UUID.Zero,
+                        "Region",
+                        agent.UUID,
+                        (byte)InstantMessageDialog.GodLikeRequestTeleport,
+                        false,
+                        "",
+                        gotoLocation,
+                        false,
+                        new Vector3(127, 0, 0),
+                        new Byte[0],
+                        false);
+
                 im.SendInstantMessage(m, delegate(bool success)
                 {
                     m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Client Initiating Teleport sending IM success = {0}", success);
@@ -1191,11 +1225,11 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             // the user may change their profile information in other region,
             // so the userinfo in UserProfileCache is not reliable any more, delete it
             // REFACTORING PROBLEM. Well, not a problem, but this method is HORRIBLE!
-            if (agent.Scene.NeedSceneCacheClear(agent.UUID))
-            {
-                m_log.DebugFormat(
-                    "[ENTITY TRANSFER MODULE]: User {0} is going to another region", agent.UUID);
-            }
+//            if (agent.Scene.NeedSceneCacheClear(agent.UUID))
+//            {
+//                m_log.DebugFormat(
+//                    "[ENTITY TRANSFER MODULE]: User {0} is going to another region", agent.UUID);
+//            }
 
             //m_log.Debug("AFTER CROSS");
             //Scene.DumpChildrenSeeds(UUID);
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
index 3010b59..f3a0b01 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
@@ -42,9 +42,11 @@ using GridRegion = OpenSim.Services.Interfaces.GridRegion;
 using OpenMetaverse;
 using log4net;
 using Nini.Config;
+using Mono.Addins;
 
 namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
 {
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "HGEntityTransferModule")]
     public class HGEntityTransferModule
         : EntityTransferModule, INonSharedRegionModule, IEntityTransferModule, IUserAgentVerificationModule
     {
@@ -54,6 +56,59 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
 
         private GatekeeperServiceConnector m_GatekeeperConnector;
 
+        protected bool m_RestrictAppearanceAbroad;
+        protected string m_AccountName;
+        protected List<AvatarAppearance> m_ExportedAppearances;
+        protected List<AvatarAttachment> m_Attachs;
+
+        protected List<AvatarAppearance> ExportedAppearance
+        {
+            get
+            {
+                if (m_ExportedAppearances != null)
+                    return m_ExportedAppearances;
+
+                m_ExportedAppearances = new List<AvatarAppearance>();
+                m_Attachs = new List<AvatarAttachment>();
+
+                string[] names = m_AccountName.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
+
+                foreach (string name in names)
+                {
+                    string[] parts = name.Trim().Split();
+                    if (parts.Length != 2)
+                    {
+                        m_log.WarnFormat("[HG ENTITY TRANSFER MODULE]: Wrong user account name format {0}. Specify 'First Last'", name);
+                        return null;
+                    }
+                    UserAccount account = Scene.UserAccountService.GetUserAccount(UUID.Zero, parts[0], parts[1]);
+                    if (account == null)
+                    {
+                        m_log.WarnFormat("[HG ENTITY TRANSFER MODULE]: Unknown account {0}", m_AccountName);
+                        return null;
+                    }
+                    AvatarAppearance a = Scene.AvatarService.GetAppearance(account.PrincipalID);
+                    if (a != null)
+                        m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: Successfully retrieved appearance for {0}", name);
+
+                    foreach (AvatarAttachment att in a.GetAttachments())
+                    {
+                        InventoryItemBase item = new InventoryItemBase(att.ItemID, account.PrincipalID);
+                        item = Scene.InventoryService.GetItem(item);
+                        if (item != null)
+                            a.SetAttachment(att.AttachPoint, att.ItemID, item.AssetID);
+                        else
+                            m_log.WarnFormat("[HG ENTITY TRANSFER MODULE]: Unable to retrieve item {0} from inventory {1}", att.ItemID, name);
+                    }
+
+                    m_ExportedAppearances.Add(a);
+                    m_Attachs.AddRange(a.GetAttachments());
+                }
+
+                return m_ExportedAppearances;
+            }
+        }
+
         #region ISharedRegionModule
 
         public override string Name
@@ -72,8 +127,18 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 {
                     IConfig transferConfig = source.Configs["EntityTransfer"];
                     if (transferConfig != null)
+                    {
                         m_levelHGTeleport = transferConfig.GetInt("LevelHGTeleport", 0);
 
+                        m_RestrictAppearanceAbroad = transferConfig.GetBoolean("RestrictAppearanceAbroad", false);
+                        if (m_RestrictAppearanceAbroad)
+                        {
+                            m_AccountName = transferConfig.GetString("AccountForAppearance", string.Empty);
+                            if (m_AccountName == string.Empty)
+                                m_log.WarnFormat("[HG ENTITY TRANSFER MODULE]: RestrictAppearanceAbroad is on, but no account has been given for avatar appearance!");
+                        }
+                    }
+
                     InitialiseCommon(source);
                     m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: {0} enabled.", Name);
                 }
@@ -85,7 +150,36 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             base.AddRegion(scene);
 
             if (m_Enabled)
+            {
                 scene.RegisterModuleInterface<IUserAgentVerificationModule>(this);
+                scene.EventManager.OnIncomingSceneObject += OnIncomingSceneObject;
+            }
+        }
+
+        void OnIncomingSceneObject(SceneObjectGroup so)
+        {
+            if (!so.IsAttachment)
+                return;
+
+            if (so.Scene.UserManagementModule.IsLocalGridUser(so.AttachedAvatar))
+                return;
+
+            // foreign user
+            AgentCircuitData aCircuit = so.Scene.AuthenticateHandler.GetAgentCircuitData(so.AttachedAvatar);
+            if (aCircuit != null && (aCircuit.teleportFlags & (uint)Constants.TeleportFlags.ViaHGLogin) != 0)
+            {
+                if (aCircuit.ServiceURLs != null && aCircuit.ServiceURLs.ContainsKey("AssetServerURI"))
+                {
+                    string url = aCircuit.ServiceURLs["AssetServerURI"].ToString();
+                    m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: Incoming attachement {0} for HG user {1} with asset server {2}", so.Name, so.AttachedAvatar, url);
+                    Dictionary<UUID, AssetType> ids = new Dictionary<UUID, AssetType>();
+                    HGUuidGatherer uuidGatherer = new HGUuidGatherer(so.Scene.AssetService, url);
+                    uuidGatherer.GatherAssetUuids(so, ids);
+
+                    foreach (KeyValuePair<UUID, AssetType> kvp in ids)
+                        uuidGatherer.FetchAsset(kvp.Key);
+                }
+            }
         }
 
         protected override void OnNewClient(IClientAPI client)
@@ -120,7 +214,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             int flags = Scene.GridService.GetRegionFlags(Scene.RegionInfo.ScopeID, region.RegionID);
             m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: region {0} flags: {1}", region.RegionID, flags);
 
-            if ((flags & (int)OpenSim.Data.RegionFlags.Hyperlink) != 0)
+            if ((flags & (int)OpenSim.Framework.RegionFlags.Hyperlink) != 0)
             {
                 m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: Destination region {0} is hyperlink", region.RegionID);
                 GridRegion real_destination = m_GatekeeperConnector.GetHyperlinkRegion(region, region.RegionID);
@@ -140,7 +234,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 return true;
 
             int flags = Scene.GridService.GetRegionFlags(Scene.RegionInfo.ScopeID, reg.RegionID);
-            if (flags == -1 /* no region in DB */ || (flags & (int)OpenSim.Data.RegionFlags.Hyperlink) != 0)
+            if (flags == -1 /* no region in DB */ || (flags & (int)OpenSim.Framework.RegionFlags.Hyperlink) != 0)
                 return true;
 
             return false;
@@ -153,6 +247,8 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             {
                 // Log them out of this grid
                 Scene.PresenceService.LogoutAgent(sp.ControllingClient.SessionId);
+                string userId = Scene.UserManagementModule.GetUserUUI(sp.UUID);
+                Scene.GridUserService.LoggedOut(userId, UUID.Zero, Scene.RegionInfo.RegionID, sp.AbsolutePosition, sp.Lookat);
             }
         }
 
@@ -162,11 +258,11 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             reason = string.Empty;
             logout = false;
             int flags = Scene.GridService.GetRegionFlags(Scene.RegionInfo.ScopeID, reg.RegionID);
-            if (flags == -1 /* no region in DB */ || (flags & (int)OpenSim.Data.RegionFlags.Hyperlink) != 0)
+            if (flags == -1 /* no region in DB */ || (flags & (int)OpenSim.Framework.RegionFlags.Hyperlink) != 0)
             {
                 // this user is going to another grid
-                // check if HyperGrid teleport is allowed, based on user level
-                if (sp.UserLevel < m_levelHGTeleport)
+                // for local users, check if HyperGrid teleport is allowed, based on user level
+                if (Scene.UserManagementModule.IsLocalGridUser(sp.UUID) && sp.UserLevel < m_levelHGTeleport)
                 {
                     m_log.WarnFormat("[HG ENTITY TRANSFER MODULE]: Unable to HG teleport agent due to insufficient UserLevel.");
                     reason = "Hypergrid teleport not allowed";
@@ -200,6 +296,124 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             TeleportHome(id, client);
         }
 
+        protected override bool ValidateGenericConditions(ScenePresence sp, GridRegion reg, GridRegion finalDestination, uint teleportFlags, out string reason)
+        {
+            reason = "Please wear your grid's allowed appearance before teleporting to another grid";
+            if (!m_RestrictAppearanceAbroad)
+                return true;
+
+            // The rest is only needed for controlling appearance
+
+            int flags = Scene.GridService.GetRegionFlags(Scene.RegionInfo.ScopeID, reg.RegionID);
+            if (flags == -1 /* no region in DB */ || (flags & (int)OpenSim.Framework.RegionFlags.Hyperlink) != 0)
+            {
+                // this user is going to another grid
+                if (Scene.UserManagementModule.IsLocalGridUser(sp.UUID))
+                {
+                    m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: RestrictAppearanceAbroad is ON. Checking generic appearance");
+
+                    // Check wearables
+                    for (int i = 0; i < AvatarWearable.MAX_WEARABLES; i++)
+                    {
+                        for (int j = 0; j < sp.Appearance.Wearables[i].Count; j++)
+                        {
+                            if (sp.Appearance.Wearables[i] == null)
+                                continue;
+
+                            bool found = false;
+                            foreach (AvatarAppearance a in ExportedAppearance)
+                                if (a.Wearables[i] != null)
+                                {
+                                    found = true;
+                                    break;
+                                }
+
+                            if (!found) 
+                            {
+                               m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: Wearable not allowed to go outside {0}", i);
+                               return false;
+                            }
+
+                            found = false;
+                            foreach (AvatarAppearance a in ExportedAppearance)
+                                if (sp.Appearance.Wearables[i][j].AssetID == a.Wearables[i][j].AssetID)
+                                {
+                                    found = true;
+                                    break;
+                                }
+
+                            if (!found)
+                            {
+                                m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: Wearable not allowed to go outside {0}", i);
+                                return false;
+                            }
+                        }
+                    }
+
+                    // Check attachments
+                    foreach (AvatarAttachment att in sp.Appearance.GetAttachments())
+                    {
+                        bool found = false;
+                        foreach (AvatarAttachment att2 in m_Attachs)
+                        {
+                            if (att2.AssetID == att.AssetID)
+                            {
+                                found = true;
+                                break;
+                            }
+                        }
+                        if (!found)
+                        {
+                            m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: Attachment not allowed to go outside {0}", att.AttachPoint);
+                            return false;
+                        }
+                    }
+                }
+            }
+
+            reason = string.Empty;
+            return true;
+        }
+
+
+        //protected override bool UpdateAgent(GridRegion reg, GridRegion finalDestination, AgentData agentData, ScenePresence sp)
+        //{
+        //    int flags = Scene.GridService.GetRegionFlags(Scene.RegionInfo.ScopeID, reg.RegionID);
+        //    if (flags == -1 /* no region in DB */ || (flags & (int)OpenSim.Data.RegionFlags.Hyperlink) != 0)
+        //    {
+        //        // this user is going to another grid
+        //        if (m_RestrictAppearanceAbroad && Scene.UserManagementModule.IsLocalGridUser(agentData.AgentID))
+        //        {
+        //            // We need to strip the agent off its appearance
+        //            m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: RestrictAppearanceAbroad is ON. Sending generic appearance");
+
+        //            // Delete existing npc attachments
+        //            Scene.AttachmentsModule.DeleteAttachmentsFromScene(sp, false);
+
+        //            // XXX: We can't just use IAvatarFactoryModule.SetAppearance() yet since it doesn't transfer attachments
+        //            AvatarAppearance newAppearance = new AvatarAppearance(ExportedAppearance, true);
+        //            sp.Appearance = newAppearance;
+
+        //            // Rez needed npc attachments
+        //            Scene.AttachmentsModule.RezAttachments(sp);
+
+                   
+        //            IAvatarFactoryModule module = Scene.RequestModuleInterface<IAvatarFactoryModule>();
+        //            //module.SendAppearance(sp.UUID);
+        //            module.RequestRebake(sp, false);
+
+        //            Scene.AttachmentsModule.CopyAttachments(sp, agentData);
+        //            agentData.Appearance = sp.Appearance;
+        //        }
+        //    }
+
+        //    foreach (AvatarAttachment a in agentData.Appearance.GetAttachments())
+        //        m_log.DebugFormat("[XXX]: {0}-{1}", a.ItemID, a.AssetID);
+
+
+        //    return base.UpdateAgent(reg, finalDestination, agentData, sp);
+        //}
+
         public override bool TeleportHome(UUID id, IClientAPI client)
         {
             m_log.DebugFormat(
@@ -375,4 +589,4 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             return region;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGAssetMapper.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGAssetMapper.cs
index eaadc1b..f8ec6de 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGAssetMapper.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGAssetMapper.cs
@@ -71,19 +71,19 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
 
         #region Internal functions
 
-        public AssetBase FetchAsset(string url, UUID assetID)
+        public AssetMetadata FetchMetadata(string url, UUID assetID)
         {
             if (!url.EndsWith("/") && !url.EndsWith("="))
                 url = url + "/";
 
-            AssetBase asset = m_scene.AssetService.Get(url + assetID.ToString());
+            AssetMetadata meta = m_scene.AssetService.GetMetadata(url + assetID.ToString());
 
-            if (asset != null)
-            {
-                m_log.DebugFormat("[HG ASSET MAPPER]: Copied asset {0} from {1} to local asset server. ", asset.ID, url);
-                return asset;
-            }
-            return null;
+            if (meta != null)
+                m_log.DebugFormat("[HG ASSET MAPPER]: Fetched metadata for asset {0} of type {1} from {2} ", assetID, meta.Type, url);
+            else
+                m_log.DebugFormat("[HG ASSET MAPPER]: Unable to fetched metadata for asset {0} from {1} ", assetID, url);
+
+            return meta;
         }
 
         public bool PostAsset(string url, AssetBase asset)
@@ -93,6 +93,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                 if (!url.EndsWith("/") && !url.EndsWith("="))
                     url = url + "/";
 
+                bool success = true;
                 // See long comment in AssetCache.AddAsset
                 if (!asset.Temporary || asset.Local)
                 {
@@ -103,14 +104,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                     // not having a global naming infrastructure
                     AssetBase asset1 = new AssetBase(asset.FullID, asset.Name, asset.Type, asset.Metadata.CreatorID);
                     Copy(asset, asset1);
-                    try
-                    {
-                        asset1.ID = url + asset.ID;
-                    }
-                    catch
-                    {
-                        m_log.Warn("[HG ASSET MAPPER]: Oops.");
-                    }
+                    asset1.ID = url + asset.ID;
 
                     AdjustIdentifiers(asset1.Metadata);
                     if (asset1.Metadata.Type == (sbyte)AssetType.Object)
@@ -118,11 +112,17 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                     else
                         asset1.Data = asset.Data;
 
-                    m_scene.AssetService.Store(asset1);
-                    m_log.DebugFormat("[HG ASSET MAPPER]: Posted copy of asset {0} from local asset server to {1}", asset1.ID, url);
+                    string id = m_scene.AssetService.Store(asset1);
+                    if (id == string.Empty)
+                    {
+                        m_log.DebugFormat("[HG ASSET MAPPER]: Asset server {0} did not accept {1}", url, asset.ID);
+                        success = false;
+                    }
+                    else
+                        m_log.DebugFormat("[HG ASSET MAPPER]: Posted copy of asset {0} from local asset server to {1}", asset1.ID, url);
                 }
-                return true;
-           }
+                return success;
+            }
             else
                 m_log.Warn("[HG ASSET MAPPER]: Tried to post asset to remote server, but asset not in local cache.");
 
@@ -222,28 +222,17 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
 
         public void Get(UUID assetID, UUID ownerID, string userAssetURL)
         {
-            // Get the item from the remote asset server onto the local AssetCache
-            // and place an entry in m_assetMap
-
-            m_log.Debug("[HG ASSET MAPPER]: Fetching object " + assetID + " from asset server " + userAssetURL);
-            AssetBase asset = FetchAsset(userAssetURL, assetID); 
+            // Get the item from the remote asset server onto the local AssetService
 
-            if (asset != null)
-            {
-                // OK, now fetch the inside.
-                Dictionary<UUID, AssetType> ids = new Dictionary<UUID, AssetType>();
-                HGUuidGatherer uuidGatherer = new HGUuidGatherer(this, m_scene.AssetService, userAssetURL);
-                uuidGatherer.GatherAssetUuids(asset.FullID, (AssetType)asset.Type, ids);
-                if (ids.ContainsKey(assetID))
-                    ids.Remove(assetID);
-                foreach (UUID uuid in ids.Keys)
-                    FetchAsset(userAssetURL, uuid);
+            AssetMetadata meta = FetchMetadata(userAssetURL, assetID);
+            if (meta == null)
+                return;
 
-                m_log.DebugFormat("[HG ASSET MAPPER]: Successfully fetched asset {0} from asset server {1}", asset.ID, userAssetURL);
+            // The act of gathering UUIDs downloads the assets from the remote server
+            Dictionary<UUID, AssetType> ids = new Dictionary<UUID, AssetType>();
+            HGUuidGatherer uuidGatherer = new HGUuidGatherer(m_scene.AssetService, userAssetURL);
+            uuidGatherer.GatherAssetUuids(assetID, (AssetType)meta.Type, ids);
 
-            }
-            else
-                m_log.Warn("[HG ASSET MAPPER]: Could not fetch asset from remote asset server " + userAssetURL);
         }
 
 
@@ -257,19 +246,23 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
             if (asset != null)
             {
                 Dictionary<UUID, AssetType> ids = new Dictionary<UUID, AssetType>();
-                HGUuidGatherer uuidGatherer = new HGUuidGatherer(this, m_scene.AssetService, string.Empty);
+                HGUuidGatherer uuidGatherer = new HGUuidGatherer(m_scene.AssetService, string.Empty);
                 uuidGatherer.GatherAssetUuids(asset.FullID, (AssetType)asset.Type, ids);
+                bool success = false;
                 foreach (UUID uuid in ids.Keys)
                 {
                     asset = m_scene.AssetService.Get(uuid.ToString());
                     if (asset == null)
                         m_log.DebugFormat("[HG ASSET MAPPER]: Could not find asset {0}", uuid);
                     else
-                        PostAsset(userAssetURL, asset);
+                        success = PostAsset(userAssetURL, asset);
                 }
 
-                 // maybe all pieces got there...
-                m_log.DebugFormat("[HG ASSET MAPPER]: Successfully posted item {0} to asset server {1}", assetID, userAssetURL);
+                // maybe all pieces got there...
+                if (!success)
+                    m_log.DebugFormat("[HG ASSET MAPPER]: Problems posting item {0} to asset server {1}", assetID, userAssetURL);
+                else
+                    m_log.DebugFormat("[HG ASSET MAPPER]: Successfully posted item {0} to asset server {1}", assetID, userAssetURL);
 
             }
             else
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs
index cf72b58..964efda 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs
@@ -42,9 +42,11 @@ using GridRegion = OpenSim.Services.Interfaces.GridRegion;
 using OpenMetaverse;
 using log4net;
 using Nini.Config;
+using Mono.Addins;
 
 namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
 {
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "HGInventoryAccessModule")]
     public class HGInventoryAccessModule : BasicInventoryAccessModule, INonSharedRegionModule, IInventoryAccessModule
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@@ -92,7 +94,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                         m_HomeURI = thisModuleConfig.GetString("HomeURI", m_HomeURI);
                         m_OutboundPermission = thisModuleConfig.GetBoolean("OutboundPermission", true);
                         m_ThisGatekeeper = thisModuleConfig.GetString("Gatekeeper", string.Empty);
-                        m_RestrictInventoryAccessAbroad = thisModuleConfig.GetBoolean("RestrictInventoryAccessAbroad", false);
+                        m_RestrictInventoryAccessAbroad = thisModuleConfig.GetBoolean("RestrictInventoryAccessAbroad", true);
                     }
                     else
                         m_log.Warn("[HG INVENTORY ACCESS MODULE]: HGInventoryAccessModule configs not found. ProfileServerURI not set!");
@@ -263,8 +265,13 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
             //}
 
             // OK, we're done fetching. Pass it up to the default RezObject
-            return base.RezObject(remoteClient, itemID, RayEnd, RayStart, RayTargetID, BypassRayCast, RayEndIsIntersection,
-                                  RezSelected, RemoveItem, fromTaskID, attachment);
+            SceneObjectGroup sog = base.RezObject(remoteClient, itemID, RayEnd, RayStart, RayTargetID, BypassRayCast, RayEndIsIntersection,
+                                   RezSelected, RemoveItem, fromTaskID, attachment);
+
+            if (sog == null)
+                remoteClient.SendAgentAlertMessage("Unable to rez: problem accessing inventory or locating assets", false);
+
+            return sog;
 
         }
 
@@ -308,6 +315,8 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
         protected override InventoryItemBase GetItem(UUID agentID, UUID itemID)
         {
             InventoryItemBase item = base.GetItem(agentID, itemID);
+            if (item == null)
+                return null;
 
             string userAssetServer = string.Empty;
             if (IsForeignUser(agentID, out userAssetServer))
@@ -344,6 +353,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
 
         private void ProcessInventoryForArriving(IClientAPI client)
         {
+            // No-op for now, but we may need to do something for freign users inventory
         }
 
         //
@@ -390,6 +400,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
 
         private void ProcessInventoryForLeaving(IClientAPI client)
         {
+            // No-op for now
         }
 
         #endregion
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
index 50f5f68..6e5a4a5 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
@@ -46,9 +46,11 @@ using GridRegion = OpenSim.Services.Interfaces.GridRegion;
 using OpenMetaverse;
 using log4net;
 using Nini.Config;
+using Mono.Addins;
 
 namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
 {
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "BasicInventoryAccessModule")]
     public class BasicInventoryAccessModule : INonSharedRegionModule, IInventoryAccessModule
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
diff --git a/OpenSim/Region/CoreModules/Framework/Library/LibraryModule.cs b/OpenSim/Region/CoreModules/Framework/Library/LibraryModule.cs
index 3155ce7..ec22146 100644
--- a/OpenSim/Region/CoreModules/Framework/Library/LibraryModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/Library/LibraryModule.cs
@@ -41,10 +41,12 @@ using OpenSim.Server.Base;
 
 using OpenMetaverse;
 using log4net;
+using Mono.Addins;
 using Nini.Config;
 
 namespace OpenSim.Region.CoreModules.Framework.Library
 {
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "LibraryModule")]
     public class LibraryModule : ISharedRegionModule
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
diff --git a/OpenSim/Region/CoreModules/Framework/Monitoring/MonitorModule.cs b/OpenSim/Region/CoreModules/Framework/Monitoring/MonitorModule.cs
index e135c21..d84460a 100644
--- a/OpenSim/Region/CoreModules/Framework/Monitoring/MonitorModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/Monitoring/MonitorModule.cs
@@ -38,10 +38,12 @@ using OpenSim.Region.CoreModules.Framework.Monitoring.Alerts;
 using OpenSim.Region.CoreModules.Framework.Monitoring.Monitors;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
+using Mono.Addins;
 
 namespace OpenSim.Region.CoreModules.Framework.Monitoring
 {
-    public class MonitorModule : IRegionModule 
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "MonitorModule")]
+    public class MonitorModule : INonSharedRegionModule 
     {
         /// <summary>
         /// Is this module enabled?
@@ -62,14 +64,14 @@ namespace OpenSim.Region.CoreModules.Framework.Monitoring
         private readonly List<IAlert> m_alerts = new List<IAlert>();
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
-        #region Implementation of IRegionModule
-
         public MonitorModule()
         {
             Enabled = true;
         }
 
-        public void Initialise(Scene scene, IConfigSource source)
+        #region Implementation of INonSharedRegionModule
+
+        public void Initialise(IConfigSource source)
         {
             IConfig cnfg = source.Configs["Monitoring"];
 
@@ -79,6 +81,13 @@ namespace OpenSim.Region.CoreModules.Framework.Monitoring
             if (!Enabled)
                 return;
 
+        }
+
+        public void AddRegion(Scene scene)
+        {
+            if (!Enabled)
+                return;
+
             m_scene = scene;
 
             m_scene.AddCommand("General", this, "monitor report",
@@ -89,101 +98,42 @@ namespace OpenSim.Region.CoreModules.Framework.Monitoring
             MainServer.Instance.AddHTTPHandler("/monitorstats/" + m_scene.RegionInfo.RegionID, StatsPage);
             MainServer.Instance.AddHTTPHandler(
                 "/monitorstats/" + Uri.EscapeDataString(m_scene.RegionInfo.RegionName), StatsPage);
+
+            AddMonitors();
         }
 
-        public void DebugMonitors(string module, string[] args)
+        public void RemoveRegion(Scene scene)
         {
-            foreach (IMonitor monitor in m_staticMonitors)
-            {
-                m_log.InfoFormat(
-                    "[MONITOR MODULE]: {0} reports {1} = {2}",
-                    m_scene.RegionInfo.RegionName, monitor.GetFriendlyName(), monitor.GetFriendlyValue());
-            }
+            if (!Enabled)
+                return;
 
-            foreach (KeyValuePair<string, float> tuple in m_scene.StatsReporter.GetExtraSimStats())
-            {
-                m_log.InfoFormat(
-                    "[MONITOR MODULE]: {0} reports {1} = {2}",
-                    m_scene.RegionInfo.RegionName, tuple.Key, tuple.Value);
-            }
+            MainServer.Instance.RemoveHTTPHandler("GET", "/monitorstats/" + m_scene.RegionInfo.RegionID);
+            MainServer.Instance.RemoveHTTPHandler("GET", "/monitorstats/" + Uri.EscapeDataString(m_scene.RegionInfo.RegionName));
+            m_scene = null;
         }
 
-        public void TestAlerts()
+        public void Close()
         {
-            foreach (IAlert alert in m_alerts)
-            {
-                alert.Test();
-            }
         }
 
-        public Hashtable StatsPage(Hashtable request)
+        public string Name
         {
-            // If request was for a specific monitor
-            // eg url/?monitor=Monitor.Name
-            if (request.ContainsKey("monitor"))
-            {
-                string monID = (string) request["monitor"];
-
-                foreach (IMonitor monitor in m_staticMonitors)
-                {
-                    string elemName = monitor.ToString();
-                    if (elemName.StartsWith(monitor.GetType().Namespace))
-                        elemName = elemName.Substring(monitor.GetType().Namespace.Length + 1);
-
-                    if (elemName == monID || monitor.ToString() == monID)
-                    {
-                        Hashtable ereply3 = new Hashtable();
-
-                        ereply3["int_response_code"] = 404; // 200 OK
-                        ereply3["str_response_string"] = monitor.GetValue().ToString();
-                        ereply3["content_type"] = "text/plain";
-
-                        return ereply3;
-                    }
-                }
-
-                // FIXME: Arguably this should also be done with dynamic monitors but I'm not sure what the above code
-                // is even doing.  Why are we inspecting the type of the monitor???
-
-                // No monitor with that name
-                Hashtable ereply2 = new Hashtable();
-
-                ereply2["int_response_code"] = 404; // 200 OK
-                ereply2["str_response_string"] = "No such monitor";
-                ereply2["content_type"] = "text/plain";
-
-                return ereply2;
-            }
-
-            string xml = "<data>";
-            foreach (IMonitor monitor in m_staticMonitors)
-            {
-                string elemName = monitor.GetName();
-                xml += "<" + elemName + ">" + monitor.GetValue().ToString() + "</" + elemName + ">";
-//                m_log.DebugFormat("[MONITOR MODULE]: {0} = {1}", elemName, monitor.GetValue());
-            }
-
-            foreach (KeyValuePair<string, float> tuple in m_scene.StatsReporter.GetExtraSimStats())
-            {
-                xml += "<" + tuple.Key + ">" + tuple.Value + "</" + tuple.Key + ">";
-            }
-
-            xml += "</data>";
-
-            Hashtable ereply = new Hashtable();
-
-            ereply["int_response_code"] = 200; // 200 OK
-            ereply["str_response_string"] = xml;
-            ereply["content_type"] = "text/xml";
+            get { return "Region Health Monitoring Module"; }
+        }
 
-            return ereply;
+        public void RegionLoaded(Scene scene)
+        {
         }
 
-        public void PostInitialise()
+        public Type ReplaceableInterface
         {
-            if (!Enabled)
-                return;
+            get { return null; }
+        }
+
+        #endregion
 
+        public void AddMonitors()
+        {
             m_staticMonitors.Add(new AgentCountMonitor(m_scene));
             m_staticMonitors.Add(new ChildAgentCountMonitor(m_scene));
             m_staticMonitors.Add(new GCMemoryMonitor());
@@ -196,7 +146,7 @@ namespace OpenSim.Region.CoreModules.Framework.Monitoring
             m_staticMonitors.Add(new EventFrameMonitor(m_scene));
             m_staticMonitors.Add(new LandFrameMonitor(m_scene));
             m_staticMonitors.Add(new LastFrameTimeMonitor(m_scene));
-            
+
             m_staticMonitors.Add(
                 new GenericMonitor(
                     m_scene,
@@ -357,25 +307,98 @@ namespace OpenSim.Region.CoreModules.Framework.Monitoring
             }
         }
 
-        void OnTriggerAlert(System.Type reporter, string reason, bool fatal)
+        public void DebugMonitors(string module, string[] args)
         {
-            m_log.Error("[Monitor] " + reporter.Name + " for " + m_scene.RegionInfo.RegionName + " reports " + reason + " (Fatal: " + fatal + ")");
+            foreach (IMonitor monitor in m_staticMonitors)
+            {
+                MainConsole.Instance.OutputFormat(
+                    "[MONITOR MODULE]: {0} reports {1} = {2}",
+                    m_scene.RegionInfo.RegionName, monitor.GetFriendlyName(), monitor.GetFriendlyValue());
+            }
+
+            foreach (KeyValuePair<string, float> tuple in m_scene.StatsReporter.GetExtraSimStats())
+            {
+                MainConsole.Instance.OutputFormat(
+                    "[MONITOR MODULE]: {0} reports {1} = {2}",
+                    m_scene.RegionInfo.RegionName, tuple.Key, tuple.Value);
+            }
         }
 
-        public void Close()
+        public void TestAlerts()
         {
+            foreach (IAlert alert in m_alerts)
+            {
+                alert.Test();
+            }
         }
 
-        public string Name
+        public Hashtable StatsPage(Hashtable request)
         {
-            get { return "Region Health Monitoring Module"; }
+            // If request was for a specific monitor
+            // eg url/?monitor=Monitor.Name
+            if (request.ContainsKey("monitor"))
+            {
+                string monID = (string) request["monitor"];
+
+                foreach (IMonitor monitor in m_staticMonitors)
+                {
+                    string elemName = monitor.ToString();
+                    if (elemName.StartsWith(monitor.GetType().Namespace))
+                        elemName = elemName.Substring(monitor.GetType().Namespace.Length + 1);
+
+                    if (elemName == monID || monitor.ToString() == monID)
+                    {
+                        Hashtable ereply3 = new Hashtable();
+
+                        ereply3["int_response_code"] = 404; // 200 OK
+                        ereply3["str_response_string"] = monitor.GetValue().ToString();
+                        ereply3["content_type"] = "text/plain";
+
+                        return ereply3;
+                    }
+                }
+
+                // FIXME: Arguably this should also be done with dynamic monitors but I'm not sure what the above code
+                // is even doing.  Why are we inspecting the type of the monitor???
+
+                // No monitor with that name
+                Hashtable ereply2 = new Hashtable();
+
+                ereply2["int_response_code"] = 404; // 200 OK
+                ereply2["str_response_string"] = "No such monitor";
+                ereply2["content_type"] = "text/plain";
+
+                return ereply2;
+            }
+
+            string xml = "<data>";
+            foreach (IMonitor monitor in m_staticMonitors)
+            {
+                string elemName = monitor.GetName();
+                xml += "<" + elemName + ">" + monitor.GetValue().ToString() + "</" + elemName + ">";
+//                m_log.DebugFormat("[MONITOR MODULE]: {0} = {1}", elemName, monitor.GetValue());
+            }
+
+            foreach (KeyValuePair<string, float> tuple in m_scene.StatsReporter.GetExtraSimStats())
+            {
+                xml += "<" + tuple.Key + ">" + tuple.Value + "</" + tuple.Key + ">";
+            }
+
+            xml += "</data>";
+
+            Hashtable ereply = new Hashtable();
+
+            ereply["int_response_code"] = 200; // 200 OK
+            ereply["str_response_string"] = xml;
+            ereply["content_type"] = "text/xml";
+
+            return ereply;
         }
 
-        public bool IsSharedModule
+        void OnTriggerAlert(System.Type reporter, string reason, bool fatal)
         {
-            get { return false; }
+            m_log.Error("[Monitor] " + reporter.Name + " for " + m_scene.RegionInfo.RegionName + " reports " + reason + " (Fatal: " + fatal + ")");
         }
-
-        #endregion
+        
     }
 }
diff --git a/OpenSim/Region/CoreModules/Framework/Statistics/Logging/LogWriter.cs b/OpenSim/Region/CoreModules/Framework/Statistics/Logging/LogWriter.cs
index 65e4c90..fd8d5e3 100755
--- a/OpenSim/Region/CoreModules/Framework/Statistics/Logging/LogWriter.cs
+++ b/OpenSim/Region/CoreModules/Framework/Statistics/Logging/LogWriter.cs
@@ -1,161 +1,170 @@
-/*

- * 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 OpenSimulator 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.IO;

-using System.Text;

-using log4net;

-

-namespace OpenSim.Region.CoreModules.Framework.Statistics.Logging

-{

-    /// <summary>

-    /// Class for writing a high performance, high volume log file.

-    /// Sometimes, to debug, one has a high volume logging to do and the regular

-    /// log file output is not appropriate.

-    /// Create a new instance with the parameters needed and

-    /// call Write() to output a line. Call Close() when finished.

-    /// If created with no parameters, it will not log anything.

-    /// </summary>

-    public class LogWriter : IDisposable

-    {

-        public bool Enabled { get; private set; }

-

-        private string m_logDirectory = ".";

-        private int m_logMaxFileTimeMin = 5;    // 5 minutes

-        public String LogFileHeader { get; set; }

-

-        private StreamWriter m_logFile = null;

-        private TimeSpan m_logFileLife;

-        private DateTime m_logFileEndTime;

-        private Object m_logFileWriteLock = new Object();

-

-        // set externally when debugging. If let 'null', this does not write any error messages.

-        public ILog ErrorLogger = null;

-        private string LogHeader = "[LOG WRITER]";

-

-        /// <summary>

-        /// Create a log writer that will not write anything. Good for when not enabled

-        /// but the write statements are still in the code.

-        /// </summary>

-        public LogWriter()

-        {

-            Enabled = false;

-            m_logFile = null;

-        }

-

-        /// <summary>

-        /// Create a log writer instance.

-        /// </summary>

-        /// <param name="dir">The directory to create the log file in. May be 'null' for default.</param>

-        /// <param name="headr">The characters that begin the log file name. May be 'null' for default.</param>

-        /// <param name="maxFileTime">Maximum age of a log file in minutes. If zero, will set default.</param>

-        public LogWriter(string dir, string headr, int maxFileTime)

-        {

-            m_logDirectory = dir == null ? "." : dir;

-

-            LogFileHeader = headr == null ? "log-" : headr;

-

-            m_logMaxFileTimeMin = maxFileTime;

-            if (m_logMaxFileTimeMin < 1)

-                m_logMaxFileTimeMin = 5;

-

-            m_logFileLife = new TimeSpan(0, m_logMaxFileTimeMin, 0);

-            m_logFileEndTime = DateTime.Now + m_logFileLife;

-

-            Enabled = true;

-        }

-

-        public void Dispose()

-        {

-            this.Close();

-        }

-

-        public void Close()

-        {

-            Enabled = false;

-            if (m_logFile != null)

-            {

-                m_logFile.Close();

-                m_logFile.Dispose();

-                m_logFile = null;

-            }

-        }

-

-        public void Write(string line, params object[] args)

-        {

-            if (!Enabled) return;

-            Write(String.Format(line, args));

-        }

-

-        public void Write(string line)

-        {

-            if (!Enabled) return;

-            try

-            {

-                lock (m_logFileWriteLock)

-                {

-                    DateTime now = DateTime.Now;

-                    if (m_logFile == null || now > m_logFileEndTime)

-                    {

-                        if (m_logFile != null)

-                        {

-                            m_logFile.Close();

-                            m_logFile.Dispose();

-                            m_logFile = null;

-                        }

-

-                        // First log file or time has expired, start writing to a new log file

-                        m_logFileEndTime = now + m_logFileLife;

-                        string path = (m_logDirectory.Length > 0 ? m_logDirectory

-                                    + System.IO.Path.DirectorySeparatorChar.ToString() : "")

-                                + String.Format("{0}{1}.log", LogFileHeader, now.ToString("yyyyMMddHHmmss"));

-                        m_logFile = new StreamWriter(File.Open(path, FileMode.Append, FileAccess.Write));

-                    }

-                    if (m_logFile != null)

-                    {

-                        StringBuilder buff = new StringBuilder(line.Length + 25);

-                        buff.Append(now.ToString("yyyyMMddHHmmssfff"));

-                        // buff.Append(now.ToString("yyyyMMddHHmmss"));

-                        buff.Append(",");

-                        buff.Append(line);

-                        buff.Append("\r\n");

-                        m_logFile.Write(buff.ToString());

-                    }

-                }

-            }

-            catch (Exception e)

-            {

-                if (ErrorLogger != null)

-                {

-                    ErrorLogger.ErrorFormat("{0}: FAILURE WRITING TO LOGFILE: {1}", LogHeader, e);

-                }

-                Enabled = false;

-            }

-            return;

-        }

-    }

-}
\ No newline at end of file
+/*
+ * 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 OpenSimulator 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.IO;
+using System.Text;
+using log4net;
+
+namespace OpenSim.Region.CoreModules.Framework.Statistics.Logging
+{
+    /// <summary>
+    /// Class for writing a high performance, high volume log file.
+    /// Sometimes, to debug, one has a high volume logging to do and the regular
+    /// log file output is not appropriate.
+    /// Create a new instance with the parameters needed and
+    /// call Write() to output a line. Call Close() when finished.
+    /// If created with no parameters, it will not log anything.
+    /// </summary>
+    public class LogWriter : IDisposable
+    {
+        public bool Enabled { get; private set; }
+
+        private string m_logDirectory = ".";
+        private int m_logMaxFileTimeMin = 5;    // 5 minutes
+        public String LogFileHeader { get; set; }
+
+        private StreamWriter m_logFile = null;
+        private TimeSpan m_logFileLife;
+        private DateTime m_logFileEndTime;
+        private Object m_logFileWriteLock = new Object();
+
+        // set externally when debugging. If let 'null', this does not write any error messages.
+        public ILog ErrorLogger = null;
+        private string LogHeader = "[LOG WRITER]";
+
+        /// <summary>
+        /// Create a log writer that will not write anything. Good for when not enabled
+        /// but the write statements are still in the code.
+        /// </summary>
+        public LogWriter()
+        {
+            Enabled = false;
+            m_logFile = null;
+        }
+
+        /// <summary>
+        /// Create a log writer instance.
+        /// </summary>
+        /// <param name="dir">The directory to create the log file in. May be 'null' for default.</param>
+        /// <param name="headr">The characters that begin the log file name. May be 'null' for default.</param>
+        /// <param name="maxFileTime">Maximum age of a log file in minutes. If zero, will set default.</param>
+        public LogWriter(string dir, string headr, int maxFileTime)
+        {
+            m_logDirectory = dir == null ? "." : dir;
+
+            LogFileHeader = headr == null ? "log-" : headr;
+
+            m_logMaxFileTimeMin = maxFileTime;
+            if (m_logMaxFileTimeMin < 1)
+                m_logMaxFileTimeMin = 5;
+
+            m_logFileLife = new TimeSpan(0, m_logMaxFileTimeMin, 0);
+            m_logFileEndTime = DateTime.Now + m_logFileLife;
+
+            Enabled = true;
+        }
+
+        public void Dispose()
+        {
+            this.Close();
+        }
+
+        public void Close()
+        {
+            Enabled = false;
+            if (m_logFile != null)
+            {
+                m_logFile.Close();
+                m_logFile.Dispose();
+                m_logFile = null;
+            }
+        }
+
+        public void Write(string line, params object[] args)
+        {
+            if (!Enabled) return;
+            Write(String.Format(line, args));
+        }
+
+        public void Flush()
+        {
+            if (!Enabled) return;
+            if (m_logFile != null)
+            {
+                m_logFile.Flush();
+            }
+        }
+
+        public void Write(string line)
+        {
+            if (!Enabled) return;
+            try
+            {
+                lock (m_logFileWriteLock)
+                {
+                    DateTime now = DateTime.Now;
+                    if (m_logFile == null || now > m_logFileEndTime)
+                    {
+                        if (m_logFile != null)
+                        {
+                            m_logFile.Close();
+                            m_logFile.Dispose();
+                            m_logFile = null;
+                        }
+
+                        // First log file or time has expired, start writing to a new log file
+                        m_logFileEndTime = now + m_logFileLife;
+                        string path = (m_logDirectory.Length > 0 ? m_logDirectory
+                                    + System.IO.Path.DirectorySeparatorChar.ToString() : "")
+                                + String.Format("{0}{1}.log", LogFileHeader, now.ToString("yyyyMMddHHmmss"));
+                        m_logFile = new StreamWriter(File.Open(path, FileMode.Append, FileAccess.Write));
+                    }
+                    if (m_logFile != null)
+                    {
+                        StringBuilder buff = new StringBuilder(line.Length + 25);
+                        buff.Append(now.ToString("yyyyMMddHHmmssfff"));
+                        // buff.Append(now.ToString("yyyyMMddHHmmss"));
+                        buff.Append(",");
+                        buff.Append(line);
+                        buff.Append("\r\n");
+                        m_logFile.Write(buff.ToString());
+                    }
+                }
+            }
+            catch (Exception e)
+            {
+                if (ErrorLogger != null)
+                {
+                    ErrorLogger.ErrorFormat("{0}: FAILURE WRITING TO LOGFILE: {1}", LogHeader, e);
+                }
+                Enabled = false;
+            }
+            return;
+        }
+    }
+}
diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/HGUserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/HGUserManagementModule.cs
index 4eecaa2..4ef57fe 100644
--- a/OpenSim/Region/CoreModules/Framework/UserManagement/HGUserManagementModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/UserManagement/HGUserManagementModule.cs
@@ -41,9 +41,11 @@ using OpenMetaverse;
 using OpenMetaverse.Packets;
 using log4net;
 using Nini.Config;
+using Mono.Addins;
 
 namespace OpenSim.Region.CoreModules.Framework.UserManagement
 {
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "HGUserManagementModule")]
     public class HGUserManagementModule : UserManagementModule, ISharedRegionModule, IUserManagement
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@@ -137,6 +139,9 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
                             ud.FirstName = words[0];
                             ud.LastName = "@" + words[1];
                             users.Add(ud);
+                            // WARNING! that uriStr is not quite right... it may be missing the / at the end,
+                            // which will cause trouble (duplicate entries on some tables). We should
+                            // get the UUI instead from the UAS. TO BE FIXED.
                             AddUser(userID, names[0], names[1], uriStr);
                             m_log.DebugFormat("[USER MANAGEMENT MODULE]: User {0}@{1} found", words[0], words[1]);
                         }
diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
index f4ed67b..86e7004 100644
--- a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
@@ -31,6 +31,7 @@ using System.Reflection;
 
 using OpenSim.Framework;
 using OpenSim.Framework.Console;
+using OpenSim.Region.ClientStack.LindenUDP;
 using OpenSim.Region.Framework;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
@@ -41,6 +42,7 @@ using OpenMetaverse;
 using OpenMetaverse.Packets;
 using log4net;
 using Nini.Config;
+using Mono.Addins;
 
 namespace OpenSim.Region.CoreModules.Framework.UserManagement
 {
@@ -53,6 +55,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
         public Dictionary<string, object> ServerURLs { get; set; }
     }
 
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "UserManagementModule")]
     public class UserManagementModule : ISharedRegionModule, IUserManagement
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@@ -429,8 +432,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
 
         public void AddUser(UUID uuid, string first, string last, string homeURL)
         {
-            // m_log.DebugFormat("[USER MANAGEMENT MODULE]: Adding user with id {0}, first {1}, last {2}, url {3}", uuid, first, last, homeURL);
-
+            //m_log.DebugFormat("[USER MANAGEMENT MODULE]: Adding user with id {0}, first {1}, last {2}, url {3}", uuid, first, last, homeURL);
             AddUser(uuid, homeURL + ";" + first + " " + last);
         }
 
@@ -553,8 +555,8 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
                 MainConsole.Instance.Output("-----------------------------------------------------------------------------");
                 foreach (KeyValuePair<UUID, UserData> kvp in m_UserCache)
                 {
-                    MainConsole.Instance.Output(String.Format("{0} {1} {2}",
-                           kvp.Key, kvp.Value.FirstName, kvp.Value.LastName));
+                    MainConsole.Instance.Output(String.Format("{0} {1} {2} ({3})",
+                           kvp.Key, kvp.Value.FirstName, kvp.Value.LastName, kvp.Value.HomeURL));
                 }
     
                 return;
diff --git a/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs b/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs
index 4f18b53..ec94420 100644
--- a/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs
+++ b/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs
@@ -31,6 +31,7 @@ using System.Reflection;
 using log4net;
 using Nini.Config;
 using OpenMetaverse;
+using Mono.Addins;
 using OpenSim.Framework;
 using OpenSim.Region.CoreModules.World.WorldMap;
 using OpenSim.Region.Framework.Interfaces;
@@ -39,6 +40,7 @@ using GridRegion = OpenSim.Services.Interfaces.GridRegion;
 
 namespace OpenSim.Region.CoreModules.Hypergrid
 {
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "HGWorldMapModule")]
     public class HGWorldMapModule : WorldMapModule
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
diff --git a/OpenSim/Region/CoreModules/InterGrid/OGSRadmin.cs b/OpenSim/Region/CoreModules/InterGrid/OGSRadmin.cs
deleted file mode 100644
index 2cc0a07..0000000
--- a/OpenSim/Region/CoreModules/InterGrid/OGSRadmin.cs
+++ /dev/null
@@ -1,150 +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 OpenSimulator 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;
-using System.Collections.Generic;
-using System.Net;
-using System.Reflection;
-using System.Text;
-using log4net;
-using Nini.Config;
-using Nwc.XmlRpc;
-using OpenMetaverse;
-using OpenSim.Framework;
-using OpenSim.Framework.Communications;
-using OpenSim.Framework.Servers;
-using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
-
-namespace OpenSim.Region.CoreModules.InterGrid
-{
-    public class OGSRadmin : IRegionModule 
-    {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        private readonly List<Scene> m_scenes = new List<Scene>();
-        private IConfigSource m_settings;
-
-        #region Implementation of IRegionModuleBase
-
-        public string Name
-        {
-            get { return "OGS Supporting RAdmin"; }
-        }
-
-
-        public void Initialise(IConfigSource source)
-        {
-            m_settings = source;
-        }
-
-        public void Close()
-        {
-
-        }
-
-        public void AddRegion(Scene scene)
-        {
-            lock (m_scenes)
-                m_scenes.Add(scene);
-        }
-
-        public void RemoveRegion(Scene scene)
-        {
-            lock (m_scenes)
-                m_scenes.Remove(scene);
-        }
-
-        public void RegionLoaded(Scene scene)
-        {
-            
-        }
-
-        public void PostInitialise()
-        {
-            if (m_settings.Configs["Startup"].GetBoolean("gridmode", false))
-            {
-                MainServer.Instance.AddXmlRPCHandler("grid_message", GridWideMessage);
-            }
-        }
-
-        #endregion
-
-        #region IRegionModule
-
-        public void Initialise(Scene scene, IConfigSource source)
-        {
-            m_settings = source;
-
-            lock (m_scenes)
-                m_scenes.Add(scene);
-        }
-
-        public bool IsSharedModule
-        {
-            get { return true; }
-        }
-
-        #endregion
-
-        public XmlRpcResponse GridWideMessage(XmlRpcRequest req, IPEndPoint remoteClient)
-        {
-            XmlRpcResponse response = new XmlRpcResponse();
-            Hashtable responseData = new Hashtable();
-
-            Hashtable requestData = (Hashtable)req.Params[0];
-
-            // REFACTORING PROBLEM. This authorization needs to be replaced with some other
-            //if ((!requestData.Contains("password") || (string)requestData["password"] != m_com.NetworkServersInfo.GridRecvKey))
-            //{
-            //    responseData["accepted"] = false;
-            //    responseData["success"] = false;
-            //    responseData["error"] = "Invalid Key";
-            //    response.Value = responseData;
-            //    return response;
-            //}
-
-            string message = (string)requestData["message"];
-            string user = (string)requestData["user"];
-            m_log.InfoFormat("[RADMIN]: Broadcasting: {0}", message);
-
-            lock (m_scenes)
-                foreach (Scene scene in m_scenes)
-                {
-                    IDialogModule dialogModule = scene.RequestModuleInterface<IDialogModule>();
-                    if (dialogModule != null)
-                        dialogModule.SendNotificationToUsersInRegion(UUID.Random(), user, message);
-                }
-
-            responseData["accepted"] = true;
-            responseData["success"] = true;
-            response.Value = responseData;
-
-            return response;
-        }
-    }
-}
diff --git a/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs b/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs
deleted file mode 100644
index 4a76b00..0000000
--- a/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs
+++ /dev/null
@@ -1,1297 +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 OpenSimulator 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.Net;
-using System.Net.Security;
-using System.Reflection;
-using System.Security.Cryptography.X509Certificates;
-using System.Threading;
-using System.Web;
-using log4net;
-using Nini.Config;
-using OpenMetaverse;
-using OpenMetaverse.StructuredData;
-using OpenSim.Framework;
-using OpenSim.Framework.Capabilities;
-using OpenSim.Framework.Monitoring;
-using OpenSim.Framework.Servers;
-using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
-using Caps=OpenSim.Framework.Capabilities.Caps;
-using OSDArray=OpenMetaverse.StructuredData.OSDArray;
-using OSDMap=OpenMetaverse.StructuredData.OSDMap;
-
-namespace OpenSim.Region.CoreModules.InterGrid
-{
-    public struct OGPState
-    {
-        public string first_name;
-        public string last_name;
-        public UUID agent_id;
-        public UUID local_agent_id;
-        public UUID region_id;
-        public uint circuit_code;
-        public UUID secure_session_id;
-        public UUID session_id;
-        public bool agent_access;
-        public string sim_access;
-        public uint god_level;
-        public bool god_overide;
-        public bool identified;
-        public bool transacted;
-        public bool age_verified;
-        public bool allow_redirect;
-        public int limited_to_estate;
-        public string inventory_host;
-        public bool src_can_see_mainland;
-        public int src_estate_id;
-        public int src_version;
-        public int src_parent_estate_id;
-        public bool visible_to_parent;
-        public string teleported_into_region;
-    }
-    
-    public class OpenGridProtocolModule : IRegionModule
-    {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        private List<Scene> m_scene = new List<Scene>();
-
-        private Dictionary<string, AgentCircuitData> CapsLoginID = new Dictionary<string, AgentCircuitData>();
-        private Dictionary<UUID, OGPState> m_OGPState = new Dictionary<UUID, OGPState>();
-        private Dictionary<string, string> m_loginToRegionState = new Dictionary<string, string>();
-        
-
-        private string LastNameSuffix = "_EXTERNAL";
-        private string FirstNamePrefix = "";
-        private string httpsCN = "";
-        private bool httpSSL = false;
-        private uint httpsslport = 0;
-//        private bool GridMode = false;
-
-        #region IRegionModule Members
-
-        public void Initialise(Scene scene, IConfigSource config)
-        {
-            bool enabled = false;
-            IConfig cfg = null;
-            IConfig httpcfg = null;
-//            IConfig startupcfg = null;
-            try
-            {
-                cfg = config.Configs["OpenGridProtocol"];
-            } catch (NullReferenceException)
-            {
-                enabled = false;
-            }
-
-            try
-            {
-                httpcfg = config.Configs["Network"];
-            }
-            catch (NullReferenceException)
-            {
-               
-            }
-//            try
-//            {
-//                startupcfg = config.Configs["Startup"];
-//            }
-//            catch (NullReferenceException)
-//            {
-//
-//            }
-
-//            if (startupcfg != null)
-//            {
-//                GridMode = enabled = startupcfg.GetBoolean("gridmode", false);
-//            }
-
-            if (cfg != null)
-            {
-                enabled = cfg.GetBoolean("ogp_enabled", false);
-                LastNameSuffix = cfg.GetString("ogp_lastname_suffix", "_EXTERNAL");
-                FirstNamePrefix = cfg.GetString("ogp_firstname_prefix", "");
-                if (enabled)
-                {
-                    m_log.Warn("[OGP]: Open Grid Protocol is on, Listening for Clients on /agent/");
-                    lock (m_scene)
-                    {
-                        if (m_scene.Count == 0)
-                        {
-                            MainServer.Instance.AddLLSDHandler("/agent/", ProcessAgentDomainMessage);
-                            MainServer.Instance.AddLLSDHandler("/", ProcessRegionDomainSeed);
-                            try
-                            {
-                                ServicePointManager.ServerCertificateValidationCallback += customXertificateValidation;
-                            }
-                            catch (NotImplementedException)
-                            {
-                                try
-                                {
-#pragma warning disable 0612, 0618
-                                    // Mono does not implement the ServicePointManager.ServerCertificateValidationCallback yet!  Don't remove this!
-                                    ServicePointManager.CertificatePolicy = new MonoCert();
-#pragma warning restore 0612, 0618
-                                }
-                                catch (Exception)
-                                {
-                                    m_log.Error("[OGP]: Certificate validation handler change not supported.  You may get ssl certificate validation errors teleporting from your region to some SSL regions.");
-                                }
-                            }
-
-                        }
-                        // can't pick the region 'agent' because it would conflict with our agent domain handler
-                        // a zero length region name would conflict with are base region seed cap
-                        if (!SceneListDuplicateCheck(scene.RegionInfo.RegionName) && scene.RegionInfo.RegionName.ToLower() != "agent" && scene.RegionInfo.RegionName.Length > 0)
-                        {
-                            MainServer.Instance.AddLLSDHandler(
-                                "/" + HttpUtility.UrlPathEncode(scene.RegionInfo.RegionName.ToLower()),
-                                ProcessRegionDomainSeed);
-                        }
-
-                        if (!m_scene.Contains(scene))
-                            m_scene.Add(scene);
-                    }
-                }
-            }
-            lock (m_scene)
-            {
-                if (m_scene.Count == 1)
-                {
-                    if (httpcfg != null)
-                    {
-                        httpSSL = httpcfg.GetBoolean("http_listener_ssl", false);
-                        httpsCN = httpcfg.GetString("http_listener_cn", scene.RegionInfo.ExternalHostName);
-                        if (httpsCN.Length == 0)
-                            httpsCN = scene.RegionInfo.ExternalHostName;
-                        httpsslport = (uint)httpcfg.GetInt("http_listener_sslport",((int)scene.RegionInfo.HttpPort + 1));
-                    }
-                }
-            }
-        }
-        
-        public void PostInitialise()
-        {
-        }
-
-        public void Close()
-        {
-            //scene.EventManager.OnAvatarEnteringNewParcel -= AvatarEnteringParcel;
-        }
-
-        public string Name
-        {
-            get { return "OpenGridProtocolModule"; }
-        }
-
-        public bool IsSharedModule
-        {
-            get { return true; }
-        }
-
-        #endregion
-
-        public OSD ProcessRegionDomainSeed(string path, OSD request, string endpoint)
-        {
-            string[] pathSegments = path.Split('/');
-            
-            if (pathSegments.Length <= 1)
-            {
-                return GenerateNoHandlerMessage();
-
-            }
-            
-            return GenerateRezAvatarRequestMessage(pathSegments[1]);
-            
-            
-
-            //m_log.InfoFormat("[OGP]: path {0}, segments {1} segment[1] {2} Last segment {3}",
-            //                 path, pathSegments.Length, pathSegments[1], pathSegments[pathSegments.Length - 1]);
-            //return new OSDMap();
-
-        }
-
-        public OSD ProcessAgentDomainMessage(string path, OSD request, string endpoint)
-        {
-            // /agent/*
-
-            string[] pathSegments = path.Split('/');
-            if (pathSegments.Length <= 1)
-            {
-                return GenerateNoHandlerMessage();
-                
-            }
-            if (pathSegments[0].Length == 0 && pathSegments[1].Length == 0)
-            {
-                return GenerateRezAvatarRequestMessage("");
-            }
-            m_log.InfoFormat("[OGP]: path {0}, segments {1} segment[1] {2} Last segment {3}",
-                             path, pathSegments.Length, pathSegments[1], pathSegments[pathSegments.Length - 1]);
-
-            switch (pathSegments[pathSegments.Length - 1])
-            {
-                case "rez_avatar":
-                    return RezAvatarMethod(path, request);
-                    //break;
-                case "derez_avatar":
-                    return DerezAvatarMethod(path, request);
-                    //break;
-
-            }
-            if (path.Length < 2)
-            {
-                return GenerateNoHandlerMessage();
-            }
-
-            switch (pathSegments[pathSegments.Length - 2] + "/" + pathSegments[pathSegments.Length - 1])
-            {
-                case "rez_avatar/rez":
-                    return RezAvatarMethod(path, request);
-                    //break;
-                case "rez_avatar/request":
-                    return RequestRezAvatarMethod(path, request);
-                case "rez_avatar/place":
-                    return RequestRezAvatarMethod(path, request);
-                case "rez_avatar/derez":
-                    return DerezAvatarMethod(path, request);
-                    //break;
-                default:
-                    return GenerateNoHandlerMessage();
-            }
-            //return null;
-        }
-
-        private OSD GenerateRezAvatarRequestMessage(string regionname)
-        {
-            Scene region = null;
-            bool usedroot = false;
-
-            if (regionname.Length == 0)
-            {
-                region = GetRootScene();
-                usedroot = true;
-            }
-            else
-            {
-                region = GetScene(HttpUtility.UrlDecode(regionname).ToLower());
-            }
-
-            // this shouldn't happen since we don't listen for a region that is down..   but 
-            // it might if the region was taken down or is in the middle of restarting
-
-            if (region == null)
-            {
-                region = GetRootScene();
-                usedroot = true;
-            }
-            
-            UUID statekeeper = UUID.Random();
-
-            
-            
-
-            RegionInfo reg = region.RegionInfo;
-
-            OSDMap responseMap = new OSDMap();
-            string rezHttpProtocol = "http://";
-            //string regionCapsHttpProtocol = "http://";
-            string httpaddr = reg.ExternalHostName;
-            string urlport = reg.HttpPort.ToString();
-            string requestpath = "/agent/" + statekeeper + "/rez_avatar/request";
-
-            if (!usedroot)
-            {
-                lock (m_loginToRegionState)
-                {
-                    if (!m_loginToRegionState.ContainsKey(requestpath))
-                    {
-                        m_loginToRegionState.Add(requestpath, region.RegionInfo.RegionName.ToLower());
-                    }
-                }
-            }
-
-            if (httpSSL)
-            {
-                rezHttpProtocol = "https://";
-                //regionCapsHttpProtocol = "https://";
-                urlport = httpsslport.ToString();
-
-                if (httpsCN.Length > 0)
-                    httpaddr = httpsCN;
-            }
-
-            responseMap["connect"] = OSD.FromBoolean(true);
-            OSDMap capabilitiesMap = new OSDMap();
-            capabilitiesMap["rez_avatar/request"] = OSD.FromString(rezHttpProtocol + httpaddr + ":" + urlport + requestpath);
-            responseMap["capabilities"] = capabilitiesMap;
-            
-            return responseMap;
-        }
-
-        // Using OpenSim.Framework.Capabilities.Caps here one time..
-        // so the long name is probably better then a using statement
-        public void OnRegisterCaps(UUID agentID, Caps caps)
-        {
-            /* If we ever want to register our own caps here....
-             * 
-            string capsBase = "/CAPS/" + caps.CapsObjectPath;
-            caps.RegisterHandler("CAPNAME",
-                                 new RestStreamHandler("POST", capsBase + CAPSPOSTFIX!,
-                                                       delegate(string request, string path, string param,
-                                                                OSHttpRequest httpRequest, OSHttpResponse httpResponse)
-                                                       {
-                                                           return METHODHANDLER(request, path, param,
-                                                                                         agentID, caps);
-                                         }));
-            
-             *
-             */
-        }
-
-        public OSD RequestRezAvatarMethod(string path, OSD request)
-        {
-            //m_log.Debug("[REQUESTREZAVATAR]: " + request.ToString());
-
-            OSDMap requestMap = (OSDMap)request;
-
-
-            Scene homeScene = null;
-
-            lock (m_loginToRegionState)
-            {
-                if (m_loginToRegionState.ContainsKey(path))
-                {
-                    homeScene = GetScene(m_loginToRegionState[path]);
-                    m_loginToRegionState.Remove(path);
-
-                    if (homeScene == null)
-                        homeScene = GetRootScene();
-                }
-                else
-                {
-                    homeScene = GetRootScene();
-                }
-            }
-
-            // Homescene is still null, we must have no regions that are up
-            if (homeScene == null)
-                return GenerateNoHandlerMessage();
-
-            RegionInfo reg = homeScene.RegionInfo;
-            ulong regionhandle = GetOSCompatibleRegionHandle(reg);
-            //string RegionURI = reg.ServerURI;
-            //int RegionPort = (int)reg.HttpPort;
-
-            UUID RemoteAgentID = requestMap["agent_id"].AsUUID();
-            
-            // will be used in the future.  The client always connects with the aditi agentid currently
-            UUID LocalAgentID = RemoteAgentID;
-
-            string FirstName = requestMap["first_name"].AsString();
-            string LastName = requestMap["last_name"].AsString();
-
-            FirstName = FirstNamePrefix + FirstName;
-            LastName = LastName + LastNameSuffix;
-
-            OGPState userState = GetOGPState(LocalAgentID);
-
-            userState.first_name = requestMap["first_name"].AsString();
-            userState.last_name = requestMap["last_name"].AsString();
-            userState.age_verified = requestMap["age_verified"].AsBoolean();
-            userState.transacted = requestMap["transacted"].AsBoolean();
-            userState.agent_access = requestMap["agent_access"].AsBoolean();
-            userState.allow_redirect = requestMap["allow_redirect"].AsBoolean();
-            userState.identified = requestMap["identified"].AsBoolean();
-            userState.god_level = (uint)requestMap["god_level"].AsInteger();
-            userState.sim_access = requestMap["sim_access"].AsString();
-            userState.agent_id = RemoteAgentID;
-            userState.limited_to_estate = requestMap["limited_to_estate"].AsInteger();
-            userState.src_can_see_mainland = requestMap["src_can_see_mainland"].AsBoolean();
-            userState.src_estate_id = requestMap["src_estate_id"].AsInteger();
-            userState.local_agent_id = LocalAgentID;
-            userState.teleported_into_region = reg.RegionName.ToLower();
-
-            UpdateOGPState(LocalAgentID, userState);
-
-            OSDMap responseMap = new OSDMap();
-
-            if (RemoteAgentID == UUID.Zero)
-            {
-                responseMap["connect"] = OSD.FromBoolean(false);
-                responseMap["message"] = OSD.FromString("No agent ID was specified in rez_avatar/request");
-                m_log.Error("[OGP]: rez_avatar/request failed because no avatar UUID was provided in the request body");
-                return responseMap;
-            }
-
-            responseMap["sim_host"] = OSD.FromString(reg.ExternalHostName);
-            
-            // DEPRECATED
-            responseMap["sim_ip"] = OSD.FromString(Util.GetHostFromDNS(reg.ExternalHostName).ToString());
-            
-            responseMap["connect"] = OSD.FromBoolean(true);
-            responseMap["sim_port"] = OSD.FromInteger(reg.InternalEndPoint.Port);
-            responseMap["region_x"] = OSD.FromInteger(reg.RegionLocX * (uint)Constants.RegionSize); // LLX
-            responseMap["region_y"] = OSD.FromInteger(reg.RegionLocY * (uint)Constants.RegionSize); // LLY
-            responseMap["region_id"] = OSD.FromUUID(reg.originRegionID);
-
-            if (reg.RegionSettings.Maturity == 1)
-            {
-                responseMap["sim_access"] = OSD.FromString("Mature");
-            }
-            else if (reg.RegionSettings.Maturity == 2)
-            {
-                responseMap["sim_access"] = OSD.FromString("Adult");
-            }
-            else
-            {
-                responseMap["sim_access"] = OSD.FromString("PG");
-            }
-
-            // Generate a dummy agent for the user so we can get back a CAPS path
-            AgentCircuitData agentData = new AgentCircuitData();
-            agentData.AgentID = LocalAgentID;
-            agentData.BaseFolder = UUID.Zero;
-            agentData.CapsPath = CapsUtil.GetRandomCapsObjectPath();
-            agentData.child = false;
-            agentData.circuitcode = (uint)(Util.RandomClass.Next());
-            agentData.firstname = FirstName;
-            agentData.lastname = LastName;
-            agentData.SecureSessionID = UUID.Random();
-            agentData.SessionID = UUID.Random();
-            agentData.startpos = new Vector3(128f, 128f, 100f);
-
-            // Pre-Fill our region cache with information on the agent.
-            UserAgentData useragent = new UserAgentData();
-            useragent.AgentIP = "unknown";
-            useragent.AgentOnline = true;
-            useragent.AgentPort = (uint)0;
-            useragent.Handle = regionhandle;
-            useragent.InitialRegion = reg.originRegionID;
-            useragent.LoginTime = Util.UnixTimeSinceEpoch();
-            useragent.LogoutTime = 0;
-            useragent.Position = agentData.startpos;
-            useragent.Region = reg.originRegionID;
-            useragent.SecureSessionID = agentData.SecureSessionID;
-            useragent.SessionID = agentData.SessionID;
-
-            UserProfileData userProfile = new UserProfileData();
-            userProfile.AboutText = "OGP User";
-            userProfile.CanDoMask = (uint)0;
-            userProfile.Created = Util.UnixTimeSinceEpoch();
-            userProfile.CurrentAgent = useragent;
-            userProfile.CustomType = "OGP";
-            userProfile.FirstLifeAboutText = "I'm testing OpenGrid Protocol";
-            userProfile.FirstLifeImage = UUID.Zero;
-            userProfile.FirstName = agentData.firstname;
-            userProfile.GodLevel = 0;
-            userProfile.HomeLocation = agentData.startpos;
-            userProfile.HomeLocationX = agentData.startpos.X;
-            userProfile.HomeLocationY = agentData.startpos.Y;
-            userProfile.HomeLocationZ = agentData.startpos.Z;
-            userProfile.HomeLookAt = Vector3.Zero;
-            userProfile.HomeLookAtX = userProfile.HomeLookAt.X;
-            userProfile.HomeLookAtY = userProfile.HomeLookAt.Y;
-            userProfile.HomeLookAtZ = userProfile.HomeLookAt.Z;
-            userProfile.HomeRegion = reg.RegionHandle;
-            userProfile.HomeRegionID = reg.originRegionID;
-            userProfile.HomeRegionX = reg.RegionLocX;
-            userProfile.HomeRegionY = reg.RegionLocY;
-            userProfile.ID = agentData.AgentID;
-            userProfile.Image = UUID.Zero;
-            userProfile.LastLogin = Util.UnixTimeSinceEpoch();
-            userProfile.Partner = UUID.Zero;
-            userProfile.PasswordHash = "$1$";
-            userProfile.PasswordSalt = "";
-            userProfile.SurName = agentData.lastname;
-            //userProfile.UserAssetURI = homeScene.CommsManager.NetworkServersInfo.AssetURL;
-            userProfile.UserFlags = 0;
-            //userProfile.UserInventoryURI = homeScene.CommsManager.NetworkServersInfo.InventoryURL;
-            userProfile.WantDoMask = 0;
-            userProfile.WebLoginKey = UUID.Random();
-
-            // !!! REFACTORING PROBLEM. This needs to be changed for 0.7
-            //
-            //// Do caps registration
-            //// get seed capagentData.firstname = FirstName;agentData.lastname = LastName;
-            //if (homeScene.CommsManager.UserService.GetUserProfile(agentData.AgentID) == null && !GridMode)
-            //{
-            //    homeScene.CommsManager.UserAdminService.AddUser(
-            //        agentData.firstname, agentData.lastname, CreateRandomStr(7), "", 
-            //        homeScene.RegionInfo.RegionLocX, homeScene.RegionInfo.RegionLocY, agentData.AgentID);
-                
-            //    UserProfileData userProfile2 = homeScene.CommsManager.UserService.GetUserProfile(agentData.AgentID);
-            //    if (userProfile2 != null)
-            //    {
-            //        userProfile = userProfile2;
-            //        userProfile.AboutText = "OGP USER";
-            //        userProfile.FirstLifeAboutText = "OGP USER";
-            //        homeScene.CommsManager.UserService.UpdateUserProfile(userProfile);
-            //    }
-            //}
-            
-            //// Stick our data in the cache so the region will know something about us
-            //homeScene.CommsManager.UserProfileCacheService.PreloadUserCache(userProfile);
-
-            // Call 'new user' event handler
-            string reason;
-            if (!homeScene.NewUserConnection(agentData, (uint)TeleportFlags.ViaLogin, out reason))
-            {
-                responseMap["connect"] = OSD.FromBoolean(false);
-                responseMap["message"] = OSD.FromString(String.Format("Connection refused: {0}", reason));
-                m_log.ErrorFormat("[OGP]: rez_avatar/request failed: {0}", reason);
-                return responseMap;
-            }
-
-
-            //string raCap = string.Empty;
-
-            UUID AvatarRezCapUUID = LocalAgentID;
-            string rezAvatarPath = "/agent/" + AvatarRezCapUUID + "/rez_avatar/rez";
-            string derezAvatarPath = "/agent/" + AvatarRezCapUUID + "/rez_avatar/derez";
-            // Get a reference to the user's cap so we can pull out the Caps Object Path
-            Caps userCap 
-                = homeScene.CapsModule.GetCapsForUser(agentData.AgentID);
-
-            string rezHttpProtocol = "http://";
-            string regionCapsHttpProtocol = "http://";
-            string httpaddr = reg.ExternalHostName;
-            string urlport = reg.HttpPort.ToString();
-
-            if (httpSSL)
-            {
-                rezHttpProtocol = "https://";
-                regionCapsHttpProtocol = "https://";
-                urlport = httpsslport.ToString();
-
-                if (httpsCN.Length > 0)
-                    httpaddr = httpsCN;
-            }
-            
-            // DEPRECATED
-            responseMap["seed_capability"] 
-                = OSD.FromString(
-                    regionCapsHttpProtocol + httpaddr + ":" + reg.HttpPort + "/" + CapsUtil.GetCapsSeedPath(userCap.CapsObjectPath));
-            
-            // REPLACEMENT
-            responseMap["region_seed_capability"] 
-                = OSD.FromString(
-                    regionCapsHttpProtocol + httpaddr + ":" + reg.HttpPort + "/" + CapsUtil.GetCapsSeedPath(userCap.CapsObjectPath));
-
-            responseMap["rez_avatar"] = OSD.FromString(rezHttpProtocol + httpaddr + ":" + urlport + rezAvatarPath);
-            responseMap["rez_avatar/rez"] = OSD.FromString(rezHttpProtocol + httpaddr + ":" + urlport + rezAvatarPath);
-            responseMap["rez_avatar/derez"] = OSD.FromString(rezHttpProtocol + httpaddr + ":" + urlport + derezAvatarPath);
-
-            // Add the user to the list of CAPS that are outstanding.
-            // well allow the caps hosts in this dictionary
-            lock (CapsLoginID)
-            {
-                if (CapsLoginID.ContainsKey(rezAvatarPath))
-                {
-                    CapsLoginID[rezAvatarPath] = agentData;
-                    
-                    // This is a joke, if you didn't notice...  It's so unlikely to happen, that I'll print this message if it does occur!
-                    m_log.Error("[OGP]: Holy anomoly batman! Caps path already existed!  All the UUID Duplication worries were founded!");
-                }
-                else
-                {
-                    CapsLoginID.Add(rezAvatarPath, agentData);
-                }
-            }
-            
-            //m_log.Debug("Response:" + responseMap.ToString());
-            return responseMap;
-        }
-
-        public OSD RezAvatarMethod(string path, OSD request)
-        {
-            m_log.WarnFormat("[REZAVATAR]: {0}", request.ToString());
-
-            OSDMap responseMap = new OSDMap();
-
-            AgentCircuitData userData = null;
-
-            // Only people we've issued a cap can go further
-            if (TryGetAgentCircuitData(path,out userData))
-            {
-                OSDMap requestMap = (OSDMap)request;
-
-                // take these values to start.  There's a few more
-                UUID SecureSessionID=requestMap["secure_session_id"].AsUUID();
-                UUID SessionID = requestMap["session_id"].AsUUID();
-                int circuitcode = requestMap["circuit_code"].AsInteger();
-                OSDArray Parameter = new OSDArray();
-                if (requestMap.ContainsKey("parameter"))
-                {
-                   Parameter = (OSDArray)requestMap["parameter"];
-                }
-
-                //int version = 1;
-                int estateID = 1;
-                int parentEstateID = 1;
-                UUID regionID = UUID.Zero;
-                bool visibleToParent = true;
-
-                for (int i = 0; i < Parameter.Count; i++)
-                {
-                    OSDMap item = (OSDMap)Parameter[i];
-//                    if (item.ContainsKey("version"))
-//                    {
-//                        version = item["version"].AsInteger();
-//                    }
-                    if (item.ContainsKey("estate_id"))
-                    {
-                        estateID = item["estate_id"].AsInteger();
-                    }
-                    if (item.ContainsKey("parent_estate_id"))
-                    {
-                        parentEstateID = item["parent_estate_id"].AsInteger();
-
-                    }
-                    if (item.ContainsKey("region_id"))
-                    {
-                        regionID = item["region_id"].AsUUID();
-
-                    }
-                    if (item.ContainsKey("visible_to_parent"))
-                    {
-                        visibleToParent = item["visible_to_parent"].AsBoolean();
-                    }
-                }
-                //Update our Circuit data with the real values
-                userData.SecureSessionID = SecureSessionID;
-                userData.SessionID = SessionID;
-
-                OGPState userState = GetOGPState(userData.AgentID);
-
-                // Locate a home scene suitable for the user.
-                Scene homeScene = null;
-
-                homeScene = GetScene(userState.teleported_into_region);
-                
-                if (homeScene == null)
-                    homeScene = GetRootScene();
-
-                if (homeScene != null)
-                {
-                    // Get a referenceokay -  to their Cap object so we can pull out the capobjectroot
-                    Caps userCap 
-                        = homeScene.CapsModule.GetCapsForUser(userData.AgentID);
-
-                    //Update the circuit data in the region so this user is authorized
-                    homeScene.UpdateCircuitData(userData);
-                    homeScene.ChangeCircuitCode(userData.circuitcode,(uint)circuitcode);
-
-                    // Load state
-                    
-
-                    // Keep state changes
-                    userState.first_name = requestMap["first_name"].AsString();
-                    userState.secure_session_id = requestMap["secure_session_id"].AsUUID();
-                    userState.age_verified = requestMap["age_verified"].AsBoolean();
-                    userState.region_id = homeScene.RegionInfo.originRegionID; // replace 0000000 with our regionid
-                    userState.transacted = requestMap["transacted"].AsBoolean();
-                    userState.agent_access = requestMap["agent_access"].AsBoolean();
-                    userState.inventory_host = requestMap["inventory_host"].AsString();
-                    userState.identified = requestMap["identified"].AsBoolean();
-                    userState.session_id = requestMap["session_id"].AsUUID();
-                    userState.god_level = (uint)requestMap["god_level"].AsInteger();
-                    userState.last_name = requestMap["last_name"].AsString();
-                    userState.god_overide = requestMap["god_override"].AsBoolean();
-                    userState.circuit_code = (uint)requestMap["circuit_code"].AsInteger();
-                    userState.limited_to_estate = requestMap["limited_to_estate"].AsInteger();
-                    userState.src_estate_id = estateID;
-                    userState.region_id = regionID;
-                    userState.src_parent_estate_id = parentEstateID;
-                    userState.visible_to_parent = visibleToParent;
-
-                    // Save state changes
-                    UpdateOGPState(userData.AgentID, userState);
-
-                    // Get the region information for the home region.
-                    RegionInfo reg = homeScene.RegionInfo;
-
-                    // Dummy positional and look at info..  we don't have it.
-                    OSDArray PositionArray = new OSDArray();
-                    PositionArray.Add(OSD.FromInteger(128));
-                    PositionArray.Add(OSD.FromInteger(128));
-                    PositionArray.Add(OSD.FromInteger(40));
-
-                    OSDArray LookAtArray = new OSDArray();
-                    LookAtArray.Add(OSD.FromInteger(1));
-                    LookAtArray.Add(OSD.FromInteger(1));
-                    LookAtArray.Add(OSD.FromInteger(1));
-
-                    // Our region's X and Y position in OpenSimulator space.
-                    uint fooX = reg.RegionLocX;
-                    uint fooY = reg.RegionLocY;
-                    m_log.InfoFormat("[OGP]: region x({0}) region y({1})", fooX, fooY);
-                    m_log.InfoFormat("[OGP]: region http {0} {1}", reg.ServerURI, reg.HttpPort);
-                    m_log.InfoFormat("[OGO]: region UUID {0} ", reg.RegionID);
-
-                    // Convert the X and Y position to LL space
-                    responseMap["region_x"] = OSD.FromInteger(fooX * (uint)Constants.RegionSize); // convert it to LL X
-                    responseMap["region_y"] = OSD.FromInteger(fooY * (uint)Constants.RegionSize); // convert it to LL Y
-
-                    // Give em a new seed capability
-                    responseMap["seed_capability"] = OSD.FromString("http://" + reg.ExternalHostName + ":" + reg.HttpPort + "/CAPS/" + userCap.CapsObjectPath + "0000/");
-                    responseMap["region"] = OSD.FromUUID(reg.originRegionID);
-                    responseMap["look_at"] = LookAtArray;
-
-                    responseMap["sim_port"] = OSD.FromInteger(reg.InternalEndPoint.Port);
-                    responseMap["sim_host"] = OSD.FromString(reg.ExternalHostName);// + ":" + reg.InternalEndPoint.Port.ToString());
-                    
-                    // DEPRECATED
-                    responseMap["sim_ip"] = OSD.FromString(Util.GetHostFromDNS(reg.ExternalHostName).ToString());
-
-                    responseMap["session_id"] = OSD.FromUUID(SessionID);
-                    responseMap["secure_session_id"] = OSD.FromUUID(SecureSessionID);
-                    responseMap["circuit_code"] = OSD.FromInteger(circuitcode);
-
-                    responseMap["position"] = PositionArray;
-
-                    responseMap["region_id"] = OSD.FromUUID(reg.originRegionID);
-
-                    responseMap["sim_access"] = OSD.FromString("Mature");
-
-                    responseMap["connect"] = OSD.FromBoolean(true);
-
-                   
-
-                    m_log.InfoFormat("[OGP]: host: {0}, IP {1}", responseMap["sim_host"].ToString(), responseMap["sim_ip"].ToString());
-                }
-            }
-
-            return responseMap;
-        }
-
-        public OSD DerezAvatarMethod(string path, OSD request)
-        {
-            m_log.ErrorFormat("DerezPath: {0}, Request: {1}", path, request.ToString());
-
-            //LLSD llsdResponse = null;
-            OSDMap responseMap = new OSDMap();
-
-            string[] PathArray = path.Split('/');
-            m_log.InfoFormat("[OGP]: prefix {0}, uuid {1}, suffix {2}", PathArray[1], PathArray[2], PathArray[3]);
-            string uuidString = PathArray[2];
-            m_log.InfoFormat("[OGP]: Request to Derez avatar with UUID {0}", uuidString);
-            UUID userUUID = UUID.Zero;
-            if (UUID.TryParse(uuidString, out userUUID))
-            {
-                UUID RemoteID = (UUID)uuidString;
-                UUID LocalID = RemoteID;
-                // FIXME: TODO: Routine to map RemoteUUIDs to LocalUUIds
-                //         would be done already..  but the client connects with the Aditi UUID
-                //         regardless over the UDP stack
-
-                OGPState userState = GetOGPState(LocalID);
-                if (userState.agent_id != UUID.Zero)
-                {
-                    //OSDMap outboundRequestMap = new OSDMap();
-                    OSDMap inboundRequestMap = (OSDMap)request;
-                    string rezAvatarString = inboundRequestMap["rez_avatar"].AsString();
-                    if (rezAvatarString.Length == 0)
-                    {
-                        rezAvatarString = inboundRequestMap["rez_avatar/rez"].AsString();
-                    }
-                    OSDArray LookAtArray = new OSDArray();
-                    LookAtArray.Add(OSD.FromInteger(1));
-                    LookAtArray.Add(OSD.FromInteger(1));
-                    LookAtArray.Add(OSD.FromInteger(1));
-
-                    OSDArray PositionArray = new OSDArray();
-                    PositionArray.Add(OSD.FromInteger(128));
-                    PositionArray.Add(OSD.FromInteger(128));
-                    PositionArray.Add(OSD.FromInteger(40));
-
-                    OSDArray lookArray = new OSDArray();
-                    lookArray.Add(OSD.FromInteger(128));
-                    lookArray.Add(OSD.FromInteger(128));
-                    lookArray.Add(OSD.FromInteger(40));
-
-                    responseMap["connect"] = OSD.FromBoolean(true);// it's okay to give this user up
-                    responseMap["look_at"] = LookAtArray;
-
-                    m_log.WarnFormat("[OGP]: Invoking rez_avatar on host:{0} for avatar: {1} {2}", rezAvatarString, userState.first_name, userState.last_name);
-
-                    OSDMap rezResponseMap = invokeRezAvatarCap(responseMap, rezAvatarString,userState);
-
-                    // If invoking it returned an error, parse and end
-                    if (rezResponseMap.ContainsKey("connect"))
-                    {
-                        if (rezResponseMap["connect"].AsBoolean() == false)
-                        {
-                            return responseMap;
-                        }
-                    }
-
-                    string rezRespSeedCap = "";
-
-                    // DEPRECATED
-                    if (rezResponseMap.ContainsKey("seed_capability"))
-                        rezRespSeedCap = rezResponseMap["seed_capability"].AsString();
-                    
-                    // REPLACEMENT
-                    if (rezResponseMap.ContainsKey("region_seed_capability"))
-                        rezRespSeedCap = rezResponseMap["region_seed_capability"].AsString();
-
-                    // REPLACEMENT
-                    if (rezResponseMap.ContainsKey("rez_avatar/rez"))
-                        rezRespSeedCap = rezResponseMap["rez_avatar/rez"].AsString();
-
-                    // DEPRECATED
-                    string rezRespSim_ip = rezResponseMap["sim_ip"].AsString();
-                    
-                    string rezRespSim_host = rezResponseMap["sim_host"].AsString();
-
-                    int rrPort = rezResponseMap["sim_port"].AsInteger();
-                    int rrX = rezResponseMap["region_x"].AsInteger();
-                    int rrY = rezResponseMap["region_y"].AsInteger();
-                    m_log.ErrorFormat("X:{0}, Y:{1}", rrX, rrY);
-                    UUID rrRID = rezResponseMap["region_id"].AsUUID();
-                    OSDArray RezResponsePositionArray = null;
-                    string rrAccess = rezResponseMap["sim_access"].AsString();
-                    if (rezResponseMap.ContainsKey("position"))
-                    {
-                        RezResponsePositionArray = (OSDArray)rezResponseMap["position"];
-                    }
-                    // DEPRECATED
-                    responseMap["seed_capability"] = OSD.FromString(rezRespSeedCap);
-                    
-                    // REPLACEMENT r3
-                    responseMap["region_seed_capability"] = OSD.FromString(rezRespSeedCap);
-
-                    // DEPRECATED
-                    responseMap["sim_ip"] = OSD.FromString(Util.GetHostFromDNS(rezRespSim_ip).ToString());
-                    
-                    responseMap["sim_host"] = OSD.FromString(rezRespSim_host);
-                    responseMap["sim_port"] = OSD.FromInteger(rrPort);
-                    responseMap["region_x"] = OSD.FromInteger(rrX);
-                    responseMap["region_y"] = OSD.FromInteger(rrY);
-                    responseMap["region_id"] = OSD.FromUUID(rrRID);
-                    responseMap["sim_access"] = OSD.FromString(rrAccess);
-
-                    if (RezResponsePositionArray != null)
-                    {
-                        responseMap["position"] = RezResponsePositionArray;
-                    }
-                    responseMap["look_at"] = lookArray;
-                    responseMap["connect"] = OSD.FromBoolean(true);
-
-                    ShutdownConnection(LocalID,this);
-                    // PLEASE STOP CHANGING THIS TO an M_LOG, M_LOG DOESN'T WORK ON MULTILINE .TOSTRINGS
-                    Console.WriteLine("RESPONSEDEREZ: " + responseMap.ToString());
-                    return responseMap;
-                }
-                else
-                {
-                    return GenerateNoStateMessage(LocalID);
-                }
-            }
-            else
-            {
-                return GenerateNoHandlerMessage();
-            }
-
-            //return responseMap;
-        }
-
-        private OSDMap invokeRezAvatarCap(OSDMap responseMap, string CapAddress, OGPState userState)
-        {
-            Scene reg = GetRootScene();
-
-            WebRequest DeRezRequest = WebRequest.Create(CapAddress);
-            DeRezRequest.Method = "POST";
-            DeRezRequest.ContentType = "application/xml+llsd";
-
-            OSDMap RAMap = new OSDMap();
-            OSDMap AgentParms = new OSDMap();
-            OSDMap RegionParms = new OSDMap();
-
-            OSDArray Parameter = new OSDArray(2);
-
-            OSDMap version = new OSDMap();
-            version["version"] = OSD.FromInteger(userState.src_version);
-            Parameter.Add(version);
-
-            OSDMap SrcData = new OSDMap();
-            SrcData["estate_id"] = OSD.FromInteger(reg.RegionInfo.EstateSettings.EstateID);
-            SrcData["parent_estate_id"] = OSD.FromInteger((reg.RegionInfo.EstateSettings.ParentEstateID == 100 ? 1 : reg.RegionInfo.EstateSettings.ParentEstateID));
-            SrcData["region_id"] = OSD.FromUUID(reg.RegionInfo.originRegionID);
-            SrcData["visible_to_parent"] = OSD.FromBoolean(userState.visible_to_parent);
-            Parameter.Add(SrcData);
-
-            AgentParms["first_name"] = OSD.FromString(userState.first_name);
-            AgentParms["last_name"] = OSD.FromString(userState.last_name);
-            AgentParms["agent_id"] = OSD.FromUUID(userState.agent_id);
-            RegionParms["region_id"] = OSD.FromUUID(userState.region_id);
-            AgentParms["circuit_code"] = OSD.FromInteger(userState.circuit_code);
-            AgentParms["secure_session_id"] = OSD.FromUUID(userState.secure_session_id);
-            AgentParms["session_id"] = OSD.FromUUID(userState.session_id);
-            AgentParms["agent_access"] = OSD.FromBoolean(userState.agent_access);
-            AgentParms["god_level"] = OSD.FromInteger(userState.god_level);
-            AgentParms["god_overide"] = OSD.FromBoolean(userState.god_overide);
-            AgentParms["identified"] = OSD.FromBoolean(userState.identified);
-            AgentParms["transacted"] = OSD.FromBoolean(userState.transacted);
-            AgentParms["age_verified"] = OSD.FromBoolean(userState.age_verified);
-            AgentParms["limited_to_estate"] = OSD.FromInteger(userState.limited_to_estate);
-            AgentParms["inventory_host"] = OSD.FromString(userState.inventory_host);
-
-            // version 1
-            RAMap = AgentParms;
-
-            // Planned for version 2
-            // RAMap["agent_params"] = AgentParms;
-
-            RAMap["region_params"] = RegionParms;
-            RAMap["parameter"] = Parameter;
-
-            string RAMapString = RAMap.ToString();
-            m_log.InfoFormat("[OGP] RAMap string {0}", RAMapString);
-            OSD LLSDofRAMap = RAMap; // RENAME if this works
-
-            m_log.InfoFormat("[OGP]: LLSD of map as string  was {0}", LLSDofRAMap.ToString());
-            //m_log.InfoFormat("[OGP]: LLSD+XML: {0}", LLSDParser.SerializeXmlString(LLSDofRAMap));
-            byte[] buffer = OSDParser.SerializeLLSDXmlBytes(LLSDofRAMap);
-
-            //string bufferDump = System.Text.Encoding.ASCII.GetString(buffer);
-            //m_log.InfoFormat("[OGP]: buffer form is {0}",bufferDump);
-            //m_log.InfoFormat("[OGP]: LLSD of map was {0}",buffer.Length);
-
-            Stream os = null;
-            try
-            { // send the Post
-                DeRezRequest.ContentLength = buffer.Length;   //Count bytes to send
-                os = DeRezRequest.GetRequestStream();
-                os.Write(buffer, 0, buffer.Length);         //Send it
-                os.Close();
-                m_log.InfoFormat("[OGP]: Derez Avatar Posted Rez Avatar request to remote sim {0}", CapAddress);
-            }
-            catch (WebException ex)
-            {
-                m_log.InfoFormat("[OGP] Bad send on de_rez_avatar {0}", ex.Message);
-                responseMap["connect"] = OSD.FromBoolean(false);
-
-                return responseMap;
-            }
-
-            m_log.Info("[OGP] waiting for a reply after rez avatar send");
-            string rez_avatar_reply = null;
-            { // get the response
-                try
-                {
-                    WebResponse webResponse = DeRezRequest.GetResponse();
-                    if (webResponse == null)
-                    {
-                        m_log.Info("[OGP:] Null reply on rez_avatar post");
-                    }
-
-                    StreamReader sr = new StreamReader(webResponse.GetResponseStream());
-                    rez_avatar_reply = sr.ReadToEnd().Trim();
-                    m_log.InfoFormat("[OGP]: rez_avatar reply was {0} ", rez_avatar_reply);
-
-                }
-                catch (WebException ex)
-                {
-                    m_log.InfoFormat("[OGP]: exception on read after send of rez avatar {0}", ex.Message);
-                    responseMap["connect"] = OSD.FromBoolean(false);
-
-                    return responseMap;
-                }
-                OSD rezResponse = null;
-                try
-                {
-                    rezResponse = OSDParser.DeserializeLLSDXml(rez_avatar_reply);
-
-                    responseMap = (OSDMap)rezResponse;
-                }
-                catch (Exception ex)
-                {
-                    m_log.InfoFormat("[OGP]: exception on parse of rez reply {0}", ex.Message);
-                    responseMap["connect"] = OSD.FromBoolean(false);
-
-                    return responseMap;
-                }
-            }
-            return responseMap;
-        }
-
-        public OSD GenerateNoHandlerMessage()
-        {
-            OSDMap map = new OSDMap();
-            map["reason"] = OSD.FromString("LLSDRequest");
-            map["message"] = OSD.FromString("No handler registered for LLSD Requests");
-            map["login"] = OSD.FromString("false");
-            map["connect"] = OSD.FromString("false");
-            return map;
-        }
-        public OSD GenerateNoStateMessage(UUID passedAvatar)
-        {
-            OSDMap map = new OSDMap();
-            map["reason"] = OSD.FromString("derez failed");
-            map["message"] = OSD.FromString("Unable to locate OGP state for avatar " + passedAvatar.ToString());
-            map["login"] = OSD.FromString("false");
-            map["connect"] = OSD.FromString("false");
-            return map;
-        }
-        private bool TryGetAgentCircuitData(string path, out AgentCircuitData userdata)
-        {
-            userdata = null;
-            lock (CapsLoginID)
-            {
-                if (CapsLoginID.ContainsKey(path))
-                {
-                    userdata = CapsLoginID[path];
-                    DiscardUsedCap(path);
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        private void DiscardUsedCap(string path)
-        {
-            CapsLoginID.Remove(path);
-        }
-
-        private Scene GetRootScene()
-        {
-            Scene ReturnScene = null;
-            lock (m_scene)
-            {
-                if (m_scene.Count > 0)
-                {
-                    ReturnScene = m_scene[0];
-                }
-            }
-
-            return ReturnScene;
-        }
-
-        private Scene GetScene(string scenename)
-        {
-            Scene ReturnScene = null;
-            lock (m_scene)
-            {
-                foreach (Scene s in m_scene)
-                {
-                    if (s.RegionInfo.RegionName.ToLower() == scenename)
-                    {
-                        ReturnScene = s;
-                        break;
-                    }
-                }
-            }
-
-            return ReturnScene;
-        }
-
-        private ulong GetOSCompatibleRegionHandle(RegionInfo reg)
-        {
-            return Util.UIntsToLong(reg.RegionLocX, reg.RegionLocY);
-        }
-
-        private OGPState InitializeNewState()
-        {
-            OGPState returnState = new OGPState();
-            returnState.first_name = "";
-            returnState.last_name = "";
-            returnState.agent_id = UUID.Zero;
-            returnState.local_agent_id = UUID.Zero;
-            returnState.region_id = UUID.Zero;
-            returnState.circuit_code = 0;
-            returnState.secure_session_id = UUID.Zero;
-            returnState.session_id = UUID.Zero;
-            returnState.agent_access = true;
-            returnState.god_level = 0;
-            returnState.god_overide = false;
-            returnState.identified = false;
-            returnState.transacted = false;
-            returnState.age_verified = false;
-            returnState.limited_to_estate = 1;
-            returnState.inventory_host = "http://inv4.mysql.aditi.lindenlab.com";
-            returnState.allow_redirect = true;
-            returnState.sim_access = "";
-            returnState.src_can_see_mainland = true;
-            returnState.src_estate_id = 1;
-            returnState.src_version = 1;
-            returnState.src_parent_estate_id = 1;
-            returnState.visible_to_parent = true;
-            returnState.teleported_into_region = "";
-
-            return returnState;
-        }
-
-        private OGPState GetOGPState(UUID agentId)
-        {
-            lock (m_OGPState)
-            {
-                if (m_OGPState.ContainsKey(agentId))
-                {
-                    return m_OGPState[agentId];
-                }
-                else
-                {
-                    return InitializeNewState();
-                }
-            }
-        }
-
-        public void DeleteOGPState(UUID agentId)
-        {
-            lock (m_OGPState)
-            {
-                if (m_OGPState.ContainsKey(agentId))
-                    m_OGPState.Remove(agentId);
-            }
-        }
-
-        private void UpdateOGPState(UUID agentId, OGPState state)
-        {
-            lock (m_OGPState)
-            {
-                if (m_OGPState.ContainsKey(agentId))
-                {
-                    m_OGPState[agentId] = state;
-                }
-                else
-                {
-                    m_OGPState.Add(agentId,state);
-                }
-            }
-        }
-        private bool SceneListDuplicateCheck(string str)
-        {
-            // no lock, called from locked space!
-            bool found = false;
-            
-            foreach (Scene s in m_scene)
-            {
-                if (s.RegionInfo.RegionName == str)
-                {
-                    found = true;
-                    break;
-                }
-            }
-
-            return found;
-        }
-
-        public void ShutdownConnection(UUID avatarId, OpenGridProtocolModule mod)
-        {
-            Scene homeScene = GetRootScene();
-            ScenePresence avatar = null;
-            if (homeScene.TryGetScenePresence(avatarId,out avatar))
-            {
-                KillAUser ku = new KillAUser(avatar,mod);
-                Watchdog.StartThread(ku.ShutdownNoLogout, "OGPShutdown", ThreadPriority.Normal, true, true);
-            }
-        }
-
-//        private string CreateRandomStr(int len)
-//        {
-//            Random rnd = new Random(Environment.TickCount);
-//            string returnstring = "";
-//            string chars = "abcdefghijklmnopqrstuvwxyz0123456789";
-//
-//            for (int i = 0; i < len; i++)
-//            {
-//                returnstring += chars.Substring(rnd.Next(chars.Length), 1);
-//            }
-//            return returnstring;
-//        }
-        
-        // Temporary hack to allow teleporting to and from Vaak
-        private static bool customXertificateValidation(object sender, X509Certificate cert, X509Chain chain, SslPolicyErrors error)
-        {
-            //if (cert.Subject == "E=root@lindenlab.com, CN=*.vaak.lindenlab.com, O=\"Linden Lab, Inc.\", L=San Francisco, S=California, C=US")
-            //{
-                return true;
-            //}
-
-            //return false;
-        }
-    }
-
-    public class KillAUser
-    {
-        private ScenePresence avToBeKilled = null;
-        private OpenGridProtocolModule m_mod = null;
-
-        public KillAUser(ScenePresence avatar, OpenGridProtocolModule mod)
-        {
-            avToBeKilled = avatar;
-            m_mod = mod;
-        }
-
-        public void ShutdownNoLogout()
-        {
-            UUID avUUID = UUID.Zero;
-
-            if (avToBeKilled != null)
-            {
-                avUUID = avToBeKilled.UUID;
-                avToBeKilled.MakeChildAgent();
-
-                avToBeKilled.ControllingClient.SendLogoutPacketWhenClosing = false;
-
-                int sleepMS = 30000;
-                while (sleepMS > 0)
-                {
-                    Watchdog.UpdateThread();
-                    Thread.Sleep(1000);
-                    sleepMS -= 1000;
-                }
-
-                // test for child agent because they might have come back
-                if (avToBeKilled.IsChildAgent)
-                {
-                    m_mod.DeleteOGPState(avUUID);
-                    avToBeKilled.ControllingClient.Close();
-                }
-            }
-
-            Watchdog.RemoveThread();
-        }
-        
-    }
-    
-    public class MonoCert : ICertificatePolicy
-    {
-        #region ICertificatePolicy Members
-
-        public bool CheckValidationResult(ServicePoint srvPoint, X509Certificate certificate, WebRequest request, int certificateProblem)
-        {
-            return true;
-        }
-
-        #endregion
-    }
-}
diff --git a/OpenSim/Region/CoreModules/Properties/AssemblyInfo.cs b/OpenSim/Region/CoreModules/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..5a8c4a2
--- /dev/null
+++ b/OpenSim/Region/CoreModules/Properties/AssemblyInfo.cs
@@ -0,0 +1,38 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+using Mono.Addins;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("OpenSim.Region.CoreModules")]
+[assembly: AssemblyDescription("Core modules for OpenSim")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("OpenSim.Region.CoreModules.Properties")]
+[assembly: AssemblyCopyright("Copyright ©  2012")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("94f62dd1-bcf3-4218-9844-9a3996286e3e")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+[assembly: AssemblyVersion("0.7.5.*")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
+
+[assembly: Addin("OpenSim.Region.CoreModules", "0.1")]
+[assembly: AddinDependency("OpenSim", "0.5")]
+
diff --git a/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml b/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml
deleted file mode 100644
index 424e0ab..0000000
--- a/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<Addin id="OpenSim.Region.CoreModules" version="0.3">
-    <Runtime>
-        <Import assembly="OpenSim.Region.CoreModules.dll"/>
-    </Runtime>
-
-    <Dependencies>
-        <Addin id="OpenSim" version="0.5" />
-    </Dependencies>
-
-    <Extension path = "/OpenSim/RegionModules">
-        <RegionModule id="UserManagementModule" type="OpenSim.Region.CoreModules.Framework.UserManagement.UserManagementModule" />
-        <RegionModule id="HGUserManagementModule" type="OpenSim.Region.CoreModules.Framework.UserManagement.HGUserManagementModule" />
-        <RegionModule id="EntityTransferModule" type="OpenSim.Region.CoreModules.Framework.EntityTransfer.EntityTransferModule" />
-        <RegionModule id="HGEntityTransferModule" type="OpenSim.Region.CoreModules.Framework.EntityTransfer.HGEntityTransferModule" />
-        <RegionModule id="InventoryAccessModule" type="OpenSim.Region.CoreModules.Framework.InventoryAccess.BasicInventoryAccessModule" />
-        <RegionModule id="HGInventoryAccessModule" type="OpenSim.Region.CoreModules.Framework.InventoryAccess.HGInventoryAccessModule" />
-        <RegionModule id="LandManagementModule" type="OpenSim.Region.CoreModules.World.Land.LandManagementModule" />
-        <RegionModule id="PrimCountModule" type="OpenSim.Region.CoreModules.World.Land.PrimCountModule" />
-        <RegionModule id="ExportSerialisationModule" type="OpenSim.Region.CoreModules.World.Serialiser.SerialiserModule" />
-        <RegionModule id="ArchiverModule" type="OpenSim.Region.CoreModules.World.Archiver.ArchiverModule" />
-        <RegionModule id="TerrainModule" type="OpenSim.Region.CoreModules.World.Terrain.TerrainModule" />
-        <RegionModule id="WorldMapModule" type="OpenSim.Region.CoreModules.World.WorldMap.WorldMapModule" />
-        <RegionModule id="Warp3DImageModule" type="OpenSim.Region.CoreModules.World.Warp3DMap.Warp3DImageModule" />
-        <RegionModule id="HGWorldMapModule" type="OpenSim.Region.CoreModules.Hypergrid.HGWorldMapModule" />
-        <RegionModule id="UrlModule" type="OpenSim.Region.CoreModules.Scripting.LSLHttp.UrlModule" />
-        <RegionModule id="Chat" type="OpenSim.Region.CoreModules.Avatar.Chat.ChatModule" />
-        <RegionModule id="FriendsModule" type="OpenSim.Region.CoreModules.Avatar.Friends.FriendsModule" />
-        <RegionModule id="HGFriendsModule" type="OpenSim.Region.CoreModules.Avatar.Friends.HGFriendsModule" />
-        <RegionModule id="PresenceModule" type="OpenSim.Region.CoreModules.Avatar.InstantMessage.PresenceModule" />
-        <RegionModule id="MuteListModule" type="OpenSim.Region.CoreModules.Avatar.InstantMessage.MuteListModule" />
-        <RegionModule id="OfflineMessageModule" type="OpenSim.Region.CoreModules.Avatar.InstantMessage.OfflineMessageModule" />
-        <RegionModule id="InstantMessageModule" type="OpenSim.Region.CoreModules.Avatar.InstantMessage.InstantMessageModule" />
-        <RegionModule id="MessageTransferModule" type="OpenSim.Region.CoreModules.Avatar.InstantMessage.MessageTransferModule" />
-        <RegionModule id="LureModule" type="OpenSim.Region.CoreModules.Avatar.Lure.LureModule" />
-        <RegionModule id="InventoryTransferModule" type="OpenSim.Region.CoreModules.Avatar.Inventory.Transfer.InventoryTransferModule" />
-        <RegionModule id="CoreAssetCache" type="OpenSim.Region.CoreModules.Asset.CoreAssetCache" />
-        <RegionModule id="GlynnTuckerAssetCache" type="OpenSim.Region.CoreModules.Asset.GlynnTuckerAssetCache" />
-        <RegionModule id="CenomeMemoryAssetCache" type="OpenSim.Region.CoreModules.Asset.CenomeMemoryAssetCache"/>
-        <RegionModule id="LibraryModule" type="OpenSim.Region.CoreModules.Framework.Library.LibraryModule"/>
-      <!-- Service connectors OUT modules -->
-        <RegionModule id="LocalAssetServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset.LocalAssetServicesConnector" />
-        <RegionModule id="RemoteAssetServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset.RemoteAssetServicesConnector" />
-        <RegionModule id="LocalAvatarServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Avatar.LocalAvatarServicesConnector" />
-        <RegionModule id="RemoteAvatarServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Avatar.RemoteAvatarServicesConnector" />
-        <RegionModule id="LocalAuthenticationServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Authentication.LocalAuthenticationServicesConnector" />
-        <RegionModule id="RemoteAuthenticationServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Authentication.RemoteAuthenticationServicesConnector" />
-        <RegionModule id="LocalAuthorizationServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Authorization.LocalAuthorizationServicesConnector" />
-        <RegionModule id="RemoteAuthorizationServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Authorization.RemoteAuthorizationServicesConnector" />
-        <RegionModule id="HGAssetBroker" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset.HGAssetBroker" />
-        <RegionModule id="LocalInventoryServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory.LocalInventoryServicesConnector" />
-        <RegionModule id="RemoteXInventoryServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory.RemoteXInventoryServicesConnector" />
-        <RegionModule id="HGInventoryBroker" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory.HGInventoryBroker" />
-        <RegionModule id="LocalNeighbourServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Neighbour.LocalNeighbourServicesConnector" />
-        <RegionModule id="RemoteNeighbourServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Neighbour.RemoteNeighbourServicesConnector" />
-        <RegionModule id="LocalLandServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Land.LocalLandServicesConnector" />
-        <RegionModule id="RemoteLandServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Land.RemoteLandServicesConnector" />
-        <RegionModule id="LocalGridServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid.LocalGridServicesConnector" />
-        <RegionModule id="RemoteGridServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid.RemoteGridServicesConnector" />
-        <RegionModule id="LocalPresenceServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Presence.LocalPresenceServicesConnector" />
-        <RegionModule id="RemotePresenceServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Presence.RemotePresenceServicesConnector" />
-        <RegionModule id="LocalUserAccountServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.UserAccounts.LocalUserAccountServicesConnector" />
-        <RegionModule id="RemoteUserAccountServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.UserAccounts.RemoteUserAccountServicesConnector" />
-        
-        <RegionModule id="LocalGridUserServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.GridUser.LocalGridUserServicesConnector" />
-        <RegionModule id="RemoteGridUserServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.GridUser.RemoteGridUserServicesConnector" />
-
-        <RegionModule id="LocalSimulationConnectorModule" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation.LocalSimulationConnectorModule" />
-        <RegionModule id="RemoteSimulationConnectorModule" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation.RemoteSimulationConnectorModule" />
-      
-      <!-- Service connectors IN modules -->
-        <RegionModule id="AssetServiceInConnectorModule" type="OpenSim.Region.CoreModules.ServiceConnectorsIn.Asset.AssetServiceInConnectorModule" />
-        <RegionModule id="InventoryServiceInConnectorModule" type="OpenSim.Region.CoreModules.ServiceConnectorsIn.Inventory.InventoryServiceInConnectorModule" />
-        <RegionModule id="LandServiceInConnectorModule" type="OpenSim.Region.CoreModules.ServiceConnectorsIn.Land.LandServiceInConnectorModule" />
-        <RegionModule id="NeighbourServiceInConnectorModule" type="OpenSim.Region.CoreModules.ServiceConnectorsIn.Neighbour.NeighbourServiceInConnectorModule" />    \
-        <RegionModule id="HypergridServiceInConnectorModule" type="OpenSim.Region.CoreModules.ServiceConnectorsIn.Hypergrid.HypergridServiceInConnectorModule" />    \
-        <RegionModule id="LLLoginServiceInConnectorModule" type="OpenSim.Region.CoreModules.ServiceConnectorsIn.Login.LLLoginServiceInConnectorModule" />    \
-        <RegionModule id="SimulationServiceInConnectorModule" type="OpenSim.Region.CoreModules.ServiceConnectorsIn.Simulation.SimulationServiceInConnectorModule" />    \
-        <RegionModule id="GridInfoServiceInConnectorModule" type="OpenSim.Region.CoreModules.ServiceConnectorsIn.Grid.GridInfoServiceInConnectorModule" />    \
-        <RegionModule id="AuthenticationServiceInConnectorModule" type="OpenSim.Region.CoreModules.ServiceConnectorsIn.Authentication.AuthenticationServiceInConnectorModule" />
-        <RegionModule id="AccessModule" type="OpenSim.Region.CoreModules.World.AccessModule" />    \
-        <RegionModule id="MapImageModule" type="OpenSim.Region.CoreModules.World.LegacyMap.MapImageModule" />    \
-
-    </Extension>
-
-    <Extension path = "/OpenSim/WindModule">
-        <WindModel id="ConfigurableWind" type="OpenSim.Region.CoreModules.World.Wind.Plugins.ConfigurableWind" />
-        <WindModel id="SimpleRandomWind" type="OpenSim.Region.CoreModules.World.Wind.Plugins.SimpleRandomWind" />
-    </Extension>
-
-</Addin>
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGUuidGatherer.cs b/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTexture.cs
index fcb544f..fce9490 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGUuidGatherer.cs
+++ b/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTexture.cs
@@ -26,32 +26,36 @@
  */
 
 using System;
-using System.Collections.Generic;
+using System.Drawing;
+using OpenSim.Region.Framework.Interfaces;
 
-using OpenSim.Framework;
-using OpenSim.Region.Framework.Scenes;
-using OpenSim.Services.Interfaces;
-using OpenMetaverse;
-
-namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
+namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
 {
-    public class HGUuidGatherer : UuidGatherer
+    public class DynamicTexture : IDynamicTexture
     {
-        protected string m_assetServerURL;
-        protected HGAssetMapper m_assetMapper;
+        public string InputCommands { get; private set; }
+        public Uri InputUri { get; private set; }
+        public string InputParams { get; private set; }
+        public byte[] Data { get; private set; }
+        public Size Size { get; private set; }
+        public bool IsReuseable { get; private set; }
 
-        public HGUuidGatherer(HGAssetMapper assMap, IAssetService assetCache, string assetServerURL) : base(assetCache)
+        public DynamicTexture(string inputCommands, string inputParams, byte[] data, Size size, bool isReuseable)
         {
-            m_assetMapper = assMap;
-            m_assetServerURL = assetServerURL;
+            InputCommands = inputCommands;
+            InputParams = inputParams;
+            Data = data;
+            Size = size;
+            IsReuseable = isReuseable;
         }
 
-        protected override AssetBase GetAsset(UUID uuid)
+        public DynamicTexture(Uri inputUri, string inputParams, byte[] data, Size size, bool isReuseable)
         {
-            if (string.Empty == m_assetServerURL)
-                return m_assetCache.Get(uuid.ToString());
-            else
-                return m_assetMapper.FetchAsset(m_assetServerURL, uuid);
+            InputUri = inputUri;
+            InputParams = inputParams;
+            Data = data;
+            Size = size;
+            IsReuseable = isReuseable;
         }
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs b/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs
index 18bd018..9d77b19 100644
--- a/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs
@@ -37,18 +37,36 @@ using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 using log4net;
 using System.Reflection;
+using Mono.Addins;
 
 namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
 {
-    public class DynamicTextureModule : IRegionModule, IDynamicTextureManager
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "DynamicTextureModule")]
+    public class DynamicTextureModule : ISharedRegionModule, IDynamicTextureManager
     {
-        //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         private const int ALL_SIDES = -1;
 
         public const int DISP_EXPIRE = 1;
         public const int DISP_TEMP   = 2;
 
+        /// <summary>
+        /// If true then where possible dynamic textures are reused.
+        /// </summary>
+        public bool ReuseTextures { get; set; }
+
+        /// <summary>
+        /// If false, then textures which have a low data size are not reused when ReuseTextures = true.
+        /// </summary>
+        /// <remarks>
+        /// LL viewers 3.3.4 and before appear to not fully render textures pulled from the viewer cache if those
+        /// textures have a relatively high pixel surface but a small data size.  Typically, this appears to happen
+        /// if the data size is smaller than the viewer's discard level 2 size estimate.  So if this is setting is
+        /// false, textures smaller than the calculation in IsSizeReuseable are always regenerated rather than reused
+        /// to work around this problem.</remarks>
+        public bool ReuseLowDataTextures { get; set; }
+
         private Dictionary<UUID, Scene> RegisteredScenes = new Dictionary<UUID, Scene>();
 
         private Dictionary<string, IDynamicTextureRender> RenderPlugins =
@@ -56,6 +74,25 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
 
         private Dictionary<UUID, DynamicTextureUpdater> Updaters = new Dictionary<UUID, DynamicTextureUpdater>();
 
+        /// <summary>
+        /// Record dynamic textures that we can reuse for a given data and parameter combination rather than
+        /// regenerate.
+        /// </summary>
+        /// <remarks>
+        /// Key is string.Format("{0}{1}", data
+        /// </remarks>
+        private Cache m_reuseableDynamicTextures;
+
+        /// <summary>
+        /// This constructor is only here because of the Unit Tests...
+        /// Don't use it.
+        /// </summary>
+        public DynamicTextureModule()
+        {
+            m_reuseableDynamicTextures = new Cache(CacheMedium.Memory, CacheStrategy.Conservative);
+            m_reuseableDynamicTextures.DefaultTTL = new TimeSpan(24, 0, 0);
+        }
+
         #region IDynamicTextureManager Members
 
         public void RegisterRender(string handleType, IDynamicTextureRender render)
@@ -69,17 +106,17 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
         /// <summary>
         /// Called by code which actually renders the dynamic texture to supply texture data.
         /// </summary>
-        /// <param name="id"></param>
-        /// <param name="data"></param>
-        public void ReturnData(UUID id, byte[] data)
+        /// <param name="updaterId"></param>
+        /// <param name="texture"></param>
+        public void ReturnData(UUID updaterId, IDynamicTexture texture)
         {
             DynamicTextureUpdater updater = null;
 
             lock (Updaters)
             {
-                if (Updaters.ContainsKey(id))
+                if (Updaters.ContainsKey(updaterId))
                 {
-                    updater = Updaters[id];
+                    updater = Updaters[updaterId];
                 }
             }
 
@@ -88,7 +125,16 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
                 if (RegisteredScenes.ContainsKey(updater.SimUUID))
                 {
                     Scene scene = RegisteredScenes[updater.SimUUID];
-                    updater.DataReceived(data, scene);
+                    UUID newTextureID = updater.DataReceived(texture.Data, scene);
+
+                    if (ReuseTextures
+                        && !updater.BlendWithOldTexture
+                        && texture.IsReuseable
+                        && (ReuseLowDataTextures || IsDataSizeReuseable(texture)))
+                    {
+                        m_reuseableDynamicTextures.Store(
+                            GenerateReusableTextureKey(texture.InputCommands, texture.InputParams), newTextureID);
+                    }
                 }
             }
 
@@ -104,6 +150,27 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
             }
         }
 
+        /// <summary>
+        /// Determines whether the texture is reuseable based on its data size.
+        /// </summary>
+        /// <remarks>
+        /// This is a workaround for a viewer bug where very small data size textures relative to their pixel size
+        /// are not redisplayed properly when pulled from cache.  The calculation here is based on the typical discard
+        /// level of 2, a 'rate' of 0.125 and 4 components (which makes for a factor of 0.5).
+        /// </remarks>
+        /// <returns></returns>
+        private bool IsDataSizeReuseable(IDynamicTexture texture)
+        {
+//            Console.WriteLine("{0} {1}", texture.Size.Width, texture.Size.Height);
+            int discardLevel2DataThreshold = (int)Math.Ceiling((texture.Size.Width >> 2) * (texture.Size.Height >> 2) * 0.5);
+
+//            m_log.DebugFormat(
+//                "[DYNAMIC TEXTURE MODULE]: Discard level 2 threshold {0}, texture data length {1}",
+//                discardLevel2DataThreshold, texture.Data.Length);
+
+            return discardLevel2DataThreshold < texture.Data.Length;
+        }
+
         public UUID AddDynamicTextureURL(UUID simID, UUID primID, string contentType, string url,
                                          string extraParams, int updateTimer)
         {
@@ -167,22 +234,61 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
         public UUID AddDynamicTextureData(UUID simID, UUID primID, string contentType, string data,
                                           string extraParams, int updateTimer, bool SetBlending, int disp, byte AlphaValue, int face)
         {
-            if (RenderPlugins.ContainsKey(contentType))
+            if (!RenderPlugins.ContainsKey(contentType))
+                return UUID.Zero;
+
+            Scene scene;
+            RegisteredScenes.TryGetValue(simID, out scene);
+
+            if (scene == null)
+                return UUID.Zero;
+
+            SceneObjectPart part = scene.GetSceneObjectPart(primID);
+
+            if (part == null)
+                return UUID.Zero;
+
+            // If we want to reuse dynamic textures then we have to ignore any request from the caller to expire
+            // them.
+            if (ReuseTextures)
+                disp = disp & ~DISP_EXPIRE;
+
+            DynamicTextureUpdater updater = new DynamicTextureUpdater();
+            updater.SimUUID = simID;
+            updater.PrimID = primID;
+            updater.ContentType = contentType;
+            updater.BodyData = data;
+            updater.UpdateTimer = updateTimer;
+            updater.UpdaterID = UUID.Random();
+            updater.Params = extraParams;
+            updater.BlendWithOldTexture = SetBlending;
+            updater.FrontAlpha = AlphaValue;
+            updater.Face = face;
+            updater.Url = "Local image";
+            updater.Disp = disp;
+
+            object objReusableTextureUUID = null;
+
+            if (ReuseTextures && !updater.BlendWithOldTexture)
             {
-                DynamicTextureUpdater updater = new DynamicTextureUpdater();
-                updater.SimUUID = simID;
-                updater.PrimID = primID;
-                updater.ContentType = contentType;
-                updater.BodyData = data;
-                updater.UpdateTimer = updateTimer;
-                updater.UpdaterID = UUID.Random();
-                updater.Params = extraParams;
-                updater.BlendWithOldTexture = SetBlending;
-                updater.FrontAlpha = AlphaValue;
-                updater.Face = face;
-                updater.Url = "Local image";
-                updater.Disp = disp;
+                string reuseableTextureKey = GenerateReusableTextureKey(data, extraParams);
+                objReusableTextureUUID = m_reuseableDynamicTextures.Get(reuseableTextureKey);
 
+                if (objReusableTextureUUID != null)
+                {
+                    // If something else has removed this temporary asset from the cache, detect and invalidate
+                    // our cached uuid.
+                    if (scene.AssetService.GetMetadata(objReusableTextureUUID.ToString()) == null)
+                    {
+                        m_reuseableDynamicTextures.Invalidate(reuseableTextureKey);
+                        objReusableTextureUUID = null;
+                    }
+                }
+            }
+
+            // We cannot reuse a dynamic texture if the data is going to be blended with something already there.
+            if (objReusableTextureUUID == null)
+            {
                 lock (Updaters)
                 {
                     if (!Updaters.ContainsKey(updater.UpdaterID))
@@ -191,11 +297,29 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
                     }
                 }
 
+//                m_log.DebugFormat(
+//                    "[DYNAMIC TEXTURE MODULE]: Requesting generation of new dynamic texture for {0} in {1}",
+//                    part.Name, part.ParentGroup.Scene.Name);
+
                 RenderPlugins[contentType].AsyncConvertData(updater.UpdaterID, data, extraParams);
-                return updater.UpdaterID;
             }
-            
-            return UUID.Zero;
+            else
+            {
+//                m_log.DebugFormat(
+//                    "[DYNAMIC TEXTURE MODULE]: Reusing cached texture {0} for {1} in {2}",
+//                    objReusableTextureUUID, part.Name, part.ParentGroup.Scene.Name);
+
+                // No need to add to updaters as the texture is always the same.  Not that this functionality
+                // apppears to be implemented anyway.
+                updater.UpdatePart(part, (UUID)objReusableTextureUUID);
+            }
+
+            return updater.UpdaterID;
+        }
+
+        private string GenerateReusableTextureKey(string data, string extraParams)
+        {
+            return string.Format("{0}{1}", data, extraParams);
         }
 
         public void GetDrawStringSize(string contentType, string text, string fontName, int fontSize,
@@ -211,9 +335,29 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
 
         #endregion
 
-        #region IRegionModule Members
+        #region ISharedRegionModule Members
 
-        public void Initialise(Scene scene, IConfigSource config)
+        public void Initialise(IConfigSource config)
+        {
+            IConfig texturesConfig = config.Configs["Textures"];
+            if (texturesConfig != null)
+            {
+                ReuseTextures = texturesConfig.GetBoolean("ReuseDynamicTextures", false);
+                ReuseLowDataTextures = texturesConfig.GetBoolean("ReuseDynamicLowDataTextures", false);
+
+                if (ReuseTextures)
+                {
+                    m_reuseableDynamicTextures = new Cache(CacheMedium.Memory, CacheStrategy.Conservative);
+                    m_reuseableDynamicTextures.DefaultTTL = new TimeSpan(24, 0, 0);
+                }
+            }
+        }
+
+        public void PostInitialise()
+        {
+        }
+
+        public void AddRegion(Scene scene)
         {
             if (!RegisteredScenes.ContainsKey(scene.RegionInfo.RegionID))
             {
@@ -222,8 +366,14 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
             }
         }
 
-        public void PostInitialise()
+        public void RegionLoaded(Scene scene)
+        {
+        }
+
+        public void RemoveRegion(Scene scene)
         {
+            if (RegisteredScenes.ContainsKey(scene.RegionInfo.RegionID))
+                RegisteredScenes.Remove(scene.RegionInfo.RegionID);
         }
 
         public void Close()
@@ -235,9 +385,9 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
             get { return "DynamicTextureModule"; }
         }
 
-        public bool IsSharedModule
+        public Type ReplaceableInterface
         {
-            get { return true; }
+            get { return null; }
         }
 
         #endregion
@@ -269,9 +419,60 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
             }
 
             /// <summary>
+            /// Update the given part with the new texture.
+            /// </summary>
+            /// <returns>
+            /// The old texture UUID.
+            /// </returns>
+            public UUID UpdatePart(SceneObjectPart part, UUID textureID)
+            {
+                UUID oldID;
+
+                lock (part)
+                {
+                    // mostly keep the values from before
+                    Primitive.TextureEntry tmptex = part.Shape.Textures;
+
+                    // FIXME: Need to return the appropriate ID if only a single face is replaced.
+                    oldID = tmptex.DefaultTexture.TextureID;
+
+                    if (Face == ALL_SIDES)
+                    {
+                        oldID = tmptex.DefaultTexture.TextureID;
+                        tmptex.DefaultTexture.TextureID = textureID;
+                    }
+                    else
+                    {
+                        try
+                        {
+                            Primitive.TextureEntryFace texface = tmptex.CreateFace((uint)Face);
+                            texface.TextureID = textureID;
+                            tmptex.FaceTextures[Face] = texface;
+                        }
+                        catch (Exception)
+                        {
+                            tmptex.DefaultTexture.TextureID = textureID;
+                        }
+                    }
+
+                    // I'm pretty sure we always want to force this to true
+                    // I'm pretty sure noone whats to set fullbright true if it wasn't true before.
+                    // tmptex.DefaultTexture.Fullbright = true;
+
+                    part.UpdateTextureEntry(tmptex.GetBytes());
+                }
+
+                return oldID;
+            }
+
+            /// <summary>
             /// Called once new texture data has been received for this updater.
             /// </summary>
-            public void DataReceived(byte[] data, Scene scene)
+            /// <param name="data"></param>
+            /// <param name="scene"></param>
+            /// <param name="isReuseable">True if the data given is reuseable.</param>
+            /// <returns>The asset UUID given to the incoming data.</returns>
+            public UUID DataReceived(byte[] data, Scene scene)
             {
                 SceneObjectPart part = scene.GetSceneObjectPart(PrimID);
 
@@ -281,7 +482,8 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
                         String.Format("DynamicTextureModule: Error preparing image using URL {0}", Url);
                     scene.SimChat(Utils.StringToBytes(msg), ChatTypeEnum.Say,
                                   0, part.ParentGroup.RootPart.AbsolutePosition, part.Name, part.UUID, false);
-                    return;
+                    
+                    return UUID.Zero;
                 }
 
                 byte[] assetData = null;
@@ -319,56 +521,29 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
                 IJ2KDecoder cacheLayerDecode = scene.RequestModuleInterface<IJ2KDecoder>();
                 if (cacheLayerDecode != null)
                 {
-                    cacheLayerDecode.Decode(asset.FullID, asset.Data);
-                    cacheLayerDecode = null;
+                    if (!cacheLayerDecode.Decode(asset.FullID, asset.Data))
+                        m_log.WarnFormat(
+                            "[DYNAMIC TEXTURE MODULE]: Decoding of dynamically generated asset {0} for {1} in {2} failed",
+                            asset.ID, part.Name, part.ParentGroup.Scene.Name);
                 }
 
-                UUID oldID = UUID.Zero;
-
-                lock (part)
-                {
-                    // mostly keep the values from before
-                    Primitive.TextureEntry tmptex = part.Shape.Textures;
-
-                    // remove the old asset from the cache
-                    oldID = tmptex.DefaultTexture.TextureID;
-                    
-                    if (Face == ALL_SIDES)
-                    {
-                        tmptex.DefaultTexture.TextureID = asset.FullID;
-                    }
-                    else
-                    {
-                        try
-                        {
-                            Primitive.TextureEntryFace texface = tmptex.CreateFace((uint)Face);
-                            texface.TextureID = asset.FullID;
-                            tmptex.FaceTextures[Face] = texface;
-                        }
-                        catch (Exception)
-                        {
-                            tmptex.DefaultTexture.TextureID = asset.FullID;
-                        }
-                    }
-
-                    // I'm pretty sure we always want to force this to true
-                    // I'm pretty sure noone whats to set fullbright true if it wasn't true before.
-                    // tmptex.DefaultTexture.Fullbright = true;
-
-                    part.UpdateTextureEntry(tmptex.GetBytes());
-                }
+                UUID oldID = UpdatePart(part, asset.FullID);
 
                 if (oldID != UUID.Zero && ((Disp & DISP_EXPIRE) != 0))
                 {
-                    if (oldAsset == null) oldAsset = scene.AssetService.Get(oldID.ToString());
+                    if (oldAsset == null)
+                        oldAsset = scene.AssetService.Get(oldID.ToString());
+
                     if (oldAsset != null)
                     {
-                        if (oldAsset.Temporary == true)
+                        if (oldAsset.Temporary)
                         {
                             scene.AssetService.Delete(oldID.ToString());
                         }
                     }
                 }
+
+                return asset.FullID;
             }
 
             private byte[] BlendTextures(byte[] frontImage, byte[] backImage, bool setNewAlpha, byte newAlpha)
diff --git a/OpenSim/Region/CoreModules/Scripting/EMailModules/EmailModule.cs b/OpenSim/Region/CoreModules/Scripting/EMailModules/EmailModule.cs
index e91e8b9..d943b20 100644
--- a/OpenSim/Region/CoreModules/Scripting/EMailModules/EmailModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/EMailModules/EmailModule.cs
@@ -37,10 +37,12 @@ using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
+using Mono.Addins;
 
 namespace OpenSim.Region.CoreModules.Scripting.EmailModules
 {
-    public class EmailModule : IRegionModule, IEmailModule
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "EmailModule")]
+    public class EmailModule : ISharedRegionModule, IEmailModule
     {
         //
         // Log
@@ -72,31 +74,9 @@ namespace OpenSim.Region.CoreModules.Scripting.EmailModules
 
         private bool m_Enabled = false;
 
-        public void InsertEmail(UUID to, Email email)
-        {
-            // It's tempting to create the queue here.  Don't; objects which have
-            // not yet called GetNextEmail should have no queue, and emails to them
-            // should be silently dropped.
-
-            lock (m_MailQueues)
-            {
-                if (m_MailQueues.ContainsKey(to))
-                {
-                    if (m_MailQueues[to].Count >= m_MaxQueueSize)
-                    {
-                        // fail silently
-                        return;
-                    }
-
-                    lock (m_MailQueues[to])
-                    {
-                        m_MailQueues[to].Add(email);
-                    }
-                }
-            }
-        }
+        #region ISharedRegionModule
 
-        public void Initialise(Scene scene, IConfigSource config)
+        public void Initialise(IConfigSource config)
         {
             m_Config = config;
             IConfig SMTPConfig;
@@ -129,36 +109,44 @@ namespace OpenSim.Region.CoreModules.Scripting.EmailModules
                 SMTP_SERVER_PORT = SMTPConfig.GetInt("SMTP_SERVER_PORT", SMTP_SERVER_PORT);
                 SMTP_SERVER_LOGIN = SMTPConfig.GetString("SMTP_SERVER_LOGIN", SMTP_SERVER_LOGIN);
                 SMTP_SERVER_PASSWORD = SMTPConfig.GetString("SMTP_SERVER_PASSWORD", SMTP_SERVER_PASSWORD);
-                m_MaxEmailSize = SMTPConfig.GetInt("email_max_size", m_MaxEmailSize); 
+                m_MaxEmailSize = SMTPConfig.GetInt("email_max_size", m_MaxEmailSize);
             }
             catch (Exception e)
             {
-                m_log.Error("[EMAIL] DefaultEmailModule not configured: "+ e.Message);
+                m_log.Error("[EMAIL] DefaultEmailModule not configured: " + e.Message);
                 m_Enabled = false;
                 return;
             }
 
-            // It's a go!
-            if (m_Enabled)
+        }
+
+        public void AddRegion(Scene scene)
+        {
+            if (!m_Enabled)
+                return;
+
+        // It's a go!
+            lock (m_Scenes)
             {
-                lock (m_Scenes)
-                {
-                    // Claim the interface slot
-                    scene.RegisterModuleInterface<IEmailModule>(this);
+                // Claim the interface slot
+                scene.RegisterModuleInterface<IEmailModule>(this);
 
-                    // Add to scene list
-                    if (m_Scenes.ContainsKey(scene.RegionInfo.RegionHandle))
-                    {
-                        m_Scenes[scene.RegionInfo.RegionHandle] = scene;
-                    }
-                    else
-                    {
-                        m_Scenes.Add(scene.RegionInfo.RegionHandle, scene);
-                    }
+                // Add to scene list
+                if (m_Scenes.ContainsKey(scene.RegionInfo.RegionHandle))
+                {
+                    m_Scenes[scene.RegionInfo.RegionHandle] = scene;
+                }
+                else
+                {
+                    m_Scenes.Add(scene.RegionInfo.RegionHandle, scene);
                 }
-
-                m_log.Info("[EMAIL] Activated DefaultEmailModule");
             }
+
+            m_log.Info("[EMAIL] Activated DefaultEmailModule");
+        }
+
+        public void RemoveRegion(Scene scene)
+        {
         }
 
         public void PostInitialise()
@@ -174,9 +162,39 @@ namespace OpenSim.Region.CoreModules.Scripting.EmailModules
             get { return "DefaultEmailModule"; }
         }
 
-        public bool IsSharedModule
+        public Type ReplaceableInterface
+        {
+            get { return null; }
+        }
+
+        public void RegionLoaded(Scene scene)
         {
-            get { return true; }
+        }
+
+        #endregion
+
+        public void InsertEmail(UUID to, Email email)
+        {
+            // It's tempting to create the queue here.  Don't; objects which have
+            // not yet called GetNextEmail should have no queue, and emails to them
+            // should be silently dropped.
+
+            lock (m_MailQueues)
+            {
+                if (m_MailQueues.ContainsKey(to))
+                {
+                    if (m_MailQueues[to].Count >= m_MaxQueueSize)
+                    {
+                        // fail silently
+                        return;
+                    }
+
+                    lock (m_MailQueues[to])
+                    {
+                        m_MailQueues[to].Add(email);
+                    }
+                }
+            }
         }
 
         private bool IsLocal(UUID objectID)
diff --git a/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs b/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
index 9dac6b9..a0ae203 100644
--- a/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
+++ b/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
@@ -41,6 +41,7 @@ using OpenSim.Framework.Servers;
 using OpenSim.Framework.Servers.HttpServer;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
+using Mono.Addins;
 
 /*****************************************************
  *
@@ -87,7 +88,8 @@ using OpenSim.Region.Framework.Scenes;
 
 namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
 {
-    public class HttpRequestModule : IRegionModule, IHttpRequestModule
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "HttpRequestModule")]
+    public class HttpRequestModule : ISharedRegionModule, IHttpRequestModule
     {
         private object HttpListLock = new object();
         private int httpTimeout = 30000;
@@ -270,24 +272,38 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
 
         #endregion
 
-        #region IRegionModule Members
+        #region ISharedRegionModule Members
 
-        public void Initialise(Scene scene, IConfigSource config)
+        public void Initialise(IConfigSource config)
         {
-            m_scene = scene;
-
-            m_scene.RegisterModuleInterface<IHttpRequestModule>(this);
-
             m_proxyurl = config.Configs["Startup"].GetString("HttpProxy");
             m_proxyexcepts = config.Configs["Startup"].GetString("HttpProxyExceptions");
 
             m_pendingRequests = new Dictionary<UUID, HttpRequestClass>();
         }
 
+        public void AddRegion(Scene scene)
+        {
+            m_scene = scene;
+
+            m_scene.RegisterModuleInterface<IHttpRequestModule>(this);
+        }
+
+        public void RemoveRegion(Scene scene)
+        {
+            scene.UnregisterModuleInterface<IHttpRequestModule>(this);
+            if (scene == m_scene)
+                m_scene = null;
+        }
+
         public void PostInitialise()
         {
         }
 
+        public void RegionLoaded(Scene scene)
+        {
+        }
+
         public void Close()
         {
         }
@@ -297,9 +313,9 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
             get { return m_name; }
         }
 
-        public bool IsSharedModule
+        public Type ReplaceableInterface
         {
-            get { return true; }
+            get { return null; }
         }
 
         #endregion
diff --git a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
index 56221aa..da59eab 100644
--- a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
@@ -31,6 +31,7 @@ using System.Collections.Generic;
 using System.Collections;
 using System.Reflection;
 using log4net;
+using Mono.Addins;
 using Nini.Config;
 using OpenMetaverse;
 using OpenSim.Framework;
@@ -58,6 +59,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
         public string body;
         public int responseCode;
         public string responseBody;
+        public string responseType = "text/plain";
         //public ManualResetEvent ev;
         public bool requestDone;
         public int startTime;
@@ -65,6 +67,10 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
         public string uri;
     }
 
+    /// <summary>
+    /// This module provides external URLs for in-world scripts.
+    /// </summary>
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "UrlModule")]
     public class UrlModule : ISharedRegionModule, IUrlModule
     {
         private static readonly ILog m_log =
@@ -270,6 +276,22 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
             }
         }
         
+        public void HttpContentType(UUID request, string type)
+        {
+            lock (m_UrlMap)
+            {
+                if (m_RequestMap.ContainsKey(request))
+                {
+                    UrlData urlData = m_RequestMap[request];
+                    urlData.requests[request].responseType = type;
+                }
+                else
+                {
+                    m_log.Info("[HttpRequestHandler] There is no http-in request with id " + request.ToString());
+                }
+            }
+        }
+        
         public void HttpResponse(UUID request, int status, string body)
         {
             lock (m_RequestMap)
diff --git a/OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs b/OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs
index 6f83948..65737fa 100644
--- a/OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs
@@ -32,14 +32,17 @@ using System.Net;
 using Nini.Config;
 using OpenMetaverse;
 using OpenMetaverse.Imaging;
+using OpenSim.Region.CoreModules.Scripting.DynamicTexture;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 using log4net;
 using System.Reflection;
+using Mono.Addins;
 
 namespace OpenSim.Region.CoreModules.Scripting.LoadImageURL
 {
-    public class LoadImageURLModule : IRegionModule, IDynamicTextureRender
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "LoadImageURLModule")]
+    public class LoadImageURLModule : ISharedRegionModule, IDynamicTextureRender
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
@@ -67,12 +70,18 @@ namespace OpenSim.Region.CoreModules.Scripting.LoadImageURL
             return true;
         }
 
-        public byte[] ConvertUrl(string url, string extraParams)
+//        public bool AlwaysIdenticalConversion(string bodyData, string extraParams)
+//        {
+//            // We don't support conversion of body data.
+//            return false;
+//        }
+
+        public IDynamicTexture ConvertUrl(string url, string extraParams)
         {
             return null;
         }
 
-        public byte[] ConvertStream(Stream data, string extraParams)
+        public IDynamicTexture ConvertData(string bodyData, string extraParams)
         {
             return null;
         }
@@ -97,22 +106,32 @@ namespace OpenSim.Region.CoreModules.Scripting.LoadImageURL
 
         #endregion
 
-        #region IRegionModule Members
+        #region ISharedRegionModule Members
 
-        public void Initialise(Scene scene, IConfigSource config)
+        public void Initialise(IConfigSource config)
         {
-            if (m_scene == null)
-            {
-                m_scene = scene;
-            }
-            
             m_proxyurl = config.Configs["Startup"].GetString("HttpProxy");
             m_proxyexcepts = config.Configs["Startup"].GetString("HttpProxyExceptions");
         }
 
         public void PostInitialise()
         {
-            if (m_scene != null)
+        }
+
+        public void AddRegion(Scene scene)
+        {
+            if (m_scene == null)
+                m_scene = scene;
+            
+        }
+
+        public void RemoveRegion(Scene scene)
+        {
+        }
+
+        public void RegionLoaded(Scene scene)
+        {
+            if (m_textureManager == null && m_scene == scene)
             {
                 m_textureManager = m_scene.RequestModuleInterface<IDynamicTextureManager>();
                 if (m_textureManager != null)
@@ -131,9 +150,9 @@ namespace OpenSim.Region.CoreModules.Scripting.LoadImageURL
             get { return m_name; }
         }
 
-        public bool IsSharedModule
+        public Type ReplaceableInterface
         {
-            get { return true; }
+            get { return null; }
         }
 
         #endregion
@@ -165,11 +184,17 @@ namespace OpenSim.Region.CoreModules.Scripting.LoadImageURL
 
         private void HttpRequestReturn(IAsyncResult result)
         {
+            if (m_textureManager == null)
+            {
+                m_log.WarnFormat("[LOADIMAGEURLMODULE]: No texture manager. Can't function.");
+                return;
+            }
 
             RequestState state = (RequestState) result.AsyncState;
             WebRequest request = (WebRequest) state.Request;
             Stream stream = null;
             byte[] imageJ2000 = new byte[0];
+            Size newSize = new Size(0, 0);
 
             try
             {
@@ -182,37 +207,43 @@ namespace OpenSim.Region.CoreModules.Scripting.LoadImageURL
                         try
                         {
                             Bitmap image = new Bitmap(stream);
-                            Size newsize;
 
                             // TODO: make this a bit less hard coded
                             if ((image.Height < 64) && (image.Width < 64))
                             {
-                                newsize = new Size(32, 32);
+                                newSize.Width = 32;
+                                newSize.Height = 32;
                             }
                             else if ((image.Height < 128) && (image.Width < 128))
                             {
-                                newsize = new Size(64, 64);
+                                newSize.Width = 64;
+                                newSize.Height = 64;
                             }
                             else if ((image.Height < 256) && (image.Width < 256))
                             {
-                                newsize = new Size(128, 128);
+                                newSize.Width = 128;
+                                newSize.Height = 128;
                             }
                             else if ((image.Height < 512 && image.Width < 512))
                             {
-                                newsize = new Size(256, 256);
+                                newSize.Width = 256;
+                                newSize.Height = 256;
                             }
                             else if ((image.Height < 1024 && image.Width < 1024))
                             {
-                                newsize = new Size(512, 512);
+                                newSize.Width = 512;
+                                newSize.Height = 512;
                             }
                             else
                             {
-                                newsize = new Size(1024, 1024);
+                                newSize.Width = 1024;
+                                newSize.Height = 1024;
                             }
 
-                            Bitmap resize = new Bitmap(image, newsize);
-
-                            imageJ2000 = OpenJPEG.EncodeFromImage(resize, true);
+                            using (Bitmap resize = new Bitmap(image, newSize))
+                            {
+                                imageJ2000 = OpenJPEG.EncodeFromImage(resize, true);
+                            }
                         } 
                         catch (Exception)
                         {
@@ -227,7 +258,6 @@ namespace OpenSim.Region.CoreModules.Scripting.LoadImageURL
             }
             catch (WebException)
             {
-                
             }
             finally
             {
@@ -236,9 +266,14 @@ namespace OpenSim.Region.CoreModules.Scripting.LoadImageURL
                     stream.Close();
                 }
             }
-            m_log.DebugFormat("[LOADIMAGEURLMODULE] Returning {0} bytes of image data for request {1}",
+
+            m_log.DebugFormat("[LOADIMAGEURLMODULE]: Returning {0} bytes of image data for request {1}",
                                        imageJ2000.Length, state.RequestID);
-            m_textureManager.ReturnData(state.RequestID, imageJ2000);
+
+            m_textureManager.ReturnData(
+                state.RequestID,
+                new OpenSim.Region.CoreModules.Scripting.DynamicTexture.DynamicTexture(
+                    request.RequestUri, null, imageJ2000, newSize, false));
         }
 
         #region Nested type: RequestState
diff --git a/OpenSim/Region/CoreModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs b/OpenSim/Region/CoreModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs
new file mode 100644
index 0000000..f6e1d39
--- /dev/null
+++ b/OpenSim/Region/CoreModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs
@@ -0,0 +1,383 @@
+/*
+ * 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 OpenSimulator 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.Reflection;
+using System.Collections.Generic;
+using Nini.Config;
+using log4net;
+using OpenSim.Framework;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Scenes;
+using Mono.Addins;
+using OpenMetaverse;
+using System.Linq;
+using System.Linq.Expressions;
+
+namespace OpenSim.Region.CoreModules.Scripting.ScriptModuleComms
+{
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "ScriptModuleCommsModule")]
+    class ScriptModuleCommsModule : INonSharedRegionModule, IScriptModuleComms
+    {
+        private static readonly ILog m_log =
+            LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+        private Dictionary<string,object> m_constants = new Dictionary<string,object>();
+
+#region ScriptInvocation
+        protected class ScriptInvocationData
+        {
+            public Delegate ScriptInvocationDelegate { get; private set; }
+            public string FunctionName { get; private set; }
+            public Type[] TypeSignature { get; private set; }
+            public Type ReturnType { get; private set; }
+
+            public ScriptInvocationData(string fname, Delegate fn, Type[] callsig, Type returnsig)
+            {
+                FunctionName = fname;
+                ScriptInvocationDelegate = fn;
+                TypeSignature = callsig;
+                ReturnType = returnsig;
+            }
+        }
+
+        private Dictionary<string,ScriptInvocationData> m_scriptInvocation = new Dictionary<string,ScriptInvocationData>();
+#endregion
+
+        private IScriptModule m_scriptModule = null;
+        public event ScriptCommand OnScriptCommand;
+
+#region RegionModuleInterface
+        public void Initialise(IConfigSource config)
+        {
+        }
+
+        public void AddRegion(Scene scene)
+        {
+            scene.RegisterModuleInterface<IScriptModuleComms>(this);
+        }
+
+        public void RemoveRegion(Scene scene)
+        {
+        }
+
+        public void RegionLoaded(Scene scene)
+        {
+            m_scriptModule = scene.RequestModuleInterface<IScriptModule>();
+            
+            if (m_scriptModule != null)
+                m_log.Info("[MODULE COMMANDS]: Script engine found, module active");
+        }
+
+        public string Name
+        {
+            get { return "ScriptModuleCommsModule"; }
+        }
+
+        public Type ReplaceableInterface
+        {
+            get { return null; }
+        }
+
+        public void Close()
+        {
+        }
+#endregion
+
+#region ScriptModuleComms
+
+        public void RaiseEvent(UUID script, string id, string module, string command, string k)
+        {
+            ScriptCommand c = OnScriptCommand;
+
+            if (c == null)
+                return;
+
+            c(script, id, module, command, k);
+        }
+
+        public void DispatchReply(UUID script, int code, string text, string k)
+        {
+            if (m_scriptModule == null)
+                return;
+
+            Object[] args = new Object[] {-1, code, text, k};
+
+            m_scriptModule.PostScriptEvent(script, "link_message", args);
+        }
+
+        private static MethodInfo GetMethodInfoFromType(Type target, string meth, bool searchInstanceMethods)
+        {
+            BindingFlags getMethodFlags =
+                    BindingFlags.NonPublic | BindingFlags.Public;
+
+            if (searchInstanceMethods)
+                getMethodFlags |= BindingFlags.Instance;
+            else
+                getMethodFlags |= BindingFlags.Static;
+
+            return target.GetMethod(meth, getMethodFlags);
+        }
+
+        public void RegisterScriptInvocation(object target, string meth)
+        {
+            MethodInfo mi = GetMethodInfoFromType(target.GetType(), meth, true);
+            if (mi == null)
+            {
+                m_log.WarnFormat("[MODULE COMMANDS] Failed to register method {0}", meth);
+                return;
+            }
+
+            RegisterScriptInvocation(target, mi);
+        }
+
+        public void RegisterScriptInvocation(object target, string[] meth)
+        {
+            foreach (string m in meth)
+                RegisterScriptInvocation(target, m);
+        }
+
+        public void RegisterScriptInvocation(object target, MethodInfo mi)
+        {
+            m_log.DebugFormat("[MODULE COMMANDS] Register method {0} from type {1}", mi.Name, (target is Type) ? ((Type)target).Name : target.GetType().Name);
+
+            Type delegateType;
+            List<Type> typeArgs = mi.GetParameters()
+                    .Select(p => p.ParameterType)
+                    .ToList();
+
+            if (mi.ReturnType == typeof(void))
+            {
+                delegateType = Expression.GetActionType(typeArgs.ToArray());
+            }
+            else
+            {
+                typeArgs.Add(mi.ReturnType);
+                delegateType = Expression.GetFuncType(typeArgs.ToArray());
+            }
+
+            Delegate fcall;
+            if (!(target is Type))
+                fcall = Delegate.CreateDelegate(delegateType, target, mi);
+            else
+                fcall = Delegate.CreateDelegate(delegateType, (Type)target, mi.Name);
+
+            lock (m_scriptInvocation)
+            {
+                ParameterInfo[] parameters = fcall.Method.GetParameters();
+                if (parameters.Length < 2) // Must have two UUID params
+                    return;
+
+                // Hide the first two parameters
+                Type[] parmTypes = new Type[parameters.Length - 2];
+                for (int i = 2; i < parameters.Length; i++)
+                    parmTypes[i - 2] = parameters[i].ParameterType;
+                m_scriptInvocation[fcall.Method.Name] = new ScriptInvocationData(fcall.Method.Name, fcall, parmTypes, fcall.Method.ReturnType);
+            }
+        }
+
+        public void RegisterScriptInvocation(Type target, string[] methods)
+        {
+            foreach (string method in methods)
+            {
+                MethodInfo mi = GetMethodInfoFromType(target, method, false);
+                if (mi == null)
+                    m_log.WarnFormat("[MODULE COMMANDS] Failed to register method {0}", method);
+                else
+                    RegisterScriptInvocation(target, mi);
+            }
+        }
+
+        public void RegisterScriptInvocations(IRegionModuleBase target)
+        {
+            foreach(MethodInfo method in target.GetType().GetMethods(
+                    BindingFlags.Public | BindingFlags.Instance |
+                    BindingFlags.Static))
+            {
+                if(method.GetCustomAttributes(
+                        typeof(ScriptInvocationAttribute), true).Any())
+                {
+                    if(method.IsStatic)
+                        RegisterScriptInvocation(target.GetType(), method);
+                    else
+                        RegisterScriptInvocation(target, method);
+                }
+            }
+        }
+        
+        public Delegate[] GetScriptInvocationList()
+        {
+            List<Delegate> ret = new List<Delegate>();
+
+            lock (m_scriptInvocation)
+            {
+                foreach (ScriptInvocationData d in m_scriptInvocation.Values)
+                    ret.Add(d.ScriptInvocationDelegate);
+            }
+            return ret.ToArray();
+        }
+
+        public string LookupModInvocation(string fname)
+        {
+            lock (m_scriptInvocation)
+            {
+                ScriptInvocationData sid;
+                if (m_scriptInvocation.TryGetValue(fname,out sid))
+                {
+                    if (sid.ReturnType == typeof(string))
+                        return "modInvokeS";
+                    else if (sid.ReturnType == typeof(int))
+                        return "modInvokeI";
+                    else if (sid.ReturnType == typeof(float))
+                        return "modInvokeF";
+                    else if (sid.ReturnType == typeof(UUID))
+                        return "modInvokeK";
+                    else if (sid.ReturnType == typeof(OpenMetaverse.Vector3))
+                        return "modInvokeV";
+                    else if (sid.ReturnType == typeof(OpenMetaverse.Quaternion))
+                        return "modInvokeR";
+                    else if (sid.ReturnType == typeof(object[]))
+                        return "modInvokeL";
+
+                    m_log.WarnFormat("[MODULE COMMANDS] failed to find match for {0} with return type {1}",fname,sid.ReturnType.Name);
+                }
+            }
+
+            return null;
+        }
+
+        public Delegate LookupScriptInvocation(string fname)
+        {
+            lock (m_scriptInvocation)
+            {
+                ScriptInvocationData sid;
+                if (m_scriptInvocation.TryGetValue(fname,out sid))
+                    return sid.ScriptInvocationDelegate;
+            }
+
+            return null;
+        }
+
+        public Type[] LookupTypeSignature(string fname)
+        {
+            lock (m_scriptInvocation)
+            {
+                ScriptInvocationData sid;
+                if (m_scriptInvocation.TryGetValue(fname,out sid))
+                    return sid.TypeSignature;
+            }
+
+            return null;
+        }
+
+        public Type LookupReturnType(string fname)
+        {
+            lock (m_scriptInvocation)
+            {
+                ScriptInvocationData sid;
+                if (m_scriptInvocation.TryGetValue(fname,out sid))
+                    return sid.ReturnType;
+            }
+
+            return null;
+        }
+
+        public object InvokeOperation(UUID hostid, UUID scriptid, string fname, params object[] parms)
+        {
+            List<object> olist = new List<object>();
+            olist.Add(hostid);
+            olist.Add(scriptid);
+            foreach (object o in parms)
+                olist.Add(o);
+            Delegate fn = LookupScriptInvocation(fname);
+            return fn.DynamicInvoke(olist.ToArray());
+        }
+
+        /// <summary>
+        /// Operation to for a region module to register a constant to be used
+        /// by the script engine
+        /// </summary>
+        public void RegisterConstant(string cname, object value)
+        {
+            m_log.DebugFormat("[MODULE COMMANDS] register constant <{0}> with value {1}",cname,value.ToString());
+            lock (m_constants)
+            {
+                m_constants.Add(cname,value);
+            }
+        }
+
+        public void RegisterConstants(IRegionModuleBase target)
+        {
+            foreach (FieldInfo field in target.GetType().GetFields(
+                    BindingFlags.Public | BindingFlags.Static |
+                    BindingFlags.Instance))
+            {
+                if (field.GetCustomAttributes(
+                        typeof(ScriptConstantAttribute), true).Any())
+                {
+                    RegisterConstant(field.Name, field.GetValue(target));
+                }
+            }
+        }
+
+        /// <summary>
+        /// Operation to check for a registered constant
+        /// </summary>
+        public object LookupModConstant(string cname)
+        {
+            // m_log.DebugFormat("[MODULE COMMANDS] lookup constant <{0}>",cname);
+            
+            lock (m_constants)
+            {
+                object value = null;
+                if (m_constants.TryGetValue(cname,out value))
+                    return value;
+            }
+            
+            return null;
+        }
+
+        /// <summary>
+        /// Get all registered constants
+        /// </summary>
+        public Dictionary<string, object> GetConstants()
+        {
+            Dictionary<string, object> ret = new Dictionary<string, object>();
+
+            lock (m_constants)
+            {
+                foreach (KeyValuePair<string, object> kvp in m_constants)
+                    ret[kvp.Key] = kvp.Value;
+            }
+
+            return ret;
+        }
+
+#endregion
+
+    }
+}
diff --git a/OpenSim/Region/CoreModules/Scripting/VectorRender/Tests/VectorRenderModuleTests.cs b/OpenSim/Region/CoreModules/Scripting/VectorRender/Tests/VectorRenderModuleTests.cs
index 9787c8c..41baccc 100644
--- a/OpenSim/Region/CoreModules/Scripting/VectorRender/Tests/VectorRenderModuleTests.cs
+++ b/OpenSim/Region/CoreModules/Scripting/VectorRender/Tests/VectorRenderModuleTests.cs
@@ -45,31 +45,292 @@ using OpenSim.Tests.Common.Mock;
 namespace OpenSim.Region.CoreModules.Scripting.VectorRender.Tests
 {
     [TestFixture]
-    public class VectorRenderModuleTests
+    public class VectorRenderModuleTests : OpenSimTestCase
     {
+        Scene m_scene;
+        DynamicTextureModule m_dtm;
+        VectorRenderModule m_vrm;
+
+        private void SetupScene(bool reuseTextures)
+        {
+            m_scene = new SceneHelpers().SetupScene();
+
+            m_dtm = new DynamicTextureModule();
+            m_dtm.ReuseTextures = reuseTextures;
+//            m_dtm.ReuseLowDataTextures = reuseTextures;
+
+            m_vrm = new VectorRenderModule();
+
+            SceneHelpers.SetupSceneModules(m_scene, m_dtm, m_vrm);
+        }
+
         [Test]
         public void TestDraw()
         {
             TestHelpers.InMethod();
 
-            Scene scene = new SceneHelpers().SetupScene();
-            DynamicTextureModule dtm = new DynamicTextureModule();
-            VectorRenderModule vrm = new VectorRenderModule();
-            SceneHelpers.SetupSceneModules(scene, dtm, vrm);
-
-            SceneObjectGroup so = SceneHelpers.AddSceneObject(scene);
+            SetupScene(false);
+            SceneObjectGroup so = SceneHelpers.AddSceneObject(m_scene);
             UUID originalTextureID = so.RootPart.Shape.Textures.GetFace(0).TextureID;
 
-            dtm.AddDynamicTextureData(
-                scene.RegionInfo.RegionID,
+            m_dtm.AddDynamicTextureData(
+                m_scene.RegionInfo.RegionID,
                 so.UUID,
-                vrm.GetContentType(),
+                m_vrm.GetContentType(),
                 "PenColour BLACK; MoveTo 40,220; FontSize 32; Text Hello World;",
                 "",
                 0);
 
+            Assert.That(originalTextureID, Is.Not.EqualTo(so.RootPart.Shape.Textures.GetFace(0).TextureID));
+        }
+
+        [Test]
+        public void TestRepeatSameDraw()
+        {
+            TestHelpers.InMethod();
+
+            string dtText = "PenColour BLACK; MoveTo 40,220; FontSize 32; Text Hello World;";
+
+            SetupScene(false);
+            SceneObjectGroup so = SceneHelpers.AddSceneObject(m_scene);
+
+            m_dtm.AddDynamicTextureData(
+                m_scene.RegionInfo.RegionID,
+                so.UUID,
+                m_vrm.GetContentType(),
+                dtText,
+                "",
+                0);
+
+            UUID firstDynamicTextureID = so.RootPart.Shape.Textures.GetFace(0).TextureID;
+
+            m_dtm.AddDynamicTextureData(
+                m_scene.RegionInfo.RegionID,
+                so.UUID,
+                m_vrm.GetContentType(),
+                dtText,
+                "",
+                0);
+
+            Assert.That(firstDynamicTextureID, Is.Not.EqualTo(so.RootPart.Shape.Textures.GetFace(0).TextureID));
+        }
+
+        [Test]
+        public void TestRepeatSameDrawDifferentExtraParams()
+        {
+            TestHelpers.InMethod();
+
+            string dtText = "PenColour BLACK; MoveTo 40,220; FontSize 32; Text Hello World;";
+
+            SetupScene(false);
+            SceneObjectGroup so = SceneHelpers.AddSceneObject(m_scene);
+
+            m_dtm.AddDynamicTextureData(
+                m_scene.RegionInfo.RegionID,
+                so.UUID,
+                m_vrm.GetContentType(),
+                dtText,
+                "",
+                0);
+
+            UUID firstDynamicTextureID = so.RootPart.Shape.Textures.GetFace(0).TextureID;
+
+            m_dtm.AddDynamicTextureData(
+                m_scene.RegionInfo.RegionID,
+                so.UUID,
+                m_vrm.GetContentType(),
+                dtText,
+                "alpha:250",
+                0);
+
+            Assert.That(firstDynamicTextureID, Is.Not.EqualTo(so.RootPart.Shape.Textures.GetFace(0).TextureID));
+        }
+
+        [Test]
+        public void TestRepeatSameDrawContainingImage()
+        {
+            TestHelpers.InMethod();
+
+            string dtText
+                = "PenColour BLACK; MoveTo 40,220; FontSize 32; Text Hello World; Image http://localhost/shouldnotexist.png";
+
+            SetupScene(false);
+            SceneObjectGroup so = SceneHelpers.AddSceneObject(m_scene);
+
+            m_dtm.AddDynamicTextureData(
+                m_scene.RegionInfo.RegionID,
+                so.UUID,
+                m_vrm.GetContentType(),
+                dtText,
+                "",
+                0);
+
+            UUID firstDynamicTextureID = so.RootPart.Shape.Textures.GetFace(0).TextureID;
+
+            m_dtm.AddDynamicTextureData(
+                m_scene.RegionInfo.RegionID,
+                so.UUID,
+                m_vrm.GetContentType(),
+                dtText,
+                "",
+                0);
+
+            Assert.That(firstDynamicTextureID, Is.Not.EqualTo(so.RootPart.Shape.Textures.GetFace(0).TextureID));
+        }
+
+        [Test]
+        public void TestDrawReusingTexture()
+        {
+            TestHelpers.InMethod();
+
+            SetupScene(true);
+            SceneObjectGroup so = SceneHelpers.AddSceneObject(m_scene);
+            UUID originalTextureID = so.RootPart.Shape.Textures.GetFace(0).TextureID;
+
+            m_dtm.AddDynamicTextureData(
+                m_scene.RegionInfo.RegionID,
+                so.UUID,
+                m_vrm.GetContentType(),
+                "PenColour BLACK; MoveTo 40,220; FontSize 32; Text Hello World;",
+                "",
+                0);
 
             Assert.That(originalTextureID, Is.Not.EqualTo(so.RootPart.Shape.Textures.GetFace(0).TextureID));
         }
+
+        [Test]
+        public void TestRepeatSameDrawReusingTexture()
+        {
+            TestHelpers.InMethod();
+//            TestHelpers.EnableLogging();
+
+            string dtText = "PenColour BLACK; MoveTo 40,220; FontSize 32; Text Hello World;";
+
+            SetupScene(true);
+            SceneObjectGroup so = SceneHelpers.AddSceneObject(m_scene);
+
+            m_dtm.AddDynamicTextureData(
+                m_scene.RegionInfo.RegionID,
+                so.UUID,
+                m_vrm.GetContentType(),
+                dtText,
+                "",
+                0);
+
+            UUID firstDynamicTextureID = so.RootPart.Shape.Textures.GetFace(0).TextureID;
+
+            m_dtm.AddDynamicTextureData(
+                m_scene.RegionInfo.RegionID,
+                so.UUID,
+                m_vrm.GetContentType(),
+                dtText,
+                "",
+                0);
+
+            Assert.That(firstDynamicTextureID, Is.EqualTo(so.RootPart.Shape.Textures.GetFace(0).TextureID));
+        }
+
+        /// <summary>
+        /// Test a low data dynamically generated texture such that it is treated as a low data texture that causes
+        /// problems for current viewers.
+        /// </summary>
+        /// <remarks>
+        /// As we do not set DynamicTextureModule.ReuseLowDataTextures = true in this test, it should not reuse the
+        /// texture
+        /// </remarks>
+        [Test]
+        public void TestRepeatSameDrawLowDataTexture()
+        {
+            TestHelpers.InMethod();
+//            TestHelpers.EnableLogging();
+
+            string dtText = "PenColour BLACK; MoveTo 40,220; FontSize 32; Text Hello World;";
+
+            SetupScene(true);
+            SceneObjectGroup so = SceneHelpers.AddSceneObject(m_scene);
+
+            m_dtm.AddDynamicTextureData(
+                m_scene.RegionInfo.RegionID,
+                so.UUID,
+                m_vrm.GetContentType(),
+                dtText,
+                "1024",
+                0);
+
+            UUID firstDynamicTextureID = so.RootPart.Shape.Textures.GetFace(0).TextureID;
+
+            m_dtm.AddDynamicTextureData(
+                m_scene.RegionInfo.RegionID,
+                so.UUID,
+                m_vrm.GetContentType(),
+                dtText,
+                "1024",
+                0);
+
+            Assert.That(firstDynamicTextureID, Is.Not.EqualTo(so.RootPart.Shape.Textures.GetFace(0).TextureID));
+        }
+
+        [Test]
+        public void TestRepeatSameDrawDifferentExtraParamsReusingTexture()
+        {
+            TestHelpers.InMethod();
+
+            string dtText = "PenColour BLACK; MoveTo 40,220; FontSize 32; Text Hello World;";
+
+            SetupScene(true);
+            SceneObjectGroup so = SceneHelpers.AddSceneObject(m_scene);
+
+            m_dtm.AddDynamicTextureData(
+                m_scene.RegionInfo.RegionID,
+                so.UUID,
+                m_vrm.GetContentType(),
+                dtText,
+                "",
+                0);
+
+            UUID firstDynamicTextureID = so.RootPart.Shape.Textures.GetFace(0).TextureID;
+
+            m_dtm.AddDynamicTextureData(
+                m_scene.RegionInfo.RegionID,
+                so.UUID,
+                m_vrm.GetContentType(),
+                dtText,
+                "alpha:250",
+                0);
+
+            Assert.That(firstDynamicTextureID, Is.Not.EqualTo(so.RootPart.Shape.Textures.GetFace(0).TextureID));
+        }
+
+        [Test]
+        public void TestRepeatSameDrawContainingImageReusingTexture()
+        {
+            TestHelpers.InMethod();
+
+            string dtText
+                = "PenColour BLACK; MoveTo 40,220; FontSize 32; Text Hello World; Image http://localhost/shouldnotexist.png";
+
+            SetupScene(true);
+            SceneObjectGroup so = SceneHelpers.AddSceneObject(m_scene);
+
+            m_dtm.AddDynamicTextureData(
+                m_scene.RegionInfo.RegionID,
+                so.UUID,
+                m_vrm.GetContentType(),
+                dtText,
+                "",
+                0);
+
+            UUID firstDynamicTextureID = so.RootPart.Shape.Textures.GetFace(0).TextureID;
+
+            m_dtm.AddDynamicTextureData(
+                m_scene.RegionInfo.RegionID,
+                so.UUID,
+                m_vrm.GetContentType(),
+                dtText,
+                "",
+                0);
+
+            Assert.That(firstDynamicTextureID, Is.Not.EqualTo(so.RootPart.Shape.Textures.GetFace(0).TextureID));
+        }
     }
 }
\ No newline at end of file
diff --git a/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs b/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs
index 8b2f2f8..f395441 100644
--- a/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs
@@ -30,26 +30,35 @@ using System.Drawing;
 using System.Drawing.Imaging;
 using System.Globalization;
 using System.IO;
+using System.Linq;
 using System.Net;
 using Nini.Config;
 using OpenMetaverse;
 using OpenMetaverse.Imaging;
+using OpenSim.Region.CoreModules.Scripting.DynamicTexture;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 using log4net;
 using System.Reflection;
+using Mono.Addins;
 
 //using Cairo;
 
 namespace OpenSim.Region.CoreModules.Scripting.VectorRender
 {
-    public class VectorRenderModule : IRegionModule, IDynamicTextureRender
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "VectorRenderModule")]
+    public class VectorRenderModule : ISharedRegionModule, IDynamicTextureRender
     {
+        // These fields exist for testing purposes, please do not remove.
+//        private static bool s_flipper;
+//        private static byte[] s_asset1Data;
+//        private static byte[] s_asset2Data;
+
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
-        private string m_name = "VectorRenderModule";
         private Scene m_scene;
         private IDynamicTextureManager m_textureManager;
+
         private Graphics m_graph;
         private string m_fontName = "Arial";
 
@@ -61,12 +70,12 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender
 
         public string GetContentType()
         {
-            return ("vector");
+            return "vector";
         }
 
         public string GetName()
         {
-            return m_name;
+            return Name;
         }
 
         public bool SupportsAsynchronous()
@@ -74,14 +83,20 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender
             return true;
         }
 
-        public byte[] ConvertUrl(string url, string extraParams)
+//        public bool AlwaysIdenticalConversion(string bodyData, string extraParams)
+//        {
+//            string[] lines = GetLines(bodyData);
+//            return lines.Any((str, r) => str.StartsWith("Image"));
+//        }
+
+        public IDynamicTexture ConvertUrl(string url, string extraParams)
         {
             return null;
         }
 
-        public byte[] ConvertStream(Stream data, string extraParams)
+        public IDynamicTexture ConvertData(string bodyData, string extraParams)
         {
-            return null;
+            return Draw(bodyData, extraParams);
         }
 
         public bool AsyncConvertUrl(UUID id, string url, string extraParams)
@@ -91,78 +106,101 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender
 
         public bool AsyncConvertData(UUID id, string bodyData, string extraParams)
         {
-            Draw(bodyData, id, extraParams);
+            if (m_textureManager == null)
+            {
+                m_log.Warn("[VECTORRENDERMODULE]: No texture manager. Can't function");
+                return false;
+            }
+            // XXX: This isn't actually being done asynchronously!
+            m_textureManager.ReturnData(id, ConvertData(bodyData, extraParams));
+
             return true;
         }
 
         public void GetDrawStringSize(string text, string fontName, int fontSize, 
                                       out double xSize, out double ySize)
         {
-            using (Font myFont = new Font(fontName, fontSize))
+            lock (this)
             {
-                SizeF stringSize = new SizeF();
-                lock (m_graph)
+                using (Font myFont = new Font(fontName, fontSize))
                 {
-                    stringSize = m_graph.MeasureString(text, myFont);
-                    xSize = stringSize.Width;
-                    ySize = stringSize.Height;
+                    SizeF stringSize = new SizeF();
+
+                    // XXX: This lock may be unnecessary.
+                    lock (m_graph)
+                    {
+                        stringSize = m_graph.MeasureString(text, myFont);
+                        xSize = stringSize.Width;
+                        ySize = stringSize.Height;
+                    }
                 }
             }
         }
 
         #endregion
 
-        #region IRegionModule Members
+        #region ISharedRegionModule Members
 
-        public void Initialise(Scene scene, IConfigSource config)
+        public void Initialise(IConfigSource config)
         {
-            if (m_scene == null)
-            {
-                m_scene = scene;
-            }
-
-            if (m_graph == null)
-            {
-                // We won't dispose of these explicitly since this module is only removed when the entire simulator
-                // is shut down.
-                Bitmap bitmap = new Bitmap(1024, 1024, PixelFormat.Format32bppArgb);
-                m_graph = Graphics.FromImage(bitmap);
-            }
-
             IConfig cfg = config.Configs["VectorRender"];
             if (null != cfg)
             {
                 m_fontName = cfg.GetString("font_name", m_fontName);
             }
             m_log.DebugFormat("[VECTORRENDERMODULE]: using font \"{0}\" for text rendering.", m_fontName);
+
+            // We won't dispose of these explicitly since this module is only removed when the entire simulator
+            // is shut down.
+            Bitmap bitmap = new Bitmap(1024, 1024, PixelFormat.Format32bppArgb);
+            m_graph = Graphics.FromImage(bitmap);
         }
 
         public void PostInitialise()
         {
-            m_textureManager = m_scene.RequestModuleInterface<IDynamicTextureManager>();
-            if (m_textureManager != null)
+        }
+
+        public void AddRegion(Scene scene)
+        {
+            if (m_scene == null)
             {
-                m_textureManager.RegisterRender(GetContentType(), this);
+                m_scene = scene;
             }
         }
 
+        public void RegionLoaded(Scene scene)
+        {
+            if (m_textureManager == null && m_scene == scene)
+            {
+                m_textureManager = m_scene.RequestModuleInterface<IDynamicTextureManager>();
+                if (m_textureManager != null)
+                {
+                    m_textureManager.RegisterRender(GetContentType(), this);
+                }
+            }
+        }
+
+        public void RemoveRegion(Scene scene)
+        {
+        }
+
         public void Close()
         {
         }
 
         public string Name
         {
-            get { return m_name; }
+            get { return "VectorRenderModule"; }
         }
 
-        public bool IsSharedModule
+        public Type ReplaceableInterface
         {
-            get { return true; }
+            get { return null; }
         }
 
         #endregion
 
-        private void Draw(string data, UUID id, string extraParams)
+        private IDynamicTexture Draw(string data, string extraParams)
         {
             // We need to cater for old scripts that didnt use extraParams neatly, they use either an integer size which represents both width and height, or setalpha
             // we will now support multiple comma seperated params in the form  width:256,height:512,alpha:255
@@ -305,40 +343,57 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender
 
             Bitmap bitmap = null;
             Graphics graph = null;
+            bool reuseable = false;
 
             try
             {
-                if (alpha == 256)
-                    bitmap = new Bitmap(width, height, PixelFormat.Format32bppRgb);
-                else
-                    bitmap = new Bitmap(width, height, PixelFormat.Format32bppArgb);
-
-                graph = Graphics.FromImage(bitmap);
-    
-                // this is really just to save people filling the 
-                // background color in their scripts, only do when fully opaque
-                if (alpha >= 255)
+                // XXX: In testing, it appears that if multiple threads dispose of separate GDI+ objects simultaneously,
+                // the native malloc heap can become corrupted, possibly due to a double free().  This may be due to
+                // bugs in the underlying libcairo used by mono's libgdiplus.dll on Linux/OSX.  These problems were
+                // seen with both libcario 1.10.2-6.1ubuntu3 and 1.8.10-2ubuntu1.  They go away if disposal is perfomed
+                // under lock.
+                lock (this)
                 {
-                    using (SolidBrush bgFillBrush = new SolidBrush(bgColor))
+                    if (alpha == 256)
+                        bitmap = new Bitmap(width, height, PixelFormat.Format32bppRgb);
+                    else
+                        bitmap = new Bitmap(width, height, PixelFormat.Format32bppArgb);
+    
+                    graph = Graphics.FromImage(bitmap);
+        
+                    // this is really just to save people filling the 
+                    // background color in their scripts, only do when fully opaque
+                    if (alpha >= 255)
                     {
-                        graph.FillRectangle(bgFillBrush, 0, 0, width, height);
+                        using (SolidBrush bgFillBrush = new SolidBrush(bgColor))
+                        {
+                            graph.FillRectangle(bgFillBrush, 0, 0, width, height);
+                        }
                     }
-                }
-    
-                for (int w = 0; w < bitmap.Width; w++)
-                {
-                    if (alpha <= 255) 
+        
+                    for (int w = 0; w < bitmap.Width; w++)
                     {
-                        for (int h = 0; h < bitmap.Height; h++)
+                        if (alpha <= 255) 
                         {
-                            bitmap.SetPixel(w, h, Color.FromArgb(alpha, bitmap.GetPixel(w, h)));
+                            for (int h = 0; h < bitmap.Height; h++)
+                            {
+                                bitmap.SetPixel(w, h, Color.FromArgb(alpha, bitmap.GetPixel(w, h)));
+                            }
                         }
                     }
+        
+                    GDIDraw(data, graph, altDataDelim, out reuseable);
                 }
     
-                GDIDraw(data, graph, altDataDelim);
-    
                 byte[] imageJ2000 = new byte[0];
+
+                // This code exists for testing purposes, please do not remove.
+//                if (s_flipper)
+//                    imageJ2000 = s_asset1Data;
+//                else
+//                    imageJ2000 = s_asset2Data;
+//
+//                s_flipper = !s_flipper;
     
                 try
                 {
@@ -351,15 +406,24 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender
                         e.Message, e.StackTrace);
                 }
 
-                m_textureManager.ReturnData(id, imageJ2000);
+                return new OpenSim.Region.CoreModules.Scripting.DynamicTexture.DynamicTexture(
+                    data, extraParams, imageJ2000, new Size(width, height), reuseable);
             }
             finally
             {
-                if (graph != null)
-                    graph.Dispose();
-
-                if (bitmap != null)
-                    bitmap.Dispose();
+                // XXX: In testing, it appears that if multiple threads dispose of separate GDI+ objects simultaneously,
+                // the native malloc heap can become corrupted, possibly due to a double free().  This may be due to
+                // bugs in the underlying libcairo used by mono's libgdiplus.dll on Linux/OSX.  These problems were
+                // seen with both libcario 1.10.2-6.1ubuntu3 and 1.8.10-2ubuntu1.  They go away if disposal is perfomed
+                // under lock.
+                lock (this)
+                {
+                    if (graph != null)
+                        graph.Dispose();
+    
+                    if (bitmap != null)
+                        bitmap.Dispose();
+                }
             }
         }
         
@@ -418,8 +482,21 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender
         }
 */
 
-        private void GDIDraw(string data, Graphics graph, char dataDelim)
+        /// <summary>
+        /// Split input data into discrete command lines.
+        /// </summary>
+        /// <returns></returns>
+        /// <param name='data'></param>
+        /// <param name='dataDelim'></param>
+        private string[] GetLines(string data, char dataDelim)
+        {
+            char[] lineDelimiter = { dataDelim };
+            return data.Split(lineDelimiter);
+        }
+
+        private void GDIDraw(string data, Graphics graph, char dataDelim, out bool reuseable)
         {
+            reuseable = true;
             Point startPoint = new Point(0, 0);
             Point endPoint = new Point(0, 0);
             Pen drawPen = null;
@@ -434,11 +511,9 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender
                 myFont = new Font(fontName, fontSize);
                 myBrush = new SolidBrush(Color.Black);
 
-                char[] lineDelimiter = {dataDelim};
                 char[] partsDelimiter = {','};
-                string[] lines = data.Split(lineDelimiter);
 
-                foreach (string line in lines)
+                foreach (string line in GetLines(data, dataDelim))
                 {
                     string nextLine = line.Trim();
                     //replace with switch, or even better, do some proper parsing
@@ -469,6 +544,10 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender
                     }
                     else if (nextLine.StartsWith("Image"))
                     {
+                        // We cannot reuse any generated texture involving fetching an image via HTTP since that image
+                        // can change.
+                        reuseable = false;
+
                         float x = 0;
                         float y = 0;
                         GetParams(partsDelimiter, ref nextLine, 5, ref x, ref y);
diff --git a/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs b/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs
index 07bb291..87a0537 100644
--- a/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs
@@ -28,8 +28,13 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Text.RegularExpressions;
+
 using Nini.Config;
+using Mono.Addins;
+
 using OpenMetaverse;
+
 using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
@@ -85,7 +90,8 @@ using OpenSim.Region.Framework.Scenes;
 
 namespace OpenSim.Region.CoreModules.Scripting.WorldComm
 {
-    public class WorldCommModule : IRegionModule, IWorldComm
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "WorldCommModule")]
+    public class WorldCommModule : IWorldComm, INonSharedRegionModule
     {
         // private static readonly ILog m_log =
         //     LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@@ -100,9 +106,9 @@ namespace OpenSim.Region.CoreModules.Scripting.WorldComm
         private int m_saydistance = 20;
         private int m_shoutdistance = 100;
 
-        #region IRegionModule Members
+        #region INonSharedRegionModule Members
 
-        public void Initialise(Scene scene, IConfigSource config)
+        public void Initialise(IConfigSource config)
         {
             // wrap this in a try block so that defaults will work if
             // the config file doesn't specify otherwise.
@@ -110,29 +116,49 @@ namespace OpenSim.Region.CoreModules.Scripting.WorldComm
             int maxhandles = 64;
             try
             {
-                m_whisperdistance = config.Configs["Chat"].GetInt("whisper_distance", m_whisperdistance);
-                m_saydistance = config.Configs["Chat"].GetInt("say_distance", m_saydistance);
-                m_shoutdistance = config.Configs["Chat"].GetInt("shout_distance", m_shoutdistance);
-                maxlisteners = config.Configs["LL-Functions"].GetInt("max_listens_per_region", maxlisteners);
-                maxhandles = config.Configs["LL-Functions"].GetInt("max_listens_per_script", maxhandles);
+                m_whisperdistance = config.Configs["Chat"].GetInt(
+                        "whisper_distance", m_whisperdistance);
+                m_saydistance = config.Configs["Chat"].GetInt(
+                        "say_distance", m_saydistance);
+                m_shoutdistance = config.Configs["Chat"].GetInt(
+                        "shout_distance", m_shoutdistance);
+                maxlisteners = config.Configs["LL-Functions"].GetInt(
+                        "max_listens_per_region", maxlisteners);
+                maxhandles = config.Configs["LL-Functions"].GetInt(
+                        "max_listens_per_script", maxhandles);
             }
             catch (Exception)
             {
             }
             if (maxlisteners < 1) maxlisteners = int.MaxValue;
             if (maxhandles < 1) maxhandles = int.MaxValue;
+            m_listenerManager = new ListenerManager(maxlisteners, maxhandles);
+            m_pendingQ = new Queue();
+            m_pending = Queue.Synchronized(m_pendingQ);
+        }
 
+        public void PostInitialise()
+        {
+        }
+
+        public void AddRegion(Scene scene)
+        {
             m_scene = scene;
             m_scene.RegisterModuleInterface<IWorldComm>(this);
-            m_listenerManager = new ListenerManager(maxlisteners, maxhandles);
             m_scene.EventManager.OnChatFromClient += DeliverClientMessage;
             m_scene.EventManager.OnChatBroadcast += DeliverClientMessage;
-            m_pendingQ = new Queue();
-            m_pending = Queue.Synchronized(m_pendingQ);
         }
 
-        public void PostInitialise()
+        public void RegionLoaded(Scene scene) { }
+
+        public void RemoveRegion(Scene scene)
         {
+            if (scene != m_scene)
+                return;
+
+            m_scene.UnregisterModuleInterface<IWorldComm>(this);
+            m_scene.EventManager.OnChatBroadcast -= DeliverClientMessage;
+            m_scene.EventManager.OnChatBroadcast -= DeliverClientMessage;
         }
 
         public void Close()
@@ -144,10 +170,7 @@ namespace OpenSim.Region.CoreModules.Scripting.WorldComm
             get { return "WorldCommModule"; }
         }
 
-        public bool IsSharedModule
-        {
-            get { return false; }
-        }
+        public Type ReplaceableInterface { get { return null; } }
 
         #endregion
 
@@ -172,12 +195,42 @@ namespace OpenSim.Region.CoreModules.Scripting.WorldComm
         /// <param name="hostID">UUID of the SceneObjectPart</param>
         /// <param name="channel">channel to listen on</param>
         /// <param name="name">name to filter on</param>
-        /// <param name="id">key to filter on (user given, could be totally faked)</param>
+        /// <param name="id">
+        /// key to filter on (user given, could be totally faked)
+        /// </param>
+        /// <param name="msg">msg to filter on</param>
+        /// <returns>number of the scripts handle</returns>
+        public int Listen(uint localID, UUID itemID, UUID hostID, int channel,
+                string name, UUID id, string msg)
+        {
+            return m_listenerManager.AddListener(localID, itemID, hostID,
+                channel, name, id, msg);
+        }
+
+        /// <summary>
+        /// Create a listen event callback with the specified filters.
+        /// The parameters localID,itemID are needed to uniquely identify
+        /// the script during 'peek' time. Parameter hostID is needed to
+        /// determine the position of the script.
+        /// </summary>
+        /// <param name="localID">localID of the script engine</param>
+        /// <param name="itemID">UUID of the script engine</param>
+        /// <param name="hostID">UUID of the SceneObjectPart</param>
+        /// <param name="channel">channel to listen on</param>
+        /// <param name="name">name to filter on</param>
+        /// <param name="id">
+        /// key to filter on (user given, could be totally faked)
+        /// </param>
         /// <param name="msg">msg to filter on</param>
+        /// <param name="regexBitfield">
+        /// Bitfield indicating which strings should be processed as regex.
+        /// </param>
         /// <returns>number of the scripts handle</returns>
-        public int Listen(uint localID, UUID itemID, UUID hostID, int channel, string name, UUID id, string msg)
+        public int Listen(uint localID, UUID itemID, UUID hostID, int channel,
+                string name, UUID id, string msg, int regexBitfield)
         {
-            return m_listenerManager.AddListener(localID, itemID, hostID, channel, name, id, msg);
+            return m_listenerManager.AddListener(localID, itemID, hostID,
+                    channel, name, id, msg, regexBitfield);
         }
 
         /// <summary>
@@ -226,7 +279,7 @@ namespace OpenSim.Region.CoreModules.Scripting.WorldComm
 
             if ((source = m_scene.GetSceneObjectPart(id)) != null)
                 position = source.AbsolutePosition;
-            else if ((avatar = m_scene.GetScenePresence(id)) != null) 
+            else if ((avatar = m_scene.GetScenePresence(id)) != null)
                 position = avatar.AbsolutePosition;
             else if (ChatTypeEnum.Region == type)
                 position = CenterOfRegion;
@@ -249,7 +302,8 @@ namespace OpenSim.Region.CoreModules.Scripting.WorldComm
         /// <param name="name">name of sender (object or avatar)</param>
         /// <param name="id">key of sender (object or avatar)</param>
         /// <param name="msg">msg to sent</param>
-        public void DeliverMessage(ChatTypeEnum type, int channel, string name, UUID id, string msg, Vector3 position)
+        public void DeliverMessage(ChatTypeEnum type, int channel,
+                string name, UUID id, string msg, Vector3 position)
         {
             // m_log.DebugFormat("[WorldComm] got[2] type {0}, channel {1}, name {2}, id {3}, msg {4}",
             //                   type, channel, name, id, msg);
@@ -257,17 +311,21 @@ namespace OpenSim.Region.CoreModules.Scripting.WorldComm
             // Determine which listen event filters match the given set of arguments, this results
             // in a limited set of listeners, each belonging a host. If the host is in range, add them
             // to the pending queue.
-            foreach (ListenerInfo li in m_listenerManager.GetListeners(UUID.Zero, channel, name, id, msg))
+            foreach (ListenerInfo li
+                    in m_listenerManager.GetListeners(UUID.Zero, channel,
+                    name, id, msg))
             {
                 // Dont process if this message is from yourself!
                 if (li.GetHostID().Equals(id))
                     continue;
 
-                SceneObjectPart sPart = m_scene.GetSceneObjectPart(li.GetHostID());
+                SceneObjectPart sPart = m_scene.GetSceneObjectPart(
+                        li.GetHostID());
                 if (sPart == null)
                     continue;
 
-                double dis =  Util.GetDistanceTo(sPart.AbsolutePosition, position);
+                double dis = Util.GetDistanceTo(sPart.AbsolutePosition,
+                        position);
                 switch (type)
                 {
                     case ChatTypeEnum.Whisper:
@@ -326,7 +384,7 @@ namespace OpenSim.Region.CoreModules.Scripting.WorldComm
                 if (channel == 0)
                 {
                     // Channel 0 goes to viewer ONLY
-                    m_scene.SimChat(Utils.StringToBytes(msg), ChatTypeEnum.Broadcast, 0, pos, name, id, false, false, target);
+                    m_scene.SimChat(Utils.StringToBytes(msg), ChatTypeEnum.Broadcast, 0, pos, name, id, target, false, false);
                     return true;
                 }
 
@@ -369,11 +427,12 @@ namespace OpenSim.Region.CoreModules.Scripting.WorldComm
                 if (li.GetHostID().Equals(id))
                     continue;
 
-                SceneObjectPart sPart = m_scene.GetSceneObjectPart(li.GetHostID());
+                SceneObjectPart sPart = m_scene.GetSceneObjectPart(
+                        li.GetHostID());
                 if (sPart == null)
                     continue;
 
-                if ( li.GetHostID().Equals(target))
+                if (li.GetHostID().Equals(target))
                 {
                     QueueMessage(new ListenerInfo(li, name, id, msg));
                     break;
@@ -427,9 +486,15 @@ namespace OpenSim.Region.CoreModules.Scripting.WorldComm
         private void DeliverClientMessage(Object sender, OSChatMessage e)
         {
             if (null != e.Sender)
-                DeliverMessage(e.Type, e.Channel, e.Sender.Name, e.Sender.AgentId, e.Message, e.Position);
+            {
+                DeliverMessage(e.Type, e.Channel, e.Sender.Name,
+                        e.Sender.AgentId, e.Message, e.Position);
+            }
             else
-                DeliverMessage(e.Type, e.Channel, e.From, UUID.Zero, e.Message, e.Position);
+            {
+                DeliverMessage(e.Type, e.Channel, e.From, UUID.Zero,
+                        e.Message, e.Position);
+            }
         }
 
         public Object[] GetSerializationData(UUID itemID)
@@ -446,7 +511,8 @@ namespace OpenSim.Region.CoreModules.Scripting.WorldComm
 
     public class ListenerManager
     {
-        private Dictionary<int, List<ListenerInfo>> m_listeners = new Dictionary<int, List<ListenerInfo>>();
+        private Dictionary<int, List<ListenerInfo>> m_listeners =
+                new Dictionary<int, List<ListenerInfo>>();
         private int m_maxlisteners;
         private int m_maxhandles;
         private int m_curlisteners;
@@ -470,15 +536,25 @@ namespace OpenSim.Region.CoreModules.Scripting.WorldComm
             m_curlisteners = 0;
         }
 
-        public int AddListener(uint localID, UUID itemID, UUID hostID, int channel, string name, UUID id, string msg)
+        public int AddListener(uint localID, UUID itemID, UUID hostID,
+                int channel, string name, UUID id, string msg)
+        {
+            return AddListener(localID, itemID, hostID, channel, name, id,
+                    msg, 0);
+        }
+
+        public int AddListener(uint localID, UUID itemID, UUID hostID,
+                int channel, string name, UUID id, string msg,
+                int regexBitfield)
         {
             // do we already have a match on this particular filter event?
-            List<ListenerInfo> coll = GetListeners(itemID, channel, name, id, msg);
+            List<ListenerInfo> coll = GetListeners(itemID, channel, name, id,
+                    msg);
 
             if (coll.Count > 0)
             {
-                // special case, called with same filter settings, return same handle
-                // (2008-05-02, tested on 1.21.1 server, still holds)
+                // special case, called with same filter settings, return same
+                // handle (2008-05-02, tested on 1.21.1 server, still holds)
                 return coll[0].GetHandle();
             }
 
@@ -490,16 +566,19 @@ namespace OpenSim.Region.CoreModules.Scripting.WorldComm
 
                     if (newHandle > 0)
                     {
-                        ListenerInfo li = new ListenerInfo(newHandle, localID, itemID, hostID, channel, name, id, msg);
+                        ListenerInfo li = new ListenerInfo(newHandle, localID,
+                                itemID, hostID, channel, name, id, msg,
+                                regexBitfield);
 
-                            List<ListenerInfo> listeners;
-                            if (!m_listeners.TryGetValue(channel,out listeners))
-                            {
-                                listeners = new List<ListenerInfo>();
-                                m_listeners.Add(channel, listeners);
-                            }
-                            listeners.Add(li);
-                            m_curlisteners++;
+                        List<ListenerInfo> listeners;
+                        if (!m_listeners.TryGetValue(
+                                channel, out listeners))
+                        {
+                            listeners = new List<ListenerInfo>();
+                            m_listeners.Add(channel, listeners);
+                        }
+                        listeners.Add(li);
+                        m_curlisteners++;
 
                         return newHandle;
                     }
@@ -512,11 +591,13 @@ namespace OpenSim.Region.CoreModules.Scripting.WorldComm
         {
             lock (m_listeners)
             {
-                foreach (KeyValuePair<int,List<ListenerInfo>> lis in m_listeners)
+                foreach (KeyValuePair<int, List<ListenerInfo>> lis
+                        in m_listeners)
                 {
                     foreach (ListenerInfo li in lis.Value)
                     {
-                        if (li.GetItemID().Equals(itemID) && li.GetHandle().Equals(handle))
+                        if (li.GetItemID().Equals(itemID) &&
+                                li.GetHandle().Equals(handle))
                         {
                             lis.Value.Remove(li);
                             if (lis.Value.Count == 0)
@@ -539,13 +620,15 @@ namespace OpenSim.Region.CoreModules.Scripting.WorldComm
 
             lock (m_listeners)
             {
-                foreach (KeyValuePair<int,List<ListenerInfo>> lis in m_listeners)
+                foreach (KeyValuePair<int, List<ListenerInfo>> lis
+                        in m_listeners)
                 {
                     foreach (ListenerInfo li in lis.Value)
                     {
                         if (li.GetItemID().Equals(itemID))
                         {
-                            // store them first, else the enumerated bails on us
+                            // store them first, else the enumerated bails on
+                            // us
                             removedListeners.Add(li);
                         }
                     }
@@ -572,11 +655,13 @@ namespace OpenSim.Region.CoreModules.Scripting.WorldComm
         {
             lock (m_listeners)
             {
-                foreach (KeyValuePair<int,List<ListenerInfo>> lis in m_listeners)
+                foreach (KeyValuePair<int, List<ListenerInfo>> lis
+                        in m_listeners)
                 {
                     foreach (ListenerInfo li in lis.Value)
                     {
-                        if (li.GetItemID().Equals(itemID) && li.GetHandle() == handle)
+                        if (li.GetItemID().Equals(itemID) &&
+                                li.GetHandle() == handle)
                         {
                             li.Activate();
                             // only one, bail out
@@ -591,11 +676,13 @@ namespace OpenSim.Region.CoreModules.Scripting.WorldComm
         {
             lock (m_listeners)
             {
-                foreach (KeyValuePair<int,List<ListenerInfo>> lis in m_listeners)
+                foreach (KeyValuePair<int, List<ListenerInfo>> lis
+                        in m_listeners)
                 {
                     foreach (ListenerInfo li in lis.Value)
                     {
-                        if (li.GetItemID().Equals(itemID) && li.GetHandle() == handle)
+                        if (li.GetItemID().Equals(itemID) &&
+                                li.GetHandle() == handle)
                         {
                             li.Deactivate();
                             // only one, bail out
@@ -606,19 +693,24 @@ namespace OpenSim.Region.CoreModules.Scripting.WorldComm
             }
         }
 
-        // non-locked access, since its always called in the context of the lock
+        /// <summary>
+        /// non-locked access, since its always called in the context of the
+        /// lock
+        /// </summary>
+        /// <param name="itemID"></param>
+        /// <returns></returns>
         private int GetNewHandle(UUID itemID)
         {
             List<int> handles = new List<int>();
 
             // build a list of used keys for this specific itemID...
-            foreach (KeyValuePair<int,List<ListenerInfo>> lis in m_listeners)
+            foreach (KeyValuePair<int, List<ListenerInfo>> lis in m_listeners)
             {
-                 foreach (ListenerInfo li in lis.Value)
-                 {
-                     if (li.GetItemID().Equals(itemID))
-                         handles.Add(li.GetHandle());
-                 }
+                foreach (ListenerInfo li in lis.Value)
+                {
+                    if (li.GetItemID().Equals(itemID))
+                        handles.Add(li.GetHandle());
+                }
             }
 
             // Note: 0 is NOT a valid handle for llListen() to return
@@ -631,17 +723,46 @@ namespace OpenSim.Region.CoreModules.Scripting.WorldComm
             return -1;
         }
 
-        // Theres probably a more clever and efficient way to
-        // do this, maybe with regex.
-        // PM2008: Ha, one could even be smart and define a specialized Enumerator.
-        public List<ListenerInfo> GetListeners(UUID itemID, int channel, string name, UUID id, string msg)
+        /// These are duplicated from ScriptBaseClass
+        /// http://opensimulator.org/mantis/view.php?id=6106#c21945
+        #region Constants for the bitfield parameter of osListenRegex
+
+        /// <summary>
+        /// process name parameter as regex
+        /// </summary>
+        public const int OS_LISTEN_REGEX_NAME = 0x1;
+
+        /// <summary>
+        /// process message parameter as regex
+        /// </summary>
+        public const int OS_LISTEN_REGEX_MESSAGE = 0x2;
+
+        #endregion
+
+        /// <summary>
+        /// Get listeners matching the input parameters.
+        /// </summary>
+        /// <remarks>
+        /// Theres probably a more clever and efficient way to do this, maybe
+        /// with regex.
+        /// PM2008: Ha, one could even be smart and define a specialized
+        /// Enumerator.
+        /// </remarks>
+        /// <param name="itemID"></param>
+        /// <param name="channel"></param>
+        /// <param name="name"></param>
+        /// <param name="id"></param>
+        /// <param name="msg"></param>
+        /// <returns></returns>
+        public List<ListenerInfo> GetListeners(UUID itemID, int channel,
+                string name, UUID id, string msg)
         {
             List<ListenerInfo> collection = new List<ListenerInfo>();
 
             lock (m_listeners)
             {
                 List<ListenerInfo> listeners;
-                if (!m_listeners.TryGetValue(channel,out listeners))
+                if (!m_listeners.TryGetValue(channel, out listeners))
                 {
                     return collection;
                 }
@@ -652,11 +773,15 @@ namespace OpenSim.Region.CoreModules.Scripting.WorldComm
                     {
                         continue;
                     }
-                    if (!itemID.Equals(UUID.Zero) && !li.GetItemID().Equals(itemID))
+                    if (!itemID.Equals(UUID.Zero) &&
+                            !li.GetItemID().Equals(itemID))
                     {
                         continue;
                     }
-                    if (li.GetName().Length > 0 && !li.GetName().Equals(name))
+                    if (li.GetName().Length > 0 && (
+                        ((li.RegexBitfield & OS_LISTEN_REGEX_NAME) != OS_LISTEN_REGEX_NAME && !li.GetName().Equals(name)) ||
+                        ((li.RegexBitfield & OS_LISTEN_REGEX_NAME) == OS_LISTEN_REGEX_NAME && !Regex.IsMatch(name, li.GetName()))
+                    ))
                     {
                         continue;
                     }
@@ -664,7 +789,10 @@ namespace OpenSim.Region.CoreModules.Scripting.WorldComm
                     {
                         continue;
                     }
-                    if (li.GetMessage().Length > 0 && !li.GetMessage().Equals(msg))
+                    if (li.GetMessage().Length > 0 && (
+                        ((li.RegexBitfield & OS_LISTEN_REGEX_MESSAGE) != OS_LISTEN_REGEX_MESSAGE && !li.GetMessage().Equals(msg)) ||
+                        ((li.RegexBitfield & OS_LISTEN_REGEX_MESSAGE) == OS_LISTEN_REGEX_MESSAGE && !Regex.IsMatch(msg, li.GetMessage()))
+                    ))
                     {
                         continue;
                     }
@@ -697,10 +825,13 @@ namespace OpenSim.Region.CoreModules.Scripting.WorldComm
         {
             int idx = 0;
             Object[] item = new Object[6];
+            int dataItemLength = 6;
 
             while (idx < data.Length)
             {
-                Array.Copy(data, idx, item, 0, 6);
+                dataItemLength = (idx + 7 == data.Length || (idx + 7 < data.Length && data[idx + 7] is bool)) ? 7 : 6;
+                item = new Object[dataItemLength];
+                Array.Copy(data, idx, item, 0, dataItemLength);
 
                 ListenerInfo info =
                         ListenerInfo.FromData(localID, itemID, hostID, item);
@@ -708,39 +839,98 @@ namespace OpenSim.Region.CoreModules.Scripting.WorldComm
                 lock (m_listeners)
                 {
                     if (!m_listeners.ContainsKey((int)item[2]))
-                        m_listeners.Add((int)item[2], new List<ListenerInfo>());
+                    {
+                        m_listeners.Add((int)item[2],
+                                new List<ListenerInfo>());
+                    }
                     m_listeners[(int)item[2]].Add(info);
                 }
 
-                idx+=6;
+                idx += dataItemLength;
             }
         }
     }
 
-    public class ListenerInfo: IWorldCommListenerInfo
+    public class ListenerInfo : IWorldCommListenerInfo
     {
-        private bool m_active; // Listener is active or not
-        private int m_handle; // Assigned handle of this listener
-        private uint m_localID; // Local ID from script engine
-        private UUID m_itemID; // ID of the host script engine
-        private UUID m_hostID; // ID of the host/scene part
-        private int m_channel; // Channel
-        private UUID m_id; // ID to filter messages from
-        private string m_name; // Object name to filter messages from
-        private string m_message; // The message
+        /// <summary>
+        /// Listener is active or not
+        /// </summary>
+        private bool m_active;
+
+        /// <summary>
+        /// Assigned handle of this listener
+        /// </summary>
+        private int m_handle;
+
+        /// <summary>
+        /// Local ID from script engine
+        /// </summary>
+        private uint m_localID;
+
+        /// <summary>
+        /// ID of the host script engine
+        /// </summary>
+        private UUID m_itemID;
+
+        /// <summary>
+        /// ID of the host/scene part
+        /// </summary>
+        private UUID m_hostID;
+
+        /// <summary>
+        /// Channel
+        /// </summary>
+        private int m_channel;
+
+        /// <summary>
+        /// ID to filter messages from
+        /// </summary>
+        private UUID m_id;
+
+        /// <summary>
+        /// Object name to filter messages from
+        /// </summary>
+        private string m_name;
+
+        /// <summary>
+        /// The message
+        /// </summary>
+        private string m_message;
+
+        public ListenerInfo(int handle, uint localID, UUID ItemID,
+                UUID hostID, int channel, string name, UUID id,
+                string message)
+        {
+            Initialise(handle, localID, ItemID, hostID, channel, name, id,
+                    message, 0);
+        }
 
-        public ListenerInfo(int handle, uint localID, UUID ItemID, UUID hostID, int channel, string name, UUID id, string message)
+        public ListenerInfo(int handle, uint localID, UUID ItemID,
+                UUID hostID, int channel, string name, UUID id,
+                string message, int regexBitfield)
         {
-            Initialise(handle, localID, ItemID, hostID, channel, name, id, message);
+            Initialise(handle, localID, ItemID, hostID, channel, name, id,
+                    message, regexBitfield);
         }
 
-        public ListenerInfo(ListenerInfo li, string name, UUID id, string message)
+        public ListenerInfo(ListenerInfo li, string name, UUID id,
+                string message)
         {
-            Initialise(li.m_handle, li.m_localID, li.m_itemID, li.m_hostID, li.m_channel, name, id, message);
+            Initialise(li.m_handle, li.m_localID, li.m_itemID, li.m_hostID,
+                    li.m_channel, name, id, message, 0);
         }
 
-        private void Initialise(int handle, uint localID, UUID ItemID, UUID hostID, int channel, string name,
-                                UUID id, string message)
+        public ListenerInfo(ListenerInfo li, string name, UUID id,
+                string message, int regexBitfield)
+        {
+            Initialise(li.m_handle, li.m_localID, li.m_itemID, li.m_hostID,
+                    li.m_channel, name, id, message, regexBitfield);
+        }
+
+        private void Initialise(int handle, uint localID, UUID ItemID,
+                UUID hostID, int channel, string name, UUID id,
+                string message, int regexBitfield)
         {
             m_active = true;
             m_handle = handle;
@@ -751,11 +941,12 @@ namespace OpenSim.Region.CoreModules.Scripting.WorldComm
             m_name = name;
             m_id = id;
             m_message = message;
+            RegexBitfield = regexBitfield;
         }
 
         public Object[] GetSerializationData()
         {
-            Object[] data = new Object[6];
+            Object[] data = new Object[7];
 
             data[0] = m_active;
             data[1] = m_handle;
@@ -763,16 +954,22 @@ namespace OpenSim.Region.CoreModules.Scripting.WorldComm
             data[3] = m_name;
             data[4] = m_id;
             data[5] = m_message;
+            data[6] = RegexBitfield;
 
             return data;
         }
 
-        public static ListenerInfo FromData(uint localID, UUID ItemID, UUID hostID, Object[] data)
+        public static ListenerInfo FromData(uint localID, UUID ItemID,
+                UUID hostID, Object[] data)
         {
             ListenerInfo linfo = new ListenerInfo((int)data[1], localID,
                     ItemID, hostID, (int)data[2], (string)data[3],
                     (UUID)data[4], (string)data[5]);
-            linfo.m_active=(bool)data[0];
+            linfo.m_active = (bool)data[0];
+            if (data.Length >= 7)
+            {
+                linfo.RegexBitfield = (int)data[6];
+            }
 
             return linfo;
         }
@@ -831,5 +1028,7 @@ namespace OpenSim.Region.CoreModules.Scripting.WorldComm
         {
             return m_id;
         }
+
+        public int RegexBitfield { get; private set; }
     }
 }
diff --git a/OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs b/OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs
index 0003af2..385f5ad 100644
--- a/OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs
@@ -40,6 +40,7 @@ using OpenSim.Framework.Servers;
 using OpenSim.Framework.Servers.HttpServer;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
+using Mono.Addins;
 
 /*****************************************************
  *
@@ -76,7 +77,8 @@ using OpenSim.Region.Framework.Scenes;
 
 namespace OpenSim.Region.CoreModules.Scripting.XMLRPC
 {
-    public class XMLRPCModule : IRegionModule, IXMLRPC
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "XMLRPCModule")]
+    public class XMLRPCModule : ISharedRegionModule, IXMLRPC
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
@@ -86,6 +88,10 @@ namespace OpenSim.Region.CoreModules.Scripting.XMLRPC
         private Dictionary<UUID, RPCChannelInfo> m_openChannels;
         private Dictionary<UUID, SendRemoteDataRequest> m_pendingSRDResponses;
         private int m_remoteDataPort = 0;
+        public int Port
+        {
+            get { return m_remoteDataPort; }
+        }
 
         private Dictionary<UUID, RPCRequestInfo> m_rpcPending;
         private Dictionary<UUID, RPCRequestInfo> m_rpcPendingResponses;
@@ -94,34 +100,24 @@ namespace OpenSim.Region.CoreModules.Scripting.XMLRPC
         private int RemoteReplyScriptWait = 300;
         private object XMLRPCListLock = new object();
 
-        #region IRegionModule Members
+        #region ISharedRegionModule Members
 
-        public void Initialise(Scene scene, IConfigSource config)
+        public void Initialise(IConfigSource config)
         {
             // We need to create these early because the scripts might be calling
             // But since this gets called for every region, we need to make sure they
             // get called only one time (or we lose any open channels)
-            if (null == m_openChannels)
-            {
-                m_openChannels = new Dictionary<UUID, RPCChannelInfo>();
-                m_rpcPending = new Dictionary<UUID, RPCRequestInfo>();
-                m_rpcPendingResponses = new Dictionary<UUID, RPCRequestInfo>();
-                m_pendingSRDResponses = new Dictionary<UUID, SendRemoteDataRequest>();
+            m_openChannels = new Dictionary<UUID, RPCChannelInfo>();
+            m_rpcPending = new Dictionary<UUID, RPCRequestInfo>();
+            m_rpcPendingResponses = new Dictionary<UUID, RPCRequestInfo>();
+            m_pendingSRDResponses = new Dictionary<UUID, SendRemoteDataRequest>();
 
-                try
-                {
-                    m_remoteDataPort = config.Configs["XMLRPC"].GetInt("XmlRpcPort", m_remoteDataPort);
-                }
-                catch (Exception)
-                {
-                }
+            try
+            {
+                m_remoteDataPort = config.Configs["XMLRPC"].GetInt("XmlRpcPort", m_remoteDataPort);
             }
-
-            if (!m_scenes.Contains(scene))
+            catch (Exception)
             {
-                m_scenes.Add(scene);
-
-                scene.RegisterModuleInterface<IXMLRPC>(this);
             }
         }
 
@@ -131,32 +127,56 @@ namespace OpenSim.Region.CoreModules.Scripting.XMLRPC
             {
                 // Start http server
                 // Attach xmlrpc handlers
-//                m_log.InfoFormat(
-//                    "[XML RPC MODULE]: Starting up XMLRPC Server on port {0} for llRemoteData commands.",
-//                    m_remoteDataPort);
+                //                m_log.InfoFormat(
+                //                    "[XML RPC MODULE]: Starting up XMLRPC Server on port {0} for llRemoteData commands.",
+                //                    m_remoteDataPort);
 
                 IHttpServer httpServer = MainServer.GetHttpServer((uint)m_remoteDataPort);
                 httpServer.AddXmlRPCHandler("llRemoteData", XmlRpcRemoteData);
             }
         }
 
-        public void Close()
+        public void AddRegion(Scene scene)
+        {
+            if (!IsEnabled())
+                return;
+
+            if (!m_scenes.Contains(scene))
+            {
+                m_scenes.Add(scene);
+
+                scene.RegisterModuleInterface<IXMLRPC>(this);
+            }
+        }
+
+        public void RegionLoaded(Scene scene)
         {
         }
 
-        public string Name
+        public void RemoveRegion(Scene scene)
         {
-            get { return m_name; }
+            if (!IsEnabled())
+                return;
+
+            if (m_scenes.Contains(scene))
+            {
+                scene.UnregisterModuleInterface<IXMLRPC>(this);
+                m_scenes.Remove(scene);
+            }
         }
 
-        public bool IsSharedModule
+        public void Close()
         {
-            get { return true; }
         }
 
-        public int Port
+        public string Name
         {
-            get { return m_remoteDataPort; }
+            get { return m_name; }
+        }
+
+        public Type ReplaceableInterface
+        {
+            get { return null; }
         }
 
         #endregion
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Asset/AssetServiceInConnectorModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Asset/AssetServiceInConnectorModule.cs
index 5541684..7b4668a 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Asset/AssetServiceInConnectorModule.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Asset/AssetServiceInConnectorModule.cs
@@ -29,6 +29,7 @@ using System;
 using System.Reflection;
 using System.Collections.Generic;
 using log4net;
+using Mono.Addins;
 using Nini.Config;
 using OpenSim.Framework;
 using OpenSim.Framework.Servers;
@@ -39,6 +40,7 @@ using OpenSim.Server.Handlers.Base;
 
 namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Asset
 {
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "AssetServiceInConnectorModule")]
     public class AssetServiceInConnectorModule : ISharedRegionModule
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@@ -47,7 +49,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Asset
         private IConfigSource m_Config;
         bool m_Registered = false;
 
-        #region IRegionModule interface
+        #region Region Module interface
 
         public void Initialise(IConfigSource config)
         {
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Authentication/AuthenticationServiceInConnectorModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Authentication/AuthenticationServiceInConnectorModule.cs
index ccf2275..2cdffe6 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Authentication/AuthenticationServiceInConnectorModule.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Authentication/AuthenticationServiceInConnectorModule.cs
@@ -29,6 +29,7 @@ using System;
 using System.Reflection;
 using System.Collections.Generic;
 using log4net;
+using Mono.Addins;
 using Nini.Config;
 using OpenSim.Framework;
 using OpenSim.Framework.Servers;
@@ -41,6 +42,7 @@ using OpenSim.Services.Interfaces;
 
 namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Authentication
 {
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "AuthenticationServiceInConnectorModule")]
     public class AuthenticationServiceInConnectorModule : ISharedRegionModule
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@@ -49,7 +51,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Authentication
         private IConfigSource m_Config;
         bool m_Registered = false;
 
-        #region IRegionModule interface
+        #region Region Module interface
 
         public void Initialise(IConfigSource config)
         {
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Grid/GridInfoServiceInConnectorModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Grid/GridInfoServiceInConnectorModule.cs
index 0e16e5a..22857d0 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Grid/GridInfoServiceInConnectorModule.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Grid/GridInfoServiceInConnectorModule.cs
@@ -29,6 +29,7 @@ using System;
 using System.Reflection;
 using System.Collections.Generic;
 using log4net;
+using Mono.Addins;
 using Nini.Config;
 using OpenSim.Framework;
 using OpenSim.Framework.Servers;
@@ -41,6 +42,7 @@ using OpenSim.Services.Interfaces;
 
 namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Grid
 {
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "GridInfoServiceInConnectorModule")]
     public class GridInfoServiceInConnectorModule : ISharedRegionModule
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@@ -49,7 +51,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Grid
         private IConfigSource m_Config;
         bool m_Registered = false;
 
-        #region IRegionModule interface
+        #region Region Module interface
 
         public void Initialise(IConfigSource config)
         {
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Hypergrid/HypergridServiceInConnectorModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Hypergrid/HypergridServiceInConnectorModule.cs
index a7dd0dd..f749295 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Hypergrid/HypergridServiceInConnectorModule.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Hypergrid/HypergridServiceInConnectorModule.cs
@@ -29,6 +29,7 @@ using System;
 using System.Reflection;
 using System.Collections.Generic;
 using log4net;
+using Mono.Addins;
 using Nini.Config;
 using OpenSim.Framework;
 using OpenSim.Framework.Servers;
@@ -42,6 +43,7 @@ using GridRegion = OpenSim.Services.Interfaces.GridRegion;
 
 namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Hypergrid
 {
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "HypergridServiceInConnectorModule")]
     public class HypergridServiceInConnectorModule : ISharedRegionModule
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@@ -53,7 +55,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Hypergrid
         private GatekeeperServiceInConnector m_HypergridHandler;
         private UserAgentServerConnector m_UASHandler;
 
-        #region IRegionModule interface
+        #region Region Module interface
 
         public void Initialise(IConfigSource config)
         {
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Inventory/InventoryServiceInConnectorModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Inventory/InventoryServiceInConnectorModule.cs
index 831ea27..0a4e736 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Inventory/InventoryServiceInConnectorModule.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Inventory/InventoryServiceInConnectorModule.cs
@@ -29,6 +29,7 @@ using System;
 using System.Reflection;
 using System.Collections.Generic;
 using log4net;
+using Mono.Addins;
 using Nini.Config;
 using OpenSim.Framework;
 using OpenSim.Framework.Servers;
@@ -39,6 +40,7 @@ using OpenSim.Server.Handlers.Base;
 
 namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Inventory
 {
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "InventoryServiceInConnectorModule")]
     public class InventoryServiceInConnectorModule : ISharedRegionModule
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@@ -47,7 +49,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Inventory
         private IConfigSource m_Config;
         bool m_Registered = false;
 
-        #region IRegionModule interface
+        #region Region Module interface
 
         public void Initialise(IConfigSource config)
         {
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Land/LandServiceInConnectorModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Land/LandServiceInConnectorModule.cs
index 2f3c350..2fd21be 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Land/LandServiceInConnectorModule.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Land/LandServiceInConnectorModule.cs
@@ -29,6 +29,7 @@ using System;
 using System.Reflection;
 using System.Collections.Generic;
 using log4net;
+using Mono.Addins;
 using Nini.Config;
 using OpenSim.Framework;
 using OpenSim.Framework.Servers;
@@ -42,6 +43,7 @@ using OpenMetaverse;
 
 namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Land
 {
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "LandServiceInConnectorModule")]
     public class LandServiceInConnectorModule : ISharedRegionModule, ILandService
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@@ -51,7 +53,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Land
         private IConfigSource m_Config;
         private List<Scene> m_Scenes = new List<Scene>();
 
-        #region IRegionModule interface
+        #region Region Module interface
 
         public void Initialise(IConfigSource config)
         {
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Login/LLLoginServiceInConnectorModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Login/LLLoginServiceInConnectorModule.cs
index ecdb380..425febd 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Login/LLLoginServiceInConnectorModule.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Login/LLLoginServiceInConnectorModule.cs
@@ -29,6 +29,7 @@ using System;
 using System.Reflection;
 using System.Collections.Generic;
 using log4net;
+using Mono.Addins;
 using Nini.Config;
 using OpenSim.Framework;
 using OpenSim.Framework.Servers;
@@ -42,6 +43,7 @@ using OpenSim.Services.Interfaces;
 
 namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Login
 {
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "LLLoginServiceInConnectorModule")]
     public class LLLoginServiceInConnectorModule : ISharedRegionModule
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@@ -51,7 +53,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Login
         private IConfigSource m_Config;
         private List<Scene> m_Scenes = new List<Scene>();
 
-        #region IRegionModule interface
+        #region Region Module interface
 
         public void Initialise(IConfigSource config)
         {
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/MapImage/MapImageServiceInConnectorModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/MapImage/MapImageServiceInConnectorModule.cs
index d38af23..c14bce7 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/MapImage/MapImageServiceInConnectorModule.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/MapImage/MapImageServiceInConnectorModule.cs
@@ -42,7 +42,7 @@ using OpenSim.Services.Interfaces;
 
 namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.MapImage
 {
-    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "MapImageServiceInConnectorModule")]
     public class MapImageServiceInConnectorModule : ISharedRegionModule
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@@ -50,7 +50,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.MapImage
         
         private IConfigSource m_Config;
 
-        #region IRegionModule interface
+        #region Region Module interface
 
         public void Initialise(IConfigSource config)
         {
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Neighbour/NeighbourServiceInConnectorModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Neighbour/NeighbourServiceInConnectorModule.cs
index b544ab3..6bf47cb 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Neighbour/NeighbourServiceInConnectorModule.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Neighbour/NeighbourServiceInConnectorModule.cs
@@ -29,6 +29,7 @@ using System;
 using System.Reflection;
 using System.Collections.Generic;
 using log4net;
+using Mono.Addins;
 using Nini.Config;
 using OpenSim.Framework;
 using OpenSim.Framework.Servers;
@@ -41,6 +42,7 @@ using OpenSim.Services.Interfaces;
 
 namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Neighbour
 {
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "NeighbourServiceInConnectorModule")]
     public class NeighbourServiceInConnectorModule : ISharedRegionModule, INeighbourService
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@@ -50,7 +52,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Neighbour
         private IConfigSource m_Config;
         private List<Scene> m_Scenes = new List<Scene>();
 
-        #region IRegionModule interface
+        #region Region Module interface
 
         public void Initialise(IConfigSource config)
         {
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Simulation/SimulationServiceInConnectorModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Simulation/SimulationServiceInConnectorModule.cs
index 0a5275d..57d1132 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Simulation/SimulationServiceInConnectorModule.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Simulation/SimulationServiceInConnectorModule.cs
@@ -29,6 +29,7 @@ using System;
 using System.Reflection;
 using System.Collections.Generic;
 using log4net;
+using Mono.Addins;
 using Nini.Config;
 using OpenSim.Framework;
 using OpenSim.Framework.Servers;
@@ -40,7 +41,7 @@ using OpenSim.Server.Handlers.Base;
 
 namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Simulation
 {
-    // Under construction
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "SimulationServiceInConnectorModule")]
     public class SimulationServiceInConnectorModule : ISharedRegionModule
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@@ -49,7 +50,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Simulation
         private IConfigSource m_Config;
         bool m_Registered = false;
 
-        #region IRegionModule interface
+        #region Region Module interface
 
         public void Initialise(IConfigSource config)
         {
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs
index 008465f..d221d68 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs
@@ -26,6 +26,7 @@
  */
 
 using log4net;
+using Mono.Addins;
 using Nini.Config;
 using System;
 using System.Collections.Generic;
@@ -40,8 +41,8 @@ using OpenMetaverse;
 
 namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
 {
-    public class HGAssetBroker :
-            ISharedRegionModule, IAssetService
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "HGAssetBroker")]
+    public class HGAssetBroker : ISharedRegionModule, IAssetService
     {
         private static readonly ILog m_log =
                 LogManager.GetLogger(
@@ -56,6 +57,8 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
 
         private bool m_Enabled = false;
 
+        private AssetPermissions m_AssetPerms;
+
         public Type ReplaceableInterface 
         {
             get { return null; }
@@ -128,6 +131,9 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
                     if (m_LocalAssetServiceURI != string.Empty)
                         m_LocalAssetServiceURI = m_LocalAssetServiceURI.Trim('/');
 
+                    IConfig hgConfig = source.Configs["HGAssetService"];
+                    m_AssetPerms = new AssetPermissions(hgConfig); // it's ok if arg is null
+
                     m_Enabled = true;
                     m_log.Info("[HG ASSET CONNECTOR]: HG asset broker enabled");
                 }
@@ -206,14 +212,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
                 asset = m_HGService.Get(id);
                 if (asset != null)
                 {
-                    // Now store it locally
-                    // For now, let me just do it for textures and scripts
-                    if (((AssetType)asset.Type == AssetType.Texture) ||
-                        ((AssetType)asset.Type == AssetType.LSLBytecode) ||
-                        ((AssetType)asset.Type == AssetType.LSLText))
-                    {
+                    // Now store it locally, if allowed
+                    if (m_AssetPerms.AllowedImport(asset.Type))
                         m_GridService.Store(asset);
-                    }
+                    else
+                        return null;
                 }
             }
             else
@@ -328,7 +331,12 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
 
             string id = string.Empty;
             if (IsHG(asset.ID))
-                id = m_HGService.Store(asset);
+            {
+                if (m_AssetPerms.AllowedExport(asset.Type))
+                    id = m_HGService.Store(asset);
+                else
+                    return String.Empty;
+            }
             else
                 id = m_GridService.Store(asset);
 
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/LocalAssetServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/LocalAssetServiceConnector.cs
index c78915f..480cd69 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/LocalAssetServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/LocalAssetServiceConnector.cs
@@ -26,6 +26,7 @@
  */
 
 using log4net;
+using Mono.Addins;
 using Nini.Config;
 using System;
 using System.Collections.Generic;
@@ -38,6 +39,7 @@ using OpenSim.Services.Interfaces;
 
 namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
 {
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "LocalAssetServicesConnector")]
     public class LocalAssetServicesConnector : ISharedRegionModule, IAssetService
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@@ -204,8 +206,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
         public byte[] GetData(string id)
         {
 //            m_log.DebugFormat("[LOCAL ASSET SERVICES CONNECTOR]: Requesting data for asset {0}", id);
-            
-            AssetBase asset = m_Cache.Get(id);
+
+            AssetBase asset = null;
+
+            if (m_Cache != null)
+                asset = m_Cache.Get(id);
 
             if (asset != null)
                 return asset.Data;
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/RemoteAssetServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/RemoteAssetServiceConnector.cs
index 8a22cfc..e6eeacf 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/RemoteAssetServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/RemoteAssetServiceConnector.cs
@@ -26,6 +26,7 @@
  */
 
 using log4net;
+using Mono.Addins;
 using System;
 using System.Collections.Generic;
 using System.Reflection;
@@ -38,6 +39,7 @@ using OpenSim.Services.Interfaces;
 
 namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
 {
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "RemoteAssetServicesConnector")]
     public class RemoteAssetServicesConnector :
             AssetServicesConnector, ISharedRegionModule, IAssetService
     {
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/Tests/AssetConnectorTests.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/Tests/AssetConnectorTests.cs
new file mode 100644
index 0000000..1982473
--- /dev/null
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/Tests/AssetConnectorTests.cs
@@ -0,0 +1,136 @@
+/*
+ * 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 OpenSimulator 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.Threading;
+using log4net.Config;
+using Nini.Config;
+using NUnit.Framework;
+using OpenMetaverse;
+using OpenSim.Framework;
+using OpenSim.Region.Framework.Scenes;
+using OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset;
+using OpenSim.Tests.Common;
+
+namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset.Tests
+{
+    [TestFixture]
+    public class AssetConnectorsTests : OpenSimTestCase
+    {
+        [Test]
+        public void TestAddAsset()
+        {
+            TestHelpers.InMethod();
+//            TestHelpers.EnableLogging();
+
+            IConfigSource config = new IniConfigSource();
+            config.AddConfig("Modules");
+            config.Configs["Modules"].Set("AssetServices", "LocalAssetServicesConnector");
+            config.AddConfig("AssetService");
+            config.Configs["AssetService"].Set("LocalServiceModule", "OpenSim.Services.AssetService.dll:AssetService");
+            config.Configs["AssetService"].Set("StorageProvider", "OpenSim.Tests.Common.dll");
+
+            LocalAssetServicesConnector lasc = new LocalAssetServicesConnector();
+            lasc.Initialise(config);
+
+            AssetBase a1 = AssetHelpers.CreateNotecardAsset();
+            lasc.Store(a1);
+
+            AssetBase retreivedA1 = lasc.Get(a1.ID);
+            Assert.That(retreivedA1.ID, Is.EqualTo(a1.ID));
+            Assert.That(retreivedA1.Metadata.ID, Is.EqualTo(a1.Metadata.ID));
+            Assert.That(retreivedA1.Data.Length, Is.EqualTo(a1.Data.Length));
+
+            AssetMetadata retrievedA1Metadata = lasc.GetMetadata(a1.ID);
+            Assert.That(retrievedA1Metadata.ID, Is.EqualTo(a1.ID));
+
+            byte[] retrievedA1Data = lasc.GetData(a1.ID);
+            Assert.That(retrievedA1Data.Length, Is.EqualTo(a1.Data.Length));
+
+            // TODO: Add cache and check that this does receive a copy of the asset
+        }
+
+        [Test]
+        public void TestAddTemporaryAsset()
+        {
+            TestHelpers.InMethod();
+//            TestHelpers.EnableLogging();
+
+            IConfigSource config = new IniConfigSource();
+            config.AddConfig("Modules");
+            config.Configs["Modules"].Set("AssetServices", "LocalAssetServicesConnector");
+            config.AddConfig("AssetService");
+            config.Configs["AssetService"].Set("LocalServiceModule", "OpenSim.Services.AssetService.dll:AssetService");
+            config.Configs["AssetService"].Set("StorageProvider", "OpenSim.Tests.Common.dll");
+
+            LocalAssetServicesConnector lasc = new LocalAssetServicesConnector();
+            lasc.Initialise(config);
+
+            AssetBase a1 = AssetHelpers.CreateNotecardAsset();
+            a1.Temporary = true;
+
+            lasc.Store(a1);
+
+            Assert.That(lasc.Get(a1.ID), Is.Null);
+            Assert.That(lasc.GetData(a1.ID), Is.Null);
+            Assert.That(lasc.GetMetadata(a1.ID), Is.Null);
+
+            // TODO: Add cache and check that this does receive a copy of the asset
+        }
+
+        [Test]
+        public void TestAddLocalAsset()
+        {
+            TestHelpers.InMethod();
+//            TestHelpers.EnableLogging();
+
+            IConfigSource config = new IniConfigSource();
+            config.AddConfig("Modules");
+            config.Configs["Modules"].Set("AssetServices", "LocalAssetServicesConnector");
+            config.AddConfig("AssetService");
+            config.Configs["AssetService"].Set("LocalServiceModule", "OpenSim.Services.AssetService.dll:AssetService");
+            config.Configs["AssetService"].Set("StorageProvider", "OpenSim.Tests.Common.dll");
+
+            LocalAssetServicesConnector lasc = new LocalAssetServicesConnector();
+            lasc.Initialise(config);
+
+            AssetBase a1 = AssetHelpers.CreateNotecardAsset();
+            a1.Local = true;
+
+            lasc.Store(a1);
+
+            Assert.That(lasc.Get(a1.ID), Is.Null);
+            Assert.That(lasc.GetData(a1.ID), Is.Null);
+            Assert.That(lasc.GetMetadata(a1.ID), Is.Null);
+
+            // TODO: Add cache and check that this does receive a copy of the asset
+        }
+    }
+}
\ No newline at end of file
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authentication/LocalAuthenticationServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authentication/LocalAuthenticationServiceConnector.cs
index d809ac2..f027810 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authentication/LocalAuthenticationServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authentication/LocalAuthenticationServiceConnector.cs
@@ -29,6 +29,7 @@ using System;
 using System.Collections.Generic;
 using System.Reflection;
 using log4net;
+using Mono.Addins;
 using Nini.Config;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
@@ -39,6 +40,7 @@ using OpenMetaverse;
 
 namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Authentication
 {
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "LocalAuthenticationServicesConnector")]
     public class LocalAuthenticationServicesConnector : ISharedRegionModule, IAuthenticationService
     {
         private static readonly ILog m_log =
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authentication/RemoteAuthenticationServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authentication/RemoteAuthenticationServiceConnector.cs
index a053bc2..7cb8b22 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authentication/RemoteAuthenticationServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authentication/RemoteAuthenticationServiceConnector.cs
@@ -28,6 +28,7 @@
 using System;
 using Nini.Config;
 using log4net;
+using Mono.Addins;
 using System.Reflection;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
@@ -36,6 +37,7 @@ using OpenSim.Services.Connectors;
 
 namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Authentication
 {
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "RemoteAuthenticationServicesConnector")]
     public class RemoteAuthenticationServicesConnector : AuthenticationServicesConnector,
             ISharedRegionModule, IAuthenticationService
     {
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/LocalAuthorizationServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/LocalAuthorizationServiceConnector.cs
index 267fb9e..1acb695 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/LocalAuthorizationServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/LocalAuthorizationServiceConnector.cs
@@ -26,6 +26,7 @@
  */
 
 using log4net;
+using Mono.Addins;
 using Nini.Config;
 using System;
 using System.Collections.Generic;
@@ -39,6 +40,7 @@ using OpenMetaverse;
 
 namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Authorization
 {
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "LocalAuthorizationServicesConnector")]
     public class LocalAuthorizationServicesConnector : INonSharedRegionModule, IAuthorizationService
     {
         private static readonly ILog m_log =
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/RemoteAuthorizationServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/RemoteAuthorizationServiceConnector.cs
index 86c0099..b8d409d 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/RemoteAuthorizationServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/RemoteAuthorizationServiceConnector.cs
@@ -26,6 +26,7 @@
  */
 
 using log4net;
+using Mono.Addins;
 using System;
 using System.Collections.Generic;
 using System.Reflection;
@@ -39,6 +40,7 @@ using OpenMetaverse;
 
 namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Authorization
 {
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "RemoteAuthorizationServicesConnector")]
     public class RemoteAuthorizationServicesConnector :
             AuthorizationServicesConnector, ISharedRegionModule, IAuthorizationService
     {
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Avatar/LocalAvatarServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Avatar/LocalAvatarServiceConnector.cs
index 9ee19f8..c3ef588 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Avatar/LocalAvatarServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Avatar/LocalAvatarServiceConnector.cs
@@ -29,6 +29,7 @@ using System;
 using System.Collections.Generic;
 using System.Reflection;
 using log4net;
+using Mono.Addins;
 using Nini.Config;
 using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
@@ -40,6 +41,7 @@ using OpenMetaverse;
 
 namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Avatar
 {
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "LocalAvatarServicesConnector")]
     public class LocalAvatarServicesConnector : ISharedRegionModule, IAvatarService
     {
         private static readonly ILog m_log =
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Avatar/RemoteAvatarServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Avatar/RemoteAvatarServiceConnector.cs
index d665a54..a087aea 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Avatar/RemoteAvatarServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Avatar/RemoteAvatarServiceConnector.cs
@@ -26,6 +26,7 @@
  */
 
 using System;
+using Mono.Addins;
 using Nini.Config;
 using log4net;
 using System.Reflection;
@@ -36,6 +37,7 @@ using OpenSim.Services.Connectors;
 
 namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Avatar
 {
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "RemoteAvatarServicesConnector")]
     public class RemoteAvatarServicesConnector : AvatarServicesConnector,
             ISharedRegionModule, IAvatarService
     {
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs
index 3c6e381..c0c2ca7 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs
@@ -26,6 +26,7 @@
  */
 
 using log4net;
+using Mono.Addins;
 using Nini.Config;
 using System;
 using System.Collections.Generic;
@@ -41,6 +42,7 @@ using OpenMetaverse;
 
 namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
 {
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "LocalGridServicesConnector")]
     public class LocalGridServicesConnector : ISharedRegionModule, IGridService
     {
         private static readonly ILog m_log =
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs
index e6c89d7..b2646ba 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs
@@ -26,6 +26,7 @@
  */
 
 using log4net;
+using Mono.Addins;
 using System;
 using System.Collections.Generic;
 using System.Reflection;
@@ -42,6 +43,7 @@ using GridRegion = OpenSim.Services.Interfaces.GridRegion;
 
 namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
 {
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "RemoteGridServicesConnector")]
     public class RemoteGridServicesConnector : ISharedRegionModule, IGridService
     {
         private static readonly ILog m_log =
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/Tests/GridConnectorsTests.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/Tests/GridConnectorsTests.cs
index b286d17..4338133 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/Tests/GridConnectorsTests.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/Tests/GridConnectorsTests.cs
@@ -43,11 +43,15 @@ using OpenSim.Tests.Common;
 namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid.Tests
 {
     [TestFixture]
-    public class GridConnectorsTests
+    public class GridConnectorsTests : OpenSimTestCase
     {
         LocalGridServicesConnector m_LocalConnector;
-        private void SetUp()
+
+        [SetUp]
+        public override void SetUp()
         {
+            base.SetUp();
+
             IConfigSource config = new IniConfigSource();
             config.AddConfig("Modules");
             config.AddConfig("GridService");
@@ -71,8 +75,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid.Tests
             TestHelpers.InMethod();
 //            log4net.Config.XmlConfigurator.Configure();
 
-            SetUp();
-
             // Create 4 regions
             GridRegion r1 = new GridRegion();
             r1.RegionName = "Test Region 1";
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/GridUser/ActivityDetector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/GridUser/ActivityDetector.cs
index b0edce7..221f815 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/GridUser/ActivityDetector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/GridUser/ActivityDetector.cs
@@ -65,11 +65,13 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.GridUser
 
         public void OnMakeRootAgent(ScenePresence sp)
         {
-//            m_log.DebugFormat("[ACTIVITY DETECTOR]: Detected root presence {0} in {1}", sp.UUID, sp.Scene.RegionInfo.RegionName);
-
             if (sp.PresenceType != PresenceType.Npc)
+            {
+                string userid = sp.Scene.UserManagementModule.GetUserUUI(sp.UUID);
+                //m_log.DebugFormat("[ACTIVITY DETECTOR]: Detected root presence {0} in {1}", userid, sp.Scene.RegionInfo.RegionName);
                 m_GridUserService.SetLastPosition(
-                    sp.UUID.ToString(), UUID.Zero, sp.Scene.RegionInfo.RegionID, sp.AbsolutePosition, sp.Lookat);
+                    userid, UUID.Zero, sp.Scene.RegionInfo.RegionID, sp.AbsolutePosition, sp.Lookat);
+            }
         }
 
         public void OnNewClient(IClientAPI client)
@@ -82,9 +84,16 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.GridUser
             if (client.SceneAgent.IsChildAgent)
                 return;
 
-//            m_log.DebugFormat("[ACTIVITY DETECTOR]: Detected client logout {0} in {1}", client.AgentId, client.Scene.RegionInfo.RegionName);
+            string userId = client.AgentId.ToString();
+            if (client.Scene is Scene)
+            {
+                Scene s = (Scene)client.Scene;
+                userId = s.UserManagementModule.GetUserUUI(client.AgentId);
+            }
+            //m_log.DebugFormat("[ACTIVITY DETECTOR]: Detected client logout {0} in {1}", userId, client.Scene.RegionInfo.RegionName);
+
             m_GridUserService.LoggedOut(
-                client.AgentId.ToString(), client.SessionId, client.Scene.RegionInfo.RegionID,
+                userId, client.SessionId, client.Scene.RegionInfo.RegionID,
                 client.SceneAgent.AbsolutePosition, client.SceneAgent.Lookat);
         }
     }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/GridUser/LocalGridUserServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/GridUser/LocalGridUserServiceConnector.cs
index 90fe69e..5734334 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/GridUser/LocalGridUserServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/GridUser/LocalGridUserServiceConnector.cs
@@ -29,6 +29,7 @@ using System;
 using System.Collections.Generic;
 using System.Reflection;
 using log4net;
+using Mono.Addins;
 using Nini.Config;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
@@ -39,6 +40,7 @@ using OpenMetaverse;
 
 namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.GridUser
 {
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "LocalGridUserServicesConnector")]
     public class LocalGridUserServicesConnector : ISharedRegionModule, IGridUserService
     {
         private static readonly ILog m_log =
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/GridUser/RemoteGridUserServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/GridUser/RemoteGridUserServiceConnector.cs
index badb552..f7e6eb8 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/GridUser/RemoteGridUserServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/GridUser/RemoteGridUserServiceConnector.cs
@@ -36,14 +36,19 @@ using OpenSim.Services.Connectors;
 
 using OpenMetaverse;
 using log4net;
+using Mono.Addins;
 using Nini.Config;
 
 namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.GridUser
 {
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "RemoteGridUserServicesConnector")]
     public class RemoteGridUserServicesConnector : ISharedRegionModule, IGridUserService
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
+        private const int KEEPTIME = 30; // 30 secs
+        private ExpiringCache<string, GridUserInfo> m_Infos = new ExpiringCache<string, GridUserInfo>();
+
         #region ISharedRegionModule
 
         private bool m_Enabled = false;
@@ -128,23 +133,60 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.GridUser
 
         public bool LoggedOut(string userID, UUID sessionID, UUID region, Vector3 position, Vector3 lookat)
         {
+            if (m_Infos.Contains(userID))
+                m_Infos.Remove(userID);
+
             return m_RemoteConnector.LoggedOut(userID, sessionID, region, position, lookat);
         }
 
 
         public bool SetHome(string userID, UUID regionID, Vector3 position, Vector3 lookAt)
         {
-            return m_RemoteConnector.SetHome(userID, regionID, position, lookAt);
+            if (m_RemoteConnector.SetHome(userID, regionID, position, lookAt))
+            {
+                // Update the cache too
+                GridUserInfo info = null;
+                if (m_Infos.TryGetValue(userID, out info))
+                {
+                    info.HomeRegionID = regionID;
+                    info.HomePosition = position;
+                    info.HomeLookAt = lookAt;
+                }
+                return true;
+            }
+
+            return false;
         }
 
         public bool SetLastPosition(string userID, UUID sessionID, UUID regionID, Vector3 position, Vector3 lookAt)
         {
-            return m_RemoteConnector.SetLastPosition(userID, sessionID, regionID, position, lookAt);
+            if (m_RemoteConnector.SetLastPosition(userID, sessionID, regionID, position, lookAt))
+            {
+                // Update the cache too
+                GridUserInfo info = null;
+                if (m_Infos.TryGetValue(userID, out info))
+                {
+                    info.LastRegionID = regionID;
+                    info.LastPosition = position;
+                    info.LastLookAt = lookAt;
+                }
+                return true;
+            }
+
+            return false;
         }
 
         public GridUserInfo GetGridUserInfo(string userID)
         {
-            return m_RemoteConnector.GetGridUserInfo(userID);
+            GridUserInfo info = null;
+            if (m_Infos.TryGetValue(userID, out info))
+                return info;
+
+            info = m_RemoteConnector.GetGridUserInfo(userID);
+
+            m_Infos.AddOrUpdate(userID, info, KEEPTIME);
+
+            return info;
         }
 
         public GridUserInfo[] GetGridUserInfo(string[] userID)
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs
index cf6d2f7..e474ef6 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs
@@ -26,6 +26,7 @@
  */
 
 using log4net;
+using Mono.Addins;
 using Nini.Config;
 using System;
 using System.Collections.Generic;
@@ -42,6 +43,7 @@ using OpenMetaverse;
 
 namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
 {
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "HGInventoryBroker")]
     public class HGInventoryBroker : ISharedRegionModule, IInventoryService
     {
         private static readonly ILog m_log =
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs
index 097ff1a..ec5751d 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs
@@ -26,6 +26,7 @@
  */
 
 using log4net;
+using Mono.Addins;
 using Nini.Config;
 
 using System;
@@ -41,6 +42,7 @@ using OpenMetaverse;
 
 namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
 {
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "LocalInventoryServicesConnector")]
     public class LocalInventoryServicesConnector : ISharedRegionModule, IInventoryService
     {
         private static readonly ILog m_log =
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs
index 11e0150..2d3ba82 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs
@@ -29,6 +29,7 @@ using log4net;
 using System;
 using System.Collections.Generic;
 using System.Reflection;
+using Mono.Addins;
 using Nini.Config;
 using OpenSim.Framework;
 using OpenSim.Framework.Monitoring;
@@ -40,6 +41,7 @@ using OpenMetaverse;
 
 namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
 {
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "RemoteXInventoryServicesConnector")]
     public class RemoteXInventoryServicesConnector : ISharedRegionModule, IInventoryService
     {
         private static readonly ILog m_log =
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Land/LocalLandServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Land/LocalLandServiceConnector.cs
index 86c0b85..5329933 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Land/LocalLandServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Land/LocalLandServiceConnector.cs
@@ -26,6 +26,7 @@
  */
 
 using log4net;
+using Mono.Addins;
 using Nini.Config;
 using System;
 using System.Collections.Generic;
@@ -39,8 +40,8 @@ using OpenMetaverse;
 
 namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Land
 {
-    public class LocalLandServicesConnector :
-            ISharedRegionModule, ILandService
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "LocalLandServicesConnector")]
+    public class LocalLandServicesConnector : ISharedRegionModule, ILandService
     {
         private static readonly ILog m_log =
                 LogManager.GetLogger(
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Land/RemoteLandServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Land/RemoteLandServiceConnector.cs
index 766ef81..77dfa4a 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Land/RemoteLandServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Land/RemoteLandServiceConnector.cs
@@ -26,6 +26,7 @@
  */
 
 using log4net;
+using Mono.Addins;
 using System;
 using System.Collections.Generic;
 using System.Reflection;
@@ -41,6 +42,7 @@ using OpenMetaverse;
 
 namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Land
 {
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "RemoteLandServicesConnector")]
     public class RemoteLandServicesConnector :
             LandServicesConnector, ISharedRegionModule, ILandService
     {
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/MapImage/MapImageServiceModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/MapImage/MapImageServiceModule.cs
index e4c6c1a..5836eb9 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/MapImage/MapImageServiceModule.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/MapImage/MapImageServiceModule.cs
@@ -52,7 +52,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.MapImage
     /// <remarks>
     /// </remarks>
 
-    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "MapImageServiceModule")]
     public class MapImageServiceModule : ISharedRegionModule
     {
         private static readonly ILog m_log =
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/LocalNeighbourServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/LocalNeighbourServiceConnector.cs
index 7a90686..fd89428 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/LocalNeighbourServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/LocalNeighbourServiceConnector.cs
@@ -29,6 +29,7 @@ using System;
 using System.Collections.Generic;
 using System.Reflection;
 using log4net;
+using Mono.Addins;
 using Nini.Config;
 using OpenMetaverse;
 using OpenSim.Framework;
@@ -39,6 +40,7 @@ using OpenSim.Services.Interfaces;
 
 namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Neighbour
 {
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "LocalNeighbourServicesConnector")]
     public class LocalNeighbourServicesConnector :
             ISharedRegionModule, INeighbourService
     {
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/RemoteNeighourServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/RemoteNeighourServiceConnector.cs
index c6fc2a1..e6772f3 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/RemoteNeighourServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/RemoteNeighourServiceConnector.cs
@@ -26,6 +26,7 @@
  */
 
 using log4net;
+using Mono.Addins;
 using System;
 using System.Collections.Generic;
 using System.Reflection;
@@ -39,6 +40,7 @@ using OpenSim.Server.Base;
 
 namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Neighbour
 {
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "RemoteNeighbourServicesConnector")]
     public class RemoteNeighbourServicesConnector :
             NeighbourServicesConnector, ISharedRegionModule, INeighbourService
     {
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/BasePresenceServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/BasePresenceServiceConnector.cs
new file mode 100644
index 0000000..fdbe10a
--- /dev/null
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/BasePresenceServiceConnector.cs
@@ -0,0 +1,137 @@
+/*
+ * 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 OpenSimulator 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.Reflection;
+using log4net;
+using Mono.Addins;
+using Nini.Config;
+using OpenMetaverse;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Scenes;
+using OpenSim.Server.Base;
+using OpenSim.Services.Interfaces;
+using PresenceInfo = OpenSim.Services.Interfaces.PresenceInfo;
+
+namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Presence
+{
+    public class BasePresenceServiceConnector : IPresenceService
+    {
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+        protected bool m_Enabled;
+
+        protected PresenceDetector m_PresenceDetector;
+
+        /// <summary>
+        /// Underlying presence service.  Do not use directly.
+        /// </summary>
+        public IPresenceService m_PresenceService;
+
+        public Type ReplaceableInterface
+        {
+            get { return null; }
+        }
+
+        public void AddRegion(Scene scene)
+        {
+            if (!m_Enabled)
+                return;
+
+            //            m_log.DebugFormat(
+            //                "[LOCAL PRESENCE CONNECTOR]: Registering IPresenceService to scene {0}", scene.RegionInfo.RegionName);
+
+            scene.RegisterModuleInterface<IPresenceService>(this);
+            m_PresenceDetector.AddRegion(scene);
+
+            m_log.InfoFormat("[BASE PRESENCE SERVICE CONNECTOR]: Enabled for region {0}", scene.Name);
+        }
+
+        public void RemoveRegion(Scene scene)
+        {
+            if (!m_Enabled)
+                return;
+
+            m_PresenceDetector.RemoveRegion(scene);
+        }
+
+        public void RegionLoaded(Scene scene)
+        {
+            if (!m_Enabled)
+                return;
+
+        }
+
+        public void PostInitialise()
+        {
+        }
+
+        public void Close()
+        {
+        }
+
+        #region IPresenceService
+
+        public bool LoginAgent(string userID, UUID sessionID, UUID secureSessionID)
+        {
+            m_log.Warn("[BASE PRESENCE SERVICE CONNECTOR]: LoginAgent connector not implemented at the simulators");
+            return false;
+        }
+
+        public bool LogoutAgent(UUID sessionID)
+        {
+            return m_PresenceService.LogoutAgent(sessionID);
+        }
+
+        public bool LogoutRegionAgents(UUID regionID)
+        {
+            return m_PresenceService.LogoutRegionAgents(regionID);
+        }
+
+        public bool ReportAgent(UUID sessionID, UUID regionID)
+        {
+            return m_PresenceService.ReportAgent(sessionID, regionID);
+        }
+
+        public PresenceInfo GetAgent(UUID sessionID)
+        {
+            return m_PresenceService.GetAgent(sessionID);
+        }
+
+        public PresenceInfo[] GetAgents(string[] userIDs)
+        {
+            // Don't bother potentially making a useless network call if we not going to ask for any users anyway.
+            if (userIDs.Length == 0)
+                return new PresenceInfo[0];
+
+            return m_PresenceService.GetAgents(userIDs);
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/LocalPresenceServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/LocalPresenceServiceConnector.cs
index 49dd633..db5c520 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/LocalPresenceServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/LocalPresenceServiceConnector.cs
@@ -24,51 +24,29 @@
  * (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.Reflection;
-
+using log4net;
+using Mono.Addins;
+using Nini.Config;
+using OpenMetaverse;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Server.Base;
 using OpenSim.Services.Interfaces;
 using PresenceInfo = OpenSim.Services.Interfaces.PresenceInfo;
 
-using OpenMetaverse;
-using log4net;
-using Nini.Config;
-
 namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Presence
 {
-    public class LocalPresenceServicesConnector : ISharedRegionModule, IPresenceService
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "LocalPresenceServicesConnector")]
+    public class LocalPresenceServicesConnector : BasePresenceServiceConnector, ISharedRegionModule, IPresenceService
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
-        private bool m_Enabled = false;
-
-        private PresenceDetector m_PresenceDetector;
-
-        /// <summary>
-        /// Underlying presence service.  Do not use directly.
-        /// </summary>
-        public IPresenceService m_PresenceService;
-
-        public LocalPresenceServicesConnector()
-        {
-        }
-
-        public LocalPresenceServicesConnector(IConfigSource source)
-        {
-            Initialise(source);
-        }
-
         #region ISharedRegionModule
 
-        public Type ReplaceableInterface
-        {
-            get { return null; }
-        }
-
         public string Name
         {
             get { return "LocalPresenceServicesConnector"; }
@@ -119,81 +97,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Presence
             }
         }
 
-        public void PostInitialise()
-        {
-        }
-
-        public void Close()
-        {
-        }
-
-        public void AddRegion(Scene scene)
-        {
-            if (!m_Enabled)
-                return;
-
-            //            m_log.DebugFormat(
-            //                "[LOCAL PRESENCE CONNECTOR]: Registering IPresenceService to scene {0}", scene.RegionInfo.RegionName);
-
-            scene.RegisterModuleInterface<IPresenceService>(this);
-            m_PresenceDetector.AddRegion(scene);
-
-            m_log.InfoFormat("[LOCAL PRESENCE CONNECTOR]: Enabled local presence for region {0}", scene.RegionInfo.RegionName);
-
-        }
-
-        public void RemoveRegion(Scene scene)
-        {
-            if (!m_Enabled)
-                return;
-
-            m_PresenceDetector.RemoveRegion(scene);
-        }
-
-        public void RegionLoaded(Scene scene)
-        {
-            if (!m_Enabled)
-                return;
-
-        }
-
-        #endregion
-
-        #region IPresenceService
-
-        public bool LoginAgent(string userID, UUID sessionID, UUID secureSessionID)
-        {
-            m_log.Warn("[LOCAL PRESENCE CONNECTOR]: LoginAgent connector not implemented at the simulators");
-            return false;
-        }
-
-        public bool LogoutAgent(UUID sessionID)
-        {
-            return m_PresenceService.LogoutAgent(sessionID);
-        }
-
-
-        public bool LogoutRegionAgents(UUID regionID)
-        {
-            return m_PresenceService.LogoutRegionAgents(regionID);
-        }
-
-        public bool ReportAgent(UUID sessionID, UUID regionID)
-        {
-            return m_PresenceService.ReportAgent(sessionID, regionID);
-        }
-
-        public PresenceInfo GetAgent(UUID sessionID)
-        {
-            return m_PresenceService.GetAgent(sessionID);
-        }
-
-        public PresenceInfo[] GetAgents(string[] userIDs)
-        {
-            return m_PresenceService.GetAgents(userIDs);
-        }
-
         #endregion
-
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/RemotePresenceServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/RemotePresenceServiceConnector.cs
index bf4e9ab..6ca5c28 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/RemotePresenceServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/RemotePresenceServiceConnector.cs
@@ -37,26 +37,18 @@ using PresenceInfo = OpenSim.Services.Interfaces.PresenceInfo;
 
 using OpenMetaverse;
 using log4net;
+using Mono.Addins;
 using Nini.Config;
 
 namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Presence
 {
-    public class RemotePresenceServicesConnector : ISharedRegionModule, IPresenceService
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "RemotePresenceServicesConnector")]
+    public class RemotePresenceServicesConnector : BasePresenceServiceConnector, ISharedRegionModule
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         #region ISharedRegionModule
 
-        private bool m_Enabled = false;
-
-        private PresenceDetector m_PresenceDetector;
-        private IPresenceService m_RemoteConnector;
-
-        public Type ReplaceableInterface
-        {
-            get { return null; }
-        }
-
         public string Name
         {
             get { return "RemotePresenceServicesConnector"; }
@@ -70,7 +62,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Presence
                 string name = moduleConfig.GetString("PresenceServices", "");
                 if (name == Name)
                 {
-                    m_RemoteConnector = new PresenceServicesConnector(source);
+                    m_PresenceService = new PresenceServicesConnector(source);
 
                     m_Enabled = true;
 
@@ -79,81 +71,8 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Presence
                     m_log.Info("[REMOTE PRESENCE CONNECTOR]: Remote presence enabled");
                 }
             }
-
-        }
-
-        public void PostInitialise()
-        {
-        }
-
-        public void Close()
-        {
-        }
-
-        public void AddRegion(Scene scene)
-        {
-            if (!m_Enabled)
-                return;
-
-            scene.RegisterModuleInterface<IPresenceService>(this);
-            m_PresenceDetector.AddRegion(scene);
-
-            m_log.InfoFormat("[REMOTE PRESENCE CONNECTOR]: Enabled remote presence for region {0}", scene.RegionInfo.RegionName);
-
-        }
-
-        public void RemoveRegion(Scene scene)
-        {
-            if (!m_Enabled)
-                return;
-
-            m_PresenceDetector.RemoveRegion(scene);
-        }
-
-        public void RegionLoaded(Scene scene)
-        {
-            if (!m_Enabled)
-                return;
-
-        }
-
-        #endregion
-
-        #region IPresenceService
-
-        public bool LoginAgent(string userID, UUID sessionID, UUID secureSessionID)
-        {
-            m_log.Warn("[REMOTE PRESENCE CONNECTOR]: LoginAgent connector not implemented at the simulators");
-            return false;
-        }
-
-        public bool LogoutAgent(UUID sessionID)
-        {
-            return m_RemoteConnector.LogoutAgent(sessionID);
-        }
-
-
-        public bool LogoutRegionAgents(UUID regionID)
-        {
-            return m_RemoteConnector.LogoutRegionAgents(regionID);
-        }
-
-        public bool ReportAgent(UUID sessionID, UUID regionID)
-        {
-            return m_RemoteConnector.ReportAgent(sessionID, regionID);
-        }
-
-        public PresenceInfo GetAgent(UUID sessionID)
-        {
-            return m_RemoteConnector.GetAgent(sessionID);
-        }
-
-        public PresenceInfo[] GetAgents(string[] userIDs)
-        {
-            return m_RemoteConnector.GetAgents(userIDs);
         }
 
         #endregion
-
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/Tests/PresenceConnectorsTests.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/Tests/PresenceConnectorsTests.cs
index 4556df3..32e47f9 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/Tests/PresenceConnectorsTests.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/Tests/PresenceConnectorsTests.cs
@@ -56,7 +56,8 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Presence.Tests
             config.Configs["PresenceService"].Set("LocalServiceModule", "OpenSim.Services.PresenceService.dll:PresenceService");
             config.Configs["PresenceService"].Set("StorageProvider", "OpenSim.Data.Null.dll");
 
-            m_LocalConnector = new LocalPresenceServicesConnector(config);
+            m_LocalConnector = new LocalPresenceServicesConnector();
+            m_LocalConnector.Initialise(config);
 
             // Let's stick in a test presence
             m_LocalConnector.m_PresenceService.LoginAgent(UUID.Zero.ToString(), UUID.Zero, UUID.Zero);
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
index 6eb99ea..b485194 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
@@ -29,6 +29,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
 using log4net;
+using Mono.Addins;
 using Nini.Config;
 using OpenMetaverse;
 using OpenSim.Framework;
@@ -39,6 +40,7 @@ using GridRegion = OpenSim.Services.Interfaces.GridRegion;
 
 namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
 {
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "LocalSimulationConnectorModule")]
     public class LocalSimulationConnectorModule : ISharedRegionModule, ISimulationService
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@@ -58,7 +60,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
         /// </summary>
         private bool m_ModuleEnabled = false;
 
-        #region IRegionModule
+        #region Region Module interface
 
         public void Initialise(IConfigSource config)
         {
@@ -156,7 +158,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
             }
         }
 
-        #endregion /* IRegionModule */
+        #endregion
 
         #region ISimulation
 
@@ -313,7 +315,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
 
             if (m_scenes.ContainsKey(destination.RegionID))
             {
-                Util.FireAndForget(delegate { m_scenes[destination.RegionID].IncomingCloseAgent(id); });
+//                    m_log.DebugFormat(
+//                        "[LOCAL SIMULATION CONNECTOR]: Found region {0} {1} to send AgentUpdate",
+//                        s.RegionInfo.RegionName, destination.RegionHandle);
+
+                Util.FireAndForget(delegate { m_scenes[destination.RegionID].IncomingCloseAgent(id, false); });
                 return true;
             }
             //m_log.Debug("[LOCAL COMMS]: region not found in SendCloseAgent");
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs
index 68be552..c8698ca 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs
@@ -32,6 +32,7 @@ using System.Net;
 using System.Reflection;
 using System.Text;
 using log4net;
+using Mono.Addins;
 using Nini.Config;
 using OpenMetaverse;
 using OpenMetaverse.StructuredData;
@@ -46,6 +47,7 @@ using GridRegion = OpenSim.Services.Interfaces.GridRegion;
 
 namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
 {
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "RemoteSimulationConnectorModule")]
     public class RemoteSimulationConnectorModule : ISharedRegionModule, ISimulationService
     {
         private bool initialized = false;
@@ -60,7 +62,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
         protected bool m_safemode;
         protected IPAddress m_thisIP;
 
-        #region IRegionModule
+        #region Region Module interface
 
         public virtual void Initialise(IConfigSource config)
         {
@@ -147,7 +149,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
             m_thisIP = Util.GetHostFromDNS(scene.RegionInfo.ExternalHostName);
         }
 
-        #endregion /* IRegionModule */
+        #endregion
 
         #region IInterregionComms
 
@@ -317,4 +319,4 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
 
         #endregion /* IInterregionComms */
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/LocalUserAccountServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/LocalUserAccountServiceConnector.cs
index 1ffd480..ea4ade5 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/LocalUserAccountServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/LocalUserAccountServiceConnector.cs
@@ -29,6 +29,7 @@ using System;
 using System.Collections.Generic;
 using System.Reflection;
 using log4net;
+using Mono.Addins;
 using Nini.Config;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
@@ -39,6 +40,7 @@ using OpenMetaverse;
 
 namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.UserAccounts
 {
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "LocalUserAccountServicesConnector")]
     public class LocalUserAccountServicesConnector : ISharedRegionModule, IUserAccountService
     {
         private static readonly ILog m_log =
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/RemoteUserAccountServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/RemoteUserAccountServiceConnector.cs
index f6b6aeb..afbba30 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/RemoteUserAccountServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/RemoteUserAccountServiceConnector.cs
@@ -28,6 +28,7 @@
 using System;
 using Nini.Config;
 using log4net;
+using Mono.Addins;
 using System.Reflection;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
@@ -39,6 +40,7 @@ using OpenMetaverse;
 
 namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.UserAccounts
 {
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "RemoteUserAccountServicesConnector")]
     public class RemoteUserAccountServicesConnector : UserAccountServicesConnector,
             ISharedRegionModule, IUserAccountService
     {
diff --git a/OpenSim/Region/CoreModules/World/Access/AccessModule.cs b/OpenSim/Region/CoreModules/World/Access/AccessModule.cs
index e7b1454..1599f15 100644
--- a/OpenSim/Region/CoreModules/World/Access/AccessModule.cs
+++ b/OpenSim/Region/CoreModules/World/Access/AccessModule.cs
@@ -29,6 +29,7 @@ using System;
 using System.Collections.Generic;
 using System.Reflection;
 using log4net;
+using Mono.Addins;
 using Nini.Config;
 using OpenMetaverse;
 using OpenSim.Framework;
@@ -39,6 +40,7 @@ using OpenSim.Services.Interfaces;
 
 namespace OpenSim.Region.CoreModules.World
 {
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "AccessModule")]
     public class AccessModule : ISharedRegionModule
     {
 //        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
index 619550c..ade5e76 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
@@ -43,6 +43,7 @@ using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Region.Framework.Scenes.Serialization;
 using OpenSim.Services.Interfaces;
+using System.Threading;
 
 namespace OpenSim.Region.CoreModules.World.Archiver
 {
@@ -52,7 +53,30 @@ namespace OpenSim.Region.CoreModules.World.Archiver
     public class ArchiveReadRequest
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+        /// <summary>
+        /// Contains data used while dearchiving a single scene.
+        /// </summary>
+        private class DearchiveContext
+        {
+            public Scene Scene { get; set; }
+
+            public List<string> SerialisedSceneObjects { get; set; }
+
+            public List<string> SerialisedParcels { get; set; }
+
+            public List<SceneObjectGroup> SceneObjects { get; set; }
+
+            public DearchiveContext(Scene scene)
+            {
+                Scene = scene;
+                SerialisedSceneObjects = new List<string>();
+                SerialisedParcels = new List<string>();
+                SceneObjects = new List<SceneObjectGroup>();
+            }
+        }
         
+
         /// <summary>
         /// The maximum major version of OAR that we can read.  Minor versions shouldn't need a max number since version
         /// bumps here should be compatible.
@@ -62,9 +86,10 @@ namespace OpenSim.Region.CoreModules.World.Archiver
         /// <summary>
         /// Has the control file been loaded for this archive?
         /// </summary>
-        public bool ControlFileLoaded { get; private set; }        
+        public bool ControlFileLoaded { get; private set; }
 
-        protected Scene m_scene;
+        protected string m_loadPath;
+        protected Scene m_rootScene;
         protected Stream m_loadStream;
         protected Guid m_requestId;
         protected string m_errorMessage;
@@ -91,16 +116,27 @@ namespace OpenSim.Region.CoreModules.World.Archiver
             {
                 if (m_UserMan == null)
                 {
-                    m_UserMan = m_scene.RequestModuleInterface<IUserManagement>();
+                    m_UserMan = m_rootScene.RequestModuleInterface<IUserManagement>();
                 }
                 return m_UserMan;
             }
         }
 
+        /// <summary>
+        /// Used to cache lookups for valid groups.
+        /// </summary>
+        private IDictionary<UUID, bool> m_validGroupUuids = new Dictionary<UUID, bool>();
+
+        private IGroupsModule m_groupsModule;
+
+        private IAssetService m_assetService = null;
+
+
         public ArchiveReadRequest(Scene scene, string loadPath, bool merge, bool skipAssets, Guid requestId)
         {
-            m_scene = scene;
+            m_rootScene = scene;
 
+            m_loadPath = loadPath;
             try
             {
                 m_loadStream = new GZipStream(ArchiveHelpers.GetStream(loadPath), CompressionMode.Decompress);
@@ -120,11 +156,15 @@ namespace OpenSim.Region.CoreModules.World.Archiver
 
             // Zero can never be a valid user id
             m_validUserUuids[UUID.Zero] = false;
+
+            m_groupsModule = m_rootScene.RequestModuleInterface<IGroupsModule>();
+            m_assetService = m_rootScene.AssetService;
         }
 
         public ArchiveReadRequest(Scene scene, Stream loadStream, bool merge, bool skipAssets, Guid requestId)
         {
-            m_scene = scene;
+            m_rootScene = scene;
+            m_loadPath = null;
             m_loadStream = loadStream;
             m_merge = merge;
             m_skipAssets = skipAssets;
@@ -132,6 +172,9 @@ namespace OpenSim.Region.CoreModules.World.Archiver
 
             // Zero can never be a valid user id
             m_validUserUuids[UUID.Zero] = false;
+
+            m_groupsModule = m_rootScene.RequestModuleInterface<IGroupsModule>();
+            m_assetService = m_rootScene.AssetService;
         }
 
         /// <summary>
@@ -139,25 +182,25 @@ namespace OpenSim.Region.CoreModules.World.Archiver
         /// </summary>
         public void DearchiveRegion()
         {
-            // The same code can handle dearchiving 0.1 and 0.2 OpenSim Archive versions
-            DearchiveRegion0DotStar();
-        }
-
-        private void DearchiveRegion0DotStar()
-        {
             int successfulAssetRestores = 0;
             int failedAssetRestores = 0;
-            List<string> serialisedSceneObjects = new List<string>();
-            List<string> serialisedParcels = new List<string>();
-            string filePath = "NONE";
 
-            TarArchiveReader archive = new TarArchiveReader(m_loadStream);
+            DearchiveScenesInfo dearchivedScenes;
+
+            // We dearchive all the scenes at once, because the files in the TAR archive might be mixed.
+            // Therefore, we have to keep track of the dearchive context of all the scenes.
+            Dictionary<UUID, DearchiveContext> sceneContexts = new Dictionary<UUID, DearchiveContext>();
+
+            string fullPath = "NONE";
+            TarArchiveReader archive = null;
             byte[] data;
             TarArchiveReader.TarEntryType entryType;
-            
+
             try
             {
-                while ((data = archive.ReadEntry(out filePath, out entryType)) != null)
+                FindAndLoadControlFile(out archive, out dearchivedScenes);
+
+                while ((data = archive.ReadEntry(out fullPath, out entryType)) != null)
                 {
                     //m_log.DebugFormat(
                     //    "[ARCHIVER]: Successfully read {0} ({1} bytes)", filePath, data.Length);
@@ -165,9 +208,30 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                     if (TarArchiveReader.TarEntryType.TYPE_DIRECTORY == entryType)
                         continue;
 
+
+                    // Find the scene that this file belongs to
+
+                    Scene scene;
+                    string filePath;
+                    if (!dearchivedScenes.GetRegionFromPath(fullPath, out scene, out filePath))
+                        continue;   // this file belongs to a region that we're not loading
+
+                    DearchiveContext sceneContext = null;
+                    if (scene != null)
+                    {
+                        if (!sceneContexts.TryGetValue(scene.RegionInfo.RegionID, out sceneContext))
+                        {
+                            sceneContext = new DearchiveContext(scene);
+                            sceneContexts.Add(scene.RegionInfo.RegionID, sceneContext);
+                        }
+                    }
+
+
+                    // Process the file
+
                     if (filePath.StartsWith(ArchiveConstants.OBJECTS_PATH))
                     {
-                        serialisedSceneObjects.Add(Encoding.UTF8.GetString(data));
+                        sceneContext.SerialisedSceneObjects.Add(Encoding.UTF8.GetString(data));
                     }
                     else if (filePath.StartsWith(ArchiveConstants.ASSETS_PATH) && !m_skipAssets)
                     {
@@ -181,19 +245,19 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                     }
                     else if (!m_merge && filePath.StartsWith(ArchiveConstants.TERRAINS_PATH))
                     {
-                        LoadTerrain(filePath, data);
+                        LoadTerrain(scene, filePath, data);
                     }
                     else if (!m_merge && filePath.StartsWith(ArchiveConstants.SETTINGS_PATH))
                     {
-                        LoadRegionSettings(filePath, data);
+                        LoadRegionSettings(scene, filePath, data, dearchivedScenes);
                     } 
                     else if (!m_merge && filePath.StartsWith(ArchiveConstants.LANDDATA_PATH))
                     {
-                        serialisedParcels.Add(Encoding.UTF8.GetString(data));
+                        sceneContext.SerialisedParcels.Add(Encoding.UTF8.GetString(data));
                     } 
                     else if (filePath == ArchiveConstants.CONTROL_FILE_PATH)
                     {
-                        LoadControlFile(filePath, data);
+                        // Ignore, because we already read the control file
                     }
                 }
 
@@ -201,15 +265,16 @@ namespace OpenSim.Region.CoreModules.World.Archiver
             }
             catch (Exception e)
             {
-                m_log.ErrorFormat(
-                    "[ARCHIVER]: Aborting load with error in archive file {0}.  {1}", filePath, e);
+                m_log.Error(
+                    String.Format("[ARCHIVER]: Aborting load with error in archive file {0} ", fullPath), e);
                 m_errorMessage += e.ToString();
-                m_scene.EventManager.TriggerOarFileLoaded(m_requestId, m_errorMessage);
+                m_rootScene.EventManager.TriggerOarFileLoaded(m_requestId, new List<UUID>(), m_errorMessage);
                 return;
             }
             finally
             {
-                archive.Close();
+                if (archive != null)
+                    archive.Close();
             }
 
             if (!m_skipAssets)
@@ -223,32 +288,143 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                 }
             }
 
-            if (!m_merge)
+            foreach (DearchiveContext sceneContext in sceneContexts.Values)
             {
-                m_log.Info("[ARCHIVER]: Clearing all existing scene objects");
-                m_scene.DeleteAllSceneObjects();
+                m_log.InfoFormat("[ARCHIVER]: Loading region {0}", sceneContext.Scene.RegionInfo.RegionName);
+
+                if (!m_merge)
+                {
+                    m_log.Info("[ARCHIVER]: Clearing all existing scene objects");
+                    sceneContext.Scene.DeleteAllSceneObjects();
+                }
+
+                try
+                {
+                    LoadParcels(sceneContext.Scene, sceneContext.SerialisedParcels);
+                    LoadObjects(sceneContext.Scene, sceneContext.SerialisedSceneObjects, sceneContext.SceneObjects);
+                    
+                    // Inform any interested parties that the region has changed. We waited until now so that all
+                    // of the region's objects will be loaded when we send this notification.
+                    IEstateModule estateModule = sceneContext.Scene.RequestModuleInterface<IEstateModule>();
+                    if (estateModule != null)
+                        estateModule.TriggerRegionInfoChange();
+                }
+                catch (Exception e)
+                {
+                    m_log.Error("[ARCHIVER]: Error loading parcels or objects ", e);
+                    m_errorMessage += e.ToString();
+                    m_rootScene.EventManager.TriggerOarFileLoaded(m_requestId, new List<UUID>(), m_errorMessage);
+                    return;
+                }
             }
 
-            LoadParcels(serialisedParcels);
-            LoadObjects(serialisedSceneObjects);
+            // Start the scripts. We delayed this because we want the OAR to finish loading ASAP, so
+            // that users can enter the scene. If we allow the scripts to start in the loop above
+            // then they significantly increase the time until the OAR finishes loading.
+            Util.FireAndForget(delegate(object o)
+            {
+                Thread.Sleep(15000);
+                m_log.Info("[ARCHIVER]: Starting scripts in scene objects");
+
+                foreach (DearchiveContext sceneContext in sceneContexts.Values)
+                {
+                    foreach (SceneObjectGroup sceneObject in sceneContext.SceneObjects)
+                    {
+                        sceneObject.CreateScriptInstances(0, false, sceneContext.Scene.DefaultScriptEngine, 0); // StateSource.RegionStart
+                        sceneObject.ResumeScripts();
+                    }
+
+                    sceneContext.SceneObjects.Clear();
+                }
+            });
 
             m_log.InfoFormat("[ARCHIVER]: Successfully loaded archive");
 
-            m_scene.EventManager.TriggerOarFileLoaded(m_requestId, m_errorMessage);
+            m_rootScene.EventManager.TriggerOarFileLoaded(m_requestId, dearchivedScenes.GetLoadedScenes(), m_errorMessage);
+        }
+
+        /// <summary>
+        /// Searches through the files in the archive for the control file, and reads it.
+        /// We must read the control file first, in order to know which regions are available.
+        /// </summary>
+        /// <remarks>
+        /// In most cases the control file *is* first, since that's how we create archives. However,
+        /// it's possible that someone rewrote the archive externally so we can't rely on this fact.
+        /// </remarks>
+        /// <param name="archive"></param>
+        /// <param name="dearchivedScenes"></param>
+        private void FindAndLoadControlFile(out TarArchiveReader archive, out DearchiveScenesInfo dearchivedScenes)
+        {
+            archive = new TarArchiveReader(m_loadStream);
+            dearchivedScenes = new DearchiveScenesInfo();
+
+            string filePath;
+            byte[] data;
+            TarArchiveReader.TarEntryType entryType;
+            bool firstFile = true;
+
+            while ((data = archive.ReadEntry(out filePath, out entryType)) != null)
+            {
+                if (TarArchiveReader.TarEntryType.TYPE_DIRECTORY == entryType)
+                    continue;
+                    
+                if (filePath == ArchiveConstants.CONTROL_FILE_PATH)
+                {
+                    LoadControlFile(filePath, data, dearchivedScenes);
+
+                    // Find which scenes are available in the simulator
+                    ArchiveScenesGroup simulatorScenes = new ArchiveScenesGroup();
+                    SceneManager.Instance.ForEachScene(delegate(Scene scene2)
+                    {
+                        simulatorScenes.AddScene(scene2);
+                    });
+                    simulatorScenes.CalcSceneLocations();
+                    dearchivedScenes.SetSimulatorScenes(m_rootScene, simulatorScenes);
+
+                    // If the control file wasn't the first file then reset the read pointer
+                    if (!firstFile)
+                    {
+                        m_log.Warn("Control file wasn't the first file in the archive");
+                        if (m_loadStream.CanSeek)
+                        {
+                            m_loadStream.Seek(0, SeekOrigin.Begin);
+                        }
+                        else if (m_loadPath != null)
+                        {
+                            archive.Close();
+                            archive = null;
+                            m_loadStream.Close();
+                            m_loadStream = null;
+                            m_loadStream = new GZipStream(ArchiveHelpers.GetStream(m_loadPath), CompressionMode.Decompress);
+                            archive = new TarArchiveReader(m_loadStream);
+                        }
+                        else
+                        {
+                            // There isn't currently a scenario where this happens, but it's best to add a check just in case
+                            throw new Exception("Error reading archive: control file wasn't the first file, and the input stream doesn't allow seeking");
+                        }
+                    }
+
+                    return;
+                }
+
+                firstFile = false;
+            }
+
+            throw new Exception("Control file not found");
         }
         
         /// <summary>
         /// Load serialized scene objects.
         /// </summary>
-        /// <param name="serialisedSceneObjects"></param>
-        protected void LoadObjects(List<string> serialisedSceneObjects)
+        protected void LoadObjects(Scene scene, List<string> serialisedSceneObjects, List<SceneObjectGroup> sceneObjects)
         {
             // Reload serialized prims
             m_log.InfoFormat("[ARCHIVER]: Loading {0} scene objects.  Please wait.", serialisedSceneObjects.Count);
 
-            UUID oldTelehubUUID = m_scene.RegionInfo.RegionSettings.TelehubObject;
+            UUID oldTelehubUUID = scene.RegionInfo.RegionSettings.TelehubObject;
 
-            IRegionSerialiserModule serialiser = m_scene.RequestModuleInterface<IRegionSerialiserModule>();
+            IRegionSerialiserModule serialiser = scene.RequestModuleInterface<IRegionSerialiserModule>();
             int sceneObjectsLoadedCount = 0;
 
             foreach (string serialisedSceneObject in serialisedSceneObjects)
@@ -269,7 +445,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
 
                 SceneObjectGroup sceneObject = serialiser.DeserializeGroupFromXml2(serialisedSceneObject);
 
-                bool isTelehub = (sceneObject.UUID == oldTelehubUUID);
+                bool isTelehub = (sceneObject.UUID == oldTelehubUUID) && (oldTelehubUUID != UUID.Zero);
 
                 // For now, give all incoming scene objects new uuids.  This will allow scenes to be cloned
                 // on the same region server and multiple examples a single object archive to be imported
@@ -279,8 +455,8 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                 if (isTelehub)
                 {
                     // Change the Telehub Object to the new UUID
-                    m_scene.RegionInfo.RegionSettings.TelehubObject = sceneObject.UUID;
-                    m_scene.RegionInfo.RegionSettings.Save();
+                    scene.RegionInfo.RegionSettings.TelehubObject = sceneObject.UUID;
+                    scene.RegionInfo.RegionSettings.Save();
                     oldTelehubUUID = UUID.Zero;
                 }
 
@@ -290,17 +466,20 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                 {
                     if (part.CreatorData == null || part.CreatorData == string.Empty)
                     {
-                        if (!ResolveUserUuid(part.CreatorID))
-                            part.CreatorID = m_scene.RegionInfo.EstateSettings.EstateOwner;
+                        if (!ResolveUserUuid(scene, part.CreatorID))
+                            part.CreatorID = scene.RegionInfo.EstateSettings.EstateOwner;
                     }
                     if (UserManager != null)
                         UserManager.AddUser(part.CreatorID, part.CreatorData);
 
-                    if (!ResolveUserUuid(part.OwnerID))
-                        part.OwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner;
+                    if (!ResolveUserUuid(scene, part.OwnerID))
+                        part.OwnerID = scene.RegionInfo.EstateSettings.EstateOwner;
+
+                    if (!ResolveUserUuid(scene, part.LastOwnerID))
+                        part.LastOwnerID = scene.RegionInfo.EstateSettings.EstateOwner;
 
-                    if (!ResolveUserUuid(part.LastOwnerID))
-                        part.LastOwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner;
+                    if (!ResolveGroupUuid(part.GroupID))
+                        part.GroupID = UUID.Zero;
 
                     // And zap any troublesome sit target information
 //                    part.SitTargetOrientation = new Quaternion(0, 0, 0, 1);
@@ -311,14 +490,14 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                     // being no copy/no mod for everyone
                     lock (part.TaskInventory)
                     {
-                        if (!ResolveUserUuid(part.CreatorID))
-                            part.CreatorID = m_scene.RegionInfo.EstateSettings.EstateOwner;
+                        if (!ResolveUserUuid(scene, part.CreatorID))
+                            part.CreatorID = scene.RegionInfo.EstateSettings.EstateOwner;
     
-                        if (!ResolveUserUuid(part.OwnerID))
-                            part.OwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner;
+                        if (!ResolveUserUuid(scene, part.OwnerID))
+                            part.OwnerID = scene.RegionInfo.EstateSettings.EstateOwner;
     
-                        if (!ResolveUserUuid(part.LastOwnerID))
-                            part.LastOwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner;
+                        if (!ResolveUserUuid(scene, part.LastOwnerID))
+                            part.LastOwnerID = scene.RegionInfo.EstateSettings.EstateOwner;
     
                         // And zap any troublesome sit target information
                         part.SitTargetOrientation = new Quaternion(0, 0, 0, 1);
@@ -331,26 +510,31 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                         TaskInventoryDictionary inv = part.TaskInventory;
                         foreach (KeyValuePair<UUID, TaskInventoryItem> kvp in inv)
                         {
-                            if (!ResolveUserUuid(kvp.Value.OwnerID))
+                            if (!ResolveUserUuid(scene, kvp.Value.OwnerID))
                             {
-                                kvp.Value.OwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner;
+                                kvp.Value.OwnerID = scene.RegionInfo.EstateSettings.EstateOwner;
                             }
+
                             if (kvp.Value.CreatorData == null || kvp.Value.CreatorData == string.Empty)
                             {
-                                if (!ResolveUserUuid(kvp.Value.CreatorID))
-                                    kvp.Value.CreatorID = m_scene.RegionInfo.EstateSettings.EstateOwner;
+                                if (!ResolveUserUuid(scene, kvp.Value.CreatorID))
+                                    kvp.Value.CreatorID = scene.RegionInfo.EstateSettings.EstateOwner;
                             }
+
                             if (UserManager != null)
                                 UserManager.AddUser(kvp.Value.CreatorID, kvp.Value.CreatorData);
+
+                            if (!ResolveGroupUuid(kvp.Value.GroupID))
+                                kvp.Value.GroupID = UUID.Zero;
                         }
                         part.TaskInventory.LockItemsForRead(false);
                     }
                 }
 
-                if (m_scene.AddRestoredSceneObject(sceneObject, true, false))
+                if (scene.AddRestoredSceneObject(sceneObject, true, false))
                 {
                     sceneObjectsLoadedCount++;
-                    sceneObject.CreateScriptInstances(0, false, m_scene.DefaultScriptEngine, 0);
+                    sceneObject.CreateScriptInstances(0, false, scene.DefaultScriptEngine, 0);
                     sceneObject.ResumeScripts();
                 }
             }
@@ -365,16 +549,17 @@ namespace OpenSim.Region.CoreModules.World.Archiver
             if (oldTelehubUUID != UUID.Zero)
             {
                 m_log.WarnFormat("Telehub object not found: {0}", oldTelehubUUID);
-                m_scene.RegionInfo.RegionSettings.TelehubObject = UUID.Zero;
-                m_scene.RegionInfo.RegionSettings.ClearSpawnPoints();
+                scene.RegionInfo.RegionSettings.TelehubObject = UUID.Zero;
+                scene.RegionInfo.RegionSettings.ClearSpawnPoints();
             }
         }
         
         /// <summary>
         /// Load serialized parcels.
         /// </summary>
+        /// <param name="scene"></param>
         /// <param name="serialisedParcels"></param>
-        protected void LoadParcels(List<string> serialisedParcels)
+        protected void LoadParcels(Scene scene, List<string> serialisedParcels)
         {
             // Reload serialized parcels
             m_log.InfoFormat("[ARCHIVER]: Loading {0} parcels.  Please wait.", serialisedParcels.Count);
@@ -382,9 +567,27 @@ namespace OpenSim.Region.CoreModules.World.Archiver
             foreach (string serialisedParcel in serialisedParcels)
             {
                 LandData parcel = LandDataSerializer.Deserialize(serialisedParcel);
-                if (!ResolveUserUuid(parcel.OwnerID))
-                    parcel.OwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner;
                 
+                // Validate User and Group UUID's
+
+                if (!ResolveUserUuid(scene, parcel.OwnerID))
+                    parcel.OwnerID = m_rootScene.RegionInfo.EstateSettings.EstateOwner;
+
+                if (!ResolveGroupUuid(parcel.GroupID))
+                {
+                    parcel.GroupID = UUID.Zero;
+                    parcel.IsGroupOwned = false;
+                }
+
+                List<LandAccessEntry> accessList = new List<LandAccessEntry>();
+                foreach (LandAccessEntry entry in parcel.ParcelAccessList)
+                {
+                    if (ResolveUserUuid(scene, entry.AgentID))
+                        accessList.Add(entry);
+                    // else, drop this access rule
+                }
+                parcel.ParcelAccessList = accessList;
+
 //                m_log.DebugFormat(
 //                    "[ARCHIVER]: Adding parcel {0}, local id {1}, area {2}", 
 //                    parcel.Name, parcel.LocalID, parcel.Area);
@@ -395,23 +598,24 @@ namespace OpenSim.Region.CoreModules.World.Archiver
             if (!m_merge)
             {
                 bool setupDefaultParcel = (landData.Count == 0);
-                m_scene.LandChannel.Clear(setupDefaultParcel);
+                scene.LandChannel.Clear(setupDefaultParcel);
             }
             
-            m_scene.EventManager.TriggerIncomingLandDataFromStorage(landData);
+            scene.EventManager.TriggerIncomingLandDataFromStorage(landData);
             m_log.InfoFormat("[ARCHIVER]: Restored {0} parcels.", landData.Count);
         }
 
         /// <summary>
         /// Look up the given user id to check whether it's one that is valid for this grid.
         /// </summary>
+        /// <param name="scene"></param>
         /// <param name="uuid"></param>
         /// <returns></returns>
-        private bool ResolveUserUuid(UUID uuid)
+        private bool ResolveUserUuid(Scene scene, UUID uuid)
         {
             if (!m_validUserUuids.ContainsKey(uuid))
             {
-                UserAccount account = m_scene.UserAccountService.GetUserAccount(m_scene.RegionInfo.ScopeID, uuid);
+                UserAccount account = scene.UserAccountService.GetUserAccount(scene.RegionInfo.ScopeID, uuid);
                 m_validUserUuids.Add(uuid, account != null);
             }
 
@@ -419,6 +623,30 @@ namespace OpenSim.Region.CoreModules.World.Archiver
         }
 
         /// <summary>
+        /// Look up the given group id to check whether it's one that is valid for this grid.
+        /// </summary>
+        /// <param name="uuid"></param>
+        /// <returns></returns>
+        private bool ResolveGroupUuid(UUID uuid)
+        {
+            if (uuid == UUID.Zero)
+                return true;    // this means the object has no group
+
+            if (!m_validGroupUuids.ContainsKey(uuid))
+            {
+                bool exists;
+                
+                if (m_groupsModule == null)
+                    exists = false;
+                else
+                    exists = (m_groupsModule.GetGroupRecord(uuid) != null);
+
+                m_validGroupUuids.Add(uuid, exists);
+            }
+
+            return m_validGroupUuids[uuid];
+        }
+
         /// Load an asset
         /// </summary>
         /// <param name="assetFilename"></param>
@@ -442,7 +670,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
             string extension = filename.Substring(i);
             string uuid = filename.Remove(filename.Length - extension.Length);
 
-            if (m_scene.AssetService.GetMetadata(uuid) != null)
+            if (m_assetService.GetMetadata(uuid) != null)
             {
                 // m_log.DebugFormat("[ARCHIVER]: found existing asset {0}",uuid);
                 return true;
@@ -462,7 +690,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
 
                 // We're relying on the asset service to do the sensible thing and not store the asset if it already
                 // exists.
-                m_scene.AssetService.Store(asset);
+                m_assetService.Store(asset);
 
                 /**
                  * Create layers on decode for image assets.  This is likely to significantly increase the time to load archives so
@@ -490,12 +718,14 @@ namespace OpenSim.Region.CoreModules.World.Archiver
         /// <summary>
         /// Load region settings data
         /// </summary>
+        /// <param name="scene"></param>
         /// <param name="settingsPath"></param>
         /// <param name="data"></param>
+        /// <param name="dearchivedScenes"></param>
         /// <returns>
         /// true if settings were loaded successfully, false otherwise
         /// </returns>
-        private bool LoadRegionSettings(string settingsPath, byte[] data)
+        private bool LoadRegionSettings(Scene scene, string settingsPath, byte[] data, DearchiveScenesInfo dearchivedScenes)
         {
             RegionSettings loadedRegionSettings;
 
@@ -511,7 +741,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                 return false;
             }
 
-            RegionSettings currentRegionSettings = m_scene.RegionInfo.RegionSettings;
+            RegionSettings currentRegionSettings = scene.RegionInfo.RegionSettings;
 
             currentRegionSettings.AgentLimit = loadedRegionSettings.AgentLimit;
             currentRegionSettings.AllowDamage = loadedRegionSettings.AllowDamage;
@@ -548,12 +778,14 @@ namespace OpenSim.Region.CoreModules.World.Archiver
             foreach (SpawnPoint sp in loadedRegionSettings.SpawnPoints())
                 currentRegionSettings.AddSpawnPoint(sp);
 
+            currentRegionSettings.LoadedCreationDateTime = dearchivedScenes.LoadedCreationDateTime;
+            currentRegionSettings.LoadedCreationID = dearchivedScenes.GetOriginalRegionID(scene.RegionInfo.RegionID).ToString();
+
             currentRegionSettings.Save();
 
-            m_scene.TriggerEstateSunUpdate();
+            scene.TriggerEstateSunUpdate();
             
-            IEstateModule estateModule = m_scene.RequestModuleInterface<IEstateModule>();
-
+            IEstateModule estateModule = scene.RequestModuleInterface<IEstateModule>();
             if (estateModule != null)
                 estateModule.sendRegionHandshakeToAll();
 
@@ -563,14 +795,15 @@ namespace OpenSim.Region.CoreModules.World.Archiver
         /// <summary>
         /// Load terrain data
         /// </summary>
+        /// <param name="scene"></param>
         /// <param name="terrainPath"></param>
         /// <param name="data"></param>
         /// <returns>
         /// true if terrain was resolved successfully, false otherwise.
         /// </returns>
-        private bool LoadTerrain(string terrainPath, byte[] data)
+        private bool LoadTerrain(Scene scene, string terrainPath, byte[] data)
         {
-            ITerrainModule terrainModule = m_scene.RequestModuleInterface<ITerrainModule>();
+            ITerrainModule terrainModule = scene.RequestModuleInterface<ITerrainModule>();
 
             MemoryStream ms = new MemoryStream(data);
             terrainModule.LoadFromStream(terrainPath, ms);
@@ -586,17 +819,18 @@ namespace OpenSim.Region.CoreModules.World.Archiver
         /// </summary>
         /// <param name="path"></param>
         /// <param name="data"></param>
-        public void LoadControlFile(string path, byte[] data)
+        /// <param name="dearchivedScenes"></param>
+        public DearchiveScenesInfo LoadControlFile(string path, byte[] data, DearchiveScenesInfo dearchivedScenes)
         {
             XmlNamespaceManager nsmgr = new XmlNamespaceManager(new NameTable());
             XmlParserContext context = new XmlParserContext(null, nsmgr, null, XmlSpace.None);
             XmlTextReader xtr = new XmlTextReader(Encoding.ASCII.GetString(data), XmlNodeType.Document, context);
 
-            RegionSettings currentRegionSettings = m_scene.RegionInfo.RegionSettings;
+            // Loaded metadata will be empty if no information exists in the archive
+            dearchivedScenes.LoadedCreationDateTime = 0;
+            dearchivedScenes.DefaultOriginalID = "";
 
-            // Loaded metadata will empty if no information exists in the archive
-            currentRegionSettings.LoadedCreationDateTime = 0;
-            currentRegionSettings.LoadedCreationID = "";
+            bool multiRegion = false;
 
             while (xtr.Read()) 
             {
@@ -622,18 +856,44 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                     {
                         int value;
                         if (Int32.TryParse(xtr.ReadElementContentAsString(), out value))
-                            currentRegionSettings.LoadedCreationDateTime = value;
+                            dearchivedScenes.LoadedCreationDateTime = value;
                     } 
-                    else if (xtr.Name.ToString() == "id") 
+                    else if (xtr.Name.ToString() == "row")
+                    {
+                        multiRegion = true;
+                        dearchivedScenes.StartRow();
+                    }
+                    else if (xtr.Name.ToString() == "region")
+                    {
+                        dearchivedScenes.StartRegion();
+                    }
+                    else if (xtr.Name.ToString() == "id")
+                    {
+                        string id = xtr.ReadElementContentAsString();
+                        dearchivedScenes.DefaultOriginalID = id;
+                        if (multiRegion)
+                            dearchivedScenes.SetRegionOriginalID(id);
+                    }
+                    else if (xtr.Name.ToString() == "dir")
                     {
-                        currentRegionSettings.LoadedCreationID = xtr.ReadElementContentAsString();
+                        dearchivedScenes.SetRegionDirectory(xtr.ReadElementContentAsString());
                     }
                 }
             }
-            
-            currentRegionSettings.Save();
-            
+
+            dearchivedScenes.MultiRegionFormat = multiRegion;
+            if (!multiRegion)
+            {
+                // Add the single scene
+                dearchivedScenes.StartRow();
+                dearchivedScenes.StartRegion();
+                dearchivedScenes.SetRegionOriginalID(dearchivedScenes.DefaultOriginalID);
+                dearchivedScenes.SetRegionDirectory("");
+            }
+
             ControlFileLoaded = true;
+
+            return dearchivedScenes;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveScenesGroup.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveScenesGroup.cs
new file mode 100644
index 0000000..d8dace2
--- /dev/null
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveScenesGroup.cs
@@ -0,0 +1,176 @@
+/*
+ * 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 OpenSimulator 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.Linq;
+using System.Text;
+using OpenSim.Region.Framework.Scenes;
+using OpenMetaverse;
+using System.Drawing;
+
+namespace OpenSim.Region.CoreModules.World.Archiver
+{
+    /// <summary>
+    /// A group of regions arranged in a rectangle, possibly with holes.
+    /// </summary>
+    /// <remarks>
+    /// The regions usually (but not necessarily) belong to an archive file, in which case we
+    /// store additional information used to create the archive (e.g., each region's
+    /// directory within the archive).
+    /// </remarks>
+    public class ArchiveScenesGroup
+    {
+        /// <summary>
+        /// All the regions. The outer dictionary contains rows (key: Y coordinate).
+        /// The inner dictionaries contain each row's regions (key: X coordinate).
+        /// </summary>
+        public SortedDictionary<uint, SortedDictionary<uint, Scene>> Regions { get; set; }
+        
+        /// <summary>
+        /// The subdirectory where each region is stored in the archive.
+        /// </summary>
+        protected Dictionary<UUID, string> m_regionDirs;
+
+        /// <summary>
+        /// The grid coordinates of the regions' bounding box.
+        /// </summary>
+        public Rectangle Rect { get; set; }
+
+
+        public ArchiveScenesGroup()
+        {
+            Regions = new SortedDictionary<uint, SortedDictionary<uint, Scene>>();
+            m_regionDirs = new Dictionary<UUID, string>();
+            Rect = new Rectangle(0, 0, 0, 0);
+        }
+
+        public void AddScene(Scene scene)
+        {
+            uint x = scene.RegionInfo.RegionLocX;
+            uint y = scene.RegionInfo.RegionLocY;
+
+            SortedDictionary<uint, Scene> row;
+            if (!Regions.TryGetValue(y, out row))
+            {
+                row = new SortedDictionary<uint, Scene>();
+                Regions[y] = row;
+            }
+
+            row[x] = scene;
+        }
+
+        /// <summary>
+        /// Called after all the scenes have been added. Performs calculations that require
+        /// knowledge of all the scenes.
+        /// </summary>
+        public void CalcSceneLocations()
+        {
+            if (Regions.Count == 0)
+                return;
+
+            // Find the bounding rectangle
+
+            uint firstY = Regions.First().Key;
+            uint lastY = Regions.Last().Key;
+
+            uint? firstX = null;
+            uint? lastX = null;
+
+            foreach (SortedDictionary<uint, Scene> row in Regions.Values)
+            {
+                uint curFirstX = row.First().Key;
+                uint curLastX = row.Last().Key;
+
+                firstX = (firstX == null) ? curFirstX : (firstX < curFirstX) ? firstX : curFirstX;
+                lastX = (lastX == null) ? curLastX : (lastX > curLastX) ? lastX : curLastX;
+            }
+
+            Rect = new Rectangle((int)firstX, (int)firstY, (int)(lastX - firstX + 1), (int)(lastY - firstY + 1));
+
+
+            // Calculate the subdirectory in which each region will be stored in the archive
+
+            m_regionDirs.Clear();
+            ForEachScene(delegate(Scene scene)
+            {
+                // We add the region's coordinates to ensure uniqueness even if multiple regions have the same name
+                string path = string.Format("{0}_{1}_{2}",
+                    scene.RegionInfo.RegionLocX - Rect.X + 1,
+                    scene.RegionInfo.RegionLocY - Rect.Y + 1,
+                    scene.RegionInfo.RegionName.Replace(' ', '_'));
+                m_regionDirs[scene.RegionInfo.RegionID] = path;
+            });
+        }
+
+        /// <summary>
+        /// Returns the subdirectory where the region is stored.
+        /// </summary>
+        /// <param name="regionID"></param>
+        /// <returns></returns>
+        public string GetRegionDir(UUID regionID)
+        {
+            return m_regionDirs[regionID];
+        }
+
+        /// <summary>
+        /// Performs an action on all the scenes in this order: rows from South to North,
+        /// and within each row West to East.
+        /// </summary>
+        /// <param name="action"></param>
+        public void ForEachScene(Action<Scene> action)
+        {
+            foreach (SortedDictionary<uint, Scene> row in Regions.Values)
+            {
+                foreach (Scene scene in row.Values)
+                {
+                    action(scene);
+                }
+            }
+        }
+        
+        /// <summary>
+        /// Returns the scene at position 'location'.
+        /// </summary>
+        /// <param name="location">A location in the grid</param>
+        /// <param name="scene">The scene at this location</param>
+        /// <returns>Whether the scene was found</returns>
+        public bool TryGetScene(Point location, out Scene scene)
+        {
+            SortedDictionary<uint, Scene> row;
+            if (Regions.TryGetValue((uint)location.Y, out row))
+            {
+                if (row.TryGetValue((uint)location.X, out scene))
+                    return true;
+            }
+
+            scene = null;
+            return false;
+        }
+
+    }
+}
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequest.cs
new file mode 100644
index 0000000..d751b1c
--- /dev/null
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequest.cs
@@ -0,0 +1,634 @@
+/*
+ * 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 OpenSimulator 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.IO.Compression;
+using System.Reflection;
+using System.Text.RegularExpressions;
+using System.Threading;
+using System.Xml;
+using log4net;
+using OpenMetaverse;
+using OpenSim.Framework;
+using OpenSim.Framework.Serialization;
+using OpenSim.Region.CoreModules.World.Terrain;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Scenes;
+using Ionic.Zlib;
+using GZipStream = Ionic.Zlib.GZipStream;
+using CompressionMode = Ionic.Zlib.CompressionMode;
+using OpenSim.Framework.Serialization.External;
+
+namespace OpenSim.Region.CoreModules.World.Archiver
+{
+    /// <summary>
+    /// Prepare to write out an archive.
+    /// </summary>
+    public class ArchiveWriteRequest
+    {
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+        /// <summary>
+        /// The minimum major version of OAR that we can write.
+        /// </summary>
+        public static int MIN_MAJOR_VERSION = 0;       
+                
+        /// <summary>
+        /// The maximum major version of OAR that we can write.
+        /// </summary>
+        public static int MAX_MAJOR_VERSION = 1;
+
+        /// <summary>
+        /// Whether we're saving a multi-region archive.
+        /// </summary>
+        public bool MultiRegionFormat { get; set; }
+
+        /// <summary>
+        /// Determine whether this archive will save assets.  Default is true.
+        /// </summary>
+        public bool SaveAssets { get; set; }
+
+        /// <summary>
+        /// Determines which objects will be included in the archive, according to their permissions.
+        /// Default is null, meaning no permission checks.
+        /// </summary>
+        public string CheckPermissions { get; set; }
+
+        protected Scene m_rootScene;
+        protected Stream m_saveStream;
+        protected TarArchiveWriter m_archiveWriter;
+        protected Guid m_requestId;
+        protected Dictionary<string, object> m_options;
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="module">Calling module</param>
+        /// <param name="savePath">The path to which to save data.</param>
+        /// <param name="requestId">The id associated with this request</param>
+        /// <exception cref="System.IO.IOException">
+        /// If there was a problem opening a stream for the file specified by the savePath
+        /// </exception>
+        public ArchiveWriteRequest(Scene scene, string savePath, Guid requestId) : this(scene, requestId)
+        {
+            try
+            {
+                m_saveStream = new GZipStream(new FileStream(savePath, FileMode.Create), CompressionMode.Compress, CompressionLevel.BestCompression);
+            }
+            catch (EntryPointNotFoundException e)
+            {
+                m_log.ErrorFormat(
+                    "[ARCHIVER]: Mismatch between Mono and zlib1g library version when trying to create compression stream."
+                        + "If you've manually installed Mono, have you appropriately updated zlib1g as well?");
+                m_log.ErrorFormat("{0} {1}", e.Message, e.StackTrace);
+            }
+        }
+        
+        /// <summary>
+        /// Constructor.
+        /// </summary>
+        /// <param name="scene">The root scene to archive</param>
+        /// <param name="saveStream">The stream to which to save data.</param>
+        /// <param name="requestId">The id associated with this request</param>
+        public ArchiveWriteRequest(Scene scene, Stream saveStream, Guid requestId) : this(scene, requestId)
+        {
+            m_saveStream = saveStream;
+        }
+
+        protected ArchiveWriteRequest(Scene scene, Guid requestId)
+        {
+            m_rootScene = scene;
+            m_requestId = requestId;
+            m_archiveWriter = null;
+
+            MultiRegionFormat = false;
+            SaveAssets = true;
+            CheckPermissions = null;
+        }
+
+        /// <summary>
+        /// Archive the region requested.
+        /// </summary>
+        /// <exception cref="System.IO.IOException">if there was an io problem with creating the file</exception>
+        public void ArchiveRegion(Dictionary<string, object> options)
+        {
+            m_options = options;
+
+            if (options.ContainsKey("all") && (bool)options["all"])
+                MultiRegionFormat = true;
+
+            if (options.ContainsKey("noassets") && (bool)options["noassets"])
+                SaveAssets = false;
+
+            Object temp;
+            if (options.TryGetValue("checkPermissions", out temp))
+                CheckPermissions = (string)temp;
+
+
+            // Find the regions to archive
+            ArchiveScenesGroup scenesGroup = new ArchiveScenesGroup();
+            if (MultiRegionFormat)
+            {
+                m_log.InfoFormat("[ARCHIVER]: Saving {0} regions", SceneManager.Instance.Scenes.Count);
+                SceneManager.Instance.ForEachScene(delegate(Scene scene)
+                {
+                    scenesGroup.AddScene(scene);
+                });
+            }
+            else
+            {
+                scenesGroup.AddScene(m_rootScene);
+            }
+            scenesGroup.CalcSceneLocations();
+
+
+            m_archiveWriter = new TarArchiveWriter(m_saveStream);
+
+            try
+            {
+                // Write out control file. It should be first so that it will be found ASAP when loading the file.
+                m_archiveWriter.WriteFile(ArchiveConstants.CONTROL_FILE_PATH, CreateControlFile(scenesGroup));
+                m_log.InfoFormat("[ARCHIVER]: Added control file to archive.");
+
+                // Archive the regions
+
+                Dictionary<UUID, AssetType> assetUuids = new Dictionary<UUID, AssetType>();
+
+                scenesGroup.ForEachScene(delegate(Scene scene)
+                {
+                    string regionDir = MultiRegionFormat ? scenesGroup.GetRegionDir(scene.RegionInfo.RegionID) : "";
+                    ArchiveOneRegion(scene, regionDir, assetUuids);
+                });
+
+                // Archive the assets
+
+                if (SaveAssets)
+                {
+                    m_log.DebugFormat("[ARCHIVER]: Saving {0} assets", assetUuids.Count);
+
+                    // Asynchronously request all the assets required to perform this archive operation
+                    AssetsRequest ar
+                        = new AssetsRequest(
+                            new AssetsArchiver(m_archiveWriter), assetUuids,
+                            m_rootScene.AssetService, m_rootScene.UserAccountService,
+                            m_rootScene.RegionInfo.ScopeID, options, ReceivedAllAssets);
+
+                    Util.FireAndForget(o => ar.Execute());
+
+                    // CloseArchive() will be called from ReceivedAllAssets()
+                }
+                else
+                {
+                    m_log.DebugFormat("[ARCHIVER]: Not saving assets since --noassets was specified");
+                    CloseArchive(string.Empty);
+                }
+            }
+            catch (Exception e)
+            {
+                CloseArchive(e.Message);
+                throw;
+            }
+        }
+
+
+        private void ArchiveOneRegion(Scene scene, string regionDir, Dictionary<UUID, AssetType> assetUuids)
+        {
+            m_log.InfoFormat("[ARCHIVER]: Writing region {0}", scene.RegionInfo.RegionName);
+
+            EntityBase[] entities = scene.GetEntities();
+            List<SceneObjectGroup> sceneObjects = new List<SceneObjectGroup>();
+
+            int numObjectsSkippedPermissions = 0;
+         
+            // Filter entities so that we only have scene objects.
+            // FIXME: Would be nicer to have this as a proper list in SceneGraph, since lots of methods
+            // end up having to do this
+            IPermissionsModule permissionsModule = scene.RequestModuleInterface<IPermissionsModule>();
+            foreach (EntityBase entity in entities)
+            {
+                if (entity is SceneObjectGroup)
+                {
+                    SceneObjectGroup sceneObject = (SceneObjectGroup)entity;
+
+                    if (!sceneObject.IsDeleted && !sceneObject.IsAttachment)
+                    {
+                        if (!CanUserArchiveObject(scene.RegionInfo.EstateSettings.EstateOwner, sceneObject, CheckPermissions, permissionsModule))
+                        {
+                            // The user isn't allowed to copy/transfer this object, so it will not be included in the OAR.
+                            ++numObjectsSkippedPermissions;
+                        }
+                        else
+                        {
+                            sceneObjects.Add(sceneObject);
+                        }
+                    }
+                }
+            }
+
+            if (SaveAssets)
+            {
+                UuidGatherer assetGatherer = new UuidGatherer(scene.AssetService);
+                int prevAssets = assetUuids.Count;
+                    
+                foreach (SceneObjectGroup sceneObject in sceneObjects)
+                {
+                    assetGatherer.GatherAssetUuids(sceneObject, assetUuids);
+                }
+
+                m_log.DebugFormat(
+                    "[ARCHIVER]: {0} scene objects to serialize requiring save of {1} assets",
+                    sceneObjects.Count, assetUuids.Count - prevAssets);
+            }
+
+            if (numObjectsSkippedPermissions > 0)
+            {
+                m_log.DebugFormat(
+                    "[ARCHIVER]: {0} scene objects skipped due to lack of permissions",
+                    numObjectsSkippedPermissions);
+            }
+
+            // Make sure that we also request terrain texture assets
+            RegionSettings regionSettings = scene.RegionInfo.RegionSettings;
+    
+            if (regionSettings.TerrainTexture1 != RegionSettings.DEFAULT_TERRAIN_TEXTURE_1)
+                assetUuids[regionSettings.TerrainTexture1] = AssetType.Texture;
+                
+            if (regionSettings.TerrainTexture2 != RegionSettings.DEFAULT_TERRAIN_TEXTURE_2)
+                assetUuids[regionSettings.TerrainTexture2] = AssetType.Texture;
+                
+            if (regionSettings.TerrainTexture3 != RegionSettings.DEFAULT_TERRAIN_TEXTURE_3)
+                assetUuids[regionSettings.TerrainTexture3] = AssetType.Texture;
+                
+            if (regionSettings.TerrainTexture4 != RegionSettings.DEFAULT_TERRAIN_TEXTURE_4)
+                assetUuids[regionSettings.TerrainTexture4] = AssetType.Texture;
+
+            Save(scene, sceneObjects, regionDir);
+        }
+
+        /// <summary>
+        /// Checks whether the user has permission to export an object group to an OAR.
+        /// </summary>
+        /// <param name="user">The user</param>
+        /// <param name="objGroup">The object group</param>
+        /// <param name="checkPermissions">Which permissions to check: "C" = Copy, "T" = Transfer</param>
+        /// <param name="permissionsModule">The scene's permissions module</param>
+        /// <returns>Whether the user is allowed to export the object to an OAR</returns>
+        private bool CanUserArchiveObject(UUID user, SceneObjectGroup objGroup, string checkPermissions, IPermissionsModule permissionsModule)
+        {
+            if (checkPermissions == null)
+                return true;
+
+            if (permissionsModule == null)
+                return true;    // this shouldn't happen
+
+            // Check whether the user is permitted to export all of the parts in the SOG. If any
+            // part can't be exported then the entire SOG can't be exported.
+
+            bool permitted = true;
+            //int primNumber = 1;
+
+            foreach (SceneObjectPart obj in objGroup.Parts)
+            {
+                uint perm;
+                PermissionClass permissionClass = permissionsModule.GetPermissionClass(user, obj);
+                switch (permissionClass)
+                {
+                    case PermissionClass.Owner:
+                        perm = obj.BaseMask;
+                        break;
+                    case PermissionClass.Group:
+                        perm = obj.GroupMask | obj.EveryoneMask;
+                        break;
+                    case PermissionClass.Everyone:
+                    default:
+                        perm = obj.EveryoneMask;
+                        break;
+                }
+
+                bool canCopy = (perm & (uint)PermissionMask.Copy) != 0;
+                bool canTransfer = (perm & (uint)PermissionMask.Transfer) != 0;
+
+                // Special case: if Everyone can copy the object then this implies it can also be
+                // Transferred.
+                // However, if the user is the Owner then we don't check EveryoneMask, because it seems that the mask
+                // always (incorrectly) includes the Copy bit set in this case. But that's a mistake: the viewer
+                // does NOT show that the object has Everyone-Copy permissions, and doesn't allow it to be copied.
+                if (permissionClass != PermissionClass.Owner)
+                    canTransfer |= (obj.EveryoneMask & (uint)PermissionMask.Copy) != 0;
+
+                bool partPermitted = true;
+                if (checkPermissions.Contains("C") && !canCopy)
+                    partPermitted = false;
+                if (checkPermissions.Contains("T") && !canTransfer)
+                    partPermitted = false;
+
+                // If the user is the Creator of the object then it can always be included in the OAR
+                bool creator = (obj.CreatorID.Guid == user.Guid);
+                if (creator)
+                    partPermitted = true;
+
+                //string name = (objGroup.PrimCount == 1) ? objGroup.Name : string.Format("{0} ({1}/{2})", obj.Name, primNumber, objGroup.PrimCount);
+                //m_log.DebugFormat("[ARCHIVER]: Object permissions: {0}: Base={1:X4}, Owner={2:X4}, Everyone={3:X4}, permissionClass={4}, checkPermissions={5}, canCopy={6}, canTransfer={7}, creator={8}, permitted={9}",
+                //    name, obj.BaseMask, obj.OwnerMask, obj.EveryoneMask,
+                //    permissionClass, checkPermissions, canCopy, canTransfer, creator, partPermitted);
+
+                if (!partPermitted)
+                {
+                    permitted = false;
+                    break;
+                }
+
+                //++primNumber;
+            }
+
+            return permitted;
+        }
+
+        /// <summary>
+        /// Create the control file.
+        /// </summary>
+        /// <returns></returns>
+        public string CreateControlFile(ArchiveScenesGroup scenesGroup)
+        {
+            int majorVersion;
+            int minorVersion;
+
+            if (MultiRegionFormat)
+            {
+                majorVersion = MAX_MAJOR_VERSION;
+                minorVersion = 0;
+            }
+            else
+            {
+                // To support older versions of OpenSim, we continue to create single-region OARs
+                // using the old file format. In the future this format will be discontinued.
+                majorVersion = 0;
+                minorVersion = 8;
+            }
+//
+//            if (m_options.ContainsKey("version"))
+//            {
+//                string[] parts = m_options["version"].ToString().Split('.');
+//                if (parts.Length >= 1)
+//                {
+//                    majorVersion = Int32.Parse(parts[0]);                    
+//                                        
+//                    if (parts.Length >= 2)
+//                        minorVersion = Int32.Parse(parts[1]);
+//                }
+//            }
+//            
+//            if (majorVersion < MIN_MAJOR_VERSION || majorVersion > MAX_MAJOR_VERSION)
+//            {
+//                throw new Exception(
+//                    string.Format(
+//                        "OAR version number for save must be between {0} and {1}", 
+//                        MIN_MAJOR_VERSION, MAX_MAJOR_VERSION));
+//            }
+//            else if (majorVersion == MAX_MAJOR_VERSION)
+//            {
+//                // Force 1.0
+//                minorVersion = 0;
+//            }
+//            else if (majorVersion == MIN_MAJOR_VERSION)
+//            {
+//                // Force 0.4
+//                minorVersion = 4;                                        
+//            }
+            
+            m_log.InfoFormat("[ARCHIVER]: Creating version {0}.{1} OAR", majorVersion, minorVersion);
+            if (majorVersion == 1)
+            {
+                m_log.WarnFormat("[ARCHIVER]: Please be aware that version 1.0 OARs are not compatible with OpenSim versions prior to 0.7.4. Do not use the --all option if you want to produce a compatible OAR");
+            }
+
+            String s;
+            
+            using (StringWriter sw = new StringWriter())
+            {
+                using (XmlTextWriter xtw = new XmlTextWriter(sw))
+                {
+                    xtw.Formatting = Formatting.Indented;
+                    xtw.WriteStartDocument();
+                    xtw.WriteStartElement("archive");
+                    xtw.WriteAttributeString("major_version", majorVersion.ToString());
+                    xtw.WriteAttributeString("minor_version", minorVersion.ToString());
+        
+                    xtw.WriteStartElement("creation_info");
+                    DateTime now = DateTime.UtcNow;
+                    TimeSpan t = now - new DateTime(1970, 1, 1);
+                    xtw.WriteElementString("datetime", ((int)t.TotalSeconds).ToString());
+                    if (!MultiRegionFormat)
+                        xtw.WriteElementString("id", m_rootScene.RegionInfo.RegionID.ToString());
+                    xtw.WriteEndElement();
+        
+                    xtw.WriteElementString("assets_included", SaveAssets.ToString());
+
+                    if (MultiRegionFormat)
+                    {
+                        WriteRegionsManifest(scenesGroup, xtw);
+                    }
+                    else
+                    {
+                        xtw.WriteStartElement("region_info");
+                        WriteRegionInfo(m_rootScene, xtw);
+                        xtw.WriteEndElement();
+                    }
+
+                    xtw.WriteEndElement();
+        
+                    xtw.Flush();
+                }
+
+                s = sw.ToString();
+            }
+
+            return s;
+        }
+
+        /// <summary>
+        /// Writes the list of regions included in a multi-region OAR.
+        /// </summary>
+        private static void WriteRegionsManifest(ArchiveScenesGroup scenesGroup, XmlTextWriter xtw)
+        {
+            xtw.WriteStartElement("regions");
+
+            // Write the regions in order: rows from South to North, then regions from West to East.
+            // The list of regions can have "holes"; we write empty elements in their position.
+
+            for (uint y = (uint)scenesGroup.Rect.Top; y < scenesGroup.Rect.Bottom; ++y)
+            {
+                SortedDictionary<uint, Scene> row;
+                if (scenesGroup.Regions.TryGetValue(y, out row))
+                {
+                    xtw.WriteStartElement("row");
+
+                    for (uint x = (uint)scenesGroup.Rect.Left; x < scenesGroup.Rect.Right; ++x)
+                    {
+                        Scene scene;
+                        if (row.TryGetValue(x, out scene))
+                        {
+                            xtw.WriteStartElement("region");
+                            xtw.WriteElementString("id", scene.RegionInfo.RegionID.ToString());
+                            xtw.WriteElementString("dir", scenesGroup.GetRegionDir(scene.RegionInfo.RegionID));
+                            WriteRegionInfo(scene, xtw);
+                            xtw.WriteEndElement();
+                        }
+                        else
+                        {
+                            // Write a placeholder for a missing region
+                            xtw.WriteElementString("region", "");
+                        }
+                    }
+
+                    xtw.WriteEndElement();
+                }
+                else
+                {
+                    // Write a placeholder for a missing row
+                    xtw.WriteElementString("row", "");
+                }
+            }
+
+            xtw.WriteEndElement();  // "regions"
+        }
+
+        protected static void WriteRegionInfo(Scene scene, XmlTextWriter xtw)
+        {
+            bool isMegaregion;
+            Vector2 size;
+
+            IRegionCombinerModule rcMod = scene.RequestModuleInterface<IRegionCombinerModule>();
+
+            if (rcMod != null)
+                isMegaregion = rcMod.IsRootForMegaregion(scene.RegionInfo.RegionID);
+            else
+                isMegaregion = false;
+    
+            if (isMegaregion)
+                size = rcMod.GetSizeOfMegaregion(scene.RegionInfo.RegionID);
+            else
+                size = new Vector2((float)Constants.RegionSize, (float)Constants.RegionSize);
+    
+            xtw.WriteElementString("is_megaregion", isMegaregion.ToString());
+            xtw.WriteElementString("size_in_meters", string.Format("{0},{1}", size.X, size.Y));
+        }
+
+
+        protected void Save(Scene scene, List<SceneObjectGroup> sceneObjects, string regionDir)
+        {
+            if (regionDir != string.Empty)
+                regionDir = ArchiveConstants.REGIONS_PATH + regionDir + "/";
+
+            m_log.InfoFormat("[ARCHIVER]: Adding region settings to archive.");
+
+            // Write out region settings
+            string settingsPath = String.Format("{0}{1}{2}.xml",
+                regionDir, ArchiveConstants.SETTINGS_PATH, scene.RegionInfo.RegionName);
+            m_archiveWriter.WriteFile(settingsPath, RegionSettingsSerializer.Serialize(scene.RegionInfo.RegionSettings));
+
+            m_log.InfoFormat("[ARCHIVER]: Adding parcel settings to archive.");
+
+            // Write out land data (aka parcel) settings
+            List<ILandObject> landObjects = scene.LandChannel.AllParcels();
+            foreach (ILandObject lo in landObjects)
+            {
+                LandData landData = lo.LandData;
+                string landDataPath = String.Format("{0}{1}{2}.xml",
+                    regionDir, ArchiveConstants.LANDDATA_PATH, landData.GlobalID.ToString());
+                m_archiveWriter.WriteFile(landDataPath, LandDataSerializer.Serialize(landData, m_options));
+            }
+
+            m_log.InfoFormat("[ARCHIVER]: Adding terrain information to archive.");
+
+            // Write out terrain
+            string terrainPath = String.Format("{0}{1}{2}.r32",
+                regionDir, ArchiveConstants.TERRAINS_PATH, scene.RegionInfo.RegionName);
+
+            MemoryStream ms = new MemoryStream();
+            scene.RequestModuleInterface<ITerrainModule>().SaveToStream(terrainPath, ms);
+            m_archiveWriter.WriteFile(terrainPath, ms.ToArray());
+            ms.Close();
+
+            m_log.InfoFormat("[ARCHIVER]: Adding scene objects to archive.");
+
+            // Write out scene object metadata
+            IRegionSerialiserModule serializer = scene.RequestModuleInterface<IRegionSerialiserModule>();
+            foreach (SceneObjectGroup sceneObject in sceneObjects)
+            {
+                //m_log.DebugFormat("[ARCHIVER]: Saving {0} {1}, {2}", entity.Name, entity.UUID, entity.GetType());
+
+                string serializedObject = serializer.SerializeGroupToXml2(sceneObject, m_options);
+                string objectPath = string.Format("{0}{1}", regionDir, ArchiveHelpers.CreateObjectPath(sceneObject));
+                m_archiveWriter.WriteFile(objectPath, serializedObject);
+            }
+        }
+        
+        protected void ReceivedAllAssets(
+            ICollection<UUID> assetsFoundUuids, ICollection<UUID> assetsNotFoundUuids)
+        {
+            foreach (UUID uuid in assetsNotFoundUuids)
+            {
+                m_log.DebugFormat("[ARCHIVER]: Could not find asset {0}", uuid);
+            }
+
+            //            m_log.InfoFormat(
+            //                "[ARCHIVER]: Received {0} of {1} assets requested",
+            //                assetsFoundUuids.Count, assetsFoundUuids.Count + assetsNotFoundUuids.Count);
+
+            CloseArchive(String.Empty);
+        }
+
+        
+        /// <summary>
+        /// Closes the archive and notifies that we're done.
+        /// </summary>
+        /// <param name="errorMessage">The error that occurred, or empty for success</param>
+        protected void CloseArchive(string errorMessage)
+        {
+            try
+            {
+                if (m_archiveWriter != null)
+                    m_archiveWriter.Close();
+                m_saveStream.Close();
+            }
+            catch (Exception e)
+            {
+                m_log.Error(string.Format("[ARCHIVER]: Error closing archive: {0} ", e.Message), e);
+                if (errorMessage == string.Empty)
+                    errorMessage = e.Message;
+            }
+            
+            m_log.InfoFormat("[ARCHIVER]: Finished writing out OAR for {0}", m_rootScene.RegionInfo.RegionName);
+
+            m_rootScene.EventManager.TriggerOarFileSaved(m_requestId, errorMessage);
+        }
+
+    }
+}
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestExecution.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestExecution.cs
deleted file mode 100644
index 0780d86..0000000
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestExecution.cs
+++ /dev/null
@@ -1,153 +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 OpenSimulator 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 log4net;
-using OpenMetaverse;
-using OpenSim.Framework;
-using OpenSim.Framework.Serialization;
-using OpenSim.Framework.Serialization.External;
-using OpenSim.Region.CoreModules.World.Terrain;
-using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
-
-namespace OpenSim.Region.CoreModules.World.Archiver
-{
-    /// <summary>
-    /// Method called when all the necessary assets for an archive request have been received.
-    /// </summary>
-    public delegate void AssetsRequestCallback(
-        ICollection<UUID> assetsFoundUuids, ICollection<UUID> assetsNotFoundUuids);
-
-    /// <summary>
-    /// Execute the write of an archive once we have received all the necessary data
-    /// </summary>
-    public class ArchiveWriteRequestExecution
-    {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-
-        protected ITerrainModule m_terrainModule;
-        protected IRegionSerialiserModule m_serialiser;
-        protected List<SceneObjectGroup> m_sceneObjects;
-        protected Scene m_scene;
-        protected TarArchiveWriter m_archiveWriter;
-        protected Guid m_requestId;
-        protected Dictionary<string, object> m_options;
-
-        public ArchiveWriteRequestExecution(
-             List<SceneObjectGroup> sceneObjects,
-             ITerrainModule terrainModule,
-             IRegionSerialiserModule serialiser,
-             Scene scene,
-             TarArchiveWriter archiveWriter,
-             Guid requestId,
-             Dictionary<string, object> options)
-        {
-            m_sceneObjects = sceneObjects;
-            m_terrainModule = terrainModule;
-            m_serialiser = serialiser;
-            m_scene = scene;
-            m_archiveWriter = archiveWriter;
-            m_requestId = requestId;
-            m_options = options;
-        }
-
-        protected internal void ReceivedAllAssets(
-            ICollection<UUID> assetsFoundUuids, ICollection<UUID> assetsNotFoundUuids)
-        {
-            try
-            {
-                Save(assetsFoundUuids, assetsNotFoundUuids);
-            }
-            finally
-            {
-                m_archiveWriter.Close();
-            }
-            
-            m_log.InfoFormat("[ARCHIVER]: Finished writing out OAR for {0}", m_scene.RegionInfo.RegionName);
-
-            m_scene.EventManager.TriggerOarFileSaved(m_requestId, String.Empty);
-        }
-
-        protected internal void Save(ICollection<UUID> assetsFoundUuids, ICollection<UUID> assetsNotFoundUuids)
-        {
-            foreach (UUID uuid in assetsNotFoundUuids)
-            {
-                m_log.DebugFormat("[ARCHIVER]: Could not find asset {0}", uuid);
-            }
-
-//            m_log.InfoFormat(
-//                "[ARCHIVER]: Received {0} of {1} assets requested",
-//                assetsFoundUuids.Count, assetsFoundUuids.Count + assetsNotFoundUuids.Count);
-
-            m_log.InfoFormat("[ARCHIVER]: Adding region settings to archive.");
-
-            // Write out region settings
-            string settingsPath
-                = String.Format("{0}{1}.xml", ArchiveConstants.SETTINGS_PATH, m_scene.RegionInfo.RegionName);
-            m_archiveWriter.WriteFile(settingsPath, RegionSettingsSerializer.Serialize(m_scene.RegionInfo.RegionSettings));
-
-            m_log.InfoFormat("[ARCHIVER]: Adding parcel settings to archive.");
-
-            // Write out land data (aka parcel) settings
-            List<ILandObject>landObjects = m_scene.LandChannel.AllParcels();
-            foreach (ILandObject lo in landObjects)
-            {
-                LandData landData = lo.LandData;
-                string landDataPath = String.Format("{0}{1}.xml", ArchiveConstants.LANDDATA_PATH, 
-                                                    landData.GlobalID.ToString());
-                m_archiveWriter.WriteFile(landDataPath, LandDataSerializer.Serialize(landData, m_options));
-            }
-
-            m_log.InfoFormat("[ARCHIVER]: Adding terrain information to archive.");
-
-            // Write out terrain
-            string terrainPath
-                = String.Format("{0}{1}.r32", ArchiveConstants.TERRAINS_PATH, m_scene.RegionInfo.RegionName);
-
-            MemoryStream ms = new MemoryStream();
-            m_terrainModule.SaveToStream(terrainPath, ms);
-            m_archiveWriter.WriteFile(terrainPath, ms.ToArray());
-            ms.Close();
-
-            m_log.InfoFormat("[ARCHIVER]: Adding scene objects to archive.");
-           
-            // Write out scene object metadata
-            foreach (SceneObjectGroup sceneObject in m_sceneObjects)
-            {
-                //m_log.DebugFormat("[ARCHIVER]: Saving {0} {1}, {2}", entity.Name, entity.UUID, entity.GetType());
-
-                string serializedObject = m_serialiser.SerializeGroupToXml2(sceneObject, m_options);                
-                m_archiveWriter.WriteFile(ArchiveHelpers.CreateObjectPath(sceneObject), serializedObject);
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs
deleted file mode 100644
index 4edaaca..0000000
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs
+++ /dev/null
@@ -1,438 +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 OpenSimulator 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.IO.Compression;
-using System.Reflection;
-using System.Text.RegularExpressions;
-using System.Threading;
-using System.Xml;
-using log4net;
-using OpenMetaverse;
-using OpenSim.Framework;
-using OpenSim.Framework.Serialization;
-using OpenSim.Region.CoreModules.World.Terrain;
-using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
-using Ionic.Zlib;
-using GZipStream = Ionic.Zlib.GZipStream;
-using CompressionMode = Ionic.Zlib.CompressionMode;
-
-namespace OpenSim.Region.CoreModules.World.Archiver
-{
-    /// <summary>
-    /// Prepare to write out an archive.
-    /// </summary>
-    public class ArchiveWriteRequestPreparation
-    {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-
-        /// <summary>
-        /// The minimum major version of OAR that we can write.
-        /// </summary>
-        public static int MIN_MAJOR_VERSION = 0;       
-                
-        /// <summary>
-        /// The maximum major version of OAR that we can write.
-        /// </summary>
-        public static int MAX_MAJOR_VERSION = 0;
-
-        /// <summary>
-        /// Determine whether this archive will save assets.  Default is true.
-        /// </summary>
-        public bool SaveAssets { get; set; }
-
-        protected ArchiverModule m_module;
-        protected Scene m_scene;
-        protected Stream m_saveStream;
-        protected Guid m_requestId;
-
-        /// <summary>
-        /// Constructor
-        /// </summary>
-        /// <param name="module">Calling module</param>
-        /// <param name="savePath">The path to which to save data.</param>
-        /// <param name="requestId">The id associated with this request</param>
-        /// <exception cref="System.IO.IOException">
-        /// If there was a problem opening a stream for the file specified by the savePath
-        /// </exception>
-        public ArchiveWriteRequestPreparation(ArchiverModule module, string savePath, Guid requestId) : this(module, requestId)
-        {
-            try
-            {
-                m_saveStream = new GZipStream(new FileStream(savePath, FileMode.Create), CompressionMode.Compress, CompressionLevel.BestCompression);
-            }
-            catch (EntryPointNotFoundException e)
-            {
-                m_log.ErrorFormat(
-                    "[ARCHIVER]: Mismatch between Mono and zlib1g library version when trying to create compression stream."
-                        + "If you've manually installed Mono, have you appropriately updated zlib1g as well?");
-                m_log.ErrorFormat("{0} {1}", e.Message, e.StackTrace);
-            }
-        }
-        
-        /// <summary>
-        /// Constructor.
-        /// </summary>
-        /// <param name="module">Calling module</param>
-        /// <param name="saveStream">The stream to which to save data.</param>
-        /// <param name="requestId">The id associated with this request</param>
-        public ArchiveWriteRequestPreparation(ArchiverModule module, Stream saveStream, Guid requestId) : this(module, requestId)
-        {
-            m_saveStream = saveStream;
-        }
-
-        protected ArchiveWriteRequestPreparation(ArchiverModule module, Guid requestId)
-        {
-            m_module = module;
-
-            // FIXME: This is only here for regression test purposes since they do not supply a module.  Need to fix
-            // this.
-            if (m_module != null)
-                m_scene = m_module.Scene;
-
-            m_requestId = requestId;
-
-            SaveAssets = true;
-        }
-
-        /// <summary>
-        /// Archive the region requested.
-        /// </summary>
-        /// <exception cref="System.IO.IOException">if there was an io problem with creating the file</exception>
-        public void ArchiveRegion(Dictionary<string, object> options)
-        {
-            if (options.ContainsKey("noassets") && (bool)options["noassets"])
-                SaveAssets = false;
-
-            try
-            {
-                Dictionary<UUID, AssetType> assetUuids = new Dictionary<UUID, AssetType>();
-    
-                EntityBase[] entities = m_scene.GetEntities();
-                List<SceneObjectGroup> sceneObjects = new List<SceneObjectGroup>();
-
-                string checkPermissions = null;
-                int numObjectsSkippedPermissions = 0;
-                Object temp;
-                if (options.TryGetValue("checkPermissions", out temp))
-                    checkPermissions = (string)temp;
-         
-                // Filter entities so that we only have scene objects.
-                // FIXME: Would be nicer to have this as a proper list in SceneGraph, since lots of methods
-                // end up having to do this
-                foreach (EntityBase entity in entities)
-                {
-                    if (entity is SceneObjectGroup)
-                    {
-                        SceneObjectGroup sceneObject = (SceneObjectGroup)entity;
-
-                        if (!sceneObject.IsDeleted && !sceneObject.IsAttachment)
-                        {
-                            if (!CanUserArchiveObject(m_scene.RegionInfo.EstateSettings.EstateOwner, sceneObject, checkPermissions))
-                            {
-                                // The user isn't allowed to copy/transfer this object, so it will not be included in the OAR.
-                                ++numObjectsSkippedPermissions;
-                            }
-                            else
-                            {
-                                sceneObjects.Add(sceneObject);
-                            }
-                        }
-                    }
-                }
-
-                if (SaveAssets)
-                {
-                    UuidGatherer assetGatherer = new UuidGatherer(m_scene.AssetService);
-
-                    foreach (SceneObjectGroup sceneObject in sceneObjects)
-                    {
-                        assetGatherer.GatherAssetUuids(sceneObject, assetUuids);
-                    }
-
-                    m_log.DebugFormat(
-                        "[ARCHIVER]: {0} scene objects to serialize requiring save of {1} assets",
-                        sceneObjects.Count, assetUuids.Count);
-                }
-                else
-                {
-                    m_log.DebugFormat("[ARCHIVER]: Not saving assets since --noassets was specified");
-                }
-
-                if (numObjectsSkippedPermissions > 0)
-                {
-                    m_log.DebugFormat(
-                        "[ARCHIVER]: {0} scene objects skipped due to lack of permissions",
-                        numObjectsSkippedPermissions);
-                }
-
-                // Make sure that we also request terrain texture assets
-                RegionSettings regionSettings = m_scene.RegionInfo.RegionSettings;
-    
-                if (regionSettings.TerrainTexture1 != RegionSettings.DEFAULT_TERRAIN_TEXTURE_1)
-                    assetUuids[regionSettings.TerrainTexture1] = AssetType.Texture;
-                
-                if (regionSettings.TerrainTexture2 != RegionSettings.DEFAULT_TERRAIN_TEXTURE_2)
-                    assetUuids[regionSettings.TerrainTexture2] = AssetType.Texture;
-                
-                if (regionSettings.TerrainTexture3 != RegionSettings.DEFAULT_TERRAIN_TEXTURE_3)
-                    assetUuids[regionSettings.TerrainTexture3] = AssetType.Texture;
-                
-                if (regionSettings.TerrainTexture4 != RegionSettings.DEFAULT_TERRAIN_TEXTURE_4)
-                    assetUuids[regionSettings.TerrainTexture4] = AssetType.Texture;
-    
-                TarArchiveWriter archiveWriter = new TarArchiveWriter(m_saveStream);
-                
-                // Asynchronously request all the assets required to perform this archive operation
-                ArchiveWriteRequestExecution awre
-                    = new ArchiveWriteRequestExecution(
-                        sceneObjects,
-                        m_scene.RequestModuleInterface<ITerrainModule>(),
-                        m_scene.RequestModuleInterface<IRegionSerialiserModule>(),
-                        m_scene,
-                        archiveWriter,
-                        m_requestId,
-                        options);
-    
-                m_log.InfoFormat("[ARCHIVER]: Creating archive file.  This may take some time.");
-    
-                // Write out control file.  This has to be done first so that subsequent loaders will see this file first
-                // XXX: I know this is a weak way of doing it since external non-OAR aware tar executables will not do this
-                archiveWriter.WriteFile(ArchiveConstants.CONTROL_FILE_PATH, CreateControlFile(options));
-                m_log.InfoFormat("[ARCHIVER]: Added control file to archive.");
-
-                if (SaveAssets)
-                {
-                    AssetsRequest ar
-                        = new AssetsRequest(
-                            new AssetsArchiver(archiveWriter), assetUuids,
-                            m_scene.AssetService, m_scene.UserAccountService, 
-                            m_scene.RegionInfo.ScopeID, options, awre.ReceivedAllAssets);
-
-                    Util.FireAndForget(o => ar.Execute());
-                }
-                else
-                {
-                    awre.ReceivedAllAssets(new List<UUID>(), new List<UUID>());
-                }
-            }
-            catch (Exception) 
-            {
-                m_saveStream.Close();
-                throw;
-            }    
-        }
-
-        /// <summary>
-        /// Checks whether the user has permission to export an object group to an OAR.
-        /// </summary>
-        /// <param name="user">The user</param>
-        /// <param name="objGroup">The object group</param>
-        /// <param name="checkPermissions">Which permissions to check: "C" = Copy, "T" = Transfer</param>
-        /// <returns>Whether the user is allowed to export the object to an OAR</returns>
-        private bool CanUserArchiveObject(UUID user, SceneObjectGroup objGroup, string checkPermissions)
-        {
-            if (checkPermissions == null)
-                return true;
-
-            IPermissionsModule module = m_scene.RequestModuleInterface<IPermissionsModule>();
-            if (module == null)
-                return true;    // this shouldn't happen
-
-            // Check whether the user is permitted to export all of the parts in the SOG. If any
-            // part can't be exported then the entire SOG can't be exported.
-
-            bool permitted = true;
-            //int primNumber = 1;
-
-            foreach (SceneObjectPart obj in objGroup.Parts)
-            {
-                uint perm;
-                PermissionClass permissionClass = module.GetPermissionClass(user, obj);
-                switch (permissionClass)
-                {
-                    case PermissionClass.Owner:
-                        perm = obj.BaseMask;
-                        break;
-                    case PermissionClass.Group:
-                        perm = obj.GroupMask | obj.EveryoneMask;
-                        break;
-                    case PermissionClass.Everyone:
-                    default:
-                        perm = obj.EveryoneMask;
-                        break;
-                }
-
-                bool canCopy = (perm & (uint)PermissionMask.Copy) != 0;
-                bool canTransfer = (perm & (uint)PermissionMask.Transfer) != 0;
-
-                // Special case: if Everyone can copy the object then this implies it can also be
-                // Transferred.
-                // However, if the user is the Owner then we don't check EveryoneMask, because it seems that the mask
-                // always (incorrectly) includes the Copy bit set in this case. But that's a mistake: the viewer
-                // does NOT show that the object has Everyone-Copy permissions, and doesn't allow it to be copied.
-                if (permissionClass != PermissionClass.Owner)
-                    canTransfer |= (obj.EveryoneMask & (uint)PermissionMask.Copy) != 0;
-
-                bool partPermitted = true;
-                if (checkPermissions.Contains("C") && !canCopy)
-                    partPermitted = false;
-                if (checkPermissions.Contains("T") && !canTransfer)
-                    partPermitted = false;
-
-                // If the user is the Creator of the object then it can always be included in the OAR
-                bool creator = (obj.CreatorID.Guid == user.Guid);
-                if (creator)
-                    partPermitted = true;
-
-                //string name = (objGroup.PrimCount == 1) ? objGroup.Name : string.Format("{0} ({1}/{2})", obj.Name, primNumber, objGroup.PrimCount);
-                //m_log.DebugFormat("[ARCHIVER]: Object permissions: {0}: Base={1:X4}, Owner={2:X4}, Everyone={3:X4}, permissionClass={4}, checkPermissions={5}, canCopy={6}, canTransfer={7}, creator={8}, permitted={9}",
-                //    name, obj.BaseMask, obj.OwnerMask, obj.EveryoneMask,
-                //    permissionClass, checkPermissions, canCopy, canTransfer, creator, partPermitted);
-
-                if (!partPermitted)
-                {
-                    permitted = false;
-                    break;
-                }
-
-                //++primNumber;
-            }
-
-            return permitted;
-        }
-
-        /// <summary>
-        /// Create the control file for the most up to date archive
-        /// </summary>
-        /// <returns></returns>
-        public string CreateControlFile(Dictionary<string, object> options)
-        {
-            int majorVersion = MAX_MAJOR_VERSION, minorVersion = 8;
-//
-//            if (options.ContainsKey("version"))
-//            {
-//                string[] parts = options["version"].ToString().Split('.');
-//                if (parts.Length >= 1)
-//                {
-//                    majorVersion = Int32.Parse(parts[0]);                    
-//                                        
-//                    if (parts.Length >= 2)
-//                        minorVersion = Int32.Parse(parts[1]);
-//                }
-//            }
-//            
-//            if (majorVersion < MIN_MAJOR_VERSION || majorVersion > MAX_MAJOR_VERSION)
-//            {
-//                throw new Exception(
-//                    string.Format(
-//                        "OAR version number for save must be between {0} and {1}", 
-//                        MIN_MAJOR_VERSION, MAX_MAJOR_VERSION));
-//            }
-//            else if (majorVersion == MAX_MAJOR_VERSION)
-//            {
-//                // Force 1.0
-//                minorVersion = 0;
-//            }
-//            else if (majorVersion == MIN_MAJOR_VERSION)
-//            {
-//                // Force 0.4
-//                minorVersion = 4;                                        
-//            }
-            
-            m_log.InfoFormat("[ARCHIVER]: Creating version {0}.{1} OAR", majorVersion, minorVersion);
-            //if (majorVersion == 1)
-            //{
-            //    m_log.WarnFormat("[ARCHIVER]: Please be aware that version 1.0 OARs are not compatible with OpenSim 0.7.0.2 and earlier.  Please use the --version=0 option if you want to produce a compatible OAR");
-            //}
-
-            String s;
-            
-            using (StringWriter sw = new StringWriter())
-            {
-                using (XmlTextWriter xtw = new XmlTextWriter(sw))
-                {
-                    xtw.Formatting = Formatting.Indented;
-                    xtw.WriteStartDocument();
-                    xtw.WriteStartElement("archive");
-                    xtw.WriteAttributeString("major_version", majorVersion.ToString());
-                    xtw.WriteAttributeString("minor_version", minorVersion.ToString());
-        
-                    xtw.WriteStartElement("creation_info");
-                    DateTime now = DateTime.UtcNow;
-                    TimeSpan t = now - new DateTime(1970, 1, 1);
-                    xtw.WriteElementString("datetime", ((int)t.TotalSeconds).ToString());
-                    xtw.WriteElementString("id", UUID.Random().ToString());
-                    xtw.WriteEndElement();
-
-                    xtw.WriteStartElement("region_info");
-
-                    bool isMegaregion;
-                    Vector2 size;
-                    IRegionCombinerModule rcMod = null;
-
-                    // FIXME: This is only here for regression test purposes since they do not supply a module.  Need to fix
-                    // this, possibly by doing control file creation somewhere else.
-                    if (m_module != null)
-                        rcMod = m_module.RegionCombinerModule;
-
-                    if (rcMod != null)
-                        isMegaregion = rcMod.IsRootForMegaregion(m_scene.RegionInfo.RegionID);
-                    else
-                        isMegaregion = false;
-
-                    if (isMegaregion)
-                        size = rcMod.GetSizeOfMegaregion(m_scene.RegionInfo.RegionID);
-                    else
-                        size = new Vector2((float)Constants.RegionSize, (float)Constants.RegionSize);
-
-                    xtw.WriteElementString("is_megaregion", isMegaregion.ToString());
-                    xtw.WriteElementString("size_in_meters", string.Format("{0},{1}", size.X, size.Y));
-
-                    xtw.WriteEndElement();
-        
-                    xtw.WriteElementString("assets_included", SaveAssets.ToString());
-
-                    xtw.WriteEndElement();
-        
-                    xtw.Flush();
-                }
-
-                s = sw.ToString();
-            }
-
-//            if (m_scene != null)
-//                Console.WriteLine(
-//                    "[ARCHIVE WRITE REQUEST PREPARATION]: Control file for {0} is: {1}", m_scene.RegionInfo.RegionName, s);
-
-            return s;
-        }
-    }
-}
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs
index bf3b124..1be6386 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs
@@ -32,6 +32,9 @@ using System.Reflection;
 using log4net;
 using NDesk.Options;
 using Nini.Config;
+using Mono.Addins;
+using OpenSim.Framework;
+using OpenSim.Framework.Console;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 
@@ -40,6 +43,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
     /// <summary>
     /// This module loads and saves OpenSimulator region archives
     /// </summary>
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "ArchiverModule")]
     public class ArchiverModule : INonSharedRegionModule, IRegionArchiverModule
     {
         private static readonly ILog m_log = 
@@ -117,7 +121,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
 //
 //            foreach (string param in mainParams)
 //                m_log.DebugFormat("GOT PARAM [{0}]", param);
-            
+
             if (mainParams.Count > 2)
             {
                 DearchiveRegion(mainParams[2], mergeOar, skipAssets, Guid.Empty);
@@ -146,17 +150,22 @@ namespace OpenSim.Region.CoreModules.World.Archiver
             ops.Add("noassets", delegate(string v) { options["noassets"] = v != null; });
             ops.Add("publish", v => options["wipe-owners"] = v != null);
             ops.Add("perm=", delegate(string v) { options["checkPermissions"] = v; });
+            ops.Add("all", delegate(string v) { options["all"] = v != null; });
 
             List<string> mainParams = ops.Parse(cmdparams);
 
+            string path;
             if (mainParams.Count > 2)
-            {
-                ArchiveRegion(mainParams[2], options);
-            }
+                path = mainParams[2];
             else
-            {
-                ArchiveRegion(DEFAULT_OAR_BACKUP_FILENAME, options);
-            }
+                path = DEFAULT_OAR_BACKUP_FILENAME;
+
+            // Not doing this right now as this causes some problems with auto-backup systems.  Maybe a force flag is
+            // needed
+//            if (!ConsoleUtil.CheckFileDoesNotExist(MainConsole.Instance, path))
+//                return;
+
+            ArchiveRegion(path, options);
         }
         
         public void ArchiveRegion(string savePath, Dictionary<string, object> options)
@@ -169,7 +178,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
             m_log.InfoFormat(
                 "[ARCHIVER]: Writing archive for region {0} to {1}", Scene.RegionInfo.RegionName, savePath);
             
-            new ArchiveWriteRequestPreparation(this, savePath, requestId).ArchiveRegion(options);
+            new ArchiveWriteRequest(Scene, savePath, requestId).ArchiveRegion(options);
         }
 
         public void ArchiveRegion(Stream saveStream)
@@ -184,7 +193,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
 
         public void ArchiveRegion(Stream saveStream, Guid requestId, Dictionary<string, object> options)
         {
-            new ArchiveWriteRequestPreparation(this, saveStream, requestId).ArchiveRegion(options);
+            new ArchiveWriteRequest(Scene, saveStream, requestId).ArchiveRegion(options);
         }
 
         public void DearchiveRegion(string loadPath)
diff --git a/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs
index 89e9593..e2f8833 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs
@@ -46,6 +46,12 @@ namespace OpenSim.Region.CoreModules.World.Archiver
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
+        /// <summary>
+        /// Method called when all the necessary assets for an archive request have been received.
+        /// </summary>
+        public delegate void AssetsRequestCallback(
+            ICollection<UUID> assetsFoundUuids, ICollection<UUID> assetsNotFoundUuids);
+
         enum RequestState
         {
             Initial,
@@ -123,6 +129,10 @@ namespace OpenSim.Region.CoreModules.World.Archiver
             m_options = options;
             m_repliesRequired = uuids.Count;
 
+            // FIXME: This is a really poor way of handling the timeout since it will always leave the original requesting thread
+            // hanging.  Need to restructure so an original request thread waits for a ManualResetEvent on asset received
+            // so we can properly abort that thread.  Or request all assets synchronously, though that would be a more
+            // radical change
             m_requestCallbackTimer = new System.Timers.Timer(TIMEOUT);
             m_requestCallbackTimer.AutoReset = false;
             m_requestCallbackTimer.Elapsed += new ElapsedEventHandler(OnRequestCallbackTimeout);
diff --git a/OpenSim/Region/CoreModules/World/Archiver/DearchiveScenesGroup.cs b/OpenSim/Region/CoreModules/World/Archiver/DearchiveScenesGroup.cs
new file mode 100644
index 0000000..3dcc020
--- /dev/null
+++ b/OpenSim/Region/CoreModules/World/Archiver/DearchiveScenesGroup.cs
@@ -0,0 +1,232 @@
+/*
+ * 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 OpenSimulator 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.Linq;
+using System.Text;
+using OpenSim.Region.Framework.Scenes;
+using OpenMetaverse;
+using System.Drawing;
+using log4net;
+using System.Reflection;
+using OpenSim.Framework.Serialization;
+
+namespace OpenSim.Region.CoreModules.World.Archiver
+{
+    /// <summary>
+    /// The regions included in an OAR file.
+    /// </summary>
+    public class DearchiveScenesInfo
+    {
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+        /// <summary>
+        /// One region in the archive.
+        /// </summary>
+        public class RegionInfo
+        {
+            /// <summary>
+            /// The subdirectory in which the region is stored.
+            /// </summary>
+            public string Directory { get; set; }
+
+            /// <summary>
+            /// The region's coordinates (relative to the South-West corner of the block).
+            /// </summary>
+            public Point Location { get; set; }
+
+            /// <summary>
+            /// The UUID of the original scene from which this archived region was saved.
+            /// </summary>
+            public string OriginalID { get; set; }
+
+            /// <summary>
+            /// The scene in the current simulator into which this region is loaded.
+            /// If null then the region doesn't have a corresponding scene, and it won't be loaded.
+            /// </summary>
+            public Scene Scene { get; set; }
+        }
+
+        /// <summary>
+        /// Whether this archive uses the multi-region format.
+        /// </summary>
+        public Boolean MultiRegionFormat { get; set; }
+
+        /// <summary>
+        /// Maps (Region directory -> region)
+        /// </summary>
+        protected Dictionary<string, RegionInfo> m_directory2region = new Dictionary<string, RegionInfo>();
+
+        /// <summary>
+        /// Maps (UUID of the scene in the simulator where the region will be loaded -> region)
+        /// </summary>
+        protected Dictionary<UUID, RegionInfo> m_newId2region = new Dictionary<UUID, RegionInfo>();
+
+        public int LoadedCreationDateTime { get; set; }
+        public string DefaultOriginalID { get; set; }
+
+        // These variables are used while reading the archive control file
+        protected int? m_curY = null;
+        protected int? m_curX = null;
+        protected RegionInfo m_curRegion;
+
+
+        public DearchiveScenesInfo()
+        {
+            MultiRegionFormat = false;
+        }
+
+
+        // The following methods are used while reading the archive control file
+
+        public void StartRow()
+        {
+            m_curY = (m_curY == null) ? 0 : m_curY + 1;
+            m_curX = null;
+        }
+
+        public void StartRegion()
+        {
+            m_curX = (m_curX == null) ? 0 : m_curX + 1;
+            // Note: this doesn't mean we have a real region in this location; this could just be a "hole"
+        }
+
+        public void SetRegionOriginalID(string id)
+        {
+            m_curRegion = new RegionInfo();
+            m_curRegion.Location = new Point((int)m_curX, (int)m_curY);
+            m_curRegion.OriginalID = id;
+            // 'curRegion' will be saved in 'm_directory2region' when SetRegionDir() is called
+        }
+
+        public void SetRegionDirectory(string directory)
+        {
+            m_curRegion.Directory = directory;
+            m_directory2region[directory] = m_curRegion;
+        }
+
+
+        /// <summary>
+        /// Sets all the scenes present in the simulator.
+        /// </summary>
+        /// <remarks>
+        /// This method matches regions in the archive to scenes in the simulator according to
+        /// their relative position. We only load regions if there's an existing Scene in the
+        /// grid location where the region should be loaded.
+        /// </remarks>
+        /// <param name="rootScene">The scene where the Load OAR operation was run</param>
+        /// <param name="simulatorScenes">All the scenes in the simulator</param>
+        public void SetSimulatorScenes(Scene rootScene, ArchiveScenesGroup simulatorScenes)
+        {
+            foreach (RegionInfo archivedRegion in m_directory2region.Values)
+            {
+                Point location = new Point((int)rootScene.RegionInfo.RegionLocX, (int)rootScene.RegionInfo.RegionLocY);
+                location.Offset(archivedRegion.Location);
+
+                Scene scene;
+                if (simulatorScenes.TryGetScene(location, out scene))
+                {
+                    archivedRegion.Scene = scene;
+                    m_newId2region[scene.RegionInfo.RegionID] = archivedRegion;
+                }
+                else
+                {
+                    m_log.WarnFormat("[ARCHIVER]: Not loading archived region {0} because there's no existing region at location {1},{2}",
+                        archivedRegion.Directory, location.X, location.Y);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Returns the archived region according to the path of a file in the archive.
+        /// Also, converts the full path into a path that is relative to the region's directory.
+        /// </summary>
+        /// <param name="fullPath">The path of a file in the archive</param>
+        /// <param name="scene">The corresponding Scene, or null if none</param>
+        /// <param name="relativePath">The path relative to the region's directory. (Or the original
+        /// path, if this file doesn't belong to a region.)</param>
+        /// <returns>True: use this file; False: skip it</returns>
+        public bool GetRegionFromPath(string fullPath, out Scene scene, out string relativePath)
+        {
+            scene = null;
+            relativePath = fullPath;
+
+            if (!MultiRegionFormat)
+            {
+                if (m_newId2region.Count > 0)
+                    scene = m_newId2region.First().Value.Scene;
+                return true;
+            }
+
+            if (!fullPath.StartsWith(ArchiveConstants.REGIONS_PATH))
+                return true;    // this file doesn't belong to a region
+
+            string[] parts = fullPath.Split(new Char[] { '/' }, 3);
+            if (parts.Length != 3)
+                return false;
+            string regionDirectory = parts[1];
+            relativePath = parts[2];
+            
+            RegionInfo region;
+            if (m_directory2region.TryGetValue(regionDirectory, out region))
+            {
+                scene = region.Scene;
+                return (scene != null);
+            }
+            else
+            {
+                return false;
+            }
+        }
+
+        /// <summary>
+        /// Returns the original UUID of a region (from the simulator where the OAR was saved),
+        /// given the UUID of the scene it was loaded into in the current simulator.
+        /// </summary>
+        /// <param name="newID"></param>
+        /// <returns></returns>
+        public string GetOriginalRegionID(UUID newID)
+        {
+            RegionInfo region;
+            if (m_newId2region.TryGetValue(newID, out region))
+                return region.OriginalID;
+            else
+                return DefaultOriginalID;
+        }
+
+        /// <summary>
+        /// Returns the scenes that have been (or will be) loaded.
+        /// </summary>
+        /// <returns></returns>
+        public List<UUID> GetLoadedScenes()
+        {
+            return m_newId2region.Keys.ToList();
+        }
+
+    }
+}
diff --git a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
index 5deaf52..82f49b0 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
@@ -47,32 +47,41 @@ using ArchiveConstants = OpenSim.Framework.Serialization.ArchiveConstants;
 using TarArchiveReader = OpenSim.Framework.Serialization.TarArchiveReader;
 using TarArchiveWriter = OpenSim.Framework.Serialization.TarArchiveWriter;
 using RegionSettings = OpenSim.Framework.RegionSettings;
+using OpenSim.Region.Framework.Interfaces;
 
 namespace OpenSim.Region.CoreModules.World.Archiver.Tests
 {
     [TestFixture]
-    public class ArchiverTests
+    public class ArchiverTests : OpenSimTestCase
     {
         private Guid m_lastRequestId;
         private string m_lastErrorMessage;
 
+        protected SceneHelpers m_sceneHelpers;
         protected TestScene m_scene;
         protected ArchiverModule m_archiverModule;
+        protected SerialiserModule m_serialiserModule;
 
         protected TaskInventoryItem m_soundItem;
         
         [SetUp]
-        public void SetUp()
+        public override void SetUp()
         {
+            base.SetUp();
+
+            // FIXME: Do something about this - relying on statics in unit tests causes trouble sooner or later
+            new SceneManager();
+
             m_archiverModule = new ArchiverModule();
-            SerialiserModule serialiserModule = new SerialiserModule();
+            m_serialiserModule = new SerialiserModule();
             TerrainModule terrainModule = new TerrainModule();
 
-            m_scene = new SceneHelpers().SetupScene();
-            SceneHelpers.SetupSceneModules(m_scene, m_archiverModule, serialiserModule, terrainModule);
+            m_sceneHelpers = new SceneHelpers();
+            m_scene = m_sceneHelpers.SetupScene();
+            SceneHelpers.SetupSceneModules(m_scene, m_archiverModule, m_serialiserModule, terrainModule);
         }
-        
-        private void LoadCompleted(Guid requestId, string errorMessage)
+
+        private void LoadCompleted(Guid requestId, List<UUID> loadedScenes, string errorMessage)
         {
             lock (this)
             {
@@ -128,26 +137,10 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
             TestHelpers.InMethod();
 //            log4net.Config.XmlConfigurator.Configure();
 
-            SceneObjectPart part1 = CreateSceneObjectPart1();
-            SceneObjectGroup sog1 = new SceneObjectGroup(part1);
-            m_scene.AddNewSceneObject(sog1, false);
-
-            SceneObjectPart part2 = CreateSceneObjectPart2();
-            
-            AssetNotecard nc = new AssetNotecard();
-            nc.BodyText = "Hello World!";
-            nc.Encode();
-            UUID ncAssetUuid = new UUID("00000000-0000-0000-1000-000000000000");
-            UUID ncItemUuid = new UUID("00000000-0000-0000-1100-000000000000");
-            AssetBase ncAsset 
-                = AssetHelpers.CreateAsset(ncAssetUuid, AssetType.Notecard, nc.AssetData, UUID.Zero);
-            m_scene.AssetService.Store(ncAsset);
-            SceneObjectGroup sog2 = new SceneObjectGroup(part2);
-            TaskInventoryItem ncItem 
-                = new TaskInventoryItem { Name = "ncItem", AssetID = ncAssetUuid, ItemID = ncItemUuid };
-            part2.Inventory.AddInventoryItem(ncItem, true);
-            
-            m_scene.AddNewSceneObject(sog2, false);
+            SceneObjectGroup sog1;
+            SceneObjectGroup sog2;
+            UUID ncAssetUuid;
+            CreateTestObjects(m_scene, out sog1, out sog2, out ncAssetUuid);
 
             MemoryStream archiveWriteStream = new MemoryStream();
             m_scene.EventManager.OnOarFileSaved += SaveCompleted;
@@ -186,7 +179,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
             Assert.That(filePath, Is.EqualTo(ArchiveConstants.CONTROL_FILE_PATH));
             
             ArchiveReadRequest arr = new ArchiveReadRequest(m_scene, (Stream)null, false, false, Guid.Empty);
-            arr.LoadControlFile(filePath, data);
+            arr.LoadControlFile(filePath, data, new DearchiveScenesInfo());
             
             Assert.That(arr.ControlFileLoaded, Is.True);        
             
@@ -211,6 +204,30 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
             // TODO: Test presence of more files and contents of files.
         }
 
+        private void CreateTestObjects(Scene scene, out SceneObjectGroup sog1, out SceneObjectGroup sog2, out UUID ncAssetUuid)
+        {
+            SceneObjectPart part1 = CreateSceneObjectPart1();
+            sog1 = new SceneObjectGroup(part1);
+            scene.AddNewSceneObject(sog1, false);
+
+            AssetNotecard nc = new AssetNotecard();
+            nc.BodyText = "Hello World!";
+            nc.Encode();
+            ncAssetUuid = UUID.Random();
+            UUID ncItemUuid = UUID.Random();
+            AssetBase ncAsset
+                = AssetHelpers.CreateAsset(ncAssetUuid, AssetType.Notecard, nc.AssetData, UUID.Zero);
+            m_scene.AssetService.Store(ncAsset);
+
+            TaskInventoryItem ncItem
+                = new TaskInventoryItem { Name = "ncItem", AssetID = ncAssetUuid, ItemID = ncItemUuid };
+            SceneObjectPart part2 = CreateSceneObjectPart2();
+            sog2 = new SceneObjectGroup(part2);
+            part2.Inventory.AddInventoryItem(ncItem, true);
+
+            scene.AddNewSceneObject(sog2, false);
+        }
+
         /// <summary>
         /// Test saving an OpenSim Region Archive with the no assets option
         /// </summary>
@@ -270,7 +287,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
             Assert.That(filePath, Is.EqualTo(ArchiveConstants.CONTROL_FILE_PATH));
             
             ArchiveReadRequest arr = new ArchiveReadRequest(m_scene, (Stream)null, false, false, Guid.Empty);
-            arr.LoadControlFile(filePath, data);
+            arr.LoadControlFile(filePath, data, new DearchiveScenesInfo());
             
             Assert.That(arr.ControlFileLoaded, Is.True);        
             
@@ -307,7 +324,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
 
             tar.WriteFile(
                 ArchiveConstants.CONTROL_FILE_PATH,
-                new ArchiveWriteRequestPreparation(null, (Stream)null, Guid.Empty).CreateControlFile(new Dictionary<string, Object>()));
+                new ArchiveWriteRequest(m_scene, (Stream)null, Guid.Empty).CreateControlFile(new ArchiveScenesGroup()));
 
             SceneObjectGroup sog1 = SceneHelpers.CreateSceneObject(1, ownerId, "obj1-", 0x11);
             SceneObjectPart sop2
@@ -362,11 +379,10 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
             // Also check that direct entries which will also have a file entry containing that directory doesn't 
             // upset load
             tar.WriteDir(ArchiveConstants.TERRAINS_PATH);
-            
+
             tar.WriteFile(
                 ArchiveConstants.CONTROL_FILE_PATH,
-                new ArchiveWriteRequestPreparation(null, (Stream)null, Guid.Empty).CreateControlFile(new Dictionary<string, Object>()));
-
+                new ArchiveWriteRequest(m_scene, (Stream)null, Guid.Empty).CreateControlFile(new ArchiveScenesGroup()));
             SceneObjectPart part1 = CreateSceneObjectPart1();
 
             part1.SitTargetOrientation = new Quaternion(0.2f, 0.3f, 0.4f, 0.5f);
@@ -389,31 +405,12 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
             Assert.That(soundDataResourceName, Is.Not.Null);
 
             byte[] soundData;
-            Console.WriteLine("Loading " + soundDataResourceName);
-            using (Stream resource = assembly.GetManifestResourceStream(soundDataResourceName))
-            {
-                using (BinaryReader br = new BinaryReader(resource))
-                {
-                    // FIXME: Use the inspector instead
-                    soundData = br.ReadBytes(99999999);
-                    UUID soundUuid = UUID.Parse("00000000-0000-0000-0000-000000000001");
-                    string soundAssetFileName 
-                       = ArchiveConstants.ASSETS_PATH + soundUuid 
-                            + ArchiveConstants.ASSET_TYPE_TO_EXTENSION[(sbyte)AssetType.SoundWAV];
-                    tar.WriteFile(soundAssetFileName, soundData);
-                    
-                    /*
-                    AssetBase soundAsset = AssetHelpers.CreateAsset(soundUuid, soundData);
-                    scene.AssetService.Store(soundAsset);
-                    asset1FileName = ArchiveConstants.ASSETS_PATH + soundUuid + ".wav";
-                    */
-                    
-                    TaskInventoryItem item1 
-                        = new TaskInventoryItem { AssetID = soundUuid, ItemID = soundItemUuid, Name = soundItemName };
-                    part1.Inventory.AddInventoryItem(item1, true);
-                }
-            }
-            
+            UUID soundUuid;
+            CreateSoundAsset(tar, assembly, soundDataResourceName, out soundData, out soundUuid);
+
+            TaskInventoryItem item1
+                = new TaskInventoryItem { AssetID = soundUuid, ItemID = soundItemUuid, Name = soundItemName };
+            part1.Inventory.AddInventoryItem(item1, true);
             m_scene.AddNewSceneObject(object1, false);
 
             string object1FileName = string.Format(
@@ -435,6 +432,34 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
             
             Assert.That(m_lastErrorMessage, Is.Null);
 
+            TestLoadedRegion(part1, soundItemName, soundData);
+        }
+
+        private static void CreateSoundAsset(TarArchiveWriter tar, Assembly assembly, string soundDataResourceName, out byte[] soundData, out UUID soundUuid)
+        {
+            using (Stream resource = assembly.GetManifestResourceStream(soundDataResourceName))
+            {
+                using (BinaryReader br = new BinaryReader(resource))
+                {
+                    // FIXME: Use the inspector instead
+                    soundData = br.ReadBytes(99999999);
+                    soundUuid = UUID.Parse("00000000-0000-0000-0000-000000000001");
+                    string soundAssetFileName
+                       = ArchiveConstants.ASSETS_PATH + soundUuid
+                            + ArchiveConstants.ASSET_TYPE_TO_EXTENSION[(sbyte)AssetType.SoundWAV];
+                    tar.WriteFile(soundAssetFileName, soundData);
+
+                    /*
+                    AssetBase soundAsset = AssetHelpers.CreateAsset(soundUuid, soundData);
+                    scene.AssetService.Store(soundAsset);
+                    asset1FileName = ArchiveConstants.ASSETS_PATH + soundUuid + ".wav";
+                    */
+                }
+            }
+        }
+
+        private void TestLoadedRegion(SceneObjectPart part1, string soundItemName, byte[] soundData)
+        {
             SceneObjectPart object1PartLoaded = m_scene.GetSceneObjectPart(part1.Name);
 
             Assert.That(object1PartLoaded, Is.Not.Null, "object1 was not loaded");
@@ -454,9 +479,6 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
             Assert.That(loadedSoundAsset.Data, Is.EqualTo(soundData), "saved and loaded sound data do not match");
 
             Assert.Greater(m_scene.LandChannel.AllParcels().Count, 0, "incorrect number of parcels");
-
-            // Temporary
-            Console.WriteLine("Successfully completed {0}", MethodBase.GetCurrentMethod());
         }
 
         /// <summary>
@@ -516,7 +538,8 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
                 SerialiserModule serialiserModule = new SerialiserModule();
                 TerrainModule terrainModule = new TerrainModule();
 
-                TestScene scene2 = new SceneHelpers().SetupScene();
+                m_sceneHelpers = new SceneHelpers();
+                TestScene scene2 = m_sceneHelpers.SetupScene();
                 SceneHelpers.SetupSceneModules(scene2, archiverModule, serialiserModule, terrainModule);
 
                 // Make sure there's a valid owner for the owner we saved (this should have been wiped if the code is
@@ -554,7 +577,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
             tar.WriteDir(ArchiveConstants.TERRAINS_PATH);
             tar.WriteFile(
                 ArchiveConstants.CONTROL_FILE_PATH,
-                new ArchiveWriteRequestPreparation(null, (Stream)null, Guid.Empty).CreateControlFile(new Dictionary<string, Object>()));
+                new ArchiveWriteRequest(m_scene, (Stream)null, Guid.Empty).CreateControlFile(new ArchiveScenesGroup()));
 
             RegionSettings rs = new RegionSettings();
             rs.AgentLimit = 17;
@@ -664,7 +687,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
                 SerialiserModule serialiserModule = new SerialiserModule();
                 TerrainModule terrainModule = new TerrainModule();
 
-                Scene scene = new SceneHelpers().SetupScene();
+                Scene scene = m_sceneHelpers.SetupScene();
                 SceneHelpers.SetupSceneModules(scene, archiverModule, serialiserModule, terrainModule);
 
                 m_scene.AddNewSceneObject(new SceneObjectGroup(part2), false);
@@ -700,5 +723,258 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
                 Assert.That(object2PartMerged.GroupPosition, Is.EqualTo(part2.GroupPosition), "object2 group position not equal after merge");
             }
         }
+
+        /// <summary>
+        /// Test saving a multi-region OAR.
+        /// </summary>
+        [Test]
+        public void TestSaveMultiRegionOar()
+        {
+            TestHelpers.InMethod();
+
+            // Create test regions
+
+            int WIDTH = 2;
+            int HEIGHT = 2;
+
+            List<Scene> scenes = new List<Scene>();
+
+            // Maps (Directory in OAR file -> scene)
+            Dictionary<string, Scene> regionPaths = new Dictionary<string, Scene>();
+
+            // Maps (Scene -> expected object paths)
+            Dictionary<UUID, List<string>> expectedPaths = new Dictionary<UUID, List<string>>();
+
+            // List of expected assets
+            List<UUID> expectedAssets = new List<UUID>();
+
+            for (uint y = 0; y < HEIGHT; y++)
+            {
+                for (uint x = 0; x < WIDTH; x++)
+                {
+                    Scene scene;
+                    if (x == 0 && y == 0)
+                    {
+                        scene = m_scene;   // this scene was already created in SetUp()
+                    }
+                    else
+                    {
+                        scene = m_sceneHelpers.SetupScene(string.Format("Unit test region {0}", (y * WIDTH) + x + 1), UUID.Random(), 1000 + x, 1000 + y);
+                        SceneHelpers.SetupSceneModules(scene, new ArchiverModule(), m_serialiserModule, new TerrainModule());
+                    }
+                    scenes.Add(scene);
+
+                    string dir = String.Format("{0}_{1}_{2}", x + 1, y + 1, scene.RegionInfo.RegionName.Replace(" ", "_"));
+                    regionPaths[dir] = scene;
+
+                    SceneObjectGroup sog1;
+                    SceneObjectGroup sog2;
+                    UUID ncAssetUuid;
+                    
+                    CreateTestObjects(scene, out sog1, out sog2, out ncAssetUuid);
+
+                    expectedPaths[scene.RegionInfo.RegionID] = new List<string>();
+                    expectedPaths[scene.RegionInfo.RegionID].Add(ArchiveHelpers.CreateObjectPath(sog1));
+                    expectedPaths[scene.RegionInfo.RegionID].Add(ArchiveHelpers.CreateObjectPath(sog2));
+
+                    expectedAssets.Add(ncAssetUuid);
+                }
+            }
+
+
+            // Save OAR
+
+            MemoryStream archiveWriteStream = new MemoryStream();
+            m_scene.EventManager.OnOarFileSaved += SaveCompleted;
+
+            Guid requestId = new Guid("00000000-0000-0000-0000-808080808080");
+
+            Dictionary<string, Object> options = new Dictionary<string, Object>();
+            options.Add("all", true);
+
+            lock (this)
+            {
+                m_archiverModule.ArchiveRegion(archiveWriteStream, requestId, options);
+                Monitor.Wait(this, 60000);
+            }
+
+
+            // Check that the OAR contains the expected data
+
+            Assert.That(m_lastRequestId, Is.EqualTo(requestId));
+
+            byte[] archive = archiveWriteStream.ToArray();
+            MemoryStream archiveReadStream = new MemoryStream(archive);
+            TarArchiveReader tar = new TarArchiveReader(archiveReadStream);
+
+            Dictionary<UUID, List<string>> foundPaths = new Dictionary<UUID, List<string>>();
+            List<UUID> foundAssets = new List<UUID>();
+
+            foreach (Scene scene in scenes)
+            {
+                foundPaths[scene.RegionInfo.RegionID] = new List<string>();
+            }
+
+            string filePath;
+            TarArchiveReader.TarEntryType tarEntryType;
+
+            byte[] data = tar.ReadEntry(out filePath, out tarEntryType);
+            Assert.That(filePath, Is.EqualTo(ArchiveConstants.CONTROL_FILE_PATH));
+
+            ArchiveReadRequest arr = new ArchiveReadRequest(m_scene, (Stream)null, false, false, Guid.Empty);
+            arr.LoadControlFile(filePath, data, new DearchiveScenesInfo());
+
+            Assert.That(arr.ControlFileLoaded, Is.True);
+
+            while (tar.ReadEntry(out filePath, out tarEntryType) != null)
+            {
+                if (filePath.StartsWith(ArchiveConstants.ASSETS_PATH))
+                {
+                    // Assets are shared, so this file doesn't belong to any specific region.
+                    string fileName = filePath.Remove(0, ArchiveConstants.ASSETS_PATH.Length);
+                    if (fileName.EndsWith("_notecard.txt"))
+                        foundAssets.Add(UUID.Parse(fileName.Substring(0, fileName.Length - "_notecard.txt".Length)));
+                }
+                else
+                {
+                    // This file belongs to one of the regions. Find out which one.
+                    Assert.IsTrue(filePath.StartsWith(ArchiveConstants.REGIONS_PATH));
+                    string[] parts = filePath.Split(new Char[] { '/' }, 3);
+                    Assert.AreEqual(3, parts.Length);
+                    string regionDirectory = parts[1];
+                    string relativePath = parts[2];
+                    Scene scene = regionPaths[regionDirectory];
+
+                    if (relativePath.StartsWith(ArchiveConstants.OBJECTS_PATH))
+                    {
+                        foundPaths[scene.RegionInfo.RegionID].Add(relativePath);
+                    }
+                }
+            }
+
+            Assert.AreEqual(scenes.Count, foundPaths.Count);
+            foreach (Scene scene in scenes)
+            {
+                Assert.That(foundPaths[scene.RegionInfo.RegionID], Is.EquivalentTo(expectedPaths[scene.RegionInfo.RegionID]));
+            }
+
+            Assert.That(foundAssets, Is.EquivalentTo(expectedAssets));
+        }
+
+        /// <summary>
+        /// Test loading a multi-region OAR.
+        /// </summary>
+        [Test]
+        public void TestLoadMultiRegionOar()
+        {
+            TestHelpers.InMethod();
+
+            // Create an ArchiveScenesGroup with the regions in the OAR. This is needed to generate the control file.
+
+            int WIDTH = 2;
+            int HEIGHT = 2;
+
+            for (uint y = 0; y < HEIGHT; y++)
+            {
+                for (uint x = 0; x < WIDTH; x++)
+                {
+                    Scene scene;
+                    if (x == 0 && y == 0)
+                    {
+                        scene = m_scene;   // this scene was already created in SetUp()
+                    }
+                    else
+                    {
+                        scene = m_sceneHelpers.SetupScene(string.Format("Unit test region {0}", (y * WIDTH) + x + 1), UUID.Random(), 1000 + x, 1000 + y);
+                        SceneHelpers.SetupSceneModules(scene, new ArchiverModule(), m_serialiserModule, new TerrainModule());
+                    }
+                }
+            }
+
+            ArchiveScenesGroup scenesGroup = new ArchiveScenesGroup();
+            SceneManager.Instance.ForEachScene(delegate(Scene scene)
+            {
+                scenesGroup.AddScene(scene);
+            });
+            scenesGroup.CalcSceneLocations();
+
+            // Generate the OAR file
+
+            MemoryStream archiveWriteStream = new MemoryStream();
+            TarArchiveWriter tar = new TarArchiveWriter(archiveWriteStream);
+
+            ArchiveWriteRequest writeRequest = new ArchiveWriteRequest(m_scene, (Stream)null, Guid.Empty);
+            writeRequest.MultiRegionFormat = true;
+            tar.WriteFile(
+                ArchiveConstants.CONTROL_FILE_PATH, writeRequest.CreateControlFile(scenesGroup));
+
+            SceneObjectPart part1 = CreateSceneObjectPart1();
+            part1.SitTargetOrientation = new Quaternion(0.2f, 0.3f, 0.4f, 0.5f);
+            part1.SitTargetPosition = new Vector3(1, 2, 3);
+
+            SceneObjectGroup object1 = new SceneObjectGroup(part1);
+
+            // Let's put some inventory items into our object
+            string soundItemName = "sound-item1";
+            UUID soundItemUuid = UUID.Parse("00000000-0000-0000-0000-000000000002");
+            Type type = GetType();
+            Assembly assembly = type.Assembly;
+            string soundDataResourceName = null;
+            string[] names = assembly.GetManifestResourceNames();
+            foreach (string name in names)
+            {
+                if (name.EndsWith(".Resources.test-sound.wav"))
+                    soundDataResourceName = name;
+            }
+            Assert.That(soundDataResourceName, Is.Not.Null);
+
+            byte[] soundData;
+            UUID soundUuid;
+            CreateSoundAsset(tar, assembly, soundDataResourceName, out soundData, out soundUuid);
+
+            TaskInventoryItem item1
+                = new TaskInventoryItem { AssetID = soundUuid, ItemID = soundItemUuid, Name = soundItemName };
+            part1.Inventory.AddInventoryItem(item1, true);
+            m_scene.AddNewSceneObject(object1, false);
+
+            string object1FileName = string.Format(
+                "{0}_{1:000}-{2:000}-{3:000}__{4}.xml",
+                part1.Name,
+                Math.Round(part1.GroupPosition.X), Math.Round(part1.GroupPosition.Y), Math.Round(part1.GroupPosition.Z),
+                part1.UUID);
+            string path = "regions/1_1_Unit_test_region/" + ArchiveConstants.OBJECTS_PATH + object1FileName;
+            tar.WriteFile(path, SceneObjectSerializer.ToXml2Format(object1));
+
+            tar.Close();
+
+            
+            // Delete the current objects, to test that they're loaded from the OAR and didn't
+            // just remain in the scene.
+            SceneManager.Instance.ForEachScene(delegate(Scene scene)
+            {
+                scene.DeleteAllSceneObjects();
+            });
+
+            // Create a "hole", to test that that the corresponding region isn't loaded from the OAR
+            SceneManager.Instance.CloseScene(SceneManager.Instance.Scenes[1]);
+
+
+            // Check thay the OAR file contains the expected data
+
+            MemoryStream archiveReadStream = new MemoryStream(archiveWriteStream.ToArray());
+
+            lock (this)
+            {
+                m_scene.EventManager.OnOarFileLoaded += LoadCompleted;
+                m_archiverModule.DearchiveRegion(archiveReadStream);
+            }
+
+            Assert.That(m_lastErrorMessage, Is.Null);
+
+            Assert.AreEqual(3, SceneManager.Instance.Scenes.Count);
+
+            TestLoadedRegion(part1, soundItemName, soundData);
+        }
+
     }
 }
diff --git a/OpenSim/Region/CoreModules/World/Cloud/CloudModule.cs b/OpenSim/Region/CoreModules/World/Cloud/CloudModule.cs
index 5fa3dc2..d217f36 100644
--- a/OpenSim/Region/CoreModules/World/Cloud/CloudModule.cs
+++ b/OpenSim/Region/CoreModules/World/Cloud/CloudModule.cs
@@ -27,15 +27,17 @@
 
 using System;
 using System.Collections.Generic;
+using Mono.Addins;
 using Nini.Config;
 using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 
-namespace OpenSim.Region.CoreModules
+namespace OpenSim.Region.CoreModules.World
 {
-    public class CloudModule : ICloudModule
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "CloudModule")]
+    public class CloudModule : ICloudModule, INonSharedRegionModule
     {
 //        private static readonly log4net.ILog m_log 
 //            = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
@@ -48,7 +50,7 @@ namespace OpenSim.Region.CoreModules
         private float m_cloudDensity = 1.0F;
         private float[] cloudCover = new float[16 * 16];
 
-        public void Initialise(Scene scene, IConfigSource config)
+        public void Initialise(IConfigSource config)
         {
             IConfig cloudConfig = config.Configs["Cloud"];
 
@@ -59,21 +61,40 @@ namespace OpenSim.Region.CoreModules
                 m_frameUpdateRate = cloudConfig.GetInt("cloud_update_rate", 1000);
             }
 
-            if (m_enabled)
-            {
+        }
 
-                m_scene = scene;
+        public void AddRegion(Scene scene)
+        {
+            if (!m_enabled)
+                return;
 
-                scene.EventManager.OnNewClient += CloudsToClient;
-                scene.RegisterModuleInterface<ICloudModule>(this);
-                scene.EventManager.OnFrame += CloudUpdate;
+            m_scene = scene;
 
-                GenerateCloudCover();
+            scene.EventManager.OnNewClient += CloudsToClient;
+            scene.RegisterModuleInterface<ICloudModule>(this);
+            scene.EventManager.OnFrame += CloudUpdate;
 
-                m_ready = true;
+            GenerateCloudCover();
 
-            }
+            m_ready = true;
+        }
+
+        public void RemoveRegion(Scene scene)
+        {
+            if (!m_enabled)
+                return;
 
+            m_ready = false;
+            //  Remove our hooks
+            m_scene.EventManager.OnNewClient -= CloudsToClient;
+            m_scene.EventManager.OnFrame -= CloudUpdate;
+            m_scene.UnregisterModuleInterface<ICloudModule>(this);
+
+            m_scene = null;
+        }
+
+        public void RegionLoaded(Scene scene)
+        {
         }
 
         public void PostInitialise()
@@ -82,13 +103,6 @@ namespace OpenSim.Region.CoreModules
 
         public void Close()
         {
-            if (m_enabled)
-            {
-                m_ready = false;
-                //  Remove our hooks
-                m_scene.EventManager.OnNewClient -= CloudsToClient;
-                m_scene.EventManager.OnFrame -= CloudUpdate;
-            }
         }
 
         public string Name
@@ -96,12 +110,11 @@ namespace OpenSim.Region.CoreModules
             get { return "CloudModule"; }
         }
 
-        public bool IsSharedModule
+        public Type ReplaceableInterface
         {
-            get { return false; }
+            get { return null; }
         }
 
-
         public float CloudCover(int x, int y, int z)
         {
             float cover = 0f;
diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
index fdef9d8..dc062b6 100644
--- a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
@@ -40,6 +40,7 @@ using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
+using RegionFlags = OpenMetaverse.RegionFlags;
 
 namespace OpenSim.Region.CoreModules.World.Estate
 {
@@ -293,6 +294,10 @@ namespace OpenSim.Region.CoreModules.World.Estate
                 }
 
                 restartModule.ScheduleRestart(UUID.Zero, "Region will restart in {0}", times.ToArray(), false);
+
+                m_log.InfoFormat(
+                    "User {0} requested restart of region {1} in {2} seconds", 
+                    remoteClient.Name, Scene.Name, times.Count != 0 ? times[0] : 0);
             }
         }
 
@@ -317,7 +322,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
 
             if ((estateAccessType & 4) != 0) // User add
             {
-                if (Scene.Permissions.CanIssueEstateCommand(remote_client.AgentId, true) || Scene.Permissions.BypassPermissions())
+                if (Scene.Permissions.CanIssueEstateCommand(remote_client.AgentId, true))
                 {
                     if ((estateAccessType & 1) != 0) // All estates
                     {
@@ -349,7 +354,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
             }
             if ((estateAccessType & 8) != 0) // User remove
             {
-                if (Scene.Permissions.CanIssueEstateCommand(remote_client.AgentId, true) || Scene.Permissions.BypassPermissions())
+                if (Scene.Permissions.CanIssueEstateCommand(remote_client.AgentId, true))
                 {
                     if ((estateAccessType & 1) != 0) // All estates
                     {
@@ -380,7 +385,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
             }
             if ((estateAccessType & 16) != 0) // Group add
             {
-                if (Scene.Permissions.CanIssueEstateCommand(remote_client.AgentId, true) || Scene.Permissions.BypassPermissions())
+                if (Scene.Permissions.CanIssueEstateCommand(remote_client.AgentId, true))
                 {
                     if ((estateAccessType & 1) != 0) // All estates
                     {
@@ -409,9 +414,10 @@ namespace OpenSim.Region.CoreModules.World.Estate
                     remote_client.SendAlertMessage("Method EstateAccessDelta Failed, you don't have permissions");
                 }
             }
+
             if ((estateAccessType & 32) != 0) // Group remove
             {
-                if (Scene.Permissions.CanIssueEstateCommand(remote_client.AgentId, true) || Scene.Permissions.BypassPermissions())
+                if (Scene.Permissions.CanIssueEstateCommand(remote_client.AgentId, true))
                 {
                     if ((estateAccessType & 1) != 0) // All estates
                     {
@@ -440,9 +446,10 @@ namespace OpenSim.Region.CoreModules.World.Estate
                     remote_client.SendAlertMessage("Method EstateAccessDelta Failed, you don't have permissions");
                 }
             }
+
             if ((estateAccessType & 64) != 0) // Ban add
             {
-                if (Scene.Permissions.CanIssueEstateCommand(remote_client.AgentId, false) || Scene.Permissions.BypassPermissions())
+                if (Scene.Permissions.CanIssueEstateCommand(remote_client.AgentId, false))
                 {
                     EstateBan[] banlistcheck = Scene.RegionInfo.EstateSettings.EstateBans;
 
@@ -521,9 +528,10 @@ namespace OpenSim.Region.CoreModules.World.Estate
                     remote_client.SendAlertMessage("Method EstateAccessDelta Failed, you don't have permissions");
                 }
             }
+
             if ((estateAccessType & 128) != 0) // Ban remove
             {
-                if (Scene.Permissions.CanIssueEstateCommand(remote_client.AgentId, false) || Scene.Permissions.BypassPermissions())
+                if (Scene.Permissions.CanIssueEstateCommand(remote_client.AgentId, false))
                 {
                     EstateBan[] banlistcheck = Scene.RegionInfo.EstateSettings.EstateBans;
 
@@ -576,9 +584,10 @@ namespace OpenSim.Region.CoreModules.World.Estate
                     remote_client.SendAlertMessage("Method EstateAccessDelta Failed, you don't have permissions");
                 }
             }
+
             if ((estateAccessType & 256) != 0) // Manager add
             {
-                if (Scene.Permissions.CanIssueEstateCommand(remote_client.AgentId, true) || Scene.Permissions.BypassPermissions())
+                if (Scene.Permissions.CanIssueEstateCommand(remote_client.AgentId, true))
                 {
                     if ((estateAccessType & 1) != 0) // All estates
                     {
@@ -607,9 +616,10 @@ namespace OpenSim.Region.CoreModules.World.Estate
                     remote_client.SendAlertMessage("Method EstateAccessDelta Failed, you don't have permissions");
                 }
             }
+
             if ((estateAccessType & 512) != 0) // Manager remove
             {
-                if (Scene.Permissions.CanIssueEstateCommand(remote_client.AgentId, true) || Scene.Permissions.BypassPermissions())
+                if (Scene.Permissions.CanIssueEstateCommand(remote_client.AgentId, true))
                 {
                     if ((estateAccessType & 1) != 0) // All estates
                     {
@@ -1108,7 +1118,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
 
         #endregion
 
-        #region IRegionModule Members
+        #region Region Module interface
         
         public string Name { get { return "EstateManagementModule"; } }
         
diff --git a/OpenSim/Region/CoreModules/World/Land/DwellModule.cs b/OpenSim/Region/CoreModules/World/Land/DwellModule.cs
new file mode 100644
index 0000000..bd22155
--- /dev/null
+++ b/OpenSim/Region/CoreModules/World/Land/DwellModule.cs
@@ -0,0 +1,112 @@
+/*
+ * 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 OpenSimulator 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;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Reflection;
+using System.Text;
+using log4net;
+using Nini.Config;
+using OpenMetaverse;
+using OpenMetaverse.StructuredData;
+using OpenMetaverse.Messages.Linden;
+using Mono.Addins;
+using OpenSim.Framework;
+using OpenSim.Framework.Capabilities;
+using OpenSim.Framework.Console;
+using OpenSim.Framework.Servers;
+using OpenSim.Framework.Servers.HttpServer;
+using OpenSim.Region.CoreModules.Framework.InterfaceCommander;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Scenes;
+using OpenSim.Region.Physics.Manager;
+using OpenSim.Services.Interfaces;
+using Caps = OpenSim.Framework.Capabilities.Caps;
+using GridRegion = OpenSim.Services.Interfaces.GridRegion;
+
+namespace OpenSim.Region.CoreModules.World.Land
+{
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "DwellModule")]
+    public class DwellModule : IDwellModule, INonSharedRegionModule
+    {
+        private Scene m_scene;
+
+        public Type ReplaceableInterface
+        {
+            get { return typeof(IDwellModule); }
+        }
+
+        public string Name
+        {
+            get { return "DwellModule"; }
+        }
+
+        public void Initialise(IConfigSource source)
+        {
+        }
+
+        public void AddRegion(Scene scene)
+        {
+            m_scene = scene;
+
+            m_scene.EventManager.OnNewClient += OnNewClient;
+        }
+
+        public void RegionLoaded(Scene scene)
+        {
+        }
+
+        public void RemoveRegion(Scene scene)
+        {
+        }
+
+        public void Close()
+        {
+        }
+
+        public void OnNewClient(IClientAPI client)
+        {
+            client.OnParcelDwellRequest += ClientOnParcelDwellRequest;
+        }
+
+        private void ClientOnParcelDwellRequest(int localID, IClientAPI client)
+        {
+            ILandObject parcel = m_scene.LandChannel.GetLandObject(localID);
+            if (parcel == null)
+                return;
+
+            client.SendParcelDwellReply(localID, parcel.LandData.GlobalID, parcel.LandData.Dwell);
+        }
+
+        public int GetDwell(UUID parcelID)
+        {
+            return 0;
+        }
+    }
+}
diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
index aae6603..1193057 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
@@ -36,6 +36,7 @@ using Nini.Config;
 using OpenMetaverse;
 using OpenMetaverse.StructuredData;
 using OpenMetaverse.Messages.Linden;
+using Mono.Addins;
 using OpenSim.Framework;
 using OpenSim.Framework.Capabilities;
 using OpenSim.Framework.Console;
@@ -60,6 +61,7 @@ namespace OpenSim.Region.CoreModules.World.Land
         public byte RegionAccess;
     }
 
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "LandManagementModule")]
     public class LandManagementModule : INonSharedRegionModule
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@@ -927,6 +929,7 @@ namespace OpenSim.Region.CoreModules.World.Land
             ILandObject newLand = startLandObject.Copy();
             newLand.LandData.Name = newLand.LandData.Name;
             newLand.LandData.GlobalID = UUID.Random();
+            newLand.LandData.Dwell = 0;
 
             newLand.SetLandBitmap(newLand.GetSquareLandBitmap(start_x, start_y, end_x, end_y));
 
diff --git a/OpenSim/Region/CoreModules/World/Land/LandObject.cs b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
index 4f06737..d5b2adb 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandObject.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
@@ -33,6 +33,7 @@ using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
+using RegionFlags = OpenMetaverse.RegionFlags;
 
 namespace OpenSim.Region.CoreModules.World.Land
 {
diff --git a/OpenSim/Region/CoreModules/World/Land/PrimCountModule.cs b/OpenSim/Region/CoreModules/World/Land/PrimCountModule.cs
index 102b4d7..55b8227 100644
--- a/OpenSim/Region/CoreModules/World/Land/PrimCountModule.cs
+++ b/OpenSim/Region/CoreModules/World/Land/PrimCountModule.cs
@@ -34,6 +34,7 @@ using log4net;
 using Nini.Config;
 using OpenMetaverse;
 using OpenSim.Framework;
+using Mono.Addins;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Services.Interfaces;
@@ -49,6 +50,7 @@ namespace OpenSim.Region.CoreModules.World.Land
         public Dictionary <UUID, int> Users = new Dictionary <UUID, int>();
     }
 
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "PrimCountModule")]
     public class PrimCountModule : IPrimCountModule, INonSharedRegionModule
     {
 //        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@@ -69,7 +71,7 @@ namespace OpenSim.Region.CoreModules.World.Land
         /// without recounting the whole sim.
         /// 
         /// We start out tainted so that the first get call resets the various prim counts.
-        /// <value>
+        /// </value>
         private bool m_Tainted = true;
         
         private Object m_TaintLock = new Object();
diff --git a/OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs b/OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs
index aa306c7..8a422b0 100644
--- a/OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs
+++ b/OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs
@@ -30,6 +30,7 @@ using System.Collections.Generic;
 using System.Drawing;
 using System.Reflection;
 using log4net;
+using Mono.Addins;
 using Nini.Config;
 using OpenMetaverse;
 using OpenMetaverse.Imaging;
@@ -59,6 +60,7 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap
         public face[] trns;
     }
 
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "MapImageModule")]
     public class MapImageModule : IMapImageGenerator, INonSharedRegionModule
     {
         private static readonly ILog m_log =
@@ -131,7 +133,7 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap
 
         #endregion
 
-        #region IRegionModule Members
+        #region Region Module interface
 
         public void Initialise(IConfigSource source)
         {
diff --git a/OpenSim/Region/CoreModules/LightShare/EnvironmentModule.cs b/OpenSim/Region/CoreModules/World/LightShare/EnvironmentModule.cs
index 1526886..c3cea7a 100644
--- a/OpenSim/Region/CoreModules/LightShare/EnvironmentModule.cs
+++ b/OpenSim/Region/CoreModules/World/LightShare/EnvironmentModule.cs
@@ -51,10 +51,10 @@ namespace OpenSim.Region.CoreModules.World.LightShare
         private Scene m_scene = null;
         private UUID regionID = UUID.Zero;
         private static bool Enabled = false;
-        
+
         private static readonly string capsName = "EnvironmentSettings";
         private static readonly string capsBase = "/CAPS/0020/";
-        
+
         private LLSDEnvironmentSetResponse setResponse = null;
 
         #region INonSharedRegionModule
@@ -72,7 +72,7 @@ namespace OpenSim.Region.CoreModules.World.LightShare
             }
 
             Enabled = true;
-            
+
             m_log.InfoFormat("[{0}]: Module is enabled.", Name);
         }
 
@@ -132,8 +132,8 @@ namespace OpenSim.Region.CoreModules.World.LightShare
         #region Events
         private void OnRegisterCaps(UUID agentID, Caps caps)
         {
-//            m_log.DebugFormat("[{0}]: Register capability for agentID {1} in region {2}",
-//                Name, agentID, caps.RegionName);
+            //            m_log.DebugFormat("[{0}]: Register capability for agentID {1} in region {2}",
+            //                Name, agentID, caps.RegionName);
 
             string capsPath = capsBase + UUID.Random();
 
@@ -163,8 +163,8 @@ namespace OpenSim.Region.CoreModules.World.LightShare
         private string GetEnvironmentSettings(string request, string path, string param,
               UUID agentID, Caps caps)
         {
-//            m_log.DebugFormat("[{0}]: Environment GET handle for agentID {1} in region {2}",
-//                Name, agentID, caps.RegionName);
+            //            m_log.DebugFormat("[{0}]: Environment GET handle for agentID {1} in region {2}",
+            //                Name, agentID, caps.RegionName);
 
             string env = String.Empty;
 
@@ -188,8 +188,8 @@ namespace OpenSim.Region.CoreModules.World.LightShare
                               UUID agentID, Caps caps)
         {
 
-//            m_log.DebugFormat("[{0}]: Environment SET handle from agentID {1} in region {2}",
-//                Name, agentID, caps.RegionName);
+            //            m_log.DebugFormat("[{0}]: Environment SET handle from agentID {1} in region {2}",
+            //                Name, agentID, caps.RegionName);
 
             setResponse.regionID = regionID;
             setResponse.success = false;
@@ -204,7 +204,7 @@ namespace OpenSim.Region.CoreModules.World.LightShare
             {
                 m_scene.SimulationDataService.StoreRegionEnvironmentSettings(regionID, request);
                 setResponse.success = true;
-                
+
                 m_log.InfoFormat("[{0}]: New Environment settings has been saved from agentID {1} in region {2}",
                     Name, agentID, caps.RegionName);
             }
diff --git a/OpenSim/Region/CoreModules/LightShare/LightShareModule.cs b/OpenSim/Region/CoreModules/World/LightShare/LightShareModule.cs
index f49641f..6f92ef6 100644
--- a/OpenSim/Region/CoreModules/LightShare/LightShareModule.cs
+++ b/OpenSim/Region/CoreModules/World/LightShare/LightShareModule.cs
@@ -27,21 +27,20 @@
 
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Reflection;
 using OpenMetaverse;
-using log4net;
-using Nini.Config;
-using OpenSim.Data;
 using OpenSim.Framework;
 using OpenSim.Region.CoreModules.Framework.InterfaceCommander;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
-
+using log4net;
+using Nini.Config;
+using Mono.Addins;
 
 namespace OpenSim.Region.CoreModules.World.LightShare
 {
-    public class LightShareModule : IRegionModule, ICommandableModule
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "LightShareModule")]
+    public class LightShareModule : INonSharedRegionModule, ILightShareModule, ICommandableModule
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
         private readonly Commander m_commander = new Commander("windlight");
@@ -57,48 +56,86 @@ namespace OpenSim.Region.CoreModules.World.LightShare
 
         #endregion
 
-        #region IRegionModule Members
+        #region INonSharedRegionModule Members
 
-        public static bool EnableWindlight
+        public void Initialise(IConfigSource config)
         {
-            get
+            try
             {
-                return m_enableWindlight;
+                m_enableWindlight = config.Configs["LightShare"].GetBoolean("enable_windlight", false);
             }
-            set
+            catch (Exception)
             {
+                m_log.Debug("[WINDLIGHT]: ini failure for enable_windlight - using default");
             }
+
+            m_log.DebugFormat("[WINDLIGHT]: windlight module {0}", (m_enableWindlight ? "enabled" : "disabled"));
         }
 
-        public void Initialise(Scene scene, IConfigSource config)
+        public void AddRegion(Scene scene)
         {
+            if (!m_enableWindlight)
+                return;
+
             m_scene = scene;
-            m_scene.RegisterModuleInterface<IRegionModule>(this);
+            m_scene.RegisterModuleInterface<ILightShareModule>(this);
             m_scene.EventManager.OnPluginConsole += EventManager_OnPluginConsole;
 
-            // ini file settings
-            try
-            {
-                m_enableWindlight = config.Configs["LightShare"].GetBoolean("enable_windlight", false);
-            }
-            catch (Exception)
+            m_scene.EventManager.OnMakeRootAgent += EventManager_OnMakeRootAgent;
+            m_scene.EventManager.OnSaveNewWindlightProfile += EventManager_OnSaveNewWindlightProfile;
+            m_scene.EventManager.OnSendNewWindlightProfileTargeted += EventManager_OnSendNewWindlightProfileTargeted;
+            m_scene.LoadWindlightProfile();
+
+            InstallCommands();
+        }
+
+        public void RemoveRegion(Scene scene)
+        {
+            if (!m_enableWindlight)
+                return;
+
+            m_scene.EventManager.OnPluginConsole -= EventManager_OnPluginConsole;
+
+            m_scene.EventManager.OnMakeRootAgent -= EventManager_OnMakeRootAgent;
+            m_scene.EventManager.OnSaveNewWindlightProfile -= EventManager_OnSaveNewWindlightProfile;
+            m_scene.EventManager.OnSendNewWindlightProfileTargeted -= EventManager_OnSendNewWindlightProfileTargeted;
+
+            m_scene = null;
+        }
+
+        public void Close()
+        {
+        }
+
+        public string Name
+        {
+            get { return "LightShareModule"; }
+        }
+
+        public void RegionLoaded(Scene scene)
+        {
+        }
+
+        public Type ReplaceableInterface
+        {
+            get { return null; }
+        }
+
+        #endregion
+
+        public static bool EnableWindlight
+        {
+            get
             {
-                m_log.Debug("[WINDLIGHT]: ini failure for enable_windlight - using default");
+                return m_enableWindlight;
             }
-
-            if (m_enableWindlight)
+            set
             {
-                m_scene.EventManager.OnMakeRootAgent += EventManager_OnMakeRootAgent;
-                m_scene.EventManager.OnSaveNewWindlightProfile += EventManager_OnSaveNewWindlightProfile;
-                m_scene.EventManager.OnSendNewWindlightProfileTargeted += EventManager_OnSendNewWindlightProfileTargeted;
-                m_scene.LoadWindlightProfile();
             }
-
-            InstallCommands();
-
-            m_log.Debug("[WINDLIGHT]: Initialised windlight module");
         }
 
+        #region events
+
         private List<byte[]> compileWindlightSettings(RegionLightShareData wl)
         {
             byte[] mBlock = new Byte[249];
@@ -153,6 +190,9 @@ namespace OpenSim.Region.CoreModules.World.LightShare
 
         public void SendProfileToClient(IClientAPI client, RegionLightShareData wl)
         {
+            if (client == null)
+                return;
+
             if (m_enableWindlight)
             {
                 if (m_scene.RegionInfo.WindlightSettings.valid)
@@ -187,29 +227,6 @@ namespace OpenSim.Region.CoreModules.World.LightShare
             m_scene.ForEachRootClient(SendProfileToClient);
         }
 
-        public void PostInitialise()
-        {
-
-        }
-
-        public void Close()
-        {
-        }
-
-        public string Name
-        {
-            get { return "LightShareModule"; }
-        }
-
-        public bool IsSharedModule
-        {
-            get { return false; }
-        }
-
-        #endregion
-
-        #region events
-
         #endregion
 
         #region ICommandableModule Members
@@ -244,7 +261,7 @@ namespace OpenSim.Region.CoreModules.World.LightShare
         private void HandleDisable(Object[] args)
         {
             m_log.InfoFormat("[WINDLIGHT]: Plugin now disabled");
-            m_enableWindlight=false;
+            m_enableWindlight = false;
         }
 
         private void HandleEnable(Object[] args)
diff --git a/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs b/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs
index 09f6758..ab8f143 100644
--- a/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs
+++ b/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs
@@ -27,9 +27,12 @@
 
 using System;
 using System.Collections.Generic;
+using System.IO;
+using System.Linq;
 using System.Reflection;
 using System.Text;
 using System.Text.RegularExpressions;
+using System.Xml;
 using log4net;
 using Mono.Addins;
 using NDesk.Options;
@@ -40,6 +43,7 @@ using OpenSim.Framework.Console;
 using OpenSim.Framework.Monitoring;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
+using OpenSim.Region.Framework.Scenes.Serialization;
 
 namespace OpenSim.Region.CoreModules.World.Objects.Commands
 {
@@ -83,52 +87,85 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
             m_console.Commands.AddCommand(
                 "Objects", false, "delete object owner",
                 "delete object owner <UUID>",
-                "Delete a scene object by owner", HandleDeleteObject);
+                "Delete scene objects by owner",
+                "Command will ask for confirmation before proceeding.",
+                HandleDeleteObject);
 
             m_console.Commands.AddCommand(
                 "Objects", false, "delete object creator",
                 "delete object creator <UUID>",
-                "Delete a scene object by creator", HandleDeleteObject);
+                "Delete scene objects by creator",
+                "Command will ask for confirmation before proceeding.",
+                HandleDeleteObject);
 
             m_console.Commands.AddCommand(
-                "Objects", false, "delete object uuid",
-                "delete object uuid <UUID>",
-                "Delete a scene object by uuid", HandleDeleteObject);
+                "Objects", false, "delete object id",
+                "delete object id <UUID-or-localID>",
+                "Delete a scene object by uuid or localID",
+                HandleDeleteObject);
 
             m_console.Commands.AddCommand(
                 "Objects", false, "delete object name",
                 "delete object name [--regex] <name>",
                 "Delete a scene object by name.",
-                "If --regex is specified then the name is treatead as a regular expression",
+                "Command will ask for confirmation before proceeding.\n"
+                  + "If --regex is specified then the name is treatead as a regular expression",
                 HandleDeleteObject);
 
             m_console.Commands.AddCommand(
                 "Objects", false, "delete object outside",
                 "delete object outside",
-                "Delete all scene objects outside region boundaries", HandleDeleteObject);
+                "Delete all scene objects outside region boundaries",
+                "Command will ask for confirmation before proceeding.",
+                HandleDeleteObject);
 
             m_console.Commands.AddCommand(
                 "Objects",
                 false,
-                "show object uuid",
-                "show object uuid <UUID>",
-                "Show details of a scene object with the given UUID", HandleShowObjectByUuid);
+                "delete object pos",
+                "delete object pos <start-coord> to <end-coord>",
+                "Delete scene objects within the given area.",
+                ConsoleUtil.CoordHelp,
+                HandleDeleteObject);
+
+            m_console.Commands.AddCommand(
+                "Objects",
+                false,
+                "show object id",
+                "show object id [--full] <UUID-or-localID>",
+                "Show details of a scene object with the given UUID or localID",
+                "The --full option will print out information on all the parts of the object.\n"
+                    + "For yet more detailed part information, use the \"show part\" commands.",
+                HandleShowObjectById);
 
             m_console.Commands.AddCommand(
                 "Objects",
                 false,
                 "show object name",
-                "show object name [--regex] <name>",
+                "show object name [--full] [--regex] <name>",
                 "Show details of scene objects with the given name.",
-                "If --regex is specified then the name is treatead as a regular expression",
+                "The --full option will print out information on all the parts of the object.\n"
+                    + "For yet more detailed part information, use the \"show part\" commands.\n"
+                    + "If --regex is specified then the name is treatead as a regular expression.",
                 HandleShowObjectByName);
 
             m_console.Commands.AddCommand(
                 "Objects",
                 false,
-                "show part uuid",
-                "show part uuid <UUID>",
-                "Show details of a scene object parts with the given UUID", HandleShowPartByUuid);
+                "show object pos",
+                "show object pos [--full] <start-coord> to <end-coord>",
+                "Show details of scene objects within the given area.",
+                "The --full option will print out information on all the parts of the object.\n"
+                    + "For yet more detailed part information, use the \"show part\" commands.\n"
+                    + ConsoleUtil.CoordHelp,
+                HandleShowObjectByPos);
+
+            m_console.Commands.AddCommand(
+                "Objects",
+                false,
+                "show part id",
+                "show part id <UUID-or-localID>",
+                "Show details of a scene object part with the given UUID or localID", HandleShowPartById);
 
             m_console.Commands.AddCommand(
                 "Objects",
@@ -136,8 +173,28 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
                 "show part name",
                 "show part name [--regex] <name>",
                 "Show details of scene object parts with the given name.",
-                "If --regex is specified then the name is treatead as a regular expression",
+                "If --regex is specified then the name is treated as a regular expression",
                 HandleShowPartByName);
+
+            m_console.Commands.AddCommand(
+                "Objects",
+                false,
+                "show part pos",
+                "show part pos <start-coord> to <end-coord>",
+                "Show details of scene object parts within the given area.",
+                ConsoleUtil.CoordHelp,
+                HandleShowPartByPos);
+
+            m_console.Commands.AddCommand(
+                "Objects",
+                false,
+                "dump object id",
+                "dump object id <UUID-or-localID>",
+                "Dump the formatted serialization of the given object to the file <UUID>.xml",
+                "e.g. dump object uuid c1ed6809-cc24-4061-a4c2-93082a2d1f1d will dump serialization to c1ed6809-cc24-4061-a4c2-93082a2d1f1d.xml\n"
+                    + "To locate the UUID or localID in the first place, you need to use the other show object commands.\n"
+                    + "If a local ID is given then the filename used is still that for the UUID",
+                HandleDumpObjectById);
         }
 
         public void RemoveRegion(Scene scene)
@@ -150,25 +207,75 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
 //            m_log.DebugFormat("[OBJECTS COMMANDS MODULE]: REGION {0} LOADED", scene.RegionInfo.RegionName);
         }
 
-        private void HandleShowObjectByUuid(string module, string[] cmd)
+        /// <summary>
+        /// Outputs the sogs to console.
+        /// </summary>
+        /// <param name='searchPredicate'></param>
+        /// <param name='showFull'>If true then output all part details.  If false then output summary.</param>
+        private void OutputSogsToConsole(Predicate<SceneObjectGroup> searchPredicate, bool showFull)
+        {
+            List<SceneObjectGroup> sceneObjects = m_scene.GetSceneObjectGroups().FindAll(searchPredicate);
+
+            StringBuilder sb = new StringBuilder();
+
+            foreach (SceneObjectGroup so in sceneObjects)
+            {
+                AddSceneObjectReport(sb, so, showFull);
+                sb.Append("\n");
+            }
+
+            sb.AppendFormat("{0} object(s) found in {1}\n", sceneObjects.Count, m_scene.Name);
+
+            m_console.OutputFormat(sb.ToString());
+        }
+
+        private void OutputSopsToConsole(Predicate<SceneObjectPart> searchPredicate, bool showFull)
+        {
+            List<SceneObjectGroup> sceneObjects = m_scene.GetSceneObjectGroups();
+            List<SceneObjectPart> parts = new List<SceneObjectPart>();
+
+            sceneObjects.ForEach(so => parts.AddRange(Array.FindAll<SceneObjectPart>(so.Parts, searchPredicate)));
+
+            StringBuilder sb = new StringBuilder();
+
+            foreach (SceneObjectPart part in parts)
+            {
+                AddScenePartReport(sb, part, showFull);
+                sb.Append("\n");
+            }
+
+            sb.AppendFormat("{0} parts found in {1}\n", parts.Count, m_scene.Name);
+
+            m_console.OutputFormat(sb.ToString());
+        }
+
+        private void HandleShowObjectById(string module, string[] cmdparams)
         {
             if (!(m_console.ConsoleScene == null || m_console.ConsoleScene == m_scene))
                 return;
 
-            if (cmd.Length < 4)
+            bool showFull = false;
+            OptionSet options = new OptionSet().Add("full", v => showFull = v != null );
+
+            List<string> mainParams = options.Parse(cmdparams);
+
+            if (mainParams.Count < 4)
             {
                 m_console.OutputFormat("Usage: show object uuid <uuid>");
                 return;
             }
 
-            UUID objectUuid;
-            if (!UUID.TryParse(cmd[3], out objectUuid))
-            {
-                m_console.OutputFormat("{0} is not a valid uuid", cmd[3]);
+            UUID uuid;
+            uint localId;
+            if (!ConsoleUtil.TryParseConsoleId(m_console, mainParams[3], out uuid, out localId))
                 return;
-            }
 
-            SceneObjectGroup so = m_scene.GetSceneObjectGroup(objectUuid);
+            SceneObjectGroup so;
+
+            if (localId != ConsoleUtil.LocalIdNotFound)
+                so = m_scene.GetSceneObjectGroup(localId);
+            else
+                so = m_scene.GetSceneObjectGroup(uuid);
 
             if (so == null)
             {
@@ -177,7 +284,7 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
             }
 
             StringBuilder sb = new StringBuilder();
-            AddSceneObjectReport(sb, so);
+            AddSceneObjectReport(sb, so, showFull);
 
             m_console.OutputFormat(sb.ToString());
         }
@@ -187,70 +294,91 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
             if (!(m_console.ConsoleScene == null || m_console.ConsoleScene == m_scene))
                 return;
 
+            bool showFull = false;
             bool useRegex = false;
-            OptionSet options = new OptionSet().Add("regex", v=> useRegex = v != null );
+            OptionSet options = new OptionSet();
+            options.Add("full", v => showFull = v != null );
+            options.Add("regex", v => useRegex = v != null );
 
             List<string> mainParams = options.Parse(cmdparams);
 
             if (mainParams.Count < 4)
             {
-                m_console.OutputFormat("Usage: show object name [--regex] <name>");
+                m_console.OutputFormat("Usage: show object name [--full] [--regex] <name>");
                 return;
             }
 
             string name = mainParams[3];
 
-            List<SceneObjectGroup> sceneObjects = new List<SceneObjectGroup>();
-            Action<SceneObjectGroup> searchAction;
+            Predicate<SceneObjectGroup> searchPredicate;
 
             if (useRegex)
             {
                 Regex nameRegex = new Regex(name);
-                searchAction = so => { if (nameRegex.IsMatch(so.Name)) { sceneObjects.Add(so); }};
+                searchPredicate = so => nameRegex.IsMatch(so.Name);
             }
             else
             {
-                searchAction = so => { if (so.Name == name) { sceneObjects.Add(so); }};
+                searchPredicate = so => so.Name == name;
             }
 
-            m_scene.ForEachSOG(searchAction);
+            OutputSogsToConsole(searchPredicate, showFull);
+        }
 
-            if (sceneObjects.Count == 0)
-            {
-                m_console.OutputFormat("No objects with name {0} found in {1}", name, m_scene.RegionInfo.RegionName);
+        private void HandleShowObjectByPos(string module, string[] cmdparams)
+        {
+            if (!(m_console.ConsoleScene == null || m_console.ConsoleScene == m_scene))
                 return;
-            }
 
-            StringBuilder sb = new StringBuilder();
+            bool showFull = false;
+            OptionSet options = new OptionSet().Add("full", v => showFull = v != null );
 
-            foreach (SceneObjectGroup so in sceneObjects)
+            List<string> mainParams = options.Parse(cmdparams);
+
+            if (mainParams.Count < 5)
             {
-                AddSceneObjectReport(sb, so);
-                sb.Append("\n");
+                m_console.OutputFormat("Usage: show object pos [--full] <start-coord> to <end-coord>");
+                return;
             }
 
-            m_console.OutputFormat(sb.ToString());
+            Vector3 startVector, endVector;
+
+            if (!TryParseVectorRange(cmdparams.Skip(3).Take(3), out startVector, out endVector))
+                return;
+
+            Predicate<SceneObjectGroup> searchPredicate
+                = so => Util.IsInsideBox(so.AbsolutePosition, startVector, endVector);
+
+            OutputSogsToConsole(searchPredicate, showFull);
         }
 
-        private void HandleShowPartByUuid(string module, string[] cmd)
+        private void HandleShowPartById(string module, string[] cmdparams)
         {
             if (!(m_console.ConsoleScene == null || m_console.ConsoleScene == m_scene))
                 return;
 
-            if (cmd.Length < 4)
+//            bool showFull = false;
+            OptionSet options = new OptionSet();
+//            options.Add("full", v => showFull = v != null );
+
+            List<string> mainParams = options.Parse(cmdparams);
+
+            if (mainParams.Count < 4)
             {
-                m_console.OutputFormat("Usage: show part uuid <uuid>");
+                m_console.OutputFormat("Usage: show part id [--full] <UUID-or-localID>");
                 return;
             }
 
             UUID objectUuid;
-            if (!UUID.TryParse(cmd[3], out objectUuid))
-            {
-                m_console.OutputFormat("{0} is not a valid uuid", cmd[3]);
+            uint localId;
+            if (!ConsoleUtil.TryParseConsoleId(m_console, mainParams[3], out objectUuid, out localId))
                 return;
-            }
 
-            SceneObjectPart sop = m_scene.GetSceneObjectPart(objectUuid);
+            SceneObjectPart sop;
+            if (localId == ConsoleUtil.LocalIdNotFound)
+                sop = m_scene.GetSceneObjectPart(objectUuid);
+            else
+                sop = m_scene.GetSceneObjectPart(localId);
 
             if (sop == null)
             {
@@ -259,84 +387,239 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
             }
 
             StringBuilder sb = new StringBuilder();
-            AddScenePartReport(sb, sop);
+            AddScenePartReport(sb, sop, true);
 
             m_console.OutputFormat(sb.ToString());
         }
 
+        private void HandleShowPartByPos(string module, string[] cmdparams)
+        {
+            if (!(m_console.ConsoleScene == null || m_console.ConsoleScene == m_scene))
+                return;
+
+//            bool showFull = false;
+            OptionSet options = new OptionSet();
+//            options.Add("full", v => showFull = v != null );
+
+            List<string> mainParams = options.Parse(cmdparams);
+
+            if (mainParams.Count < 5)
+            {
+                m_console.OutputFormat("Usage: show part pos [--full] <start-coord> to <end-coord>");
+                return;
+            }
+
+            string rawConsoleStartVector = mainParams[3];
+            Vector3 startVector;
+
+            if (!ConsoleUtil.TryParseConsoleMinVector(rawConsoleStartVector, out startVector))
+            {
+                m_console.OutputFormat("Error: Start vector {0} does not have a valid format", rawConsoleStartVector);
+                return;
+            }
+
+            string rawConsoleEndVector = mainParams[5];
+            Vector3 endVector;
+
+            if (!ConsoleUtil.TryParseConsoleMaxVector(rawConsoleEndVector, out endVector))
+            {
+                m_console.OutputFormat("Error: End vector {0} does not have a valid format", rawConsoleEndVector);
+                return;
+            }
+
+            OutputSopsToConsole(sop => Util.IsInsideBox(sop.AbsolutePosition, startVector, endVector), true);
+        }
+
         private void HandleShowPartByName(string module, string[] cmdparams)
         {
             if (!(m_console.ConsoleScene == null || m_console.ConsoleScene == m_scene))
                 return;
 
+//            bool showFull = false;
             bool useRegex = false;
-            OptionSet options = new OptionSet().Add("regex", v=> useRegex = v != null );
+            OptionSet options = new OptionSet();
+//            options.Add("full", v => showFull = v != null );
+            options.Add("regex", v => useRegex = v != null );
 
             List<string> mainParams = options.Parse(cmdparams);
 
             if (mainParams.Count < 4)
             {
-                m_console.OutputFormat("Usage: show part name [--regex] <name>");
+                m_console.OutputFormat("Usage: show part name [--full] [--regex] <name>");
                 return;
             }
 
             string name = mainParams[3];
 
-            List<SceneObjectPart> parts = new List<SceneObjectPart>();
-
-            Action<SceneObjectGroup> searchAction;
+            Predicate<SceneObjectPart> searchPredicate;
 
             if (useRegex)
             {
                 Regex nameRegex = new Regex(name);
-                searchAction = so => so.ForEachPart(sop => { if (nameRegex.IsMatch(sop.Name)) { parts.Add(sop); } });
+                searchPredicate = sop => nameRegex.IsMatch(sop.Name);
             }
             else
             {
-                searchAction = so => so.ForEachPart(sop => { if (sop.Name == name) { parts.Add(sop); } });
+                searchPredicate = sop => sop.Name == name;
             }
 
-            m_scene.ForEachSOG(searchAction);
+            OutputSopsToConsole(searchPredicate, true);
+        }
+
+        private void HandleDumpObjectById(string module, string[] cmdparams)
+        {
+            if (!(m_console.ConsoleScene == null || m_console.ConsoleScene == m_scene))
+                return;
 
-            if (parts.Count == 0)
+            if (cmdparams.Length < 4)
             {
-                m_console.OutputFormat("No parts with name {0} found in {1}", name, m_scene.RegionInfo.RegionName);
+                m_console.OutputFormat("Usage: dump object id <UUID-or-localID>");
                 return;
             }
 
-            StringBuilder sb = new StringBuilder();
+            UUID objectUuid;
+            uint localId;
+            if (!ConsoleUtil.TryParseConsoleId(m_console, cmdparams[3], out objectUuid, out localId))
+                return;
 
-            foreach (SceneObjectPart part in parts)
+            SceneObjectGroup so;
+            if (localId == ConsoleUtil.LocalIdNotFound)
+                so = m_scene.GetSceneObjectGroup(objectUuid);
+            else
+                so = m_scene.GetSceneObjectGroup(localId);
+
+            if (so == null)
             {
-                AddScenePartReport(sb, part);
-                sb.Append("\n");
+//                m_console.OutputFormat("No part found with uuid {0}", objectUuid);
+                return;
             }
 
-            m_console.OutputFormat(sb.ToString());
+            // In case we found it via local ID.
+            objectUuid = so.UUID;
+
+            string fileName = string.Format("{0}.xml", objectUuid);
+
+            if (!ConsoleUtil.CheckFileDoesNotExist(m_console, fileName))
+                return;
+            
+            using (XmlTextWriter xtw = new XmlTextWriter(fileName, Encoding.UTF8))
+            {
+                xtw.Formatting = Formatting.Indented;
+                SceneObjectSerializer.ToOriginalXmlFormat(so, xtw, true);
+            }
+            
+            m_console.OutputFormat("Object dumped to file {0}", fileName);
         }
 
-        private StringBuilder AddSceneObjectReport(StringBuilder sb, SceneObjectGroup so)
+        /// <summary>
+        /// Append a scene object report to an input StringBuilder
+        /// </summary>
+        /// <returns></returns>
+        /// <param name='sb'></param>
+        /// <param name='so'</param>
+        /// <param name='showFull'>
+        /// If true then information on all parts of an object is appended.
+        /// If false then only summary information about an object is appended.
+        /// </param>
+        private StringBuilder AddSceneObjectReport(StringBuilder sb, SceneObjectGroup so, bool showFull)
         {
-            sb.AppendFormat("Name:        {0}\n", so.Name);
-            sb.AppendFormat("Description: {0}\n", so.Description);
-            sb.AppendFormat("Location:    {0} @ {1}\n", so.AbsolutePosition, so.Scene.RegionInfo.RegionName);
-            sb.AppendFormat("Parts:       {0}\n", so.PrimCount);
-            sb.AppendFormat("Flags:       {0}\n", so.RootPart.Flags);
+            if (showFull)
+            {
+                foreach (SceneObjectPart sop in so.Parts)
+                {
+                    AddScenePartReport(sb, sop, false);
+                    sb.Append("\n");
+                }
+            }
+            else
+            {
+                AddSummarySceneObjectReport(sb, so);
+            }
 
             return sb;
         }
 
-        private StringBuilder AddScenePartReport(StringBuilder sb, SceneObjectPart sop)
+        private StringBuilder AddSummarySceneObjectReport(StringBuilder sb, SceneObjectGroup so)
         {
-            sb.AppendFormat("Name:        {0}\n", sop.Name);
-            sb.AppendFormat("Description: {0}\n", sop.Description);
-            sb.AppendFormat("Location:    {0} @ {1}\n", sop.AbsolutePosition, sop.ParentGroup.Scene.RegionInfo.RegionName);
-            sb.AppendFormat("Parent:      {0}",
-                sop.IsRoot ? "Is Root\n" : string.Format("{0} {1}\n", sop.ParentGroup.Name, sop.ParentGroup.UUID));
-            sb.AppendFormat("Link number: {0}\n", sop.LinkNum);
-            sb.AppendFormat("Flags:       {0}\n", sop.Flags);
+            ConsoleDisplayList cdl = new ConsoleDisplayList();
+            cdl.AddRow("Name", so.Name);
+            cdl.AddRow("Descrition", so.Description);
+            cdl.AddRow("Local ID", so.LocalId);
+            cdl.AddRow("UUID", so.UUID);
+            cdl.AddRow("Location", string.Format("{0} @ {1}", so.AbsolutePosition, so.Scene.Name));
+            cdl.AddRow("Parts", so.PrimCount);
+            cdl.AddRow("Flags", so.RootPart.Flags);
+
+            return sb.Append(cdl.ToString());
+        }
 
-            return sb;
+        /// <summary>
+        /// Append a scene object part report to an input StringBuilder
+        /// </summary>
+        /// <returns></returns>
+        /// <param name='sb'></param>
+        /// <param name='sop'</param>
+        /// <param name='showFull'>
+        /// If true then information on each inventory item will be shown.
+        /// If false then only summary inventory information is shown.
+        /// </param>
+        private StringBuilder AddScenePartReport(StringBuilder sb, SceneObjectPart sop, bool showFull)
+        {
+            ConsoleDisplayList cdl = new ConsoleDisplayList();
+            cdl.AddRow("Name", sop.Name);
+            cdl.AddRow("Description", sop.Description);
+            cdl.AddRow("Local ID", sop.LocalId);
+            cdl.AddRow("UUID", sop.UUID);
+            cdl.AddRow("Location",  string.Format("{0} @ {1}", sop.AbsolutePosition, sop.ParentGroup.Scene.Name));
+            cdl.AddRow(
+                "Parent",
+                sop.IsRoot ? "Is Root" : string.Format("{0} {1}", sop.ParentGroup.Name, sop.ParentGroup.UUID));
+            cdl.AddRow("Link number", sop.LinkNum);
+            cdl.AddRow("Flags", sop.Flags);
+
+            object itemsOutput;
+            if (showFull)
+            {
+                StringBuilder itemsSb = new StringBuilder("\n");
+                itemsOutput = AddScenePartItemsReport(itemsSb, sop.Inventory).ToString();
+            }
+            else
+            {
+                itemsOutput = sop.Inventory.Count;
+            }
+
+
+            cdl.AddRow("Items", itemsOutput);
+
+            return sb.Append(cdl.ToString());
+        }
+
+        private StringBuilder AddScenePartItemsReport(StringBuilder sb, IEntityInventory inv)
+        {
+            ConsoleDisplayTable cdt = new ConsoleDisplayTable();
+            cdt.Indent = 2;
+
+            cdt.AddColumn("Name", 50);
+            cdt.AddColumn("Type", 12);
+            cdt.AddColumn("Running", 7);
+            cdt.AddColumn("Item UUID", 36);
+            cdt.AddColumn("Asset UUID", 36);
+
+            foreach (TaskInventoryItem item in inv.GetInventoryItems())
+            {
+                bool foundScriptInstance, scriptRunning;
+                foundScriptInstance
+                    = SceneObjectPartInventory.TryGetScriptInstanceRunning(m_scene, item, out scriptRunning);
+
+                cdt.AddRow(
+                    item.Name,
+                    ((InventoryType)item.InvType).ToString(),
+                    foundScriptInstance ? scriptRunning.ToString() : "n/a",
+                    item.ItemID.ToString(),
+                    item.AssetID.ToString());
+            }
+
+            return sb.Append(cdt.ToString());
         }
 
         private void HandleDeleteObject(string module, string[] cmd)
@@ -398,19 +681,24 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
         
                     break;
         
-                case "uuid":
-                    if (!UUID.TryParse(o, out match))
+                case "id":
+                    UUID uuid;
+                    uint localId;
+                    if (!ConsoleUtil.TryParseConsoleId(m_console, o, out uuid, out localId))
                         return;
 
                     requireConfirmation = false;
                     deletes = new List<SceneObjectGroup>();
-        
-                    m_scene.ForEachSOG(delegate (SceneObjectGroup g)
-                    {
-                        if (g.UUID == match && !g.IsAttachment)
-                            deletes.Add(g);
-                    });
-        
+
+                    SceneObjectGroup so;
+                    if (localId == ConsoleUtil.LocalIdNotFound)
+                        so = m_scene.GetSceneObjectGroup(uuid);
+                    else
+                        so = m_scene.GetSceneObjectGroup(localId);
+
+                    if (!so.IsAttachment)
+                       deletes.Add(so);
+
         //                if (deletes.Count == 0)
         //                    m_console.OutputFormat("No objects were found with uuid {0}", match);
         
@@ -450,6 +738,10 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
         
                     break;
 
+                case "pos":
+                    deletes = GetDeleteCandidatesByPos(module, cmd);
+                    break;
+
                 default:
                     m_console.OutputFormat("Unrecognized mode {0}", mode);
                     return;
@@ -464,7 +756,7 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
                     string.Format(
                         "Are you sure that you want to delete {0} objects from {1}",
                         deletes.Count, m_scene.RegionInfo.RegionName),
-                    "n");
+                    "y/N");
     
                 if (response.ToLower() != "y")
                 {
@@ -486,9 +778,6 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
 
         private List<SceneObjectGroup> GetDeleteCandidatesByName(string module, string[] cmdparams)
         {
-            if (!(m_console.ConsoleScene == null || m_console.ConsoleScene == m_scene))
-                return null;
-
             bool useRegex = false;
             OptionSet options = new OptionSet().Add("regex", v=> useRegex = v != null );
 
@@ -522,5 +811,52 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
 
             return sceneObjects;
         }
+
+        /// <summary>
+        /// Get scene object delete candidates by position
+        /// </summary>
+        /// <param name='module'></param>
+        /// <param name='cmdparams'></param>
+        /// <returns>null if parsing failed on one of the arguments, otherwise a list of objects to delete.  If there
+        /// are no objects to delete then the list will be empty./returns>
+        private List<SceneObjectGroup> GetDeleteCandidatesByPos(string module, string[] cmdparams)
+        {
+            if (cmdparams.Length < 5)
+            {
+                m_console.OutputFormat("Usage: delete object pos <start-coord> to <end-coord>");
+                return null;
+            }
+
+            Vector3 startVector, endVector;
+
+            if (!TryParseVectorRange(cmdparams.Skip(3).Take(3), out startVector, out endVector))
+                return null;
+
+            return m_scene.GetSceneObjectGroups().FindAll(
+                so => !so.IsAttachment && Util.IsInsideBox(so.AbsolutePosition, startVector, endVector));
+        }
+
+        private bool TryParseVectorRange(IEnumerable<string> rawComponents, out Vector3 startVector, out Vector3 endVector)
+        {
+            string rawConsoleStartVector = rawComponents.Take(1).Single();
+
+            if (!ConsoleUtil.TryParseConsoleMinVector(rawConsoleStartVector, out startVector))
+            {
+                m_console.OutputFormat("Error: Start vector {0} does not have a valid format", rawConsoleStartVector);
+                endVector = Vector3.Zero;
+                
+                return false;
+            }
+
+            string rawConsoleEndVector = rawComponents.Skip(1).Take(1).Single();
+
+            if (!ConsoleUtil.TryParseConsoleMaxVector(rawConsoleEndVector, out endVector))
+            {
+                m_console.OutputFormat("Error: End vector {0} does not have a valid format", rawConsoleEndVector);
+                return false;
+            }
+
+            return true;
+        }
     }
 }
\ No newline at end of file
diff --git a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
index f3d38bc..ddaa227 100644
--- a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
+++ b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
@@ -37,13 +37,17 @@ using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Services.Interfaces;
 
+using Mono.Addins;
+
 namespace OpenSim.Region.CoreModules.World.Permissions
 {
-    public class PermissionsModule : IRegionModule, IPermissionsModule
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "PermissionsModule")]
+    public class PermissionsModule : INonSharedRegionModule, IPermissionsModule
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
                 
         protected Scene m_scene;
+        protected bool m_Enabled;
 
         private InventoryFolderImpl m_libraryRootFolder;
         protected InventoryFolderImpl LibraryRootFolder
@@ -114,18 +118,44 @@ namespace OpenSim.Region.CoreModules.World.Permissions
         private Dictionary<string, bool> GrantVB = new Dictionary<string, bool>();
         private Dictionary<string, bool> GrantJS = new Dictionary<string, bool>();
         private Dictionary<string, bool> GrantYP = new Dictionary<string, bool>();
+        
         private IFriendsModule m_friendsModule;
+        private IFriendsModule FriendsModule
+        {
+            get
+            {
+                if (m_friendsModule == null)
+                    m_friendsModule = m_scene.RequestModuleInterface<IFriendsModule>();
+                return m_friendsModule;
+            }
+        }
         private IGroupsModule m_groupsModule;
-        private IMoapModule m_moapModule;
+        private IGroupsModule GroupsModule
+        {
+            get
+            {
+                if (m_groupsModule == null)
+                    m_groupsModule = m_scene.RequestModuleInterface<IGroupsModule>();
+                return m_groupsModule;
+            }
+        }
 
+        private IMoapModule m_moapModule;
+        private IMoapModule MoapModule
+        {
+            get
+            {
+                if (m_moapModule == null)
+                    m_moapModule = m_scene.RequestModuleInterface<IMoapModule>();
+                return m_moapModule;
+            }
+        }
         #endregion
 
-        #region IRegionModule Members
+        #region INonSharedRegionModule Members
 
-        public void Initialise(Scene scene, IConfigSource config)
+        public void Initialise(IConfigSource config)
         {
-            m_scene = scene;
-
             IConfig myConfig = config.Configs["Startup"];
 
             string permissionModules = myConfig.GetString("permissionmodules", "DefaultPermissionsModule");
@@ -135,6 +165,8 @@ namespace OpenSim.Region.CoreModules.World.Permissions
             if (!modules.Contains("DefaultPermissionsModule"))
                 return;
 
+            m_Enabled = true;
+
             m_allowGridGods = myConfig.GetBoolean("allow_grid_gods", false);
             m_bypassPermissions = !myConfig.GetBoolean("serverside_object_permissions", true);
             m_propagatePermissions = myConfig.GetBoolean("propagate_permissions", true);
@@ -144,7 +176,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
 
             m_SimpleBuildPermissions = myConfig.GetBoolean("simple_build_permissions", false);
 
-            m_allowedScriptCreators 
+            m_allowedScriptCreators
                 = ParseUserSetConfigSetting(myConfig, "allowed_script_creators", m_allowedScriptCreators);
             m_allowedScriptEditors
                 = ParseUserSetConfigSetting(myConfig, "allowed_script_editors", m_allowedScriptEditors);
@@ -154,6 +186,64 @@ namespace OpenSim.Region.CoreModules.World.Permissions
             else
                 m_log.Debug("[PERMISSIONS]: Enabling all region service permission checks");
 
+            string grant = myConfig.GetString("GrantLSL", "");
+            if (grant.Length > 0)
+            {
+                foreach (string uuidl in grant.Split(','))
+                {
+                    string uuid = uuidl.Trim(" \t".ToCharArray());
+                    GrantLSL.Add(uuid, true);
+                }
+            }
+
+            grant = myConfig.GetString("GrantCS", "");
+            if (grant.Length > 0)
+            {
+                foreach (string uuidl in grant.Split(','))
+                {
+                    string uuid = uuidl.Trim(" \t".ToCharArray());
+                    GrantCS.Add(uuid, true);
+                }
+            }
+
+            grant = myConfig.GetString("GrantVB", "");
+            if (grant.Length > 0)
+            {
+                foreach (string uuidl in grant.Split(','))
+                {
+                    string uuid = uuidl.Trim(" \t".ToCharArray());
+                    GrantVB.Add(uuid, true);
+                }
+            }
+
+            grant = myConfig.GetString("GrantJS", "");
+            if (grant.Length > 0)
+            {
+                foreach (string uuidl in grant.Split(','))
+                {
+                    string uuid = uuidl.Trim(" \t".ToCharArray());
+                    GrantJS.Add(uuid, true);
+                }
+            }
+
+            grant = myConfig.GetString("GrantYP", "");
+            if (grant.Length > 0)
+            {
+                foreach (string uuidl in grant.Split(','))
+                {
+                    string uuid = uuidl.Trim(" \t".ToCharArray());
+                    GrantYP.Add(uuid, true);
+                }
+            }
+        }
+
+        public void AddRegion(Scene scene)
+        {
+            if (!m_Enabled)
+                return;
+
+            m_scene = scene;
+
             scene.RegisterModuleInterface<IPermissionsModule>(this);
 
             //Register functions with Scene External Checks!
@@ -169,44 +259,44 @@ namespace OpenSim.Region.CoreModules.World.Permissions
             m_scene.Permissions.OnIsGridGod += IsGridGod;
             m_scene.Permissions.OnIsAdministrator += IsAdministrator;
             m_scene.Permissions.OnDuplicateObject += CanDuplicateObject;
-            m_scene.Permissions.OnDeleteObject += CanDeleteObject; //MAYBE FULLY IMPLEMENTED
-            m_scene.Permissions.OnEditObject += CanEditObject; //MAYBE FULLY IMPLEMENTED
-            m_scene.Permissions.OnEditParcelProperties += CanEditParcelProperties; //MAYBE FULLY IMPLEMENTED
+            m_scene.Permissions.OnDeleteObject += CanDeleteObject; 
+            m_scene.Permissions.OnEditObject += CanEditObject; 
+            m_scene.Permissions.OnEditParcelProperties += CanEditParcelProperties; 
             m_scene.Permissions.OnInstantMessage += CanInstantMessage;
-            m_scene.Permissions.OnInventoryTransfer += CanInventoryTransfer; //NOT YET IMPLEMENTED
-            m_scene.Permissions.OnIssueEstateCommand += CanIssueEstateCommand; //FULLY IMPLEMENTED
-            m_scene.Permissions.OnMoveObject += CanMoveObject; //MAYBE FULLY IMPLEMENTED
+            m_scene.Permissions.OnInventoryTransfer += CanInventoryTransfer; 
+            m_scene.Permissions.OnIssueEstateCommand += CanIssueEstateCommand; 
+            m_scene.Permissions.OnMoveObject += CanMoveObject; 
             m_scene.Permissions.OnObjectEntry += CanObjectEntry;
-            m_scene.Permissions.OnReturnObjects += CanReturnObjects; //NOT YET IMPLEMENTED
-            m_scene.Permissions.OnRezObject += CanRezObject; //MAYBE FULLY IMPLEMENTED
+            m_scene.Permissions.OnReturnObjects += CanReturnObjects; 
+            m_scene.Permissions.OnRezObject += CanRezObject; 
             m_scene.Permissions.OnRunConsoleCommand += CanRunConsoleCommand;
-            m_scene.Permissions.OnRunScript += CanRunScript; //NOT YET IMPLEMENTED
+            m_scene.Permissions.OnRunScript += CanRunScript; 
             m_scene.Permissions.OnCompileScript += CanCompileScript;
             m_scene.Permissions.OnSellParcel += CanSellParcel;
             m_scene.Permissions.OnTakeObject += CanTakeObject;
             m_scene.Permissions.OnTakeCopyObject += CanTakeCopyObject;
             m_scene.Permissions.OnTerraformLand += CanTerraformLand;
-            m_scene.Permissions.OnLinkObject += CanLinkObject; //NOT YET IMPLEMENTED
-            m_scene.Permissions.OnDelinkObject += CanDelinkObject; //NOT YET IMPLEMENTED
-            m_scene.Permissions.OnBuyLand += CanBuyLand; //NOT YET IMPLEMENTED
+            m_scene.Permissions.OnLinkObject += CanLinkObject; 
+            m_scene.Permissions.OnDelinkObject += CanDelinkObject; 
+            m_scene.Permissions.OnBuyLand += CanBuyLand; 
             
-            m_scene.Permissions.OnViewNotecard += CanViewNotecard; //NOT YET IMPLEMENTED
-            m_scene.Permissions.OnViewScript += CanViewScript; //NOT YET IMPLEMENTED
-            m_scene.Permissions.OnEditNotecard += CanEditNotecard; //NOT YET IMPLEMENTED
-            m_scene.Permissions.OnEditScript += CanEditScript; //NOT YET IMPLEMENTED
+            m_scene.Permissions.OnViewNotecard += CanViewNotecard; 
+            m_scene.Permissions.OnViewScript += CanViewScript; 
+            m_scene.Permissions.OnEditNotecard += CanEditNotecard; 
+            m_scene.Permissions.OnEditScript += CanEditScript; 
             
             m_scene.Permissions.OnCreateObjectInventory += CanCreateObjectInventory;
-            m_scene.Permissions.OnEditObjectInventory += CanEditObjectInventory;//MAYBE FULLY IMPLEMENTED
-            m_scene.Permissions.OnCopyObjectInventory += CanCopyObjectInventory; //NOT YET IMPLEMENTED
-            m_scene.Permissions.OnDeleteObjectInventory += CanDeleteObjectInventory; //NOT YET IMPLEMENTED
+            m_scene.Permissions.OnEditObjectInventory += CanEditObjectInventory;
+            m_scene.Permissions.OnCopyObjectInventory += CanCopyObjectInventory; 
+            m_scene.Permissions.OnDeleteObjectInventory += CanDeleteObjectInventory; 
             m_scene.Permissions.OnResetScript += CanResetScript;
             
-            m_scene.Permissions.OnCreateUserInventory += CanCreateUserInventory; //NOT YET IMPLEMENTED
-            m_scene.Permissions.OnCopyUserInventory += CanCopyUserInventory; //NOT YET IMPLEMENTED
-            m_scene.Permissions.OnEditUserInventory += CanEditUserInventory; //NOT YET IMPLEMENTED
-            m_scene.Permissions.OnDeleteUserInventory += CanDeleteUserInventory; //NOT YET IMPLEMENTED
+            m_scene.Permissions.OnCreateUserInventory += CanCreateUserInventory; 
+            m_scene.Permissions.OnCopyUserInventory += CanCopyUserInventory; 
+            m_scene.Permissions.OnEditUserInventory += CanEditUserInventory; 
+            m_scene.Permissions.OnDeleteUserInventory += CanDeleteUserInventory; 
             
-            m_scene.Permissions.OnTeleport += CanTeleport; //NOT YET IMPLEMENTED
+            m_scene.Permissions.OnTeleport += CanTeleport; 
             
             m_scene.Permissions.OnControlPrimMedia += CanControlPrimMedia;
             m_scene.Permissions.OnInteractWithPrimMedia += CanInteractWithPrimMedia;
@@ -226,52 +316,38 @@ namespace OpenSim.Region.CoreModules.World.Permissions
                     "Turn on permissions debugging",
                     HandleDebugPermissions);                    
                     
-            string grant = myConfig.GetString("GrantLSL","");
-            if (grant.Length > 0) {
-                foreach (string uuidl in grant.Split(',')) {
-                    string uuid = uuidl.Trim(" \t".ToCharArray());
-                    GrantLSL.Add(uuid, true);
-                }
-            }
+        }
 
-            grant = myConfig.GetString("GrantCS","");
-            if (grant.Length > 0) {
-                foreach (string uuidl in grant.Split(',')) {
-                    string uuid = uuidl.Trim(" \t".ToCharArray());
-                    GrantCS.Add(uuid, true);
-                }
-            }
+        public void RegionLoaded(Scene scene)
+        {
+        }
 
-            grant = myConfig.GetString("GrantVB","");
-            if (grant.Length > 0) {
-                foreach (string uuidl in grant.Split(',')) {
-                    string uuid = uuidl.Trim(" \t".ToCharArray());
-                    GrantVB.Add(uuid, true);
-                }
-            }
+        public void RemoveRegion(Scene scene)
+        {
+            if (!m_Enabled)
+                return;
 
-            grant = myConfig.GetString("GrantJS", "");
-            if (grant.Length > 0)
-            {
-                foreach (string uuidl in grant.Split(','))
-                {
-                    string uuid = uuidl.Trim(" \t".ToCharArray());
-                    GrantJS.Add(uuid, true);
-                }
-            }
+            m_scene.UnregisterModuleInterface<IPermissionsModule>(this);
+        }
 
-            grant = myConfig.GetString("GrantYP", "");
-            if (grant.Length > 0)
-            {
-                foreach (string uuidl in grant.Split(','))
-                {
-                    string uuid = uuidl.Trim(" \t".ToCharArray());
-                    GrantYP.Add(uuid, true);
-                }
-            }
+        public void Close()
+        {
+        }
+
+        public string Name
+        {
+            get { return "PermissionsModule"; }
+        }
 
+        public Type ReplaceableInterface
+        {
+            get { return null; }
         }
 
+        #endregion
+
+        #region Console command handlers
+
         public void HandleBypassPermissions(string module, string[] args)
         {
             if (m_scene.ConsoleScene() != null &&
@@ -290,7 +366,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
                 m_bypassPermissions = val;
 
                 m_log.InfoFormat(
-                    "[PERMISSIONS]: Set permissions bypass to {0} for {1}", 
+                    "[PERMISSIONS]: Set permissions bypass to {0} for {1}",
                     m_bypassPermissions, m_scene.RegionInfo.RegionName);
             }
         }
@@ -343,39 +419,6 @@ namespace OpenSim.Region.CoreModules.World.Permissions
             }
         }
 
-        public void PostInitialise()
-        {
-            m_friendsModule = m_scene.RequestModuleInterface<IFriendsModule>();
-
-            if (m_friendsModule == null)
-                m_log.Debug("[PERMISSIONS]: Friends module not found, friend permissions will not work");
-
-            m_groupsModule = m_scene.RequestModuleInterface<IGroupsModule>();
-
-            if (m_groupsModule == null)
-                m_log.Debug("[PERMISSIONS]: Groups module not found, group permissions will not work");
-            
-            m_moapModule = m_scene.RequestModuleInterface<IMoapModule>();
-            
-            // This log line will be commented out when no longer required for debugging
-//            if (m_moapModule == null)
-//                m_log.Warn("[PERMISSIONS]: Media on a prim module not found, media on a prim permissions will not work");
-        }
-
-        public void Close()
-        {
-        }
-
-        public string Name
-        {
-            get { return "DefaultPermissionsModule"; }
-        }
-
-        public bool IsSharedModule
-        {
-            get { return false; }
-        }
-
         #endregion
 
         #region Helper Functions
@@ -400,10 +443,10 @@ namespace OpenSim.Region.CoreModules.World.Permissions
         /// <returns></returns>
         protected bool IsGroupMember(UUID groupID, UUID userID, ulong powers)
         {
-            if (null == m_groupsModule)
+            if (null == GroupsModule)
                 return false;
 
-            GroupMembershipData gmd = m_groupsModule.GetMembershipData(groupID, userID);
+            GroupMembershipData gmd = GroupsModule.GetMembershipData(groupID, userID);
 
             if (gmd != null)
             {
@@ -503,10 +546,10 @@ namespace OpenSim.Region.CoreModules.World.Permissions
             if (user == UUID.Zero)
                 return false;
 
-            if (m_friendsModule == null)
+            if (FriendsModule == null)
                 return false;
 
-            int friendPerms = m_friendsModule.GetRightsGrantedByFriend(user, objectOwner);
+            int friendPerms = FriendsModule.GetRightsGrantedByFriend(user, objectOwner);
             return (friendPerms & (int)FriendRights.CanModifyObjects) != 0;
         }
 
@@ -1915,14 +1958,14 @@ namespace OpenSim.Region.CoreModules.World.Permissions
 //                "[PERMISSONS]: Performing CanControlPrimMedia check with agentID {0}, primID {1}, face {2}",
 //                agentID, primID, face);
             
-            if (null == m_moapModule)
+            if (null == MoapModule)
                 return false;
             
             SceneObjectPart part = m_scene.GetSceneObjectPart(primID);
             if (null == part)
                 return false;
             
-            MediaEntry me = m_moapModule.GetMediaEntry(part, face);
+            MediaEntry me = MoapModule.GetMediaEntry(part, face);
             
             // If there is no existing media entry then it can be controlled (in this context, created).
             if (null == me)
@@ -1941,14 +1984,14 @@ namespace OpenSim.Region.CoreModules.World.Permissions
 //                "[PERMISSONS]: Performing CanInteractWithPrimMedia check with agentID {0}, primID {1}, face {2}",
 //                agentID, primID, face);
             
-            if (null == m_moapModule)
+            if (null == MoapModule)
                 return false;
             
             SceneObjectPart part = m_scene.GetSceneObjectPart(primID);
             if (null == part)
                 return false;
             
-            MediaEntry me = m_moapModule.GetMediaEntry(part, face);
+            MediaEntry me = MoapModule.GetMediaEntry(part, face);
             
             // If there is no existing media entry then it can be controlled (in this context, created).
             if (null == me)
diff --git a/OpenSim/Region/CoreModules/World/Region/RestartModule.cs b/OpenSim/Region/CoreModules/World/Region/RestartModule.cs
index 287738a..9c441ed 100644
--- a/OpenSim/Region/CoreModules/World/Region/RestartModule.cs
+++ b/OpenSim/Region/CoreModules/World/Region/RestartModule.cs
@@ -26,6 +26,7 @@
  */
 
 using System;
+using System.Linq;
 using System.Reflection;
 using System.Timers;
 using System.IO;
@@ -305,6 +306,9 @@ namespace OpenSim.Region.CoreModules.World.Region
             for (int i = 4 ; i < args.Length ; i++)
                 times.Add(Convert.ToInt32(args[i]));
 
+            MainConsole.Instance.OutputFormat(
+                "Region {0} scheduled for restart in {1} seconds", m_Scene.Name, times.Sum());
+
             ScheduleRestart(UUID.Zero, args[3], times.ToArray(), notice);
         }
 
@@ -328,4 +332,4 @@ namespace OpenSim.Region.CoreModules.World.Region
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Region/CoreModules/World/Serialiser/SerialiserModule.cs b/OpenSim/Region/CoreModules/World/Serialiser/SerialiserModule.cs
index 0e861a1..e0247d9 100644
--- a/OpenSim/Region/CoreModules/World/Serialiser/SerialiserModule.cs
+++ b/OpenSim/Region/CoreModules/World/Serialiser/SerialiserModule.cs
@@ -32,6 +32,7 @@ using System.Reflection;
 
 using log4net;
 using Nini.Config;
+using Mono.Addins;
 
 using OpenMetaverse;
 using OpenSim.Region.CoreModules.Framework.InterfaceCommander;
@@ -41,6 +42,7 @@ using OpenSim.Region.Framework.Scenes.Serialization;
 
 namespace OpenSim.Region.CoreModules.World.Serialiser
 {
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "SerialiserModule")]
     public class SerialiserModule : ISharedRegionModule, IRegionSerialiserModule
     {
         private static readonly ILog m_log = 
diff --git a/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs b/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs
index 14c1a39..513a8f5 100644
--- a/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs
+++ b/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) Contributors, http://opensimulator.org/
  * See CONTRIBUTORS.TXT for a full list of copyright holders.
  *
@@ -24,56 +24,110 @@
  * (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.IO;
+using System.Collections.Generic;
+using System.Reflection;
+
 using Nini.Config;
 using OpenMetaverse;
+using log4net;
+using Mono.Addins;
+
 using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
-using System.Reflection;
-using log4net;
 
 namespace OpenSim.Region.CoreModules.World.Sound
 {
-    public class SoundModule : IRegionModule, ISoundModule
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "SoundModule")]
+    public class SoundModule : INonSharedRegionModule, ISoundModule
     {
-//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        
-        protected Scene m_scene;
-        
-        public void Initialise(Scene scene, IConfigSource source)
+        private static readonly ILog m_log = LogManager.GetLogger(
+                MethodBase.GetCurrentMethod().DeclaringType);
+
+        private Scene m_scene;
+
+        public bool Enabled { get; private set; }
+
+        public float MaxDistance { get; private set; }
+
+        #region INonSharedRegionModule
+
+        public void Initialise(IConfigSource configSource)
+        {
+            IConfig config = configSource.Configs["Sounds"];
+
+            if (config == null)
+            {
+                Enabled = true;
+                MaxDistance = 100.0f;
+            }
+            else
+            {
+                Enabled = config.GetString("Module", "OpenSim.Region.CoreModules.dll:SoundModule") ==
+                        Path.GetFileName(Assembly.GetExecutingAssembly().Location)
+                        + ":" + MethodBase.GetCurrentMethod().DeclaringType.Name;
+                MaxDistance = config.GetFloat("MaxDistance", 100.0f);
+            }
+        }
+
+        public void AddRegion(Scene scene) { }
+
+        public void RemoveRegion(Scene scene)
         {
+            m_scene.EventManager.OnClientLogin -= OnNewClient;
+        }
+
+        public void RegionLoaded(Scene scene)
+        {
+            if (!Enabled)
+                return;
+
             m_scene = scene;
-            
-            m_scene.EventManager.OnNewClient += OnNewClient;
-            
+            m_scene.EventManager.OnClientLogin += OnNewClient;
+
             m_scene.RegisterModuleInterface<ISoundModule>(this);
         }
-        
-        public void PostInitialise() {}
-        public void Close() {}
+
+        public void Close() { }
+
+        public Type ReplaceableInterface
+        {
+            get { return typeof(ISoundModule); }
+        }
+
         public string Name { get { return "Sound Module"; } }
-        public bool IsSharedModule { get { return false; } }
-        
+
+        #endregion
+
+        #region Event Handlers
+
         private void OnNewClient(IClientAPI client)
         {
             client.OnSoundTrigger += TriggerSound;
         }
-        
+
+        #endregion
+
+        #region ISoundModule
+
         public virtual void PlayAttachedSound(
             UUID soundID, UUID ownerID, UUID objectID, double gain, Vector3 position, byte flags, float radius)
         {
-            SceneObjectPart part = m_scene.GetSceneObjectPart(objectID);
-            if (part == null)
+            SceneObjectPart part;
+            if (!m_scene.TryGetSceneObjectPart(objectID, out part))
                 return;
 
             SceneObjectGroup grp = part.ParentGroup;
 
+            if (radius == 0)
+                radius = MaxDistance;
+
             m_scene.ForEachRootScenePresence(delegate(ScenePresence sp)
             {
                 double dis = Util.GetDistanceTo(sp.AbsolutePosition, position);
-                if (dis > 100.0) // Max audio distance
+                if (dis > MaxDistance) // Max audio distance
                     return;
 
                 if (grp.IsAttachment)
@@ -86,23 +140,21 @@ namespace OpenSim.Region.CoreModules.World.Sound
                 }
 
                 // Scale by distance
-                if (radius == 0)
-                    gain = (float)((double)gain * ((100.0 - dis) / 100.0));
-                else
-                    gain = (float)((double)gain * ((radius - dis) / radius));
+                double thisSpGain = gain * ((radius - dis) / radius);
 
-                sp.ControllingClient.SendPlayAttachedSound(soundID, objectID, ownerID, (float)gain, flags);
+                sp.ControllingClient.SendPlayAttachedSound(soundID, objectID,
+                        ownerID, (float)thisSpGain, flags);
             });
         }
-        
+
         public virtual void TriggerSound(
             UUID soundId, UUID ownerID, UUID objectID, UUID parentID, double gain, Vector3 position, UInt64 handle, float radius)
         {
-            SceneObjectPart part = m_scene.GetSceneObjectPart(objectID);
-            if (part == null)
+            SceneObjectPart part;
+            if (!m_scene.TryGetSceneObjectPart(objectID, out part))
             {
                 ScenePresence sp;
-                if (!m_scene.TryGetScenePresence(objectID, out sp))
+                if (!m_scene.TryGetScenePresence(ownerID, out sp))
                     return;
             }
             else
@@ -116,24 +168,207 @@ namespace OpenSim.Region.CoreModules.World.Sound
                 }
             }
 
+            if (radius == 0)
+                radius = MaxDistance;
+
             m_scene.ForEachRootScenePresence(delegate(ScenePresence sp)
             {
                 double dis = Util.GetDistanceTo(sp.AbsolutePosition, position);
 
-                if (dis > 100.0) // Max audio distance
+                if (dis > MaxDistance) // Max audio distance
                     return;
 
-                float thisSpGain;
-
                 // Scale by distance
-                if (radius == 0)
-                    thisSpGain = (float)((double)gain * ((100.0 - dis) / 100.0));
+                double thisSpGain = gain * ((radius - dis) / radius);
+
+                sp.ControllingClient.SendTriggeredSound(soundId, ownerID,
+                        objectID, parentID, handle, position,
+                        (float)thisSpGain);
+            });
+        }
+
+        public virtual void StopSound(UUID objectID)
+        {
+            SceneObjectPart m_host;
+            if (!m_scene.TryGetSceneObjectPart(objectID, out m_host))
+                return;
+
+            StopSound(m_host);
+        }
+
+        private static void StopSound(SceneObjectPart m_host)
+        {
+            m_host.AdjustSoundGain(0);
+            // Xantor 20080528: Clear prim data of sound instead
+            if (m_host.ParentGroup.LoopSoundSlavePrims.Contains(m_host))
+            {
+                if (m_host.ParentGroup.LoopSoundMasterPrim == m_host)
+                {
+                    foreach (SceneObjectPart part in m_host.ParentGroup.LoopSoundSlavePrims)
+                    {
+                        part.Sound = UUID.Zero;
+                        part.SoundFlags = 1 << 5;
+                        part.SoundRadius = 0;
+                        part.ScheduleFullUpdate();
+                        part.SendFullUpdateToAllClients();
+                    }
+                    m_host.ParentGroup.LoopSoundMasterPrim = null;
+                    m_host.ParentGroup.LoopSoundSlavePrims.Clear();
+                }
+                else
+                {
+                    m_host.Sound = UUID.Zero;
+                    m_host.SoundFlags = 1 << 5;
+                    m_host.SoundRadius = 0;
+                    m_host.ScheduleFullUpdate();
+                    m_host.SendFullUpdateToAllClients();
+                }
+            }
+            else
+            {
+                m_host.Sound = UUID.Zero;
+                m_host.SoundFlags = 1 << 5;
+                m_host.SoundRadius = 0;
+                m_host.ScheduleFullUpdate();
+                m_host.SendFullUpdateToAllClients();
+            }
+        }
+
+        public virtual void PreloadSound(UUID objectID, UUID soundID, float radius)
+        {
+            SceneObjectPart part;
+            if (soundID == UUID.Zero
+                    || !m_scene.TryGetSceneObjectPart(objectID, out part))
+            {
+                return;
+            }
+
+            if (radius == 0)
+                radius = MaxDistance;
+
+            m_scene.ForEachRootScenePresence(delegate(ScenePresence sp)
+            {
+                if (!(Util.GetDistanceTo(sp.AbsolutePosition, part.AbsolutePosition) >= MaxDistance))
+                    sp.ControllingClient.SendPreLoadSound(objectID, objectID, soundID);
+            });
+        }
+
+        // Xantor 20080528 we should do this differently.
+        // 1) apply the sound to the object
+        // 2) schedule full update
+        // just sending the sound out once doesn't work so well when other avatars come in view later on
+        // or when the prim gets moved, changed, sat on, whatever
+        // see large number of mantises (mantes?)
+        // 20080530 Updated to remove code duplication
+        // 20080530 Stop sound if there is one, otherwise volume only changes don't work
+        public void LoopSound(UUID objectID, UUID soundID,
+                double volume, double radius, bool isMaster)
+        {
+            SceneObjectPart m_host;
+            if (!m_scene.TryGetSceneObjectPart(objectID, out m_host))
+                return;
+
+            if (isMaster)
+                m_host.ParentGroup.LoopSoundMasterPrim = m_host;
+
+            if (m_host.Sound != UUID.Zero)
+                StopSound(m_host);
+
+            m_host.Sound = soundID;
+            m_host.SoundGain = volume;
+            m_host.SoundFlags = 1;      // looping
+            m_host.SoundRadius = radius;
+
+            m_host.ScheduleFullUpdate();
+            m_host.SendFullUpdateToAllClients();
+        }
+
+        public void SendSound(UUID objectID, UUID soundID, double volume,
+                bool triggered, byte flags, float radius, bool useMaster,
+                bool isMaster)
+        {
+            if (soundID == UUID.Zero)
+                return;
+
+            SceneObjectPart part;
+            if (!m_scene.TryGetSceneObjectPart(objectID, out part))
+                return;
+
+            volume = Util.Clip((float)volume, 0, 1);
+
+            UUID parentID = part.ParentGroup.UUID;
+
+            Vector3 position = part.AbsolutePosition; // region local
+            ulong regionHandle = m_scene.RegionInfo.RegionHandle;
+
+            if (useMaster)
+            {
+                if (isMaster)
+                {
+                    if (triggered)
+                        TriggerSound(soundID, part.OwnerID, part.UUID, parentID, volume, position, regionHandle, radius);
+                    else
+                        PlayAttachedSound(soundID, part.OwnerID, part.UUID, volume, position, flags, radius);
+                    part.ParentGroup.PlaySoundMasterPrim = part;
+                    if (triggered)
+                        TriggerSound(soundID, part.OwnerID, part.UUID, parentID, volume, position, regionHandle, radius);
+                    else
+                        PlayAttachedSound(soundID, part.OwnerID, part.UUID, volume, position, flags, radius);
+                    foreach (SceneObjectPart prim in part.ParentGroup.PlaySoundSlavePrims)
+                    {
+                        position = prim.AbsolutePosition; // region local
+                        if (triggered)
+                            TriggerSound(soundID, part.OwnerID, prim.UUID, parentID, volume, position, regionHandle, radius);
+                        else
+                            PlayAttachedSound(soundID, part.OwnerID, prim.UUID, volume, position, flags, radius);
+                    }
+                    part.ParentGroup.PlaySoundSlavePrims.Clear();
+                    part.ParentGroup.PlaySoundMasterPrim = null;
+                }
                 else
-                    thisSpGain = (float)((double)gain * ((radius - dis) / radius));
+                {
+                    part.ParentGroup.PlaySoundSlavePrims.Add(part);
+                }
+            }
+            else
+            {
+                if (triggered)
+                    TriggerSound(soundID, part.OwnerID, part.UUID, parentID, volume, position, regionHandle, radius);
+                else
+                    PlayAttachedSound(soundID, part.OwnerID, part.UUID, volume, position, flags, radius);
+            }
+        }
 
-                sp.ControllingClient.SendTriggeredSound(
-                    soundId, ownerID, objectID, parentID, handle, position, thisSpGain);
+        public void TriggerSoundLimited(UUID objectID, UUID sound,
+                double volume, Vector3 min, Vector3 max)
+        {
+            if (sound == UUID.Zero)
+                return;
+
+            SceneObjectPart part;
+            if (!m_scene.TryGetSceneObjectPart(objectID, out part))
+                return;
+
+            m_scene.ForEachRootScenePresence(delegate(ScenePresence sp)
+            {
+                double dis = Util.GetDistanceTo(sp.AbsolutePosition,
+                        part.AbsolutePosition);
+
+                if (dis > MaxDistance) // Max audio distance
+                    return;
+                else if (!Util.IsInsideBox(sp.AbsolutePosition, min, max))
+                    return;
+
+                // Scale by distance
+                double thisSpGain = volume * ((MaxDistance - dis) / MaxDistance);
+
+                sp.ControllingClient.SendTriggeredSound(sound, part.OwnerID,
+                        part.UUID, part.ParentGroup.UUID,
+                        m_scene.RegionInfo.RegionHandle,
+                        part.AbsolutePosition, (float)thisSpGain);
             });
         }
+
+        #endregion
     }
 }
diff --git a/OpenSim/Region/CoreModules/World/Sun/SunModule.cs b/OpenSim/Region/CoreModules/World/Sun/SunModule.cs
index 9a954b8..a321c09 100644
--- a/OpenSim/Region/CoreModules/World/Sun/SunModule.cs
+++ b/OpenSim/Region/CoreModules/World/Sun/SunModule.cs
@@ -29,6 +29,7 @@ using System;
 using System.Collections.Generic;
 using System.Reflection;
 using log4net;
+using Mono.Addins;
 using Nini.Config;
 using OpenMetaverse;
 using OpenSim.Framework;
@@ -37,6 +38,7 @@ using OpenSim.Region.Framework.Scenes;
 
 namespace OpenSim.Region.CoreModules
 {
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "SunModule")]
     public class SunModule : ISunModule
     {
         /// <summary>
@@ -267,26 +269,17 @@ namespace OpenSim.Region.CoreModules
             return GetCurrentSunHour() + 6.0f;
         }
 
-        #region IRegion Methods
+        #region INonSharedRegion Methods
 
         // Called immediately after the module is loaded for a given region
         // i.e. Immediately after instance creation.
-        public void Initialise(Scene scene, IConfigSource config)
+        public void Initialise(IConfigSource config)
         {
-            m_scene = scene;
             m_frame = 0;
 
             // This one puts an entry in the main help screen
 //            m_scene.AddCommand("Regions", this, "sun", "sun", "Usage: sun [param] [value] - Get or Update Sun module paramater", null);
 
-            // This one enables the ability to type just "sun" without any parameters
-//            m_scene.AddCommand("Regions", this, "sun", "", "", HandleSunConsoleCommand);
-            foreach (KeyValuePair<string, string> kvp in GetParamList())
-            {
-                string sunCommand = string.Format("sun {0}", kvp.Key);
-                m_scene.AddCommand("Regions", this, sunCommand, string.Format("{0} [<value>]", sunCommand), kvp.Value, "", HandleSunConsoleCommand);
-            }
-
             TimeZone local = TimeZone.CurrentTimeZone;
             TicksUTCOffset = local.GetUtcOffset(local.ToLocalTime(DateTime.Now)).Ticks;
             m_log.DebugFormat("[SUN]: localtime offset is {0}", TicksUTCOffset);
@@ -358,15 +351,6 @@ namespace OpenSim.Region.CoreModules
                     HorizonShift      = m_HorizonShift; // Z axis translation
                     // HoursToRadians    = (SunCycle/24)*VWTimeRatio;
 
-                    //  Insert our event handling hooks
-
-                    scene.EventManager.OnFrame     += SunUpdate;
-                    scene.EventManager.OnAvatarEnteringNewParcel += AvatarEnteringParcel;
-                    scene.EventManager.OnEstateToolsSunUpdate += EstateToolsSunUpdate;
-                    scene.EventManager.OnGetCurrentTimeAsLindenSunHour += GetCurrentTimeAsLindenSunHour;
-
-                    ready = true;
-
                     m_log.Debug("[SUN]: Mode is " + m_RegionMode);
                     m_log.Debug("[SUN]: Initialization completed. Day is " + SecondsPerSunCycle + " seconds, and year is " + m_YearLengthDays + " days");
                     m_log.Debug("[SUN]: Axis offset is " + m_HorizonShift);
@@ -376,14 +360,37 @@ namespace OpenSim.Region.CoreModules
                     break;
             }
 
-            scene.RegisterModuleInterface<ISunModule>(this);
         }
 
-        public void PostInitialise()
+        public Type ReplaceableInterface 
         {
+            get { return null; }
         }
 
-        public void Close()
+        public void AddRegion(Scene scene)
+        {
+            m_scene = scene;
+            //  Insert our event handling hooks
+
+            scene.EventManager.OnFrame += SunUpdate;
+            scene.EventManager.OnAvatarEnteringNewParcel += AvatarEnteringParcel;
+            scene.EventManager.OnEstateToolsSunUpdate += EstateToolsSunUpdate;
+            scene.EventManager.OnGetCurrentTimeAsLindenSunHour += GetCurrentTimeAsLindenSunHour;
+
+            scene.RegisterModuleInterface<ISunModule>(this);
+
+            // This one enables the ability to type just "sun" without any parameters
+            //            m_scene.AddCommand("Regions", this, "sun", "", "", HandleSunConsoleCommand);
+            foreach (KeyValuePair<string, string> kvp in GetParamList())
+            {
+                string sunCommand = string.Format("sun {0}", kvp.Key);
+                m_scene.AddCommand("Regions", this, sunCommand, string.Format("{0} [<value>]", sunCommand), kvp.Value, "", HandleSunConsoleCommand);
+            }
+
+            ready = true;
+        }
+
+        public void RemoveRegion(Scene scene)
         {
             ready = false;
 
@@ -394,14 +401,17 @@ namespace OpenSim.Region.CoreModules
             m_scene.EventManager.OnGetCurrentTimeAsLindenSunHour -= GetCurrentTimeAsLindenSunHour;
         }
 
-        public string Name
+        public void RegionLoaded(Scene scene)
         {
-            get { return "SunModule"; }
         }
 
-        public bool IsSharedModule
+        public void Close()
         {
-            get { return false; }
+        }
+
+        public string Name
+        {
+            get { return "SunModule"; }
         }
 
         #endregion
diff --git a/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
index 402b9fb..33aabe4 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
@@ -33,6 +33,7 @@ using System.Net;
 using log4net;
 using Nini.Config;
 using OpenMetaverse;
+using Mono.Addins;
 using OpenSim.Framework;
 using OpenSim.Region.CoreModules.Framework.InterfaceCommander;
 using OpenSim.Region.CoreModules.World.Terrain.FileLoaders;
@@ -43,6 +44,7 @@ using OpenSim.Region.Framework.Scenes;
 
 namespace OpenSim.Region.CoreModules.World.Terrain
 {
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "TerrainModule")]
     public class TerrainModule : INonSharedRegionModule, ICommandableModule, ITerrainModule
     {
         #region StandardTerrainEffects enum
@@ -414,6 +416,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain
         private void LoadPlugins()
         {
             m_plugineffects = new Dictionary<string, ITerrainEffect>();
+            LoadPlugins(Assembly.GetCallingAssembly());
             string plugineffectsPath = "Terrain";
             
             // Load the files in the Terrain/ dir
@@ -427,34 +430,39 @@ namespace OpenSim.Region.CoreModules.World.Terrain
                 try
                 {
                     Assembly library = Assembly.LoadFrom(file);
-                    foreach (Type pluginType in library.GetTypes())
-                    {
-                        try
-                        {
-                            if (pluginType.IsAbstract || pluginType.IsNotPublic)
-                                continue;
+                    LoadPlugins(library);
+                }
+                catch (BadImageFormatException)
+                {
+                }
+            }
+        }
 
-                            string typeName = pluginType.Name;
+        private void LoadPlugins(Assembly library)
+        {
+            foreach (Type pluginType in library.GetTypes())
+            {
+                try
+                {
+                    if (pluginType.IsAbstract || pluginType.IsNotPublic)
+                        continue;
 
-                            if (pluginType.GetInterface("ITerrainEffect", false) != null)
-                            {
-                                ITerrainEffect terEffect = (ITerrainEffect) Activator.CreateInstance(library.GetType(pluginType.ToString()));
+                    string typeName = pluginType.Name;
 
-                                InstallPlugin(typeName, terEffect);
-                            }
-                            else if (pluginType.GetInterface("ITerrainLoader", false) != null)
-                            {
-                                ITerrainLoader terLoader = (ITerrainLoader) Activator.CreateInstance(library.GetType(pluginType.ToString()));
-                                m_loaders[terLoader.FileExtension] = terLoader;
-                                m_log.Info("L ... " + typeName);
-                            }
-                        }
-                        catch (AmbiguousMatchException)
-                        {
-                        }
+                    if (pluginType.GetInterface("ITerrainEffect", false) != null)
+                    {
+                        ITerrainEffect terEffect = (ITerrainEffect)Activator.CreateInstance(library.GetType(pluginType.ToString()));
+
+                        InstallPlugin(typeName, terEffect);
+                    }
+                    else if (pluginType.GetInterface("ITerrainLoader", false) != null)
+                    {
+                        ITerrainLoader terLoader = (ITerrainLoader)Activator.CreateInstance(library.GetType(pluginType.ToString()));
+                        m_loaders[terLoader.FileExtension] = terLoader;
+                        m_log.Info("L ... " + typeName);
                     }
                 }
-                catch (BadImageFormatException)
+                catch (AmbiguousMatchException)
                 {
                 }
             }
@@ -1178,7 +1186,8 @@ namespace OpenSim.Region.CoreModules.World.Terrain
 
         private void InterfaceRunPluginEffect(Object[] args)
         {
-            if ((string) args[0] == "list")
+            string firstArg = (string)args[0];
+            if (firstArg == "list")
             {
                 m_log.Info("List of loaded plugins");
                 foreach (KeyValuePair<string, ITerrainEffect> kvp in m_plugineffects)
@@ -1187,14 +1196,14 @@ namespace OpenSim.Region.CoreModules.World.Terrain
                 }
                 return;
             }
-            if ((string) args[0] == "reload")
+            if (firstArg == "reload")
             {
                 LoadPlugins();
                 return;
             }
-            if (m_plugineffects.ContainsKey((string) args[0]))
+            if (m_plugineffects.ContainsKey(firstArg))
             {
-                m_plugineffects[(string) args[0]].RunEffect(m_channel);
+                m_plugineffects[firstArg].RunEffect(m_channel);
                 CheckForTerrainUpdates();
             }
             else
diff --git a/OpenSim/Region/CoreModules/World/Vegetation/VegetationModule.cs b/OpenSim/Region/CoreModules/World/Vegetation/VegetationModule.cs
index f5f35bb..3f5d375 100644
--- a/OpenSim/Region/CoreModules/World/Vegetation/VegetationModule.cs
+++ b/OpenSim/Region/CoreModules/World/Vegetation/VegetationModule.cs
@@ -28,15 +28,17 @@
 using System;
 using System.Reflection;
 using log4net;
+using Mono.Addins;
 using Nini.Config;
 using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 
-namespace OpenSim.Region.CoreModules.Avatar.Vegetation
+namespace OpenSim.Region.CoreModules.World.Vegetation
 {
-    public class VegetationModule : IRegionModule, IVegetationModule
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "VegetationModule")]
+    public class VegetationModule : INonSharedRegionModule, IVegetationModule
     { 
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
         
@@ -45,16 +47,32 @@ namespace OpenSim.Region.CoreModules.Avatar.Vegetation
         protected static readonly PCode[] creationCapabilities = new PCode[] { PCode.Grass, PCode.NewTree, PCode.Tree };
         public PCode[] CreationCapabilities { get { return creationCapabilities; } }
         
-        public void Initialise(Scene scene, IConfigSource source)
+        public void Initialise(IConfigSource source)
+        {
+        }
+
+        public void AddRegion(Scene scene)
         {
             m_scene = scene;
             m_scene.RegisterModuleInterface<IVegetationModule>(this);
         }
-        
-        public void PostInitialise() {}
+
+        public void RemoveRegion(Scene scene)
+        {
+            m_scene.UnregisterModuleInterface<IVegetationModule>(this);
+        }
+
         public void Close() {}
         public string Name { get { return "Vegetation Module"; } }
-        public bool IsSharedModule { get { return false; } }
+
+        public Type ReplaceableInterface
+        {
+            get { return null; }
+        }
+
+        public void RegionLoaded(Scene scene)
+        {
+        }
 
         public SceneObjectGroup AddTree(
             UUID uuid, UUID groupID, Vector3 scale, Quaternion rotation, Vector3 position, Tree treeType, bool newTree)
diff --git a/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs b/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs
index 3c48d07..7ef44db 100644
--- a/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs
+++ b/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs
@@ -35,6 +35,7 @@ using CSJ2K;
 using Nini.Config;
 using log4net;
 using Rednettle.Warp3D;
+using Mono.Addins;
 using OpenMetaverse;
 using OpenMetaverse.Imaging;
 using OpenMetaverse.Rendering;
@@ -49,6 +50,7 @@ using WarpRenderer = global::Warp3D.Warp3D;
 
 namespace OpenSim.Region.CoreModules.World.Warp3DMap
 {
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "Warp3DImageModule")]
     public class Warp3DImageModule : IMapImageGenerator, INonSharedRegionModule
     {
         private static readonly UUID TEXTURE_METADATA_MAGIC = new UUID("802dc0e0-f080-4931-8b57-d1be8611c4f3");
@@ -66,7 +68,7 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
         private Bitmap lastImage = null;
         private DateTime lastImageTime = DateTime.MinValue;
 
-        #region IRegionModule Members
+        #region Region Module interface
 
         public void Initialise(IConfigSource source)
         {
@@ -222,6 +224,13 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
                     bitmap = ImageUtils.ResizeImage(origBitmap, viewport.Width, viewport.Height);
             }
 
+            // XXX: It shouldn't really be necesary to force a GC here as one should occur anyway pretty shortly
+            // afterwards.  It's generally regarded as a bad idea to manually GC.  If Warp3D is using lots of memory
+            // then this may be some issue with the Warp3D code itself, though it's also quite possible that generating
+            // this map tile simply takes a lot of memory.
+            GC.Collect();
+            m_log.Debug("[WARP 3D IMAGE MODULE]: GC.Collect()");
+
             return bitmap;
         }
 
diff --git a/OpenSim/Region/CoreModules/World/Wind/Plugins/ConfigurableWind.cs b/OpenSim/Region/CoreModules/World/Wind/Plugins/ConfigurableWind.cs
index 9d47e19..6af4050 100644
--- a/OpenSim/Region/CoreModules/World/Wind/Plugins/ConfigurableWind.cs
+++ b/OpenSim/Region/CoreModules/World/Wind/Plugins/ConfigurableWind.cs
@@ -31,12 +31,14 @@ using System.Reflection;
 
 using log4net;
 using OpenMetaverse;
+using Mono.Addins;
 
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.CoreModules.World.Wind;
 
 namespace OpenSim.Region.CoreModules.World.Wind.Plugins
 {
+    [Extension(Path = "/OpenSim/WindModule", NodeName = "WindModel", Id = "ConfigurableWind")]
     class ConfigurableWind : Mono.Addins.TypeExtensionNode, IWindModelPlugin
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
diff --git a/OpenSim/Region/CoreModules/World/Wind/Plugins/SimpleRandomWind.cs b/OpenSim/Region/CoreModules/World/Wind/Plugins/SimpleRandomWind.cs
index 071e20b..fcb0c10 100644
--- a/OpenSim/Region/CoreModules/World/Wind/Plugins/SimpleRandomWind.cs
+++ b/OpenSim/Region/CoreModules/World/Wind/Plugins/SimpleRandomWind.cs
@@ -29,11 +29,13 @@ using System;
 using System.Collections.Generic;
 
 using OpenMetaverse;
+using Mono.Addins;
 
 using OpenSim.Region.Framework.Interfaces;
 
 namespace OpenSim.Region.CoreModules.World.Wind.Plugins
 {
+    [Extension(Path = "/OpenSim/WindModule", NodeName = "WindModel", Id = "SimpleRandomWind")]
     class SimpleRandomWind : Mono.Addins.TypeExtensionNode, IWindModelPlugin
     {
         private Vector2[] m_windSpeeds = new Vector2[16 * 16];
diff --git a/OpenSim/Region/CoreModules/World/Wind/WindModule.cs b/OpenSim/Region/CoreModules/World/Wind/WindModule.cs
index 7b6fbda..fd8e2b4 100644
--- a/OpenSim/Region/CoreModules/World/Wind/WindModule.cs
+++ b/OpenSim/Region/CoreModules/World/Wind/WindModule.cs
@@ -40,6 +40,7 @@ using OpenSim.Region.CoreModules.World.Wind;
 
 namespace OpenSim.Region.CoreModules
 {
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "WindModule")]
     public class WindModule : IWindModule
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@@ -52,31 +53,31 @@ namespace OpenSim.Region.CoreModules
         private bool m_ready = false;
 
         private bool m_enabled = false;
-
+        private IConfig m_windConfig;
         private IWindModelPlugin m_activeWindPlugin = null;
-        private const string m_dWindPluginName = "SimpleRandomWind";
+        private string m_dWindPluginName = "SimpleRandomWind";
         private Dictionary<string, IWindModelPlugin> m_availableWindPlugins = new Dictionary<string, IWindModelPlugin>();
 
         // Simplified windSpeeds based on the fact that the client protocal tracks at a resolution of 16m
         private Vector2[] windSpeeds = new Vector2[16 * 16];
 
-        #region IRegion Methods
+        #region INonSharedRegionModule Methods
 
-        public void Initialise(Scene scene, IConfigSource config)
+        public void Initialise(IConfigSource config)
         {
-            IConfig windConfig = config.Configs["Wind"];
+            m_windConfig = config.Configs["Wind"];
             string desiredWindPlugin = m_dWindPluginName;
 
-            if (windConfig != null)
+            if (m_windConfig != null)
             {
-                m_enabled = windConfig.GetBoolean("enabled", true);
+                m_enabled = m_windConfig.GetBoolean("enabled", true);
 
-                m_frameUpdateRate = windConfig.GetInt("wind_update_rate", 150);
+                m_frameUpdateRate = m_windConfig.GetInt("wind_update_rate", 150);
 
                 // Determine which wind model plugin is desired
-                if (windConfig.Contains("wind_plugin"))
+                if (m_windConfig.Contains("wind_plugin"))
                 {
-                    desiredWindPlugin = windConfig.GetString("wind_plugin");
+                    m_dWindPluginName = m_windConfig.GetString("wind_plugin", m_dWindPluginName);
                 }
             }
 
@@ -84,104 +85,111 @@ namespace OpenSim.Region.CoreModules
             {
                 m_log.InfoFormat("[WIND] Enabled with an update rate of {0} frames.", m_frameUpdateRate);
 
-                m_scene = scene;
-                m_frame = 0;
-
-                // Register all the Wind Model Plug-ins
-                foreach (IWindModelPlugin windPlugin in AddinManager.GetExtensionObjects("/OpenSim/WindModule", false))
-                {
-                    m_log.InfoFormat("[WIND] Found Plugin: {0}", windPlugin.Name);
-                    m_availableWindPlugins.Add(windPlugin.Name, windPlugin);
-                }
+            }
 
-                // Check for desired plugin
-                if (m_availableWindPlugins.ContainsKey(desiredWindPlugin))
-                {
-                    m_activeWindPlugin = m_availableWindPlugins[desiredWindPlugin];
+        }
 
-                    m_log.InfoFormat("[WIND] {0} plugin found, initializing.", desiredWindPlugin);
+        public void AddRegion(Scene scene)
+        {
+            if (!m_enabled)
+                return;
 
-                    if (windConfig != null)
-                    {
-                        m_activeWindPlugin.Initialise();
-                        m_activeWindPlugin.WindConfig(m_scene, windConfig);
-                    }
-                } 
+            m_scene = scene;
+            m_frame = 0;
 
+            // Register all the Wind Model Plug-ins
+            foreach (IWindModelPlugin windPlugin in AddinManager.GetExtensionObjects("/OpenSim/WindModule", false))
+            {
+                m_log.InfoFormat("[WIND] Found Plugin: {0}", windPlugin.Name);
+                m_availableWindPlugins.Add(windPlugin.Name, windPlugin);
+            }
 
-                // if the plug-in wasn't found, default to no wind.
-                if (m_activeWindPlugin == null)
-                {
-                    m_log.ErrorFormat("[WIND] Could not find specified wind plug-in: {0}", desiredWindPlugin);
-                    m_log.ErrorFormat("[WIND] Defaulting to no wind.");
-                }
+            // Check for desired plugin
+            if (m_availableWindPlugins.ContainsKey(m_dWindPluginName))
+            {
+                m_activeWindPlugin = m_availableWindPlugins[m_dWindPluginName];
 
-                // This one puts an entry in the main help screen
-//                m_scene.AddCommand("Regions", this, "wind", "wind", "Usage: wind <plugin> <param> [value] - Get or Update Wind paramaters", null);
-                
-                // This one enables the ability to type just the base command without any parameters
-//                m_scene.AddCommand("Regions", this, "wind", "", "", HandleConsoleCommand);
+                m_log.InfoFormat("[WIND] {0} plugin found, initializing.", m_dWindPluginName);
 
-                // Get a list of the parameters for each plugin
-                foreach (IWindModelPlugin windPlugin in m_availableWindPlugins.Values)
+                if (m_windConfig != null)
                 {
-//                    m_scene.AddCommand("Regions", this, String.Format("wind base wind_plugin {0}", windPlugin.Name), String.Format("{0} - {1}", windPlugin.Name, windPlugin.Description), "", HandleConsoleBaseCommand);
-                    m_scene.AddCommand(
-                        "Regions",
-                        this,
-                        "wind base wind_update_rate",
-                        "wind base wind_update_rate [<value>]",
-                        "Get or set the wind update rate.",
-                        "",
-                        HandleConsoleBaseCommand);
-                    
-                    foreach (KeyValuePair<string, string> kvp in windPlugin.WindParams())
-                    {
-                        string windCommand = String.Format("wind {0} {1}", windPlugin.Name, kvp.Key);
-                        m_scene.AddCommand("Regions", this, windCommand, string.Format("{0} [<value>]", windCommand), kvp.Value, "", HandleConsoleParamCommand);
-                    }
+                    m_activeWindPlugin.Initialise();
+                    m_activeWindPlugin.WindConfig(m_scene, m_windConfig);
                 }
+            }
 
-                // Register event handlers for when Avatars enter the region, and frame ticks
-                m_scene.EventManager.OnFrame += WindUpdate;
-                m_scene.EventManager.OnMakeRootAgent += OnAgentEnteredRegion;
 
-                // Register the wind module 
-                m_scene.RegisterModuleInterface<IWindModule>(this);
+            // if the plug-in wasn't found, default to no wind.
+            if (m_activeWindPlugin == null)
+            {
+                m_log.ErrorFormat("[WIND] Could not find specified wind plug-in: {0}", m_dWindPluginName);
+                m_log.ErrorFormat("[WIND] Defaulting to no wind.");
+            }
 
-                // Generate initial wind values
-                GenWindPos();
+            // This one puts an entry in the main help screen
+            //                m_scene.AddCommand("Regions", this, "wind", "wind", "Usage: wind <plugin> <param> [value] - Get or Update Wind paramaters", null);
 
-                // Mark Module Ready for duty
-                m_ready = true;
+            // This one enables the ability to type just the base command without any parameters
+            //                m_scene.AddCommand("Regions", this, "wind", "", "", HandleConsoleCommand);
 
+            // Get a list of the parameters for each plugin
+            foreach (IWindModelPlugin windPlugin in m_availableWindPlugins.Values)
+            {
+                //                    m_scene.AddCommand("Regions", this, String.Format("wind base wind_plugin {0}", windPlugin.Name), String.Format("{0} - {1}", windPlugin.Name, windPlugin.Description), "", HandleConsoleBaseCommand);
+                m_scene.AddCommand(
+                    "Regions",
+                    this,
+                    "wind base wind_update_rate",
+                    "wind base wind_update_rate [<value>]",
+                    "Get or set the wind update rate.",
+                    "",
+                    HandleConsoleBaseCommand);
+
+                foreach (KeyValuePair<string, string> kvp in windPlugin.WindParams())
+                {
+                    string windCommand = String.Format("wind {0} {1}", windPlugin.Name, kvp.Key);
+                    m_scene.AddCommand("Regions", this, windCommand, string.Format("{0} [<value>]", windCommand), kvp.Value, "", HandleConsoleParamCommand);
+                }
             }
 
-        }
+            // Register event handlers for when Avatars enter the region, and frame ticks
+            m_scene.EventManager.OnFrame += WindUpdate;
+            m_scene.EventManager.OnMakeRootAgent += OnAgentEnteredRegion;
 
-        public void PostInitialise()
-        {
+            // Register the wind module 
+            m_scene.RegisterModuleInterface<IWindModule>(this);
+
+            // Generate initial wind values
+            GenWindPos();
+
+            // Mark Module Ready for duty
+            m_ready = true;
         }
 
-        public void Close()
+        public void RemoveRegion(Scene scene)
         {
-            if (m_enabled)
+            if (!m_enabled)
+                return;
+
+            m_ready = false;
+
+            // REVIEW: If a region module is closed, is there a possibility that it'll re-open/initialize ??
+            m_activeWindPlugin = null;
+            foreach (IWindModelPlugin windPlugin in m_availableWindPlugins.Values)
             {
-                m_ready = false;
+                windPlugin.Dispose();
+            }
 
-                // REVIEW: If a region module is closed, is there a possibility that it'll re-open/initialize ??
-                m_activeWindPlugin = null;
-                foreach (IWindModelPlugin windPlugin in m_availableWindPlugins.Values)
-                {
-                    windPlugin.Dispose();
-                }
+            m_availableWindPlugins.Clear();
 
-                m_availableWindPlugins.Clear();
+            //  Remove our hooks
+            m_scene.EventManager.OnFrame -= WindUpdate;
+            m_scene.EventManager.OnMakeRootAgent -= OnAgentEnteredRegion;
 
-                //  Remove our hooks
-                m_scene.EventManager.OnFrame -= WindUpdate;
-                m_scene.EventManager.OnMakeRootAgent -= OnAgentEnteredRegion;
-            }
+        }
+
+        public void Close()
+        {
         }
 
         public string Name
@@ -189,11 +197,14 @@ namespace OpenSim.Region.CoreModules
             get { return "WindModule"; }
         }
 
-        public bool IsSharedModule
+        public Type ReplaceableInterface
         {
-            get { return false; }
+            get { return null; }
         }
 
+        public void RegionLoaded(Scene scene)
+        {
+        }
 
         #endregion
 
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
index 2417b1a..4c96a50 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
@@ -24,11 +24,13 @@
  * (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.Reflection;
 using log4net;
 using Nini.Config;
 using OpenMetaverse;
+using Mono.Addins;
 using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
@@ -37,16 +39,22 @@ using GridRegion = OpenSim.Services.Interfaces.GridRegion;
 
 namespace OpenSim.Region.CoreModules.World.WorldMap
 {
-    public class MapSearchModule : IRegionModule
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "MapSearchModule")]
+    public class MapSearchModule : ISharedRegionModule
     {
         private static readonly ILog m_log =
             LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         Scene m_scene = null; // only need one for communication with GridService
         List<Scene> m_scenes = new List<Scene>();
+        List<UUID> m_Clients;
 
-        #region IRegionModule Members
-        public void Initialise(Scene scene, IConfigSource source)
+        #region ISharedRegionModule Members
+        public void Initialise(IConfigSource source)
+        {
+        }
+
+        public void AddRegion(Scene scene)
         {
             if (m_scene == null)
             {
@@ -55,6 +63,16 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
 
             m_scenes.Add(scene);
             scene.EventManager.OnNewClient += OnNewClient;
+            m_Clients = new List<UUID>();
+        }
+
+        public void RemoveRegion(Scene scene)
+        {
+            m_scenes.Remove(scene);
+            if (m_scene == scene && m_scenes.Count > 0)
+                m_scene = m_scenes[0];
+
+            scene.EventManager.OnNewClient -= OnNewClient;
         }
 
         public void PostInitialise()
@@ -72,16 +90,40 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
             get { return "MapSearchModule"; }
         }
 
-        public bool IsSharedModule
+        public Type ReplaceableInterface
         {
-            get { return true; }
+            get { return null; }
         }
 
+        public void RegionLoaded(Scene scene)
+        {
+        }
         #endregion
 
         private void OnNewClient(IClientAPI client)
         {
-            client.OnMapNameRequest += OnMapNameRequest;
+            client.OnMapNameRequest += OnMapNameRequestHandler;
+        }
+
+        private void OnMapNameRequestHandler(IClientAPI remoteClient, string mapName, uint flags)
+        {
+            lock (m_Clients)
+            {
+                if (m_Clients.Contains(remoteClient.AgentId))
+                    return;
+
+                m_Clients.Add(remoteClient.AgentId);
+            }
+
+            try
+            {
+                OnMapNameRequest(remoteClient, mapName, flags);
+            }
+            finally
+            {
+                lock (m_Clients)
+                    m_Clients.Remove(remoteClient.AgentId);
+            }
         }
 
         private void OnMapNameRequest(IClientAPI remoteClient, string mapName, uint flags)
@@ -175,6 +217,20 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
             });
         }
 
+        private void AddFinalBlock(List<MapBlockData> blocks)
+        {
+                // final block, closing the search result
+                MapBlockData data = new MapBlockData();
+                data.Agents = 0;
+                data.Access = 255;
+                data.MapImageId = UUID.Zero;
+                data.Name = "";
+                data.RegionFlags = 0;
+                data.WaterHeight = 0; // not used
+                data.X = 0;
+                data.Y = 0;
+                blocks.Add(data);
+        }
 //        private Scene GetClientScene(IClientAPI client)
 //        {
 //            foreach (Scene s in m_scenes)
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
index 26b406e..2184a59 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
@@ -40,6 +40,7 @@ using Nini.Config;
 using OpenMetaverse;
 using OpenMetaverse.Imaging;
 using OpenMetaverse.StructuredData;
+using Mono.Addins;
 using OpenSim.Framework;
 using OpenSim.Framework.Capabilities;
 using OpenSim.Framework.Monitoring;
@@ -55,6 +56,7 @@ using GridRegion = OpenSim.Services.Interfaces.GridRegion;
 
 namespace OpenSim.Region.CoreModules.World.WorldMap
 {
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "WorldMapModule")]
     public class WorldMapModule : INonSharedRegionModule, IWorldMapModule
     {
         private static readonly ILog m_log =