Revert "Merge master into teravuswork", it should have been avination, not master.

This reverts commit dfac269032300872c4d0dc507f4f9062d102b0f4, reversing
changes made to 619c39e5144f15aca129d6d999bcc5c34133ee64.

62 files changed, 1778 insertions, 4763 deletions

diff --git a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs
index da1ff2e..8a4fd8f 100644
--- a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs
+++ b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs
@@ -57,36 +57,39 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
         }
 
         /// <summary>
-        /// Return the xfer uploader for the given transaction.
+        /// Return a xfer uploader if one does not already exist.
         /// </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>
-        /// <returns>The asset xfer uploader</returns>
-        public AssetXferUploader RequestXferUploader(UUID transactionID)
+        /// <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)
         {
-            AssetXferUploader uploader;
-
             lock (XferUploaders)
             {
                 if (!XferUploaders.ContainsKey(transactionID))
                 {
-                    uploader = new AssetXferUploader(this, m_Scene, transactionID, m_dumpAssetsToFile);
+                    AssetXferUploader uploader = new AssetXferUploader(this, m_Scene, assetID, m_dumpAssetsToFile);
 
 //                    m_log.DebugFormat(
 //                        "[AGENT ASSETS TRANSACTIONS]: Adding asset xfer uploader {0} since it didn't previously exist", transactionID);
 
                     XferUploaders.Add(transactionID, uploader);
-                }
-                else
-                {
-                    uploader = XferUploaders[transactionID];
+
+                    return uploader;
                 }
             }
 
-            return uploader;
+            m_log.WarnFormat("[AGENT ASSETS TRANSACTIONS]: Ignoring request for asset xfer uploader {0} since it already exists", transactionID);
+
+            return null;
         }
 
         public void HandleXfer(ulong xferID, uint packetID, byte[] data)
@@ -148,30 +151,117 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
                 string description, string name, sbyte invType,
                sbyte type, byte wearableType, uint nextOwnerMask)
         {
-            AssetXferUploader uploader = RequestXferUploader(transactionID);
+            AssetXferUploader uploader = null;
+
+            lock (XferUploaders)
+            {
+                if (XferUploaders.ContainsKey(transactionID))
+                    uploader = XferUploaders[transactionID];
+            }
 
-            uploader.RequestCreateInventoryItem(
-                remoteClient, folderID, callbackID,
-                description, name, invType, type, wearableType, nextOwnerMask);
+            if (uploader != null)
+            {
+                uploader.RequestCreateInventoryItem(
+                    remoteClient, transactionID, folderID,
+                    callbackID, description, name, invType, type,
+                    wearableType, nextOwnerMask);
 
-            return true;
+                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;
         }
 
         public void RequestUpdateTaskInventoryItem(IClientAPI remoteClient,
                 SceneObjectPart part, UUID transactionID,
                 TaskInventoryItem item)
         {
-            AssetXferUploader uploader = RequestXferUploader(transactionID);
+            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;
 
-            uploader.RequestUpdateTaskInventoryItem(remoteClient, item);
+                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);
+            }
         }
 
         public void RequestUpdateInventoryItem(IClientAPI remoteClient,
                 UUID transactionID, InventoryItemBase item)
         {
-            AssetXferUploader uploader = RequestXferUploader(transactionID);
+            AssetXferUploader uploader = null;
+
+            lock (XferUploaders)
+            {
+                if (XferUploaders.ContainsKey(transactionID))
+                    uploader = XferUploaders[transactionID];
+            }
 
-            uploader.RequestUpdateInventoryItem(remoteClient, item);
+            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);
+            }
         }
     }
 }
diff --git a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetTransactionModule.cs b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetTransactionModule.cs
index 4bb8986..441c4ff 100644
--- a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetTransactionModule.cs
+++ b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetTransactionModule.cs
@@ -215,7 +215,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
             IClientAPI remoteClient, SceneObjectPart part, UUID transactionID, TaskInventoryItem item)
         {
             m_log.DebugFormat(
-                "[ASSET TRANSACTION MODULE] Called HandleTaskItemUpdateFromTransaction with item {0} in {1} for {2} in {3}",
+                "[TRANSACTIONS MANAGER] Called HandleTaskItemUpdateFromTransaction with item {0} in {1} for {2} in {3}",
                 item.Name, part.Name, remoteClient.Name, m_Scene.RegionInfo.RegionName);
 
             AgentAssetTransactions transactions =
@@ -274,8 +274,13 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
             }
 
             AgentAssetTransactions transactions = GetUserTransactions(remoteClient.AgentId);
-            AssetXferUploader uploader = transactions.RequestXferUploader(transaction);
-            uploader.StartUpload(remoteClient, assetID, transaction, type, data, storeLocal, tempFile);
+            AssetXferUploader uploader = transactions.RequestXferUploader(transaction, assetID);
+
+            if (uploader != null)
+            {
+                uploader.Initialise(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 f6dd5af..4cedfe6 100644
--- a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs
+++ b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs
@@ -49,75 +49,39 @@ 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;
-        private uint m_createItemCallback;
-
-        private bool m_updateItem;
+        private bool m_createItem = false;
+        private uint m_createItemCallback = 0;
+        private bool m_updateItem = false;
         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 m_transactionID;
-
+        private UUID TransactionID = UUID.Zero;
         private sbyte type = 0;
         private byte wearableType = 0;
         private byte[] m_oldData = null;
         public ulong XferID;
         private Scene m_Scene;
 
-        /// <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)
+        public AssetXferUploader(AgentAssetTransactions transactions, Scene scene, UUID assetID, bool dumpAssetToFile)
         {
-            m_asset = new AssetBase();
-
             m_transactions = transactions;
-            m_transactionID = transactionID;
             m_Scene = scene;
+            m_asset = new AssetBase() { FullID = assetID };
             m_dumpAssetToFile = dumpAssetToFile;
         }
 
@@ -163,50 +127,30 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
         }
 
         /// <summary>
-        /// Start asset transfer from the client
+        /// Initialise asset transfer from the client
         /// </summary>
-        /// <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)
+        /// <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)
         {
 //            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.FullID = assetID;
+            m_asset.Name = "blank";
+            m_asset.Description = "empty";
             m_asset.Type = type;
             m_asset.CreatorID = remoteClient.AgentId.ToString();
             m_asset.Data = data;
             m_asset.Local = storeLocal;
             m_asset.Temporary = tempFile;
 
-//            m_storeLocal = storeLocal;
+            TransactionID = transaction;
+            m_storeLocal = storeLocal;
 
             if (m_asset.Data.Length > 2)
             {
@@ -231,35 +175,36 @@ 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_uploadState = UploadState.Complete;
-
-                ourClient.SendAssetUploadCompleteMessage(m_asset.Type, true, m_asset.FullID);
-
+                m_finished = true;
                 if (m_createItem)
                 {
-                    CompleteCreateItem(m_createItemCallback);
+                    DoCreateItem(m_createItemCallback);
                 }
                 else if (m_updateItem)
                 {
-                    CompleteItemUpdate(m_updateItemData);
+                    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);
                 }
-                else if (m_updateTaskItem)
+                else if (m_storeLocal)
                 {
-                    CompleteTaskItemUpdate(m_updateTaskItemData);
+                    m_Scene.AssetService.Store(m_asset);
                 }
-//                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, m_transactionID);
+                m_asset.FullID, TransactionID);
 
             if (m_dumpAssetToFile)
             {
@@ -287,37 +232,40 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
         }
 
         public void RequestCreateInventoryItem(IClientAPI remoteClient,
-                UUID folderID, uint callbackID,
+                UUID transactionID, UUID folderID, uint callbackID,
                 string description, string name, sbyte invType,
                 sbyte type, byte wearableType, uint nextOwnerMask)
         {
-            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 (TransactionID == transactionID)
             {
-                if (m_uploadState == UploadState.Complete)
+                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)
                 {
-                    CompleteCreateItem(callbackID);
-                }
-                else
-                {
-                    m_createItem = true; //set flag so the inventory item is created when upload is complete
-                    m_createItemCallback = callbackID;
+                    if (m_finished)
+                    {
+                        DoCreateItem(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, InventoryItemBase item)
+        public void RequestUpdateInventoryItem(IClientAPI remoteClient, UUID transactionID, InventoryItemBase item)
         {
             // We must lock to avoid a race with a separate thread uploading the asset.
             lock (this)
@@ -332,9 +280,9 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
                 item.AssetID = m_asset.FullID;
                 m_Scene.InventoryService.UpdateItem(item);
 
-                if (m_uploadState == UploadState.Complete)
+                if (m_finished)
                 {
-                    CompleteItemUpdate(item);
+                    StoreAssetForItemUpdate(item);
                 }
                 else
                 {
@@ -348,59 +296,20 @@ 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 when it has been uploaded.
+        /// Store the asset for the given item.
         /// </summary>
         /// <param name="item"></param>
-        private void CompleteItemUpdate(InventoryItemBase item)
+        private void StoreAssetForItemUpdate(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);
-        }
-
-        /// <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)
+        private void DoCreateItem(uint callbackID)
         {
             ValidateAssets();
             m_Scene.AssetService.Store(m_asset);
@@ -430,8 +339,6 @@ 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()
@@ -509,7 +416,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
         /// <returns>null if the asset has not finished uploading</returns>
         public AssetBase GetAssetData()
         {
-            if (m_uploadState == UploadState.Complete)
+            if (m_finished)
             {
                 ValidateAssets();
                 return m_asset;
@@ -562,3 +469,4 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
         }
     }
 }
+
diff --git a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
index d1a563c..7d7176f 100644
--- a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
+++ b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
@@ -52,7 +52,7 @@ using OpenSim.Services.Interfaces;
 [assembly: Addin("FlotsamAssetCache", "1.1")]
 [assembly: AddinDependency("OpenSim", "0.5")]
 
-namespace OpenSim.Region.CoreModules.Asset
+namespace Flotsam.RegionModules.AssetCache
 {
     [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]
     public class FlotsamAssetCache : ISharedRegionModule, IImprovedAssetCache, IAssetService
@@ -107,6 +107,8 @@ namespace OpenSim.Region.CoreModules.Asset
         private IAssetService m_AssetService;
         private List<Scene> m_Scenes = new List<Scene>();
 
+        private bool m_DeepScanBeforePurge;
+
         public FlotsamAssetCache()
         {
             m_InvalidChars.AddRange(Path.GetInvalidPathChars());
@@ -168,6 +170,8 @@ namespace OpenSim.Region.CoreModules.Asset
                         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);
@@ -515,10 +519,13 @@ namespace OpenSim.Region.CoreModules.Asset
             // Purge all files last accessed prior to this point
             DateTime purgeLine = DateTime.Now - m_FileExpiration;
 
-            // 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);
+            // 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();
+            }
 
             foreach (string dir in Directory.GetDirectories(m_CacheDirectory))
             {
@@ -711,14 +718,11 @@ namespace OpenSim.Region.CoreModules.Asset
 
         /// <summary>
         /// Iterates through all Scenes, doing a deep scan through assets 
-        /// to update the access time of all assets present in the scene or referenced by assets
-        /// in the scene.
+        /// to cache all assets present in the scene or referenced by assets 
+        /// in the scene
         /// </summary>
-        /// <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)
+        /// <returns></returns>
+        private int CacheScenes()
         {
             UuidGatherer gatherer = new UuidGatherer(m_AssetService);
 
@@ -741,7 +745,7 @@ namespace OpenSim.Region.CoreModules.Asset
                 {
                     File.SetLastAccessTime(filename, DateTime.Now);
                 }
-                else if (storeUncached)
+                else
                 {
                     m_AssetService.Get(assetID.ToString());
                 }
@@ -869,14 +873,13 @@ namespace OpenSim.Region.CoreModules.Asset
 
                         break;
 
+
                     case "assets":
-                        m_log.Info("[FLOTSAM ASSET CACHE]: Ensuring assets are cached for all scenes.");
+                        m_log.Info("[FLOTSAM ASSET CACHE]: Caching all assets, in all scenes.");
 
                         Util.FireAndForget(delegate {
-                            int assetReferenceTotal = TouchAllSceneAssets(true);
-                            m_log.InfoFormat(
-                                "[FLOTSAM ASSET CACHE]: Completed check with {0} assets.",
-                                assetReferenceTotal);
+                            int assetsCached = CacheScenes();
+                            m_log.InfoFormat("[FLOTSAM ASSET CACHE]: Completed Scene Caching, {0} assets found.", assetsCached);
                         });
 
                         break;
diff --git a/OpenSim/Region/CoreModules/Asset/Tests/FlotsamAssetCacheTests.cs b/OpenSim/Region/CoreModules/Asset/Tests/FlotsamAssetCacheTests.cs
index 1c2bfd0..c91b25f 100644
--- a/OpenSim/Region/CoreModules/Asset/Tests/FlotsamAssetCacheTests.cs
+++ b/OpenSim/Region/CoreModules/Asset/Tests/FlotsamAssetCacheTests.cs
@@ -35,6 +35,7 @@ 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 acd156e..951afd7 100644
--- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
@@ -286,20 +286,6 @@ 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(
@@ -475,11 +461,6 @@ 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;
 
@@ -521,11 +502,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
                 so.FromItemID = UUID.Zero;
 
                 SceneObjectPart rootPart = so.RootPart;
-                so.AbsolutePosition = absolutePos;
-                if (absoluteRot != Quaternion.Identity)
-                {
-                    so.UpdateGroupRotationR(absoluteRot);
-                }
+                so.AbsolutePosition = sp.AbsolutePosition;
                 so.AttachedAvatar = UUID.Zero;
                 rootPart.SetParentLocalId(0);
                 so.ClearPartAttachmentData();
@@ -639,9 +616,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);
 
@@ -885,7 +862,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
                     // This will throw if the attachment fails
                     try
                     {
-                        AttachObjectInternal(sp, objatt, attachmentPt, false, false, false);
+                        AttachObject(sp, objatt, attachmentPt, false, false, false);
                     }
                     catch (Exception e)
                     {
@@ -956,9 +933,6 @@ 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 4e9d3f9..d9a619d 100644
--- a/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
@@ -62,10 +62,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests
     public class AttachmentsModuleTests : OpenSimTestCase
     {
         private AutoResetEvent m_chatEvent = new AutoResetEvent(false);
-//        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;
+        private OSChatMessage m_osChatMessageReceived;
 
         [TestFixtureSetUp]
         public void FixtureInit()
@@ -86,7 +83,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests
         {
 //            Console.WriteLine("Got chat [{0}]", oscm.Message);
 
-//            m_osChatMessageReceived = oscm;
+            m_osChatMessageReceived = oscm;
             m_chatEvent.Set();
         }
 
@@ -102,8 +99,6 @@ 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;
         }
 
@@ -186,8 +181,6 @@ 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);
@@ -196,7 +189,6 @@ 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
@@ -224,8 +216,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests
 
             Assert.That(scene.GetSceneObjectGroups().Count, Is.EqualTo(1));
 
-            // Check events
-            Assert.That(m_numberOfAttachEventsFired, Is.EqualTo(1));
+//            TestHelpers.DisableLogging();
         }
 
         /// <summary>
@@ -237,8 +228,6 @@ 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);
@@ -258,9 +247,6 @@ 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]
@@ -275,7 +261,6 @@ 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);
 
@@ -295,9 +280,6 @@ 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>
@@ -356,8 +338,6 @@ 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
@@ -373,9 +353,6 @@ 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]
@@ -392,8 +369,6 @@ 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
@@ -405,9 +380,6 @@ 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>
@@ -489,14 +461,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests
 
             SceneObjectGroup rezzedAtt = presence.GetAttachments()[0];
 
-            m_numberOfAttachEventsFired = 0;
-            scene.IncomingCloseAgent(presence.UUID, false);
+            scene.IncomingCloseAgent(presence.UUID);
 
             // 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]
@@ -512,8 +480,6 @@ 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);
@@ -536,9 +502,6 @@ 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]
@@ -559,14 +522,10 @@ 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]
@@ -615,7 +574,6 @@ 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,
@@ -658,9 +616,29 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests
             Assert.That(actualSceneAAttachments.Count, Is.EqualTo(0));
 
             Assert.That(sceneA.GetSceneObjectGroups().Count, Is.EqualTo(0));
