diff options
author | UbitUmarov | 2019-11-14 06:34:44 +0000 |
---|---|---|
committer | UbitUmarov | 2019-11-14 06:34:44 +0000 |
commit | 31aef4e82b2e746837a6ef0fcd8d3f1b7385bc8e (patch) | |
tree | 1714d1b387d631925abc9bb417adc17565084dc9 /OpenSim/Server/Handlers/Login | |
parent | Complete PostGres from previous commit - (Not Tested) (diff) | |
download | opensim-SC-31aef4e82b2e746837a6ef0fcd8d3f1b7385bc8e.zip opensim-SC-31aef4e82b2e746837a6ef0fcd8d3f1b7385bc8e.tar.gz opensim-SC-31aef4e82b2e746837a6ef0fcd8d3f1b7385bc8e.tar.bz2 opensim-SC-31aef4e82b2e746837a6ef0fcd8d3f1b7385bc8e.tar.xz |
work on previus 2 patchs
Diffstat (limited to 'OpenSim/Server/Handlers/Login')
-rw-r--r-- | OpenSim/Server/Handlers/Login/LLLoginHandlers.cs | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/OpenSim/Server/Handlers/Login/LLLoginHandlers.cs b/OpenSim/Server/Handlers/Login/LLLoginHandlers.cs index 4e7ab00..c40bbd3 100644 --- a/OpenSim/Server/Handlers/Login/LLLoginHandlers.cs +++ b/OpenSim/Server/Handlers/Login/LLLoginHandlers.cs | |||
@@ -132,13 +132,8 @@ namespace OpenSim.Server.Handlers.Login | |||
132 | 132 | ||
133 | //m_log.InfoFormat("[LOGIN]: XMLRPC Login Requested for {0} {1}, starting in {2}, using {3}", first, last, startLocation, clientVersion); | 133 | //m_log.InfoFormat("[LOGIN]: XMLRPC Login Requested for {0} {1}, starting in {2}, using {3}", first, last, startLocation, clientVersion); |
134 | 134 | ||
135 | |||
136 | bool LibOMVclient = false; | ||
137 | if (request.Params.Count > 4 && (string)request.Params[4] == "gridproxy") | ||
138 | LibOMVclient = true; | ||
139 | |||
140 | LoginResponse reply = null; | 135 | LoginResponse reply = null; |
141 | reply = m_LocalService.Login(first, last, passwd, startLocation, scopeID, clientVersion, channel, mac, id0, remoteClient, LibOMVclient); | 136 | reply = m_LocalService.Login(first, last, passwd, startLocation, scopeID, clientVersion, channel, mac, id0, remoteClient); |
142 | 137 | ||
143 | XmlRpcResponse response = new XmlRpcResponse(); | 138 | XmlRpcResponse response = new XmlRpcResponse(); |
144 | response.Value = reply.ToHashtable(); | 139 | response.Value = reply.ToHashtable(); |
@@ -221,7 +216,7 @@ namespace OpenSim.Server.Handlers.Login | |||
221 | 216 | ||
222 | LoginResponse reply = null; | 217 | LoginResponse reply = null; |
223 | reply = m_LocalService.Login(map["first"].AsString(), map["last"].AsString(), map["passwd"].AsString(), startLocation, scopeID, | 218 | reply = m_LocalService.Login(map["first"].AsString(), map["last"].AsString(), map["passwd"].AsString(), startLocation, scopeID, |
224 | map["version"].AsString(), map["channel"].AsString(), map["mac"].AsString(), map["id0"].AsString(), remoteClient,false); | 219 | map["version"].AsString(), map["channel"].AsString(), map["mac"].AsString(), map["id0"].AsString(), remoteClient); |
225 | return reply.ToOSDMap(); | 220 | return reply.ToOSDMap(); |
226 | 221 | ||
227 | } | 222 | } |
@@ -264,7 +259,7 @@ namespace OpenSim.Server.Handlers.Login | |||
264 | (sender as WebSocketHttpServerHandler).GetRemoteIPEndpoint(); | 259 | (sender as WebSocketHttpServerHandler).GetRemoteIPEndpoint(); |
265 | LoginResponse reply = null; | 260 | LoginResponse reply = null; |
266 | reply = m_LocalService.Login(first, last, passwd, start, scope, version, | 261 | reply = m_LocalService.Login(first, last, passwd, start, scope, version, |
267 | channel, mac, id0, endPoint,false); | 262 | channel, mac, id0, endPoint); |
268 | sock.SendMessage(OSDParser.SerializeJsonString(reply.ToOSDMap())); | 263 | sock.SendMessage(OSDParser.SerializeJsonString(reply.ToOSDMap())); |
269 | 264 | ||
270 | } | 265 | } |