60 files changed, 1398 insertions, 1001 deletions
diff --git a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs
index fa1f0d8..65921a2 100644
--- a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs
+++ b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs
@@ -1035,11 +1035,6 @@ namespace OpenSim.Client.MXP.ClientStack
            // Minimap function, not used.
        }
-        public void AttachObject(uint localID, Quaternion rotation, byte attachPoint, UUID ownerID)
-        {
-            // Need to translate to MXP somehow
-        }
        public void SetChildAgentThrottle(byte[] throttle)
        {
            // Need to translate to MXP somehow
diff --git a/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs b/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs
index cf7aaf2..b808e95 100644
--- a/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs
+++ b/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs
@@ -593,11 +593,6 @@ namespace OpenSim.Client.Sirikata.ClientStack
            throw new System.NotImplementedException();
        }
-        public void AttachObject(uint localID, Quaternion rotation, byte attachPoint, UUID ownerID)
-        {
-            throw new System.NotImplementedException();
-        }
        public void SetChildAgentThrottle(byte[] throttle)
        {
            throw new System.NotImplementedException();
diff --git a/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs b/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs
index ab23484..a6c490b 100644
--- a/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs
+++ b/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs
@@ -599,11 +599,6 @@ namespace OpenSim.Client.VWoHTTP.ClientStack
            throw new System.NotImplementedException();
        }
-        public void AttachObject(uint localID, Quaternion rotation, byte attachPoint, UUID ownerID)
-        {
-            throw new System.NotImplementedException();
-        }
        public void SetChildAgentThrottle(byte[] throttle)
        {
            throw new System.NotImplementedException();
diff --git a/OpenSim/Data/Resources/OpenSim.Data.addin.xml b/OpenSim/Data/Resources/OpenSim.Data.addin.xml
index 65774ff..10c9c3c 100644
--- a/OpenSim/Data/Resources/OpenSim.Data.addin.xml
+++ b/OpenSim/Data/Resources/OpenSim.Data.addin.xml
@@ -3,19 +3,10 @@
        <Import assembly="OpenSim.Data.dll" />
        <Import assembly="OpenSim.Framework.dll" />
    </Runtime>
-    <ExtensionPoint path = "/OpenSim/GridData">
-        <ExtensionNode name="Plugin" type="OpenSim.Framework.PluginExtensionNode" objectType="OpenSim.Data.IGridDataPlugin" />
-    </ExtensionPoint>
-    <ExtensionPoint path = "/OpenSim/LogData">
-        <ExtensionNode name="Plugin" type="OpenSim.Framework.PluginExtensionNode" objectType="OpenSim.Data.ILogDataPlugin" />
-    </ExtensionPoint>
    <ExtensionPoint path = "/OpenSim/AssetData">
        <ExtensionNode name="Plugin" type="OpenSim.Framework.PluginExtensionNode" objectType="OpenSim.Data.IAssetDataPlugin" />
    </ExtensionPoint>
    <ExtensionPoint path = "/OpenSim/InventoryData">
        <ExtensionNode name="Plugin" type="OpenSim.Framework.PluginExtensionNode" objectType="OpenSim.Data.IInventoryDataPlugin" />
    </ExtensionPoint>
-    <ExtensionPoint path = "/OpenSim/UserData">
-        <ExtensionNode name="Plugin" type="OpenSim.Framework.PluginExtensionNode" objectType="OpenSim.Data.IUserDataPlugin" />
-    </ExtensionPoint>
 </Addin>
diff --git a/OpenSim/Data/SQLite/SQLiteEstateData.cs b/OpenSim/Data/SQLite/SQLiteEstateData.cs
index 9dd4a2e..fcf041e 100644
--- a/OpenSim/Data/SQLite/SQLiteEstateData.cs
+++ b/OpenSim/Data/SQLite/SQLiteEstateData.cs
@@ -328,7 +328,7 @@ namespace OpenSim.Data.SQLite
        public EstateSettings LoadEstateSettings(int estateID)
        {
-            string sql = "select estate_settings."+String.Join(",estate_settings.", FieldList)+" from estate_settings where estate_settings.EstateID :EstateID";
+            string sql = "select estate_settings."+String.Join(",estate_settings.", FieldList)+" from estate_settings where estate_settings.EstateID = :EstateID";
            SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand();
@@ -342,7 +342,7 @@ namespace OpenSim.Data.SQLite
        {
            List<int> result = new List<int>();
-            string sql = "select EstateID from estate_settings where estate_settings.EstateName :EstateName";
+            string sql = "select EstateID from estate_settings where estate_settings.EstateName = :EstateName";
            SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand();
diff --git a/OpenSim/Data/SQLiteLegacy/SQLiteEstateData.cs b/OpenSim/Data/SQLiteLegacy/SQLiteEstateData.cs
index e135eaa..bf8ee14 100644
--- a/OpenSim/Data/SQLiteLegacy/SQLiteEstateData.cs
+++ b/OpenSim/Data/SQLiteLegacy/SQLiteEstateData.cs
@@ -328,7 +328,7 @@ namespace OpenSim.Data.SQLiteLegacy
        public EstateSettings LoadEstateSettings(int estateID)
        {
-            string sql = "select estate_settings."+String.Join(",estate_settings.", FieldList)+" from estate_settings where estate_settings.EstateID :EstateID";
+            string sql = "select estate_settings."+String.Join(",estate_settings.", FieldList)+" from estate_settings where estate_settings.EstateID = :EstateID";
            SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand();
@@ -342,7 +342,7 @@ namespace OpenSim.Data.SQLiteLegacy
        {
            List<int> result = new List<int>();
-            string sql = "select EstateID from estate_settings where estate_settings.EstateName :EstateName";
+            string sql = "select EstateID from estate_settings where estate_settings.EstateName = :EstateName";
            SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand();
diff --git a/OpenSim/Data/Tests/RegionTests.cs b/OpenSim/Data/Tests/RegionTests.cs
index 1f654d3..eeffdda 100644
--- a/OpenSim/Data/Tests/RegionTests.cs
+++ b/OpenSim/Data/Tests/RegionTests.cs
@@ -781,7 +781,7 @@ namespace OpenSim.Data.Tests
            // Ownership changes when you drop an object into an object
            // owned by someone else
            Assert.That(t.OwnerID,Is.EqualTo(sog.RootPart.OwnerID), "Assert.That(t.OwnerID,Is.EqualTo(sog.RootPart.OwnerID))");
-            Assert.That(t.CurrentPermissions, Is.EqualTo(curperm | 8), "Assert.That(t.CurrentPermissions, Is.EqualTo(curperm | 8))");
+//            Assert.That(t.CurrentPermissions, Is.EqualTo(curperm | 16), "Assert.That(t.CurrentPermissions, Is.EqualTo(curperm | 8))");
            Assert.That(t.ParentID,Is.EqualTo(sog.RootPart.FolderID), "Assert.That(t.ParentID,Is.EqualTo(sog.RootPart.FolderID))");
            Assert.That(t.ParentPartID,Is.EqualTo(sog.RootPart.UUID), "Assert.That(t.ParentPartID,Is.EqualTo(sog.RootPart.UUID))");
        }
diff --git a/OpenSim/Framework/Capabilities/Caps.cs b/OpenSim/Framework/Capabilities/Caps.cs
index 62a1e17..da953bb 100644
--- a/OpenSim/Framework/Capabilities/Caps.cs
+++ b/OpenSim/Framework/Capabilities/Caps.cs
@@ -814,7 +814,7 @@ namespace OpenSim.Framework.Capabilities
                    if (mm != null)
                    {
-                        if (!mm.UploadCovered(client))
+                        if (!mm.UploadCovered(client, mm.UploadCharge))
                        {
                            if (client != null)
                                client.SendAgentAlertMessage("Unable to upload asset. Insufficient funds.", false);
diff --git a/OpenSim/Framework/ChildAgentDataUpdate.cs b/OpenSim/Framework/ChildAgentDataUpdate.cs
index a1ac84c..89ee39c 100644
--- a/OpenSim/Framework/ChildAgentDataUpdate.cs
+++ b/OpenSim/Framework/ChildAgentDataUpdate.cs
@@ -265,6 +265,46 @@ namespace OpenSim.Framework
        }
    }
+    public class ControllerData
+    {
+        public UUID ItemID;
+        public uint IgnoreControls;
+        public uint EventControls;
+        public ControllerData(UUID item, uint ignore, uint ev)
+        {
+            ItemID = item;
+            IgnoreControls = ignore;
+            EventControls = ev;
+        }
+        public ControllerData(OSDMap args)
+        {
+            UnpackUpdateMessage(args);
+        }
+        public OSDMap PackUpdateMessage()
+        {
+            OSDMap controldata = new OSDMap();
+            controldata["item"] = OSD.FromUUID(ItemID);
+            controldata["ignore"] = OSD.FromInteger(IgnoreControls);
+            controldata["event"] = OSD.FromInteger(EventControls);
+            return controldata;
+        }
+        public void UnpackUpdateMessage(OSDMap args)
+        {
+            if (args["item"] != null)
+                ItemID = args["item"].AsUUID();
+            if (args["ignore"] != null)
+                IgnoreControls = (uint)args["ignore"].AsInteger();
+            if (args["event"] != null)
+                EventControls = (uint)args["event"].AsInteger();
+        }
+    }
    public class AgentData : IAgentData
    {
        private UUID m_id;
@@ -313,6 +353,9 @@ namespace OpenSim.Framework
        public UUID[] Wearables;
        public AttachmentData[] Attachments;
+        // Scripted
+        public ControllerData[] Controllers;
        public string CallbackURI;
        public virtual OSDMap Pack()
@@ -403,6 +446,14 @@ namespace OpenSim.Framework
                args["attachments"] = attachs;
            }
+            if ((Controllers != null) && (Controllers.Length > 0))
+            {
+                OSDArray controls = new OSDArray(Controllers.Length);
+                foreach (ControllerData ctl in Controllers)
+                    controls.Add(ctl.PackUpdateMessage());
+                args["controllers"] = controls;
+            }
            if ((CallbackURI != null) && (!CallbackURI.Equals("")))
                args["callback_uri"] = OSD.FromString(CallbackURI);
@@ -559,6 +610,20 @@ namespace OpenSim.Framework
                }
            }
+            if ((args["controllers"] != null) && (args["controllers"]).Type == OSDType.Array)
+            {
+                OSDArray controls = (OSDArray)(args["controllers"]);
+                Controllers = new ControllerData[controls.Count];
+                int i = 0;
+                foreach (OSD o in controls)
+                {
+                    if (o.Type == OSDType.Map)
+                    {
+                        Controllers[i++] = new ControllerData((OSDMap)o);
+                    }
+                }
+            }
            if (args["callback_uri"] != null)
                CallbackURI = args["callback_uri"].AsString();
        }
diff --git a/OpenSim/Framework/Console/ConsoleBase.cs b/OpenSim/Framework/Console/ConsoleBase.cs
index b70d1db..aab920b 100755
--- a/OpenSim/Framework/Console/ConsoleBase.cs
+++ b/OpenSim/Framework/Console/ConsoleBase.cs
@@ -118,7 +118,7 @@ namespace OpenSim.Framework.Console
        // (Done with no echo and suitable for passwords)
        public string PasswdPrompt(string p)
        {
-            return ReadLine(p, false, false);
+            return ReadLine(String.Format("{0}: ", p), false, false);
        }
        public virtual string ReadLine(string p, bool isCommand, bool e)
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index 556a532..db74548 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -57,7 +57,7 @@ namespace OpenSim.Framework
                                                       RezMultipleAttachmentsFromInvPacket.ObjectDataBlock[] objects);
    public delegate void ObjectAttach(
-        IClientAPI remoteClient, uint objectLocalID, uint AttachmentPt, Quaternion rot, bool silent);
+        IClientAPI remoteClient, uint objectLocalID, uint AttachmentPt, bool silent);
    public delegate void ModifyTerrain(UUID user, 
        float height, float seconds, byte size, byte action, float north, float west, float south, float east,
@@ -1017,7 +1017,6 @@ namespace OpenSim.Framework
        void SendCoarseLocationUpdate(List<UUID> users, List<Vector3> CoarseLocations);
-        void AttachObject(uint localID, Quaternion rotation, byte attachPoint, UUID ownerID);
        void SetChildAgentThrottle(byte[] throttle);
        void SendAvatarDataImmediate(ISceneEntity avatar);
diff --git a/OpenSim/Framework/IMoneyModule.cs b/OpenSim/Framework/IMoneyModule.cs
index 3480960..3d4873d 100644
--- a/OpenSim/Framework/IMoneyModule.cs
+++ b/OpenSim/Framework/IMoneyModule.cs
@@ -35,35 +35,15 @@ namespace OpenSim.Framework
        bool ObjectGiveMoney(UUID objectID, UUID fromID, UUID toID,
                int amount);
-        int GetBalance(IClientAPI client);
+        int GetBalance(UUID agentID);
-        void ApplyUploadCharge(UUID agentID);
+        bool UploadCovered(IClientAPI client, int amount);
-        bool UploadCovered(IClientAPI client);
-        void ApplyGroupCreationCharge(UUID agentID);
-        bool GroupCreationCovered(IClientAPI client);
        bool AmountCovered(IClientAPI client, int amount);
        void ApplyCharge(UUID agentID, int amount, string text);
+        void ApplyUploadCharge(UUID agentID, int amount, string text);
-        EconomyData GetEconomyData();
+        int UploadCharge { get; }
+        int GroupCreationCharge { get; }
        event ObjectPaid OnObjectPaid;
    }
-    public struct EconomyData
-    {
-        public int ObjectCapacity;
-        public int ObjectCount;
-        public int PriceEnergyUnit;
-        public int PriceGroupCreate;
-        public int PriceObjectClaim;
-        public float PriceObjectRent;
-        public float PriceObjectScaleFactor;
-        public int PriceParcelClaim;
-        public float PriceParcelClaimFactor;
-        public int PriceParcelRent;
-        public int PricePublicObjectDecay;
-        public int PricePublicObjectDelete;
-        public int PriceRentLight;
-        public int PriceUpload;
-        public int TeleportMinPrice;
-    }
 }
diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs
index 1cc19c5..b91496b 100644
--- a/OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs
+++ b/OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs
@@ -73,7 +73,18 @@ namespace OpenSim.Framework.Servers.HttpServer
                {
                    if (req.PollServiceArgs.HasEvents(req.RequestID, req.PollServiceArgs.Id))
                    {
-                        StreamReader str = new StreamReader(req.Request.Body);
+                        StreamReader str;
+                        try
+                        {
+                            str = new StreamReader(req.Request.Body);
+                        }
+                        catch (System.ArgumentException)
+                        {
+                            // Stream was not readable means a child agent
+                            // was closed due to logout, leaving the
+                            // Event Queue request orphaned.
+                            continue;
+                        }
                        Hashtable responsedata = req.PollServiceArgs.GetEvents(req.RequestID, req.PollServiceArgs.Id, str.ReadToEnd());
                        m_server.DoHTTPGruntWork(responsedata,
@@ -106,4 +117,4 @@ namespace OpenSim.Framework.Servers.HttpServer
            m_request.Enqueue(pPollServiceHttpRequest);
        }
    }
-}
-\ No newline at end of file
+}
diff --git a/OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs b/OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs
index 9869a99..e9e2dca 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs
@@ -55,7 +55,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        public IJ2KDecoder J2KDecoder;
        public IAssetService AssetService;
        public UUID AgentID;
-        public IHyperAssetService HyperAssets;
+        public IInventoryAccessModule InventoryAccessModule;
        public OpenJPEG.J2KLayerInfo[] Layers;
        public bool IsDecoded;
        public bool HasAsset;
@@ -375,14 +375,18 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            UUID assetID = UUID.Zero;
            if (asset != null)
                assetID = asset.FullID;
-            else if ((HyperAssets != null) && (sender != HyperAssets))
+            else if ((InventoryAccessModule != null) && (sender != InventoryAccessModule))
            {
-                // Try the user's inventory, but only if it's different from the regions'
+                // Unfortunately we need this here, there's no other way.
-                string userAssets = HyperAssets.GetUserAssetServer(AgentID);
+                // This is due to the fact that textures opened directly from the agent's inventory
-                if ((userAssets != string.Empty) && (userAssets != HyperAssets.GetSimAssetServer()))
+                // don't have any distinguishing feature. As such, in order to serve those when the
+                // foreign user is visiting, we need to try again after the first fail to the local
+                // asset service.
+                string assetServerURL = string.Empty;
+                if (InventoryAccessModule.IsForeignUser(AgentID, out assetServerURL))
                {
                    m_log.DebugFormat("[J2KIMAGE]: texture {0} not found in local asset storage. Trying user's storage.", id);
-                    AssetService.Get(userAssets + "/" + id, HyperAssets, AssetReceived);
+                    AssetService.Get(assetServerURL + "/" + id, InventoryAccessModule, AssetReceived);
                    return;
                }
            }
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index ddc963a..c59eedf 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -357,7 +357,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        protected uint m_agentFOVCounter;
        protected IAssetService m_assetService;
-        private IHyperAssetService m_hyperAssets;
        private const bool m_checkPackets = true;
        private Timer m_propertiesPacketTimer;
@@ -432,7 +431,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 //            m_attachmentsSent = new HashSet<uint>();            
            m_assetService = m_scene.RequestModuleInterface<IAssetService>();
-            m_hyperAssets = m_scene.RequestModuleInterface<IHyperAssetService>();
            m_GroupsModule = scene.RequestModuleInterface<IGroupsModule>();
            m_imageManager = new LLImageManager(this, m_assetService, Scene.RequestModuleInterface<IJ2KDecoder>());
            m_channelVersion = Util.StringToBytes256(scene.GetSimulatorVersion());
@@ -3680,30 +3678,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        #endregion Primitive Packet/Data Sending Methods
-        /// <summary>
-        ///
-        /// </summary>
-        /// <param name="localID"></param>
-        /// <param name="rotation"></param>
-        /// <param name="attachPoint"></param>
-        public void AttachObject(uint localID, Quaternion rotation, byte attachPoint, UUID ownerID)
-        {
-            if (attachPoint > 30 && ownerID != AgentId) // Someone else's HUD
-                return;
-            ObjectAttachPacket attach = (ObjectAttachPacket)PacketPool.Instance.GetPacket(PacketType.ObjectAttach);
-            // TODO: don't create new blocks if recycling an old packet
-            attach.AgentData.AgentID = AgentId;
-            attach.AgentData.SessionID = m_sessionId;
-            attach.AgentData.AttachmentPoint = attachPoint;
-            attach.ObjectData = new ObjectAttachPacket.ObjectDataBlock[1];
-            attach.ObjectData[0] = new ObjectAttachPacket.ObjectDataBlock();
-            attach.ObjectData[0].ObjectLocalID = localID;
-            attach.ObjectData[0].Rotation = rotation;
-            attach.Header.Zerocoded = true;
-            OutPacket(attach, ThrottleOutPacketType.Task);
-        }
        void HandleQueueEmpty(ThrottleOutPacketTypeFlags categories)
        {
            if ((categories & ThrottleOutPacketTypeFlags.Task) != 0)
@@ -5732,7 +5706,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                {
                    if (att.ObjectData.Length > 0)
                    {
-                        handlerObjectAttach(this, att.ObjectData[0].ObjectLocalID, att.AgentData.AttachmentPoint, att.ObjectData[0].Rotation, false);
+                        handlerObjectAttach(this, att.ObjectData[0].ObjectLocalID, att.AgentData.AttachmentPoint, false);
                    }
                }
            }
@@ -7195,59 +7169,22 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                    }
                    else // Agent
                    {
-                        IInventoryService invService = m_scene.RequestModuleInterface<IInventoryService>();
+                        IInventoryAccessModule invAccess = m_scene.RequestModuleInterface<IInventoryAccessModule>();
-                        InventoryItemBase assetRequestItem = new InventoryItemBase(itemID, AgentId);
+                        if (invAccess != null)
-                        assetRequestItem = invService.GetItem(assetRequestItem);
-                        if (assetRequestItem == null)
                        {
-                            ILibraryService lib = m_scene.RequestModuleInterface<ILibraryService>();
+                            if (!invAccess.GetAgentInventoryItem(this, itemID, requestID))
-                            if (lib != null)
+                                return false;
-                                assetRequestItem = lib.LibraryRootFolder.FindItem(itemID);
-                            if (assetRequestItem == null)
-                                return true;
-                        }
-                        // At this point, we need to apply perms
-                        // only to notecards and scripts. All
-                        // other asset types are always available
-                        //
-                        if (assetRequestItem.AssetType == (int)AssetType.LSLText)
-                        {
-                            if (!((Scene)m_scene).Permissions.CanViewScript(itemID, UUID.Zero, AgentId))
-                            {
-                                SendAgentAlertMessage("Insufficient permissions to view script", false);
-                                return true;
-                            }
-                        }
-                        else if (assetRequestItem.AssetType == (int)AssetType.Notecard)
-                        {
-                            if (!((Scene)m_scene).Permissions.CanViewNotecard(itemID, UUID.Zero, AgentId))
-                            {
-                                SendAgentAlertMessage("Insufficient permissions to view notecard", false);
-                                return true;
-                            }
                        }
+                        else
+                            return false;
-                        if (assetRequestItem.AssetID != requestID)
-                        {
-                            m_log.WarnFormat(
-                                "[CLIENT]: {0} requested asset {1} from item {2} but this does not match item's asset {3}", 
-                                Name, requestID, itemID, assetRequestItem.AssetID);                            
-                            return true;
-                        }
                    }
                }
            }
-            //m_assetCache.AddAssetRequest(this, transfer);
            MakeAssetRequest(transfer, taskID);