-
-            // Check events
-            Assert.That(m_numberOfAttachEventsFired, 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");
+//        }
     }
 }
diff --git a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
index e3bf997..4cb4370 100644
--- a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
@@ -533,7 +533,6 @@ 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 4407e40..dbbb0ae 100644
--- a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
@@ -197,7 +197,6 @@ 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;
@@ -225,16 +224,11 @@ 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;
             }
 
@@ -268,16 +262,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
                             // objects on a parcel with access restrictions
                             if (c.Sender == null || Presencecheck.IsEitherBannedOrRestricted(c.Sender.AgentId) != true)
                             {
-                                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);
-                                }
+                                if (TrySendChatMessage(presence, fromPos, regionPos, fromID, fromNamePrefix + fromName, c.Type, message, sourceType))
+                                    receiverIDs.Add(presence.UUID);
                             }
                         }
                     }
@@ -338,7 +324,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
                             (((SceneObjectPart)c.SenderObject).OwnerID != client.AgentId))
                             return;
                         
-                        client.SendChatMessage(c.Message, (byte)cType, CenterOfRegion, fromName, fromID, fromID,
+                        client.SendChatMessage(c.Message, (byte)cType, CenterOfRegion, fromName, fromID, 
                                                (byte)sourceType, (byte)ChatAudibleLevel.Fully);
                         receiverIDs.Add(client.AgentId);
                     }
@@ -355,20 +341,15 @@ 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, UUID ownerID, string fromName, ChatTypeEnum type,
-            string message, ChatSourceType src, bool ignoreDistance)
+        protected virtual bool TrySendChatMessage(ScenePresence presence, Vector3 fromPos, Vector3 regionPos,
+                                                  UUID fromAgentID, string fromName, ChatTypeEnum type,
+                                                  string message, ChatSourceType src)
         {
             // don't send chat to child agents
             if (presence.IsChildAgent) return false;
@@ -388,9 +369,8 @@ 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, ownerID, (byte)src, (byte)ChatAudibleLevel.Fully);
+            presence.ControllingClient.SendChatMessage(message, (byte) type, fromPos, fromName,
+                                                       fromAgentID, (byte)src, (byte)ChatAudibleLevel.Fully);
             
             return true;
         }
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/CallingCardModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/CallingCardModule.cs
index 5ec0ea9..d942e87 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], true),
+                        transactionID, false, new Vector3(), new byte[0]),
                         delegate(bool success) {} );
             }
         }
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
index f1903c3..24ec435 100644
--- a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
@@ -28,7 +28,6 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.Linq;
 using System.Reflection;
 using System.Threading;
 using log4net;
@@ -483,9 +482,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);
@@ -496,36 +495,42 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
 
         protected virtual void StatusNotify(List<FriendInfo> friendList, UUID userID, bool online)
         {
-            List<string> friendStringIds = friendList.ConvertAll<string>(friend => friend.Friend);
-            List<string> remoteFriendStringIds = new List<string>();
-            foreach (string friendStringId in friendStringIds)
+            foreach (FriendInfo friend in friendList)
             {
-                UUID friendUuid;
-                if (UUID.TryParse(friendStringId, out friendUuid))
+                UUID friendID;
+                if (UUID.TryParse(friend.Friend, out friendID))
                 {
-                    if (LocalStatusNotification(userID, friendUuid, online))
+                    // Try local
+                    if (LocalStatusNotification(userID, friendID, online))
                         continue;
 
-                    remoteFriendStringIds.Add(friendStringId);
+                    // 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.
                 }
                 else
                 {
-                    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);
+                    m_log.WarnFormat("[FRIENDS]: Error parsing friend ID {0}", friend.Friend);
                 }
             }
         }
diff --git a/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs b/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
index 82816d9..716cc69 100644
--- a/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
@@ -206,7 +206,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}, true),
+                            new Vector3(), new byte[] {(byte)kickflags}),
                             delegate(bool success) {} );
                 }
                 return;
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs
index d0e88f6..6587ead 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} (asset UUID {2})",
+                    "[INVENTORY ARCHIVER]: Saving item {0} {1} with asset {2}",
                     inventoryItem.ID, inventoryItem.Name, inventoryItem.AssetID);
 
             string filename = path + CreateArchiveItemName(inventoryItem);
@@ -337,14 +337,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                 {
                     m_log.DebugFormat("[INVENTORY ARCHIVER]: Saving {0} assets for items", m_assetUuids.Count);
 
-                    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());
+                    new AssetsRequest(
+                        new AssetsArchiver(m_archiveWriter),
+                        m_assetUuids, m_scene.AssetService,
+                        m_scene.UserAccountService, m_scene.RegionInfo.ScopeID,
+                        options, ReceivedAllAssets).Execute();
                 }
                 else
                 {
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
index 765b960..7d1fe68 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
@@ -35,7 +35,6 @@ 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;
@@ -210,9 +209,6 @@ 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 00727a4..1056865 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveTestCase.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveTestCase.cs
@@ -82,25 +82,7 @@ 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()
         {
@@ -108,6 +90,12 @@ 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();
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
index 06f6e49..b112b6d 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();
-//            TestHelpers.EnableLogging();
+//            log4net.Config.XmlConfigurator.Configure();
             
             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();
-//            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
+        /// 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
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
index e26beec..8176989 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
@@ -38,15 +38,15 @@ using OpenSim.Services.Interfaces;
 
 namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
 {
-    public class InventoryTransferModule : ISharedRegionModule
+    public class InventoryTransferModule : IInventoryTransferModule, 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;
@@ -76,12 +76,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 +96,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 +106,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 +138,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,11 +313,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
                         m_TransferModule.SendInstantMessage(im, delegate(bool success) {});
                 }
             }
-
-            // 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;
@@ -329,16 +324,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
 
                 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
@@ -346,11 +331,9 @@ 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) // It's an item
                     {
-                        previousParentFolderID = item.Folder;
                         item.Folder = destinationFolderID;
 
                         invService.DeleteItems(item.Owner, new List<UUID>() { item.ID });
@@ -363,22 +346,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
 
                         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 (
@@ -399,11 +370,9 @@ 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???
@@ -419,7 +388,6 @@ 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);
@@ -440,16 +408,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
                     client.SendAgentAlertMessage("Unable to delete "+
                             "received inventory" + reason, false);
                 }
-                // 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)
-                {
-                    InventoryFolderBase previousParentFolder
-                        = new InventoryFolderBase((UUID)previousParentFolderID, client.AgentId);
-                    previousParentFolder = invService.GetFolder(previousParentFolder);
-                    scene.SendInventoryUpdate(client, previousParentFolder, true, true);
-
-                    scene.SendInventoryUpdate(client, trashFolder, true, true);
-                }
 
                 if (im.dialog == (byte)InstantMessageDialog.InventoryDeclined)
                 {
@@ -468,69 +426,69 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
             }
         }
 
-//        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);
-//        }
+        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 9c369f6..92cf9d1 100644
--- a/OpenSim/Region/CoreModules/Avatar/Lure/HGLureModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Lure/HGLureModule.cs
@@ -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], true);
+                    new Byte[0]);
             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 1949459..a889984 100644
--- a/OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs
@@ -173,7 +173,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Lure
                         client.FirstName+" "+client.LastName, targetid,
                         (byte)InstantMessageDialog.GodLikeRequestTeleport, false,
                         message, dest, false, presence.AbsolutePosition,
-                        new Byte[0], true);
+                        new Byte[0]);
             }
             else
             {
@@ -181,7 +181,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Lure
                         client.FirstName+" "+client.LastName, targetid,
                         (byte)InstantMessageDialog.RequestTeleport, false,
                         message, dest, false, presence.AbsolutePosition,
-                        new Byte[0], true);
+                        new Byte[0]);
             }
 
             if (m_TransferModule != null)
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index 31e6ce9..880b2cc 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -327,14 +327,6 @@ 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
                 //
@@ -366,13 +358,6 @@ 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>
@@ -488,11 +473,10 @@ 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)
@@ -568,11 +552,8 @@ 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
                 {
@@ -593,7 +574,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
 
             //sp.ControllingClient.SendTeleportProgress(teleportFlags, "Updating agent...");
 
-            if (!UpdateAgent(reg, finalDestination, agent, sp))
+            if (!UpdateAgent(reg, finalDestination, agent))
             {
                 // Region doesn't take it
                 m_log.WarnFormat(
@@ -669,7 +650,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, false);
+                sp.Scene.IncomingCloseAgent(sp.UUID);
             }
             else
             {
@@ -677,14 +658,13 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 sp.Reset();
             }
 
-            // 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);
-//            }
+            // 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);
         }
@@ -721,7 +701,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             return success;
         }
 
-        protected virtual bool UpdateAgent(GridRegion reg, GridRegion finalDestination, AgentData agent, ScenePresence sp)
+        protected virtual bool UpdateAgent(GridRegion reg, GridRegion finalDestination, AgentData agent)
         {
             return Scene.SimulationService.UpdateAgent(finalDestination, agent);
         }
@@ -1033,7 +1013,6 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             Scene initiatingScene)
         {
             Thread.Sleep(10000);
-            
             IMessageTransferModule im = initiatingScene.RequestModuleInterface<IMessageTransferModule>();
             if (im != null)
             {
@@ -1046,22 +1025,11 @@ 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],
-                        false);
-
+                GridInstantMessage m = new GridInstantMessage(initiatingScene, UUID.Zero,
+                "Region", agent.UUID,
+                (byte)InstantMessageDialog.GodLikeRequestTeleport, false,
+                "", gotoLocation, false, new Vector3(127, 0, 0),
+                new Byte[0]);
                 im.SendInstantMessage(m, delegate(bool success)
                 {
                     m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Client Initiating Teleport sending IM success = {0}", success);
@@ -1223,11 +1191,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 b16c37a..3010b59 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
@@ -54,59 +54,6 @@ 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
@@ -125,18 +72,8 @@ 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);
                 }
