26 files changed, 513 insertions, 776 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/J2KImage.cs b/OpenSim/Region/ClientStack/Linden/UDP/J2KImage.cs
index e9e2dca..cb9692a 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/J2KImage.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/J2KImage.cs
@@ -56,9 +56,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        public IAssetService AssetService;
        public UUID AgentID;
        public IInventoryAccessModule InventoryAccessModule;
-        public OpenJPEG.J2KLayerInfo[] Layers;
+        private OpenJPEG.J2KLayerInfo[] m_layers;
-        public bool IsDecoded;
+        public bool IsDecoded { get; private set; }
-        public bool HasAsset;
+        public bool HasAsset { get; private set; }
        public C5.IPriorityQueueHandle<J2KImage> PriorityQueueHandle;
        private uint m_currentPacket;
@@ -170,14 +170,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                    if (DiscardLevel >= 0 || m_stopPacket == 0)
                    {
                        // This shouldn't happen, but if it does, we really can't proceed
-                        if (Layers == null)
+                        if (m_layers == null)
                        {
                            m_log.Warn("[J2KIMAGE]: RunUpdate() called with missing Layers. Canceling texture transfer");
                            m_currentPacket = m_stopPacket;
                            return;
                        }
-                        int maxDiscardLevel = Math.Max(0, Layers.Length - 1);
+                        int maxDiscardLevel = Math.Max(0, m_layers.Length - 1);
                        // Treat initial texture downloads with a DiscardLevel of -1 a request for the highest DiscardLevel
                        if (DiscardLevel < 0 && m_stopPacket == 0)
@@ -187,9 +187,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                        DiscardLevel = (sbyte)Math.Min(DiscardLevel, maxDiscardLevel);
                        //Calculate the m_stopPacket
-                        if (Layers.Length > 0)
+                        if (m_layers.Length > 0)
                        {
-                            m_stopPacket = (uint)GetPacketForBytePosition(Layers[(Layers.Length - 1) - DiscardLevel].End);
+                            m_stopPacket = (uint)GetPacketForBytePosition(m_layers[(m_layers.Length - 1) - DiscardLevel].End);
                            //I don't know why, but the viewer seems to expect the final packet if the file
                            //is just one packet bigger.
                            if (TexturePacketCount() == m_stopPacket + 1)
@@ -341,7 +341,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        private void J2KDecodedCallback(UUID AssetId, OpenJPEG.J2KLayerInfo[] layers)
        {
-            Layers = layers;
+            m_layers = layers;
            IsDecoded = true;
            RunUpdate();
        }
@@ -385,8 +385,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                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);
+                    if (!assetServerURL.EndsWith("/") && !assetServerURL.EndsWith("="))
-                    AssetService.Get(assetServerURL + "/" + id, InventoryAccessModule, AssetReceived);
+                        assetServerURL = assetServerURL + "/";
+                    m_log.DebugFormat("[J2KIMAGE]: texture {0} not found in local asset storage. Trying user's storage.", assetServerURL + id);
+                    AssetService.Get(assetServerURL + id, InventoryAccessModule, AssetReceived);
                    return;
                }
            }
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLImageManager.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLImageManager.cs
index 9e0db12..e3a881f 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLImageManager.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLImageManager.cs
@@ -39,6 +39,9 @@ using log4net;
 namespace OpenSim.Region.ClientStack.LindenUDP
 {
+    /// <summary>
+    /// This class handles UDP texture requests.
+    /// </summary>
    public class LLImageManager
    {
        private sealed class J2KImageComparer : IComparer<J2KImage>
@@ -208,7 +211,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        #region Priority Queue Helpers
-        J2KImage GetHighestPriorityImage()
+        private J2KImage GetHighestPriorityImage()
        {
            J2KImage image = null;
@@ -223,23 +226,27 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            return image;
        }
-        void AddImageToQueue(J2KImage image)
+        private void AddImageToQueue(J2KImage image)
        {
            image.PriorityQueueHandle = null;
            lock (m_syncRoot)
+            {
                try { m_priorityQueue.Add(ref image.PriorityQueueHandle, image); }
                catch (Exception) { }
+            }
        }
-        void RemoveImageFromQueue(J2KImage image)
+        private void RemoveImageFromQueue(J2KImage image)
        {
            lock (m_syncRoot)
+            {
                try { m_priorityQueue.Delete(image.PriorityQueueHandle); }
                catch (Exception) { }
+            }
        }
-        void UpdateImageInQueue(J2KImage image)
+        private void UpdateImageInQueue(J2KImage image)
        {
            lock (m_syncRoot)
            {
@@ -254,4 +261,4 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        #endregion Priority Queue Helpers
    }
-}
+}
+\ No newline at end of file
diff --git a/OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs b/OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs
index 1386e86..7dd9087 100644
--- a/OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs
+++ b/OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs
@@ -152,6 +152,9 @@ namespace OpenSim.Region.CoreModules.Agent.TextureSender
        /// <param name="j2kData">JPEG2000 data</param>
        private void DoJ2KDecode(UUID assetID, byte[] j2kData)
        {
+//            m_log.DebugFormat(
+//                "[J2KDecoderModule]: Doing J2K decoding of {0} bytes for asset {1}", j2kData.Length, assetID);
            //int DecodeTime = 0;
            //DecodeTime = Environment.TickCount;
            OpenJPEG.J2KLayerInfo[] layers;
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs
index 9a97925..a77646c 100644
--- a/OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs
@@ -50,6 +50,17 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
    {
        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        IUserManagement m_uMan;
+        IUserManagement UserManagementModule
+        {
+            get
+            {
+                if (m_uMan == null)
+                    m_uMan = m_Scenes[0].RequestModuleInterface<IUserManagement>();
+                return m_uMan;
+            }
+        }
        #region ISharedRegionModule
        public override string Name
        {
@@ -369,9 +380,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
        protected override FriendInfo[] GetFriendsFromService(IClientAPI client)
        {
 //            m_log.DebugFormat("[HGFRIENDS MODULE]: Entering GetFriendsFromService for {0}", client.Name);
+            Boolean agentIsLocal = true;
+            if (UserManagementModule != null)
+                agentIsLocal = UserManagementModule.IsLocalGridUser(client.AgentId);
-            UserAccount account1 = UserAccountService.GetUserAccount(m_Scenes[0].RegionInfo.ScopeID, client.AgentId);
+            if (agentIsLocal)
-            if (account1 != null)
                return base.GetFriendsFromService(client);
            FriendInfo[] finfos = new FriendInfo[0];
@@ -392,16 +405,22 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
        protected override bool StoreRights(UUID agentID, UUID friendID, int rights)
        {
-            UserAccount account1 = UserAccountService.GetUserAccount(m_Scenes[0].RegionInfo.ScopeID, agentID);
+            Boolean agentIsLocal = true;
-            UserAccount account2 = UserAccountService.GetUserAccount(m_Scenes[0].RegionInfo.ScopeID, friendID);
+            Boolean friendIsLocal = true;
+            if (UserManagementModule != null)
+            {
+                agentIsLocal = UserManagementModule.IsLocalGridUser(agentID);
+                friendIsLocal = UserManagementModule.IsLocalGridUser(friendID);
+            }
            // Are they both local users?
-            if (account1 != null && account2 != null)
+            if (agentIsLocal && friendIsLocal)
            {
                // local grid users
                return base.StoreRights(agentID, friendID, rights);
            }
-            if (account1 != null) // agent is local, friend is foreigner
+            if (agentIsLocal) // agent is local, friend is foreigner
            {
                FriendInfo[] finfos = GetFriends(agentID);
                FriendInfo finfo = GetFriend(finfos, friendID);
@@ -412,7 +431,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
                }
            }
-            if (account2 != null) // agent is foreigner, friend is local
+            if (friendIsLocal) // agent is foreigner, friend is local
            {
                string agentUUI = GetUUI(friendID, agentID);
                if (agentUUI != string.Empty)
@@ -427,10 +446,16 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
        protected override void StoreBackwards(UUID friendID, UUID agentID)
        {
-            UserAccount account1 = UserAccountService.GetUserAccount(m_Scenes[0].RegionInfo.ScopeID, agentID);
+            Boolean agentIsLocal = true;
-            UserAccount account2 = UserAccountService.GetUserAccount(m_Scenes[0].RegionInfo.ScopeID, friendID);
+            Boolean friendIsLocal = true;
+            if (UserManagementModule != null)
+            {
+                agentIsLocal = UserManagementModule.IsLocalGridUser(agentID);
+                friendIsLocal = UserManagementModule.IsLocalGridUser(friendID);
+            }
            // Are they both local users?
-            if (account1 != null && account2 != null)
+            if (agentIsLocal && friendIsLocal)
            {
                // local grid users
                m_log.DebugFormat("[HGFRIENDS MODULE]: Users are both local");
@@ -444,10 +469,16 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
        protected override void StoreFriendships(UUID agentID, UUID friendID)
        {
-            UserAccount agentAccount = UserAccountService.GetUserAccount(m_Scenes[0].RegionInfo.ScopeID, agentID);
+            Boolean agentIsLocal = true;
-            UserAccount friendAccount = UserAccountService.GetUserAccount(m_Scenes[0].RegionInfo.ScopeID, friendID);
+            Boolean friendIsLocal = true;
+            if (UserManagementModule != null)
+            {
+                agentIsLocal = UserManagementModule.IsLocalGridUser(agentID);
+                friendIsLocal = UserManagementModule.IsLocalGridUser(friendID);
+            }
            // Are they both local users?
-            if (agentAccount != null && friendAccount != null)
+            if (agentIsLocal && friendIsLocal)
            {
                // local grid users
                m_log.DebugFormat("[HGFRIENDS MODULE]: Users are both local");
@@ -465,13 +496,13 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
            string agentFriendService = string.Empty;
            string friendFriendService = string.Empty;
-            if (agentClient != null)
+            if (agentIsLocal)
            {
                agentClientCircuit = ((Scene)(agentClient.Scene)).AuthenticateHandler.GetAgentCircuitData(agentClient.CircuitCode);
                agentUUI = Util.ProduceUserUniversalIdentifier(agentClientCircuit);
                agentFriendService = agentClientCircuit.ServiceURLs["FriendsServerURI"].ToString();
            }
-            if (friendClient != null)
+            if (friendIsLocal)
            {
                friendClientCircuit = ((Scene)(friendClient.Scene)).AuthenticateHandler.GetAgentCircuitData(friendClient.CircuitCode);
                friendUUI = Util.ProduceUserUniversalIdentifier(friendClientCircuit);
@@ -484,7 +515,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
            // Generate a random 8-character hex number that will sign this friendship
            string secret = UUID.Random().ToString().Substring(0, 8);
-            if (agentAccount != null) // agent is local, 'friend' is foreigner
+            if (agentIsLocal) // agent is local, 'friend' is foreigner
            {
                // This may happen when the agent returned home, in which case the friend is not there
                // We need to look for its information in the friends list itself
@@ -520,7 +551,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
                    friendsConn.NewFriendship(friendID, agentUUI + ";" + secret);
                }
            }
-            else if (friendAccount != null) // 'friend' is local,  agent is foreigner
+            else if (friendIsLocal) // 'friend' is local,  agent is foreigner
            {
                // store in the local friends service a reference to the foreign agent
                FriendsService.StoreFriend(friendID.ToString(), agentUUI + ";" + secret, 1);
@@ -553,10 +584,16 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
        protected override bool DeleteFriendship(UUID agentID, UUID exfriendID)
        {
-            UserAccount agentAccount = UserAccountService.GetUserAccount(m_Scenes[0].RegionInfo.ScopeID, agentID);
+            Boolean agentIsLocal = true;
-            UserAccount friendAccount = UserAccountService.GetUserAccount(m_Scenes[0].RegionInfo.ScopeID, exfriendID);
+            Boolean friendIsLocal = true;
+            if (UserManagementModule != null)
+            {
+                agentIsLocal = UserManagementModule.IsLocalGridUser(agentID);
+                friendIsLocal = UserManagementModule.IsLocalGridUser(exfriendID);
+            }
            // Are they both local users?
-            if (agentAccount != null && friendAccount != null)
+            if (agentIsLocal && friendIsLocal)
            {
                // local grid users
                return base.DeleteFriendship(agentID, exfriendID);
@@ -566,7 +603,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
            string agentUUI = string.Empty;
            string friendUUI = string.Empty;
-            if (agentAccount != null) // agent is local, 'friend' is foreigner
+            if (agentIsLocal) // agent is local, 'friend' is foreigner
            {
                // We need to look for its information in the friends list itself
                FriendInfo[] finfos = GetFriends(agentID);
@@ -587,7 +624,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
                    return true;
                }
            }
-            else if (friendAccount != null) // agent is foreigner, 'friend' is local
+            else if (friendIsLocal) // agent is foreigner, 'friend' is local
            {
                agentUUI = GetUUI(exfriendID, agentID);
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/HGMessageTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/HGMessageTransferModule.cs
index 560d913..bf1d787 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/HGMessageTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/HGMessageTransferModule.cs
@@ -180,10 +180,9 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
 //            m_log.DebugFormat("[HG INSTANT MESSAGE]: Delivering IM to {0} via XMLRPC", im.toAgentID);
            // Is the user a local user?
-            UserAccount account = m_Scenes[0].UserAccountService.GetUserAccount(m_Scenes[0].RegionInfo.ScopeID, toAgentID);
            string url = string.Empty;
            bool foreigner = false;
-            if (account == null) // foreign user
+            if (UserManagementModule != null && !UserManagementModule.IsLocalGridUser(toAgentID)) // foreign user
            {
                url = UserManagementModule.GetUserServerURL(toAgentID, "IMServerURI");
                foreigner = true;
diff --git a/OpenSim/Region/CoreModules/Avatar/Profile/BasicProfileModule.cs b/OpenSim/Region/CoreModules/Avatar/Profile/BasicProfileModule.cs
index dee0ad4..eb1e4b5 100644
--- a/OpenSim/Region/CoreModules/Avatar/Profile/BasicProfileModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Profile/BasicProfileModule.cs
@@ -43,7 +43,7 @@ using OpenSim.Services.Interfaces;
 namespace OpenSim.Region.CoreModules.Avatar.Profile
 {
    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]
-    public class BasicProfileModule : ISharedRegionModule
+    public class BasicProfileModule : IProfileModule, ISharedRegionModule
    {
        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@@ -57,6 +57,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Profile
        public void Initialise(IConfigSource config)
        {
+            // This can be reduced later as the loader will determine 
+            // whether we are needed
            if (config.Configs["Profile"] != null)
            {
                if (config.Configs["Profile"].GetString("Module", string.Empty) != "BasicProfileModule")
@@ -65,14 +67,13 @@ namespace OpenSim.Region.CoreModules.Avatar.Profile
            m_log.DebugFormat("[PROFILE MODULE]: Basic Profile Module enabled");
            m_Enabled = true;
        }
        public void AddRegion(Scene scene)
        {
            if (!m_Enabled)
                return;
+            
            lock (m_Scenes)
            {
                if (!m_Scenes.Contains(scene))
@@ -80,6 +81,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Profile
                    m_Scenes.Add(scene);
                    // Hook up events
                    scene.EventManager.OnNewClient += OnNewClient;
+                    scene.RegisterModuleInterface<IProfileModule>(this);
                }
            }
        }
@@ -116,7 +118,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Profile
        public Type ReplaceableInterface
        {
-            get { return null; }
+            get { return typeof(IProfileModule); }
        }
        #endregion
@@ -170,4 +172,4 @@ namespace OpenSim.Region.CoreModules.Avatar.Profile
        }
    }
-}
-\ No newline at end of file
+}
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index 87f292c..cbef6ce 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -676,9 +676,6 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
            Vector3 eastCross = new Vector3(boundaryDistance, 0, 0);
            Vector3 westCross = new Vector3(-1 * boundaryDistance, 0, 0);
-            // distance to edge that will trigger crossing
            // distance into new region to place avatar
            const float enterDistance = 0.5f;
@@ -960,29 +957,31 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                        m_log.DebugFormat(
                            "[ENTITY TRANSFER MODULE]: Failed validation of all attachments for region crossing of {0} from {1} to {2}.  Continuing.",
                            agent.Name, agent.Scene.RegionInfo.RegionName, neighbourRegion.RegionName);
-    
-                    pos = pos + (agent.Velocity);
+                    pos = pos + agent.Velocity;
-    
+                    Vector3 vel2 = new Vector3(agent.Velocity.X, agent.Velocity.Y, 0);
+                    agent.RemoveFromPhysicalScene();
                    SetInTransit(agent.UUID);
-                    AgentData cAgent = new AgentData();
+                    AgentData cAgent = new AgentData(); 
                    agent.CopyTo(cAgent);
                    cAgent.Position = pos;
                    if (isFlying)
                        cAgent.ControlFlags |= (uint)AgentManager.ControlFlags.AGENT_CONTROL_FLY;
-                    cAgent.CallbackURI = m_scene.RegionInfo.ServerURI +
-                        "agent/" + agent.UUID.ToString() + "/" + m_scene.RegionInfo.RegionID.ToString() + "/release/";
+                    // We don't need the callback anymnore
-    
+                    cAgent.CallbackURI = String.Empty;
                    if (!m_scene.SimulationService.UpdateAgent(neighbourRegion, cAgent))
                    {
                        // region doesn't take it
                        ReInstantiateScripts(agent);
+                        agent.AddToPhysicalScene(isFlying);
                        ResetFromTransit(agent.UUID);
                        return agent;
                    }
    
-                    // Next, let's close the child agent connections that are too far away.
-                    agent.CloseChildAgents(neighbourx, neighboury);
-    
                    //AgentCircuitData circuitdata = m_controllingClient.RequestClientInfo();
                    agent.ControllingClient.RequestClientInfo();
    
@@ -999,11 +998,11 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                    string capsPath = neighbourRegion.ServerURI + CapsUtil.GetCapsSeedPath(agentcaps);
    
                    m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Sending new CAPS seed url {0} to client {1}", capsPath, agent.UUID);
-    
                    IEventQueue eq = agent.Scene.RequestModuleInterface<IEventQueue>();
                    if (eq != null)
                    {
-                        eq.CrossRegion(neighbourHandle, pos, agent.Velocity, neighbourRegion.ExternalEndPoint,
+                        eq.CrossRegion(neighbourHandle, pos, vel2 /* agent.Velocity */, neighbourRegion.ExternalEndPoint,
                                       capsPath, agent.UUID, agent.ControllingClient.SessionId);
                    }
                    else
@@ -1011,32 +1010,26 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                        agent.ControllingClient.CrossRegion(neighbourHandle, pos, agent.Velocity, neighbourRegion.ExternalEndPoint,
                                                    capsPath);
                    }
-    
-                    if (!WaitForCallback(agent.UUID))
+                    // SUCCESS! 
-                    {
-                        m_log.Debug("[ENTITY TRANSFER MODULE]: Callback never came in crossing agent");
-                        ReInstantiateScripts(agent);
-                        ResetFromTransit(agent.UUID);
-    
-                        // Yikes! We should just have a ref to scene here.
-                        //agent.Scene.InformClientOfNeighbours(agent);
-                        EnableChildAgents(agent);
-    
-                        return agent;
-                    }
-    
                    agent.MakeChildAgent();
-    
+                    ResetFromTransit(agent.UUID);
                    // now we have a child agent in this region. Request all interesting data about other (root) agents
                    agent.SendOtherAgentsAvatarDataToMe();
                    agent.SendOtherAgentsAppearanceToMe();
-    
-                    // Backwards compatibility
+                    // Backwards compatibility. Best effort
                    if (version == "Unknown" || version == string.Empty)
                    {
-                        m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Old neighbor, passing attachments one by one...");
+                        m_log.DebugFormat("[ENTITY TRANSFER MODULE]: neighbor with old version, passing attachments one by one...");
+                        Thread.Sleep(3000); // wait a little now that we're not waiting for the callback
                        CrossAttachmentsIntoNewRegion(neighbourRegion, agent, true);
                    }
+                    // Next, let's close the child agent connections that are too far away.
+                    agent.CloseChildAgents(neighbourx, neighboury);
    
                    AgentHasMovedAway(agent, false);
    
@@ -1069,16 +1062,16 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
            CrossAgentToNewRegionDelegate icon = (CrossAgentToNewRegionDelegate)iar.AsyncState;
            ScenePresence agent = icon.EndInvoke(iar);
-            // If the cross was successful, this agent is a child agent
+            //// If the cross was successful, this agent is a child agent
-            if (agent.IsChildAgent)
+            //if (agent.IsChildAgent)
-                agent.Reset();
+            //    agent.Reset();
-            else // Not successful
+            //else // Not successful
-                agent.RestoreInCurrentScene();
+            //    agent.RestoreInCurrentScene();
            // In any case
            agent.IsInTransit = false;
-            //m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Crossing agent {0} {1} completed.", agent.Firstname, agent.Lastname);
+            m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Crossing agent {0} {1} completed.", agent.Firstname, agent.Lastname);
        }
        #endregion
@@ -1712,9 +1705,23 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
            uint x = 0, y = 0;
            Utils.LongToUInts(newRegionHandle, out x, out y);
            GridRegion destination = scene.GridService.GetRegionByPosition(scene.RegionInfo.ScopeID, (int)x, (int)y);
-            if (destination != null && !CrossPrimGroupIntoNewRegion(destination, grp, silent))
+            if (destination == null || !CrossPrimGroupIntoNewRegion(destination, grp, silent))
            {
+                m_log.InfoFormat("[ENTITY TRANSFER MODULE] cross region transfer failed for object {0}",grp.UUID);
+                // We are going to move the object back to the old position so long as the old position
+                // is in the region
+                oldGroupPosition.X = Util.Clamp<float>(oldGroupPosition.X,1.0f,(float)Constants.RegionSize-1);
+                oldGroupPosition.Y = Util.Clamp<float>(oldGroupPosition.Y,1.0f,(float)Constants.RegionSize-1);
+                oldGroupPosition.Z = Util.Clamp<float>(oldGroupPosition.Z,1.0f,4096.0f);
                grp.RootPart.GroupPosition = oldGroupPosition;
+                // Need to turn off the physics flags, otherwise the object will continue to attempt to
+                // move out of the region creating an infinite loop of failed attempts to cross
+                grp.UpdatePrimFlags(grp.RootPart.LocalId,false,grp.IsTemporary,grp.IsPhantom,false);
                grp.ScheduleGroupForFullUpdate();
            }
        }
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
index cc9ba97..8d41728 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
@@ -187,8 +187,8 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
            m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: Request to teleport {0} {1} home", client.FirstName, client.LastName);
            // Let's find out if this is a foreign user or a local user
-            UserAccount account = m_aScene.UserAccountService.GetUserAccount(m_aScene.RegionInfo.ScopeID, id);
+            IUserManagement uMan = m_aScene.RequestModuleInterface<IUserManagement>(); 
-            if (account != null)
+            if (uMan != null && uMan.IsLocalGridUser(id))
            {
                // local grid user
                m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: User is local");
@@ -227,8 +227,8 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
            IEventQueue eq = sp.Scene.RequestModuleInterface<IEventQueue>();
            GridRegion homeGatekeeper = MakeRegion(aCircuit);
            
-            m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: teleporting user {0} {1} home to {2} via {3}:{4}:{5}",
+            m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: teleporting user {0} {1} home to {2} via {3}:{4}",
-                aCircuit.firstname, aCircuit.lastname, finalDestination.RegionName, homeGatekeeper.ExternalHostName, homeGatekeeper.HttpPort, homeGatekeeper.RegionName);
+                aCircuit.firstname, aCircuit.lastname, finalDestination.RegionName, homeGatekeeper.ServerURI, homeGatekeeper.RegionName);
            DoTeleport(sp, homeGatekeeper, finalDestination, position, lookAt, (uint)(Constants.TeleportFlags.SetLastToTarget | Constants.TeleportFlags.ViaHome), eq);
        }
@@ -313,8 +313,9 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                }
                // Let's find out if this is a foreign user or a local user
+                IUserManagement uMan = m_aScene.RequestModuleInterface<IUserManagement>();
                UserAccount account = m_aScene.UserAccountService.GetUserAccount(m_aScene.RegionInfo.ScopeID, obj.AgentId);
-                if (account != null)
+                if (uMan != null && uMan.IsLocalGridUser(obj.AgentId))
                {
                    // local grid user
                    return;
@@ -347,6 +348,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
            region.ExternalHostName = uri.Host;
            region.HttpPort = (uint)uri.Port;
+            region.ServerURI = uri.ToString();
            region.RegionName = string.Empty;
            region.InternalEndPoint = new System.Net.IPEndPoint(System.Net.IPAddress.Parse("0.0.0.0"), (int)0);
            return region;
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGAssetMapper.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGAssetMapper.cs
index 81b65c5..d20c9eb 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGAssetMapper.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGAssetMapper.cs
@@ -73,7 +73,10 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
        public AssetBase FetchAsset(string url, UUID assetID)
        {
-            AssetBase asset = m_scene.AssetService.Get(url + "/" + assetID.ToString());
+            if (!url.EndsWith("/") && !url.EndsWith("="))
+                url = url + "/";
+            AssetBase asset = m_scene.AssetService.Get(url + assetID.ToString());
            if (asset != null)
            {
@@ -87,6 +90,9 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
        {
            if (asset != null)
            {
+                if (!url.EndsWith("/") && !url.EndsWith("="))
+                    url = url + "/";
                // See long comment in AssetCache.AddAsset
                if (!asset.Temporary || asset.Local)
                {
@@ -99,7 +105,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                    Copy(asset, asset1);
                    try
                    {
-                        asset1.ID = url + "/" + asset.ID;
+                        asset1.ID = url + asset.ID;
                    }
                    catch
                    {
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs
index 49d484b..bf24ebc 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs
@@ -124,8 +124,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
        protected override string GenerateLandmark(ScenePresence presence, out string prefix, out string suffix)
        {
-            UserAccount account = m_Scene.UserAccountService.GetUserAccount(m_Scene.RegionInfo.ScopeID, presence.UUID);
+            if (UserManagementModule != null && !UserManagementModule.IsLocalGridUser(presence.UUID))
-            if (account == null)
                prefix = "HG ";
            else
                prefix = string.Empty;
@@ -210,12 +209,9 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
        public override bool IsForeignUser(UUID userID, out string assetServerURL)
        {
            assetServerURL = string.Empty;
-            UserAccount account = null;
-            if (m_Scene.UserAccountService != null)
-                account = m_Scene.UserAccountService.GetUserAccount(m_Scene.RegionInfo.ScopeID, userID);
-            if (account == null) // foreign
+            if (UserManagementModule != null && !UserManagementModule.IsLocalGridUser(userID))
-            {
+            { // foreign 
                ScenePresence sp = null;
                if (m_Scene.TryGetScenePresence(userID, out sp))
                {
diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
index a40a6a4..37292d6 100644
--- a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
@@ -50,6 +50,9 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
        public string LastName { get; set; }
        public string HomeURL { get; set; }
        public Dictionary<string, object> ServerURLs { get; set; }
+        public string Title { get; set; }
+        public int Flags { get; set; }
+        public int Created { get; set; }
    }
    public class UserManagementModule : ISharedRegionModule, IUserManagement
@@ -281,6 +284,94 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
            return string.Empty;
        }
+        public int GetUserFlags(UUID userID)
+        {
+            UserData userdata;
+            lock (m_UserCache)
+                m_UserCache.TryGetValue(userID, out userdata);
+            if (userdata.Flags == -1)
+                GetUserInfo(userID);
+            if (userdata.Flags != -1)
+                return userdata.Flags;
+            return 0;
+        }
+        public int GetUserCreated(UUID userID)
+        {
+            UserData userdata;
+            lock (m_UserCache)
+                m_UserCache.TryGetValue(userID, out userdata);
+            if (userdata.Flags == -1)
+                GetUserInfo(userID);
+            if (userdata.Created != -1)
+                return userdata.Created;
+            return 0;
+        }
+        public string GetUserTitle(UUID userID)
+        {
+            UserData userdata;
+            lock (m_UserCache)
+                m_UserCache.TryGetValue(userID, out userdata);
+            if (userdata.Flags == -1)
+                GetUserInfo(userID);
+            if (userdata.Created != -1)
+                return userdata.Title;
+            return string.Empty;
+        }
+        // This will cache the user data
+        // Change this to return bool
+        private bool GetUserInfo(UUID userID)
+        {
+            UserData userdata;
+            lock (m_UserCache)
+                m_UserCache.TryGetValue(userID, out userdata);
+            if (userdata != null)
+            {
+//                m_log.DebugFormat("[USER MANAGEMENT MODULE]: Requested url type {0} for {1}", serverType, userID);
+                if (userdata.Flags >= 0)
+                {
+                    // This is already populated
+                    return true;
+                }
+                if (userdata.HomeURL != null && userdata.HomeURL != string.Empty)
+                {
+                    m_log.DebugFormat(
+                        "[USER MANAGEMENT MODULE]: Requesting user flags from '{0}' for {1}",
+                        userdata.HomeURL, userID);
+                    UserAgentServiceConnector uConn = new UserAgentServiceConnector(userdata.HomeURL);
+                    Dictionary<string, object> info = uConn.GetUserInfo(userID);
+                    // Pull our data now
+                    if (info["result"].ToString() == "success")
+                    {
+                        userdata.Flags = (int)info["user_flags"];
+                        userdata.Created = (int)info["user_created"];
+                        userdata.Title = (string)info["user_title"];
+                        return true;
+                    }
+                }
+            }
+            return false;
+        }
        public string GetUserUUI(UUID userID)
        {
            UserAccount account = m_Scenes[0].UserAccountService.GetUserAccount(m_Scenes[0].RegionInfo.ScopeID, userID);
@@ -352,6 +443,8 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
            {
                UserData user = new UserData();
                user.Id = id;
+                user.Flags = -1;
+                user.Created = -1;
                if (creatorData != null && creatorData != string.Empty)
                {
@@ -425,6 +518,15 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
        //}
+        public bool IsLocalGridUser(UUID uuid)
+        {
+            UserAccount account = m_Scenes[0].UserAccountService.GetUserAccount(m_Scenes[0].RegionInfo.ScopeID, uuid);
+            if (account == null || (account != null && !account.LocalToGrid))
+                return false;
+            return true;
+        }
        #endregion IUserManagement
        private void HandleShowUsers(string module, string[] cmd)
diff --git a/OpenSim/Region/CoreModules/LightShare/LightShareModule.cs b/OpenSim/Region/CoreModules/LightShare/LightShareModule.cs
index cabbd31..16cbbf5 100644
--- a/OpenSim/Region/CoreModules/LightShare/LightShareModule.cs
+++ b/OpenSim/Region/CoreModules/LightShare/LightShareModule.cs
@@ -153,10 +153,18 @@ namespace OpenSim.Region.CoreModules.World.LightShare
        public void SendProfileToClient(IClientAPI client, RegionLightShareData wl)
        {
-            if (m_enableWindlight && m_scene.RegionInfo.WindlightSettings.valid)
+            if (m_enableWindlight)
            {
-                List<byte[]> param = compileWindlightSettings(wl);
+                if (m_scene.RegionInfo.WindlightSettings.valid)
-                client.SendGenericMessage("Windlight", param);
+                {
+                    List<byte[]> param = compileWindlightSettings(wl);
+                    client.SendGenericMessage("Windlight", param);
+                }
+                else
+                {
+                    List<byte[]> param = new List<byte[]>();
+                    client.SendGenericMessage("WindlightReset", param);
+                }
            }
        }
@@ -175,8 +183,7 @@ namespace OpenSim.Region.CoreModules.World.LightShare
        private void EventManager_OnSaveNewWindlightProfile()
        {
-            if (m_scene.RegionInfo.WindlightSettings.valid)
+            m_scene.ForEachRootClient(SendProfileToClient);
-                m_scene.ForEachRootClient(SendProfileToClient);
        }
        public void PostInitialise()
diff --git a/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs b/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
index 43672d1..8fb5d75 100644
--- a/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
+++ b/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
@@ -411,8 +411,21 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
                }
                Request.Timeout = HttpTimeout;
-                // execute the request
+                try
-                response = (HttpWebResponse) Request.GetResponse();
+                {
+                    // execute the request
+                    response = (HttpWebResponse) Request.GetResponse();
+                }
+                catch (WebException e)
+                {
+                    if (e.Status != WebExceptionStatus.ProtocolError)
+                    {
+                        throw;
+                    }
+                    response = (HttpWebResponse)e.Response;
+                }
+                Status = (int)response.StatusCode;
                Stream resStream = response.GetResponseStream();
@@ -436,17 +449,8 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
            }
            catch (Exception e)
            {
-                if (e is WebException && ((WebException)e).Status == WebExceptionStatus.ProtocolError)
+                Status = (int)OSHttpStatusCode.ClientErrorJoker;
-                {
+                ResponseBody = e.Message;
-                    HttpWebResponse webRsp = (HttpWebResponse)((WebException)e).Response;
-                    Status = (int)webRsp.StatusCode;
-                    ResponseBody = webRsp.StatusDescription;
-                }
-                else
-                {
-                    Status = (int)OSHttpStatusCode.ClientErrorJoker;
-                    ResponseBody = e.Message;
-                }
                _finished = true;
                return;
@@ -457,7 +461,6 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
                    response.Close();
            }
-            Status = (int)OSHttpStatusCode.SuccessOk;
            _finished = true;
        }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs
index e31be21..8395f83 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs
@@ -382,23 +382,5 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
            return result;
        }
-        #region IHyperAssetService
-        public string GetUserAssetServer(UUID userID)
-        {
-            UserAccount account = m_aScene.UserAccountService.GetUserAccount(m_aScene.RegionInfo.ScopeID, userID);
-            if (account != null && account.ServiceURLs.ContainsKey("AssetServerURI") && account.ServiceURLs["AssetServerURI"] != null)
-                return account.ServiceURLs["AssetServerURI"].ToString();
-            return string.Empty;
-        }
-        public string GetSimAssetServer()
-        {
-            return m_LocalAssetServiceURI;
-        }
-        #endregion
    }
 }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/LocalAssetServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/LocalAssetServiceConnector.cs
index cc5d061..2e6ec90 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/LocalAssetServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/LocalAssetServiceConnector.cs
@@ -170,6 +170,8 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
        public AssetBase GetCached(string id)
        {
+//            m_log.DebugFormat("[LOCAL ASSET SERVICES CONNECTOR]: Cache request for {0}", id);
            if (m_Cache != null)
                return m_Cache.Get(id);
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/BaseInventoryConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/BaseInventoryConnector.cs
deleted file mode 100644
index dcf08e3..0000000
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/BaseInventoryConnector.cs
+++ /dev/null
@@ -1,223 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSimulator Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-using System;
-using System.Collections.Generic;
-using OpenMetaverse;
-using Nini.Config;
-using log4net;
-using OpenSim.Framework;
-using OpenSim.Services.Interfaces;
-namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
-{
-    public abstract class BaseInventoryConnector : IInventoryService
-    {
-        protected static InventoryCache m_cache;
-        private static bool m_Initialized;
-        protected virtual void Init(IConfigSource source)
-        {
-            if (!m_Initialized)
-            {
-                m_cache = new InventoryCache();
-                m_cache.Init(source, this);
-                m_Initialized = true;
-            }
-        }
-        /// <summary>
-        /// Create the entire inventory for a given user
-        /// </summary>
-        /// <param name="user"></param>
-        /// <returns></returns>
-        public abstract bool CreateUserInventory(UUID user);
-        /// <summary>
-        /// Gets the skeleton of the inventory -- folders only
-        /// </summary>
-        /// <param name="userId"></param>
-        /// <returns></returns>
-        public abstract List<InventoryFolderBase> GetInventorySkeleton(UUID userId);
-        /// <summary>
-        /// Synchronous inventory fetch.
-        /// </summary>
-        /// <param name="userID"></param>
-        /// <returns></returns>
-        public abstract InventoryCollection GetUserInventory(UUID userID);
-        /// <summary>
-        /// Request the inventory for a user.  This is an asynchronous operation that will call the callback when the
-        /// inventory has been received
-        /// </summary>
-        /// <param name="userID"></param>
-        /// <param name="callback"></param>
-        public abstract void GetUserInventory(UUID userID, InventoryReceiptCallback callback);
-        /// <summary>
-        /// Retrieve the root inventory folder for the given user.
-        /// </summary>
-        /// <param name="userID"></param>
-        /// <returns>null if no root folder was found</returns>
-        public InventoryFolderBase GetRootFolder(UUID userID)
-        {
-            // Root folder is here as system type Folder.
-            return m_cache.GetFolderForType(userID, AssetType.Folder);
-        }
-        public abstract Dictionary<AssetType, InventoryFolderBase> GetSystemFolders(UUID userID);
-        /// <summary>
-        /// Gets the user folder for the given folder-type
-        /// </summary>
-        /// <param name="userID"></param>
-        /// <param name="type"></param>
-        /// <returns></returns>
-        public InventoryFolderBase GetFolderForType(UUID userID, AssetType type)
-        {
-            return m_cache.GetFolderForType(userID, type);
-        }
-        /// <summary>
-        /// Gets everything (folders and items) inside a folder
-        /// </summary>
-        /// <param name="userId"></param>
-        /// <param name="folderID"></param>
-        /// <returns></returns>
-        public abstract InventoryCollection GetFolderContent(UUID userID, UUID folderID);
-        /// <summary>
-        /// Gets the items inside a folder
-        /// </summary>
-        /// <param name="userID"></param>
-        /// <param name="folderID"></param>
-        /// <returns></returns>
-        public abstract List<InventoryItemBase> GetFolderItems(UUID userID, UUID folderID);
-        /// <summary>
-        /// Add a new folder to the user's inventory
-        /// </summary>
-        /// <param name="folder"></param>
-        /// <returns>true if the folder was successfully added</returns>
-        public abstract bool AddFolder(InventoryFolderBase folder);
-        /// <summary>
-        /// Update a folder in the user's inventory
-        /// </summary>
-        /// <param name="folder"></param>
-        /// <returns>true if the folder was successfully updated</returns>
-        public abstract bool UpdateFolder(InventoryFolderBase folder);
-        /// <summary>
-        /// Move an inventory folder to a new location
-        /// </summary>
-        /// <param name="folder">A folder containing the details of the new location</param>
-        /// <returns>true if the folder was successfully moved</returns>
-        public abstract bool MoveFolder(InventoryFolderBase folder);
-        /// <summary>
-        /// Delete a list of inventory folders (from trash)
-        /// </summary>
-        public abstract bool DeleteFolders(UUID ownerID, List<UUID> folderIDs);
-        
-        /// <summary>
-        /// Purge an inventory folder of all its items and subfolders.
-        /// </summary>
-        /// <param name="folder"></param>
-        /// <returns>true if the folder was successfully purged</returns>
-        public abstract bool PurgeFolder(InventoryFolderBase folder);
-        /// <summary>
-        /// Add a new item to the user's inventory.
-        /// If the given item has to parent folder, it tries to find the most
-        /// suitable folder for it.
-        /// </summary>
-        /// <param name="item"></param>
-        /// <returns>true if the item was successfully added</returns>
-        public bool AddItem(InventoryItemBase item)
-        {
-            if (item == null)
-                return false;
-            if (item.Folder == UUID.Zero)
-            {
-                InventoryFolderBase f = GetFolderForType(item.Owner, (AssetType)item.AssetType);
-                if (f != null)
-                    item.Folder = f.ID;
-                else
-                {
-                    f = GetRootFolder(item.Owner);
-                    if (f != null)
-                        item.Folder = f.ID;
-                    else
-                        return false;
-                }
-            }
-            return AddItemPlain(item);
-        }
-        protected abstract bool AddItemPlain(InventoryItemBase item);
-        /// <summary>
-        /// Update an item in the user's inventory
-        /// </summary>
-        /// <param name="item"></param>
-        /// <returns>true if the item was successfully updated</returns>
-        public abstract bool UpdateItem(InventoryItemBase item);
-        public abstract bool MoveItems(UUID ownerID, List<InventoryItemBase> items);
-        /// <summary>
-        /// Delete an item from the user's inventory
-        /// </summary>
-        /// <param name="item"></param>
-        /// <returns>true if the item was successfully deleted</returns>
-        public abstract bool DeleteItems(UUID ownerID, List<UUID> itemIDs);
-        public abstract InventoryItemBase GetItem(InventoryItemBase item);
-        public abstract InventoryFolderBase GetFolder(InventoryFolderBase folder);
-        /// <summary>
-        /// Does the given user have an inventory structure?
-        /// </summary>
-        /// <param name="userID"></param>
-        /// <returns></returns>
-        public abstract bool HasInventoryForUser(UUID userID);
-        /// <summary>
-        /// Get the active gestures of the agent.
-        /// </summary>
-        /// <param name="userId"></param>
-        /// <returns></returns>
-        public abstract List<InventoryItemBase> GetActiveGestures(UUID userId);
-        public abstract int GetAssetPermissions(UUID userID, UUID assetID);
-    }
-}
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs
index 0d121ed..b5c0af6 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs
@@ -218,9 +218,9 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
        /// <param name="userID"></param>
        private void CacheInventoryServiceURL(UUID userID)
        {
-            if (m_Scenes[0].UserAccountService.GetUserAccount(m_Scenes[0].RegionInfo.ScopeID, userID) == null)
+            if (UserManagementModule != null && !UserManagementModule.IsLocalGridUser(userID))
            {
-                // The user does not have a local account; let's cache its service URL
+                // The user is not local; let's cache its service URL
                string inventoryURL = string.Empty;
                ScenePresence sp = null;
                foreach (Scene scene in m_Scenes)
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/InventoryCache.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/InventoryCache.cs
deleted file mode 100644
index 2322d7c..0000000
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/InventoryCache.cs
+++ /dev/null
@@ -1,237 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSimulator Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-using System;
-using System.Collections.Generic;
-using System.Reflection;
-using OpenSim.Framework;
-using OpenSim.Framework.Client;
-using OpenSim.Region.Framework.Scenes;
-using OpenMetaverse;
-using Nini.Config;
-using log4net;
-namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
-{
-    public class InventoryCache
-    {
-        private static readonly ILog m_log =
-            LogManager.GetLogger(
-            MethodBase.GetCurrentMethod().DeclaringType);
-        protected BaseInventoryConnector m_Connector;
-        protected List<Scene> m_Scenes;
-        // The cache proper
-        protected Dictionary<UUID, Dictionary<AssetType, InventoryFolderBase>> m_InventoryCache;
-        // A cache of userIDs --> ServiceURLs, for HGBroker only
-        protected Dictionary<UUID, string> m_InventoryURLs =
-                new Dictionary<UUID, string>();
-        public virtual void Init(IConfigSource source, BaseInventoryConnector connector)
-        {
-            m_Scenes = new List<Scene>();
-            m_InventoryCache = new Dictionary<UUID, Dictionary<AssetType, InventoryFolderBase>>();
-            m_Connector = connector;
-        }
-        public virtual void AddRegion(Scene scene)
-        {
-            m_Scenes.Add(scene);
-            scene.EventManager.OnMakeRootAgent += OnMakeRootAgent;
-            scene.EventManager.OnClientClosed += OnClientClosed;
-        }
-        public virtual void RemoveRegion(Scene scene)
-        {
-            if ((m_Scenes != null) && m_Scenes.Contains(scene))
-            {
-                m_Scenes.Remove(scene);
-            }
-        }
-        void OnMakeRootAgent(ScenePresence presence)
-        {
-            // Get system folders
-            // First check if they're here already
-            lock (m_InventoryCache)
-            {
-                if (m_InventoryCache.ContainsKey(presence.UUID))
-                {
-                    m_log.DebugFormat("[INVENTORY CACHE]: OnMakeRootAgent, system folders for {0} {1} already in cache", presence.Firstname, presence.Lastname);
-                    return;
-                }
-            }
-            // If not, go get them and place them in the cache
-            Dictionary<AssetType, InventoryFolderBase> folders = CacheSystemFolders(presence.UUID);
-            CacheInventoryServiceURL(presence.Scene, presence.UUID);
-            
-            m_log.DebugFormat("[INVENTORY CACHE]: OnMakeRootAgent in {0}, fetched system folders for {1} {2}: count {3}", 
-                presence.Scene.RegionInfo.RegionName, presence.Firstname, presence.Lastname, folders.Count);
-        }
-        void OnClientClosed(UUID clientID, Scene scene)
-        {
-            if (m_InventoryCache.ContainsKey(clientID)) // if it's still in cache
-            {
-                ScenePresence sp = null;
-                foreach (Scene s in m_Scenes)
-                {
-                    s.TryGetScenePresence(clientID, out sp);
-                    if ((sp != null) && !sp.IsChildAgent && (s != scene))
-                    {
-                        m_log.DebugFormat("[INVENTORY CACHE]: OnClientClosed in {0}, but user {1} still in sim. Keeping system folders in cache",
-                            scene.RegionInfo.RegionName, clientID);
-                        return;
-                    }
-                }
-                m_log.DebugFormat(
-                    "[INVENTORY CACHE]: OnClientClosed in {0}, user {1} out of sim. Dropping system folders",
-                    scene.RegionInfo.RegionName, clientID);
-                DropCachedSystemFolders(clientID);
-                DropInventoryServiceURL(clientID);
-            }
-        }
-        /// <summary>
-        /// Cache a user's 'system' folders.
-        /// </summary>
-        /// <param name="userID"></param>
-        /// <returns>Folders cached</returns>
-        protected Dictionary<AssetType, InventoryFolderBase> CacheSystemFolders(UUID userID)
-        {
-            // If not, go get them and place them in the cache
-            Dictionary<AssetType, InventoryFolderBase> folders = m_Connector.GetSystemFolders(userID);
-            if (folders.Count > 0)
-                lock (m_InventoryCache)
-                    m_InventoryCache.Add(userID, folders);
-            return folders;
-        }
-        /// <summary>
-        /// Drop a user's cached 'system' folders
-        /// </summary>
-        /// <param name="userID"></param>
-        protected void DropCachedSystemFolders(UUID userID)
-        {
-            // Drop system folders
-            lock (m_InventoryCache)
-                if (m_InventoryCache.ContainsKey(userID))
-                    m_InventoryCache.Remove(userID);
-        }
-        /// <summary>
-        /// Get the system folder for a particular asset type
-        /// </summary>
-        /// <param name="userID"></param>
-        /// <param name="type"></param>
-        /// <returns></returns>
-        public InventoryFolderBase GetFolderForType(UUID userID, AssetType type)
-        {
-            m_log.DebugFormat("[INVENTORY CACHE]: Getting folder for asset type {0} for user {1}", type, userID);
-            
-            Dictionary<AssetType, InventoryFolderBase> folders = null;
-            
-            lock (m_InventoryCache)
-            {
-                m_InventoryCache.TryGetValue(userID, out folders);
-                // In some situations (such as non-secured standalones), system folders can be requested without
-                // the user being logged in.  So we need to try caching them here if we don't already have them.
-                if (null == folders)
-                    CacheSystemFolders(userID);
-                m_InventoryCache.TryGetValue(userID, out folders);
-            }
-            
-            if ((folders != null) && folders.ContainsKey(type))
-            {
-                m_log.DebugFormat(
-                    "[INVENTORY CACHE]: Returning folder {0} as type {1} for {2}", folders[type], type, userID);
-                
-                return folders[type];
-            }
-            
-            m_log.WarnFormat("[INVENTORY CACHE]: Could not find folder for system type {0} for {1}", type, userID);
-            return null;
-        }
-        /// <summary>
-        /// Gets the user's inventory URL from its serviceURLs, if the user is foreign,
-        /// and sticks it in the cache
-        /// </summary>
-        /// <param name="userID"></param>
-        private void CacheInventoryServiceURL(Scene scene, UUID userID)
-        {
-            if (scene.UserAccountService.GetUserAccount(scene.RegionInfo.ScopeID, userID) == null)
-            {
-                // The user does not have a local account; let's cache its service URL
-                string inventoryURL = string.Empty;
-                ScenePresence sp = null;
-                scene.TryGetScenePresence(userID, out sp);
-                if (sp != null)
-                {
-                    AgentCircuitData aCircuit = scene.AuthenticateHandler.GetAgentCircuitData(sp.ControllingClient.CircuitCode);
-                    if (aCircuit.ServiceURLs.ContainsKey("InventoryServerURI"))
-                    {
-                        inventoryURL = aCircuit.ServiceURLs["InventoryServerURI"].ToString();
-                        if (inventoryURL != null && inventoryURL != string.Empty)
-                        {
-                            inventoryURL = inventoryURL.Trim(new char[] { '/' });
-                            m_InventoryURLs.Add(userID, inventoryURL);
-                        }
-                    }
-                }
-            }
-        }
-        private void DropInventoryServiceURL(UUID userID)
-        {
-            lock (m_InventoryURLs)
-                if (m_InventoryURLs.ContainsKey(userID))
-                    m_InventoryURLs.Remove(userID);
-        }
-        public string GetInventoryServiceURL(UUID userID)
-        {
-            if (m_InventoryURLs.ContainsKey(userID))
-                return m_InventoryURLs[userID];
-            return null;
-        }
-    }
-}
diff --git a/OpenSim/Region/Framework/Interfaces/IUserManagement.cs b/OpenSim/Region/Framework/Interfaces/IUserManagement.cs
index c66e053..54dfaf4 100644
--- a/OpenSim/Region/Framework/Interfaces/IUserManagement.cs
+++ b/OpenSim/Region/Framework/Interfaces/IUserManagement.cs
@@ -14,6 +14,9 @@ namespace OpenSim.Region.Framework.Interfaces
        string GetUserHomeURL(UUID uuid);
        string GetUserUUI(UUID uuid);
        string GetUserServerURL(UUID uuid, string serverType);
+        int GetUserFlags(UUID userID);
+        int GetUserCreated(UUID userID);
+        string GetUserTitle(UUID userID);
        /// <summary>
        /// Add a user.
@@ -48,5 +51,7 @@ namespace OpenSim.Region.Framework.Interfaces
        /// <param name="firstName"></param>
        /// <param name="profileURL"></param>
        void AddUser(UUID uuid, string firstName, string lastName, string profileURL);
+        bool IsLocalGridUser(UUID uuid);
    }
 }
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 6666328..0f84da9 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -77,7 +77,15 @@ namespace OpenSim.Region.Framework.Scenes
        /// Controls whether physics can be applied to prims.  Even if false, prims still have entries in a
        /// PhysicsScene in order to perform collision detection
        /// </summary>
-        public bool m_physicalPrim;
+        public bool PhysicalPrims { get; private set; }
+        /// <summary>
+        /// Controls whether prims can be collided with.
+        /// </summary>
+        /// <remarks>
+        /// If this is set to false then prims cannot be subject to physics either.
+        /// </summary>
+        public bool CollidablePrims { get; private set; }
        public float m_maxNonphys = 256;
        public float m_maxPhys = 10;
@@ -650,7 +658,8 @@ namespace OpenSim.Region.Framework.Scenes
                //Animation states
                m_useFlySlow = startupConfig.GetBoolean("enableflyslow", false);
-                m_physicalPrim = startupConfig.GetBoolean("physical_prim", true);
+                PhysicalPrims = startupConfig.GetBoolean("physical_prim", true);
+                CollidablePrims = startupConfig.GetBoolean("collidable_prim", true);
                m_maxNonphys = startupConfig.GetFloat("NonPhysicalPrimMax", m_maxNonphys);
                if (RegionInfo.NonphysPrimMax > 0)
@@ -701,7 +710,7 @@ namespace OpenSim.Region.Framework.Scenes
                    if (maptileRefresh != 0)
                    {
                        m_mapGenerationTimer.Interval = maptileRefresh * 1000;
-                        m_mapGenerationTimer.Elapsed += RegenerateMaptile;
+                        m_mapGenerationTimer.Elapsed += RegenerateMaptileAndReregister;
                        m_mapGenerationTimer.AutoReset = true;
                        m_mapGenerationTimer.Start();
                    }
@@ -1638,21 +1647,17 @@ namespace OpenSim.Region.Framework.Scenes
        {
            m_sceneGridService.SetScene(this);
+            //// Unfortunately this needs to be here and it can't be async.
+            //// The map tile image is stored in RegionSettings, but it also needs to be
+            //// stored in the GridService, because that's what the world map module uses
+            //// to send the map image UUIDs (of other regions) to the viewer...
+            if (m_generateMaptiles)
+                RegenerateMaptile();
            GridRegion region = new GridRegion(RegionInfo);
            string error = GridService.RegisterRegion(RegionInfo.ScopeID, region);
            if (error != String.Empty)
-            {
                throw new Exception(error);
-            }
-            // Generate the maptile asynchronously, because sometimes it can be very slow and we
-            // don't want this to delay starting the region.
-            if (m_generateMaptiles)
-            {
-                Util.FireAndForget(delegate {
-                    RegenerateMaptile(null, null);
-                });
-            }
        }
        #endregion
@@ -5023,13 +5028,24 @@ namespace OpenSim.Region.Framework.Scenes
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
-        public void RegenerateMaptile(object sender, ElapsedEventArgs e)
+        private void RegenerateMaptile()
        {
            IWorldMapModule mapModule = RequestModuleInterface<IWorldMapModule>();
            if (mapModule != null)
                mapModule.GenerateMaptile();
        }
+        private void RegenerateMaptileAndReregister(object sender, ElapsedEventArgs e)
+        {
+            RegenerateMaptile();
+            // We need to propagate the new image UUID to the grid service
+            // so that all simulators can retrieve it
+            string error = GridService.RegisterRegion(RegionInfo.ScopeID, new GridRegion(RegionInfo));
+            if (error != string.Empty)
+                throw new Exception(error);
+        }
        // This method is called across the simulation connector to
        // determine if a given agent is allowed in this region
        // AS A ROOT AGENT. Returning false here will prevent them
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index a3e4b46..1e2901b 100644
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -333,7 +333,6 @@ namespace OpenSim.Region.Framework.Scenes
            if (rot != null)
                sceneObject.UpdateGroupRotationR((Quaternion)rot);
-            //group.ApplyPhysics(m_physicalPrim);
            if (sceneObject.RootPart.PhysActor != null && sceneObject.RootPart.PhysActor.IsPhysical && vel != Vector3.Zero)
            {
                sceneObject.RootPart.ApplyImpulse((vel * sceneObject.GetMass()), false);
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index abea788..8860764 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -210,7 +210,7 @@ namespace OpenSim.Region.Framework.Scenes
        /// </remarks>
        public bool UsesPhysics
        {
-            get { return (RootPart.Flags & PrimFlags.TemporaryOnRez) != 0; }
+            get { return (RootPart.Flags & PrimFlags.Physics) != 0; }
        }
        /// <summary>
@@ -669,7 +669,7 @@ namespace OpenSim.Region.Framework.Scenes
                //m_log.DebugFormat("[SCENE]: Given local id {0} to part {1}, linknum {2}, parent {3} {4}", part.LocalId, part.UUID, part.LinkNum, part.ParentID, part.ParentUUID);
            }
-            ApplyPhysics(m_scene.m_physicalPrim);
+            ApplyPhysics();
            // Don't trigger the update here - otherwise some client issues occur when multiple updates are scheduled
            // for the same object with very different properties.  The caller must schedule the update.
@@ -1239,8 +1239,7 @@ namespace OpenSim.Region.Framework.Scenes
        /// <summary>
        /// Apply physics to this group
        /// </summary>
-        /// <param name="m_physicalPrim"></param>
+        public void ApplyPhysics()
-        public void ApplyPhysics(bool m_physicalPrim)
        {
            // Apply physics to the root prim
            m_rootPart.ApplyPhysics(m_rootPart.GetEffectiveObjectFlags(), m_rootPart.VolumeDetectActive);
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index b29ecc6..aea47e6 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -1473,6 +1473,9 @@ namespace OpenSim.Region.Framework.Scenes
        /// <param name="VolumeDetectActive"></param>
        public void ApplyPhysics(uint rootObjectFlags, bool VolumeDetectActive)
        {
+            if (!ParentGroup.Scene.CollidablePrims)
+                return;
 //            m_log.DebugFormat(
 //                "[SCENE OBJECT PART]: Applying physics to {0} {1}, m_physicalPrim {2}",
 //                Name, LocalId, UUID, m_physicalPrim);
@@ -1739,7 +1742,7 @@ namespace OpenSim.Region.Framework.Scenes
        /// <param name="isNew"></param>
        public void DoPhysicsPropertyUpdate(bool UsePhysics, bool isNew)
        {
-            if (!ParentGroup.Scene.m_physicalPrim && UsePhysics)
+            if (!ParentGroup.Scene.PhysicalPrims && UsePhysics)
                return;
            if (IsJoint())
@@ -4318,7 +4321,7 @@ namespace OpenSim.Region.Framework.Scenes
                if (ParentGroup.Scene == null)
                    return;
-                if (PhysActor == null)
+                if (ParentGroup.Scene.CollidablePrims && PhysActor == null)
                {
                    // It's not phantom anymore. So make sure the physics engine get's knowledge of it
                    PhysActor = ParentGroup.Scene.PhysicsScene.AddPrimShape(
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index b8ae553..42cd4be 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -118,7 +118,7 @@ namespace OpenSim.Region.Framework.Scenes
        /// TODO: For some reason, we effectively have a list both here and in Appearance.  Need to work out if this is
        /// necessary.
        /// </remarks>
-        protected List<SceneObjectGroup> m_attachments = new List<SceneObjectGroup>();
+        private List<SceneObjectGroup> m_attachments = new List<SceneObjectGroup>();
        public Object AttachmentsSyncLock { get; private set; }
@@ -550,8 +550,12 @@ namespace OpenSim.Region.Framework.Scenes
                    }
                }
-                m_pos = value;
+                // Don't update while sitting
-                ParentPosition = Vector3.Zero;
+                if (ParentID == 0)
+                {
+                    m_pos = value;
+                    ParentPosition = Vector3.Zero;
+                }
                //m_log.DebugFormat(
                //    "[ENTITY BASE]: In {0} set AbsolutePosition of {1} to {2}",
@@ -566,6 +570,15 @@ namespace OpenSim.Region.Framework.Scenes
        public Vector3 OffsetPosition
        {
            get { return m_pos; }
+            // Don't remove setter. It's not currently used in core but
+            // upcoming Avination code needs it.
+            set
+            {
+                // There is no offset position when not seated
+                if (ParentID == 0)
+                    return;
+                m_pos = value;
+            }
        }
        /// <summary>
@@ -1161,10 +1174,10 @@ namespace OpenSim.Region.Framework.Scenes
        public void CompleteMovement(IClientAPI client, bool openChildAgents)
        {
 //            DateTime startTime = DateTime.Now;
-            
-//            m_log.DebugFormat(
+            m_log.DebugFormat(
-//                "[SCENE PRESENCE]: Completing movement of {0} into region {1}", 
+                "[SCENE PRESENCE]: Completing movement of {0} into region {1} in position {2}",
-//                client.Name, Scene.RegionInfo.RegionName);
+                client.Name, Scene.RegionInfo.RegionName, AbsolutePosition);
            Vector3 look = Velocity;
            if ((look.X == 0) && (look.Y == 0) && (look.Z == 0))
@@ -2383,9 +2396,7 @@ namespace OpenSim.Region.Framework.Scenes
                    m_lastVelocity = Velocity;
                }
-                // followed suggestion from mic bowman. reversed the two lines below.
+                CheckForBorderCrossing();
-                if (ParentID == 0 && PhysicsActor != null || ParentID != 0) // Check that we have a physics actor or we're sitting on something
-                    CheckForBorderCrossing();
                CheckForSignificantMovement(); // sends update to the modules.
            }
@@ -2738,143 +2749,146 @@ namespace OpenSim.Region.Framework.Scenes
        /// </remarks>
        protected void CheckForBorderCrossing()
        {
-            if (IsChildAgent)
+            // Check that we we are not a child
+            if (IsChildAgent) 
                return;
-            Vector3 pos2 = AbsolutePosition;
+            // If we don't have a PhysActor, we can't cross anyway
-            Vector3 vel = Velocity;
+            // Also don't do this while sat, sitting avatars cross with the
-            int neighbor = 0;
+            // object they sit on.
-            int[] fix = new int[2];
+            if (ParentID != 0 || PhysicsActor == null)
+                return;
-            float timeStep = 0.1f;
-            pos2.X = pos2.X + (vel.X*timeStep);
-            pos2.Y = pos2.Y + (vel.Y*timeStep);
-            pos2.Z = pos2.Z + (vel.Z*timeStep);
            if (!IsInTransit)
            {
-                // Checks if where it's headed exists a region
+                Vector3 pos2 = AbsolutePosition;
+                Vector3 vel = Velocity;
+                int neighbor = 0;
+                int[] fix = new int[2];
-                bool needsTransit = false;
+                float timeStep = 0.1f;
-                if (m_scene.TestBorderCross(pos2, Cardinals.W))
+                pos2.X = pos2.X + (vel.X * timeStep);
+                pos2.Y = pos2.Y + (vel.Y * timeStep);
+                pos2.Z = pos2.Z + (vel.Z * timeStep);
+                if (!IsInTransit)
                {
-                    if (m_scene.TestBorderCross(pos2, Cardinals.S))
+                    // Checks if where it's headed exists a region
-                    {
+                    bool needsTransit = false;
-                        needsTransit = true;
+                    if (m_scene.TestBorderCross(pos2, Cardinals.W))
-                        neighbor = m_scene.HaveNeighbor(Cardinals.SW, ref fix);
-                    }
-                    else if (m_scene.TestBorderCross(pos2, Cardinals.N))
                    {
-                        needsTransit = true;
+                        if (m_scene.TestBorderCross(pos2, Cardinals.S))
-                        neighbor = m_scene.HaveNeighbor(Cardinals.NW, ref fix);
+                        {
+                            needsTransit = true;
+                            neighbor = m_scene.HaveNeighbor(Cardinals.SW, ref fix);
+                        }
+                        else if (m_scene.TestBorderCross(pos2, Cardinals.N))
+                        {
+                            needsTransit = true;
+                            neighbor = m_scene.HaveNeighbor(Cardinals.NW, ref fix);
+                        }
+                        else
+                        {
+                            needsTransit = true;
+                            neighbor = m_scene.HaveNeighbor(Cardinals.W, ref fix);
+                        }
                    }
-                    else
+                    else if (m_scene.TestBorderCross(pos2, Cardinals.E))
                    {
-                        needsTransit = true;
+                        if (m_scene.TestBorderCross(pos2, Cardinals.S))
-                        neighbor = m_scene.HaveNeighbor(Cardinals.W, ref fix);
+                        {
+                            needsTransit = true;
+                            neighbor = m_scene.HaveNeighbor(Cardinals.SE, ref fix);
+                        }
+                        else if (m_scene.TestBorderCross(pos2, Cardinals.N))
+                        {
+                            needsTransit = true;
+                            neighbor = m_scene.HaveNeighbor(Cardinals.NE, ref fix);
+                        }
+                        else
+                        {
+                            needsTransit = true;
+                            neighbor = m_scene.HaveNeighbor(Cardinals.E, ref fix);
+                        }
                    }
-                }
+                    else if (m_scene.TestBorderCross(pos2, Cardinals.S))
-                else if (m_scene.TestBorderCross(pos2, Cardinals.E))
-                {
-                    if (m_scene.TestBorderCross(pos2, Cardinals.S))
                    {
                        needsTransit = true;
-                        neighbor = m_scene.HaveNeighbor(Cardinals.SE, ref fix);
+                        neighbor = m_scene.HaveNeighbor(Cardinals.S, ref fix);
                    }
                    else if (m_scene.TestBorderCross(pos2, Cardinals.N))
                    {
                        needsTransit = true;
-                        neighbor = m_scene.HaveNeighbor(Cardinals.NE, ref fix);
+                        neighbor = m_scene.HaveNeighbor(Cardinals.N, ref fix);
                    }
-                    else
-                    {
-                        needsTransit = true;
-                        neighbor = m_scene.HaveNeighbor(Cardinals.E, ref fix);
-                    }
-                }
-                else if (m_scene.TestBorderCross(pos2, Cardinals.S))
-                {
-                    needsTransit = true;
-                    neighbor = m_scene.HaveNeighbor(Cardinals.S, ref fix);
-                }
-                else if (m_scene.TestBorderCross(pos2, Cardinals.N))
-                {
-                    needsTransit = true;
-                    neighbor = m_scene.HaveNeighbor(Cardinals.N, ref fix);
-                }
-                // Makes sure avatar does not end up outside region
+                    // Makes sure avatar does not end up outside region
-                if (neighbor <= 0)
+                    if (neighbor <= 0)
-                {
-                    if (needsTransit)
                    {
-                        if (m_requestedSitTargetUUID == UUID.Zero)
+                        if (needsTransit)
                        {
-                            bool isFlying = Flying;
+                            if (m_requestedSitTargetUUID == UUID.Zero)
-                            RemoveFromPhysicalScene();
+                            {
+                                bool isFlying = Flying;
-                            Vector3 pos = AbsolutePosition;
+                                RemoveFromPhysicalScene();
-                            if (AbsolutePosition.X < 0)
-                                pos.X += Velocity.X * 2;
+                                Vector3 pos = AbsolutePosition;
-                            else if (AbsolutePosition.X > Constants.RegionSize)
+                                if (AbsolutePosition.X < 0)
-                                pos.X -= Velocity.X * 2;
+                                    pos.X += Velocity.X * 2;
-                            if (AbsolutePosition.Y < 0)
+                                else if (AbsolutePosition.X > Constants.RegionSize)
-                                pos.Y += Velocity.Y * 2;
+                                    pos.X -= Velocity.X * 2;
-                            else if (AbsolutePosition.Y > Constants.RegionSize)
+                                if (AbsolutePosition.Y < 0)
-                                pos.Y -= Velocity.Y * 2;
+                                    pos.Y += Velocity.Y * 2;
-                            Velocity = Vector3.Zero;
+                                else if (AbsolutePosition.Y > Constants.RegionSize)
-                            AbsolutePosition = pos;
+                                    pos.Y -= Velocity.Y * 2;
+                                Velocity = Vector3.Zero;
-//                            m_log.DebugFormat("[SCENE PRESENCE]: Prevented flyoff for {0} at {1}", Name, AbsolutePosition);
+                                AbsolutePosition = pos;
-                            AddToPhysicalScene(isFlying);
+//                                m_log.DebugFormat("[SCENE PRESENCE]: Prevented flyoff for {0} at {1}", Name, AbsolutePosition);
+                                AddToPhysicalScene(isFlying);
+                            }
                        }
                    }
-                }
+                    else if (neighbor > 0)
-                else if (neighbor > 0)
-                {
-                    if (!CrossToNewRegion())
                    {
-                        if (m_requestedSitTargetUUID == UUID.Zero)
+                        if (!CrossToNewRegion())
                        {
-                            bool isFlying = Flying;
+                            if (m_requestedSitTargetUUID == UUID.Zero)
-                            RemoveFromPhysicalScene();
+                            {
+                                bool isFlying = Flying;
-                            Vector3 pos = AbsolutePosition;
+                                RemoveFromPhysicalScene();
-                            if (AbsolutePosition.X < 0)
-                                pos.X += Velocity.X * 2;
+                                Vector3 pos = AbsolutePosition;
-                            else if (AbsolutePosition.X > Constants.RegionSize)
+                                if (AbsolutePosition.X < 0)
-                                pos.X -= Velocity.X * 2;
+                                    pos.X += Velocity.X * 2;
-                            if (AbsolutePosition.Y < 0)
+                                else if (AbsolutePosition.X > Constants.RegionSize)
-                                pos.Y += Velocity.Y * 2;
+                                    pos.X -= Velocity.X * 2;
-                            else if (AbsolutePosition.Y > Constants.RegionSize)
+                                if (AbsolutePosition.Y < 0)
-                                pos.Y -= Velocity.Y * 2;
+                                    pos.Y += Velocity.Y * 2;
-                            Velocity = Vector3.Zero;
+                                else if (AbsolutePosition.Y > Constants.RegionSize)
-                            AbsolutePosition = pos;
+                                    pos.Y -= Velocity.Y * 2;
+                                Velocity = Vector3.Zero;
-                            AddToPhysicalScene(isFlying);
+                                AbsolutePosition = pos;
+                                AddToPhysicalScene(isFlying);
+                            }
                        }
                    }
                }
-            }
+                else
-            else
+                {
-            {
+                    // This constant has been inferred from experimentation
-                // We must remove the agent from the physical scene if it has been placed in transit.  If we don't,
+                    // I'm not sure what this value should be, so I tried a few values.
-                // then this method continues to be called from ScenePresence.Update() until the handover of the client between
+                    timeStep = 0.04f;
-                // regions is completed.  Since this handover can take more than 1000ms (due to the 1000ms
+                    pos2 = AbsolutePosition;
-                // event queue polling response from the server), this results in the avatar pausing on the border
+                    pos2.X = pos2.X + (vel.X * timeStep);
-                // for the handover period.
+                    pos2.Y = pos2.Y + (vel.Y * timeStep);
-                RemoveFromPhysicalScene();
+                    // Don't touch the Z
-                
+                    m_pos = pos2;
-                // This constant has been inferred from experimentation
+                    m_log.DebugFormat("[SCENE PRESENCE]: In transit m_pos={0}", m_pos);
-                // I'm not sure what this value should be, so I tried a few values.
+                }
-                timeStep = 0.04f;
+            }   
-                pos2 = AbsolutePosition;
-                pos2.X = pos2.X + (vel.X * timeStep);
-                pos2.Y = pos2.Y + (vel.Y * timeStep);
-                pos2.Z = pos2.Z + (vel.Z * timeStep);
-                m_pos = pos2;
-            }
        }
        /// <summary>
@@ -3104,30 +3118,28 @@ namespace OpenSim.Region.Framework.Scenes
            catch { }
            // Attachment objects
-            lock (m_attachments)
+            List<SceneObjectGroup> attachments = GetAttachments();
+            if (attachments.Count > 0)
            {
-                if (m_attachments.Count > 0)
+                cAgent.AttachmentObjects = new List<ISceneObject>();
-                {
+                cAgent.AttachmentObjectStates = new List<string>();
-                    cAgent.AttachmentObjects = new List<ISceneObject>();
+//                IScriptModule se = m_scene.RequestModuleInterface<IScriptModule>();
-                    cAgent.AttachmentObjectStates = new List<string>();
+                InTransitScriptStates.Clear();
-    //                IScriptModule se = m_scene.RequestModuleInterface<IScriptModule>();
-                    InTransitScriptStates.Clear();
-                    foreach (SceneObjectGroup sog in m_attachments)
+                foreach (SceneObjectGroup sog in attachments)
-                    {
+                {
-                        // We need to make a copy and pass that copy
+                    // We need to make a copy and pass that copy
-                        // because of transfers withn the same sim
+                    // because of transfers withn the same sim
-                        ISceneObject clone = sog.CloneForNewScene();
+                    ISceneObject clone = sog.CloneForNewScene();
-                        // Attachment module assumes that GroupPosition holds the offsets...!
+                    // Attachment module assumes that GroupPosition holds the offsets...!
-                        ((SceneObjectGroup)clone).RootPart.GroupPosition = sog.RootPart.AttachedPos;
+                    ((SceneObjectGroup)clone).RootPart.GroupPosition = sog.RootPart.AttachedPos;
-                        ((SceneObjectGroup)clone).IsAttachment = false;
+                    ((SceneObjectGroup)clone).IsAttachment = false;
-                        cAgent.AttachmentObjects.Add(clone);
+                    cAgent.AttachmentObjects.Add(clone);
-                        string state = sog.GetStateSnapshot();
+                    string state = sog.GetStateSnapshot();
-                        cAgent.AttachmentObjectStates.Add(state);
+                    cAgent.AttachmentObjectStates.Add(state);
-                        InTransitScriptStates.Add(state);
+                    InTransitScriptStates.Add(state);
-                        // Let's remove the scripts of the original object here
+                    // Let's remove the scripts of the original object here
-                        sog.RemoveScriptInstances(true);
+                    sog.RemoveScriptInstances(true);
-                    }
                }
            }
        }
@@ -3535,26 +3547,29 @@ namespace OpenSim.Region.Framework.Scenes
        /// <param name="args">The arguments for the event</param>
        public void SendScriptEventToAttachments(string eventName, Object[] args)
        {
-            if (m_scriptEngines.Length == 0)
+            Util.FireAndForget(delegate(object x)
-                return;
-            lock (m_attachments)
            {
-                foreach (SceneObjectGroup grp in m_attachments)
+                if (m_scriptEngines.Length == 0)
+                    return;
+                lock (m_attachments)
                {
-                    // 16384 is CHANGED_ANIMATION
+                    foreach (SceneObjectGroup grp in m_attachments)
-                    //
-                    // Send this to all attachment root prims
-                    //
-                    foreach (IScriptModule m in m_scriptEngines)
                    {
-                        if (m == null) // No script engine loaded
+                        // 16384 is CHANGED_ANIMATION
-                            continue;
+                        //
+                        // Send this to all attachment root prims
+                        //
+                        foreach (IScriptModule m in m_scriptEngines)
+                        {
+                            if (m == null) // No script engine loaded
+                                continue;
-                        m.PostObjectEvent(grp.RootPart.UUID, "changed", new Object[] { (int)Changed.ANIMATION });
+                            m.PostObjectEvent(grp.RootPart.UUID, "changed", new Object[] { (int)Changed.ANIMATION });
+                        }
                    }
                }
-            }
+            });
        }
        internal void PushForce(Vector3 impulse)
diff --git a/OpenSim/Region/Physics/OdePlugin/OdeScene.cs b/OpenSim/Region/Physics/OdePlugin/OdeScene.cs
index 04ba738..228eca9 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdeScene.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdeScene.cs
@@ -110,7 +110,7 @@ namespace OpenSim.Region.Physics.OdePlugin
        private const uint m_regionWidth = Constants.RegionSize;
        private const uint m_regionHeight = Constants.RegionSize;
-        private float ODE_STEPSIZE = 0.020f;
+        private float ODE_STEPSIZE = 0.0178f;
        private float metersInSpace = 29.9f;
        private float m_timeDilation = 1.0f;
@@ -456,7 +456,7 @@ namespace OpenSim.Region.Physics.OdePlugin
                    mAvatarObjectContactFriction = physicsconfig.GetFloat("m_avatarobjectcontact_friction", 75f);
                    mAvatarObjectContactBounce = physicsconfig.GetFloat("m_avatarobjectcontact_bounce", 0.1f);
-                    ODE_STEPSIZE = physicsconfig.GetFloat("world_stepsize", 0.020f);
+                    ODE_STEPSIZE = physicsconfig.GetFloat("world_stepsize", ODE_STEPSIZE);
                    m_physicsiterations = physicsconfig.GetInt("world_internal_steps_without_collisions", 10);
                    avDensity = physicsconfig.GetFloat("av_density", 80f);
@@ -2822,6 +2822,7 @@ namespace OpenSim.Region.Physics.OdePlugin
                        m_global_contactcount = 0;
                        
                        d.WorldQuickStep(world, ODE_STEPSIZE);
                        d.JointGroupEmpty(contactgroup);
                    }
                    catch (Exception e)
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs
index cb0d765..77a784d 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs
@@ -486,6 +486,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
            m_host.ParentGroup.Scene.RegionInfo.WindlightSettings.valid = false;
            if (m_host.ParentGroup.Scene.SimulationDataService != null)
                m_host.ParentGroup.Scene.SimulationDataService.RemoveRegionWindlightSettings(m_host.ParentGroup.Scene.RegionInfo.RegionID);
+            m_host.ParentGroup.Scene.EventManager.TriggerOnSaveNewWindlightProfile();
        }
        /// <summary>
        /// Set the current Windlight scene to a target avatar