From 9d8fe7f3db2e90fa91c39ee9b0bd76859beb1412 Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Mon, 23 Nov 2015 23:10:02 +0000
Subject: revert previus commit
---
OpenSim/Server/Handlers/Login/LLLoginHandlers.cs | 14 ++++++++++----
OpenSim/Services/Interfaces/ILoginService.cs | 2 +-
OpenSim/Services/LLLoginService/LLLoginService.cs | 7 +++++--
3 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/OpenSim/Server/Handlers/Login/LLLoginHandlers.cs b/OpenSim/Server/Handlers/Login/LLLoginHandlers.cs
index b8788ac..5d672c3 100644
--- a/OpenSim/Server/Handlers/Login/LLLoginHandlers.cs
+++ b/OpenSim/Server/Handlers/Login/LLLoginHandlers.cs
@@ -132,12 +132,18 @@ namespace OpenSim.Server.Handlers.Login
//m_log.InfoFormat("[LOGIN]: XMLRPC Login Requested for {0} {1}, starting in {2}, using {3}", first, last, startLocation, clientVersion);
+
+ bool LibOMVclient = false;
+ if (request.Params.Count > 4 && (string)request.Params[4] == "gridproxy")
+ LibOMVclient = true;
+
LoginResponse reply = null;
- reply = m_LocalService.Login(first, last, passwd, startLocation, scopeID, clientVersion, channel, mac, id0, remoteClient);
+ reply = m_LocalService.Login(first, last, passwd, startLocation, scopeID, clientVersion, channel, mac, id0, remoteClient, LibOMVclient);
XmlRpcResponse response = new XmlRpcResponse();
response.Value = reply.ToHashtable();
return response;
+
}
}
@@ -215,7 +221,7 @@ namespace OpenSim.Server.Handlers.Login
LoginResponse reply = null;
reply = m_LocalService.Login(map["first"].AsString(), map["last"].AsString(), map["passwd"].AsString(), startLocation, scopeID,
- map["version"].AsString(), map["channel"].AsString(), map["mac"].AsString(), map["id0"].AsString(), remoteClient);
+ map["version"].AsString(), map["channel"].AsString(), map["mac"].AsString(), map["id0"].AsString(), remoteClient,false);
return reply.ToOSDMap();
}
@@ -257,8 +263,8 @@ namespace OpenSim.Server.Handlers.Login
IPEndPoint endPoint =
(sender as WebSocketHttpServerHandler).GetRemoteIPEndpoint();
LoginResponse reply = null;
- reply = m_LocalService.Login(first, last, passwd, start, scope,
- version, channel, mac, id0, endPoint);
+ reply = m_LocalService.Login(first, last, passwd, start, scope, version,
+ channel, mac, id0, endPoint,false);
sock.SendMessage(OSDParser.SerializeJsonString(reply.ToOSDMap()));
}
diff --git a/OpenSim/Services/Interfaces/ILoginService.cs b/OpenSim/Services/Interfaces/ILoginService.cs
index c37e666..7c44cd8 100644
--- a/OpenSim/Services/Interfaces/ILoginService.cs
+++ b/OpenSim/Services/Interfaces/ILoginService.cs
@@ -48,7 +48,7 @@ namespace OpenSim.Services.Interfaces
public interface ILoginService
{
LoginResponse Login(string firstName, string lastName, string passwd, string startLocation, UUID scopeID,
- string clientVersion, string channel, string mac, string id0, IPEndPoint clientIP);
+ string clientVersion, string channel, string mac, string id0, IPEndPoint clientIP, bool LibOMVclient);
Hashtable SetLevel(string firstName, string lastName, string passwd, int level, IPEndPoint clientIP);
}
diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs
index 135a8f3..6681f1a 100644
--- a/OpenSim/Services/LLLoginService/LLLoginService.cs
+++ b/OpenSim/Services/LLLoginService/LLLoginService.cs
@@ -266,15 +266,18 @@ namespace OpenSim.Services.LLLoginService
}
public LoginResponse Login(string firstName, string lastName, string passwd, string startLocation, UUID scopeID,
- string clientVersion, string channel, string mac, string id0, IPEndPoint clientIP)
+ string clientVersion, string channel, string mac, string id0, IPEndPoint clientIP, bool LibOMVclient)
{
bool success = false;
UUID session = UUID.Random();
string processedMessage;
+ if (clientVersion.Contains("Radegast"))
+ LibOMVclient = false;
+
m_log.InfoFormat("[LLOGIN SERVICE]: Login request for {0} {1} at {2} using viewer {3}, channel {4}, IP {5}, Mac {6}, Id0 {7}, Possible LibOMVGridProxy: {8} ",
- firstName, lastName, startLocation, clientVersion, channel, clientIP.Address.ToString(), mac, id0);
+ firstName, lastName, startLocation, clientVersion, channel, clientIP.Address.ToString(), mac, id0, LibOMVclient.ToString());
try
{
--
cgit v1.1