OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

replace some string tests

0.9.1.0-post-fixes
UbitUmarov 2018-07-08 13:41:55 +01:00
parent 60644b440b
commit c3933ce8b9
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim/Services/HypergridService/GatekeeperService.cs
View File

@ -284,7 +284,7 @@ namespace OpenSim.Services.HypergridService
// //
// Check client // Check client
// //
if (m_AllowedClients != string.Empty) if (!String.IsNullOrWhiteSpace(m_AllowedClients))
{ {
Regex arx = new Regex(m_AllowedClients); Regex arx = new Regex(m_AllowedClients);
Match am = arx.Match(curViewer); Match am = arx.Match(curViewer);
@ -297,7 +297,7 @@ namespace OpenSim.Services.HypergridService
} }
} }
if (m_DeniedClients != string.Empty) if (!String.IsNullOrWhiteSpace(m_DeniedClients))
{ {
Regex drx = new Regex(m_DeniedClients); Regex drx = new Regex(m_DeniedClients);
Match dm = drx.Match(curViewer); Match dm = drx.Match(curViewer);
@ -310,7 +310,7 @@ namespace OpenSim.Services.HypergridService
} }
} }
if (m_DeniedMacs != string.Empty) if (!String.IsNullOrWhiteSpace(m_DeniedMacs))
{ {
m_log.InfoFormat("[GATEKEEPER SERVICE]: Checking users Mac {0} against list of denied macs {1} ...", curMac, m_DeniedMacs); m_log.InfoFormat("[GATEKEEPER SERVICE]: Checking users Mac {0} against list of denied macs {1} ...", curMac, m_DeniedMacs);
if (m_DeniedMacs.Contains(curMac)) if (m_DeniedMacs.Contains(curMac))

6
OpenSim/Services/LLLoginService/LLLoginService.cs
View File

@ -301,7 +301,7 @@ namespace OpenSim.Services.LLLoginService
// //
// Check client // Check client
// //
if (m_AllowedClients != string.Empty) if (!String.IsNullOrWhiteSpace(m_AllowedClients))
{ {
Regex arx = new Regex(m_AllowedClients); Regex arx = new Regex(m_AllowedClients);
Match am = arx.Match(clientVersion); Match am = arx.Match(clientVersion);
@ -315,7 +315,7 @@ namespace OpenSim.Services.LLLoginService
} }
} }
if (m_DeniedClients != string.Empty) if (!String.IsNullOrWhiteSpace(m_DeniedClients))
{ {
Regex drx = new Regex(m_DeniedClients); Regex drx = new Regex(m_DeniedClients);
Match dm = drx.Match(clientVersion); Match dm = drx.Match(clientVersion);
@ -329,7 +329,7 @@ namespace OpenSim.Services.LLLoginService
} }
} }
if (m_DeniedMacs != string.Empty) if (!String.IsNullOrWhiteSpace(m_DeniedMacs))
{ {
m_log.InfoFormat("[LLOGIN SERVICE]: Checking users Mac {0} against list of denied macs {1} ...", curMac, m_DeniedMacs); m_log.InfoFormat("[LLOGIN SERVICE]: Checking users Mac {0} against list of denied macs {1} ...", curMac, m_DeniedMacs);
if (m_DeniedMacs.Contains(curMac)) if (m_DeniedMacs.Contains(curMac))