diff options
author | Melanie Thielker | 2010-05-06 00:34:49 +0200 |
---|---|---|
committer | Melanie | 2010-05-05 22:15:32 +0100 |
commit | 2ebe1482664533bb9b9040134fe4a23fbc939d51 (patch) | |
tree | 41c7c99c6da6ecd1ff217730e1dd95dd680ec5da /OpenSim/Server/Handlers/Login | |
parent | Add a XMLRPC method to remotely set the login level for the LLLoginService. (diff) | |
download | opensim-SC_OLD-2ebe1482664533bb9b9040134fe4a23fbc939d51.zip opensim-SC_OLD-2ebe1482664533bb9b9040134fe4a23fbc939d51.tar.gz opensim-SC_OLD-2ebe1482664533bb9b9040134fe4a23fbc939d51.tar.bz2 opensim-SC_OLD-2ebe1482664533bb9b9040134fe4a23fbc939d51.tar.xz |
Plumb the viewer version string through into AgentCircuitData. Now all that
is left os to figure out what black magic turns AgentCircuitData into
AgentData and then copy that into the ScenePresence, where m_Viewer is
already added with this commit and waits for the data.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Server/Handlers/Login/LLLoginHandlers.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Server/Handlers/Login/LLLoginHandlers.cs b/OpenSim/Server/Handlers/Login/LLLoginHandlers.cs index 83b3e31..c9bf996 100644 --- a/OpenSim/Server/Handlers/Login/LLLoginHandlers.cs +++ b/OpenSim/Server/Handlers/Login/LLLoginHandlers.cs | |||
@@ -86,7 +86,7 @@ namespace OpenSim.Server.Handlers.Login | |||
86 | m_log.InfoFormat("[LOGIN]: XMLRPC Login Requested for {0} {1}, starting in {2}, using {3}", first, last, startLocation, clientVersion); | 86 | m_log.InfoFormat("[LOGIN]: XMLRPC Login Requested for {0} {1}, starting in {2}, using {3}", first, last, startLocation, clientVersion); |
87 | 87 | ||
88 | LoginResponse reply = null; | 88 | LoginResponse reply = null; |
89 | reply = m_LocalService.Login(first, last, passwd, startLocation, scopeID, remoteClient); | 89 | reply = m_LocalService.Login(first, last, passwd, startLocation, scopeID, clientVersion, remoteClient); |
90 | 90 | ||
91 | XmlRpcResponse response = new XmlRpcResponse(); | 91 | XmlRpcResponse response = new XmlRpcResponse(); |
92 | response.Value = reply.ToHashtable(); | 92 | response.Value = reply.ToHashtable(); |
@@ -157,7 +157,7 @@ namespace OpenSim.Server.Handlers.Login | |||
157 | m_log.Info("[LOGIN]: LLSD Login Requested for: '" + map["first"].AsString() + "' '" + map["last"].AsString() + "' / " + startLocation); | 157 | m_log.Info("[LOGIN]: LLSD Login Requested for: '" + map["first"].AsString() + "' '" + map["last"].AsString() + "' / " + startLocation); |
158 | 158 | ||
159 | LoginResponse reply = null; | 159 | LoginResponse reply = null; |
160 | reply = m_LocalService.Login(map["first"].AsString(), map["last"].AsString(), map["passwd"].AsString(), startLocation, scopeID, remoteClient); | 160 | reply = m_LocalService.Login(map["first"].AsString(), map["last"].AsString(), map["passwd"].AsString(), startLocation, scopeID, String.Empty, remoteClient); |
161 | return reply.ToOSDMap(); | 161 | return reply.ToOSDMap(); |
162 | 162 | ||
163 | } | 163 | } |