Merge branch 'master' into careminster

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
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
-        public bool DoCreateChildAgentCall(GridRegion region, AgentCircuitData aCircuit, string authKey, out string reason)
+        public bool DoCreateChildAgentCall(GridRegion region, AgentCircuitData aCircuit, string authKey, uint teleportFlags, out string reason)
         {
             reason = String.Empty;
 
@@ -83,7 +83,8 @@ namespace OpenSim.Framework.Communications.Clients
             }
             // Add the regionhandle of the destination region
             ulong regionHandle = GetRegionHandle(region.RegionHandle);
-            args["destination_handle"] = OSD.FromString(regionHandle.ToString());
+            args["destination_handle"] = OSD.FromString(regionHandle.ToString());

+            args["teleport_flags"] = OSD.FromString(teleportFlags.ToString());
 
             string strBuffer = "";
             byte[] buffer = new byte[1];