diff options
author | Diva Canto | 2011-05-02 19:45:47 -0700 |
---|---|---|
committer | Diva Canto | 2011-05-02 19:45:47 -0700 |
commit | ac9697edbebd8c4e59191823950dbda08207177b (patch) | |
tree | 54ca9a8f38ae5db3a864d308a16da592bfe5efdb /OpenSim/Region/ClientStack | |
parent | Fix the GetTexture path to /CAPS/GetTexture for now until we have real capabi... (diff) | |
download | opensim-SC_OLD-ac9697edbebd8c4e59191823950dbda08207177b.zip opensim-SC_OLD-ac9697edbebd8c4e59191823950dbda08207177b.tar.gz opensim-SC_OLD-ac9697edbebd8c4e59191823950dbda08207177b.tar.bz2 opensim-SC_OLD-ac9697edbebd8c4e59191823950dbda08207177b.tar.xz |
Fixed: EventQueueGet and other caps were being wrongly deregistered. Also CapabilitiesModule was being instantiated twice (damn Mono.Addins).
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs index 2f1b9aa..95713e9 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs | |||
@@ -112,8 +112,6 @@ namespace OpenSim.Region.ClientStack.Linden | |||
112 | /// </summary> | 112 | /// </summary> |
113 | public void RegisterHandlers() | 113 | public void RegisterHandlers() |
114 | { | 114 | { |
115 | m_HostCapsObj.DeregisterHandlers(); | ||
116 | |||
117 | string capsBase = "/CAPS/" + m_HostCapsObj.CapsObjectPath; | 115 | string capsBase = "/CAPS/" + m_HostCapsObj.CapsObjectPath; |
118 | 116 | ||
119 | RegisterRegionServiceHandlers(capsBase); | 117 | RegisterRegionServiceHandlers(capsBase); |
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs index 4a8bb53..139d8b8 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs | |||
@@ -272,9 +272,9 @@ namespace OpenSim.Region.ClientStack.Linden | |||
272 | public void OnRegisterCaps(UUID agentID, Caps caps) | 272 | public void OnRegisterCaps(UUID agentID, Caps caps) |
273 | { | 273 | { |
274 | // Register an event queue for the client | 274 | // Register an event queue for the client |
275 | 275 | ||
276 | //m_log.DebugFormat( | 276 | //m_log.DebugFormat( |
277 | // "[EVENTQUEUE]: OnRegisterCaps: agentID {0} caps {1} region {2}", | 277 | // "[EVENTQUEUE]: OnRegisterCaps: agentID {0} caps {1} region {2}", |
278 | // agentID, caps, m_scene.RegionInfo.RegionName); | 278 | // agentID, caps, m_scene.RegionInfo.RegionName); |
279 | 279 | ||
280 | // Let's instantiate a Queue for this agent right now | 280 | // Let's instantiate a Queue for this agent right now |
@@ -317,7 +317,7 @@ namespace OpenSim.Region.ClientStack.Linden | |||
317 | { | 317 | { |
318 | return ProcessQueue(m_dhttpMethod, agentID, caps); | 318 | return ProcessQueue(m_dhttpMethod, agentID, caps); |
319 | })); | 319 | })); |
320 | 320 | ||
321 | // This will persist this beyond the expiry of the caps handlers | 321 | // This will persist this beyond the expiry of the caps handlers |
322 | MainServer.Instance.AddPollServiceHTTPHandler( | 322 | MainServer.Instance.AddPollServiceHTTPHandler( |
323 | capsBase + EventQueueGetUUID.ToString() + "/", EventQueuePoll, new PollServiceEventArgs(null, HasEvents, GetEvents, NoEvents, agentID)); | 323 | capsBase + EventQueueGetUUID.ToString() + "/", EventQueuePoll, new PollServiceEventArgs(null, HasEvents, GetEvents, NoEvents, agentID)); |