diff options
author | teravus | 2012-11-15 10:05:16 -0500 |
---|---|---|
committer | teravus | 2012-11-15 10:05:16 -0500 |
commit | e9153e1d1aae50024d8cd05fe14a9bce34343a0e (patch) | |
tree | bc111d34f95a26b99c7e34d9e495dc14d1802cc3 /OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs | |
parent | Merge master into teravuswork (diff) | |
download | opensim-SC-e9153e1d1aae50024d8cd05fe14a9bce34343a0e.zip opensim-SC-e9153e1d1aae50024d8cd05fe14a9bce34343a0e.tar.gz opensim-SC-e9153e1d1aae50024d8cd05fe14a9bce34343a0e.tar.bz2 opensim-SC-e9153e1d1aae50024d8cd05fe14a9bce34343a0e.tar.xz |
Revert "Merge master into teravuswork", it should have been avination, not master.
This reverts commit dfac269032300872c4d0dc507f4f9062d102b0f4, reversing
changes made to 619c39e5144f15aca129d6d999bcc5c34133ee64.
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs')
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs index f6146a9..650cd50 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs | |||
@@ -241,8 +241,8 @@ namespace OpenSim.Region.ClientStack.Linden | |||
241 | m_HostCapsObj.RegisterHandler( | 241 | m_HostCapsObj.RegisterHandler( |
242 | "SEED", new RestStreamHandler("POST", capsBase + m_requestPath, SeedCapRequest, "SEED", null)); | 242 | "SEED", new RestStreamHandler("POST", capsBase + m_requestPath, SeedCapRequest, "SEED", null)); |
243 | 243 | ||
244 | // m_log.DebugFormat( | 244 | m_log.DebugFormat( |
245 | // "[CAPS]: Registered seed capability {0} for {1}", capsBase + m_requestPath, m_HostCapsObj.AgentID); | 245 | "[CAPS]: Registered seed capability {0} for {1}", capsBase + m_requestPath, m_HostCapsObj.AgentID); |
246 | 246 | ||
247 | //m_capsHandlers["MapLayer"] = | 247 | //m_capsHandlers["MapLayer"] = |
248 | // new LLSDStreamhandler<OSDMapRequest, OSDMapLayerResponse>("POST", | 248 | // new LLSDStreamhandler<OSDMapRequest, OSDMapLayerResponse>("POST", |
@@ -337,12 +337,11 @@ namespace OpenSim.Region.ClientStack.Linden | |||
337 | public string SeedCapRequest(string request, string path, string param, | 337 | public string SeedCapRequest(string request, string path, string param, |
338 | IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) | 338 | IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) |
339 | { | 339 | { |
340 | m_log.DebugFormat( | 340 | // m_log.Debug("[CAPS]: Seed Caps Request in region: " + m_regionName); |
341 | "[CAPS]: Received SEED caps request in {0} for agent {1}", m_regionName, m_HostCapsObj.AgentID); | ||
342 | 341 | ||
343 | if (!m_Scene.CheckClient(m_HostCapsObj.AgentID, httpRequest.RemoteIPEndPoint)) | 342 | if (!m_Scene.CheckClient(m_HostCapsObj.AgentID, httpRequest.RemoteIPEndPoint)) |
344 | { | 343 | { |
345 | m_log.WarnFormat( | 344 | m_log.DebugFormat( |
346 | "[CAPS]: Unauthorized CAPS client {0} from {1}", | 345 | "[CAPS]: Unauthorized CAPS client {0} from {1}", |
347 | m_HostCapsObj.AgentID, httpRequest.RemoteIPEndPoint); | 346 | m_HostCapsObj.AgentID, httpRequest.RemoteIPEndPoint); |
348 | 347 | ||