diff options
author | Teravus Ovares (Dan Olivares) | 2009-12-29 22:00:01 -0500 |
---|---|---|
committer | Teravus Ovares (Dan Olivares) | 2009-12-29 22:00:01 -0500 |
commit | 2205d1c486666399085f2e6d3b7d5d08474587cf (patch) | |
tree | 10fa1e3ed522d4eefdd3770a531648ee2c9957f4 /OpenSim/Client/Linden | |
parent | * Attempts to resolve the megaregion terrain edit rebound. (diff) | |
parent | Fix an omission in LSL that causes a viewer crash (diff) | |
download | opensim-SC_OLD-2205d1c486666399085f2e6d3b7d5d08474587cf.zip opensim-SC_OLD-2205d1c486666399085f2e6d3b7d5d08474587cf.tar.gz opensim-SC_OLD-2205d1c486666399085f2e6d3b7d5d08474587cf.tar.bz2 opensim-SC_OLD-2205d1c486666399085f2e6d3b7d5d08474587cf.tar.xz |
Merge branch 'master' of ssh://MyConnection/var/git/opensim
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; |