aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Client
diff options
context:
space:
mode:
authorMelanie2009-12-29 18:41:45 +0000
committerMelanie2009-12-29 18:41:45 +0000
commit67cfac0cf15d873666d2bbf5e2178d4242d702b4 (patch)
treeae27113d3b127d6eccaa189cc601f3b6ab714788 /OpenSim/Client
parentOne should not copy/paste so much :) (diff)
parentChange teleports so the TeleportFlags are sent to the destination sim. It (diff)
downloadopensim-SC_OLD-67cfac0cf15d873666d2bbf5e2178d4242d702b4.zip
opensim-SC_OLD-67cfac0cf15d873666d2bbf5e2178d4242d702b4.tar.gz
opensim-SC_OLD-67cfac0cf15d873666d2bbf5e2178d4242d702b4.tar.bz2
opensim-SC_OLD-67cfac0cf15d873666d2bbf5e2178d4242d702b4.tar.xz
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Client')
-rw-r--r--OpenSim/Client/Linden/LLProxyLoginModule.cs2
-rw-r--r--OpenSim/Client/Linden/LLStandaloneLoginModule.cs2
-rw-r--r--OpenSim/Client/MXP/PacketHandler/MXPPacketServer.cs2
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()