@@ -148,36 +85,7 @@ 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)
@@ -212,7 +120,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.Framework.RegionFlags.Hyperlink) != 0)
+            if ((flags & (int)OpenSim.Data.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);
@@ -232,7 +140,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.Framework.RegionFlags.Hyperlink) != 0)
+            if (flags == -1 /* no region in DB */ || (flags & (int)OpenSim.Data.RegionFlags.Hyperlink) != 0)
                 return true;
 
             return false;
@@ -245,8 +153,6 @@ 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);
             }
         }
 
@@ -256,11 +162,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.Framework.RegionFlags.Hyperlink) != 0)
+            if (flags == -1 /* no region in DB */ || (flags & (int)OpenSim.Data.RegionFlags.Hyperlink) != 0)
             {
                 // this user is going to another grid
-                // for local users, check if HyperGrid teleport is allowed, based on user level
-                if (Scene.UserManagementModule.IsLocalGridUser(sp.UUID) && sp.UserLevel < m_levelHGTeleport)
+                // check if HyperGrid teleport is allowed, based on user level
+                if (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";
@@ -294,124 +200,6 @@ 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(
@@ -587,4 +375,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 f8ec6de..eaadc1b 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 AssetMetadata FetchMetadata(string url, UUID assetID)
+        public AssetBase FetchAsset(string url, UUID assetID)
         {
             if (!url.EndsWith("/") && !url.EndsWith("="))
                 url = url + "/";
 
-            AssetMetadata meta = m_scene.AssetService.GetMetadata(url + assetID.ToString());
+            AssetBase asset = m_scene.AssetService.Get(url + assetID.ToString());
 
-            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;
+            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;
         }
 
         public bool PostAsset(string url, AssetBase asset)
@@ -93,7 +93,6 @@ 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)
                 {
@@ -104,7 +103,14 @@ 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);
-                    asset1.ID = url + asset.ID;
+                    try
+                    {
+                        asset1.ID = url + asset.ID;
+                    }
+                    catch
+                    {
+                        m_log.Warn("[HG ASSET MAPPER]: Oops.");
+                    }
 
                     AdjustIdentifiers(asset1.Metadata);
                     if (asset1.Metadata.Type == (sbyte)AssetType.Object)
@@ -112,17 +118,11 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                     else
                         asset1.Data = asset.Data;
 
-                    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);
+                    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);
                 }
-                return success;
-            }
+                return true;
+           }
             else
                 m_log.Warn("[HG ASSET MAPPER]: Tried to post asset to remote server, but asset not in local cache.");
 
@@ -222,17 +222,28 @@ 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 AssetService
+            // 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); 
 
-            AssetMetadata meta = FetchMetadata(userAssetURL, assetID);
-            if (meta == null)
-                return;
+            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);
 
-            // 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);
+                m_log.DebugFormat("[HG ASSET MAPPER]: Successfully fetched asset {0} from asset server {1}", asset.ID, userAssetURL);
 
+            }
+            else
+                m_log.Warn("[HG ASSET MAPPER]: Could not fetch asset from remote asset server " + userAssetURL);
         }
 
 
@@ -246,23 +257,19 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
             if (asset != null)
             {
                 Dictionary<UUID, AssetType> ids = new Dictionary<UUID, AssetType>();
-                HGUuidGatherer uuidGatherer = new HGUuidGatherer(m_scene.AssetService, string.Empty);
+                HGUuidGatherer uuidGatherer = new HGUuidGatherer(this, 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
-                        success = PostAsset(userAssetURL, asset);
+                        PostAsset(userAssetURL, asset);
                 }
 
-                // 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);
+                 // maybe all pieces got there...
+                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 6bb758e..cf72b58 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs
@@ -92,7 +92,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", true);
+                        m_RestrictInventoryAccessAbroad = thisModuleConfig.GetBoolean("RestrictInventoryAccessAbroad", false);
                     }
                     else
                         m_log.Warn("[HG INVENTORY ACCESS MODULE]: HGInventoryAccessModule configs not found. ProfileServerURI not set!");
@@ -263,13 +263,8 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
             //}
 
             // OK, we're done fetching. Pass it up to the default RezObject
-            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;
+            return base.RezObject(remoteClient, itemID, RayEnd, RayStart, RayTargetID, BypassRayCast, RayEndIsIntersection,
+                                  RezSelected, RemoveItem, fromTaskID, attachment);
 
         }
 
@@ -313,8 +308,6 @@ 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))
@@ -351,7 +344,6 @@ 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
         }
 
         //
@@ -398,7 +390,6 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
 
         private void ProcessInventoryForLeaving(IClientAPI client)
         {
-            // No-op for now
         }
 
         #endregion
diff --git a/OpenSim/Region/ScriptEngine/Shared/ScriptException.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGUuidGatherer.cs
index f55ba7e..fcb544f 100644
--- a/OpenSim/Region/ScriptEngine/Shared/ScriptException.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGUuidGatherer.cs
@@ -26,19 +26,32 @@
  */
 
 using System;
-using System.Runtime.Serialization;
+using System.Collections.Generic;
 
