diff options
author | Melanie | 2009-12-29 18:35:06 +0000 |
---|---|---|
committer | Melanie | 2009-12-29 18:35:06 +0000 |
commit | 0b5cdc539c767b526f14cb7e7d97fd83bea14424 (patch) | |
tree | a2d3061e021f68b3208b02c9291e442c39a3226f /OpenSim/Client | |
parent | One should not copy/paste so much :) (diff) | |
download | opensim-SC-0b5cdc539c767b526f14cb7e7d97fd83bea14424.zip opensim-SC-0b5cdc539c767b526f14cb7e7d97fd83bea14424.tar.gz opensim-SC-0b5cdc539c767b526f14cb7e7d97fd83bea14424.tar.bz2 opensim-SC-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/Client')
-rw-r--r-- | OpenSim/Client/Linden/LLProxyLoginModule.cs | 2 | ||||
-rw-r--r-- | OpenSim/Client/Linden/LLStandaloneLoginModule.cs | 2 | ||||
-rw-r--r-- | OpenSim/Client/MXP/PacketHandler/MXPPacketServer.cs | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Client/Linden/LLProxyLoginModule.cs b/OpenSim/Client/Linden/LLProxyLoginModule.cs index efae234..9075f15 100644 --- a/OpenSim/Client/Linden/LLProxyLoginModule.cs +++ b/OpenSim/Client/Linden/LLProxyLoginModule.cs | |||
@@ -268,7 +268,7 @@ namespace OpenSim.Client.Linden | |||
268 | else | 268 | else |
269 | { | 269 | { |
270 | string reason; | 270 | string reason; |
271 | if (scene.NewUserConnection(agentData, out reason)) | 271 | if (scene.NewUserConnection(agentData, (uint)TeleportFlags.ViaLogin, out reason)) |
272 | { | 272 | { |
273 | success = true; | 273 | success = true; |
274 | } | 274 | } |
diff --git a/OpenSim/Client/Linden/LLStandaloneLoginModule.cs b/OpenSim/Client/Linden/LLStandaloneLoginModule.cs index 8739ce5..8047f74 100644 --- a/OpenSim/Client/Linden/LLStandaloneLoginModule.cs +++ b/OpenSim/Client/Linden/LLStandaloneLoginModule.cs | |||
@@ -199,7 +199,7 @@ namespace OpenSim.Client.Linden | |||
199 | Scene scene; | 199 | Scene scene; |
200 | if (TryGetRegion(regionHandle, out scene)) | 200 | if (TryGetRegion(regionHandle, out scene)) |
201 | { | 201 | { |
202 | return scene.NewUserConnection(agent, out reason); | 202 | return scene.NewUserConnection(agent, (uint)TeleportFlags.ViaLogin, out reason); |
203 | } | 203 | } |
204 | reason = "Region not found."; | 204 | reason = "Region not found."; |
205 | return false; | 205 | return false; |
diff --git a/OpenSim/Client/MXP/PacketHandler/MXPPacketServer.cs b/OpenSim/Client/MXP/PacketHandler/MXPPacketServer.cs index 63381a4..7d71f18 100644 --- a/OpenSim/Client/MXP/PacketHandler/MXPPacketServer.cs +++ b/OpenSim/Client/MXP/PacketHandler/MXPPacketServer.cs | |||
@@ -609,7 +609,7 @@ namespace OpenSim.Client.MXP.PacketHandler | |||
609 | agent.Appearance = new AvatarAppearance(); | 609 | agent.Appearance = new AvatarAppearance(); |
610 | } | 610 | } |
611 | 611 | ||
612 | return scene.NewUserConnection(agent, out reason); | 612 | return scene.NewUserConnection(agent, 0, out reason); |
613 | } | 613 | } |
614 | 614 | ||
615 | public void PrintDebugInformation() | 615 | public void PrintDebugInformation() |