diff options
author | Teravus Ovares (Dan Olivares) | 2009-12-29 22:00:01 -0500 |
---|---|---|
committer | Teravus Ovares (Dan Olivares) | 2009-12-29 22:00:01 -0500 |
commit | 2205d1c486666399085f2e6d3b7d5d08474587cf (patch) | |
tree | 10fa1e3ed522d4eefdd3770a531648ee2c9957f4 /OpenSim/Region/Framework/Interfaces/IInterregionComms.cs | |
parent | * Attempts to resolve the megaregion terrain edit rebound. (diff) | |
parent | Fix an omission in LSL that causes a viewer crash (diff) | |
download | opensim-SC-2205d1c486666399085f2e6d3b7d5d08474587cf.zip opensim-SC-2205d1c486666399085f2e6d3b7d5d08474587cf.tar.gz opensim-SC-2205d1c486666399085f2e6d3b7d5d08474587cf.tar.bz2 opensim-SC-2205d1c486666399085f2e6d3b7d5d08474587cf.tar.xz |
Merge branch 'master' of ssh://MyConnection/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework/Interfaces/IInterregionComms.cs')
-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. |