aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
diff options
context:
space:
mode:
authorUbitUmarov2018-11-14 16:23:14 +0000
committerUbitUmarov2018-11-14 16:23:14 +0000
commitb48cbcbfdda1bf348a77554958bebea33560dbe6 (patch)
tree37aa567ef790dd0af446095e370c76f7d741b513 /OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
parentreplace Enviroment response encoding ( runprebuild needed) (diff)
downloadopensim-SC-b48cbcbfdda1bf348a77554958bebea33560dbe6.zip
opensim-SC-b48cbcbfdda1bf348a77554958bebea33560dbe6.tar.gz
opensim-SC-b48cbcbfdda1bf348a77554958bebea33560dbe6.tar.bz2
opensim-SC-b48cbcbfdda1bf348a77554958bebea33560dbe6.tar.xz
simplify a bit some caps paths
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs')
-rw-r--r--OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs7
1 files changed, 4 insertions, 3 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
index a02ef9d..dd410a7 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
@@ -350,17 +350,18 @@ namespace OpenSim.Region.ClientStack.Linden
350 public string SeedCapRequest(string request, string path, string param, 350 public string SeedCapRequest(string request, string path, string param,
351 IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) 351 IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
352 { 352 {
353 UUID agentID = m_HostCapsObj.AgentID;
353 m_log.DebugFormat( 354 m_log.DebugFormat(
354 "[CAPS]: Received SEED caps request in {0} for agent {1}", m_regionName, m_HostCapsObj.AgentID); 355 "[CAPS]: Received SEED caps request in {0} for agent {1}", m_regionName, agentID);
355 356
356 if (!m_HostCapsObj.WaitForActivation()) 357 if (!m_HostCapsObj.WaitForActivation())
357 return string.Empty; 358 return string.Empty;
358 359
359 if (!m_Scene.CheckClient(m_HostCapsObj.AgentID, httpRequest.RemoteIPEndPoint)) 360 if (!m_Scene.CheckClient(agentID, httpRequest.RemoteIPEndPoint))
360 { 361 {
361 m_log.WarnFormat( 362 m_log.WarnFormat(
362 "[CAPS]: Unauthorized CAPS client {0} from {1}", 363 "[CAPS]: Unauthorized CAPS client {0} from {1}",
363 m_HostCapsObj.AgentID, httpRequest.RemoteIPEndPoint); 364 agentID, httpRequest.RemoteIPEndPoint);
364 365
365 return string.Empty; 366 return string.Empty;
366 } 367 }