diff options
Merge branch 'master' into careminster
Conflicts:
OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
OpenSim/Services/HypergridService/UserAgentService.cs
Diffstat (limited to 'OpenSim/Services/HypergridService/GatekeeperService.cs')
-rw-r--r-- | OpenSim/Services/HypergridService/GatekeeperService.cs | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/OpenSim/Services/HypergridService/GatekeeperService.cs b/OpenSim/Services/HypergridService/GatekeeperService.cs index 0cf1c14..0a3e70b 100644 --- a/OpenSim/Services/HypergridService/GatekeeperService.cs +++ b/OpenSim/Services/HypergridService/GatekeeperService.cs | |||
@@ -419,6 +419,12 @@ namespace OpenSim.Services.HypergridService | |||
419 | if (!CheckAddress(aCircuit.ServiceSessionID)) | 419 | if (!CheckAddress(aCircuit.ServiceSessionID)) |
420 | return false; | 420 | return false; |
421 | 421 | ||
422 | if (string.IsNullOrEmpty(aCircuit.IPAddress)) | ||
423 | { | ||
424 | m_log.DebugFormat("[GATEKEEPER SERVICE]: Agent did not provide a client IP address."); | ||
425 | return false; | ||
426 | } | ||
427 | |||
422 | string userURL = string.Empty; | 428 | string userURL = string.Empty; |
423 | if (aCircuit.ServiceURLs.ContainsKey("HomeURI")) | 429 | if (aCircuit.ServiceURLs.ContainsKey("HomeURI")) |
424 | userURL = aCircuit.ServiceURLs["HomeURI"].ToString(); | 430 | userURL = aCircuit.ServiceURLs["HomeURI"].ToString(); |