aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorMelanie2009-12-29 18:35:06 +0000
committerMelanie2009-12-29 18:35:06 +0000
commit0b5cdc539c767b526f14cb7e7d97fd83bea14424 (patch)
treea2d3061e021f68b3208b02c9291e442c39a3226f /OpenSim/Framework
parentOne should not copy/paste so much :) (diff)
downloadopensim-SC_OLD-0b5cdc539c767b526f14cb7e7d97fd83bea14424.zip
opensim-SC_OLD-0b5cdc539c767b526f14cb7e7d97fd83bea14424.tar.gz
opensim-SC_OLD-0b5cdc539c767b526f14cb7e7d97fd83bea14424.tar.bz2
opensim-SC_OLD-0b5cdc539c767b526f14cb7e7d97fd83bea14424.tar.xz
Change teleports so the TeleportFlags are sent to the destination sim. It
can now determine if a connection is from login, teleport or crossing. Needed for a meaningful banlines implementation
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/Communications/Clients/RegionClient.cs5
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];