diff options
author | BlueWall | 2012-10-20 05:25:58 -0400 |
---|---|---|
committer | BlueWall | 2012-10-20 05:25:58 -0400 |
commit | 07f1d44174f5e2b4e3d5ffdec3619bb84f357af2 (patch) | |
tree | 83cc0442b2c1b89a5b3dd94cff23d5098415777e /OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps | |
parent | Merge branch 'master' into connector_plugin (diff) | |
parent | Fix: invinite loading for Viewer3 : parcelinfo request of traffic-value (impl... (diff) | |
download | opensim-SC-07f1d44174f5e2b4e3d5ffdec3619bb84f357af2.zip opensim-SC-07f1d44174f5e2b4e3d5ffdec3619bb84f357af2.tar.gz opensim-SC-07f1d44174f5e2b4e3d5ffdec3619bb84f357af2.tar.bz2 opensim-SC-07f1d44174f5e2b4e3d5ffdec3619bb84f357af2.tar.xz |
Merge branch 'master' into connector_plugin
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps')
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs index 185f9ce..cc69645 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs | |||
@@ -163,8 +163,8 @@ namespace OpenSim.Region.ClientStack.Linden | |||
163 | m_HostCapsObj.RegisterHandler( | 163 | m_HostCapsObj.RegisterHandler( |
164 | "SEED", new RestStreamHandler("POST", capsBase + m_requestPath, SeedCapRequest, "SEED", null)); | 164 | "SEED", new RestStreamHandler("POST", capsBase + m_requestPath, SeedCapRequest, "SEED", null)); |
165 | 165 | ||
166 | m_log.DebugFormat( | 166 | // m_log.DebugFormat( |
167 | "[CAPS]: Registered seed capability {0} for {1}", capsBase + m_requestPath, m_HostCapsObj.AgentID); | 167 | // "[CAPS]: Registered seed capability {0} for {1}", capsBase + m_requestPath, m_HostCapsObj.AgentID); |
168 | 168 | ||
169 | //m_capsHandlers["MapLayer"] = | 169 | //m_capsHandlers["MapLayer"] = |
170 | // new LLSDStreamhandler<OSDMapRequest, OSDMapLayerResponse>("POST", | 170 | // new LLSDStreamhandler<OSDMapRequest, OSDMapLayerResponse>("POST", |
@@ -254,11 +254,12 @@ namespace OpenSim.Region.ClientStack.Linden | |||
254 | public string SeedCapRequest(string request, string path, string param, | 254 | public string SeedCapRequest(string request, string path, string param, |
255 | IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) | 255 | IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) |
256 | { | 256 | { |
257 | // m_log.Debug("[CAPS]: Seed Caps Request in region: " + m_regionName); | 257 | m_log.DebugFormat( |
258 | "[CAPS]: Received SEED caps request in {0} for agent {1}", m_regionName, m_HostCapsObj.AgentID); | ||
258 | 259 | ||
259 | if (!m_Scene.CheckClient(m_HostCapsObj.AgentID, httpRequest.RemoteIPEndPoint)) | 260 | if (!m_Scene.CheckClient(m_HostCapsObj.AgentID, httpRequest.RemoteIPEndPoint)) |
260 | { | 261 | { |
261 | m_log.DebugFormat( | 262 | m_log.WarnFormat( |
262 | "[CAPS]: Unauthorized CAPS client {0} from {1}", | 263 | "[CAPS]: Unauthorized CAPS client {0} from {1}", |
263 | m_HostCapsObj.AgentID, httpRequest.RemoteIPEndPoint); | 264 | m_HostCapsObj.AgentID, httpRequest.RemoteIPEndPoint); |
264 | 265 | ||