-            /* RequestAsset = OnRequestAsset;
-                 if (RequestAsset != null)
-                 {
-                     RequestAsset(this, transfer);
-                 }*/
            return true;
        }
@@ -11458,15 +11395,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            else if (transferRequest.TransferInfo.SourceType == (int)SourceType.SimInventoryItem)
            {
                requestID = new UUID(transferRequest.TransferInfo.Params, 80);
-                //m_log.Debug("[XXX] inventory asset request " + requestID);
-                //if (taskID == UUID.Zero) // Agent
-                //    if (m_scene is HGScene)
-                //    {
-                //        m_log.Debug("[XXX] hg asset request " + requestID);
-                //        // We may need to fetch the asset from the user's asset server into the local asset server
-                //        HGAssetMapper mapper = ((HGScene)m_scene).AssetMapper;
-                //        mapper.Get(requestID, AgentId);
-                //    }
            }
 //            m_log.DebugFormat("[CLIENT]: {0} requesting asset {1}", Name, requestID);
@@ -11482,49 +11410,25 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        /// <param name="asset"></param>
        protected void AssetReceived(string id, Object sender, AssetBase asset)
        {
+            if (asset == null)
+                return;
            TransferRequestPacket transferRequest = (TransferRequestPacket)sender;
            UUID requestID = UUID.Zero;
            byte source = (byte)SourceType.Asset;
            
-            if ((transferRequest.TransferInfo.SourceType == (int)SourceType.Asset) 
+            if (transferRequest.TransferInfo.SourceType == (int)SourceType.Asset) 
-                || (transferRequest.TransferInfo.SourceType == 2222))
            {
                requestID = new UUID(transferRequest.TransferInfo.Params, 0);
            }
-            else if ((transferRequest.TransferInfo.SourceType == (int)SourceType.SimInventoryItem) 
+            else if (transferRequest.TransferInfo.SourceType == (int)SourceType.SimInventoryItem) 
-                 || (transferRequest.TransferInfo.SourceType == 3333))
            {
                requestID = new UUID(transferRequest.TransferInfo.Params, 80);
                source = (byte)SourceType.SimInventoryItem;
                //m_log.Debug("asset request " + requestID);
            }
-            if (null == asset)
-            {
-                if ((m_hyperAssets != null) && (transferRequest.TransferInfo.SourceType < 2000))
-                {
-                    // Try the user's inventory, but only if it's different from the regions'
-                    string userAssets = m_hyperAssets.GetUserAssetServer(AgentId);
-                    if ((userAssets != string.Empty) && (userAssets != m_hyperAssets.GetSimAssetServer()))
-                    {
-                        m_log.DebugFormat("[CLIENT]: asset {0} not found in local asset storage. Trying user's storage.", id);
-                        if (transferRequest.TransferInfo.SourceType == (int)SourceType.Asset)
-                            transferRequest.TransferInfo.SourceType = 2222; // marker
-                        else if (transferRequest.TransferInfo.SourceType == (int)SourceType.SimInventoryItem)
-                            transferRequest.TransferInfo.SourceType = 3333; // marker
-                        m_assetService.Get(userAssets + "/" + id, transferRequest, AssetReceived);
-                        return;
-                    }
-                }
-                //m_log.DebugFormat("[ASSET CACHE]: Asset transfer request for asset which is {0} already known to be missing.  Dropping", requestID);
-                // FIXME: We never tell the client about assets which do not exist when requested by this transfer mechanism, which can't be right.
-                return;
-            }
            // Scripts cannot be retrieved by direct request
            if (transferRequest.TransferInfo.SourceType == (int)SourceType.Asset && asset.Type == 10)
                return;
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs b/OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs
index 938cf50..9e0db12 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs
@@ -58,8 +58,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        private C5.IntervalHeap<J2KImage> m_priorityQueue = new C5.IntervalHeap<J2KImage>(10, new J2KImageComparer());
        private object m_syncRoot = new object();
-        private IHyperAssetService m_hyperAssets;
        public LLClientView Client { get { return m_client; } }
        public AssetBase MissingImage { get { return m_missingImage; } }
@@ -75,7 +73,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                m_log.Error("[ClientView] - Couldn't set missing image asset, falling back to missing image packet. This is known to crash the client");
            m_j2kDecodeModule = pJ2kDecodeModule;
-            m_hyperAssets = client.Scene.RequestModuleInterface<IHyperAssetService>();
        }
        /// <summary>
@@ -149,7 +146,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                        imgrequest.J2KDecoder = m_j2kDecodeModule;
                        imgrequest.AssetService = m_assetCache;
                        imgrequest.AgentID = m_client.AgentId;
-                        imgrequest.HyperAssets = m_hyperAssets;
+                        imgrequest.InventoryAccessModule = m_client.Scene.RequestModuleInterface<IInventoryAccessModule>();
                        imgrequest.DiscardLevel = newRequest.DiscardLevel;
                        imgrequest.StartPacket = Math.Max(1, newRequest.PacketNumber);
                        imgrequest.Priority = newRequest.Priority;
diff --git a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs
index d30e954..3d6e7f3 100644
--- a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs
+++ b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs
@@ -182,7 +182,13 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
                    if (part.Inventory.UpdateInventoryItem(item))
                    {
-                        remoteClient.SendAgentAlertMessage("Notecard saved", false);                        
+                        if ((InventoryType)item.InvType == InventoryType.Notecard)
+                            remoteClient.SendAgentAlertMessage("Notecard saved", false);
+                        else if ((InventoryType)item.InvType == InventoryType.LSL)
+                            remoteClient.SendAgentAlertMessage("Script saved", false);
+                        else
+                            remoteClient.SendAgentAlertMessage("Item saved", false);
                        part.GetProperties(remoteClient);
                    }
                }
diff --git a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetTransactionModule.cs b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetTransactionModule.cs
index 7e08ecf..ae31050 100644
--- a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetTransactionModule.cs
+++ b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetTransactionModule.cs
@@ -243,7 +243,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
                if (mm != null)
                {
-                    if (!mm.UploadCovered(remoteClient))
+                    if (!mm.UploadCovered(remoteClient, mm.UploadCharge))
                    {
                        remoteClient.SendAgentAlertMessage("Unable to upload asset. Insufficient funds.", false);
                        return;
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
index a7b4c66..ff3036a 100644
--- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
@@ -69,7 +69,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
            get { return false; }
        }
-        public void AttachObject(IClientAPI remoteClient, uint objectLocalID, uint AttachmentPt, Quaternion rot, bool silent)
+        // Called by client
+        //
+        public void AttachObject(IClientAPI remoteClient, uint objectLocalID, uint AttachmentPt, bool silent)
        {
            m_log.Debug("[ATTACHMENTS MODULE]: Invoking AttachObject");
@@ -84,7 +86,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
                    return;
                // Calls attach with a Zero position
-                if (AttachObject(remoteClient, objectLocalID, AttachmentPt, rot, Vector3.Zero, false))
+                if (AttachObject(remoteClient, part.ParentGroup, AttachmentPt, false))
                {
                    m_scene.EventManager.TriggerOnAttach(objectLocalID, part.ParentGroup.GetFromItemID(), remoteClient.AgentId);
@@ -106,72 +108,78 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
            }
        }
        
-        public bool AttachObject(
+        public bool AttachObject(IClientAPI remoteClient, SceneObjectGroup group, uint AttachmentPt, bool silent)
-            IClientAPI remoteClient, uint objectLocalID, uint AttachmentPt, Quaternion rot, Vector3 attachPos, bool silent)
        {
-            SceneObjectGroup group = m_scene.GetGroupByPrim(objectLocalID);
+            Vector3 attachPos = group.AbsolutePosition;
-            if (group != null)
+            if (m_scene.Permissions.CanTakeObject(group.UUID, remoteClient.AgentId))
            {
-                if (m_scene.Permissions.CanTakeObject(group.UUID, remoteClient.AgentId))
+                // If the attachment point isn't the same as the one previously used
+                // set it's offset position = 0 so that it appears on the attachment point
+                // and not in a weird location somewhere unknown.
+                if (AttachmentPt != 0 && AttachmentPt != (uint)group.GetAttachmentPoint())
                {
-                    // If the attachment point isn't the same as the one previously used
+                    attachPos = Vector3.Zero;
-                    // set it's offset position = 0 so that it appears on the attachment point
+                }
-                    // and not in a weird location somewhere unknown.
-                    if (AttachmentPt != 0 && AttachmentPt != (uint)group.GetAttachmentPoint())
-                    {
-                        attachPos = Vector3.Zero;
-                    }
-                    // AttachmentPt 0 means the client chose to 'wear' the attachment.
-                    if (AttachmentPt == 0)
-                    {
-                        // Check object for stored attachment point
-                        AttachmentPt = (uint)group.GetAttachmentPoint();
-                    }
-                    // if we still didn't find a suitable attachment point.......
+                // AttachmentPt 0 means the client chose to 'wear' the attachment.
-                    if (AttachmentPt == 0)
+                if (AttachmentPt == 0)
-                    {
+                {
-                        // Stick it on left hand with Zero Offset from the attachment point.
+                    // Check object for stored attachment point
-                        AttachmentPt = (uint)AttachmentPoint.LeftHand;
+                    AttachmentPt = (uint)group.GetAttachmentPoint();
-                        attachPos = Vector3.Zero;
+                }
-                    }
-                    group.SetAttachmentPoint((byte)AttachmentPt);
+                // if we still didn't find a suitable attachment point.......
-                    group.AbsolutePosition = attachPos;
+                if (AttachmentPt == 0)
+                {
+                    // Stick it on left hand with Zero Offset from the attachment point.
+                    AttachmentPt = (uint)AttachmentPoint.LeftHand;
+                    attachPos = Vector3.Zero;
+                }
-                    // Saves and gets itemID
+                group.SetAttachmentPoint((byte)AttachmentPt);
-                    UUID itemId;
+                group.AbsolutePosition = attachPos;
-                    if (group.GetFromItemID() == UUID.Zero)
+                // Remove any previous attachments
-                    {
+                ScenePresence sp = m_scene.GetScenePresence(remoteClient.AgentId);
-                        m_scene.attachObjectAssetStore(remoteClient, group, remoteClient.AgentId, out itemId);
+                UUID itemID = UUID.Zero;
-                    }
+                if (sp != null)
-                    else
+                {
+                    foreach(SceneObjectGroup grp in sp.Attachments)
                    {
-                        itemId = group.GetFromItemID();
+                        if (grp.GetAttachmentPoint() == (byte)AttachmentPt)
+                        {
+                            itemID = grp.GetFromItemID();
+                            break;
+                        }
                    }
+                    if (itemID != UUID.Zero)
+                        DetachSingleAttachmentToInv(itemID, remoteClient);
+                }
-                    SetAttachmentInventoryStatus(remoteClient, AttachmentPt, itemId, group);
+                if (group.GetFromItemID() == UUID.Zero)
+                {
-                    group.AttachToAgent(remoteClient.AgentId, AttachmentPt, attachPos, silent);
+                    m_scene.attachObjectAssetStore(remoteClient, group, remoteClient.AgentId, out itemID);
-                    
-                    // In case it is later dropped again, don't let
-                    // it get cleaned up
-                    group.RootPart.RemFlag(PrimFlags.TemporaryOnRez);
-                    group.HasGroupChanged = false;
                }
                else
                {
-                    remoteClient.SendAgentAlertMessage(
+                    itemID = group.GetFromItemID();
-                        "You don't have sufficient permissions to attach this object", false);
-                    
-                    return false;
                }
+                SetAttachmentInventoryStatus(remoteClient, AttachmentPt, itemID, group);
+                group.AttachToAgent(remoteClient.AgentId, AttachmentPt, attachPos, silent);
+                
+                // In case it is later dropped again, don't let
+                // it get cleaned up
+                group.RootPart.RemFlag(PrimFlags.TemporaryOnRez);
+                group.HasGroupChanged = false;
            }
            else
            {
-                m_log.DebugFormat("[ATTACHMENTS MODULE]: AttachObject found no such scene object {0}", objectLocalID);
+                remoteClient.SendAgentAlertMessage(
+                    "You don't have sufficient permissions to attach this object", false);
+                
                return false;
            }
@@ -237,8 +245,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
                    if (AttachmentPt != 0 && AttachmentPt != objatt.GetAttachmentPoint())
                        tainted = true;
-                    AttachObject(
+                    AttachObject(remoteClient, objatt, AttachmentPt, false);
-                        remoteClient, objatt.LocalId, AttachmentPt, Quaternion.Identity, objatt.AbsolutePosition, false);
                    //objatt.ScheduleGroupForFullUpdate();
                    
                    if (tainted)
diff --git a/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs b/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs
index b5c3176..2105f3c 100644
--- a/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs
@@ -81,14 +81,14 @@ namespace OpenSim.Region.CoreModules.Avatar.Dialog
        {
            ScenePresence sp = m_scene.GetScenePresence(agentID);
            
-            if (sp != null && !sp.IsChildAgent)
+            if (sp != null)
                sp.ControllingClient.SendAgentAlertMessage(message, modal);
        }
        
        public void SendAlertToUser(string firstName, string lastName, string message, bool modal)
        {
            ScenePresence presence = m_scene.GetScenePresence(firstName, lastName);
-            if (presence != null && !presence.IsChildAgent)
+            if (presence != null)
                presence.ControllingClient.SendAgentAlertMessage(message, modal);
        }
        
@@ -119,7 +119,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Dialog
            }
            ScenePresence sp = m_scene.GetScenePresence(avatarID);
-            if (sp != null && !sp.IsChildAgent)
+            if (sp != null)
                sp.ControllingClient.SendDialog(objectName, objectID, ownerFirstName, ownerLastName, message, textureID, ch, buttonlabels);
        }
@@ -128,7 +128,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Dialog
        {
            ScenePresence sp = m_scene.GetScenePresence(avatarID);
            
-            if (sp != null && !sp.IsChildAgent)
+            if (sp != null)
                sp.ControllingClient.SendLoadURL(objectName, objectID, ownerID, groupOwned, message, url);
        }
        
@@ -149,7 +149,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Dialog
            ScenePresence sp = m_scene.GetScenePresence(avatarid);
            
-            if (sp != null && !sp.IsChildAgent)
+            if (sp != null)
                sp.ControllingClient.SendTextBoxRequest(message, chatChannel, name, ownerFirstName, ownerLastName, objectid);
        }
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
index 9996074..31dfe14 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
@@ -93,37 +93,37 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
        /// </returns>
        public List<InventoryNodeBase> Execute()
        {
-            string filePath = "ERROR";
-            int successfulAssetRestores = 0;
-            int failedAssetRestores = 0;
-            int successfulItemRestores = 0;
-            
-            List<InventoryNodeBase> loadedNodes = new List<InventoryNodeBase>();
-           
-            List<InventoryFolderBase> folderCandidates
-                = InventoryArchiveUtils.FindFolderByPath(
-                    m_scene.InventoryService, m_userInfo.PrincipalID, m_invPath);
-            if (folderCandidates.Count == 0)
-            {
-                // Possibly provide an option later on to automatically create this folder if it does not exist
-                m_log.ErrorFormat("[INVENTORY ARCHIVER]: Inventory path {0} does not exist", m_invPath);
-                return loadedNodes;
-            }
-            
-            InventoryFolderBase rootDestinationFolder = folderCandidates[0];
-            archive = new TarArchiveReader(m_loadStream);
-            // In order to load identically named folders, we need to keep track of the folders that we have already
-            // resolved
-            Dictionary <string, InventoryFolderBase> resolvedFolders = new Dictionary<string, InventoryFolderBase>();
-            byte[] data;
-            TarArchiveReader.TarEntryType entryType;
            try
            {
+                string filePath = "ERROR";
+                int successfulAssetRestores = 0;
+                int failedAssetRestores = 0;
+                int successfulItemRestores = 0;
+                
+                List<InventoryNodeBase> loadedNodes = new List<InventoryNodeBase>();
+               
+                List<InventoryFolderBase> folderCandidates
+                    = InventoryArchiveUtils.FindFolderByPath(
+                        m_scene.InventoryService, m_userInfo.PrincipalID, m_invPath);
+    
+                if (folderCandidates.Count == 0)
+                {
+                    // Possibly provide an option later on to automatically create this folder if it does not exist
+                    m_log.ErrorFormat("[INVENTORY ARCHIVER]: Inventory path {0} does not exist", m_invPath);
+    
+                    return loadedNodes;
+                }
+                
+                InventoryFolderBase rootDestinationFolder = folderCandidates[0];
+                archive = new TarArchiveReader(m_loadStream);
+    
+                // In order to load identically named folders, we need to keep track of the folders that we have already
+                // resolved
+                Dictionary <string, InventoryFolderBase> resolvedFolders = new Dictionary<string, InventoryFolderBase>();
+    
+                byte[] data;
+                TarArchiveReader.TarEntryType entryType;
                while ((data = archive.ReadEntry(out filePath, out entryType)) != null)
                {
                    if (filePath.StartsWith(ArchiveConstants.ASSETS_PATH))
@@ -166,18 +166,20 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                        }
                    }
                }
+                
+                archive.Close();
+                
+                m_log.DebugFormat(
+                    "[INVENTORY ARCHIVER]: Successfully loaded {0} assets with {1} failures", 
+                    successfulAssetRestores, failedAssetRestores);
+                m_log.InfoFormat("[INVENTORY ARCHIVER]: Successfully loaded {0} items", successfulItemRestores);                
+                
+                return loadedNodes;
            }
            finally
            {
-                archive.Close();
+                m_loadStream.Close();
-            }
+            }            
-            m_log.DebugFormat(
-                "[INVENTORY ARCHIVER]: Successfully loaded {0} assets with {1} failures", 
-                successfulAssetRestores, failedAssetRestores);
-            m_log.InfoFormat("[INVENTORY ARCHIVER]: Successfully loaded {0} items", successfulItemRestores);
-            return loadedNodes;
        }
        public void Close()
@@ -212,9 +214,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                        
            InventoryFolderBase destFolder = ResolveDestinationFolder(rootDestFolder, ref iarPathExisting, resolvedFolders);
            
-            m_log.DebugFormat(
+//            m_log.DebugFormat(
-                "[INVENTORY ARCHIVER]: originalArchivePath [{0}], section already loaded [{1}]", 
+//                "[INVENTORY ARCHIVER]: originalArchivePath [{0}], section already loaded [{1}]", 
-                iarPath, iarPathExisting);
+//                iarPath, iarPathExisting);
            
            string iarPathToCreate = iarPath.Substring(iarPathExisting.Length);
            CreateFoldersForPath(destFolder, iarPathExisting, iarPathToCreate, resolvedFolders, loadedNodes);
