diff options
author | Melanie Thielker | 2017-01-05 19:07:37 +0000 |
---|---|---|
committer | Melanie Thielker | 2017-01-05 19:07:37 +0000 |
commit | b16abc8166c29585cb76cc55c3bdd76e5833cb4f (patch) | |
tree | 6a34f465a74b7a3a6dc00a3d7aa8dcc25ac3e3a5 /OpenSim/Services/HypergridService/GatekeeperService.cs | |
parent | Make it possible to disable the bakes module in the way it is described in co... (diff) | |
download | opensim-SC-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.zip opensim-SC-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.gz opensim-SC-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.bz2 opensim-SC-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.xz |
Massive tab and trailing space cleanup
Diffstat (limited to 'OpenSim/Services/HypergridService/GatekeeperService.cs')
-rw-r--r-- | OpenSim/Services/HypergridService/GatekeeperService.cs | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/OpenSim/Services/HypergridService/GatekeeperService.cs b/OpenSim/Services/HypergridService/GatekeeperService.cs index 41e2b40..b80700f 100644 --- a/OpenSim/Services/HypergridService/GatekeeperService.cs +++ b/OpenSim/Services/HypergridService/GatekeeperService.cs | |||
@@ -93,7 +93,7 @@ namespace OpenSim.Services.HypergridService | |||
93 | // These are mandatory, the others aren't | 93 | // These are mandatory, the others aren't |
94 | if (gridService == string.Empty || presenceService == string.Empty) | 94 | if (gridService == string.Empty || presenceService == string.Empty) |
95 | throw new Exception("Incomplete specifications, Gatekeeper Service cannot function."); | 95 | throw new Exception("Incomplete specifications, Gatekeeper Service cannot function."); |
96 | 96 | ||
97 | string scope = serverConfig.GetString("ScopeID", UUID.Zero.ToString()); | 97 | string scope = serverConfig.GetString("ScopeID", UUID.Zero.ToString()); |
98 | UUID.TryParse(scope, out m_ScopeID); | 98 | UUID.TryParse(scope, out m_ScopeID); |
99 | //m_WelcomeMessage = serverConfig.GetString("WelcomeMessage", "Welcome to OpenSim!"); | 99 | //m_WelcomeMessage = serverConfig.GetString("WelcomeMessage", "Welcome to OpenSim!"); |
@@ -135,7 +135,7 @@ namespace OpenSim.Services.HypergridService | |||
135 | m_AllowedClients = Util.GetConfigVarFromSections<string>( | 135 | m_AllowedClients = Util.GetConfigVarFromSections<string>( |
136 | config, "AllowedClients", possibleAccessControlConfigSections, string.Empty); | 136 | config, "AllowedClients", possibleAccessControlConfigSections, string.Empty); |
137 | m_DeniedClients = Util.GetConfigVarFromSections<string>( | 137 | m_DeniedClients = Util.GetConfigVarFromSections<string>( |
138 | config, "DeniedClients", possibleAccessControlConfigSections, string.Empty); | 138 | config, "DeniedClients", possibleAccessControlConfigSections, string.Empty); |
139 | m_ForeignAgentsAllowed = serverConfig.GetBoolean("ForeignAgentsAllowed", true); | 139 | m_ForeignAgentsAllowed = serverConfig.GetBoolean("ForeignAgentsAllowed", true); |
140 | 140 | ||
141 | LoadDomainExceptionsFromConfig(serverConfig, "AllowExcept", m_ForeignsAllowedExceptions); | 141 | LoadDomainExceptionsFromConfig(serverConfig, "AllowExcept", m_ForeignsAllowedExceptions); |
@@ -219,11 +219,11 @@ namespace OpenSim.Services.HypergridService | |||
219 | { | 219 | { |
220 | // Don't even check the given regionID | 220 | // Don't even check the given regionID |
221 | m_log.DebugFormat( | 221 | m_log.DebugFormat( |
222 | "[GATEKEEPER SERVICE]: Returning gateway region {0} {1} @ {2} to user {3}{4} as teleporting to arbitrary regions is not allowed.", | 222 | "[GATEKEEPER SERVICE]: Returning gateway region {0} {1} @ {2} to user {3}{4} as teleporting to arbitrary regions is not allowed.", |
223 | m_DefaultGatewayRegion.RegionName, | 223 | m_DefaultGatewayRegion.RegionName, |
224 | m_DefaultGatewayRegion.RegionID, | 224 | m_DefaultGatewayRegion.RegionID, |
225 | m_DefaultGatewayRegion.ServerURI, | 225 | m_DefaultGatewayRegion.ServerURI, |
226 | agentID, | 226 | agentID, |
227 | agentHomeURI == null ? "" : " @ " + agentHomeURI); | 227 | agentHomeURI == null ? "" : " @ " + agentHomeURI); |
228 | 228 | ||
229 | message = "Teleporting to the default region."; | 229 | message = "Teleporting to the default region."; |
@@ -244,10 +244,10 @@ namespace OpenSim.Services.HypergridService | |||
244 | 244 | ||
245 | m_log.DebugFormat( | 245 | m_log.DebugFormat( |
246 | "[GATEKEEPER SERVICE]: Returning region {0} {1} @ {2} to user {3}{4}.", | 246 | "[GATEKEEPER SERVICE]: Returning region {0} {1} @ {2} to user {3}{4}.", |
247 | region.RegionName, | 247 | region.RegionName, |
248 | region.RegionID, | 248 | region.RegionID, |
249 | region.ServerURI, | 249 | region.ServerURI, |
250 | agentID, | 250 | agentID, |
251 | agentHomeURI == null ? "" : " @ " + agentHomeURI); | 251 | agentHomeURI == null ? "" : " @ " + agentHomeURI); |
252 | 252 | ||
253 | return region; | 253 | return region; |
@@ -308,7 +308,7 @@ namespace OpenSim.Services.HypergridService | |||
308 | return false; | 308 | return false; |
309 | } | 309 | } |
310 | m_log.DebugFormat("[GATEKEEPER SERVICE]: Identity verified for {0} {1} @ {2}", aCircuit.firstname, aCircuit.lastname, authURL); | 310 | m_log.DebugFormat("[GATEKEEPER SERVICE]: Identity verified for {0} {1} @ {2}", aCircuit.firstname, aCircuit.lastname, authURL); |
311 | 311 | ||
312 | // | 312 | // |
313 | // Check for impersonations | 313 | // Check for impersonations |
314 | // | 314 | // |
@@ -461,7 +461,7 @@ namespace OpenSim.Services.HypergridService | |||
461 | EntityTransferContext ctx = new EntityTransferContext(); | 461 | EntityTransferContext ctx = new EntityTransferContext(); |
462 | 462 | ||
463 | if (!m_SimulationService.QueryAccess( | 463 | if (!m_SimulationService.QueryAccess( |
464 | destination, aCircuit.AgentID, aCircuit.ServiceURLs["HomeURI"].ToString(), | 464 | destination, aCircuit.AgentID, aCircuit.ServiceURLs["HomeURI"].ToString(), |
465 | true, aCircuit.startpos, new List<UUID>(), ctx, out reason)) | 465 | true, aCircuit.startpos, new List<UUID>(), ctx, out reason)) |
466 | return false; | 466 | return false; |
467 | 467 | ||
@@ -495,7 +495,7 @@ namespace OpenSim.Services.HypergridService | |||
495 | } | 495 | } |
496 | else | 496 | else |
497 | { | 497 | { |
498 | IUserAgentService userAgentService = new UserAgentServiceConnector(userURL); | 498 | IUserAgentService userAgentService = new UserAgentServiceConnector(userURL); |
499 | 499 | ||
500 | try | 500 | try |
501 | { | 501 | { |