Merge branch 'master' into careminster-presence-refactor

This commit is contained in:
Melanie
2010-12-12 01:20:46 +00:00
29 changed files with 351 additions and 238 deletions

View File

@@ -235,6 +235,7 @@ namespace OpenSim.Services.Connectors.Simulation
m_log.Warn("[REMOTE SIMULATION CONNECTOR]: PackAgentCircuitData failed with exception: " + e.Message);
return null;
}
// Add the input arguments
args["destination_x"] = OSD.FromString(destination.RegionLocX.ToString());
args["destination_y"] = OSD.FromString(destination.RegionLocY.ToString());