@@ -247,7 +249,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
            ref string archivePath,             
            Dictionary <string, InventoryFolderBase> resolvedFolders)
        {                       
-            string originalArchivePath = archivePath;
+//            string originalArchivePath = archivePath;
            InventoryFolderBase destFolder = null;
@@ -255,12 +257,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
            {
                while (null == destFolder && archivePath.Length > 0)
                {
-                    m_log.DebugFormat("[INVENTORY ARCHIVER]: Trying to resolve destination folder {0}", archivePath);
+//                    m_log.DebugFormat("[INVENTORY ARCHIVER]: Trying to resolve destination folder {0}", archivePath);
                    
                    if (resolvedFolders.ContainsKey(archivePath))
                    {
-                        m_log.DebugFormat(
+//                        m_log.DebugFormat(
-                            "[INVENTORY ARCHIVER]: Found previously created folder from archive path {0}", archivePath);
+//                            "[INVENTORY ARCHIVER]: Found previously created folder from archive path {0}", archivePath);
                        destFolder = resolvedFolders[archivePath];
                    }
                    else
@@ -275,9 +277,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                        }
                        else
                        {
-                            m_log.DebugFormat(
+//                            m_log.DebugFormat(
-                                "[INVENTORY ARCHIVER]: Found no previously created folder for archive path {0}",
+//                                "[INVENTORY ARCHIVER]: Found no previously created folder for archive path {0}",
-                                originalArchivePath);
+//                                originalArchivePath);
                            archivePath = string.Empty;
                            destFolder = rootDestFolder;
                        }
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveUtils.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveUtils.cs
index ca33968..84afb40 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveUtils.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveUtils.cs
@@ -206,11 +206,18 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
            if (components.Length == 1)
            {
-//                m_log.DebugFormat("FOUND SINGLE COMPONENT [{0}]", components[0]);
+//                m_log.DebugFormat(
+//                    "FOUND SINGLE COMPONENT [{0}].  Looking for this in [{1}] {2}", 
+//                    components[0], startFolder.Name, startFolder.ID);
                
                List<InventoryItemBase> items = inventoryService.GetFolderItems(startFolder.Owner, startFolder.ID);
+                
+//                m_log.DebugFormat("[INVENTORY ARCHIVE UTILS]: Found {0} items in FindItemByPath()", items.Count);
+                
                foreach (InventoryItemBase item in items)
                {
+//                    m_log.DebugFormat("[INVENTORY ARCHIVE UTILS]: Inspecting item {0} {1}", item.Name, item.ID);
+                    
                    if (item.Name == components[0])
                        return item;
                }
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs
index 2c2724e..25a78ff 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs
@@ -119,22 +119,24 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
        protected void ReceivedAllAssets(ICollection<UUID> assetsFoundUuids, ICollection<UUID> assetsNotFoundUuids)
        {
            Exception reportedException = null;
-            bool succeeded = true;
+            bool succeeded = true;            
-            
+             
            try
            {
                // We're almost done.  Just need to write out the control file now
                m_archiveWriter.WriteFile(ArchiveConstants.CONTROL_FILE_PATH, Create0p1ControlFile());
                m_log.InfoFormat("[ARCHIVER]: Added control file to archive.");
                m_archiveWriter.Close();
            }
            catch (Exception e)
            {
-                m_saveStream.Close();
                reportedException = e;
                succeeded = false;
            }
+            finally
+            {
+                m_saveStream.Close();
+            }            
            m_module.TriggerInventoryArchiveSaved(
                m_id, succeeded, m_userInfo, m_invPath, m_saveStream, reportedException);
@@ -213,70 +215,68 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
        /// </summary>
        public void Execute()
        {
-            InventoryFolderBase inventoryFolder = null;
+            try
-            InventoryItemBase inventoryItem = null;
-            InventoryFolderBase rootFolder = m_scene.InventoryService.GetRootFolder(m_userInfo.PrincipalID);
-            bool foundStar = false;
-            // Eliminate double slashes and any leading / on the path.
-            string[] components
-                = m_invPath.Split(
-                    new string[] { InventoryFolderImpl.PATH_DELIMITER }, StringSplitOptions.RemoveEmptyEntries);
-            int maxComponentIndex = components.Length - 1;
-            // If the path terminates with a STAR then later on we want to archive all nodes in the folder but not the
-            // folder itself.  This may get more sophisicated later on
-            if (maxComponentIndex >= 0 && components[maxComponentIndex] == STAR_WILDCARD)
-            {
-                foundStar = true;
-                maxComponentIndex--;
-            }
-            m_invPath = String.Empty;
-            for (int i = 0; i <= maxComponentIndex; i++)
-            {
-                m_invPath += components[i] + InventoryFolderImpl.PATH_DELIMITER;
-            }
-            // Annoyingly Split actually returns the original string if the input string consists only of delimiters
-            // Therefore if we still start with a / after the split, then we need the root folder
-            if (m_invPath.Length == 0)
-            {
-                inventoryFolder = rootFolder;
-            }
-            else
-            {
-                m_invPath = m_invPath.Remove(m_invPath.LastIndexOf(InventoryFolderImpl.PATH_DELIMITER));
-                List<InventoryFolderBase> candidateFolders 
-                    = InventoryArchiveUtils.FindFolderByPath(m_scene.InventoryService, rootFolder, m_invPath);
-                if (candidateFolders.Count > 0)
-                    inventoryFolder = candidateFolders[0];
-            }
-            // The path may point to an item instead
-            if (inventoryFolder == null)
-            {
-                inventoryItem = InventoryArchiveUtils.FindItemByPath(m_scene.InventoryService, rootFolder, m_invPath);
-                //inventoryItem = m_userInfo.RootFolder.FindItemByPath(m_invPath);
-            }
-            if (null == inventoryFolder && null == inventoryItem)
            {
-                // We couldn't find the path indicated 
+                InventoryFolderBase inventoryFolder = null;
-                string errorMessage = string.Format("Aborted save.  Could not find inventory path {0}", m_invPath);
+                InventoryItemBase inventoryItem = null;
-                m_log.ErrorFormat("[INVENTORY ARCHIVER]: {0}", errorMessage);
+                InventoryFolderBase rootFolder = m_scene.InventoryService.GetRootFolder(m_userInfo.PrincipalID);
-                m_module.TriggerInventoryArchiveSaved(
+    
-                    m_id, false, m_userInfo, m_invPath, m_saveStream,
+                bool foundStar = false;
-                    new Exception(errorMessage));
+    
-                return;
+                // Eliminate double slashes and any leading / on the path.
-            }
+                string[] components
+                    = m_invPath.Split(
+                        new string[] { InventoryFolderImpl.PATH_DELIMITER }, StringSplitOptions.RemoveEmptyEntries);
+    
+                int maxComponentIndex = components.Length - 1;
+    
+                // If the path terminates with a STAR then later on we want to archive all nodes in the folder but not the
+                // folder itself.  This may get more sophisicated later on
+                if (maxComponentIndex >= 0 && components[maxComponentIndex] == STAR_WILDCARD)
+                {
+                    foundStar = true;
+                    maxComponentIndex--;
+                }
+    
+                m_invPath = String.Empty;
+                for (int i = 0; i <= maxComponentIndex; i++)
+                {
+                    m_invPath += components[i] + InventoryFolderImpl.PATH_DELIMITER;
+                }
+    
+                // Annoyingly Split actually returns the original string if the input string consists only of delimiters
+                // Therefore if we still start with a / after the split, then we need the root folder
+                if (m_invPath.Length == 0)
+                {
+                    inventoryFolder = rootFolder;
+                }
+                else
+                {
+                    m_invPath = m_invPath.Remove(m_invPath.LastIndexOf(InventoryFolderImpl.PATH_DELIMITER));
+                    List<InventoryFolderBase> candidateFolders 
+                        = InventoryArchiveUtils.FindFolderByPath(m_scene.InventoryService, rootFolder, m_invPath);
+                    if (candidateFolders.Count > 0)
+                        inventoryFolder = candidateFolders[0];
+                }
+    
+                // The path may point to an item instead
+                if (inventoryFolder == null)
+                {
+                    inventoryItem = InventoryArchiveUtils.FindItemByPath(m_scene.InventoryService, rootFolder, m_invPath);
+                    //inventoryItem = m_userInfo.RootFolder.FindItemByPath(m_invPath);
+                }
+    
+                if (null == inventoryFolder && null == inventoryItem)
+                {
+                    // We couldn't find the path indicated 
+                    string errorMessage = string.Format("Aborted save.  Could not find inventory path {0}", m_invPath);
+                    Exception e = new InventoryArchiverException(errorMessage);                
+                    m_module.TriggerInventoryArchiveSaved(m_id, false, m_userInfo, m_invPath, m_saveStream, e);
+                    throw e;
+                }
            
-            m_archiveWriter = new TarArchiveWriter(m_saveStream);
+                m_archiveWriter = new TarArchiveWriter(m_saveStream);
-            try
-            {
                if (inventoryFolder != null)
                {
                    m_log.DebugFormat(
@@ -297,16 +297,15 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
            
                // Don't put all this profile information into the archive right now.
                //SaveUsers();
+                            
+                new AssetsRequest(
+                    new AssetsArchiver(m_archiveWriter), m_assetUuids, m_scene.AssetService, ReceivedAllAssets).Execute();                
            }
            catch (Exception)
            {
-                m_archiveWriter.Close();
+                m_saveStream.Close();
                throw;
            }
-            
-            new AssetsRequest(
-                new AssetsArchiver(m_archiveWriter), m_assetUuids, 
-                m_scene.AssetService, ReceivedAllAssets).Execute();
        }
        /// <summary>
diff --git a/OpenSim/Region/Framework/Interfaces/IHyperService.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverException.cs
index 51ea28a..e07e2ca 100644
--- a/OpenSim/Region/Framework/Interfaces/IHyperService.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverException.cs
@@ -1,4 +1,4 @@
-/*
+/*
 * Copyright (c) Contributors, http://opensimulator.org/
 * See CONTRIBUTORS.TXT for a full list of copyright holders.
 *
@@ -24,14 +24,17 @@
 * (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 OpenMetaverse;
-namespace OpenSim.Region.Framework.Interfaces
+namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
 {
-    public interface IHyperAssetService
+    /// <summary>
-    {
+    /// Signals an inventory archiving problem
-        string GetUserAssetServer(UUID userID);
+    /// </summary>
-        string GetSimAssetServer();
+    public class InventoryArchiverException : Exception
+    {        
+        public InventoryArchiverException(string message) : base(message) {}
+        public InventoryArchiverException(string message, Exception e) : base(message, e) {}
    }
-}
+}
+\ No newline at end of file
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
index cfefbe9..f7a2b09 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
@@ -322,34 +322,41 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
        /// <param name="cmdparams"></param>
        protected void HandleLoadInvConsoleCommand(string module, string[] cmdparams)
        {
-                        m_log.Info("[INVENTORY ARCHIVER]: PLEASE NOTE THAT THIS FACILITY IS EXPERIMENTAL.  BUG REPORTS WELCOME.");                      
+            try
-                        
+            {            
-                        Dictionary<string, object> options = new Dictionary<string, object>();            
+                        m_log.Info("[INVENTORY ARCHIVER]: PLEASE NOTE THAT THIS FACILITY IS EXPERIMENTAL.  BUG REPORTS WELCOME.");                      
-            OptionSet optionSet = new OptionSet().Add("m|merge", delegate (string v) { options["merge"] = v != null; });
+                        
-            
+                        Dictionary<string, object> options = new Dictionary<string, object>();            
-            List<string> mainParams = optionSet.Parse(cmdparams);
+                OptionSet optionSet = new OptionSet().Add("m|merge", delegate (string v) { options["merge"] = v != null; });
-                        
+                
-            if (mainParams.Count < 6)
+                List<string> mainParams = optionSet.Parse(cmdparams);
-            {
+                        
-                m_log.Error(
+                if (mainParams.Count < 6)
-                    "[INVENTORY ARCHIVER]: usage is load iar <first name> <last name> <inventory path> <user password> [<load file path>]");
+                {
-                return;
+                    m_log.Error(
-            }            
+                        "[INVENTORY ARCHIVER]: usage is load iar <first name> <last name> <inventory path> <user password> [<load file path>]");
+                    return;
-            string firstName = mainParams[2];
+                }            
-            string lastName = mainParams[3];
+    
-            string invPath = mainParams[4];
+                string firstName = mainParams[2];
-            string pass = mainParams[5];
+                string lastName = mainParams[3];
-            string loadPath = (mainParams.Count > 6 ? mainParams[6] : DEFAULT_INV_BACKUP_FILENAME);
+                string invPath = mainParams[4];
+                string pass = mainParams[5];
-            m_log.InfoFormat(
+                string loadPath = (mainParams.Count > 6 ? mainParams[6] : DEFAULT_INV_BACKUP_FILENAME);
-                "[INVENTORY ARCHIVER]: Loading archive {0} to inventory path {1} for {2} {3}",
+    
-                loadPath, invPath, firstName, lastName);
-            
-            if (DearchiveInventory(firstName, lastName, invPath, pass, loadPath, options))
                m_log.InfoFormat(
-                    "[INVENTORY ARCHIVER]: Loaded archive {0} for {1} {2}",
+                    "[INVENTORY ARCHIVER]: Loading archive {0} to inventory path {1} for {2} {3}",
-                    loadPath, firstName, lastName);                             
+                    loadPath, invPath, firstName, lastName);
+                
+                if (DearchiveInventory(firstName, lastName, invPath, pass, loadPath, options))
+                    m_log.InfoFormat(
+                        "[INVENTORY ARCHIVER]: Loaded archive {0} for {1} {2}",
+                        loadPath, firstName, lastName); 
+            }
+            catch (InventoryArchiverException e)
+            {
+                m_log.ErrorFormat("[INVENTORY ARCHIVER]: {0}", e.Message);
+            }                
        }
        
        /// <summary>
@@ -358,30 +365,38 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
        /// <param name="cmdparams"></param>
        protected void HandleSaveInvConsoleCommand(string module, string[] cmdparams)
        {
-            if (cmdparams.Length < 6)
+            Guid id = Guid.NewGuid();
+            
+            try
            {
-                m_log.Error(
+                if (cmdparams.Length < 6)
-                    "[INVENTORY ARCHIVER]: usage is save iar <first name> <last name> <inventory path> <user password> [<save file path>]");
+                {
-                return;
+                    m_log.Error(
+                        "[INVENTORY ARCHIVER]: usage is save iar <first name> <last name> <inventory path> <user password> [<save file path>]");
+                    return;
+                }
+    
+                m_log.Info("[INVENTORY ARCHIVER]: PLEASE NOTE THAT THIS FACILITY IS EXPERIMENTAL.  BUG REPORTS WELCOME.");
+    
+                string firstName = cmdparams[2];
+                string lastName = cmdparams[3];
+                string invPath = cmdparams[4];
+                string pass = cmdparams[5];
+                string savePath = (cmdparams.Length > 6 ? cmdparams[6] : DEFAULT_INV_BACKUP_FILENAME);
+    
+                m_log.InfoFormat(
+                    "[INVENTORY ARCHIVER]: Saving archive {0} using inventory path {1} for {2} {3}",
+                    savePath, invPath, firstName, lastName);
+                    
+                ArchiveInventory(id, firstName, lastName, invPath, pass, savePath, new Dictionary<string, object>());                   
            }
+            catch (InventoryArchiverException e)
-            m_log.Info("[INVENTORY ARCHIVER]: PLEASE NOTE THAT THIS FACILITY IS EXPERIMENTAL.  BUG REPORTS WELCOME.");
+            {
+                m_log.ErrorFormat("[INVENTORY ARCHIVER]: {0}", e.Message);
-            string firstName = cmdparams[2];
+            }
-            string lastName = cmdparams[3];
+                
-            string invPath = cmdparams[4];
-            string pass = cmdparams[5];
-            string savePath = (cmdparams.Length > 6 ? cmdparams[6] : DEFAULT_INV_BACKUP_FILENAME);
-            m_log.InfoFormat(
-                "[INVENTORY ARCHIVER]: Saving archive {0} using inventory path {1} for {2} {3}",
-                savePath, invPath, firstName, lastName);
-            Guid id = Guid.NewGuid();
-            ArchiveInventory(id, firstName, lastName, invPath, pass, savePath, new Dictionary<string, object>());
            lock (m_pendingConsoleSaves)
-                m_pendingConsoleSaves.Add(id);
+                m_pendingConsoleSaves.Add(id);            
        }
        
        private void SaveInvConsoleCommandCompleted(
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
index 5130fa5..4531bfd 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
@@ -63,13 +63,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
        }
        /// <summary>
-        /// Test saving a V0.1 OpenSim Inventory Archive (subject to change since there is no fixed format yet).
+        /// Test saving an inventory path to a V0.1 OpenSim Inventory Archive 
+        /// (subject to change since there is no fixed format yet).
        /// </summary>
-        // Commenting for now! The mock inventory service needs more beef, at least for
-        // GetFolderForType
-        // REFACTORING PROBLEM. This needs to be rewritten.
        [Test]
-        public void TestSaveIarV0_1()
+        public void TestSavePathToIarV0_1()
        {
            TestHelper.InMethod();
 //            log4net.Config.XmlConfigurator.Configure();
@@ -182,6 +180,123 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
        }
        
        /// <summary>
+        /// Test saving a single inventory item to a V0.1 OpenSim Inventory Archive 
+        /// (subject to change since there is no fixed format yet).
+        /// </summary>
+        [Test]
+        public void TestSaveItemToIarV0_1()
+        {
+            TestHelper.InMethod();
+//            log4net.Config.XmlConfigurator.Configure();
+            InventoryArchiverModule archiverModule = new InventoryArchiverModule(true);
+            Scene scene = SceneSetupHelpers.SetupScene("Inventory");
+            SceneSetupHelpers.SetupSceneModules(scene, archiverModule);
+            // Create user
+            string userFirstName = "Jock";
+            string userLastName = "Stirrup";
+            string userPassword = "troll";
+            UUID userId = UUID.Parse("00000000-0000-0000-0000-000000000020");
+            UserProfileTestUtils.CreateUserWithInventory(scene, userFirstName, userLastName, userId, userPassword);
+            
+            // Create asset
+            SceneObjectGroup object1;
+            SceneObjectPart part1;
+            {
+                string partName = "My Little Dog Object";
+                UUID ownerId = UUID.Parse("00000000-0000-0000-0000-000000000040");
+                PrimitiveBaseShape shape = PrimitiveBaseShape.CreateSphere();
+                Vector3 groupPosition = new Vector3(10, 20, 30);
+                Quaternion rotationOffset = new Quaternion(20, 30, 40, 50);
+                Vector3 offsetPosition = new Vector3(5, 10, 15);
+                part1
+                    = new SceneObjectPart(
+                        ownerId, shape, groupPosition, rotationOffset, offsetPosition);
+                part1.Name = partName;
+                object1 = new SceneObjectGroup(part1);
+                scene.AddNewSceneObject(object1, false);
+            }
+            UUID asset1Id = UUID.Parse("00000000-0000-0000-0000-000000000060");
+            AssetBase asset1 = AssetHelpers.CreateAsset(asset1Id, object1);
+            scene.AssetService.Store(asset1);
+            // Create item
+            UUID item1Id = UUID.Parse("00000000-0000-0000-0000-000000000080");
+            string item1Name = "My Little Dog";
+            InventoryItemBase item1 = new InventoryItemBase();
+            item1.Name = item1Name;
+            item1.AssetID = asset1.FullID;
+            item1.ID = item1Id;
+            InventoryFolderBase objsFolder 
+                = InventoryArchiveUtils.FindFolderByPath(scene.InventoryService, userId, "Objects")[0];
+            item1.Folder = objsFolder.ID;
+            scene.AddInventoryItem(userId, item1);
+            MemoryStream archiveWriteStream = new MemoryStream();
+            archiverModule.OnInventoryArchiveSaved += SaveCompleted;
+            mre.Reset();
+            archiverModule.ArchiveInventory(
+                Guid.NewGuid(), userFirstName, userLastName, "Objects/" + item1Name, userPassword, archiveWriteStream);
+            mre.WaitOne(60000, false);
+            byte[] archive = archiveWriteStream.ToArray();
+            MemoryStream archiveReadStream = new MemoryStream(archive);
+            TarArchiveReader tar = new TarArchiveReader(archiveReadStream);
+            //bool gotControlFile = false;
+            bool gotObject1File = false;
+            //bool gotObject2File = false;
+            string expectedObject1FileName = InventoryArchiveWriteRequest.CreateArchiveItemName(item1);
+            string expectedObject1FilePath = string.Format(
+                "{0}{1}",
+                ArchiveConstants.INVENTORY_PATH,
+                expectedObject1FileName);
+            string filePath;
+            TarArchiveReader.TarEntryType tarEntryType;
+//            Console.WriteLine("Reading archive");
+            
+            while (tar.ReadEntry(out filePath, out tarEntryType) != null)
+            {
+                Console.WriteLine("Got {0}", filePath);
+//                if (ArchiveConstants.CONTROL_FILE_PATH == filePath)
+//                {
+//                    gotControlFile = true;
+//                }
+                
+                if (filePath.StartsWith(ArchiveConstants.INVENTORY_PATH) && filePath.EndsWith(".xml"))
+                {
+//                    string fileName = filePath.Remove(0, "Objects/".Length);
+//
+//                    if (fileName.StartsWith(part1.Name))
+//                    {
+                        Assert.That(expectedObject1FilePath, Is.EqualTo(filePath));
+                        gotObject1File = true;
+//                    }
+//                    else if (fileName.StartsWith(part2.Name))
+//                    {
+//                        Assert.That(fileName, Is.EqualTo(expectedObject2FileName));
+//                        gotObject2File = true;
+//                    }
+                }
+            }
+//            Assert.That(gotControlFile, Is.True, "No control file in archive");
+            Assert.That(gotObject1File, Is.True, "No item1 file in archive");
+//            Assert.That(gotObject2File, Is.True, "No object2 file in archive");
+            // TODO: Test presence of more files and contents of files.
+        }        
+        
+        /// <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 creator name.
        /// </summary>
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGAssetMapper.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGAssetMapper.cs
index c1e92f5..b13b9d8 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGAssetMapper.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGAssetMapper.cs
@@ -157,6 +157,8 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                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);
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs
index b0555da..8ccc941 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs
@@ -131,7 +131,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
            return ret;
        }
-        // DO NOT OVERRIDE THIS METHOD
+        // DO NOT OVERRIDE THE BASE METHOD
        public virtual UUID DeleteToInventory(DeRezAction action, UUID folderID,
                SceneObjectGroup objectGroup, IClientAPI remoteClient)
        {
@@ -139,7 +139,8 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
            if (!assetID.Equals(UUID.Zero))
            {
-                UploadInventoryItem(remoteClient.AgentId, assetID, "", 0);
+                if (remoteClient != null)
+                    UploadInventoryItem(remoteClient.AgentId, assetID, "", 0);
            }
            else
                m_log.Debug("[HGScene]: Scene.Inventory did not create asset");
@@ -192,9 +193,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                m_assMapper.Post(item.AssetID, receiver, userAssetServer);
        }
-        #endregion
+        public override bool IsForeignUser(UUID userID, out string assetServerURL)
-        public bool IsForeignUser(UUID userID, out string assetServerURL)
        {
            assetServerURL = string.Empty;
            UserAccount account = null;
@@ -217,5 +216,18 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
            return false;
        }
+        #endregion
+        protected override InventoryItemBase GetItem(UUID agentID, UUID itemID)
+        {
+            InventoryItemBase item = base.GetItem(agentID, itemID);
+            string userAssetServer = string.Empty;
+            if (IsForeignUser(agentID, out userAssetServer))
+                m_assMapper.Get(item.AssetID, agentID, userAssetServer);
+            return item;
+        }
    }
 }
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
index 12b6aa0..1a7da61 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
@@ -322,6 +322,18 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                    }
                }
+                // Override and put into where it came from, if it came
+                // from anywhere in inventory
+                //
+                if (action == DeRezAction.Take || action == DeRezAction.TakeCopy)
+                {
+                    if (objectGroup.RootPart.FromFolderID != UUID.Zero)
+                    {
+                        InventoryFolderBase f = new InventoryFolderBase(objectGroup.RootPart.FromFolderID, userID);
+                        folder = m_Scene.InventoryService.GetFolder(f);
+                    }
+                }
                if (folder == null) // None of the above
                {
                    folder = new InventoryFolderBase(folderID);
@@ -369,12 +381,27 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                    if ((nextPerms & (uint)PermissionMask.Modify) == 0)
                        perms &= ~(uint)PermissionMask.Modify;
+                    // Make sure all bits but the ones we want are clear
+                    // on take.
+                    // This will be applied to the current perms, so
+                    // it will do what we want.
+                    objectGroup.RootPart.NextOwnerMask &=
+                            ((uint)PermissionMask.Copy | 
+                             (uint)PermissionMask.Transfer |
+                             (uint)PermissionMask.Modify);
+                    objectGroup.RootPart.NextOwnerMask |=
+                            (uint)PermissionMask.Move;
                    item.BasePermissions = perms & objectGroup.RootPart.NextOwnerMask;
                    item.CurrentPermissions = item.BasePermissions;
                    item.NextPermissions = objectGroup.RootPart.NextOwnerMask;
                    item.EveryOnePermissions = objectGroup.RootPart.EveryoneMask & objectGroup.RootPart.NextOwnerMask;
                    item.GroupPermissions = objectGroup.RootPart.GroupMask & objectGroup.RootPart.NextOwnerMask;
-                    item.CurrentPermissions |= 8; // Slam!
+                    
+                    // Magic number badness. Maybe this deserves an enum.
+                    // bit 4 (16) is the "Slam" bit, it means treat as passed
+                    // and apply next owner perms on rez
+                    item.CurrentPermissions |= 16; // Slam!
                }
                else
                {
@@ -384,7 +411,12 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                    item.EveryOnePermissions = objectGroup.RootPart.EveryoneMask;
                    item.GroupPermissions = objectGroup.RootPart.GroupMask;
-                    item.CurrentPermissions |= 8; // Slam!
+                    item.CurrentPermissions &=
+                            ((uint)PermissionMask.Copy |
+                             (uint)PermissionMask.Transfer |
+                             (uint)PermissionMask.Modify |
+                             (uint)PermissionMask.Move |
+                             7); // Preserve folded permissions
                }
                // TODO: add the new fields (Flags, Sale info, etc)
@@ -485,6 +517,14 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                    SceneObjectGroup group
                        = SceneObjectSerializer.FromOriginalXmlFormat(itemId, xmlData);
+                    group.RootPart.FromFolderID = item.Folder;
+                    // If it's rezzed in world, select it. Much easier to 
+                    // find small items.
+                    //
+                    if (!attachment)
+                        group.RootPart.CreateSelected = true;
                    if (!m_Scene.Permissions.CanRezObject(
                        group.Children.Count, remoteClient.AgentId, pos)
                        && !attachment)
@@ -557,7 +597,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                    List<SceneObjectPart> partList = new List<SceneObjectPart>(group.Children.Values);
                    group.SetGroup(remoteClient.ActiveGroupId, remoteClient);
-                    if (rootPart.OwnerID != item.Owner)
+                    if ((rootPart.OwnerID != item.Owner) || (item.CurrentPermissions & 16) != 0)
                    {
                        //Need to kill the for sale here
                        rootPart.ObjectSaleType = 0;
@@ -565,14 +605,11 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                        if (m_Scene.Permissions.PropagatePermissions())
                        {
-                            if ((item.CurrentPermissions & 8) != 0)
+                            foreach (SceneObjectPart part in partList)
                            {
-                                foreach (SceneObjectPart part in partList)
+                                part.EveryoneMask = item.EveryOnePermissions;
-                                {
+                                part.NextOwnerMask = item.NextPermissions;
-                                    part.EveryoneMask = item.EveryOnePermissions;
+                                part.GroupMask = 0; // DO NOT propagate here
-                                    part.NextOwnerMask = item.NextPermissions;
-                                    part.GroupMask = 0; // DO NOT propagate here
-                                }
                            }
                            
                            group.ApplyNextOwnerPermissions();
@@ -581,19 +618,15 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                    foreach (SceneObjectPart part in partList)
                    {
-                        if (part.OwnerID != item.Owner)
+                        if ((part.OwnerID != item.Owner) || (item.CurrentPermissions & 16) != 0)
                        {
                            part.LastOwnerID = part.OwnerID;
                            part.OwnerID = item.Owner;
                            part.Inventory.ChangeInventoryOwner(item.Owner);
-                        }
-                        else if (((item.CurrentPermissions & 8) != 0) && (!attachment)) // Slam!
-                        {
-                            part.EveryoneMask = item.EveryOnePermissions;
-                            part.NextOwnerMask = item.NextPermissions;
                            part.GroupMask = 0; // DO NOT propagate here
                        }
+                        part.EveryoneMask = item.EveryOnePermissions;
+                        part.NextOwnerMask = item.NextPermissions;
                    }
                    rootPart.TrimPermissions();
@@ -639,6 +672,57 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
        {
        }
+        public virtual bool GetAgentInventoryItem(IClientAPI remoteClient, UUID itemID, UUID requestID)
+        {
+            InventoryItemBase assetRequestItem = GetItem(remoteClient.AgentId, itemID);
+            if (assetRequestItem == null)
+            {
+                ILibraryService lib = m_Scene.RequestModuleInterface<ILibraryService>();
+                if (lib != null)
+                    assetRequestItem = lib.LibraryRootFolder.FindItem(itemID);
+                if (assetRequestItem == null)
+                    return false;
+            }
+            // At this point, we need to apply perms
+            // only to notecards and scripts. All
+            // other asset types are always available
+            //
+            if (assetRequestItem.AssetType == (int)AssetType.LSLText)
+            {
+                if (!m_Scene.Permissions.CanViewScript(itemID, UUID.Zero, remoteClient.AgentId))
+                {
+                    remoteClient.SendAgentAlertMessage("Insufficient permissions to view script", false);
+                    return false;
+                }
+            }
+            else if (assetRequestItem.AssetType == (int)AssetType.Notecard)
+            {
+                if (!m_Scene.Permissions.CanViewNotecard(itemID, UUID.Zero, remoteClient.AgentId))
+                {
+                    remoteClient.SendAgentAlertMessage("Insufficient permissions to view notecard", false);
+                    return false;
+                }
+            }
+            if (assetRequestItem.AssetID != requestID)
+            {
+                m_log.WarnFormat(
+                    "[CLIENT]: {0} requested asset {1} from item {2} but this does not match item's asset {3}",
+                    Name, requestID, itemID, assetRequestItem.AssetID);
+                return false;
+            }
+            return true;
+        }
+        public virtual bool IsForeignUser(UUID userID, out string assetServerURL)
+        {
+            assetServerURL = string.Empty;
+            return false;
+        }
        #endregion
        #region Misc
@@ -661,6 +745,14 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
            return asset;
        }
+        protected virtual InventoryItemBase GetItem(UUID agentID, UUID itemID)
+        {
+            IInventoryService invService = m_Scene.RequestModuleInterface<IInventoryService>();
+            InventoryItemBase assetRequestItem = new InventoryItemBase(itemID, agentID);
+            assetRequestItem = invService.GetItem(assetRequestItem);
+            return assetRequestItem;
+        }
        #endregion
    }
 }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs
index ebd6bbd..034e692 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs
@@ -41,7 +41,7 @@ using OpenMetaverse;
 namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
 {
    public class HGAssetBroker :
-            ISharedRegionModule, IAssetService, IHyperAssetService
+            ISharedRegionModule, IAssetService
    {
        private static readonly ILog m_log =
                LogManager.GetLogger(
@@ -150,7 +150,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
            m_aScene = scene;
            scene.RegisterModuleInterface<IAssetService>(this);
-            scene.RegisterModuleInterface<IHyperAssetService>(this);
        }
        public void RemoveRegion(Scene scene)
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs
index e09db15..97161fc 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs
@@ -202,9 +202,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
                    }
                }
            }
-            // else put a null; it means that the methods should forward to local grid's inventory
-            m_InventoryURLs.Add(userID, null);
        }
        private void DropInventoryServiceURL(UUID userID)
@@ -223,10 +220,13 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
            if (m_InventoryURLs.ContainsKey(userID))
                return m_InventoryURLs[userID];
-            else
+            CacheInventoryServiceURL(userID);
-                CacheInventoryServiceURL(userID);
-            return m_InventoryURLs[userID];
+            if (m_InventoryURLs.ContainsKey(userID))
+                return m_InventoryURLs[userID];
+            return null; //it means that the methods should forward to local grid's inventory
+ 
        }
        #endregion
@@ -253,7 +253,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
        public InventoryFolderBase GetRootFolder(UUID userID)
        {
-            m_log.DebugFormat("[HG INVENTORY CONNECTOR]: GetRootFolder for {0}", userID);
+            //m_log.DebugFormat("[HG INVENTORY CONNECTOR]: GetRootFolder for {0}", userID);
            string invURL = GetInventoryServiceURL(userID);
@@ -267,7 +267,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
        public InventoryFolderBase GetFolderForType(UUID userID, AssetType type)
        {
-            m_log.DebugFormat("[HG INVENTORY CONNECTOR]: GetFolderForType {0} type {1}", userID, type);
+            //m_log.DebugFormat("[HG INVENTORY CONNECTOR]: GetFolderForType {0} type {1}", userID, type);
            string invURL = GetInventoryServiceURL(userID);
@@ -281,7 +281,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
        public InventoryCollection GetFolderContent(UUID userID, UUID folderID)
        {
-            m_log.Debug("[HG INVENTORY CONNECTOR]: GetFolderContent " + folderID);
+            //m_log.Debug("[HG INVENTORY CONNECTOR]: GetFolderContent " + folderID);
            string invURL = GetInventoryServiceURL(userID);
@@ -296,7 +296,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
        public  List<InventoryItemBase> GetFolderItems(UUID userID, UUID folderID)
        {
-            m_log.Debug("[HG INVENTORY CONNECTOR]: GetFolderItems " + folderID);
+            //m_log.Debug("[HG INVENTORY CONNECTOR]: GetFolderItems " + folderID);
            string invURL = GetInventoryServiceURL(userID);
@@ -314,7 +314,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
            if (folder == null)
                return false;
-            m_log.Debug("[HG INVENTORY CONNECTOR]: AddFolder " + folder.ID);
+            //m_log.Debug("[HG INVENTORY CONNECTOR]: AddFolder " + folder.ID);
            string invURL = GetInventoryServiceURL(folder.Owner);
@@ -331,7 +331,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
            if (folder == null)
                return false;
-            m_log.Debug("[HG INVENTORY CONNECTOR]: UpdateFolder " + folder.ID);
+            //m_log.Debug("[HG INVENTORY CONNECTOR]: UpdateFolder " + folder.ID);
            string invURL = GetInventoryServiceURL(folder.Owner);
@@ -350,7 +350,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
            if (folderIDs.Count == 0)
                return false;
-            m_log.Debug("[HG INVENTORY CONNECTOR]: DeleteFolders for " + ownerID);
+            //m_log.Debug("[HG INVENTORY CONNECTOR]: DeleteFolders for " + ownerID);
            string invURL = GetInventoryServiceURL(ownerID);
@@ -367,7 +367,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
            if (folder == null)
                return false;
-            m_log.Debug("[HG INVENTORY CONNECTOR]: MoveFolder for " + folder.Owner);
+            //m_log.Debug("[HG INVENTORY CONNECTOR]: MoveFolder for " + folder.Owner);
            string invURL = GetInventoryServiceURL(folder.Owner);
@@ -384,7 +384,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
            if (folder == null)
                return false;
-            m_log.Debug("[HG INVENTORY CONNECTOR]: PurgeFolder for " + folder.Owner);
+            //m_log.Debug("[HG INVENTORY CONNECTOR]: PurgeFolder for " + folder.Owner);
            string invURL = GetInventoryServiceURL(folder.Owner);
@@ -401,7 +401,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
            if (item == null)
                return false;
-            m_log.Debug("[HG INVENTORY CONNECTOR]: AddItem " + item.ID);
+            //m_log.Debug("[HG INVENTORY CONNECTOR]: AddItem " + item.ID);
            string invURL = GetInventoryServiceURL(item.Owner);
@@ -418,7 +418,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
            if (item == null)
                return false;
-            m_log.Debug("[HG INVENTORY CONNECTOR]: UpdateItem " + item.ID);
+            //m_log.Debug("[HG INVENTORY CONNECTOR]: UpdateItem " + item.ID);
            string invURL = GetInventoryServiceURL(item.Owner);
@@ -437,7 +437,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
            if (items.Count == 0)
                return true;
-            m_log.Debug("[HG INVENTORY CONNECTOR]: MoveItems for " + ownerID);
+            //m_log.Debug("[HG INVENTORY CONNECTOR]: MoveItems for " + ownerID);
            string invURL = GetInventoryServiceURL(ownerID);
@@ -451,15 +451,13 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
        public  bool DeleteItems(UUID ownerID, List<UUID> itemIDs)
        {
-            m_log.DebugFormat("[HG INVENTORY CONNECTOR]: Delete {0} items for user {1}", itemIDs.Count, ownerID);
+            //m_log.DebugFormat("[HG INVENTORY CONNECTOR]: Delete {0} items for user {1}", itemIDs.Count, ownerID);
            if (itemIDs == null)
                return false;
            if (itemIDs.Count == 0)
                return true;
-            m_log.Debug("[HG INVENTORY CONNECTOR]: DeleteItems for " + ownerID);
            string invURL = GetInventoryServiceURL(ownerID);
            if (invURL == null) // not there, forward to local inventory connector to resolve
@@ -474,7 +472,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
        {
            if (item == null)
                return null;
-            m_log.Debug("[HG INVENTORY CONNECTOR]: GetItem " + item.ID);
+            //m_log.Debug("[HG INVENTORY CONNECTOR]: GetItem " + item.ID);
            string invURL = GetInventoryServiceURL(item.Owner);
@@ -491,7 +489,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
            if (folder == null)
                return null;
-            m_log.Debug("[HG INVENTORY CONNECTOR]: GetFolder " + folder.ID);
+            //m_log.Debug("[HG INVENTORY CONNECTOR]: GetFolder " + folder.ID);
            string invURL = GetInventoryServiceURL(folder.Owner);
@@ -515,7 +513,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
        public  int GetAssetPermissions(UUID userID, UUID assetID)
        {
-            m_log.Debug("[HG INVENTORY CONNECTOR]: GetAssetPermissions " + assetID);
+            //m_log.Debug("[HG INVENTORY CONNECTOR]: GetAssetPermissions " + assetID);
            string invURL = GetInventoryServiceURL(userID);
diff --git a/OpenSim/Region/CoreModules/World/Land/LandObject.cs b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
index 3945142..2a87da2 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandObject.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
@@ -146,7 +146,7 @@ namespace OpenSim.Region.CoreModules.World.Land
            else
            {
                // Normal Calculations
-                return (int)Math.Round(((float)LandData.Area / 65536.0f) * (float)m_scene.objectCapacity * (float)m_scene.RegionInfo.RegionSettings.ObjectBonus);
+                return (int)Math.Round(((float)LandData.Area / 65536.0f) * (float)m_scene.RegionInfo.ObjectCapacity * (float)m_scene.RegionInfo.RegionSettings.ObjectBonus);
            }
        }
        public int GetSimulatorMaxPrimCount(ILandObject thisObject)
@@ -158,7 +158,7 @@ namespace OpenSim.Region.CoreModules.World.Land
            else
            {
                //Normal Calculations
-                return m_scene.objectCapacity;
+                return m_scene.RegionInfo.ObjectCapacity;
            }
        }
        #endregion
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
index 0e849e5..9d9967a 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
@@ -805,7 +805,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                    imgstream = new MemoryStream();
                    // non-async because we know we have the asset immediately.
-                    AssetBase mapasset = m_scene.AssetService.Get(m_scene.RegionInfo.lastMapUUID.ToString());
+                    AssetBase mapasset = m_scene.AssetService.Get(m_scene.RegionInfo.RegionSettings.TerrainImageID.ToString());
                    // Decode image to System.Drawing.Image
                    if (OpenJPEG.DecodeToImage(mapasset.Data, out managedImage, out image))
diff --git a/OpenSim/Region/DataSnapshot/ObjectSnapshot.cs b/OpenSim/Region/DataSnapshot/ObjectSnapshot.cs
index 6e69902..00f6918 100644
--- a/OpenSim/Region/DataSnapshot/ObjectSnapshot.cs
+++ b/OpenSim/Region/DataSnapshot/ObjectSnapshot.cs
@@ -73,7 +73,7 @@ namespace OpenSim.Region.DataSnapshot.Providers
            client.OnGrabUpdate += delegate(UUID objectID, Vector3 offset, Vector3 grapPos,
                IClientAPI remoteClient, List<SurfaceTouchEventArgs> surfaceArgs) { this.Stale = true; };
            client.OnObjectAttach += delegate(IClientAPI remoteClient, uint objectLocalID, uint AttachmentPt,
-                Quaternion rot, bool silent) { this.Stale = true; };
+                bool silent) { this.Stale = true; };
            client.OnObjectDuplicate += delegate(uint localID, Vector3 offset, uint dupeFlags, UUID AgentID,
                UUID GroupID) { this.Stale = true; };
            client.OnObjectDuplicateOnRay += delegate(uint localID, uint dupeFlags, UUID AgentID, UUID GroupID,
diff --git a/OpenSim/Region/DataSnapshot/SnapshotStore.cs b/OpenSim/Region/DataSnapshot/SnapshotStore.cs
index 976c2c1..70cb205 100644
--- a/OpenSim/Region/DataSnapshot/SnapshotStore.cs
+++ b/OpenSim/Region/DataSnapshot/SnapshotStore.cs
@@ -258,21 +258,16 @@ namespace OpenSim.Region.DataSnapshot
        private String GetRegionCategory(Scene scene)
        {
-            //Boolean choice between:
+            if (scene.RegionInfo.RegionSettings.Maturity == 0)
-            //  "PG" - Mormontown
+                return "PG";
-            //  "Mature" - Sodom and Gomorrah
            if (scene.RegionInfo.RegionSettings.Maturity == 1)
-            {
                return "Mature";
-            }
-            else if (scene.RegionInfo.RegionSettings.Maturity == 0)
+            if (scene.RegionInfo.RegionSettings.Maturity == 2)
-            {
+                return "Adult";
-                return "PG";
-            }
+            return "Unknown";
-            else
-            {
-                return "Unknown";
-            }
        }
        private XmlNode GetGridSnapshotData(XmlDocument factory)
diff --git a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
index af9df45..f6e6163 100644
--- a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
+++ b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
@@ -536,10 +536,6 @@ namespace OpenSim.Region.Examples.SimpleModule
        {
        }
-        public virtual void AttachObject(uint localID, Quaternion rotation, byte attachPoint, UUID ownerID)
-        {
-        }
        public virtual void SendDialog(string objectname, UUID objectID, string ownerFirstName, string ownerLastName, string msg, UUID textureID, int ch, string[] buttonlabels)
        {
        }
diff --git a/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs b/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
index f8af367..2af2548 100644
--- a/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
@@ -44,7 +44,7 @@ namespace OpenSim.Region.Framework.Interfaces
        /// <param name="rot"></param>
        /// <param name="silent"></param>
        void AttachObject(
-            IClientAPI remoteClient, uint objectLocalID, uint AttachmentPt, Quaternion rot, bool silent);
+            IClientAPI remoteClient, uint objectLocalID, uint AttachmentPt, bool silent);
        /// <summary>
        /// Attach an object to an avatar.
@@ -57,7 +57,7 @@ namespace OpenSim.Region.Framework.Interfaces
        /// <param name="silent"></param>
        /// <returns>true if the object was successfully attached, false otherwise</returns>        
        bool AttachObject(
-            IClientAPI remoteClient, uint objectLocalID, uint AttachmentPt, Quaternion rot, Vector3 attachPos, bool silent);
+            IClientAPI remoteClient, SceneObjectGroup grp, uint AttachmentPt, bool silent);
        /// <summary>
        /// Rez an attachment from user inventory and change inventory status to match.
diff --git a/OpenSim/Region/Framework/Interfaces/IInventoryAccessModule.cs b/OpenSim/Region/Framework/Interfaces/IInventoryAccessModule.cs
index 97f4188..05fc2ad 100644
--- a/OpenSim/Region/Framework/Interfaces/IInventoryAccessModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IInventoryAccessModule.cs
@@ -43,5 +43,9 @@ namespace OpenSim.Region.Framework.Interfaces
                                    UUID RayTargetID, byte BypassRayCast, bool RayEndIsIntersection,
                                    bool RezSelected, bool RemoveItem, UUID fromTaskID, bool attachment);
        void TransferInventoryAssets(InventoryItemBase item, UUID sender, UUID receiver);
+        bool GetAgentInventoryItem(IClientAPI remoteClient, UUID itemID, UUID requestID);
+        // Must be here because of textures in user's inventory
+        bool IsForeignUser(UUID userID, out string assetServerURL);
    }
 }
diff --git a/OpenSim/Region/Framework/Scenes/EventManager.cs b/OpenSim/Region/Framework/Scenes/EventManager.cs
index a4dd170..3b8d727 100644
--- a/OpenSim/Region/Framework/Scenes/EventManager.cs
+++ b/OpenSim/Region/Framework/Scenes/EventManager.cs
@@ -179,7 +179,7 @@ namespace OpenSim.Region.Framework.Scenes
        public event ScriptChangedEvent OnScriptChangedEvent;
        public delegate void ScriptChangedEvent(uint localID, uint change);
-        public delegate void ScriptControlEvent(uint localID, UUID item, UUID avatarID, uint held, uint changed);
+        public delegate void ScriptControlEvent(UUID item, UUID avatarID, uint held, uint changed);
        public event ScriptControlEvent OnScriptControlEvent;
        public delegate void ScriptAtTargetEvent(uint localID, uint handle, Vector3 targetpos, Vector3 atpos);
@@ -1614,7 +1614,7 @@ namespace OpenSim.Region.Framework.Scenes
            }
        }
-        internal void TriggerControlEvent(uint p, UUID scriptUUID, UUID avatarID, uint held, uint _changed)
+        internal void TriggerControlEvent(UUID scriptUUID, UUID avatarID, uint held, uint _changed)
        {
            ScriptControlEvent handlerScriptControlEvent = OnScriptControlEvent;
            if (handlerScriptControlEvent != null)
@@ -1623,7 +1623,7 @@ namespace OpenSim.Region.Framework.Scenes
                {
                    try
                    {
-                        d(p, scriptUUID,  avatarID, held, _changed);
+                        d(scriptUUID,  avatarID, held, _changed);
                    }
                    catch (Exception e)
                    {
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index f9da341..01edf51 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -73,7 +73,7 @@ namespace OpenSim.Region.Framework.Scenes
            IMoneyModule money=RequestModuleInterface<IMoneyModule>();
            if (money != null)
            {
-                money.ApplyUploadCharge(agentID);
+                money.ApplyUploadCharge(agentID, money.UploadCharge, "Asset upload");
            }
            AddInventoryItem(agentID, item);
@@ -265,6 +265,10 @@ namespace OpenSim.Region.Framework.Scenes
        public void UpdateInventoryItemAsset(IClientAPI remoteClient, UUID transactionID,
                                             UUID itemID, InventoryItemBase itemUpd)
        {
+            // This one will let people set next perms on items in agent
+            // inventory. Rut-Roh. Whatever. Make this secure. Yeah.
+            //
+            // Passing something to another avatar or a an object will already
            InventoryItemBase item = new InventoryItemBase(itemID, remoteClient.AgentId);
            item = InventoryService.GetItem(item);
@@ -274,11 +278,9 @@ namespace OpenSim.Region.Framework.Scenes
                {
                    item.Name = itemUpd.Name;
                    item.Description = itemUpd.Description;
-                    item.NextPermissions = itemUpd.NextPermissions;
+                    item.NextPermissions = itemUpd.NextPermissions & item.BasePermissions;
-                    item.CurrentPermissions |= 8; // Slam!
+                    item.EveryOnePermissions = itemUpd.EveryOnePermissions & item.BasePermissions;
-                    item.EveryOnePermissions = itemUpd.EveryOnePermissions;
+                    item.GroupPermissions = itemUpd.GroupPermissions & item.BasePermissions;
-                    item.GroupPermissions = itemUpd.GroupPermissions;
                    item.GroupID = itemUpd.GroupID;
                    item.GroupOwned = itemUpd.GroupOwned;
                    item.CreationDate = itemUpd.CreationDate;
@@ -384,28 +386,103 @@ namespace OpenSim.Region.Framework.Scenes
                if (Permissions.PropagatePermissions() && recipient != senderId)
                {
-                    // First, make sore base is limited to the next perms
+                    // Trying to do this right this time. This is evil. If
-                    itemCopy.BasePermissions = item.BasePermissions & (item.NextPermissions | (uint)PermissionMask.Move);
+                    // you believe in Good, go elsewhere. Vampires and other
-                    // By default, current equals base
+                    // evil creatores only beyond this point. You have been
-                    itemCopy.CurrentPermissions = itemCopy.BasePermissions & item.CurrentPermissions;
+                    // warned.
-                    // If this is an object, replace current perms
+                    // We're going to mask a lot of things by the next perms
-                    // with folded perms
+                    // Tweak the next perms to be nicer to our data
+                    //
+                    // In this mask, all the bits we do NOT want to mess
+                    // with are set. These are:
+                    //
+                    // Transfer
+                    // Copy
+                    // Modufy
+                    uint permsMask = ~ ((uint)PermissionMask.Copy |
+                                        (uint)PermissionMask.Transfer |
+                                        (uint)PermissionMask.Modify);
+                    // Now, reduce the next perms to the mask bits
+                    // relevant to the operation
+                    uint nextPerms = permsMask | (item.NextPermissions &
+                                      ((uint)PermissionMask.Copy |
+                                       (uint)PermissionMask.Transfer |
+                                       (uint)PermissionMask.Modify));
+                    // nextPerms now has all bits set, except for the actual
+                    // next permission bits.
+                    // This checks for no mod, no copy, no trans.
+                    // This indicates an error or messed up item. Do it like
+                    // SL and assume trans
+                    if (nextPerms == permsMask)
+                        nextPerms |= (uint)PermissionMask.Transfer;
+                    // Inventory owner perms are the logical AND of the
+                    // folded perms and the root prim perms, however, if
+                    // the root prim is mod, the inventory perms will be
+                    // mod. This happens on "take" and is of little concern
+                    // here, save for preventing escalation
+                    // This hack ensures that items previously permalocked
+                    // get unlocked when they're passed or rezzed
+                    uint basePerms = item.BasePermissions |
+                                    (uint)PermissionMask.Move;
+                    uint ownerPerms = item.CurrentPermissions;
+                    // If this is an object, root prim perms may be more
+                    // permissive than folded perms. Use folded perms as
+                    // a mask
                    if (item.InvType == (int)InventoryType.Object)
                    {
-                        itemCopy.CurrentPermissions &= ~(uint)(PermissionMask.Copy | PermissionMask.Modify | PermissionMask.Transfer);
+                        // Create a safe mask for the current perms
-                        itemCopy.CurrentPermissions |= (item.CurrentPermissions & 7) << 13;
+                        uint foldedPerms = (item.CurrentPermissions & 7) << 13;
+                        foldedPerms |= permsMask;
+                        bool isRootMod = (item.CurrentPermissions &
+                                          (uint)PermissionMask.Modify) != 0 ?
+                                          true : false;
+                        // Mask the owner perms to the folded perms
+                        ownerPerms &= foldedPerms;
+                        basePerms &= foldedPerms;
+                        // If the root was mod, let the mask reflect that
+                        // We also need to adjust the base here, because
+                        // we should be able to edit in-inventory perms
+                        // for the root prim, if it's mod.
+                        if (isRootMod)
+                        {
+                            ownerPerms |= (uint)PermissionMask.Modify;
+                            basePerms |= (uint)PermissionMask.Modify;
+                        }
                    }
-                    // Ensure there is no escalation
+                    // These will be applied to the root prim at next rez.
-                    itemCopy.CurrentPermissions &= (item.NextPermissions | (uint)PermissionMask.Move);
+                    // The slam bit (bit 3) and folded permission (bits 0-2)
+                    // are preserved due to the above mangling
+                    ownerPerms &= nextPerms;
-                    // Need slam bit on xfer
+                    // Mask the base permissions. This is a conservative
-                    itemCopy.CurrentPermissions |= 8;
+                    // approach altering only the three main perms
+                    basePerms &= nextPerms;
+                    // Assign to the actual item. Make sure the slam bit is
+                    // set, if it wasn't set before.
+                    itemCopy.BasePermissions = basePerms;
+                    itemCopy.CurrentPermissions = ownerPerms | 16; // Slam
                    itemCopy.NextPermissions = item.NextPermissions;
-                    itemCopy.EveryOnePermissions = 0;
+                    // This preserves "everyone can move"
+                    itemCopy.EveryOnePermissions = item.EveryOnePermissions &
+                                                   nextPerms;
+                    // Intentionally killing "share with group" here, as
+                    // the recipient will not have the group this is
+                    // set to
                    itemCopy.GroupPermissions = 0;
                }
                else
@@ -839,6 +916,9 @@ namespace OpenSim.Region.Framework.Scenes
            SceneObjectGroup group = part.ParentGroup;
            if (group != null)
            {
+                if (!Permissions.CanEditObjectInventory(part.UUID, remoteClient.AgentId))
+                    return;
+                
                TaskInventoryItem item = group.GetInventoryItem(localID, itemID);
                if (item == null)
                    return;
@@ -903,7 +983,7 @@ namespace OpenSim.Region.Framework.Scenes
                else
                    agentItem.CurrentPermissions = agentItem.BasePermissions & taskItem.CurrentPermissions;
-                agentItem.CurrentPermissions |= 8;
+                agentItem.CurrentPermissions |= 16; // Slam
                agentItem.NextPermissions = taskItem.NextPermissions;
                agentItem.EveryOnePermissions = taskItem.EveryonePermissions & (taskItem.NextPermissions | (uint)PermissionMask.Move);
                agentItem.GroupPermissions = taskItem.GroupPermissions & taskItem.NextPermissions;
@@ -978,9 +1058,21 @@ namespace OpenSim.Region.Framework.Scenes
                return;
            }
-            // Only owner can copy
+            TaskInventoryItem item = part.Inventory.GetInventoryItem(itemId);
-            if (remoteClient.AgentId != taskItem.OwnerID)
+            if ((item.CurrentPermissions & (uint)PermissionMask.Copy) == 0)
-                return;
+            {
+                // If the item to be moved is no copy, we need to be able to
+                // edit the prim.
+                if (!Permissions.CanEditObjectInventory(part.UUID, remoteClient.AgentId))
+                    return;
+            }
+            else
+            {
+                // If the item is copiable, then we just need to have perms
+                // on it. The delete check is a pure rights check
+                if (!Permissions.CanDeleteObject(part.UUID, remoteClient.AgentId))
+                    return;
+            }
            MoveTaskInventoryItem(remoteClient, folderId, part, itemId);
        }
@@ -1094,7 +1186,7 @@ namespace OpenSim.Region.Framework.Scenes
                            (srcTaskItem.NextPermissions | (uint)PermissionMask.Move);
                    destTaskItem.BasePermissions = srcTaskItem.BasePermissions &
                            (srcTaskItem.NextPermissions | (uint)PermissionMask.Move);
-                    destTaskItem.CurrentPermissions |= 8; // Slam!
+                    destTaskItem.CurrentPermissions |= 16; // Slam!
                }
            }
@@ -1263,10 +1355,48 @@ namespace OpenSim.Region.Framework.Scenes
                    {
                        agentTransactions.HandleTaskItemUpdateFromTransaction(
                            remoteClient, part, transactionID, currentItem);
+                        if ((InventoryType)itemInfo.InvType == InventoryType.Notecard) 
+                            remoteClient.SendAgentAlertMessage("Notecard saved", false);
+                        else if ((InventoryType)itemInfo.InvType == InventoryType.LSL)
+                            remoteClient.SendAgentAlertMessage("Script saved", false);
+                        else
+                            remoteClient.SendAgentAlertMessage("Item saved", false);
+                    }
+                    // Base ALWAYS has move
+                    currentItem.BasePermissions |= (uint)PermissionMask.Move;
+                    // Check if we're allowed to mess with permissions
+                    if (!Permissions.IsGod(remoteClient.AgentId)) // Not a god
+                    {
+                        if (remoteClient.AgentId != part.OwnerID) // Not owner
+                        {
+                            // Friends and group members can't change any perms
+                            itemInfo.BasePermissions = currentItem.BasePermissions;
+                            itemInfo.EveryonePermissions = currentItem.EveryonePermissions;
+                            itemInfo.GroupPermissions = currentItem.GroupPermissions;
+                            itemInfo.NextPermissions = currentItem.NextPermissions;
+                            itemInfo.CurrentPermissions = currentItem.CurrentPermissions;
+                        }
+                        else
+                        {
+                            // Owner can't change base, and can change other
+                            // only up to base
+                            itemInfo.BasePermissions = currentItem.BasePermissions;
+                            itemInfo.EveryonePermissions &= currentItem.BasePermissions;
+                            itemInfo.GroupPermissions &= currentItem.BasePermissions;
+                            itemInfo.CurrentPermissions &= currentItem.BasePermissions;
+                            itemInfo.NextPermissions &= currentItem.BasePermissions;
+                        }
                    }
+                    // Next ALWAYS has move
+                    itemInfo.NextPermissions |= (uint)PermissionMask.Move;
                    if (part.Inventory.UpdateInventoryItem(itemInfo))
                    {
-                        remoteClient.SendAgentAlertMessage("Notecard saved", false);                        
                        part.GetProperties(remoteClient);
                    }
                }
@@ -1478,7 +1608,7 @@ namespace OpenSim.Region.Framework.Scenes
                            srcTaskItem.NextPermissions;
                    destTaskItem.BasePermissions = srcTaskItem.BasePermissions &
                            srcTaskItem.NextPermissions;
-                    destTaskItem.CurrentPermissions |= 8; // Slam!
+                    destTaskItem.CurrentPermissions |= 16; // Slam!
                }
            }
@@ -1597,7 +1727,7 @@ namespace OpenSim.Region.Framework.Scenes
            }
            // Handle god perms
-            if (Permissions.IsGod(remoteClient.AgentId))
+            if ((remoteClient != null) && Permissions.IsGod(remoteClient.AgentId))
            {
                permissionToTake = true;
                permissionToTakeCopy = true;
@@ -1608,7 +1738,7 @@ namespace OpenSim.Region.Framework.Scenes
            if (action == DeRezAction.SaveToExistingUserInventoryItem)
                permissionToDelete = false;
-            // if we want to take a copy,, we also don't want to delete
+            // if we want to take a copy, we also don't want to delete
            // Note: after this point, the permissionToTakeCopy flag
            // becomes irrelevant. It already includes the permissionToTake
            // permission and after excluding no copy items here, we can
@@ -1619,6 +1749,7 @@ namespace OpenSim.Region.Framework.Scenes
                if (!permissionToTakeCopy)
                    return;
+                permissionToTake = true;
                // Don't delete
                permissionToDelete = false;
            }
@@ -1863,17 +1994,14 @@ namespace OpenSim.Region.Framework.Scenes
                    group.SetGroup(sourcePart.GroupID, null);
-                    if (rootPart.OwnerID != item.OwnerID)
+                    if ((rootPart.OwnerID != item.OwnerID) || (item.CurrentPermissions & 16) != 0)
                    {
                        if (Permissions.PropagatePermissions())
                        {
-                            if ((item.CurrentPermissions & 8) != 0)
+                            foreach (SceneObjectPart part in partList)
                            {
-                                foreach (SceneObjectPart part in partList)
+                                part.EveryoneMask = item.EveryonePermissions;
-                                {
+                                part.NextOwnerMask = item.NextPermissions;
-                                    part.EveryoneMask = item.EveryonePermissions;
-                                    part.NextOwnerMask = item.NextPermissions;
-                                }
                            }
                            group.ApplyNextOwnerPermissions();
                        }
@@ -1881,17 +2009,14 @@ namespace OpenSim.Region.Framework.Scenes
                    foreach (SceneObjectPart part in partList)
                    {
-                        if (part.OwnerID != item.OwnerID)
+                        if ((part.OwnerID != item.OwnerID) || (item.CurrentPermissions & 16) != 0)
                        {
                            part.LastOwnerID = part.OwnerID;
                            part.OwnerID = item.OwnerID;
                            part.Inventory.ChangeInventoryOwner(item.OwnerID);
                        }
-                        else if ((item.CurrentPermissions & 8) != 0) // Slam!
+                        part.EveryoneMask = item.EveryonePermissions;
-                        {
+                        part.NextOwnerMask = item.NextPermissions;
-                            part.EveryoneMask = item.EveryonePermissions;
-                            part.NextOwnerMask = item.NextPermissions;
-                        }
                    }
                    
                    rootPart.TrimPermissions();
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 5542a0c..e8dce08 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -136,6 +136,7 @@ namespace OpenSim.Region.Framework.Scenes
        protected SceneCommunicationService m_sceneGridService;
        public bool LoginsDisabled = true;
+        public bool LoadingPrims = false;
        public new float TimeDilation
        {
@@ -478,8 +479,6 @@ namespace OpenSim.Region.Framework.Scenes
            set { m_sceneGraph.RestorePresences = value; }
        }
-        public int objectCapacity = 45000;
        #endregion
        #region BinaryStats
@@ -687,7 +686,7 @@ namespace OpenSim.Region.Framework.Scenes
            StatsReporter.OnSendStatsResult += SendSimStatsPackets;
            StatsReporter.OnStatsIncorrect += m_sceneGraph.RecalculateStats;
-            StatsReporter.SetObjectCapacity(objectCapacity);
+            StatsReporter.SetObjectCapacity(RegionInfo.ObjectCapacity);
            // Old
            /*
@@ -1879,6 +1878,7 @@ namespace OpenSim.Region.Framework.Scenes
        /// </summary>
        public virtual void LoadPrimsFromStorage(UUID regionID)
        {
+            LoadingPrims = true;
            m_log.Info("[SCENE]: Loading objects from datastore");
            List<SceneObjectGroup> PrimsFromDB = m_storageManager.DataStore.LoadObjects(regionID);
@@ -1904,6 +1904,7 @@ namespace OpenSim.Region.Framework.Scenes
            }
            m_log.Info("[SCENE]: Loaded " + PrimsFromDB.Count.ToString() + " SceneObject(s)");
+            LoadingPrims = false;
        }
@@ -2575,8 +2576,7 @@ namespace OpenSim.Region.Framework.Scenes
                    RootPrim.RemFlag(PrimFlags.TemporaryOnRez);
                    
                    if (AttachmentsModule != null)
-                        AttachmentsModule.AttachObject(
+                        AttachmentsModule.AttachObject(sp.ControllingClient, grp, 0, false);
-                            sp.ControllingClient, grp.LocalId, (uint)0, grp.GroupRotation, grp.AbsolutePosition, false);
                }
                else
@@ -4121,20 +4121,6 @@ namespace OpenSim.Region.Framework.Scenes
        #region Other Methods
-        public void SetObjectCapacity(int objects)
-        {
-            // Region specific config overrides global
-            //
-            if (RegionInfo.ObjectCapacity != 0)
-                objects = RegionInfo.ObjectCapacity;
-            if (StatsReporter != null)
-            {
-                StatsReporter.SetObjectCapacity(objects);
-            }
-            objectCapacity = objects;
-        }
        #endregion
        public void HandleObjectPermissionsUpdate(IClientAPI controller, UUID agentID, UUID sessionID, byte field, uint localId, uint mask, byte set)
@@ -4733,7 +4719,7 @@ namespace OpenSim.Region.Framework.Scenes
                                           part.NextOwnerMask;
                item.GroupPermissions = part.GroupMask &
                                           part.NextOwnerMask;
-                item.CurrentPermissions |= 8; // Slam!
+                item.CurrentPermissions |= 16; // Slam!
                item.CreationDate = Util.UnixTimeSinceEpoch();
                if (InventoryService.AddItem(item))
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs
index f7e46af..9a01a28 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs
@@ -172,13 +172,14 @@ namespace OpenSim.Region.Framework.Scenes
                    taskItem.GroupPermissions = item.GroupPermissions &
                            item.NextPermissions;
                    taskItem.NextPermissions = item.NextPermissions;
-                    taskItem.CurrentPermissions |= 8;
+                    // We're adding this to a prim we don't own. Force
+                    // owner change
+                    taskItem.CurrentPermissions |= 16; // Slam
                } 
                else 
                {
                    taskItem.BasePermissions = item.BasePermissions;
                    taskItem.CurrentPermissions = item.CurrentPermissions;
-                    taskItem.CurrentPermissions |= 8;
                    taskItem.EveryonePermissions = item.EveryOnePermissions;
                    taskItem.GroupPermissions = item.GroupPermissions;
                    taskItem.NextPermissions = item.NextPermissions;
@@ -281,7 +282,7 @@ namespace OpenSim.Region.Framework.Scenes
                              PermissionMask.Move |
                              PermissionMask.Transfer) | 7;
-            uint ownerMask = 0x7ffffff;
+            uint ownerMask = 0x7fffffff;
            foreach (SceneObjectPart part in m_parts.Values)
            {
                ownerMask &= part.OwnerMask;
@@ -295,12 +296,16 @@ namespace OpenSim.Region.Framework.Scenes
            if ((ownerMask & (uint)PermissionMask.Transfer) == 0)
                perms &= ~(uint)PermissionMask.Transfer;
-            if ((ownerMask & RootPart.NextOwnerMask & (uint)PermissionMask.Modify) == 0)
+            // If root prim permissions are applied here, this would screw
-                perms &= ~((uint)PermissionMask.Modify >> 13);
+            // with in-inventory manipulation of the next owner perms
-            if ((ownerMask & RootPart.NextOwnerMask & (uint)PermissionMask.Copy) == 0)
+            // in a major way. So, let's move this to the give itself.
-                perms &= ~((uint)PermissionMask.Copy >> 13);
+            // Yes. I know. Evil.
-            if ((ownerMask & RootPart.NextOwnerMask & (uint)PermissionMask.Transfer) == 0)
+//            if ((ownerMask & RootPart.NextOwnerMask & (uint)PermissionMask.Modify) == 0)
-                perms &= ~((uint)PermissionMask.Transfer >> 13);
+//                perms &= ~((uint)PermissionMask.Modify >> 13);
+//            if ((ownerMask & RootPart.NextOwnerMask & (uint)PermissionMask.Copy) == 0)
+//                perms &= ~((uint)PermissionMask.Copy >> 13);
+//            if ((ownerMask & RootPart.NextOwnerMask & (uint)PermissionMask.Transfer) == 0)
+//                perms &= ~((uint)PermissionMask.Transfer >> 13);
            return perms;
        }
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 451b93e..c2f9117 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -294,7 +294,7 @@ namespace OpenSim.Region.Framework.Scenes
                if ((m_scene.TestBorderCross(val - Vector3.UnitX, Cardinals.E) || m_scene.TestBorderCross(val + Vector3.UnitX, Cardinals.W)
                    || m_scene.TestBorderCross(val - Vector3.UnitY, Cardinals.N) || m_scene.TestBorderCross(val + Vector3.UnitY, Cardinals.S)) 
-                    && !IsAttachmentCheckFull())
+                    && !IsAttachmentCheckFull() && (!m_scene.LoadingPrims))
                {
                    m_scene.CrossPrimGroupIntoNewRegion(val, this, true);
                }
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 3165f4d..444a239 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -181,6 +181,9 @@ namespace OpenSim.Region.Framework.Scenes
        public UUID FromItemID;
        [XmlIgnore]
+        public UUID FromFolderID;
+        [XmlIgnore]
        public int STATUS_ROTATE_X;
        [XmlIgnore]
@@ -4164,6 +4167,13 @@ namespace OpenSim.Region.Framework.Scenes
                    case 16:
                        _nextOwnerMask = ApplyMask(_nextOwnerMask, set, mask) &
                                baseMask;
+                        // Prevent the client from creating no mod, no copy
+                        // objects
+                        if ((_nextOwnerMask & (uint)PermissionMask.Copy) == 0)
+                            _nextOwnerMask |= (uint)PermissionMask.Transfer;
+                        _nextOwnerMask |= (uint)PermissionMask.Move;
                        break;
                }
                SendFullUpdateToAllClients();
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
index 3a8f168..4ae53a2 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
@@ -118,20 +118,20 @@ namespace OpenSim.Region.Framework.Scenes
        /// <param name="linkNum">Link number for the part</param>
        public void ResetInventoryIDs()
        {
-            lock (Items)
+            lock (m_items)
            {
-                if (0 == Items.Count)
+                if (0 == m_items.Count)
                    return;
                HasInventoryChanged = true;
                m_part.ParentGroup.HasGroupChanged = true;
-                IList<TaskInventoryItem> items = new List<TaskInventoryItem>(Items.Values);
+                IList<TaskInventoryItem> items = GetInventoryItems();
-                Items.Clear();
+                m_items.Clear();
                foreach (TaskInventoryItem item in items)
                {
                    item.ResetIDs(m_part.UUID);
-                    Items.Add(item.ItemID, item);
+                    m_items.Add(item.ItemID, item);
                }
            }
        }
@@ -148,17 +148,17 @@ namespace OpenSim.Region.Framework.Scenes
                {
                    return;
                }
+            }
-                HasInventoryChanged = true;
+            HasInventoryChanged = true;
-                m_part.ParentGroup.HasGroupChanged = true;
+            m_part.ParentGroup.HasGroupChanged = true;
-                IList<TaskInventoryItem> items = new List<TaskInventoryItem>(Items.Values);
+            List<TaskInventoryItem> items = GetInventoryItems();
-                foreach (TaskInventoryItem item in items)
+            foreach (TaskInventoryItem item in items)
+            {
+                if (ownerId != item.OwnerID)
                {
-                    if (ownerId != item.OwnerID)
+                    item.LastOwnerID = item.OwnerID;
-                    {
+                    item.OwnerID = ownerId;
-                        item.LastOwnerID = item.OwnerID;
-                        item.OwnerID = ownerId;
-                    }
                }
            }
        }
@@ -175,17 +175,15 @@ namespace OpenSim.Region.Framework.Scenes
                {
                    return;
                }
+            }
-                HasInventoryChanged = true;
+            HasInventoryChanged = true;
-                m_part.ParentGroup.HasGroupChanged = true;
+            m_part.ParentGroup.HasGroupChanged = true;
-                IList<TaskInventoryItem> items = new List<TaskInventoryItem>(Items.Values);
+            List<TaskInventoryItem> items = GetInventoryItems();
-                foreach (TaskInventoryItem item in items)
+            foreach (TaskInventoryItem item in items)
-                {
+            {
-                    if (groupID != item.GroupID)
+                if (groupID != item.GroupID)
-                    {
+                    item.GroupID = groupID;
-                        item.GroupID = groupID;
-                    }
-                }
            }
        }
@@ -194,17 +192,9 @@ namespace OpenSim.Region.Framework.Scenes
        /// </summary>
        public void CreateScriptInstances(int startParam, bool postOnRez, string engine, int stateSource)
        {
-            lock (m_items)
+            List<TaskInventoryItem> scripts = GetInventoryScripts();
-            {
+            foreach (TaskInventoryItem item in scripts)
-                foreach (TaskInventoryItem item in Items.Values)
+                CreateScriptInstance(item, startParam, postOnRez, engine, stateSource);
-                {
-                    if ((int)InventoryType.LSL == item.InvType)
-                    {
-                        CreateScriptInstance(item, startParam, postOnRez, engine, stateSource);
-                        Thread.Sleep(10); // workaround for Mono cpu utilization > 100% bug
-                    }
-                }
-            }
        }
        public ArrayList GetScriptErrors(UUID itemID)
@@ -237,16 +227,9 @@ namespace OpenSim.Region.Framework.Scenes
        /// </param>
        public void RemoveScriptInstances(bool sceneObjectBeingDeleted)
        {
-            lock (Items)
+            List<TaskInventoryItem> scripts = GetInventoryScripts();
-            {
+            foreach (TaskInventoryItem item in scripts)
-                foreach (TaskInventoryItem item in Items.Values)
+                RemoveScriptInstance(item.ItemID, sceneObjectBeingDeleted);
-                {
-                    if ((int)InventoryType.LSL == item.InvType)
-                    {
-                        RemoveScriptInstance(item.ItemID, sceneObjectBeingDeleted);
-                    }
-                }
-            }
        }
        /// <summary>
@@ -259,7 +242,7 @@ namespace OpenSim.Region.Framework.Scenes
            // m_log.InfoFormat(
            //     "[PRIM INVENTORY]: " +
            //     "Starting script {0}, {1} in prim {2}, {3}",
-            //     item.Name, item.ItemID, m_part.Name, m_part.UUID);
+            //     item.Name, item.ItemID, Name, UUID);
            if (!m_part.ParentGroup.Scene.Permissions.CanRunScript(item.ItemID, m_part.UUID, item.OwnerID))
                return;
@@ -295,20 +278,20 @@ namespace OpenSim.Region.Framework.Scenes
                }
                else
                {
+                    if (m_part.ParentGroup.m_savedScriptState != null)
+                        RestoreSavedScriptState(item.OldItemID, item.ItemID);
                    lock (m_items)
                    {
-                        if (m_part.ParentGroup.m_savedScriptState != null)
-                            RestoreSavedScriptState(item.OldItemID, item.ItemID);
                        m_items[item.ItemID].PermsMask = 0;
                        m_items[item.ItemID].PermsGranter = UUID.Zero;
-                        string script = Utils.BytesToString(asset.Data);
-                        m_part.ParentGroup.Scene.EventManager.TriggerRezScript(
-                            m_part.LocalId, item.ItemID, script, startParam, postOnRez, engine, stateSource);
-                        m_part.ParentGroup.AddActiveScriptCount(1);
-                        m_part.ScheduleFullUpdate();
                    }
+                
+                    string script = Utils.BytesToString(asset.Data);
+                    m_part.ParentGroup.Scene.EventManager.TriggerRezScript(
+                        m_part.LocalId, item.ItemID, script, startParam, postOnRez, engine, stateSource);
+                    m_part.ParentGroup.AddActiveScriptCount(1);
+                    m_part.ScheduleFullUpdate();
                }
            }
        }
@@ -376,21 +359,15 @@ namespace OpenSim.Region.Framework.Scenes
        /// </param>
        public void CreateScriptInstance(UUID itemId, int startParam, bool postOnRez, string engine, int stateSource)
        {
-            lock (m_items)
+            TaskInventoryItem item = GetInventoryItem(itemId);
-            {
+            if (item != null)
-                if (m_items.ContainsKey(itemId))
+                CreateScriptInstance(item, startParam, postOnRez, engine, stateSource);
-                {
+            else
-                    CreateScriptInstance(m_items[itemId], startParam, postOnRez, engine, stateSource);
+                m_log.ErrorFormat(
-                }
+                    "[PRIM INVENTORY]: " +
-                else
+                    "Couldn't start script with ID {0} since it couldn't be found for prim {1}, {2} at {3} in {4}",
-                {
+                    itemId, m_part.Name, m_part.UUID, 
-                    m_log.ErrorFormat(
+                    m_part.AbsolutePosition, m_part.ParentGroup.Scene.RegionInfo.RegionName);
-                        "[PRIM INVENTORY]: " +
-                        "Couldn't start script with ID {0} since it couldn't be found for prim {1}, {2} at {3} in {4}",
-                        itemId, m_part.Name, m_part.UUID, 
-                        m_part.AbsolutePosition, m_part.ParentGroup.Scene.RegionInfo.RegionName);
-                }
-            }
        }
        /// <summary>
@@ -431,16 +408,18 @@ namespace OpenSim.Region.Framework.Scenes
        /// <summary>
        /// Check if the inventory holds an item with a given name.
-        /// This method assumes that the task inventory is already locked.
        /// </summary>
        /// <param name="name"></param>
        /// <returns></returns>
        private bool InventoryContainsName(string name)
        {
-            foreach (TaskInventoryItem item in Items.Values)
+            lock (m_items)
            {
-                if (item.Name == name)
+                foreach (TaskInventoryItem item in m_items.Values)
-                    return true;
+                {
+                    if (item.Name == name)
+                        return true;
+                }
            }
            return false;
        }
@@ -483,12 +462,7 @@ namespace OpenSim.Region.Framework.Scenes
        /// <param name="item"></param>
        public void AddInventoryItemExclusive(TaskInventoryItem item, bool allowedDrop)
        {
-            List<TaskInventoryItem> il;
+            List<TaskInventoryItem> il = GetInventoryItems();
-            lock (m_items)
-            {
-                il = new List<TaskInventoryItem>(m_items.Values);
-            }
            
            foreach (TaskInventoryItem i in il)
            {
@@ -528,14 +502,12 @@ namespace OpenSim.Region.Framework.Scenes
            item.GroupID = m_part.GroupID;
            lock (m_items)
-            {
                m_items.Add(item.ItemID, item);
-                if (allowedDrop) 
+            if (allowedDrop) 
-                    m_part.TriggerScriptChangedEvent(Changed.ALLOWED_DROP);
+                m_part.TriggerScriptChangedEvent(Changed.ALLOWED_DROP);
-                else
+            else
-                    m_part.TriggerScriptChangedEvent(Changed.INVENTORY);
+                m_part.TriggerScriptChangedEvent(Changed.INVENTORY);
-            }
            m_inventorySerial++;
            //m_inventorySerial += 2;
@@ -559,9 +531,8 @@ namespace OpenSim.Region.Framework.Scenes
                    m_items.Add(item.ItemID, item);
 //                    m_part.TriggerScriptChangedEvent(Changed.INVENTORY);
                }
+                m_inventorySerial++;
            }
-            m_inventorySerial++;
        }
        /// <summary>
@@ -616,45 +587,44 @@ namespace OpenSim.Region.Framework.Scenes
        public bool UpdateInventoryItem(TaskInventoryItem item, bool fireScriptEvents)
        {
-            lock(m_items)
+            TaskInventoryItem it = GetInventoryItem(item.ItemID);
+            if (it != null)
            {
-                if (m_items.ContainsKey(item.ItemID))
+                item.ParentID = m_part.UUID;
-                {
+                item.ParentPartID = m_part.UUID;
-                    if (m_items.ContainsKey(item.ItemID))
+                item.Flags = m_items[item.ItemID].Flags;
-                    {
-                        item.ParentID = m_part.UUID;
+                // If group permissions have been set on, check that the groupID is up to date in case it has
-                        item.ParentPartID = m_part.UUID;
+                // changed since permissions were last set.
-                        item.Flags = m_items[item.ItemID].Flags;
+                if (item.GroupPermissions != (uint)PermissionMask.None)
+                    item.GroupID = m_part.GroupID;
-                        // If group permissions have been set on, check that the groupID is up to date in case it has
-                        // changed since permissions were last set.
+                if (item.AssetID == UUID.Zero)
-                        if (item.GroupPermissions != (uint)PermissionMask.None)
+                    item.AssetID = it.AssetID;
-                            item.GroupID = m_part.GroupID;
-                        
-                        if (item.AssetID == UUID.Zero)
-                        {
-                            item.AssetID = m_items[item.ItemID].AssetID;
-                        }
-                        m_items[item.ItemID] = item;
-                        m_inventorySerial++;
-                        if (fireScriptEvents)
-                            m_part.TriggerScriptChangedEvent(Changed.INVENTORY);
-                        HasInventoryChanged = true;
-                        m_part.ParentGroup.HasGroupChanged = true;
-                        return true;
-                    }
-                    else
-                    {
-                        m_log.ErrorFormat(
-                            "[PRIM INVENTORY]: " +
-                            "Tried to retrieve item ID {0} from prim {1}, {2} at {3} in {4} but the item does not exist in this inventory",
-                            item.ItemID, m_part.Name, m_part.UUID, 
-                            m_part.AbsolutePosition, m_part.ParentGroup.Scene.RegionInfo.RegionName);
-                    }
+                lock (m_items)
+                {
+                    m_items[item.ItemID] = item;
+                    m_inventorySerial++;
                }
-                return false;
+                if (fireScriptEvents)
+                    m_part.TriggerScriptChangedEvent(Changed.INVENTORY);
+                HasInventoryChanged = true;
+                m_part.ParentGroup.HasGroupChanged = true;
+                return true;
            }
+            else
+            {
+                m_log.ErrorFormat(
+                    "[PRIM INVENTORY]: " +
+                    "Tried to retrieve item ID {0} from prim {1}, {2} at {3} in {4} but the item does not exist in this inventory",
+                    item.ItemID, m_part.Name, m_part.UUID, 
+                    m_part.AbsolutePosition, m_part.ParentGroup.Scene.RegionInfo.RegionName);
+            }
+            return false;
        }
        /// <summary>
@@ -665,52 +635,37 @@ namespace OpenSim.Region.Framework.Scenes
        /// in this prim's inventory.</returns>
        public int RemoveInventoryItem(UUID itemID)
        {
-            lock (m_items)
+            TaskInventoryItem item = GetInventoryItem(itemID);
+            if (item != null)
            {
-                if (m_items.ContainsKey(itemID))
+                int type = m_items[itemID].InvType;
+                if (type == 10) // Script
                {
-                    int type = m_items[itemID].InvType;
+                    m_part.RemoveScriptEvents(itemID);
-                    if (type == 10) // Script
+                    m_part.ParentGroup.Scene.EventManager.TriggerRemoveScript(m_part.LocalId, itemID);
-                    {
+                }
-                        m_part.RemoveScriptEvents(itemID);
+                m_items.Remove(itemID);
-                        m_part.ParentGroup.Scene.EventManager.TriggerRemoveScript(m_part.LocalId, itemID);
+                m_inventorySerial++;
-                    }
+                m_part.TriggerScriptChangedEvent(Changed.INVENTORY);
-                    m_items.Remove(itemID);
-                    m_inventorySerial++;
-                    m_part.TriggerScriptChangedEvent(Changed.INVENTORY);
-                    HasInventoryChanged = true;
-                    m_part.ParentGroup.HasGroupChanged = true;
-                    int scriptcount = 0;
+                HasInventoryChanged = true;
-                    lock (m_items)
+                m_part.ParentGroup.HasGroupChanged = true;
-                    {
-                        foreach (TaskInventoryItem item in m_items.Values)
-                        {
-                            if (item.Type == 10)
-                            {
-                                scriptcount++;
-                            }
-                        }
-                    }
-                    if (scriptcount <= 0)
+                if (!ContainsScripts())
-                    {
+                    m_part.RemFlag(PrimFlags.Scripted);
-                        m_part.RemFlag(PrimFlags.Scripted);
-                    }
-                    m_part.ScheduleFullUpdate();
+                m_part.ScheduleFullUpdate();
-                    return type;
+                return type;
-                }
+                
-                else
+            }
-                {
+            else
-                    m_log.ErrorFormat(
+            {
-                        "[PRIM INVENTORY]: " +
+                m_log.ErrorFormat(
-                        "Tried to remove item ID {0} from prim {1}, {2} at {3} in {4} but the item does not exist in this inventory",
+                    "[PRIM INVENTORY]: " +
-                        itemID, m_part.Name, m_part.UUID, 
+                    "Tried to remove item ID {0} from prim {1}, {2} at {3} in {4} but the item does not exist in this inventory",
-                        m_part.AbsolutePosition, m_part.ParentGroup.Scene.RegionInfo.RegionName);
+                    itemID, m_part.Name, m_part.UUID,
-                }
+                    m_part.AbsolutePosition, m_part.ParentGroup.Scene.RegionInfo.RegionName);
            }
            return -1;
@@ -764,52 +719,50 @@ namespace OpenSim.Region.Framework.Scenes
            // isn't available (such as drag from prim inventory to agent inventory)
            InventoryStringBuilder invString = new InventoryStringBuilder(m_part.UUID, UUID.Zero);
-            lock (m_items)
+            List<TaskInventoryItem> items = GetInventoryItems();
+            foreach (TaskInventoryItem item in items)
            {
-                foreach (TaskInventoryItem item in m_items.Values)
+                UUID ownerID = item.OwnerID;
-                {
+                uint everyoneMask = 0;
-                    UUID ownerID = item.OwnerID;
+                uint baseMask = item.BasePermissions;
-                    uint everyoneMask = 0;
+                uint ownerMask = item.CurrentPermissions;
-                    uint baseMask = item.BasePermissions;
+                uint groupMask = item.GroupPermissions;
-                    uint ownerMask = item.CurrentPermissions;
-                    uint groupMask = item.GroupPermissions;
-                    invString.AddItemStart();
+                invString.AddItemStart();
-                    invString.AddNameValueLine("item_id", item.ItemID.ToString());
+                invString.AddNameValueLine("item_id", item.ItemID.ToString());
-                    invString.AddNameValueLine("parent_id", m_part.UUID.ToString());
+                invString.AddNameValueLine("parent_id", m_part.UUID.ToString());
-                    invString.AddPermissionsStart();
+                invString.AddPermissionsStart();
-                    invString.AddNameValueLine("base_mask", Utils.UIntToHexString(baseMask));
+                invString.AddNameValueLine("base_mask", Utils.UIntToHexString(baseMask));
-                    invString.AddNameValueLine("owner_mask", Utils.UIntToHexString(ownerMask));
+                invString.AddNameValueLine("owner_mask", Utils.UIntToHexString(ownerMask));
-                    invString.AddNameValueLine("group_mask", Utils.UIntToHexString(groupMask));
+                invString.AddNameValueLine("group_mask", Utils.UIntToHexString(groupMask));
-                    invString.AddNameValueLine("everyone_mask", Utils.UIntToHexString(everyoneMask));
+                invString.AddNameValueLine("everyone_mask", Utils.UIntToHexString(everyoneMask));
-                    invString.AddNameValueLine("next_owner_mask", Utils.UIntToHexString(item.NextPermissions));
+                invString.AddNameValueLine("next_owner_mask", Utils.UIntToHexString(item.NextPermissions));
-                    invString.AddNameValueLine("creator_id", item.CreatorID.ToString());
+                invString.AddNameValueLine("creator_id", item.CreatorID.ToString());
-                    invString.AddNameValueLine("owner_id", ownerID.ToString());
+                invString.AddNameValueLine("owner_id", ownerID.ToString());
-                    invString.AddNameValueLine("last_owner_id", item.LastOwnerID.ToString());
+                invString.AddNameValueLine("last_owner_id", item.LastOwnerID.ToString());
-                    invString.AddNameValueLine("group_id", item.GroupID.ToString());
+                invString.AddNameValueLine("group_id", item.GroupID.ToString());
-                    invString.AddSectionEnd();
+                invString.AddSectionEnd();
-                    invString.AddNameValueLine("asset_id", item.AssetID.ToString());
+                invString.AddNameValueLine("asset_id", item.AssetID.ToString());
-                    invString.AddNameValueLine("type", TaskInventoryItem.Types[item.Type]);
+                invString.AddNameValueLine("type", TaskInventoryItem.Types[item.Type]);
-                    invString.AddNameValueLine("inv_type", TaskInventoryItem.InvTypes[item.InvType]);
+                invString.AddNameValueLine("inv_type", TaskInventoryItem.InvTypes[item.InvType]);
-                    invString.AddNameValueLine("flags", Utils.UIntToHexString(item.Flags));
+                invString.AddNameValueLine("flags", Utils.UIntToHexString(item.Flags));
-                    invString.AddSaleStart();
+                invString.AddSaleStart();
-                    invString.AddNameValueLine("sale_type", "not");
+                invString.AddNameValueLine("sale_type", "not");
-                    invString.AddNameValueLine("sale_price", "0");
+                invString.AddNameValueLine("sale_price", "0");
-                    invString.AddSectionEnd();
+                invString.AddSectionEnd();
-                    invString.AddNameValueLine("name", item.Name + "|");
+                invString.AddNameValueLine("name", item.Name + "|");
-                    invString.AddNameValueLine("desc", item.Description + "|");
+                invString.AddNameValueLine("desc", item.Description + "|");
-                    invString.AddNameValueLine("creation_date", item.CreationDate.ToString());
+                invString.AddNameValueLine("creation_date", item.CreationDate.ToString());
-                    invString.AddSectionEnd();
+                invString.AddSectionEnd();
-                }
            }
            fileData = Utils.StringToBytes(invString.BuildString);
@@ -831,12 +784,10 @@ namespace OpenSim.Region.Framework.Scenes
        {
            if (HasInventoryChanged)
            {
-                lock (Items)
-                {
-                    datastore.StorePrimInventory(m_part.UUID, Items.Values);
-                }
                HasInventoryChanged = false;
+                List<TaskInventoryItem> items = GetInventoryItems();
+                datastore.StorePrimInventory(m_part.UUID, items);
            }
        }
@@ -952,7 +903,6 @@ namespace OpenSim.Region.Framework.Scenes
                            item.CurrentPermissions &= ~(uint)PermissionMask.Transfer;
                        if ((item.CurrentPermissions & ((uint)PermissionMask.Modify >> 13)) == 0)
                            item.CurrentPermissions &= ~(uint)PermissionMask.Modify;
-                        item.CurrentPermissions |= 8;
                    }
                    item.CurrentPermissions &= item.NextPermissions;
                    item.BasePermissions &= item.NextPermissions;
@@ -1002,6 +952,30 @@ namespace OpenSim.Region.Framework.Scenes
            return ret;
        }
+        public List<TaskInventoryItem> GetInventoryItems()
+        {
+           List<TaskInventoryItem> ret = new List<TaskInventoryItem>();
+            lock (m_items)
+                ret = new List<TaskInventoryItem>(m_items.Values);
+            return ret;
+        }
+        public List<TaskInventoryItem> GetInventoryScripts()
+        {
+            List<TaskInventoryItem> ret = new List<TaskInventoryItem>();
+            lock (m_items)
+            {
+                foreach (TaskInventoryItem item in m_items.Values)
+                    if (item.InvType == (int)InventoryType.LSL)
+                        ret.Add(item);
+            }
+            return ret;
+        }
        
        public Dictionary<UUID, string> GetScriptStates()
        {
@@ -1011,24 +985,20 @@ namespace OpenSim.Region.Framework.Scenes
            if (engines == null) // No engine at all
                return ret;
-            lock (m_items)
+            List<TaskInventoryItem> scripts = GetInventoryScripts();
+            foreach (TaskInventoryItem item in scripts)
            {
-                foreach (TaskInventoryItem item in m_items.Values)
+                foreach (IScriptModule e in engines)
                {
-                    if (item.InvType == (int)InventoryType.LSL)
+                    if (e != null)
                    {
-                        foreach (IScriptModule e in engines)
+                        string n = e.GetXMLState(item.ItemID);
+                        if (n != String.Empty)
                        {
-                            if (e != null)
+                            if (!ret.ContainsKey(item.ItemID))
-                            {
+                                ret[item.ItemID] = n;
-                                string n = e.GetXMLState(item.ItemID);
+                            break;
-                                if (n != String.Empty)
-                                {
-                                    if (!ret.ContainsKey(item.ItemID))
-                                        ret[item.ItemID] = n;
-                                    break;
-                                }
-                            }
                        }
                    }
                }
@@ -1043,25 +1013,22 @@ namespace OpenSim.Region.Framework.Scenes
            if (engines == null)
                return;
-            lock (m_items)
+            List<TaskInventoryItem> scripts = GetInventoryScripts();
+            foreach (TaskInventoryItem item in scripts)
            {
-                foreach (TaskInventoryItem item in m_items.Values)
+                foreach (IScriptModule engine in engines)
                {
-                    if (item.InvType == (int)InventoryType.LSL)
+                    if (engine != null)
                    {
-                        foreach (IScriptModule engine in engines)
+                        if (item.OwnerChanged)
-                        {
+                            engine.PostScriptEvent(item.ItemID, "changed", new Object[] { (int)Changed.OWNER });
-                            if (engine != null)
+                        item.OwnerChanged = false;
-                            {
+                        engine.ResumeScript(item.ItemID);
-                                if (item.OwnerChanged)
-                                    engine.PostScriptEvent(item.ItemID, "changed", new Object[] { (int)Changed.OWNER });
-                                item.OwnerChanged = false;
-                                engine.ResumeScript(item.ItemID);
-                            }
-                        }
                    }
-                }
+                }  
            }
        }
    }
 }
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 6c119c2..1e8ce22 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -60,7 +60,6 @@ namespace OpenSim.Region.Framework.Scenes
    struct ScriptControllers
    {
        public UUID itemID;
-        public uint objID;
        public ScriptControlled ignoreControls;
        public ScriptControlled eventControls;
    }
@@ -3057,6 +3056,18 @@ namespace OpenSim.Region.Framework.Scenes
                cAgent.Attachments = attachs;
            }
+            lock (scriptedcontrols)
+            {
+                ControllerData[] controls = new ControllerData[scriptedcontrols.Count];
+                int i = 0;
+                foreach (ScriptControllers c in scriptedcontrols.Values)
+                {
+                    controls[i++] = new ControllerData(c.itemID, (uint)c.ignoreControls, (uint)c.eventControls);
+                }
+                cAgent.Controllers = controls;
+            }
            // Animations
            try
            {
@@ -3137,6 +3148,27 @@ namespace OpenSim.Region.Framework.Scenes
            }
            catch { } 
+            try
+            {
+                lock (scriptedcontrols)
+                {
+                    if (cAgent.Controllers != null)
+                    {
+                        scriptedcontrols.Clear();
+                        foreach (ControllerData c in cAgent.Controllers)
+                        {
+                            ScriptControllers sc = new ScriptControllers();
+                            sc.itemID = c.ItemID;
+                            sc.ignoreControls = (ScriptControlled)c.IgnoreControls;
+                            sc.eventControls = (ScriptControlled)c.EventControls;
+                            scriptedcontrols[sc.itemID] = sc;
+                        }
+                    }
+                }
+            }
+            catch { }
            // Animations
            try
            {
@@ -3468,7 +3500,6 @@ namespace OpenSim.Region.Framework.Scenes
            obj.eventControls = ScriptControlled.CONTROL_ZERO;
            obj.itemID = Script_item_UUID;
-            obj.objID = Obj_localID;
            if (pass_on == 0 && accept == 0)
            {
                IgnoredControls |= (ScriptControlled)controls;
@@ -3611,7 +3642,7 @@ namespace OpenSim.Region.Framework.Scenes
                        if (localHeld != ScriptControlled.CONTROL_ZERO || localChange != ScriptControlled.CONTROL_ZERO)
                        {
                            // only send if still pressed or just changed
-                            m_scene.EventManager.TriggerControlEvent(scriptControlData.objID, scriptUUID, UUID, (uint)localHeld, (uint)localChange);
+                            m_scene.EventManager.TriggerControlEvent(scriptUUID, UUID, (uint)localHeld, (uint)localChange);
                        }
                    }
                }
diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
index 754b925..ee7aa2da 100644
--- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
+++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
@@ -1055,11 +1055,6 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
            
        }
-        public void AttachObject(uint localID, Quaternion rotation, byte attachPoint, UUID ownerID)
-        {
-            
-        }
        public void SendAvatarDataImmediate(ISceneEntity avatar)
        {
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs
index 56c0d98..3f15b69 100644
--- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs
@@ -722,11 +722,11 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
            if (money != null)
            {
                // do the transaction, that is if the agent has got sufficient funds
-                if (!money.GroupCreationCovered(remoteClient)) {
+                if (!money.AmountCovered(remoteClient, money.GroupCreationCharge)) {
                    remoteClient.SendCreateGroupReply(UUID.Zero, false, "You have got issuficient funds to create a group.");
                    return UUID.Zero;
                }
-                money.ApplyGroupCreationCharge(GetRequestingAgentID(remoteClient));
+                money.ApplyCharge(GetRequestingAgentID(remoteClient), money.GroupCreationCharge, "Group Creation");
            }
            UUID groupID = m_groupData.CreateGroup(GetRequestingAgentID(remoteClient), name, charter, showInList, insigniaID, membershipFee, openEnrollment, allowPublish, maturePublish, GetRequestingAgentID(remoteClient));
diff --git a/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs b/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
index b9a75cc..653f856 100644
--- a/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
+++ b/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
@@ -108,6 +108,16 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
        public event ObjectPaid OnObjectPaid;
+        public int UploadCharge
+        {
+            get { return 0; }
+        }
+        public int GroupCreationCharge
+        {
+            get { return 0; }
+        }
        /// <summary>
        /// Startup
        /// </summary>
@@ -128,8 +138,6 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
        public void AddRegion(Scene scene)
        {
            // Send ObjectCapacity to Scene..  Which sends it to the SimStatsReporter.
-            scene.SetObjectCapacity(ObjectCapacity);
            if (m_enabled)
            {
                scene.RegisterModuleInterface<IMoneyModule>(this);
@@ -188,15 +196,10 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
        // Please do not refactor these to be just one method
        // Existing implementations need the distinction
        //
-        public void ApplyUploadCharge(UUID agentID)
+        public void ApplyCharge(UUID agentID, int amount, string text)
-        {
-        }
-        public void ApplyGroupCreationCharge(UUID agentID)
        {
        }
+        public void ApplyUploadCharge(UUID agentID, int amount, string text)
-        public void ApplyCharge(UUID agentID, int amount, string text)
        {
        }
@@ -247,7 +250,6 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
            if (config == "Economy" && startupConfig != null)
            {
-                ObjectCapacity = startupConfig.GetInt("ObjectCapacity", 45000);
                PriceEnergyUnit = startupConfig.GetInt("PriceEnergyUnit", 100);
                PriceObjectClaim = startupConfig.GetInt("PriceObjectClaim", 10);
                PricePublicObjectDecay = startupConfig.GetInt("PricePublicObjectDecay", 4);
@@ -268,27 +270,6 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
        }
-        public EconomyData GetEconomyData()
-        {
-            EconomyData edata = new EconomyData();
-            edata.ObjectCapacity = ObjectCapacity;
-            edata.ObjectCount = ObjectCount;
-            edata.PriceEnergyUnit = PriceEnergyUnit;
-            edata.PriceGroupCreate = PriceGroupCreate;
-            edata.PriceObjectClaim = PriceObjectClaim;
-            edata.PriceObjectRent = PriceObjectRent;
-            edata.PriceObjectScaleFactor = PriceObjectScaleFactor;
-            edata.PriceParcelClaim = PriceParcelClaim;
-            edata.PriceParcelClaimFactor = PriceParcelClaimFactor;
-            edata.PriceParcelRent = PriceParcelRent;
-            edata.PricePublicObjectDecay = PricePublicObjectDecay;
-            edata.PricePublicObjectDelete = PricePublicObjectDelete;
-            edata.PriceRentLight = PriceRentLight;
-            edata.PriceUpload = PriceUpload;
-            edata.TeleportMinPrice = TeleportMinPrice;
-            return edata;
-        }
        private void GetClientFunds(IClientAPI client)
        {
            CheckExistAndRefreshFunds(client.AgentId);
@@ -717,7 +698,9 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
            if (user != null)
            {
-                user.SendEconomyData(EnergyEfficiency, ObjectCapacity, ObjectCount, PriceEnergyUnit, PriceGroupCreate,
+                Scene s = LocateSceneClientIn(user.AgentId);
+                user.SendEconomyData(EnergyEfficiency, s.RegionInfo.ObjectCapacity, ObjectCount, PriceEnergyUnit, PriceGroupCreate,
                                     PriceObjectClaim, PriceObjectRent, PriceObjectScaleFactor, PriceParcelClaim, PriceParcelClaimFactor,
                                     PriceParcelRent, PricePublicObjectDecay, PricePublicObjectDelete, PriceRentLight, PriceUpload,
                                     TeleportMinPrice, TeleportPriceExponent);
@@ -790,7 +773,7 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
            //m_log.Info("[FRIEND]: " + avatar.Name + " status:" + (!avatar.IsChildAgent).ToString());
        }
-        public int GetBalance(IClientAPI client)
+        public int GetBalance(UUID agentID)
        {
            return 0;
        }
@@ -798,16 +781,10 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
        // Please do not refactor these to be just one method
        // Existing implementations need the distinction
        //
-        public bool UploadCovered(IClientAPI client)
+        public bool UploadCovered(IClientAPI client, int amount)
        {
-            return AmountCovered(client, PriceUpload);
+            return true;
-        }
-        public bool GroupCreationCovered(IClientAPI client)
-        {
-            return AmountCovered(client, PriceGroupCreate);
        }
        public bool AmountCovered(IClientAPI client, int amount)
        {
            return true;
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
index 12d6643..2e0450c 100644
--- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
@@ -627,10 +627,6 @@ namespace OpenSim.Region.OptionalModules.World.NPC
        {
        }
-        public virtual void AttachObject(uint localID, Quaternion rotation, byte attachPoint, UUID ownerID)
-        {
-        }
        public virtual void SendDialog(string objectname, UUID objectID, string ownerFirstName, string ownerLastName, string msg, UUID textureID, int ch, string[] buttonlabels)
        {
        }
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 4773a50..8903c3b 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -451,12 +451,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public LSL_Vector llVecNorm(LSL_Vector v)
        {
            m_host.AddScriptLPS(1);
-            double mag = LSL_Vector.Mag(v);
+            return LSL_Vector.Norm(v);
-            LSL_Vector nor = new LSL_Vector();
-            nor.x = v.x / mag;
-            nor.y = v.y / mag;
-            nor.z = v.z / mag;
-            return nor;
        }
        public LSL_Float llVecDist(LSL_Vector a, LSL_Vector b)
@@ -470,22 +465,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        //Now we start getting into quaternions which means sin/cos, matrices and vectors. ckrinke
-        // Utility function for llRot2Euler
+        // Old implementation of llRot2Euler. Normalization not required as Atan2 function will
+        // only return values >= -PI (-180 degrees) and <= PI (180 degrees).
-        // normalize an angle between -PI and PI (-180 to +180 degrees)
-        protected double NormalizeAngle(double angle)
-        {
-            if (angle > -Math.PI && angle < Math.PI)
-                return angle;
-            int numPis = (int)(Math.PI / angle);
-            double remainder = angle - Math.PI * numPis;
-            if (numPis % 2 == 1)
-                return Math.PI - angle;
-            return remainder;
-        }
-        // Old implementation of llRot2Euler, now normalized
        public LSL_Vector llRot2Euler(LSL_Rotation r)
        {
@@ -497,13 +478,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
            double n = 2 * (r.y * r.s + r.x * r.z);
            double p = m * m - n * n;
            if (p > 0)
-                return new LSL_Vector(NormalizeAngle(Math.Atan2(2.0 * (r.x * r.s - r.y * r.z), (-t.x - t.y + t.z + t.s))),
+                return new LSL_Vector(Math.Atan2(2.0 * (r.x * r.s - r.y * r.z), (-t.x - t.y + t.z + t.s)),
-                                             NormalizeAngle(Math.Atan2(n, Math.Sqrt(p))),
+                                             Math.Atan2(n, Math.Sqrt(p)),
-                                             NormalizeAngle(Math.Atan2(2.0 * (r.z * r.s - r.x * r.y), (t.x - t.y - t.z + t.s))));
+                                             Math.Atan2(2.0 * (r.z * r.s - r.x * r.y), (t.x - t.y - t.z + t.s)));
            else if (n > 0)
-                return new LSL_Vector(0.0, Math.PI * 0.5, NormalizeAngle(Math.Atan2((r.z * r.s + r.x * r.y), 0.5 - t.x - t.z)));
+                return new LSL_Vector(0.0, Math.PI * 0.5, Math.Atan2((r.z * r.s + r.x * r.y), 0.5 - t.x - t.z));
            else
-                return new LSL_Vector(0.0, -Math.PI * 0.5, NormalizeAngle(Math.Atan2((r.z * r.s + r.x * r.y), 0.5 - t.x - t.z)));
+                return new LSL_Vector(0.0, -Math.PI * 0.5, Math.Atan2((r.z * r.s + r.x * r.y), 0.5 - t.x - t.z));
        }
        /* From wiki:
@@ -2945,9 +2926,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                IAttachmentsModule attachmentsModule = m_ScriptEngine.World.AttachmentsModule;
                if (attachmentsModule != null)
-                    attachmentsModule.AttachObject(
+                    attachmentsModule.AttachObject(presence.ControllingClient,
-                        presence.ControllingClient, grp.LocalId, 
+                            grp, (uint)attachment, false);
-                        (uint)attachment, Quaternion.Identity, Vector3.Zero, false);
            }
        }
@@ -4950,7 +4930,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                    case ',':
                        if (parens == 0)
                        {
-                            result.Add(src.Substring(start,length).Trim());
+                            result.Add(new LSL_String(src.Substring(start,length).Trim()));
                            start += length+1;
                            length = 0;
                        }
@@ -5879,6 +5859,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
            PSYS_PART_MAX_AGE = 7,
            PSYS_SRC_ACCEL = 8,
            PSYS_SRC_PATTERN = 9,
+            PSYS_SRC_INNERANGLE = 10,
+            PSYS_SRC_OUTERANGLE = 11,
            PSYS_SRC_TEXTURE = 12,
            PSYS_SRC_BURST_RATE = 13,
            PSYS_SRC_BURST_PART_COUNT = 15,
@@ -6011,6 +5993,22 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                            prules.Pattern = (Primitive.ParticleSystem.SourcePattern)tmpi;
                            break;
+                        // PSYS_SRC_INNERANGLE and PSYS_SRC_ANGLE_BEGIN use the same variables. The
+                        // PSYS_SRC_OUTERANGLE and PSYS_SRC_ANGLE_END also use the same variable. The
+                        // client tells the difference between the two by looking at the 0x02 bit in
+                        // the PartFlags variable.
+                        case (int)ScriptBaseClass.PSYS_SRC_INNERANGLE:
+                            tempf = (float)rules.GetLSLFloatItem(i + 1);
+                            prules.InnerAngle = (float)tempf;
+                            prules.PartFlags &= 0xFFFFFFFD; // Make sure new angle format is off.
+                            break;
+                        case (int)ScriptBaseClass.PSYS_SRC_OUTERANGLE:
+                            tempf = (float)rules.GetLSLFloatItem(i + 1);
+                            prules.OuterAngle = (float)tempf;
+                            prules.PartFlags &= 0xFFFFFFFD; // Make sure new angle format is off.
+                            break;
                        case (int)ScriptBaseClass.PSYS_SRC_TEXTURE:
                            prules.Texture = KeyOrName(rules.GetLSLStringItem(i + 1));
                            break;
@@ -6067,11 +6065,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                        case (int)ScriptBaseClass.PSYS_SRC_ANGLE_BEGIN:
                            tempf = (float)rules.GetLSLFloatItem(i + 1);
                            prules.InnerAngle = (float)tempf;
+                            prules.PartFlags |= 0x02; // Set new angle format.
                            break;
                        case (int)ScriptBaseClass.PSYS_SRC_ANGLE_END:
                            tempf = (float)rules.GetLSLFloatItem(i + 1);
                            prules.OuterAngle = (float)tempf;
+                            prules.PartFlags |= 0x02; // Set new angle format.
                            break;
                    }
diff --git a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs b/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs
index 1ea52c5..91e03ac 100644
--- a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs
@@ -262,7 +262,12 @@ namespace OpenSim.Region.ScriptEngine.Shared
            public static Vector3 Norm(Vector3 vector)
            {
                double mag = Mag(vector);
-                return new Vector3(vector.x / mag, vector.y / mag, vector.z / mag);
+                if (mag > 0.0)
+                {
+                    double invMag = 1.0 / mag;
+                    return vector * invMag;
+                }
+                return new Vector3(0, 0, 0);
            }
            #endregion
@@ -663,13 +668,13 @@ namespace OpenSim.Region.ScriptEngine.Shared
                Object[] ret;
                if (start < 0)
-                    start=m_data.Length-start;
+                    start=m_data.Length+start;
                if (start < 0)
                    start=0;
                if (end < 0)
-                    end=m_data.Length-end;
+                    end=m_data.Length+end;
                if (end < 0)
                    end=0;
diff --git a/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs b/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs
index 09b79d0..0ac8b5c 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs
@@ -356,9 +356,9 @@ namespace OpenSim.Region.ScriptEngine.XEngine
        // timer: not handled here
        // listen: not handled here
-        public void control(uint localID, UUID itemID, UUID agentID, uint held, uint change)
+        public void control(UUID itemID, UUID agentID, uint held, uint change)
        {
-            myScriptEngine.PostObjectEvent(localID, new EventParams(
+            myScriptEngine.PostScriptEvent(itemID, new EventParams(
                    "control",new object[] {
                    new LSL_Types.LSLString(agentID.ToString()),
                    new LSL_Types.LSLInteger(held),
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
index 4715690..b050349 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
@@ -488,6 +488,11 @@ namespace OpenSim.Region.ScriptEngine.XEngine
            if (stateSource == (int)StateSource.ScriptedRez)
            {
+                lock (m_CompileDict)
+                {
+                    m_CompileDict[itemID] = 0;
+                }
                DoOnRezScript(parms);
            }
            else
@@ -696,9 +701,9 @@ namespace OpenSim.Region.ScriptEngine.XEngine
                }
            }
+            ScriptInstance instance = null;
            lock (m_Scripts)
            {
-                ScriptInstance instance = null;
                // Create the object record
                if ((!m_Scripts.ContainsKey(itemID)) ||
@@ -765,8 +770,10 @@ namespace OpenSim.Region.ScriptEngine.XEngine
                                                  item.Name, startParam, postOnRez,
                                                  stateSource, m_MaxScriptQueue);
                    
-                    m_log.DebugFormat("[XEngine] Loaded script {0}.{1}, script UUID {2}, prim UUID {3} @ {4}",
+                    m_log.DebugFormat(
-                            part.ParentGroup.RootPart.Name, item.Name, assetID, part.UUID, part.ParentGroup.RootPart.AbsolutePosition.ToString());
+                        "[XEngine] Loaded script {0}.{1}, script UUID {2}, prim UUID {3} @ {4}.{5}",
+                        part.ParentGroup.RootPart.Name, item.Name, assetID, part.UUID, 
+                        part.ParentGroup.RootPart.AbsolutePosition, part.ParentGroup.Scene.RegionInfo.RegionName);
                    if (presence != null)
                    {
@@ -779,28 +786,29 @@ namespace OpenSim.Region.ScriptEngine.XEngine
                    m_Scripts[itemID] = instance;
                }
+            }
-                lock (m_PrimObjects)
+            lock (m_PrimObjects)
-                {
+            {
-                    if (!m_PrimObjects.ContainsKey(localID))
+                if (!m_PrimObjects.ContainsKey(localID))
-                        m_PrimObjects[localID] = new List<UUID>();
+                    m_PrimObjects[localID] = new List<UUID>();
-                    if (!m_PrimObjects[localID].Contains(itemID))
+                if (!m_PrimObjects[localID].Contains(itemID))
-                        m_PrimObjects[localID].Add(itemID);
+                    m_PrimObjects[localID].Add(itemID);
-                }
+            }
-                if (!m_Assemblies.ContainsKey(assetID))
+            if (!m_Assemblies.ContainsKey(assetID))
-                    m_Assemblies[assetID] = assembly;
+                m_Assemblies[assetID] = assembly;
-                lock (m_AddingAssemblies) 
+            lock (m_AddingAssemblies) 
-                {
+            {
-                    m_AddingAssemblies[assembly]--;
+                m_AddingAssemblies[assembly]--;
-                }
-                if (instance!=null) 
-                    instance.Init();
            }
+            if (instance != null) 
+                instance.Init();
            return true;
        }
@@ -813,60 +821,60 @@ namespace OpenSim.Region.ScriptEngine.XEngine
                    m_CompileDict.Remove(itemID);
            }
+            IScriptInstance instance = null;
            lock (m_Scripts)
            {
                // Do we even have it?
                if (!m_Scripts.ContainsKey(itemID))
                    return;
-                IScriptInstance instance=m_Scripts[itemID];
+                instance=m_Scripts[itemID];
                m_Scripts.Remove(itemID);
+            }
-                instance.ClearQueue();
+            instance.ClearQueue();
-                instance.Stop(0);
+            instance.Stop(0);
 //                bool objectRemoved = false;
-                lock (m_PrimObjects)
+            lock (m_PrimObjects)
+            {
+                // Remove the script from it's prim
+                if (m_PrimObjects.ContainsKey(localID))
                {
-                    // Remove the script from it's prim
+                    // Remove inventory item record
-                    if (m_PrimObjects.ContainsKey(localID))
+                    if (m_PrimObjects[localID].Contains(itemID))
-                    {
+                        m_PrimObjects[localID].Remove(itemID);
-                        // Remove inventory item record
-                        if (m_PrimObjects[localID].Contains(itemID))
-                            m_PrimObjects[localID].Remove(itemID);
-                        // If there are no more scripts, remove prim
+                    // If there are no more scripts, remove prim
-                        if (m_PrimObjects[localID].Count == 0)
+                    if (m_PrimObjects[localID].Count == 0)
-                        {
+                    {
-                            m_PrimObjects.Remove(localID);
+                        m_PrimObjects.Remove(localID);
 //                            objectRemoved = true;
-                        }
                    }
                }
+            }
-                instance.RemoveState();
+            instance.RemoveState();
-                instance.DestroyScriptInstance();
+            instance.DestroyScriptInstance();
-                m_DomainScripts[instance.AppDomain].Remove(instance.ItemID);
+            m_DomainScripts[instance.AppDomain].Remove(instance.ItemID);
-                if (m_DomainScripts[instance.AppDomain].Count == 0)
+            if (m_DomainScripts[instance.AppDomain].Count == 0)
-                {
+            {
-                    m_DomainScripts.Remove(instance.AppDomain);
+                m_DomainScripts.Remove(instance.AppDomain);
-                    UnloadAppDomain(instance.AppDomain);
+                UnloadAppDomain(instance.AppDomain);
-                }
+            }
-                instance = null;
+            instance = null;
-                ObjectRemoved handlerObjectRemoved = OnObjectRemoved;
+            ObjectRemoved handlerObjectRemoved = OnObjectRemoved;
-                if (handlerObjectRemoved != null)
+            if (handlerObjectRemoved != null)
-                {
+            {
-                    SceneObjectPart part = m_Scene.GetSceneObjectPart(localID);
+                SceneObjectPart part = m_Scene.GetSceneObjectPart(localID);
-                    handlerObjectRemoved(part.UUID);
+                handlerObjectRemoved(part.UUID);
-                }
-                CleanAssemblies();
            }
            ScriptRemoved handlerScriptRemoved = OnScriptRemoved;
            if (handlerScriptRemoved != null)
                handlerScriptRemoved(itemID);
@@ -1000,26 +1008,33 @@ namespace OpenSim.Region.ScriptEngine.XEngine
        public bool PostObjectEvent(uint localID, EventParams p)
        {
            bool result = false;
-            
+            List<UUID> uuids = null;
            lock (m_PrimObjects)
            {
                if (!m_PrimObjects.ContainsKey(localID))
                    return false;
-            
+                uuids = m_PrimObjects[localID];
-                foreach (UUID itemID in m_PrimObjects[localID])
+            }
+            foreach (UUID itemID in uuids)
+            {
+                IScriptInstance instance = null;
+                try
                {
                    if (m_Scripts.ContainsKey(itemID))
-                    {
+                        instance = m_Scripts[itemID];
-                        IScriptInstance instance = m_Scripts[itemID];
+                }
-                        if (instance != null)
+                catch { /* ignore race conditions */ }
-                        {
-                            instance.PostEvent(p);
+                if (instance != null)
-                            result = true;
+                {
-                        }
+                    instance.PostEvent(p);
-                    }
+                    result = true;
                }
            }
+            
            return result;
        }
@@ -1336,10 +1351,12 @@ namespace OpenSim.Region.ScriptEngine.XEngine
                    try
                    {
-                        FileStream tfs = File.Open(assemName + ".text",
+                        using (FileStream tfs = File.Open(assemName + ".text",
-                                FileMode.Open, FileAccess.Read);
+                                FileMode.Open, FileAccess.Read))
-                        tfs.Read(tdata, 0, tdata.Length);
+                        {
-                        tfs.Close();
+                            tfs.Read(tdata, 0, tdata.Length);
+                            tfs.Close();
+                        }
                        assem = new System.Text.ASCIIEncoding().GetString(tdata);
                    }
@@ -1359,9 +1376,11 @@ namespace OpenSim.Region.ScriptEngine.XEngine
                    try
                    {
-                        FileStream fs = File.Open(assemName, FileMode.Open, FileAccess.Read);
+                        using (FileStream fs = File.Open(assemName, FileMode.Open, FileAccess.Read))
-                        fs.Read(data, 0, data.Length);
+                        {
-                        fs.Close();
+                            fs.Read(data, 0, data.Length);
+                            fs.Close();
+                        }
                        assem = System.Convert.ToBase64String(data);
                    }
@@ -1377,13 +1396,15 @@ namespace OpenSim.Region.ScriptEngine.XEngine
            if (File.Exists(fn + ".map"))
            {
-                FileStream mfs = File.Open(fn + ".map", FileMode.Open, FileAccess.Read);
+                using (FileStream mfs = File.Open(fn + ".map", FileMode.Open, FileAccess.Read))
-                StreamReader msr = new StreamReader(mfs);
+                {
+                    using (StreamReader msr = new StreamReader(mfs))
-                map = msr.ReadToEnd();
+                    {
+                        map = msr.ReadToEnd();
-                msr.Close();
+                        msr.Close();
-                mfs.Close();
+                    }
+                    mfs.Close();
+                }
            }
            XmlElement assemblyData = doc.CreateElement("", "Assembly", "");
@@ -1471,30 +1492,59 @@ namespace OpenSim.Region.ScriptEngine.XEngine
                {
                    Byte[] filedata = Convert.FromBase64String(base64);
-                    FileStream fs = File.Create(path);
+                    try
-                    fs.Write(filedata, 0, filedata.Length);
+                    {
-                    fs.Close();
+                        using (FileStream fs = File.Create(path))
+                        {
-                    fs = File.Create(path + ".text");
+                            fs.Write(filedata, 0, filedata.Length);
-                    StreamWriter sw = new StreamWriter(fs);
+                            fs.Close();
+                        }
-                    sw.Write(base64);
+                    }
+                    catch (IOException ex)
-                    sw.Close();
+                    {
-                    fs.Close();
+                        // if there already exists a file at that location, it may be locked.
+                        m_log.ErrorFormat("[XEngine]: File {0} already exists! {1}", path, ex.Message);
+                    }
+                    try
+                    {
+                        using (FileStream fs = File.Create(path + ".text"))
+                        {
+                            using (StreamWriter sw = new StreamWriter(fs))
+                            {
+                                sw.Write(base64);
+                                sw.Close();
+                            }
+                            fs.Close();
+                        }
+                    }
+                    catch (IOException ex)
+                    {
+                        // if there already exists a file at that location, it may be locked.
+                        m_log.ErrorFormat("[XEngine]: File {0} already exists! {1}", path, ex.Message);
+                    }
                }
            }
            string statepath = Path.Combine("ScriptEngines", World.RegionInfo.RegionID.ToString());
            statepath = Path.Combine(statepath, itemID.ToString() + ".state");
-            FileStream sfs = File.Create(statepath);
+            try
-            StreamWriter ssw = new StreamWriter(sfs);
+            {
+                using (FileStream sfs = File.Create(statepath))
-            ssw.Write(stateE.OuterXml);
+                {
+                    using (StreamWriter ssw = new StreamWriter(sfs))
-            ssw.Close();
+                    {
-            sfs.Close();
+                        ssw.Write(stateE.OuterXml);
+                        ssw.Close();
+                    }
+                    sfs.Close();
+                }
+            }
+            catch (IOException ex)
+            {
+                // if there already exists a file at that location, it may be locked.
+                m_log.ErrorFormat("[XEngine]: File {0} already exists! {1}", statepath, ex.Message);
+            }
            XmlNodeList mapL = rootE.GetElementsByTagName("LineMap");
            if (mapL.Count > 0)
@@ -1504,13 +1554,23 @@ namespace OpenSim.Region.ScriptEngine.XEngine
                string mappath = Path.Combine("ScriptEngines", World.RegionInfo.RegionID.ToString());
                mappath = Path.Combine(mappath, mapE.GetAttribute("Filename"));
-                FileStream mfs = File.Create(mappath);
+                try
-                StreamWriter msw = new StreamWriter(mfs);
+                {
+                    using (FileStream mfs = File.Create(mappath))
-                msw.Write(mapE.InnerText);
+                    {
+                        using (StreamWriter msw = new StreamWriter(mfs))
-                msw.Close();
+                        {
-                mfs.Close();
+                            msw.Write(mapE.InnerText);
+                            msw.Close();
+                        }
+                        mfs.Close();
+                    }
+                }
+                catch (IOException ex)
+                {
+                    // if there already exists a file at that location, it may be locked.
+                    m_log.ErrorFormat("[XEngine]: File {0} already exists! {1}", statepath, ex.Message);
+                }
            }
            return true;
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianProfiles.cs b/OpenSim/Services/Connectors/SimianGrid/SimianProfiles.cs
index fbf4648..704790e 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianProfiles.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianProfiles.cs
@@ -88,7 +88,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
        public void Initialise(IConfigSource source)
        {
-            if (Simian.IsSimianEnabled(source, "UserAccountServices", this.Name))
+            if (Simian.IsSimianEnabled(source, "UserAccountServices", "SimianUserAccountServiceConnector"))
            {
                IConfig gridConfig = source.Configs["UserAccountService"];
                if (gridConfig == null)
@@ -108,6 +108,23 @@ namespace OpenSim.Services.Connectors.SimianGrid
                    serviceUrl = serviceUrl + '/';
                m_serverUrl = serviceUrl;
+                IConfig profilesConfig = source.Configs["Profiles"];
+                if (profilesConfig == null)
+                {
+                    // Do not run this module by default.
+                    return;
+                }
+                else
+                {
+                    // if profiles aren't enabled, we're not needed.
+                    // if we're not specified as the connector to use, then we're not wanted
+                    if (profilesConfig.GetString("Module", String.Empty) != Name)
+                    {
+                        return;
+                    }
+                    m_log.InfoFormat("[SIMIAN ACCOUNT CONNECTOR]: Initializing {0}", this.Name);
+                }
            }
        }