-namespace OpenSim.Region.ScriptEngine.Shared
+using OpenSim.Framework;
+using OpenSim.Region.Framework.Scenes;
+using OpenSim.Services.Interfaces;
+using OpenMetaverse;
+
+namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
 {
-    [Serializable]
-    public class ScriptException : Exception
+    public class HGUuidGatherer : UuidGatherer
     {
-        public ScriptException() : base() {}
-
-        public ScriptException(string message) : base(message) {}
+        protected string m_assetServerURL;
+        protected HGAssetMapper m_assetMapper;
 
-        public ScriptException(string message, Exception innerException) : base(message, innerException) {}
+        public HGUuidGatherer(HGAssetMapper assMap, IAssetService assetCache, string assetServerURL) : base(assetCache)
+        {
+            m_assetMapper = assMap;
+            m_assetServerURL = assetServerURL;
+        }
 
-        public ScriptException(SerializationInfo info, StreamingContext context) :base(info, context) {}
+        protected override AssetBase GetAsset(UUID uuid)
+        {
+            if (string.Empty == m_assetServerURL)
+                return m_assetCache.Get(uuid.ToString());
+            else
+                return m_assetMapper.FetchAsset(m_assetServerURL, uuid);
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Region/CoreModules/Framework/Monitoring/MonitorModule.cs b/OpenSim/Region/CoreModules/Framework/Monitoring/MonitorModule.cs
index e411585..e135c21 100644
--- a/OpenSim/Region/CoreModules/Framework/Monitoring/MonitorModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/Monitoring/MonitorModule.cs
@@ -95,14 +95,14 @@ namespace OpenSim.Region.CoreModules.Framework.Monitoring
         {
             foreach (IMonitor monitor in m_staticMonitors)
             {
-                MainConsole.Instance.OutputFormat(
+                m_log.InfoFormat(
                     "[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(
+                m_log.InfoFormat(
                     "[MONITOR MODULE]: {0} reports {1} = {2}",
                     m_scene.RegionInfo.RegionName, tuple.Key, tuple.Value);
             }
diff --git a/OpenSim/Region/CoreModules/Framework/Statistics/Logging/LogWriter.cs b/OpenSim/Region/CoreModules/Framework/Statistics/Logging/LogWriter.cs
index fd8d5e3..65e4c90 100755
--- a/OpenSim/Region/CoreModules/Framework/Statistics/Logging/LogWriter.cs
+++ b/OpenSim/Region/CoreModules/Framework/Statistics/Logging/LogWriter.cs
@@ -1,170 +1,161 @@
-/*
- * 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;
-        }
-    }
-}
+/*

+ * 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
diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/HGUserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/HGUserManagementModule.cs
index acefc97..4eecaa2 100644
--- a/OpenSim/Region/CoreModules/Framework/UserManagement/HGUserManagementModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/UserManagement/HGUserManagementModule.cs
@@ -137,9 +137,6 @@ 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 b4811da..f4ed67b 100644
--- a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
@@ -31,7 +31,6 @@ 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;
@@ -430,7 +429,8 @@ 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 +553,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} ({3})",
-                           kvp.Key, kvp.Value.FirstName, kvp.Value.LastName, kvp.Value.HomeURL));
+                    MainConsole.Instance.Output(String.Format("{0} {1} {2}",
+                           kvp.Key, kvp.Value.FirstName, kvp.Value.LastName));
                 }
     
                 return;
diff --git a/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml b/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml
index 6c73d91..424e0ab 100644
--- a/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml
+++ b/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml
@@ -15,7 +15,6 @@
         <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="DwellModule" type="OpenSim.Region.CoreModules.World.Land.DwellModule" />
         <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" />
diff --git a/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTexture.cs b/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTexture.cs
deleted file mode 100644
index fce9490..0000000
--- a/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTexture.cs
+++ /dev/null
@@ -1,61 +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.Drawing;
-using OpenSim.Region.Framework.Interfaces;
-
-namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
-{
-    public class DynamicTexture : IDynamicTexture
-    {
-        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 DynamicTexture(string inputCommands, string inputParams, byte[] data, Size size, bool isReuseable)
-        {
-            InputCommands = inputCommands;
-            InputParams = inputParams;
-            Data = data;
-            Size = size;
-            IsReuseable = isReuseable;
-        }
-
-        public DynamicTexture(Uri inputUri, string inputParams, byte[] data, Size size, bool isReuseable)
-        {
-            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 93a045e..18bd018 100644
--- a/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs
@@ -42,29 +42,13 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
 {
     public class DynamicTextureModule : IRegionModule, 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 =
@@ -72,15 +56,6 @@ 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;
-
         #region IDynamicTextureManager Members
 
         public void RegisterRender(string handleType, IDynamicTextureRender render)
@@ -94,17 +69,17 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
         /// <summary>
         /// Called by code which actually renders the dynamic texture to supply texture data.
         /// </summary>
-        /// <param name="updaterId"></param>
-        /// <param name="texture"></param>
-        public void ReturnData(UUID updaterId, IDynamicTexture texture)
+        /// <param name="id"></param>
+        /// <param name="data"></param>
+        public void ReturnData(UUID id, byte[] data)
         {
             DynamicTextureUpdater updater = null;
 
             lock (Updaters)
             {
-                if (Updaters.ContainsKey(updaterId))
+                if (Updaters.ContainsKey(id))
                 {
-                    updater = Updaters[updaterId];
+                    updater = Updaters[id];
                 }
             }
 
@@ -113,16 +88,7 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
                 if (RegisteredScenes.ContainsKey(updater.SimUUID))
                 {
                     Scene scene = RegisteredScenes[updater.SimUUID];
-                    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);
-                    }
+                    updater.DataReceived(data, scene);
                 }
             }
 
@@ -138,27 +104,6 @@ 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)
         {
@@ -222,61 +167,22 @@ 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))
-                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)
+            if (RenderPlugins.ContainsKey(contentType))
             {
-                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;
-                    }
-                }
-            }
+                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;
 
-            // 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))
@@ -285,29 +191,11 @@ 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;
             }
-            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);
+            
+            return UUID.Zero;
         }
 
         public void GetDrawStringSize(string contentType, string text, string fontName, int fontSize,
@@ -327,13 +215,6 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
 
         public void Initialise(Scene scene, IConfigSource config)
         {
-            IConfig texturesConfig = config.Configs["Textures"];
-            if (texturesConfig != null)
-            {
-                ReuseTextures = texturesConfig.GetBoolean("ReuseDynamicTextures", false);
-                ReuseLowDataTextures = texturesConfig.GetBoolean("ReuseDynamicLowDataTextures", false);
-            }
-
             if (!RegisteredScenes.ContainsKey(scene.RegionInfo.RegionID))
             {
                 RegisteredScenes.Add(scene.RegionInfo.RegionID, scene);
@@ -343,11 +224,6 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
 
         public void PostInitialise()
         {
-            if (ReuseTextures)
-            {
-                m_reuseableDynamicTextures = new Cache(CacheMedium.Memory, CacheStrategy.Conservative);
-                m_reuseableDynamicTextures.DefaultTTL = new TimeSpan(24, 0, 0);
-            }
         }
 
         public void Close()
@@ -393,60 +269,9 @@ 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>
-            /// <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)
+            public void DataReceived(byte[] data, Scene scene)
             {
                 SceneObjectPart part = scene.GetSceneObjectPart(PrimID);
 
@@ -456,8 +281,7 @@ 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 UUID.Zero;
+                    return;
                 }
 
                 byte[] assetData = null;
@@ -495,29 +319,56 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
                 IJ2KDecoder cacheLayerDecode = scene.RequestModuleInterface<IJ2KDecoder>();
                 if (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);
+                    cacheLayerDecode.Decode(asset.FullID, asset.Data);
+                    cacheLayerDecode = null;
                 }
 
-                UUID oldID = UpdatePart(part, asset.FullID);
+                UUID oldID = UUID.Zero;
 
-                if (oldID != UUID.Zero && ((Disp & DISP_EXPIRE) != 0))
+                lock (part)
                 {
-                    if (oldAsset == null)
-                        oldAsset = scene.AssetService.Get(oldID.ToString());
+                    // 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());
+                }
+
+                if (oldID != UUID.Zero && ((Disp & DISP_EXPIRE) != 0))
+                {
+                    if (oldAsset == null) oldAsset = scene.AssetService.Get(oldID.ToString());
                     if (oldAsset != null)
                     {
-                        if (oldAsset.Temporary)
+                        if (oldAsset.Temporary == true)
                         {
                             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/LSLHttp/UrlModule.cs b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
index 0b9174f..56221aa 100644
--- a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
@@ -58,7 +58,6 @@ 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;
@@ -271,22 +270,6 @@ 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 45e6527..6f83948 100644
--- a/OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs
@@ -32,7 +32,6 @@ 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;
@@ -68,18 +67,12 @@ namespace OpenSim.Region.CoreModules.Scripting.LoadImageURL
             return true;
         }
 
-//        public bool AlwaysIdenticalConversion(string bodyData, string extraParams)
-//        {
-//            // We don't support conversion of body data.
-//            return false;
-//        }
-
-        public IDynamicTexture ConvertUrl(string url, string extraParams)
+        public byte[] ConvertUrl(string url, string extraParams)
         {
             return null;
         }
 
-        public IDynamicTexture ConvertData(string bodyData, string extraParams)
+        public byte[] ConvertStream(Stream data, string extraParams)
         {
             return null;
         }
@@ -172,11 +165,11 @@ namespace OpenSim.Region.CoreModules.Scripting.LoadImageURL
 
         private void HttpRequestReturn(IAsyncResult result)
         {
+
             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
             {
@@ -189,43 +182,37 @@ 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.Width = 32;
-                                newSize.Height = 32;
+                                newsize = new Size(32, 32);
                             }
                             else if ((image.Height < 128) && (image.Width < 128))
                             {
-                                newSize.Width = 64;
-                                newSize.Height = 64;
+                                newsize = new Size(64, 64);
                             }
                             else if ((image.Height < 256) && (image.Width < 256))
                             {
-                                newSize.Width = 128;
-                                newSize.Height = 128;
+                                newsize = new Size(128, 128);
                             }
                             else if ((image.Height < 512 && image.Width < 512))
                             {
-                                newSize.Width = 256;
-                                newSize.Height = 256;
+                                newsize = new Size(256, 256);
                             }
                             else if ((image.Height < 1024 && image.Width < 1024))
                             {
-                                newSize.Width = 512;
-                                newSize.Height = 512;
+                                newsize = new Size(512, 512);
                             }
                             else
                             {
-                                newSize.Width = 1024;
-                                newSize.Height = 1024;
+                                newsize = new Size(1024, 1024);
                             }
 
-                            using (Bitmap resize = new Bitmap(image, newSize))
-                            {
-                                imageJ2000 = OpenJPEG.EncodeFromImage(resize, true);
-                            }
+                            Bitmap resize = new Bitmap(image, newsize);
+
+                            imageJ2000 = OpenJPEG.EncodeFromImage(resize, true);
                         } 
                         catch (Exception)
                         {
@@ -240,6 +227,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LoadImageURL
             }
             catch (WebException)
             {
+                
             }
             finally
             {
@@ -248,14 +236,9 @@ 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,
-                new OpenSim.Region.CoreModules.Scripting.DynamicTexture.DynamicTexture(
-                    request.RequestUri, null, imageJ2000, newSize, false));
+            m_textureManager.ReturnData(state.RequestID, imageJ2000);
         }
 
         #region Nested type: RequestState
diff --git a/OpenSim/Region/CoreModules/Scripting/VectorRender/Tests/VectorRenderModuleTests.cs b/OpenSim/Region/CoreModules/Scripting/VectorRender/Tests/VectorRenderModuleTests.cs
index 41baccc..9787c8c 100644
--- a/OpenSim/Region/CoreModules/Scripting/VectorRender/Tests/VectorRenderModuleTests.cs
+++ b/OpenSim/Region/CoreModules/Scripting/VectorRender/Tests/VectorRenderModuleTests.cs
@@ -45,292 +45,31 @@ using OpenSim.Tests.Common.Mock;
 namespace OpenSim.Region.CoreModules.Scripting.VectorRender.Tests
 {
     [TestFixture]
-    public class VectorRenderModuleTests : OpenSimTestCase
+    public class VectorRenderModuleTests
     {
-        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();
 
-            SetupScene(false);
-            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 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();
+            Scene scene = new SceneHelpers().SetupScene();
+            DynamicTextureModule dtm = new DynamicTextureModule();
+            VectorRenderModule vrm = new VectorRenderModule();
+            SceneHelpers.SetupSceneModules(scene, dtm, vrm);
 
-            SetupScene(true);
-            SceneObjectGroup so = SceneHelpers.AddSceneObject(m_scene);
+            SceneObjectGroup so = SceneHelpers.AddSceneObject(scene);
             UUID originalTextureID = so.RootPart.Shape.Textures.GetFace(0).TextureID;
 
-            m_dtm.AddDynamicTextureData(
-                m_scene.RegionInfo.RegionID,
+            dtm.AddDynamicTextureData(
+                scene.RegionInfo.RegionID,
                 so.UUID,
-                m_vrm.GetContentType(),
+                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));
+            Assert.That(originalTextureID, 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 673c2d1..8b2f2f8 100644
--- a/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs
@@ -30,12 +30,10 @@ 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;
@@ -47,13 +45,9 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender
 {
     public class VectorRenderModule : IRegionModule, 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;
@@ -67,12 +61,12 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender
 
         public string GetContentType()
         {
-            return "vector";
+            return ("vector");
         }
 
         public string GetName()
         {
-            return Name;
+            return m_name;
         }
 
         public bool SupportsAsynchronous()
@@ -80,20 +74,14 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender
             return true;
         }
 
-//        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)
+        public byte[] ConvertUrl(string url, string extraParams)
         {
             return null;
         }
 
-        public IDynamicTexture ConvertData(string bodyData, string extraParams)
+        public byte[] ConvertStream(Stream data, string extraParams)
         {
-            return Draw(bodyData, extraParams);
+            return null;
         }
 
         public bool AsyncConvertUrl(UUID id, string url, string extraParams)
@@ -103,28 +91,21 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender
 
         public bool AsyncConvertData(UUID id, string bodyData, string extraParams)
         {
-            // XXX: This isn't actually being done asynchronously!
-            m_textureManager.ReturnData(id, ConvertData(bodyData, extraParams));
-
+            Draw(bodyData, id, extraParams);
             return true;
         }
 
         public void GetDrawStringSize(string text, string fontName, int fontSize, 
                                       out double xSize, out double ySize)
         {
-            lock (this)
+            using (Font myFont = new Font(fontName, fontSize))
             {
-                using (Font myFont = new Font(fontName, fontSize))
+                SizeF stringSize = new SizeF();
+                lock (m_graph)
                 {
-                    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;
-                    }
+                    stringSize = m_graph.MeasureString(text, myFont);
+                    xSize = stringSize.Width;
+                    ySize = stringSize.Height;
                 }
             }
         }
@@ -163,13 +144,6 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender
             {
                 m_textureManager.RegisterRender(GetContentType(), this);
             }
-
-                // This code exists for testing purposes, please do not remove.
-//            s_asset1Data = m_scene.AssetService.Get("00000000-0000-1111-9999-000000000001").Data;
-//            s_asset1Data = m_scene.AssetService.Get("9f4acf0d-1841-4e15-bdb8-3a12efc9dd8f").Data;
-
-            // Terrain dirt - smallest bin/assets file (6004 bytes)
-//            s_asset2Data = m_scene.AssetService.Get("b8d3965a-ad78-bf43-699b-bff8eca6c975").Data;
         }
 
         public void Close()
@@ -178,7 +152,7 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender
 
         public string Name
         {
-            get { return "VectorRenderModule"; }
+            get { return m_name; }
         }
 
         public bool IsSharedModule
@@ -188,7 +162,7 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender
 
         #endregion
 
-        private IDynamicTexture Draw(string data, string extraParams)
+        private void Draw(string data, UUID id, 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
@@ -331,57 +305,40 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender
 
             Bitmap bitmap = null;
             Graphics graph = null;
-            bool reuseable = false;
 
             try
             {
-                // 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 (alpha == 256)
-                        bitmap = new Bitmap(width, height, PixelFormat.Format32bppRgb);
-                    else
-                        bitmap = new Bitmap(width, height, PixelFormat.Format32bppArgb);
+                if (alpha == 256)
+                    bitmap = new Bitmap(width, height, PixelFormat.Format32bppRgb);
+                else
+                    bitmap = new Bitmap(width, height, PixelFormat.Format32bppArgb);
+
+                graph = Graphics.FromImage(bitmap);
     
-                    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)
+                // this is really just to save people filling the 
+                // background color in their scripts, only do when fully opaque
+                if (alpha >= 255)
+                {
+                    using (SolidBrush bgFillBrush = new SolidBrush(bgColor))
                     {
-                        using (SolidBrush bgFillBrush = new SolidBrush(bgColor))
-                        {
-                            graph.FillRectangle(bgFillBrush, 0, 0, width, height);
-                        }
+                        graph.FillRectangle(bgFillBrush, 0, 0, width, height);
                     }
-        
-                    for (int w = 0; w < bitmap.Width; w++)
+                }
+    
+                for (int w = 0; w < bitmap.Width; w++)
+                {
+                    if (alpha <= 255) 
                     {
-                        if (alpha <= 255) 
+                        for (int h = 0; h < bitmap.Height; h++)
                         {
-                            for (int h = 0; h < bitmap.Height; h++)
-                            {
-                                bitmap.SetPixel(w, h, Color.FromArgb(alpha, bitmap.GetPixel(w, 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
                 {
@@ -394,24 +351,15 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender
                         e.Message, e.StackTrace);
                 }
 
-                return new OpenSim.Region.CoreModules.Scripting.DynamicTexture.DynamicTexture(
-                    data, extraParams, imageJ2000, new Size(width, height), reuseable);
+                m_textureManager.ReturnData(id, imageJ2000);
             }
             finally
             {
-                // 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();
-                }
+                if (graph != null)
+                    graph.Dispose();
+
+                if (bitmap != null)
+                    bitmap.Dispose();
             }
         }
         
@@ -470,21 +418,8 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender
         }
 */
 
-        /// <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)
+        private void GDIDraw(string data, Graphics graph, char dataDelim)
         {
-            reuseable = true;
             Point startPoint = new Point(0, 0);
             Point endPoint = new Point(0, 0);
             Pen drawPen = null;
@@ -499,9 +434,11 @@ 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 GetLines(data, dataDelim))
+                foreach (string line in lines)
                 {
                     string nextLine = line.Trim();
                     //replace with switch, or even better, do some proper parsing
@@ -532,10 +469,6 @@ 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 e167e31..07bb291 100644
--- a/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs
@@ -28,7 +28,6 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.Text.RegularExpressions;
 using Nini.Config;
 using OpenMetaverse;
 using OpenSim.Framework;
@@ -173,42 +172,12 @@ 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="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="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, int regexBitfield)
+        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, regexBitfield);
+            return m_listenerManager.AddListener(localID, itemID, hostID, channel, name, id, msg);
         }
 
         /// <summary>
@@ -357,7 +326,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, target, false, false);
+                    m_scene.SimChat(Utils.StringToBytes(msg), ChatTypeEnum.Broadcast, 0, pos, name, id, false, false, target);
                     return true;
                 }
 
@@ -501,25 +470,15 @@ 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)
-        {
-            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)
+        public int AddListener(uint localID, UUID itemID, UUID hostID, int channel, string name, UUID id, string msg)
         {
             // 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();
             }
 
@@ -531,9 +490,7 @@ namespace OpenSim.Region.CoreModules.Scripting.WorldComm
 
                     if (newHandle > 0)
                     {
-                        ListenerInfo li = new ListenerInfo(newHandle, localID,
-                                itemID, hostID, channel, name, id, msg,
-                                regexBitfield);
+                        ListenerInfo li = new ListenerInfo(newHandle, localID, itemID, hostID, channel, name, id, msg);
 
                             List<ListenerInfo> listeners;
                             if (!m_listeners.TryGetValue(channel,out listeners))
@@ -674,22 +631,6 @@ namespace OpenSim.Region.CoreModules.Scripting.WorldComm
             return -1;
         }
 
-        /// 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
-
         // 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.
@@ -715,10 +656,7 @@ namespace OpenSim.Region.CoreModules.Scripting.WorldComm
                     {
                         continue;
                     }
-                    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()))
-                    ))
+                    if (li.GetName().Length > 0 && !li.GetName().Equals(name))
                     {
                         continue;
                     }
@@ -726,10 +664,7 @@ namespace OpenSim.Region.CoreModules.Scripting.WorldComm
                     {
                         continue;
                     }
-                    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()))
-                    ))
+                    if (li.GetMessage().Length > 0 && !li.GetMessage().Equals(msg))
                     {
                         continue;
                     }
@@ -762,13 +697,10 @@ namespace OpenSim.Region.CoreModules.Scripting.WorldComm
         {
             int idx = 0;
             Object[] item = new Object[6];
-            int dataItemLength = 6;
 
             while (idx < data.Length)
             {
-                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);
+                Array.Copy(data, idx, item, 0, 6);
 
                 ListenerInfo info =
                         ListenerInfo.FromData(localID, itemID, hostID, item);
@@ -780,12 +712,12 @@ namespace OpenSim.Region.CoreModules.Scripting.WorldComm
                     m_listeners[(int)item[2]].Add(info);
                 }
 
