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

@@ -181,7 +181,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
// else do the remote thing
if (!m_localBackend.IsLocalRegion(destination.RegionHandle))
{
//m_regionClient.SendUserInformation(regInfo, aCircuit);
return m_remoteConnector.CreateAgent(destination, aCircuit, teleportFlags, out reason);
}
return false;