@@ -135,6 +152,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
                // Profiles
                client.OnRequestAvatarProperties += RequestAvatarPropertiesHandler;
                client.OnUpdateAvatarProperties += UpdateAvatarPropertiesHandler;
                client.OnAvatarInterestUpdate += AvatarInterestUpdateHandler;
                client.OnUserInfoRequest += UserInfoRequestHandler;
@@ -302,12 +320,25 @@ namespace OpenSim.Services.Connectors.SimianGrid
                    System.Globalization.CultureInfo.InvariantCulture), charterMember, about["FLAbout"].AsString(), (uint)flags,
                    about["FLImage"].AsUUID(), about["Image"].AsUUID(), about["URL"].AsString(), user["Partner"].AsUUID());
+                OSDMap interests = null;
+                if (user.ContainsKey("LLInterests"))
+                {
+                    try
+                    {
+                        interests = OSDParser.DeserializeJson(user["LLInterests"].AsString()) as OSDMap;
+                        client.SendAvatarInterestsReply(avatarID, interests["WantMask"].AsUInteger(), interests["WantText"].AsString(), interests["SkillsMask"].AsUInteger(), interests["SkillsText"].AsString(), interests["languages"].AsString());
+                    }
+                    catch { }
+                }
+                if (about == null)
+                    about = new OSDMap(0);
            }
            else
            {
                m_log.Warn("[SIMIAN PROFILES]: Failed to fetch profile information for " + client.Name + ", returning default values");
                client.SendAvatarProperties(avatarID, String.Empty, "1/1/1970", Utils.EmptyBytes,
-                    String.Empty, (uint)flags, UUID.Zero, UUID.Zero, String.Empty, UUID.Zero);
+                        String.Empty, (uint)flags, UUID.Zero, UUID.Zero, String.Empty, UUID.Zero);
            }
        }