-                idx+=dataItemLength;
+                idx+=6;
             }
         }
     }
 
-    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
@@ -799,29 +731,16 @@ namespace OpenSim.Region.CoreModules.Scripting.WorldComm
 
         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, int regexBitfield)
-        {
-            Initialise(handle, localID, ItemID, hostID, channel, name, id,
-                    message, regexBitfield);
+            Initialise(handle, localID, ItemID, hostID, channel, name, id, 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, 0);
-        }
-
-        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);
+            Initialise(li.m_handle, li.m_localID, li.m_itemID, li.m_hostID, li.m_channel, name, id, message);
         }
 
-        private void Initialise(int handle, uint localID, UUID ItemID, UUID hostID, int channel, string name, UUID id, string message, int regexBitfield)
+        private void Initialise(int handle, uint localID, UUID ItemID, UUID hostID, int channel, string name,
+                                UUID id, string message)
         {
             m_active = true;
             m_handle = handle;
@@ -832,12 +751,11 @@ namespace OpenSim.Region.CoreModules.Scripting.WorldComm
             m_name = name;
             m_id = id;
             m_message = message;
-            RegexBitfield = regexBitfield;
         }
 
         public Object[] GetSerializationData()
         {
-            Object[] data = new Object[7];
+            Object[] data = new Object[6];
 
             data[0] = m_active;
             data[1] = m_handle;
@@ -845,19 +763,16 @@ 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)
         {
-            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];
-            if (data.Length >= 7)
-            {
-                linfo.RegexBitfield = (int)data[6];
-            }
+            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];
 
             return linfo;
         }
@@ -916,7 +831,5 @@ namespace OpenSim.Region.CoreModules.Scripting.WorldComm
         {
             return m_id;
         }
-
-        public int RegexBitfield { get; private set; }
     }
 }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs
index 1e1c7d0..008465f 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs
@@ -56,8 +56,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
 
         private bool m_Enabled = false;
 
-        private AssetPermissions m_AssetPerms;
-
         public Type ReplaceableInterface 
         {
             get { return null; }
@@ -130,9 +128,6 @@ 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");
                 }
@@ -211,11 +206,14 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
                 asset = m_HGService.Get(id);
                 if (asset != null)
                 {
-                    // Now store it locally, if allowed
-                    if (m_AssetPerms.AllowedImport(asset.Type))
+                    // 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))
+                    {
                         m_GridService.Store(asset);
-                    else
-                        return null;
+                    }
                 }
             }
             else
@@ -330,12 +328,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
 
             string id = string.Empty;
             if (IsHG(asset.ID))
-            {
-                if (m_AssetPerms.AllowedExport(asset.Type))
-                    id = m_HGService.Store(asset);
-                else
-                    return String.Empty;
-            }
+                id = m_HGService.Store(asset);
             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 449c1f1..c78915f 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/LocalAssetServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/LocalAssetServiceConnector.cs
@@ -204,11 +204,8 @@ 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 = null;
-
-            if (m_Cache != null)
-                asset = m_Cache.Get(id);
+            
+            AssetBase asset = m_Cache.Get(id);
 
             if (asset != null)
                 return asset.Data;
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/Tests/AssetConnectorTests.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/Tests/AssetConnectorTests.cs
deleted file mode 100644
index 1982473..0000000
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/Tests/AssetConnectorTests.cs
+++ /dev/null
@@ -1,136 +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.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/Grid/Tests/GridConnectorsTests.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/Tests/GridConnectorsTests.cs
index 4338133..b286d17 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/Tests/GridConnectorsTests.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/Tests/GridConnectorsTests.cs
@@ -43,15 +43,11 @@ using OpenSim.Tests.Common;
 namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid.Tests
 {
     [TestFixture]
-    public class GridConnectorsTests : OpenSimTestCase
+    public class GridConnectorsTests
     {
         LocalGridServicesConnector m_LocalConnector;
-
-        [SetUp]
-        public override void SetUp()
+        private void SetUp()
         {
-            base.SetUp();
-
             IConfigSource config = new IniConfigSource();
             config.AddConfig("Modules");
             config.AddConfig("GridService");
@@ -75,6 +71,8 @@ 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 221f815..b0edce7 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/GridUser/ActivityDetector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/GridUser/ActivityDetector.cs
@@ -65,13 +65,11 @@ 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(
-                    userid, UUID.Zero, sp.Scene.RegionInfo.RegionID, sp.AbsolutePosition, sp.Lookat);
-            }
+                    sp.UUID.ToString(), UUID.Zero, sp.Scene.RegionInfo.RegionID, sp.AbsolutePosition, sp.Lookat);
         }
 
         public void OnNewClient(IClientAPI client)
@@ -84,16 +82,9 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.GridUser
             if (client.SceneAgent.IsChildAgent)
                 return;
 
-            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_log.DebugFormat("[ACTIVITY DETECTOR]: Detected client logout {0} in {1}", client.AgentId, client.Scene.RegionInfo.RegionName);
             m_GridUserService.LoggedOut(
-                userId, client.SessionId, client.Scene.RegionInfo.RegionID,
+                client.AgentId.ToString(), client.SessionId, client.Scene.RegionInfo.RegionID,
                 client.SceneAgent.AbsolutePosition, client.SceneAgent.Lookat);
         }
     }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/GridUser/RemoteGridUserServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/GridUser/RemoteGridUserServiceConnector.cs
index 04acf67..badb552 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/GridUser/RemoteGridUserServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/GridUser/RemoteGridUserServiceConnector.cs
@@ -44,9 +44,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.GridUser
     {
         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;
@@ -131,60 +128,23 @@ 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)
         {
-            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;
+            return m_RemoteConnector.SetHome(userID, regionID, position, lookAt);
         }
 
         public bool SetLastPosition(string userID, UUID sessionID, UUID regionID, Vector3 position, Vector3 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;
+            return m_RemoteConnector.SetLastPosition(userID, sessionID, regionID, position, lookAt);
         }
 
         public GridUserInfo GetGridUserInfo(string 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;
+            return m_RemoteConnector.GetGridUserInfo(userID);
         }
 
         public GridUserInfo[] GetGridUserInfo(string[] userID)
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
index 8ed1833..6eb99ea 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
@@ -313,11 +313,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
 
             if (m_scenes.ContainsKey(destination.RegionID))
             {
-//                    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); });
+                Util.FireAndForget(delegate { m_scenes[destination.RegionID].IncomingCloseAgent(id); });
                 return true;
             }
             //m_log.Debug("[LOCAL COMMS]: region not found in SendCloseAgent");
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
index ade5e76..619550c 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
@@ -43,7 +43,6 @@ 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
 {
@@ -53,30 +52,7 @@ 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.
@@ -86,10 +62,9 @@ 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 string m_loadPath;
-        protected Scene m_rootScene;
+        protected Scene m_scene;
         protected Stream m_loadStream;
         protected Guid m_requestId;
         protected string m_errorMessage;
@@ -116,27 +91,16 @@ namespace OpenSim.Region.CoreModules.World.Archiver
             {
                 if (m_UserMan == null)
                 {
-                    m_UserMan = m_rootScene.RequestModuleInterface<IUserManagement>();
+                    m_UserMan = m_scene.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_rootScene = scene;
+            m_scene = scene;
 
-            m_loadPath = loadPath;
             try
             {
                 m_loadStream = new GZipStream(ArchiveHelpers.GetStream(loadPath), CompressionMode.Decompress);
@@ -156,15 +120,11 @@ 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_rootScene = scene;
-            m_loadPath = null;
+            m_scene = scene;
             m_loadStream = loadStream;
             m_merge = merge;
             m_skipAssets = skipAssets;
@@ -172,9 +132,6 @@ 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>
@@ -182,25 +139,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";
 
-            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;
+            TarArchiveReader archive = new TarArchiveReader(m_loadStream);
             byte[] data;
             TarArchiveReader.TarEntryType entryType;
-
+            
             try
             {
-                FindAndLoadControlFile(out archive, out dearchivedScenes);
-
-                while ((data = archive.ReadEntry(out fullPath, out entryType)) != null)
+                while ((data = archive.ReadEntry(out filePath, out entryType)) != null)
                 {
                     //m_log.DebugFormat(
                     //    "[ARCHIVER]: Successfully read {0} ({1} bytes)", filePath, data.Length);
@@ -208,30 +165,9 @@ 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))
                     {
-                        sceneContext.SerialisedSceneObjects.Add(Encoding.UTF8.GetString(data));
+                        serialisedSceneObjects.Add(Encoding.UTF8.GetString(data));
                     }
                     else if (filePath.StartsWith(ArchiveConstants.ASSETS_PATH) && !m_skipAssets)
                     {
@@ -245,19 +181,19 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                     }
                     else if (!m_merge && filePath.StartsWith(ArchiveConstants.TERRAINS_PATH))
                     {
-                        LoadTerrain(scene, filePath, data);
+                        LoadTerrain(filePath, data);
                     }
                     else if (!m_merge && filePath.StartsWith(ArchiveConstants.SETTINGS_PATH))
                     {
-                        LoadRegionSettings(scene, filePath, data, dearchivedScenes);
+                        LoadRegionSettings(filePath, data);
                     } 
                     else if (!m_merge && filePath.StartsWith(ArchiveConstants.LANDDATA_PATH))
                     {
-                        sceneContext.SerialisedParcels.Add(Encoding.UTF8.GetString(data));
+                        serialisedParcels.Add(Encoding.UTF8.GetString(data));
                     } 
                     else if (filePath == ArchiveConstants.CONTROL_FILE_PATH)
                     {
-                        // Ignore, because we already read the control file
+                        LoadControlFile(filePath, data);
                     }
                 }
 
@@ -265,16 +201,15 @@ namespace OpenSim.Region.CoreModules.World.Archiver
             }
             catch (Exception e)
             {
-                m_log.Error(
-                    String.Format("[ARCHIVER]: Aborting load with error in archive file {0} ", fullPath), e);
+                m_log.ErrorFormat(
+                    "[ARCHIVER]: Aborting load with error in archive file {0}.  {1}", filePath, e);
                 m_errorMessage += e.ToString();
-                m_rootScene.EventManager.TriggerOarFileLoaded(m_requestId, new List<UUID>(), m_errorMessage);
+                m_scene.EventManager.TriggerOarFileLoaded(m_requestId, m_errorMessage);
                 return;
             }
             finally
             {
-                if (archive != null)
-                    archive.Close();
+                archive.Close();
             }
 
             if (!m_skipAssets)
@@ -288,143 +223,32 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                 }
             }
 
-            foreach (DearchiveContext sceneContext in sceneContexts.Values)
+            if (!m_merge)
             {
-                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;
-                }
+                m_log.Info("[ARCHIVER]: Clearing all existing scene objects");
+                m_scene.DeleteAllSceneObjects();
             }
 
-            // 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();
-                }
-            });
+            LoadParcels(serialisedParcels);
+            LoadObjects(serialisedSceneObjects);
 
             m_log.InfoFormat("[ARCHIVER]: Successfully loaded archive");
 
-            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");
+            m_scene.EventManager.TriggerOarFileLoaded(m_requestId, m_errorMessage);
         }
         
         /// <summary>
         /// Load serialized scene objects.
         /// </summary>
-        protected void LoadObjects(Scene scene, List<string> serialisedSceneObjects, List<SceneObjectGroup> sceneObjects)
+        /// <param name="serialisedSceneObjects"></param>
+        protected void LoadObjects(List<string> serialisedSceneObjects)
         {
             // Reload serialized prims
             m_log.InfoFormat("[ARCHIVER]: Loading {0} scene objects.  Please wait.", serialisedSceneObjects.Count);
 
-            UUID oldTelehubUUID = scene.RegionInfo.RegionSettings.TelehubObject;
+            UUID oldTelehubUUID = m_scene.RegionInfo.RegionSettings.TelehubObject;
 
-            IRegionSerialiserModule serialiser = scene.RequestModuleInterface<IRegionSerialiserModule>();
+            IRegionSerialiserModule serialiser = m_scene.RequestModuleInterface<IRegionSerialiserModule>();
             int sceneObjectsLoadedCount = 0;
 
             foreach (string serialisedSceneObject in serialisedSceneObjects)
@@ -445,7 +269,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
 
                 SceneObjectGroup sceneObject = serialiser.DeserializeGroupFromXml2(serialisedSceneObject);
 
-                bool isTelehub = (sceneObject.UUID == oldTelehubUUID) && (oldTelehubUUID != UUID.Zero);
+                bool isTelehub = (sceneObject.UUID == oldTelehubUUID);
 
                 // 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
@@ -455,8 +279,8 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                 if (isTelehub)
                 {
                     // Change the Telehub Object to the new UUID
-                    scene.RegionInfo.RegionSettings.TelehubObject = sceneObject.UUID;
-                    scene.RegionInfo.RegionSettings.Save();
+                    m_scene.RegionInfo.RegionSettings.TelehubObject = sceneObject.UUID;
+                    m_scene.RegionInfo.RegionSettings.Save();
                     oldTelehubUUID = UUID.Zero;
                 }
 
@@ -466,20 +290,17 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                 {
                     if (part.CreatorData == null || part.CreatorData == string.Empty)
                     {
-                        if (!ResolveUserUuid(scene, part.CreatorID))
-                            part.CreatorID = scene.RegionInfo.EstateSettings.EstateOwner;
+                        if (!ResolveUserUuid(part.CreatorID))
+                            part.CreatorID = m_scene.RegionInfo.EstateSettings.EstateOwner;
                     }
                     if (UserManager != null)
                         UserManager.AddUser(part.CreatorID, part.CreatorData);
 
-                    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.OwnerID))
+                        part.OwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner;
 
