diff options
| author | Melanie | 2009-12-30 22:24:14 +0000 |
|---|---|---|
| committer | Melanie | 2009-12-30 22:24:14 +0000 |
| commit | a21ce9151b22c75117c4ea4d2a300c302ff78d6a (patch) | |
| tree | 8875cc8058a18645fa94ef055367046d23340e84 /OpenSim/Client/Linden | |
| parent | Merge branch 'presence-refactor' of melanie@opensimulator.org:/var/git/opensi... (diff) | |
| parent | * Fixes Sitting on the ground. (diff) | |
| download | opensim-SC-a21ce9151b22c75117c4ea4d2a300c302ff78d6a.zip opensim-SC-a21ce9151b22c75117c4ea4d2a300c302ff78d6a.tar.gz opensim-SC-a21ce9151b22c75117c4ea4d2a300c302ff78d6a.tar.bz2 opensim-SC-a21ce9151b22c75117c4ea4d2a300c302ff78d6a.tar.xz | |
Merge branch 'master' into presence-refactor
Diffstat (limited to 'OpenSim/Client/Linden')
| -rw-r--r-- | OpenSim/Client/Linden/LLProxyLoginModule.cs | 2 | ||||
| -rw-r--r-- | OpenSim/Client/Linden/LLStandaloneLoginModule.cs | 2 |
2 files changed, 2 insertions, 2 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; |