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/Services | |
parent | remove some Xengine errors on scripted object delete (diff) | |
download | opensim-SC_OLD-fd79f75ba6766e1edc196a73dd05fc5f806f82b2.zip opensim-SC_OLD-fd79f75ba6766e1edc196a73dd05fc5f806f82b2.tar.gz opensim-SC_OLD-fd79f75ba6766e1edc196a73dd05fc5f806f82b2.tar.bz2 opensim-SC_OLD-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 'OpenSim/Services')
-rw-r--r-- | OpenSim/Services/Interfaces/ILoginService.cs | 4 | ||||
-rw-r--r-- | OpenSim/Services/LLLoginService/LLLoginService.cs | 9 |
2 files changed, 8 insertions, 5 deletions
diff --git a/OpenSim/Services/Interfaces/ILoginService.cs b/OpenSim/Services/Interfaces/ILoginService.cs index ee9b0b1..7c44cd8 100644 --- a/OpenSim/Services/Interfaces/ILoginService.cs +++ b/OpenSim/Services/Interfaces/ILoginService.cs | |||
@@ -47,8 +47,8 @@ namespace OpenSim.Services.Interfaces | |||
47 | 47 | ||
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 ed62c43..1c1c9b0 100644 --- a/OpenSim/Services/LLLoginService/LLLoginService.cs +++ b/OpenSim/Services/LLLoginService/LLLoginService.cs | |||
@@ -247,13 +247,16 @@ namespace OpenSim.Services.LLLoginService | |||
247 | } | 247 | } |
248 | 248 | ||
249 | public LoginResponse Login(string firstName, string lastName, string passwd, string startLocation, UUID scopeID, | 249 | public LoginResponse Login(string firstName, string lastName, string passwd, string startLocation, UUID scopeID, |
250 | string clientVersion, string channel, string mac, string id0, IPEndPoint clientIP) | 250 | string clientVersion, string channel, string mac, string id0, IPEndPoint clientIP, bool LibOMVclient) |
251 | { | 251 | { |
252 | bool success = false; | 252 | bool success = false; |
253 | UUID session = UUID.Random(); | 253 | UUID session = UUID.Random(); |
254 | if (clientVersion.Contains("Radegast")) | ||
255 | LibOMVclient = false; | ||
254 | 256 | ||
255 | m_log.InfoFormat("[LLOGIN SERVICE]: Login request for {0} {1} at {2} using viewer {3}, channel {4}, IP {5}, Mac {6}, Id0 {7}", | 257 | |
256 | firstName, lastName, startLocation, clientVersion, channel, clientIP.Address.ToString(), mac, id0); | 258 | 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} ", |
259 | firstName, lastName, startLocation, clientVersion, channel, clientIP.Address.ToString(), mac, id0, LibOMVclient.ToString()); | ||
257 | 260 | ||
258 | try | 261 | try |
259 | { | 262 | { |