-                    if (!ResolveGroupUuid(part.GroupID))
-                        part.GroupID = UUID.Zero;
+                    if (!ResolveUserUuid(part.LastOwnerID))
+                        part.LastOwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner;
 
                     // And zap any troublesome sit target information
 //                    part.SitTargetOrientation = new Quaternion(0, 0, 0, 1);
@@ -490,14 +311,14 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                     // being no copy/no mod for everyone
                     lock (part.TaskInventory)
                     {
-                        if (!ResolveUserUuid(scene, part.CreatorID))
-                            part.CreatorID = scene.RegionInfo.EstateSettings.EstateOwner;
+                        if (!ResolveUserUuid(part.CreatorID))
+                            part.CreatorID = m_scene.RegionInfo.EstateSettings.EstateOwner;
     
-                        if (!ResolveUserUuid(scene, part.OwnerID))
-                            part.OwnerID = scene.RegionInfo.EstateSettings.EstateOwner;
+                        if (!ResolveUserUuid(part.OwnerID))
+                            part.OwnerID = m_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;
     
                         // And zap any troublesome sit target information
                         part.SitTargetOrientation = new Quaternion(0, 0, 0, 1);
@@ -510,31 +331,26 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                         TaskInventoryDictionary inv = part.TaskInventory;
                         foreach (KeyValuePair<UUID, TaskInventoryItem> kvp in inv)
                         {
-                            if (!ResolveUserUuid(scene, kvp.Value.OwnerID))
+                            if (!ResolveUserUuid(kvp.Value.OwnerID))
                             {
-                                kvp.Value.OwnerID = scene.RegionInfo.EstateSettings.EstateOwner;
+                                kvp.Value.OwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner;
                             }
-
                             if (kvp.Value.CreatorData == null || kvp.Value.CreatorData == string.Empty)
                             {
-                                if (!ResolveUserUuid(scene, kvp.Value.CreatorID))
-                                    kvp.Value.CreatorID = scene.RegionInfo.EstateSettings.EstateOwner;
+                                if (!ResolveUserUuid(kvp.Value.CreatorID))
+                                    kvp.Value.CreatorID = m_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 (scene.AddRestoredSceneObject(sceneObject, true, false))
+                if (m_scene.AddRestoredSceneObject(sceneObject, true, false))
                 {
                     sceneObjectsLoadedCount++;
-                    sceneObject.CreateScriptInstances(0, false, scene.DefaultScriptEngine, 0);
+                    sceneObject.CreateScriptInstances(0, false, m_scene.DefaultScriptEngine, 0);
                     sceneObject.ResumeScripts();
                 }
             }
@@ -549,17 +365,16 @@ namespace OpenSim.Region.CoreModules.World.Archiver
             if (oldTelehubUUID != UUID.Zero)
             {
                 m_log.WarnFormat("Telehub object not found: {0}", oldTelehubUUID);
-                scene.RegionInfo.RegionSettings.TelehubObject = UUID.Zero;
-                scene.RegionInfo.RegionSettings.ClearSpawnPoints();
+                m_scene.RegionInfo.RegionSettings.TelehubObject = UUID.Zero;
+                m_scene.RegionInfo.RegionSettings.ClearSpawnPoints();
             }
         }
         
         /// <summary>
         /// Load serialized parcels.
         /// </summary>
-        /// <param name="scene"></param>
         /// <param name="serialisedParcels"></param>
-        protected void LoadParcels(Scene scene, List<string> serialisedParcels)
+        protected void LoadParcels(List<string> serialisedParcels)
         {
             // Reload serialized parcels
             m_log.InfoFormat("[ARCHIVER]: Loading {0} parcels.  Please wait.", serialisedParcels.Count);
@@ -567,27 +382,9 @@ 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);
@@ -598,24 +395,23 @@ namespace OpenSim.Region.CoreModules.World.Archiver
             if (!m_merge)
             {
                 bool setupDefaultParcel = (landData.Count == 0);
-                scene.LandChannel.Clear(setupDefaultParcel);
+                m_scene.LandChannel.Clear(setupDefaultParcel);
             }
             
-            scene.EventManager.TriggerIncomingLandDataFromStorage(landData);
+            m_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(Scene scene, UUID uuid)
+        private bool ResolveUserUuid(UUID uuid)
         {
             if (!m_validUserUuids.ContainsKey(uuid))
             {
-                UserAccount account = scene.UserAccountService.GetUserAccount(scene.RegionInfo.ScopeID, uuid);
+                UserAccount account = m_scene.UserAccountService.GetUserAccount(m_scene.RegionInfo.ScopeID, uuid);
                 m_validUserUuids.Add(uuid, account != null);
             }
 
@@ -623,30 +419,6 @@ 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>
@@ -670,7 +442,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
             string extension = filename.Substring(i);
             string uuid = filename.Remove(filename.Length - extension.Length);
 
-            if (m_assetService.GetMetadata(uuid) != null)
+            if (m_scene.AssetService.GetMetadata(uuid) != null)
             {
                 // m_log.DebugFormat("[ARCHIVER]: found existing asset {0}",uuid);
                 return true;
@@ -690,7 +462,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_assetService.Store(asset);
+                m_scene.AssetService.Store(asset);
 
                 /**
                  * Create layers on decode for image assets.  This is likely to significantly increase the time to load archives so
@@ -718,14 +490,12 @@ 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(Scene scene, string settingsPath, byte[] data, DearchiveScenesInfo dearchivedScenes)
+        private bool LoadRegionSettings(string settingsPath, byte[] data)
         {
             RegionSettings loadedRegionSettings;
 
@@ -741,7 +511,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                 return false;
             }
 
-            RegionSettings currentRegionSettings = scene.RegionInfo.RegionSettings;
+            RegionSettings currentRegionSettings = m_scene.RegionInfo.RegionSettings;
 
             currentRegionSettings.AgentLimit = loadedRegionSettings.AgentLimit;
             currentRegionSettings.AllowDamage = loadedRegionSettings.AllowDamage;
@@ -778,14 +548,12 @@ 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();
 
-            scene.TriggerEstateSunUpdate();
+            m_scene.TriggerEstateSunUpdate();
             
-            IEstateModule estateModule = scene.RequestModuleInterface<IEstateModule>();
+            IEstateModule estateModule = m_scene.RequestModuleInterface<IEstateModule>();
+
             if (estateModule != null)
                 estateModule.sendRegionHandshakeToAll();
 
@@ -795,15 +563,14 @@ 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(Scene scene, string terrainPath, byte[] data)
+        private bool LoadTerrain(string terrainPath, byte[] data)
         {
-            ITerrainModule terrainModule = scene.RequestModuleInterface<ITerrainModule>();
+            ITerrainModule terrainModule = m_scene.RequestModuleInterface<ITerrainModule>();
 
             MemoryStream ms = new MemoryStream(data);
             terrainModule.LoadFromStream(terrainPath, ms);
@@ -819,18 +586,17 @@ namespace OpenSim.Region.CoreModules.World.Archiver
         /// </summary>
         /// <param name="path"></param>
         /// <param name="data"></param>
-        /// <param name="dearchivedScenes"></param>
-        public DearchiveScenesInfo LoadControlFile(string path, byte[] data, DearchiveScenesInfo dearchivedScenes)
+        public void LoadControlFile(string path, byte[] data)
         {
             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);
 
-            // Loaded metadata will be empty if no information exists in the archive
-            dearchivedScenes.LoadedCreationDateTime = 0;
-            dearchivedScenes.DefaultOriginalID = "";
+            RegionSettings currentRegionSettings = m_scene.RegionInfo.RegionSettings;
 
-            bool multiRegion = false;
+            // Loaded metadata will empty if no information exists in the archive
+            currentRegionSettings.LoadedCreationDateTime = 0;
+            currentRegionSettings.LoadedCreationID = "";
 
             while (xtr.Read()) 
             {
@@ -856,44 +622,18 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                     {
                         int value;
                         if (Int32.TryParse(xtr.ReadElementContentAsString(), out value))
-                            dearchivedScenes.LoadedCreationDateTime = value;
+                            currentRegionSettings.LoadedCreationDateTime = value;
                     } 
-                    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")
+                    else if (xtr.Name.ToString() == "id") 
                     {
-                        dearchivedScenes.SetRegionDirectory(xtr.ReadElementContentAsString());
+                        currentRegionSettings.LoadedCreationID = xtr.ReadElementContentAsString();
                     }
                 }
             }
-
-            dearchivedScenes.MultiRegionFormat = multiRegion;
-            if (!multiRegion)
-            {
-                // Add the single scene
-                dearchivedScenes.StartRow();
-                dearchivedScenes.StartRegion();
-                dearchivedScenes.SetRegionOriginalID(dearchivedScenes.DefaultOriginalID);
-                dearchivedScenes.SetRegionDirectory("");
-            }
-
+            
+            currentRegionSettings.Save();
+            
             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
deleted file mode 100644
index d8dace2..0000000
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveScenesGroup.cs
+++ /dev/null
@@ -1,176 +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.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
deleted file mode 100644
index d751b1c..0000000
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequest.cs
+++ /dev/null
@@ -1,634 +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;
-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
new file mode 100644
index 0000000..0780d86
--- /dev/null
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestExecution.cs
@@ -0,0 +1,153 @@
+/*
+ * 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
new file mode 100644
index 0000000..4edaaca
--- /dev/null
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs
@@ -0,0 +1,438 @@
+/*
+ * 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 abf3713..bf3b124 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs
@@ -32,8 +32,6 @@ using System.Reflection;
 using log4net;
 using NDesk.Options;
 using Nini.Config;
-using OpenSim.Framework;
-using OpenSim.Framework.Console;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 
@@ -119,7 +117,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);
@@ -148,22 +146,17 @@ 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)
-                path = mainParams[2];
+            {
+                ArchiveRegion(mainParams[2], options);
+            }
             else
-                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);
+            {
+                ArchiveRegion(DEFAULT_OAR_BACKUP_FILENAME, options);
+            }
         }
         
         public void ArchiveRegion(string savePath, Dictionary<string, object> options)
@@ -176,7 +169,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
             m_log.InfoFormat(
                 "[ARCHIVER]: Writing archive for region {0} to {1}", Scene.RegionInfo.RegionName, savePath);
             
-            new ArchiveWriteRequest(Scene, savePath, requestId).ArchiveRegion(options);
+            new ArchiveWriteRequestPreparation(this, savePath, requestId).ArchiveRegion(options);
         }
 
         public void ArchiveRegion(Stream saveStream)
@@ -191,7 +184,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
 
         public void ArchiveRegion(Stream saveStream, Guid requestId, Dictionary<string, object> options)
         {
-            new ArchiveWriteRequest(Scene, saveStream, requestId).ArchiveRegion(options);
+            new ArchiveWriteRequestPreparation(this, 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 e2f8833..89e9593 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs
@@ -46,12 +46,6 @@ 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,
@@ -129,10 +123,6 @@ 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
deleted file mode 100644
index 3dcc020..0000000
--- a/OpenSim/Region/CoreModules/World/Archiver/DearchiveScenesGroup.cs
+++ /dev/null
@@ -1,232 +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.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 82f49b0..5deaf52 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
@@ -47,41 +47,32 @@ 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 : OpenSimTestCase
+    public class ArchiverTests
     {
         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 override void SetUp()
+        public 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();
-            m_serialiserModule = new SerialiserModule();
+            SerialiserModule serialiserModule = new SerialiserModule();
             TerrainModule terrainModule = new TerrainModule();
 
-            m_sceneHelpers = new SceneHelpers();
-            m_scene = m_sceneHelpers.SetupScene();
-            SceneHelpers.SetupSceneModules(m_scene, m_archiverModule, m_serialiserModule, terrainModule);
+            m_scene = new SceneHelpers().SetupScene();
+            SceneHelpers.SetupSceneModules(m_scene, m_archiverModule, serialiserModule, terrainModule);
         }
-
-        private void LoadCompleted(Guid requestId, List<UUID> loadedScenes, string errorMessage)
+        
+        private void LoadCompleted(Guid requestId, string errorMessage)
         {
             lock (this)
             {
@@ -137,10 +128,26 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
             TestHelpers.InMethod();
 //            log4net.Config.XmlConfigurator.Configure();
 
-            SceneObjectGroup sog1;
-            SceneObjectGroup sog2;
-            UUID ncAssetUuid;
-            CreateTestObjects(m_scene, out sog1, out sog2, out ncAssetUuid);
+            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);
 
             MemoryStream archiveWriteStream = new MemoryStream();
             m_scene.EventManager.OnOarFileSaved += SaveCompleted;
@@ -179,7 +186,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, new DearchiveScenesInfo());
+            arr.LoadControlFile(filePath, data);
             
             Assert.That(arr.ControlFileLoaded, Is.True);        
             
@@ -204,30 +211,6 @@ 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>
@@ -287,7 +270,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, new DearchiveScenesInfo());
+            arr.LoadControlFile(filePath, data);
             
             Assert.That(arr.ControlFileLoaded, Is.True);        
             
@@ -324,7 +307,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
 
             tar.WriteFile(
                 ArchiveConstants.CONTROL_FILE_PATH,
-                new ArchiveWriteRequest(m_scene, (Stream)null, Guid.Empty).CreateControlFile(new ArchiveScenesGroup()));
+                new ArchiveWriteRequestPreparation(null, (Stream)null, Guid.Empty).CreateControlFile(new Dictionary<string, Object>()));
 
             SceneObjectGroup sog1 = SceneHelpers.CreateSceneObject(1, ownerId, "obj1-", 0x11);
             SceneObjectPart sop2
@@ -379,10 +362,11 @@ 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 ArchiveWriteRequest(m_scene, (Stream)null, Guid.Empty).CreateControlFile(new ArchiveScenesGroup()));
+                new ArchiveWriteRequestPreparation(null, (Stream)null, Guid.Empty).CreateControlFile(new Dictionary<string, Object>()));
+
             SceneObjectPart part1 = CreateSceneObjectPart1();
 
             part1.SitTargetOrientation = new Quaternion(0.2f, 0.3f, 0.4f, 0.5f);
@@ -405,12 +389,31 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
             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);
+            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);
+                }
+            }
+            
             m_scene.AddNewSceneObject(object1, false);
 
             string object1FileName = string.Format(
@@ -432,34 +435,6 @@ 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");
@@ -479,6 +454,9 @@ 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>
@@ -538,8 +516,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
                 SerialiserModule serialiserModule = new SerialiserModule();
                 TerrainModule terrainModule = new TerrainModule();
 
-                m_sceneHelpers = new SceneHelpers();
-                TestScene scene2 = m_sceneHelpers.SetupScene();
+                TestScene scene2 = new 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
@@ -577,7 +554,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
             tar.WriteDir(ArchiveConstants.TERRAINS_PATH);
             tar.WriteFile(
                 ArchiveConstants.CONTROL_FILE_PATH,
-                new ArchiveWriteRequest(m_scene, (Stream)null, Guid.Empty).CreateControlFile(new ArchiveScenesGroup()));
+                new ArchiveWriteRequestPreparation(null, (Stream)null, Guid.Empty).CreateControlFile(new Dictionary<string, Object>()));
 
             RegionSettings rs = new RegionSettings();
             rs.AgentLimit = 17;
@@ -687,7 +664,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
                 SerialiserModule serialiserModule = new SerialiserModule();
                 TerrainModule terrainModule = new TerrainModule();
 
-                Scene scene = m_sceneHelpers.SetupScene();
+                Scene scene = new SceneHelpers().SetupScene();
                 SceneHelpers.SetupSceneModules(scene, archiverModule, serialiserModule, terrainModule);
 
                 m_scene.AddNewSceneObject(new SceneObjectGroup(part2), false);
@@ -723,258 +700,5 @@ 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/Estate/EstateManagementModule.cs b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
index 5fd1bce..fdef9d8 100644
--- a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
@@ -40,7 +40,6 @@ 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
 {
diff --git a/OpenSim/Region/CoreModules/World/Land/DwellModule.cs b/OpenSim/Region/CoreModules/World/Land/DwellModule.cs
deleted file mode 100644
index d1f05a7..0000000
--- a/OpenSim/Region/CoreModules/World/Land/DwellModule.cs
+++ /dev/null
@@ -1,110 +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.Diagnostics;
-using System.Reflection;
-using System.Text;
-using log4net;
-using Nini.Config;
-using OpenMetaverse;
-using OpenMetaverse.StructuredData;
-using OpenMetaverse.Messages.Linden;
-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
-{
-    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 b5e2bc3..aae6603 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
@@ -927,7 +927,6 @@ 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 d5b2adb..4f06737 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandObject.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
@@ -33,7 +33,6 @@ 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 cbb3abe..102b4d7 100644
--- a/OpenSim/Region/CoreModules/World/Land/PrimCountModule.cs
+++ b/OpenSim/Region/CoreModules/World/Land/PrimCountModule.cs
@@ -69,7 +69,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/Objects/Commands/ObjectCommandsModule.cs b/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs
index ab8f143..09f6758 100644
--- a/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs
+++ b/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs
@@ -27,12 +27,9 @@
 
 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;
@@ -43,7 +40,6 @@ 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
 {
@@ -87,85 +83,52 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
             m_console.Commands.AddCommand(
                 "Objects", false, "delete object owner",
                 "delete object owner <UUID>",
-                "Delete scene objects by owner",
-                "Command will ask for confirmation before proceeding.",
-                HandleDeleteObject);
+                "Delete a scene object by owner", HandleDeleteObject);
 
             m_console.Commands.AddCommand(
                 "Objects", false, "delete object creator",
                 "delete object creator <UUID>",
-                "Delete scene objects by creator",
-                "Command will ask for confirmation before proceeding.",
-                HandleDeleteObject);
+                "Delete a scene object by creator", HandleDeleteObject);
 
             m_console.Commands.AddCommand(
-                "Objects", false, "delete object id",
-                "delete object id <UUID-or-localID>",
-                "Delete a scene object by uuid or localID",
-                HandleDeleteObject);
+                "Objects", false, "delete object uuid",
+                "delete object uuid <UUID>",
+                "Delete a scene object by uuid", HandleDeleteObject);
 
             m_console.Commands.AddCommand(
                 "Objects", false, "delete object name",
                 "delete object name [--regex] <name>",
                 "Delete a scene object by name.",
-                "Command will ask for confirmation before proceeding.\n"
-                  + "If --regex is specified then the name is treatead as a regular expression",
+                "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",
-                "Command will ask for confirmation before proceeding.",
-                HandleDeleteObject);
+                "Delete all scene objects outside region boundaries", HandleDeleteObject);
 
             m_console.Commands.AddCommand(
                 "Objects",
                 false,
-                "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);
+                "show object uuid",
+                "show object uuid <UUID>",
+                "Show details of a scene object with the given UUID", HandleShowObjectByUuid);
 
             m_console.Commands.AddCommand(
                 "Objects",
                 false,
                 "show object name",
-                "show object name [--full] [--regex] <name>",
+                "show object name [--regex] <name>",
                 "Show details of scene objects with the given name.",
-                "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.",
+                "If --regex is specified then the name is treatead as a regular expression",
                 HandleShowObjectByName);
 
             m_console.Commands.AddCommand(
                 "Objects",
                 false,
-                "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);
+                "show part uuid",
+                "show part uuid <UUID>",
+                "Show details of a scene object parts with the given UUID", HandleShowPartByUuid);
 
             m_console.Commands.AddCommand(
                 "Objects",
@@ -173,28 +136,8 @@ 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 treated as a regular expression",
+                "If --regex is specified then the name is treatead 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)
@@ -207,75 +150,25 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
 //            m_log.DebugFormat("[OBJECTS COMMANDS MODULE]: REGION {0} LOADED", scene.RegionInfo.RegionName);
         }
 
-        /// <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)
+        private void HandleShowObjectByUuid(string module, string[] cmd)
         {
             if (!(m_console.ConsoleScene == null || m_console.ConsoleScene == m_scene))
                 return;
 
-            bool showFull = false;
-            OptionSet options = new OptionSet().Add("full", v => showFull = v != null );
-
-            List<string> mainParams = options.Parse(cmdparams);
-
-            if (mainParams.Count < 4)
+            if (cmd.Length < 4)
             {
                 m_console.OutputFormat("Usage: show object uuid <uuid>");
                 return;
             }
 
-            UUID uuid;
-            uint localId;
-            if (!ConsoleUtil.TryParseConsoleId(m_console, mainParams[3], out uuid, out localId))
+            UUID objectUuid;
+            if (!UUID.TryParse(cmd[3], out objectUuid))
+            {
+                m_console.OutputFormat("{0} is not a valid uuid", cmd[3]);
                 return;
+            }
 
-            SceneObjectGroup so;
-
-            if (localId != ConsoleUtil.LocalIdNotFound)
-                so = m_scene.GetSceneObjectGroup(localId);
-            else
-                so = m_scene.GetSceneObjectGroup(uuid);
+            SceneObjectGroup so = m_scene.GetSceneObjectGroup(objectUuid);
 
             if (so == null)
             {
@@ -284,7 +177,7 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
             }
 
             StringBuilder sb = new StringBuilder();
-            AddSceneObjectReport(sb, so, showFull);
+            AddSceneObjectReport(sb, so);
 
             m_console.OutputFormat(sb.ToString());
         }
@@ -294,91 +187,70 @@ 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();
-            options.Add("full", v => showFull = v != null );
-            options.Add("regex", v => useRegex = v != null );
+            OptionSet options = new OptionSet().Add("regex", v=> useRegex = v != null );
 
             List<string> mainParams = options.Parse(cmdparams);
 
             if (mainParams.Count < 4)
             {
-                m_console.OutputFormat("Usage: show object name [--full] [--regex] <name>");
+                m_console.OutputFormat("Usage: show object name [--regex] <name>");
                 return;
             }
 
             string name = mainParams[3];
 
-            Predicate<SceneObjectGroup> searchPredicate;
+            List<SceneObjectGroup> sceneObjects = new List<SceneObjectGroup>();
+            Action<SceneObjectGroup> searchAction;
 
             if (useRegex)
             {
                 Regex nameRegex = new Regex(name);
-                searchPredicate = so => nameRegex.IsMatch(so.Name);
+                searchAction = so => { if (nameRegex.IsMatch(so.Name)) { sceneObjects.Add(so); }};
             }
             else
             {
-                searchPredicate = so => so.Name == name;
+                searchAction = so => { if (so.Name == name) { sceneObjects.Add(so); }};
             }
 
-            OutputSogsToConsole(searchPredicate, showFull);
-        }
-
-        private void HandleShowObjectByPos(string module, string[] cmdparams)
-        {
-            if (!(m_console.ConsoleScene == null || m_console.ConsoleScene == m_scene))
-                return;
-
-            bool showFull = false;
-            OptionSet options = new OptionSet().Add("full", v => showFull = v != null );
-
-            List<string> mainParams = options.Parse(cmdparams);
+            m_scene.ForEachSOG(searchAction);
 
-            if (mainParams.Count < 5)
+            if (sceneObjects.Count == 0)
             {
-                m_console.OutputFormat("Usage: show object pos [--full] <start-coord> to <end-coord>");
+                m_console.OutputFormat("No objects with name {0} found in {1}", name, m_scene.RegionInfo.RegionName);
                 return;
             }
 
-            Vector3 startVector, endVector;
-
-            if (!TryParseVectorRange(cmdparams.Skip(3).Take(3), out startVector, out endVector))
-                return;
+            StringBuilder sb = new StringBuilder();
 
-            Predicate<SceneObjectGroup> searchPredicate
-                = so => Util.IsInsideBox(so.AbsolutePosition, startVector, endVector);
+            foreach (SceneObjectGroup so in sceneObjects)
+            {
+                AddSceneObjectReport(sb, so);
+                sb.Append("\n");
+            }
 
-            OutputSogsToConsole(searchPredicate, showFull);
+            m_console.OutputFormat(sb.ToString());
         }
 
-        private void HandleShowPartById(string module, string[] cmdparams)
+        private void HandleShowPartByUuid(string module, string[] cmd)
         {
             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 < 4)
+            if (cmd.Length < 4)
             {
-                m_console.OutputFormat("Usage: show part id [--full] <UUID-or-localID>");
+                m_console.OutputFormat("Usage: show part uuid <uuid>");
                 return;
             }
 
             UUID objectUuid;
-            uint localId;
-            if (!ConsoleUtil.TryParseConsoleId(m_console, mainParams[3], out objectUuid, out localId))
+            if (!UUID.TryParse(cmd[3], out objectUuid))
+            {
+                m_console.OutputFormat("{0} is not a valid uuid", cmd[3]);
                 return;
+            }
 
-            SceneObjectPart sop;
-            if (localId == ConsoleUtil.LocalIdNotFound)
-                sop = m_scene.GetSceneObjectPart(objectUuid);
-            else
-                sop = m_scene.GetSceneObjectPart(localId);
+            SceneObjectPart sop = m_scene.GetSceneObjectPart(objectUuid);
 
             if (sop == null)
             {
@@ -387,239 +259,84 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
             }
 
             StringBuilder sb = new StringBuilder();
-            AddScenePartReport(sb, sop, true);
+            AddScenePartReport(sb, sop);
 
             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();
-//            options.Add("full", v => showFull = v != null );
-            options.Add("regex", v => useRegex = v != null );
+            OptionSet options = new OptionSet().Add("regex", v=> useRegex = v != null );
 
             List<string> mainParams = options.Parse(cmdparams);
 
             if (mainParams.Count < 4)
             {
-                m_console.OutputFormat("Usage: show part name [--full] [--regex] <name>");
+                m_console.OutputFormat("Usage: show part name [--regex] <name>");
                 return;
             }
 
             string name = mainParams[3];
 
-            Predicate<SceneObjectPart> searchPredicate;
+            List<SceneObjectPart> parts = new List<SceneObjectPart>();
+
+            Action<SceneObjectGroup> searchAction;
 
             if (useRegex)
             {
                 Regex nameRegex = new Regex(name);
-                searchPredicate = sop => nameRegex.IsMatch(sop.Name);
+                searchAction = so => so.ForEachPart(sop => { if (nameRegex.IsMatch(sop.Name)) { parts.Add(sop); } });
             }
             else
             {
-                searchPredicate = sop => sop.Name == name;
+                searchAction = so => so.ForEachPart(sop => { if (sop.Name == name) { parts.Add(sop); } });
             }
 
-            OutputSopsToConsole(searchPredicate, true);
-        }
-
-        private void HandleDumpObjectById(string module, string[] cmdparams)
-        {
-            if (!(m_console.ConsoleScene == null || m_console.ConsoleScene == m_scene))
-                return;
+            m_scene.ForEachSOG(searchAction);
 
-            if (cmdparams.Length < 4)
+            if (parts.Count == 0)
             {
-                m_console.OutputFormat("Usage: dump object id <UUID-or-localID>");
+                m_console.OutputFormat("No parts with name {0} found in {1}", name, m_scene.RegionInfo.RegionName);
                 return;
             }
 
-            UUID objectUuid;
-            uint localId;
-            if (!ConsoleUtil.TryParseConsoleId(m_console, cmdparams[3], out objectUuid, out localId))
-                return;
-
-            SceneObjectGroup so;
-            if (localId == ConsoleUtil.LocalIdNotFound)
-                so = m_scene.GetSceneObjectGroup(objectUuid);
-            else
-                so = m_scene.GetSceneObjectGroup(localId);
+            StringBuilder sb = new StringBuilder();
 
-            if (so == null)
+            foreach (SceneObjectPart part in parts)
             {
-//                m_console.OutputFormat("No part found with uuid {0}", objectUuid);
-                return;
+                AddScenePartReport(sb, part);
+                sb.Append("\n");
             }
 
-            // 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);
+            m_console.OutputFormat(sb.ToString());
         }
 
-        /// <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)
+        private StringBuilder AddSceneObjectReport(StringBuilder sb, SceneObjectGroup so)
         {
-            if (showFull)
-            {
-                foreach (SceneObjectPart sop in so.Parts)
-                {
-                    AddScenePartReport(sb, sop, false);
-                    sb.Append("\n");
-                }
-            }
-            else
-            {
-                AddSummarySceneObjectReport(sb, so);
-            }
+            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);
 
             return sb;
         }
 
-        private StringBuilder AddSummarySceneObjectReport(StringBuilder sb, SceneObjectGroup so)
-        {
-            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());
-        }
-
-        /// <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)
+        private StringBuilder AddScenePartReport(StringBuilder sb, SceneObjectPart sop)
         {
-            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());
-            }
+            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);
 
-            return sb.Append(cdt.ToString());
+            return sb;
         }
 
         private void HandleDeleteObject(string module, string[] cmd)
@@ -681,24 +398,19 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
         
                     break;
         
-                case "id":
-                    UUID uuid;
-                    uint localId;
-                    if (!ConsoleUtil.TryParseConsoleId(m_console, o, out uuid, out localId))
+                case "uuid":
+                    if (!UUID.TryParse(o, out match))
                         return;
 
                     requireConfirmation = false;
                     deletes = new List<SceneObjectGroup>();
-
-                    SceneObjectGroup so;
-                    if (localId == ConsoleUtil.LocalIdNotFound)
-                        so = m_scene.GetSceneObjectGroup(uuid);
-                    else
-                        so = m_scene.GetSceneObjectGroup(localId);
-
-                    if (!so.IsAttachment)
-                       deletes.Add(so);
-
+        
+                    m_scene.ForEachSOG(delegate (SceneObjectGroup g)
+                    {
+                        if (g.UUID == match && !g.IsAttachment)
+                            deletes.Add(g);
+                    });
+        
         //                if (deletes.Count == 0)
         //                    m_console.OutputFormat("No objects were found with uuid {0}", match);
         
@@ -738,10 +450,6 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
         
                     break;
 
-                case "pos":
-                    deletes = GetDeleteCandidatesByPos(module, cmd);
-                    break;
-
                 default:
                     m_console.OutputFormat("Unrecognized mode {0}", mode);
                     return;
@@ -756,7 +464,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),
-                    "y/N");
+                    "n");
     
                 if (response.ToLower() != "y")
                 {
@@ -778,6 +486,9 @@ 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 );
 
@@ -811,52 +522,5 @@ 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/Sound/SoundModule.cs b/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs
index 513a8f5..14c1a39 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,110 +24,56 @@
  * (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 System;
 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
 {
-    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "SoundModule")]
-    public class SoundModule : INonSharedRegionModule, ISoundModule
+    public class SoundModule : IRegionModule, ISoundModule
     {
-        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)
+//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        
+        protected Scene m_scene;
+        
+        public void Initialise(Scene scene, IConfigSource source)
         {
-            m_scene.EventManager.OnClientLogin -= OnNewClient;
-        }
-
-        public void RegionLoaded(Scene scene)
-        {
-            if (!Enabled)
-                return;
-
             m_scene = scene;
-            m_scene.EventManager.OnClientLogin += OnNewClient;
-
+            
+            m_scene.EventManager.OnNewClient += OnNewClient;
+            
             m_scene.RegisterModuleInterface<ISoundModule>(this);
         }
-
-        public void Close() { }
-
-        public Type ReplaceableInterface
-        {
-            get { return typeof(ISoundModule); }
-        }
-
+        
+        public void PostInitialise() {}
+        public void Close() {}
         public string Name { get { return "Sound Module"; } }
-
-        #endregion
-
-        #region Event Handlers
-
+        public bool IsSharedModule { get { return false; } }
+        
         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;
-            if (!m_scene.TryGetSceneObjectPart(objectID, out part))
+            SceneObjectPart part = m_scene.GetSceneObjectPart(objectID);
+            if (part == null)
                 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 > MaxDistance) // Max audio distance
+                if (dis > 100.0) // Max audio distance
                     return;
 
                 if (grp.IsAttachment)
@@ -140,21 +86,23 @@ namespace OpenSim.Region.CoreModules.World.Sound
                 }
 
                 // Scale by distance
-                double thisSpGain = gain * ((radius - dis) / radius);
+                if (radius == 0)
+                    gain = (float)((double)gain * ((100.0 - dis) / 100.0));
+                else
+                    gain = (float)((double)gain * ((radius - dis) / radius));
 
-                sp.ControllingClient.SendPlayAttachedSound(soundID, objectID,
-                        ownerID, (float)thisSpGain, flags);
+                sp.ControllingClient.SendPlayAttachedSound(soundID, objectID, ownerID, (float)gain, flags);
             });
         }
-
+        
         public virtual void TriggerSound(
             UUID soundId, UUID ownerID, UUID objectID, UUID parentID, double gain, Vector3 position, UInt64 handle, float radius)
         {
-            SceneObjectPart part;
-            if (!m_scene.TryGetSceneObjectPart(objectID, out part))
+            SceneObjectPart part = m_scene.GetSceneObjectPart(objectID);
+            if (part == null)
             {
                 ScenePresence sp;
-                if (!m_scene.TryGetScenePresence(ownerID, out sp))
+                if (!m_scene.TryGetScenePresence(objectID, out sp))
                     return;
             }
             else
@@ -168,207 +116,24 @@ 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 > MaxDistance) // Max audio distance
+                if (dis > 100.0) // Max audio distance
                     return;
 
-                // Scale by distance
-                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
-                {
-                    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);
-            }
-        }
-
-        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;
+                float thisSpGain;
 
                 // Scale by distance
-                double thisSpGain = volume * ((MaxDistance - dis) / MaxDistance);
+                if (radius == 0)
+                    thisSpGain = (float)((double)gain * ((100.0 - dis) / 100.0));
+                else
+                    thisSpGain = (float)((double)gain * ((radius - dis) / radius));
 
-                sp.ControllingClient.SendTriggeredSound(sound, part.OwnerID,
-                        part.UUID, part.ParentGroup.UUID,
-                        m_scene.RegionInfo.RegionHandle,
-                        part.AbsolutePosition, (float)thisSpGain);
+                sp.ControllingClient.SendTriggeredSound(
+                    soundId, ownerID, objectID, parentID, handle, position, thisSpGain);
             });
         }
-
-        #endregion
     }
 }
diff --git a/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
index d99567c..402b9fb 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
@@ -414,7 +414,6 @@ 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
@@ -428,39 +427,34 @@ namespace OpenSim.Region.CoreModules.World.Terrain
                 try
                 {
                     Assembly library = Assembly.LoadFrom(file);
-                    LoadPlugins(library);
-                }
-                catch (BadImageFormatException)
-                {
-                }
-            }
-        }
-
-        private void LoadPlugins(Assembly library)
-        {
-            foreach (Type pluginType in library.GetTypes())
-            {
-                try
-                {
-                    if (pluginType.IsAbstract || pluginType.IsNotPublic)
-                        continue;
+                    foreach (Type pluginType in library.GetTypes())
+                    {
+                        try
+                        {
+                            if (pluginType.IsAbstract || pluginType.IsNotPublic)
+                                continue;
 
-                    string typeName = pluginType.Name;
+                            string typeName = pluginType.Name;
 
-                    if (pluginType.GetInterface("ITerrainEffect", false) != null)
-                    {
-                        ITerrainEffect terEffect = (ITerrainEffect)Activator.CreateInstance(library.GetType(pluginType.ToString()));
+                            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);
+                                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)
+                        {
+                        }
                     }
                 }
-                catch (AmbiguousMatchException)
+                catch (BadImageFormatException)
                 {
                 }
             }
@@ -1184,8 +1178,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain
 
         private void InterfaceRunPluginEffect(Object[] args)
         {
-            string firstArg = (string)args[0];
-            if (firstArg == "list")
+            if ((string) args[0] == "list")
             {
                 m_log.Info("List of loaded plugins");
                 foreach (KeyValuePair<string, ITerrainEffect> kvp in m_plugineffects)
@@ -1194,14 +1187,14 @@ namespace OpenSim.Region.CoreModules.World.Terrain
                 }
                 return;
             }
-            if (firstArg == "reload")
+            if ((string) args[0] == "reload")
             {
                 LoadPlugins();
                 return;
             }
-            if (m_plugineffects.ContainsKey(firstArg))
+            if (m_plugineffects.ContainsKey((string) args[0]))
             {
-                m_plugineffects[firstArg].RunEffect(m_channel);
+                m_plugineffects[(string) args[0]].RunEffect(m_channel);
                 CheckForTerrainUpdates();
             }
             else
diff --git a/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs b/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs
index 33f6c3f..3c48d07 100644
--- a/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs
+++ b/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs
@@ -222,13 +222,6 @@ 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/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs b/OpenSim/Region/OptionalModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs
index dc54c3f..c5c96a9 100644
--- a/OpenSim/Region/CoreModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs
@@ -130,25 +130,13 @@ namespace OpenSim.Region.OptionalModules.Scripting.ScriptModuleComms
             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);
+            MethodInfo mi = target.GetType().GetMethod(meth,
+                    BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance);
             if (mi == null)
             {
-                m_log.WarnFormat("[MODULE COMMANDS] Failed to register method {0}", meth);
+                m_log.WarnFormat("[MODULE COMMANDS] Failed to register method {0}",meth);
                 return;
             }
 
@@ -163,71 +151,38 @@ namespace OpenSim.Region.OptionalModules.Scripting.ScriptModuleComms
 
         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);
+            m_log.DebugFormat("[MODULE COMMANDS] Register method {0} from type {1}", mi.Name, target.GetType().Name);
 
             Type delegateType;
-            List<Type> typeArgs = mi.GetParameters()
+            var typeArgs = mi.GetParameters()
                     .Select(p => p.ParameterType)
                     .ToList();
 
             if (mi.ReturnType == typeof(void))
             {
-                delegateType = Expression.GetActionType(typeArgs.ToArray());
+                    delegateType = Expression.GetActionType(typeArgs.ToArray());
             }
             else
             {
-                typeArgs.Add(mi.ReturnType);
-                delegateType = Expression.GetFuncType(typeArgs.ToArray());
+                    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);
+            Delegate fcall = Delegate.CreateDelegate(delegateType, target, mi);
 
             lock (m_scriptInvocation)
             {
-                ParameterInfo[] parameters = fcall.Method.GetParameters();
+                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++)
+                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()
         {
@@ -330,20 +285,6 @@ namespace OpenSim.Region.OptionalModules.Scripting.ScriptModuleComms
             }
         }
 
-        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>