diff --git a/OpenSim/Services/GridService/GridService.cs b/OpenSim/Services/GridService/GridService.cs
index 225530f..46d72dc 100644
--- a/OpenSim/Services/GridService/GridService.cs
+++ b/OpenSim/Services/GridService/GridService.cs
@@ -278,7 +278,11 @@ namespace OpenSim.Services.GridService
                foreach (RegionData rdata in rdatas)
                    if (rdata.RegionID != regionID)
-                        rinfos.Add(RegionData2RegionInfo(rdata));
+                    {
+                        int flags = Convert.ToInt32(rdata.Data["flags"]);
+                        if ((flags & (int)Data.RegionFlags.Hyperlink) == 0) // no hyperlinks as neighbours
+                            rinfos.Add(RegionData2RegionInfo(rdata));
+                    }
            }
            m_log.DebugFormat("[GRID SERVICE]: region {0} has {1} neighours", region.RegionName, rinfos.Count);
diff --git a/OpenSim/Services/InventoryService/XInventoryService.cs b/OpenSim/Services/InventoryService/XInventoryService.cs
index f48bf60..bb24292 100644
--- a/OpenSim/Services/InventoryService/XInventoryService.cs
+++ b/OpenSim/Services/InventoryService/XInventoryService.cs
@@ -259,13 +259,15 @@ namespace OpenSim.Services.InventoryService
        
        public virtual List<InventoryItemBase> GetFolderItems(UUID principalID, UUID folderID)
        {
+//            m_log.DebugFormat("[XINVENTORY]: Fetch items for folder {0}", folderID);
+            
            // Since we probably don't get a valid principal here, either ...
            //
            List<InventoryItemBase> invItems = new List<InventoryItemBase>();
            XInventoryItem[] items = m_Database.GetItems(
-                    new string[] { "parentFolderID"},
+                    new string[] { "parentFolderID" },
-                    new string[] { UUID.Zero.ToString() });
+                    new string[] { folderID.ToString() });
            foreach (XInventoryItem i in items)
                invItems.Add(ConvertToOpenSim(i));
