aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorUbitUmarov2018-07-08 13:41:55 +0100
committerUbitUmarov2018-07-08 13:41:55 +0100
commitc3933ce8b93790dd8e6f1e47ebb9ae327d5edffb (patch)
tree3cf8e77ba25879ceb50c319a43dee4bb1d6200e6
parentwe don't use tab simbol, we use 4 whitespaces (diff)
downloadopensim-SC-c3933ce8b93790dd8e6f1e47ebb9ae327d5edffb.zip
opensim-SC-c3933ce8b93790dd8e6f1e47ebb9ae327d5edffb.tar.gz
opensim-SC-c3933ce8b93790dd8e6f1e47ebb9ae327d5edffb.tar.bz2
opensim-SC-c3933ce8b93790dd8e6f1e47ebb9ae327d5edffb.tar.xz
replace some string tests
-rw-r--r--OpenSim/Services/HypergridService/GatekeeperService.cs6
-rw-r--r--OpenSim/Services/LLLoginService/LLLoginService.cs6
2 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Services/HypergridService/GatekeeperService.cs b/OpenSim/Services/HypergridService/GatekeeperService.cs
index 2dae6b7..1b652a0 100644
--- a/OpenSim/Services/HypergridService/GatekeeperService.cs
+++ b/OpenSim/Services/HypergridService/GatekeeperService.cs
@@ -284,7 +284,7 @@ namespace OpenSim.Services.HypergridService
284 // 284 //
285 // Check client 285 // Check client
286 // 286 //
287 if (m_AllowedClients != string.Empty) 287 if (!String.IsNullOrWhiteSpace(m_AllowedClients))
288 { 288 {
289 Regex arx = new Regex(m_AllowedClients); 289 Regex arx = new Regex(m_AllowedClients);
290 Match am = arx.Match(curViewer); 290 Match am = arx.Match(curViewer);
@@ -297,7 +297,7 @@ namespace OpenSim.Services.HypergridService
297 } 297 }
298 } 298 }
299 299
300 if (m_DeniedClients != string.Empty) 300 if (!String.IsNullOrWhiteSpace(m_DeniedClients))
301 { 301 {
302 Regex drx = new Regex(m_DeniedClients); 302 Regex drx = new Regex(m_DeniedClients);
303 Match dm = drx.Match(curViewer); 303 Match dm = drx.Match(curViewer);
@@ -310,7 +310,7 @@ namespace OpenSim.Services.HypergridService
310 } 310 }
311 } 311 }
312 312
313 if (m_DeniedMacs != string.Empty) 313 if (!String.IsNullOrWhiteSpace(m_DeniedMacs))
314 { 314 {
315 m_log.InfoFormat("[GATEKEEPER SERVICE]: Checking users Mac {0} against list of denied macs {1} ...", curMac, m_DeniedMacs); 315 m_log.InfoFormat("[GATEKEEPER SERVICE]: Checking users Mac {0} against list of denied macs {1} ...", curMac, m_DeniedMacs);
316 if (m_DeniedMacs.Contains(curMac)) 316 if (m_DeniedMacs.Contains(curMac))
diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs
index a57c9a7..d7cade5 100644
--- a/OpenSim/Services/LLLoginService/LLLoginService.cs
+++ b/OpenSim/Services/LLLoginService/LLLoginService.cs
@@ -301,7 +301,7 @@ namespace OpenSim.Services.LLLoginService
301 // 301 //
302 // Check client 302 // Check client
303 // 303 //
304 if (m_AllowedClients != string.Empty) 304 if (!String.IsNullOrWhiteSpace(m_AllowedClients))
305 { 305 {
306 Regex arx = new Regex(m_AllowedClients); 306 Regex arx = new Regex(m_AllowedClients);
307 Match am = arx.Match(clientVersion); 307 Match am = arx.Match(clientVersion);
@@ -315,7 +315,7 @@ namespace OpenSim.Services.LLLoginService
315 } 315 }
316 } 316 }
317 317
318 if (m_DeniedClients != string.Empty) 318 if (!String.IsNullOrWhiteSpace(m_DeniedClients))
319 { 319 {
320 Regex drx = new Regex(m_DeniedClients); 320 Regex drx = new Regex(m_DeniedClients);
321 Match dm = drx.Match(clientVersion); 321 Match dm = drx.Match(clientVersion);
@@ -329,7 +329,7 @@ namespace OpenSim.Services.LLLoginService
329 } 329 }
330 } 330 }
331 331
332 if (m_DeniedMacs != string.Empty) 332 if (!String.IsNullOrWhiteSpace(m_DeniedMacs))
333 { 333 {
334 m_log.InfoFormat("[LLOGIN SERVICE]: Checking users Mac {0} against list of denied macs {1} ...", curMac, m_DeniedMacs); 334 m_log.InfoFormat("[LLOGIN SERVICE]: Checking users Mac {0} against list of denied macs {1} ...", curMac, m_DeniedMacs);
335 if (m_DeniedMacs.Contains(curMac)) 335 if (m_DeniedMacs.Contains(curMac))