diff options
author | UbitUmarov | 2014-10-24 02:12:30 +0100 |
---|---|---|
committer | UbitUmarov | 2014-10-24 02:12:30 +0100 |
commit | fd79f75ba6766e1edc196a73dd05fc5f806f82b2 (patch) | |
tree | 3ead04ca86d81e6608308782945aec6490fedfa9 /OpenSim/Server | |
parent | remove some Xengine errors on scripted object delete (diff) | |
download | opensim-SC-fd79f75ba6766e1edc196a73dd05fc5f806f82b2.zip opensim-SC-fd79f75ba6766e1edc196a73dd05fc5f806f82b2.tar.gz opensim-SC-fd79f75ba6766e1edc196a73dd05fc5f806f82b2.tar.bz2 opensim-SC-fd79f75ba6766e1edc196a73dd05fc5f806f82b2.tar.xz |
TEST**** wingridproxy detection at grid login. Untested possible not
very reliable. Adds some load even on region servers because of code at
BaseHttpServer.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Server/Handlers/Login/LLLoginHandlers.cs | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/OpenSim/Server/Handlers/Login/LLLoginHandlers.cs b/OpenSim/Server/Handlers/Login/LLLoginHandlers.cs index f2a5678..5d672c3 100644 --- a/OpenSim/Server/Handlers/Login/LLLoginHandlers.cs +++ b/OpenSim/Server/Handlers/Login/LLLoginHandlers.cs | |||
@@ -132,8 +132,13 @@ 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 | |||
135 | LoginResponse reply = null; | 140 | LoginResponse reply = null; |
136 | reply = m_LocalService.Login(first, last, passwd, startLocation, scopeID, clientVersion, channel, mac, id0, remoteClient); | 141 | reply = m_LocalService.Login(first, last, passwd, startLocation, scopeID, clientVersion, channel, mac, id0, remoteClient, LibOMVclient); |
137 | 142 | ||
138 | XmlRpcResponse response = new XmlRpcResponse(); | 143 | XmlRpcResponse response = new XmlRpcResponse(); |
139 | response.Value = reply.ToHashtable(); | 144 | response.Value = reply.ToHashtable(); |
@@ -216,7 +221,7 @@ namespace OpenSim.Server.Handlers.Login | |||
216 | 221 | ||
217 | LoginResponse reply = null; | 222 | LoginResponse reply = null; |
218 | reply = m_LocalService.Login(map["first"].AsString(), map["last"].AsString(), map["passwd"].AsString(), startLocation, scopeID, | 223 | reply = m_LocalService.Login(map["first"].AsString(), map["last"].AsString(), map["passwd"].AsString(), startLocation, scopeID, |
219 | map["version"].AsString(), map["channel"].AsString(), map["mac"].AsString(), map["id0"].AsString(), remoteClient); | 224 | map["version"].AsString(), map["channel"].AsString(), map["mac"].AsString(), map["id0"].AsString(), remoteClient,false); |
220 | return reply.ToOSDMap(); | 225 | return reply.ToOSDMap(); |
221 | 226 | ||
222 | } | 227 | } |
@@ -259,7 +264,7 @@ namespace OpenSim.Server.Handlers.Login | |||
259 | (sender as WebSocketHttpServerHandler).GetRemoteIPEndpoint(); | 264 | (sender as WebSocketHttpServerHandler).GetRemoteIPEndpoint(); |
260 | LoginResponse reply = null; | 265 | LoginResponse reply = null; |
261 | reply = m_LocalService.Login(first, last, passwd, start, scope, version, | 266 | reply = m_LocalService.Login(first, last, passwd, start, scope, version, |
262 | channel, mac, id0, endPoint); | 267 | channel, mac, id0, endPoint,false); |
263 | sock.SendMessage(OSDParser.SerializeJsonString(reply.ToOSDMap())); | 268 | sock.SendMessage(OSDParser.SerializeJsonString(reply.ToOSDMap())); |
264 | 269 | ||
265 | } | 270 | } |