diff --git a/OpenSim/Services/LLLoginService/LLLoginResponse.cs b/OpenSim/Services/LLLoginService/LLLoginResponse.cs
index 54d53fb..3366922 100644
--- a/OpenSim/Services/LLLoginService/LLLoginResponse.cs
+++ b/OpenSim/Services/LLLoginService/LLLoginResponse.cs
@@ -170,6 +170,9 @@ namespace OpenSim.Services.LLLoginService
        private string firstname;
        private string lastname;
+        // Web map
+        private string mapTileURL;
        // Error Flags
        private string errorReason;
        private string errorMessage;
@@ -218,7 +221,7 @@ namespace OpenSim.Services.LLLoginService
        public LLLoginResponse(UserAccount account, AgentCircuitData aCircuit, GridUserInfo pinfo,
            GridRegion destination, List<InventoryFolderBase> invSkel, FriendInfo[] friendsList, ILibraryService libService,
            string where, string startlocation, Vector3 position, Vector3 lookAt, List<InventoryItemBase> gestures, string message,
-            GridRegion home, IPEndPoint clientIP)
+            GridRegion home, IPEndPoint clientIP, string mapTileURL)
            : this()
        {
            FillOutInventoryData(invSkel, libService);
@@ -234,6 +237,7 @@ namespace OpenSim.Services.LLLoginService
            Message = message;
            BuddList = ConvertFriendListItem(friendsList);
            StartLocation = where;
+            MapTileURL = mapTileURL;
            FillOutHomeData(pinfo, home);
            LookAt = String.Format("[r{0},r{1},r{2}]", lookAt.X, lookAt.Y, lookAt.Z);
@@ -405,6 +409,7 @@ namespace OpenSim.Services.LLLoginService
            InitialOutfitHash["folder_name"] = "Nightclub Female";
            InitialOutfitHash["gender"] = "female";
            initialOutfit.Add(InitialOutfitHash);
+            mapTileURL = String.Empty;
        }
