diff options
| author | Melanie | 2009-12-29 18:41:45 +0000 |
|---|---|---|
| committer | Melanie | 2009-12-29 18:41:45 +0000 |
| commit | 67cfac0cf15d873666d2bbf5e2178d4242d702b4 (patch) | |
| tree | ae27113d3b127d6eccaa189cc601f3b6ab714788 /OpenSim/Client/MXP | |
| parent | One should not copy/paste so much :) (diff) | |
| parent | Change teleports so the TeleportFlags are sent to the destination sim. It (diff) | |
| download | opensim-SC-67cfac0cf15d873666d2bbf5e2178d4242d702b4.zip opensim-SC-67cfac0cf15d873666d2bbf5e2178d4242d702b4.tar.gz opensim-SC-67cfac0cf15d873666d2bbf5e2178d4242d702b4.tar.bz2 opensim-SC-67cfac0cf15d873666d2bbf5e2178d4242d702b4.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Client/MXP')
| -rw-r--r-- | OpenSim/Client/MXP/PacketHandler/MXPPacketServer.cs | 2 |
1 files changed, 1 insertions, 1 deletions
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() |