17 files changed, 145 insertions, 546 deletions

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/J2KImage.cs b/OpenSim/Region/ClientStack/Linden/UDP/J2KImage.cs
index 30d4f21..2bbc6c7 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;
-        public bool IsDecoded;
-        public bool HasAsset;
+        private OpenJPEG.J2KLayerInfo[] m_layers;
+        public bool IsDecoded { get; private set; }
+        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)
@@ -203,7 +203,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                         }
 
                         //Give them at least two packets, to play nice with some broken viewers (SL also behaves this way)
-                        if (m_stopPacket == 1 && Layers[0].End > FIRST_PACKET_SIZE) m_stopPacket++;
+                        if (m_stopPacket == 1 && m_layers[0].End > FIRST_PACKET_SIZE) m_stopPacket++;
 
                         m_currentPacket = StartPacket;
                     }
@@ -344,7 +344,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
         private void J2KDecodedCallback(UUID AssetId, OpenJPEG.J2KLayerInfo[] layers)
         {
-            Layers = layers;
+            m_layers = layers;
             IsDecoded = true;
             RunUpdate();
         }
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 (account1 != null)
+            if (agentIsLocal)
                 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);
-            UserAccount account2 = UserAccountService.GetUserAccount(m_Scenes[0].RegionInfo.ScopeID, friendID);
+            Boolean agentIsLocal = true;
+            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);
-            UserAccount account2 = UserAccountService.GetUserAccount(m_Scenes[0].RegionInfo.ScopeID, friendID);
+            Boolean agentIsLocal = true;
+            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);
-            UserAccount friendAccount = UserAccountService.GetUserAccount(m_Scenes[0].RegionInfo.ScopeID, friendID);
+            Boolean agentIsLocal = true;
+            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);
-            UserAccount friendAccount = UserAccountService.GetUserAccount(m_Scenes[0].RegionInfo.ScopeID, exfriendID);
+            Boolean agentIsLocal = true;
+            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/Framework/EntityTransfer/HGEntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
index 37b36f6..b16d0d3 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
@@ -192,8 +192,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);
-            if (account != null)
+            IUserManagement uMan = m_aScene.RequestModuleInterface<IUserManagement>(); 
+            if (uMan != null && uMan.IsLocalGridUser(id))
             {
                 // local grid user
                 m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: User is local");
@@ -231,8 +231,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}",
-                aCircuit.firstname, aCircuit.lastname, finalDestination.RegionName, homeGatekeeper.ExternalHostName, homeGatekeeper.HttpPort, homeGatekeeper.RegionName);
+            m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: teleporting user {0} {1} home to {2} via {3}:{4}",
+                aCircuit.firstname, aCircuit.lastname, finalDestination.RegionName, homeGatekeeper.ServerURI, homeGatekeeper.RegionName);
 
             DoTeleport(sp, homeGatekeeper, finalDestination, position, lookAt, (uint)(Constants.TeleportFlags.SetLastToTarget | Constants.TeleportFlags.ViaHome), eq);
             return true;
@@ -318,8 +318,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;
@@ -352,6 +353,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/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 (account == null)
+            if (UserManagementModule != null && !UserManagementModule.IsLocalGridUser(presence.UUID))
                 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..dbe2560 100644
--- a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
@@ -425,6 +425,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/Scripting/HttpRequest/ScriptsHttpRequests.cs b/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
index 84ff22b..2fe36c1 100644
--- a/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
+++ b/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
@@ -415,8 +415,21 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
                 }
 
                 Request.Timeout = HttpTimeout;
-                // execute the request
-                response = (HttpWebResponse) Request.GetResponse();
+                try
+                {
+                    // 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();
 
@@ -473,7 +486,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..ea0ba593 100644
--- a/OpenSim/Region/Framework/Interfaces/IUserManagement.cs
+++ b/OpenSim/Region/Framework/Interfaces/IUserManagement.cs
@@ -48,5 +48,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 b828f39..26f915b 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -737,7 +737,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();
                     }
@@ -1697,21 +1697,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
@@ -5251,7 +5247,7 @@ Environment.Exit(1);
         /// </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)
@@ -5306,6 +5302,17 @@ Environment.Exit(1);
             }
         }
 
+        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/Physics/OdePlugin/OdeScene.cs b/OpenSim/Region/Physics/OdePlugin/OdeScene.cs
index 2194ff0..228eca9 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdeScene.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdeScene.cs
@@ -2822,6 +2822,7 @@ namespace OpenSim.Region.Physics.OdePlugin
                         m_global_contactcount = 0;
                         
                         d.WorldQuickStep(world, ODE_STEPSIZE);
+
                         d.JointGroupEmpty(contactgroup);
                     }
                     catch (Exception e)