aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Client/Linden/LLProxyLoginModule.cs
diff options
context:
space:
mode:
authorMelanie2009-12-30 22:24:14 +0000
committerMelanie2009-12-30 22:24:14 +0000
commita21ce9151b22c75117c4ea4d2a300c302ff78d6a (patch)
tree8875cc8058a18645fa94ef055367046d23340e84 /OpenSim/Client/Linden/LLProxyLoginModule.cs
parentMerge branch 'presence-refactor' of melanie@opensimulator.org:/var/git/opensi... (diff)
parent* Fixes Sitting on the ground. (diff)
downloadopensim-SC_OLD-a21ce9151b22c75117c4ea4d2a300c302ff78d6a.zip
opensim-SC_OLD-a21ce9151b22c75117c4ea4d2a300c302ff78d6a.tar.gz
opensim-SC_OLD-a21ce9151b22c75117c4ea4d2a300c302ff78d6a.tar.bz2
opensim-SC_OLD-a21ce9151b22c75117c4ea4d2a300c302ff78d6a.tar.xz
Merge branch 'master' into presence-refactor
Diffstat (limited to 'OpenSim/Client/Linden/LLProxyLoginModule.cs')
-rw-r--r--OpenSim/Client/Linden/LLProxyLoginModule.cs2
1 files changed, 1 insertions, 1 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 }