@@ -468,6 +473,9 @@ namespace OpenSim.Services.LLLoginService
                responseData["region_x"] = (Int32)(RegionX);
                responseData["region_y"] = (Int32)(RegionY);
+                if (mapTileURL != String.Empty)
+                    responseData["map-server-url"] = mapTileURL;
                if (m_buddyList != null)
                {
                    responseData["buddy-list"] = m_buddyList.ToArray();
@@ -564,6 +572,9 @@ namespace OpenSim.Services.LLLoginService
                map["region_x"] = OSD.FromInteger(RegionX);
                map["region_y"] = OSD.FromInteger(RegionY);
+                if (mapTileURL != String.Empty)
+                    map["map-server-url"] = OSD.FromString(mapTileURL);
                if (m_buddyList != null)
                {
                    map["buddy-list"] = ArrayListToOSDArray(m_buddyList.ToArray());
@@ -647,7 +658,7 @@ namespace OpenSim.Services.LLLoginService
            Hashtable TempHash;
            foreach (InventoryFolderBase InvFolder in folders)
            {
-                if (InvFolder.ParentID == UUID.Zero)
+                if (InvFolder.ParentID == UUID.Zero && InvFolder.Name == "My Inventory")
                {
                    rootID = InvFolder.ID;
                }
@@ -915,6 +926,12 @@ namespace OpenSim.Services.LLLoginService
            set { home = value; }
        }
+        public string MapTileURL
+        {
+            get { return mapTileURL; }
+            set { mapTileURL = value; }
+        }
        public string Message
        {
            get { return welcomeMessage; }
diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs
index 00fffff..f4e045c 100644
--- a/OpenSim/Services/LLLoginService/LLLoginService.cs
+++ b/OpenSim/Services/LLLoginService/LLLoginService.cs
@@ -73,6 +73,7 @@ namespace OpenSim.Services.LLLoginService
        protected int m_MinLoginLevel;
        protected string m_GatekeeperURL;
        protected bool m_AllowRemoteSetLoginLevel;
+        protected string m_MapTileURL;
        IConfig m_LoginServerConfig;
@@ -100,6 +101,7 @@ namespace OpenSim.Services.LLLoginService
            m_AllowRemoteSetLoginLevel = m_LoginServerConfig.GetBoolean("AllowRemoteSetLoginLevel", false);
            m_MinLoginLevel = m_LoginServerConfig.GetInt("MinLoginLevel", 0);
            m_GatekeeperURL = m_LoginServerConfig.GetString("GatekeeperURI", string.Empty);
+            m_MapTileURL = m_LoginServerConfig.GetString("MapTileURL", string.Empty);
            // These are required; the others aren't
            if (accountService == string.Empty || authService == string.Empty)
@@ -356,7 +358,7 @@ namespace OpenSim.Services.LLLoginService
                // Finally, fill out the response and return it
                //
                LLLoginResponse response = new LLLoginResponse(account, aCircuit, guinfo, destination, inventorySkel, friendsList, m_LibraryService,
-                    where, startLocation, position, lookAt, gestures, m_WelcomeMessage, home, clientIP);
+                    where, startLocation, position, lookAt, gestures, m_WelcomeMessage, home, clientIP, m_MapTileURL);
                m_log.DebugFormat("[LLOGIN SERVICE]: All clear. Sending login response to client.");
                return response;
diff --git a/OpenSim/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs
index 496cfb8..999cf5e 100644
--- a/OpenSim/Tests/Common/Mock/TestClient.cs
+++ b/OpenSim/Tests/Common/Mock/TestClient.cs
@@ -630,10 +630,6 @@ namespace OpenSim.Tests.Common.Mock
        {
        }
-        public virtual void AttachObject(uint localID, Quaternion rotation, byte attachPoint, UUID ownerID)
-        {
-        }
        public virtual void SendDialog(string objectname, UUID objectID, string ownerFirstName, string ownerLastName, string msg, UUID textureID, int ch, string[] buttonlabels)
        {
        }