Merge branch 'master' into careminster-presence-refactor

This commit is contained in:
Melanie
2010-06-14 02:49:15 +01:00
21 changed files with 709 additions and 445 deletions

View File

@@ -483,7 +483,7 @@ namespace OpenSim.Services.Connectors.Simulation
}
catch (WebException ex)
{
m_log.InfoFormat("[REMOTE SIMULATION CONNECTOR]: exception on reply of agent delete {0}", ex.Message);
m_log.InfoFormat("[REMOTE SIMULATION CONNECTOR]: exception on reply of agent delete from {0}: {1}", destination.RegionName, ex.Message);
return false;
}
finally