Merge branch 'master' into presence-refactor

This commit is contained in:
Melanie
2009-12-30 22:24:14 +00:00
16 changed files with 173 additions and 37 deletions

View File

@@ -37,7 +37,7 @@ namespace OpenSim.Region.Framework.Interfaces
{
#region Agents
bool SendCreateChildAgent(ulong regionHandle, AgentCircuitData aCircuit, out string reason);
bool SendCreateChildAgent(ulong regionHandle, AgentCircuitData aCircuit, uint teleportFlags, out string reason);
/// <summary>
/// Full child agent update.