aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Server/Handlers/Login/LLLoginHandlers.cs14
-rw-r--r--OpenSim/Services/Interfaces/ILoginService.cs2
-rw-r--r--OpenSim/Services/LLLoginService/LLLoginService.cs7
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
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();
140 return response; 145 return response;
146
141 } 147 }
142 } 148 }
143 149
@@ -215,7 +221,7 @@ namespace OpenSim.Server.Handlers.Login
215 221
216 LoginResponse reply = null; 222 LoginResponse reply = null;
217 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,
218 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);
219 return reply.ToOSDMap(); 225 return reply.ToOSDMap();
220 226
221 } 227 }
@@ -257,8 +263,8 @@ namespace OpenSim.Server.Handlers.Login
257 IPEndPoint endPoint = 263 IPEndPoint endPoint =
258 (sender as WebSocketHttpServerHandler).GetRemoteIPEndpoint(); 264 (sender as WebSocketHttpServerHandler).GetRemoteIPEndpoint();
259 LoginResponse reply = null; 265 LoginResponse reply = null;
260 reply = m_LocalService.Login(first, last, passwd, start, scope, 266 reply = m_LocalService.Login(first, last, passwd, start, scope, version,
261 version, channel, mac, id0, endPoint); 267 channel, mac, id0, endPoint,false);
262 sock.SendMessage(OSDParser.SerializeJsonString(reply.ToOSDMap())); 268 sock.SendMessage(OSDParser.SerializeJsonString(reply.ToOSDMap()));
263 269
264 } 270 }
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
48 public interface ILoginService 48 public interface ILoginService
49 { 49 {
50 LoginResponse Login(string firstName, string lastName, string passwd, string startLocation, UUID scopeID, 50 LoginResponse Login(string firstName, string lastName, string passwd, string startLocation, UUID scopeID,
51 string clientVersion, string channel, string mac, string id0, IPEndPoint clientIP); 51 string clientVersion, string channel, string mac, string id0, IPEndPoint clientIP, bool LibOMVclient);
52 Hashtable SetLevel(string firstName, string lastName, string passwd, int level, IPEndPoint clientIP); 52 Hashtable SetLevel(string firstName, string lastName, string passwd, int level, IPEndPoint clientIP);
53 } 53 }
54 54
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
266 } 266 }
267 267
268 public LoginResponse Login(string firstName, string lastName, string passwd, string startLocation, UUID scopeID, 268 public LoginResponse Login(string firstName, string lastName, string passwd, string startLocation, UUID scopeID,
269 string clientVersion, string channel, string mac, string id0, IPEndPoint clientIP) 269 string clientVersion, string channel, string mac, string id0, IPEndPoint clientIP, bool LibOMVclient)
270 { 270 {
271 bool success = false; 271 bool success = false;
272 UUID session = UUID.Random(); 272 UUID session = UUID.Random();
273 273
274 string processedMessage; 274 string processedMessage;
275 275
276 if (clientVersion.Contains("Radegast"))
277 LibOMVclient = false;
278
276 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} ", 279 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} ",
277 firstName, lastName, startLocation, clientVersion, channel, clientIP.Address.ToString(), mac, id0); 280 firstName, lastName, startLocation, clientVersion, channel, clientIP.Address.ToString(), mac, id0, LibOMVclient.ToString());
278 281
279 try 282 try
280 { 283 {