diff options
| author | Melanie | 2009-12-29 18:41:45 +0000 |
|---|---|---|
| committer | Melanie | 2009-12-29 18:41:45 +0000 |
| commit | 67cfac0cf15d873666d2bbf5e2178d4242d702b4 (patch) | |
| tree | ae27113d3b127d6eccaa189cc601f3b6ab714788 /OpenSim/Region/Framework/Interfaces | |
| parent | One should not copy/paste so much :) (diff) | |
| parent | Change teleports so the TeleportFlags are sent to the destination sim. It (diff) | |
| download | opensim-SC_OLD-67cfac0cf15d873666d2bbf5e2178d4242d702b4.zip opensim-SC_OLD-67cfac0cf15d873666d2bbf5e2178d4242d702b4.tar.gz opensim-SC_OLD-67cfac0cf15d873666d2bbf5e2178d4242d702b4.tar.bz2 opensim-SC_OLD-67cfac0cf15d873666d2bbf5e2178d4242d702b4.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/Framework/Interfaces')
| -rw-r--r-- | OpenSim/Region/Framework/Interfaces/IInterregionComms.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/IInterregionComms.cs b/OpenSim/Region/Framework/Interfaces/IInterregionComms.cs index 8f4d3d5..2d6287f 100644 --- a/OpenSim/Region/Framework/Interfaces/IInterregionComms.cs +++ b/OpenSim/Region/Framework/Interfaces/IInterregionComms.cs | |||
| @@ -37,7 +37,7 @@ namespace OpenSim.Region.Framework.Interfaces | |||
| 37 | { | 37 | { |
| 38 | #region Agents | 38 | #region Agents |
| 39 | 39 | ||
| 40 | bool SendCreateChildAgent(ulong regionHandle, AgentCircuitData aCircuit, out string reason); | 40 | bool SendCreateChildAgent(ulong regionHandle, AgentCircuitData aCircuit, uint teleportFlags, out string reason); |
| 41 | 41 | ||
| 42 | /// <summary> | 42 | /// <summary> |
| 43 | /// Full child agent update. | 43 | /// Full child agent update. |