diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index 86d7f837a7..9090f64b6f 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -220,7 +220,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
///
///
///
- ///
private void TeleportAgentWithinRegion(ScenePresence sp, Vector3 position, Vector3 lookAt, uint teleportFlags)
{
m_log.DebugFormat(
@@ -988,7 +988,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
agent.IsInTransit = true;
CrossAgentToNewRegionDelegate d = CrossAgentToNewRegionAsync;
- d.BeginInvoke(agent, newpos, x, y, neighbourRegion, isFlying, version, CrossAgentToNewRegionCompleted, d);
+ d.BeginInvoke(agent, newpos, neighbourRegion, isFlying, version, CrossAgentToNewRegionCompleted, d);
return true;
}
@@ -1045,42 +1045,43 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
icon.EndInvoke(iar);
}
+ public bool CrossAgentToNewRegionPrep(ScenePresence agent, GridRegion neighbourRegion)
+ {
+ if (neighbourRegion == null)
+ return false;
+
+ m_entityTransferStateMachine.SetInTransit(agent.UUID);
+
+ agent.RemoveFromPhysicalScene();
+
+ return true;
+ }
+
///
/// This Closes child agents on neighbouring regions
/// Calls an asynchronous method to do so.. so it doesn't lag the sim.
///
public ScenePresence CrossAgentToNewRegionAsync(
- ScenePresence agent, Vector3 pos, uint neighbourx, uint neighboury, GridRegion neighbourRegion,
+ ScenePresence agent, Vector3 pos, GridRegion neighbourRegion,
bool isFlying, string version)
{
- if (neighbourRegion == null)
+ if (!CrossAgentToNewRegionPrep(agent, neighbourRegion))
return agent;
+ if (!CrossAgentIntoNewRegionMain(agent, pos, neighbourRegion, isFlying))
+ return agent;
+
+ CrossAgentToNewRegionPost(agent, pos, neighbourRegion, isFlying, version);
+ return agent;
+ }
+
+ public bool CrossAgentIntoNewRegionMain(ScenePresence agent, Vector3 pos, GridRegion neighbourRegion, bool isFlying)
+ {
try
{
- m_entityTransferStateMachine.SetInTransit(agent.UUID);
-
- ulong neighbourHandle = Utils.UIntsToLong((uint)(neighbourx * Constants.RegionSize), (uint)(neighboury * Constants.RegionSize));
-
- m_log.DebugFormat(
- "[ENTITY TRANSFER MODULE]: Crossing agent {0} {1} to {2}-{3} running version {4}",
- agent.Firstname, agent.Lastname, neighbourx, neighboury, version);
-
- Scene m_scene = agent.Scene;
-
- if (!agent.ValidateAttachments())
- 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;
- Vector3 vel2 = new Vector3(agent.Velocity.X, agent.Velocity.Y, 0);
-
- agent.RemoveFromPhysicalScene();
-
AgentData cAgent = new AgentData();
agent.CopyTo(cAgent);
- cAgent.Position = pos;
+ cAgent.Position = pos + agent.Velocity;
if (isFlying)
cAgent.ControlFlags |= (uint)AgentManager.ControlFlags.AGENT_CONTROL_FLY;
@@ -1090,7 +1091,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
// Beyond this point, extra cleanup is needed beyond removing transit state
m_entityTransferStateMachine.UpdateInTransit(agent.UUID, AgentTransferState.Transferring);
- if (!m_scene.SimulationService.UpdateAgent(neighbourRegion, cAgent))
+ if (!agent.Scene.SimulationService.UpdateAgent(neighbourRegion, cAgent))
{
// region doesn't take it
m_entityTransferStateMachine.UpdateInTransit(agent.UUID, AgentTransferState.CleaningUp);
@@ -1099,82 +1100,9 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
agent.AddToPhysicalScene(isFlying);
m_entityTransferStateMachine.ResetFromTransit(agent.UUID);
- return agent;
+ return false;
}
- //AgentCircuitData circuitdata = m_controllingClient.RequestClientInfo();
- agent.ControllingClient.RequestClientInfo();
-
- //m_log.Debug("BEFORE CROSS");
- //Scene.DumpChildrenSeeds(UUID);
- //DumpKnownRegions();
- string agentcaps;
- if (!agent.KnownRegions.TryGetValue(neighbourRegion.RegionHandle, out agentcaps))
- {
- m_log.ErrorFormat("[ENTITY TRANSFER MODULE]: No ENTITY TRANSFER MODULE information for region handle {0}, exiting CrossToNewRegion.",
- neighbourRegion.RegionHandle);
- return agent;
- }
- // No turning back
- agent.IsChildAgent = true;
-
- 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);
-
- if (m_eqModule != null)
- {
- m_eqModule.CrossRegion(
- neighbourHandle, pos, vel2 /* agent.Velocity */, neighbourRegion.ExternalEndPoint,
- capsPath, agent.UUID, agent.ControllingClient.SessionId);
- }
- else
- {
- agent.ControllingClient.CrossRegion(neighbourHandle, pos, agent.Velocity, neighbourRegion.ExternalEndPoint,
- capsPath);
- }
-
- // SUCCESS!
- m_entityTransferStateMachine.UpdateInTransit(agent.UUID, AgentTransferState.ReceivedAtDestination);
-
- // Unlike a teleport, here we do not wait for the destination region to confirm the receipt.
- m_entityTransferStateMachine.UpdateInTransit(agent.UUID, AgentTransferState.CleaningUp);
-
- agent.MakeChildAgent();
-
- // FIXME: Possibly this should occur lower down after other commands to close other agents,
- // but not sure yet what the side effects would be.
- m_entityTransferStateMachine.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. Best effort
- if (version == "Unknown" || version == string.Empty)
- {
- 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);
-
- // the user may change their profile information in other region,
- // so the userinfo in UserProfileCache is not reliable any more, delete it
- // REFACTORING PROBLEM. Well, not a problem, but this method is HORRIBLE!
- if (agent.Scene.NeedSceneCacheClear(agent.UUID))
- {
- m_log.DebugFormat(
- "[ENTITY TRANSFER MODULE]: User {0} is going to another region", agent.UUID);
- }
-
- //m_log.Debug("AFTER CROSS");
- //Scene.DumpChildrenSeeds(UUID);
- //DumpKnownRegions();
}
catch (Exception e)
{
@@ -1183,9 +1111,97 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
agent.Name, neighbourRegion.RegionName, agent.Scene.RegionInfo.RegionName, e.Message, e.StackTrace);
// TODO: Might be worth attempting other restoration here such as reinstantiation of scripts, etc.
+ return false;
}
- return agent;
+ return true;
+ }
+
+ public void CrossAgentToNewRegionPost(ScenePresence agent, Vector3 pos, GridRegion neighbourRegion,
+ bool isFlying, string version)
+ {
+ agent.ControllingClient.RequestClientInfo();
+
+ string agentcaps;
+ if (!agent.KnownRegions.TryGetValue(neighbourRegion.RegionHandle, out agentcaps))
+ {
+ m_log.ErrorFormat("[ENTITY TRANSFER MODULE]: No ENTITY TRANSFER MODULE information for region handle {0}, exiting CrossToNewRegion.",
+ neighbourRegion.RegionHandle);
+ return;
+ }
+
+ // No turning back
+ agent.IsChildAgent = true;
+
+ 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);
+
+ Vector3 vel2 = new Vector3(agent.Velocity.X, agent.Velocity.Y, 0);
+
+ if (m_eqModule != null)
+ {
+ m_eqModule.CrossRegion(
+ neighbourRegion.RegionHandle, pos + agent.Velocity, vel2 /* agent.Velocity */, neighbourRegion.ExternalEndPoint,
+ capsPath, agent.UUID, agent.ControllingClient.SessionId);
+ }
+ else
+ {
+ agent.ControllingClient.CrossRegion(neighbourRegion.RegionHandle, pos + agent.Velocity, agent.Velocity, neighbourRegion.ExternalEndPoint,
+ capsPath);
+ }
+
+ // SUCCESS!
+ m_entityTransferStateMachine.UpdateInTransit(agent.UUID, AgentTransferState.ReceivedAtDestination);
+
+ // Unlike a teleport, here we do not wait for the destination region to confirm the receipt.
+ m_entityTransferStateMachine.UpdateInTransit(agent.UUID, AgentTransferState.CleaningUp);
+
+ agent.MakeChildAgent();
+
+ // FIXME: Possibly this should occur lower down after other commands to close other agents,
+ // but not sure yet what the side effects would be.
+ m_entityTransferStateMachine.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. Best effort
+ if (version == "Unknown" || version == string.Empty)
+ {
+ 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.
+ uint neighbourx;
+ uint neighboury;
+
+ Utils.LongToUInts(neighbourRegion.RegionHandle, out neighbourx, out neighboury);
+
+ neighbourx /= Constants.RegionSize;
+ neighboury /= Constants.RegionSize;
+
+ agent.CloseChildAgents(neighbourx, neighboury);
+
+ AgentHasMovedAway(agent, false);
+
+ // the user may change their profile information in other region,
+ // so the userinfo in UserProfileCache is not reliable any more, delete it
+ // REFACTORING PROBLEM. Well, not a problem, but this method is HORRIBLE!
+ if (agent.Scene.NeedSceneCacheClear(agent.UUID))
+ {
+ m_log.DebugFormat(
+ "[ENTITY TRANSFER MODULE]: User {0} is going to another region", agent.UUID);
+ }
+
+ //m_log.Debug("AFTER CROSS");
+ //Scene.DumpChildrenSeeds(UUID);
+ //DumpKnownRegions();
+
+ return;
}
private void CrossAgentToNewRegionCompleted(IAsyncResult iar)
diff --git a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
index e0e358a613..13762f7993 100644
--- a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
@@ -188,9 +188,9 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
args.Type = PollServiceEventArgs.EventType.LslHttp;
m_HttpServer.AddPollServiceHTTPHandler(uri, args);
- m_log.DebugFormat(
- "[URL MODULE]: Set up incoming request url {0} for {1} in {2} {3}",
- uri, itemID, host.Name, host.LocalId);
+// m_log.DebugFormat(
+// "[URL MODULE]: Set up incoming request url {0} for {1} in {2} {3}",
+// uri, itemID, host.Name, host.LocalId);
engine.PostScriptEvent(itemID, "http_request", new Object[] { urlcode.ToString(), "URL_REQUEST_GRANTED", url });
}
@@ -234,9 +234,9 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
args.Type = PollServiceEventArgs.EventType.LslHttp;
m_HttpsServer.AddPollServiceHTTPHandler(uri, args);
- m_log.DebugFormat(
- "[URL MODULE]: Set up incoming secure request url {0} for {1} in {2} {3}",
- uri, itemID, host.Name, host.LocalId);
+// m_log.DebugFormat(
+// "[URL MODULE]: Set up incoming secure request url {0} for {1} in {2} {3}",
+// uri, itemID, host.Name, host.LocalId);
engine.PostScriptEvent(itemID, "http_request", new Object[] { urlcode.ToString(), "URL_REQUEST_GRANTED", url });
}
diff --git a/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs b/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
index 5bc8e51759..1949a9007a 100644
--- a/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
@@ -35,7 +35,7 @@ using OpenSim.Region.Framework.Scenes;
namespace OpenSim.Region.Framework.Interfaces
{
- public delegate ScenePresence CrossAgentToNewRegionDelegate(ScenePresence agent, Vector3 pos, uint neighbourx, uint neighboury, GridRegion neighbourRegion, bool isFlying, string version);
+ public delegate ScenePresence CrossAgentToNewRegionDelegate(ScenePresence agent, Vector3 pos, GridRegion neighbourRegion, bool isFlying, string version);
public interface IEntityTransferModule
{
@@ -76,7 +76,7 @@ namespace OpenSim.Region.Framework.Interfaces
void Cross(SceneObjectGroup sog, Vector3 position, bool silent);
- ScenePresence CrossAgentToNewRegionAsync(ScenePresence agent, Vector3 pos, uint neighbourx, uint neighboury, GridRegion neighbourRegion, bool isFlying, string version);
+ ScenePresence CrossAgentToNewRegionAsync(ScenePresence agent, Vector3 pos, GridRegion neighbourRegion, bool isFlying, string version);
}
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index bc0f5b6edf..4798481b42 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -581,7 +581,7 @@ namespace OpenSim.Region.Framework.Scenes
av.IsInTransit = true;
CrossAgentToNewRegionDelegate d = entityTransfer.CrossAgentToNewRegionAsync;
- d.BeginInvoke(av, val, x, y, destination, av.Flying, version, CrossAgentToNewRegionCompleted, d);
+ d.BeginInvoke(av, val, destination, av.Flying, version, CrossAgentToNewRegionCompleted, d);
}
else
m_log.DebugFormat("[SCENE OBJECT]: Crossing avatar alreasy in transit {0} to {1}", av.Name, val);
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 34ac7d4f6d..433efc7644 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -3432,7 +3432,7 @@ namespace OpenSim.Region.Framework.Scenes
///
public void PhysicsCollisionUpdate(EventArgs e)
{
- if (IsChildAgent)
+ if (IsChildAgent || Animator == null)
return;
//if ((Math.Abs(Velocity.X) > 0.1e-9f) || (Math.Abs(Velocity.Y) > 0.1e-9f))
diff --git a/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs b/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
index 20919a1982..756b1f44cd 100644
--- a/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
+++ b/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
@@ -438,23 +438,26 @@ namespace OpenSim.Region.Framework.Scenes
}
// Extra statistics that aren't currently sent to clients
- lock (m_lastReportedExtraSimStats)
+ if (m_scene.PhysicsScene != null)
{
- m_lastReportedExtraSimStats[LastReportedObjectUpdateStatName] = m_objectUpdates / m_statsUpdateFactor;
-
- Dictionary physicsStats = m_scene.PhysicsScene.GetStats();
-
- if (physicsStats != null)
+ lock (m_lastReportedExtraSimStats)
{
- foreach (KeyValuePair tuple in physicsStats)
+ m_lastReportedExtraSimStats[LastReportedObjectUpdateStatName] = m_objectUpdates / m_statsUpdateFactor;
+
+ Dictionary physicsStats = m_scene.PhysicsScene.GetStats();
+
+ if (physicsStats != null)
{
- // FIXME: An extremely dirty hack to divide MS stats per frame rather than per second
- // Need to change things so that stats source can indicate whether they are per second or
- // per frame.
- if (tuple.Key.EndsWith("MS"))
- m_lastReportedExtraSimStats[tuple.Key] = tuple.Value * perframe;
- else
- m_lastReportedExtraSimStats[tuple.Key] = tuple.Value / m_statsUpdateFactor;
+ foreach (KeyValuePair tuple in physicsStats)
+ {
+ // FIXME: An extremely dirty hack to divide MS stats per frame rather than per second
+ // Need to change things so that stats source can indicate whether they are per second or
+ // per frame.
+ if (tuple.Key.EndsWith("MS"))
+ m_lastReportedExtraSimStats[tuple.Key] = tuple.Value * perframe;
+ else
+ m_lastReportedExtraSimStats[tuple.Key] = tuple.Value / m_statsUpdateFactor;
+ }
}
}
}
diff --git a/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs b/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
index 7ad6f0b5b9..2a3daccdae 100644
--- a/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
+++ b/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
@@ -181,8 +181,7 @@ namespace OpenSim.Services.Connectors
public AssetBase Get(string id)
{
-// string uri = MapServer(id) + "/assets/" + id;
- string uri = MapServer(id) + "assets/" + id;
+ string uri = Path.Combine(MapServer(id), Path.Combine("assets", id));
AssetBase asset = null;
if (m_Cache != null)
@@ -219,8 +218,7 @@ namespace OpenSim.Services.Connectors
return fullAsset.Metadata;
}
-// string uri = MapServer(id) + "/assets/" + id + "/metadata";
- string uri = MapServer(id) + "assets/" + id + "/metadata";
+ string uri = Path.Combine(MapServer(id), Path.Combine("assets", id));
AssetMetadata asset = SynchronousRestObjectRequester.
MakeRequest("GET", uri, 0);
@@ -262,8 +260,7 @@ namespace OpenSim.Services.Connectors
public bool Get(string id, Object sender, AssetRetrieved handler)
{
-// string uri = MapServer(id) + "/assets/" + id;
- string uri = MapServer(id) + "assets/" + id;
+ string uri = Path.Combine(MapServer(id), Path.Combine("assets", id));
AssetBase asset = null;
if (m_Cache != null)
@@ -382,9 +379,9 @@ namespace OpenSim.Services.Connectors
return asset.ID;
}
-// string uri = MapServer(asset.FullID.ToString()) + "/assets/";
-
- string uri = MapServer(asset.FullID.ToString()) + "assets/";
+ string uri = Path.Combine(MapServer(asset.FullID.ToString()), "/assets/");
+ if (!uri.EndsWith("/"))
+ uri += "/";
string newID = string.Empty;
try
@@ -461,8 +458,7 @@ namespace OpenSim.Services.Connectors
}
asset.Data = data;
-// string uri = MapServer(id) + "/assets/" + id;
- string uri = MapServer(id) + "assets/" + id;
+ string uri = Path.Combine(MapServer(id), Path.Combine("assets", id));
if (SynchronousRestObjectRequester.
MakeRequest("POST", uri, asset))
@@ -477,8 +473,7 @@ namespace OpenSim.Services.Connectors
public bool Delete(string id)
{
-// string uri = MapServer(id) + "/assets/" + id;
- string uri = MapServer(id) + "assets/" + id;
+ string uri = Path.Combine(MapServer(id), Path.Combine("assets", id));
if (SynchronousRestObjectRequester.
MakeRequest("DELETE", uri, 0))
diff --git a/OpenSim/Services/Connectors/Friends/FriendsSimConnector.cs b/OpenSim/Services/Connectors/Friends/FriendsSimConnector.cs
index 3fd0c53633..6cd21d155e 100644
--- a/OpenSim/Services/Connectors/Friends/FriendsSimConnector.cs
+++ b/OpenSim/Services/Connectors/Friends/FriendsSimConnector.cs
@@ -144,44 +144,48 @@ namespace OpenSim.Services.Connectors.Friends
private bool Call(GridRegion region, Dictionary sendData)
{
- string reqString = ServerUtils.BuildQueryString(sendData);
- //m_log.DebugFormat("[FRIENDS SIM CONNECTOR]: queryString = {0}", reqString);
- if (region == null)
- return false;
+ Util.FireAndForget(x => {
+ string reqString = ServerUtils.BuildQueryString(sendData);
+ //m_log.DebugFormat("[FRIENDS SIM CONNECTOR]: queryString = {0}", reqString);
+ if (region == null)
+ return;
- string path = ServicePath();
- if (!region.ServerURI.EndsWith("/"))
- path = "/" + path;
- string uri = region.ServerURI + path;
- m_log.DebugFormat("[FRIENDS SIM CONNECTOR]: calling {0}", uri);
+ string path = ServicePath();
+ if (!region.ServerURI.EndsWith("/"))
+ path = "/" + path;
+ string uri = region.ServerURI + path;
+ m_log.DebugFormat("[FRIENDS SIM CONNECTOR]: calling {0}", uri);
- try
- {
- string reply = SynchronousRestFormsRequester.MakeRequest("POST", uri, reqString);
- if (reply != string.Empty)
+ try
{
- Dictionary replyData = ServerUtils.ParseXmlResponse(reply);
-
- if (replyData.ContainsKey("RESULT"))
+ string reply = SynchronousRestFormsRequester.MakeRequest("POST", uri, reqString);
+ if (reply != string.Empty)
{
- if (replyData["RESULT"].ToString().ToLower() == "true")
- return true;
+ Dictionary replyData = ServerUtils.ParseXmlResponse(reply);
+
+ if (replyData.ContainsKey("RESULT"))
+ {
+// if (replyData["RESULT"].ToString().ToLower() == "true")
+// return;
+// else
+ return;
+ }
else
- return false;
+ m_log.DebugFormat("[FRIENDS SIM CONNECTOR]: reply data does not contain result field");
+
}
else
- m_log.DebugFormat("[FRIENDS SIM CONNECTOR]: reply data does not contain result field");
-
+ m_log.DebugFormat("[FRIENDS SIM CONNECTOR]: received empty reply");
+ }
+ catch (Exception e)
+ {
+ m_log.DebugFormat("[FRIENDS SIM CONNECTOR]: Exception when contacting remote sim at {0}: {1}", uri, e.Message);
}
- else
- m_log.DebugFormat("[FRIENDS SIM CONNECTOR]: received empty reply");
- }
- catch (Exception e)
- {
- m_log.DebugFormat("[FRIENDS SIM CONNECTOR]: Exception when contacting remote sim at {0}: {1}", uri, e.Message);
- }
- return false;
+ return;
+ });
+
+ return true;
}
}
}
diff --git a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
index e1c2243316..508baf7e5d 100644
--- a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
@@ -395,17 +395,18 @@ namespace OpenSim.Services.Connectors.Simulation
private bool CloseAgent(GridRegion destination, UUID id, bool ChildOnly)
{
// m_log.DebugFormat("[REMOTE SIMULATION CONNECTOR]: CloseAgent start");
+ Util.FireAndForget(x => {
+ string uri = destination.ServerURI + AgentPath() + id + "/" + destination.RegionID.ToString() + "/";
- string uri = destination.ServerURI + AgentPath() + id + "/" + destination.RegionID.ToString() + "/";
-
- try
- {
- WebUtil.ServiceOSDRequest(uri, null, "DELETE", 10000, false);
- }
- catch (Exception e)
- {
- m_log.WarnFormat("[REMOTE SIMULATION CONNECTOR] CloseAgent failed with exception; {0}",e.ToString());
- }
+ try
+ {
+ WebUtil.ServiceOSDRequest(uri, null, "DELETE", 10000, false);
+ }
+ catch (Exception e)
+ {
+ m_log.WarnFormat("[REMOTE SIMULATION CONNECTOR] CloseAgent failed with exception; {0}",e.ToString());
+ }
+ });
return true;
}