diff options
author | Melanie | 2009-12-30 00:27:34 +0100 |
---|---|---|
committer | Melanie | 2009-12-30 00:27:34 +0100 |
commit | a08360e3cd06a266eef0030a3f04bab295a6e4ca (patch) | |
tree | a2af13489f9bc048a018e3ede3a05e0afb5e3f6a /OpenSim/Framework | |
parent | Fix a timer list locking issue causing XMREngine deadlocks (diff) | |
parent | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ... (diff) | |
download | opensim-SC-a08360e3cd06a266eef0030a3f04bab295a6e4ca.zip opensim-SC-a08360e3cd06a266eef0030a3f04bab295a6e4ca.tar.gz opensim-SC-a08360e3cd06a266eef0030a3f04bab295a6e4ca.tar.bz2 opensim-SC-a08360e3cd06a266eef0030a3f04bab295a6e4ca.tar.xz |
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r-- | OpenSim/Framework/Communications/Clients/RegionClient.cs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Framework/Communications/Clients/RegionClient.cs b/OpenSim/Framework/Communications/Clients/RegionClient.cs index 297b046..5ceaf39 100644 --- a/OpenSim/Framework/Communications/Clients/RegionClient.cs +++ b/OpenSim/Framework/Communications/Clients/RegionClient.cs | |||
@@ -45,7 +45,7 @@ namespace OpenSim.Framework.Communications.Clients | |||
45 | { | 45 | { |
46 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 46 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
47 | 47 | ||
48 | public bool DoCreateChildAgentCall(GridRegion region, AgentCircuitData aCircuit, string authKey, out string reason) | 48 | public bool DoCreateChildAgentCall(GridRegion region, AgentCircuitData aCircuit, string authKey, uint teleportFlags, out string reason) |
49 | { | 49 | { |
50 | reason = String.Empty; | 50 | reason = String.Empty; |
51 | 51 | ||
@@ -83,7 +83,8 @@ namespace OpenSim.Framework.Communications.Clients | |||
83 | } | 83 | } |
84 | // Add the regionhandle of the destination region | 84 | // Add the regionhandle of the destination region |
85 | ulong regionHandle = GetRegionHandle(region.RegionHandle); | 85 | ulong regionHandle = GetRegionHandle(region.RegionHandle); |
86 | args["destination_handle"] = OSD.FromString(regionHandle.ToString()); | 86 | args["destination_handle"] = OSD.FromString(regionHandle.ToString()); |
87 | args["teleport_flags"] = OSD.FromString(teleportFlags.ToString()); | ||
87 | 88 | ||
88 | string strBuffer = ""; | 89 | string strBuffer = ""; |
89 | byte[] buffer = new byte[1]; | 90 | byte[] buffer = new byte[1]; |