diff options
author | Justin Clark-Casey (justincc) | 2014-03-17 20:51:35 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2014-03-17 20:51:35 +0000 |
commit | f3e177814a30ee91a2fdd27f2a1aebf06a39cd15 (patch) | |
tree | c511df5ec9e48d961241341e30adce3e33eb7ad7 /OpenSim/Capabilities | |
parent | Implement osForceBreakAllLinks(). (diff) | |
download | opensim-SC_OLD-f3e177814a30ee91a2fdd27f2a1aebf06a39cd15.zip opensim-SC_OLD-f3e177814a30ee91a2fdd27f2a1aebf06a39cd15.tar.gz opensim-SC_OLD-f3e177814a30ee91a2fdd27f2a1aebf06a39cd15.tar.bz2 opensim-SC_OLD-f3e177814a30ee91a2fdd27f2a1aebf06a39cd15.tar.xz |
Add regression test for http inventory fetch.
Involved some restructuring to allow regression tests to dequeue inventory requests and perform poll responses synchronously rather than async
Diffstat (limited to 'OpenSim/Capabilities')
-rw-r--r-- | OpenSim/Capabilities/Caps.cs | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/OpenSim/Capabilities/Caps.cs b/OpenSim/Capabilities/Caps.cs index bbf3b27..049afab 100644 --- a/OpenSim/Capabilities/Caps.cs +++ b/OpenSim/Capabilities/Caps.cs | |||
@@ -50,8 +50,7 @@ namespace OpenSim.Framework.Capabilities | |||
50 | 50 | ||
51 | public class Caps | 51 | public class Caps |
52 | { | 52 | { |
53 | // private static readonly ILog m_log = | 53 | // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
54 | // LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | ||
55 | 54 | ||
56 | private string m_httpListenerHostName; | 55 | private string m_httpListenerHostName; |
57 | private uint m_httpListenPort; | 56 | private uint m_httpListenPort; |
@@ -152,6 +151,10 @@ namespace OpenSim.Framework.Capabilities | |||
152 | 151 | ||
153 | public void RegisterPollHandler(string capName, PollServiceEventArgs pollServiceHandler) | 152 | public void RegisterPollHandler(string capName, PollServiceEventArgs pollServiceHandler) |
154 | { | 153 | { |
154 | // m_log.DebugFormat( | ||
155 | // "[CAPS]: Registering handler with name {0}, url {1} for {2}", | ||
156 | // capName, pollServiceHandler.Url, m_agentID, m_regionName); | ||
157 | |||
155 | m_pollServiceHandlers.Add(capName, pollServiceHandler); | 158 | m_pollServiceHandlers.Add(capName, pollServiceHandler); |
156 | 159 | ||
157 | m_httpListener.AddPollServiceHTTPHandler(pollServiceHandler.Url, pollServiceHandler); | 160 | m_httpListener.AddPollServiceHTTPHandler(pollServiceHandler.Url, pollServiceHandler); |