From f49912f92abfae79ba00da74fc7665548266f7cd Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 26 Apr 2012 16:10:24 +0100
Subject: minor: Add more detail to unauthorized caps client message

---
 OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Region/ClientStack/Linden/Caps')

diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
index 8ec2f20..e20c24f 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
@@ -235,7 +235,10 @@ namespace OpenSim.Region.ClientStack.Linden
 
             if (!m_Scene.CheckClient(m_HostCapsObj.AgentID, httpRequest.RemoteIPEndPoint))
             {
-                m_log.DebugFormat("[CAPS]: Unauthorized CAPS client");
+                m_log.DebugFormat(
+                    "[CAPS]: Unauthorized CAPS client {0} from {1}",
+                    m_HostCapsObj.AgentID, httpRequest.RemoteIPEndPoint);
+
                 return string.Empty;
             }
 
-- 
cgit v1.1


From 07e62df5582e28675275b3f5143ec37e5697d283 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 27 Apr 2012 00:58:54 +0100
Subject: Add regression test for teleporting an agent between separated
 regions on the same simulator.

This involves a large amount of change in test scene setup code to allow test scenes to share shared modules
SetupScene is now an instance method that requires an instantiation of SceneHelpers, though other SceneHelpers methods are still static
May split these out into separate classes in the future.
---
 .../Region/ClientStack/Linden/Caps/EventQueue/Tests/EventQueueTests.cs  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenSim/Region/ClientStack/Linden/Caps')

diff --git a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/Tests/EventQueueTests.cs b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/Tests/EventQueueTests.cs
index a5209b7..c25b58c 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/Tests/EventQueueTests.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/Tests/EventQueueTests.cs
@@ -60,7 +60,7 @@ namespace OpenSim.Region.ClientStack.Linden.Tests
             CapabilitiesModule capsModule = new CapabilitiesModule();
             EventQueueGetModule eqgModule = new EventQueueGetModule();
 
-            m_scene = SceneHelpers.SetupScene();
+            m_scene = new SceneHelpers().SetupScene();
             SceneHelpers.SetupSceneModules(m_scene, config, capsModule, eqgModule);
         }
 
-- 
cgit v1.1