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/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs | |
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/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs b/OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs index 13cc99a..817ef85 100644 --- a/OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs +++ b/OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs | |||
@@ -137,6 +137,10 @@ namespace OpenSim.Region.CoreModules.Framework | |||
137 | // agentId, m_scene.RegionInfo.RegionName, oldCaps.CapsObjectPath, capsObjectPath); | 137 | // agentId, m_scene.RegionInfo.RegionName, oldCaps.CapsObjectPath, capsObjectPath); |
138 | } | 138 | } |
139 | 139 | ||
140 | // m_log.DebugFormat( | ||
141 | // "[CAPS]: Adding capabilities for agent {0} in {1} with path {2}", | ||
142 | // agentId, m_scene.RegionInfo.RegionName, capsObjectPath); | ||
143 | |||
140 | caps = new Caps(MainServer.Instance, m_scene.RegionInfo.ExternalHostName, | 144 | caps = new Caps(MainServer.Instance, m_scene.RegionInfo.ExternalHostName, |
141 | (MainServer.Instance == null) ? 0: MainServer.Instance.Port, | 145 | (MainServer.Instance == null) ? 0: MainServer.Instance.Port, |
142 | capsObjectPath, agentId, m_scene.RegionInfo.RegionName); | 146 | capsObjectPath, agentId, m_scene.RegionInfo.RegionName); |