From ac9697edbebd8c4e59191823950dbda08207177b Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Mon, 2 May 2011 19:45:47 -0700
Subject: Fixed: EventQueueGet and other caps were being wrongly deregistered.
Also CapabilitiesModule was being instantiated twice (damn Mono.Addins).
---
OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs | 2 --
.../ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs | 6 +++---
OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml | 1 -
3 files changed, 3 insertions(+), 6 deletions(-)
(limited to 'OpenSim/Region')
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
///
public void RegisterHandlers()
{
- m_HostCapsObj.DeregisterHandlers();
-
string capsBase = "/CAPS/" + m_HostCapsObj.CapsObjectPath;
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
public void OnRegisterCaps(UUID agentID, Caps caps)
{
// Register an event queue for the client
-
+
//m_log.DebugFormat(
- // "[EVENTQUEUE]: OnRegisterCaps: agentID {0} caps {1} region {2}",
+ // "[EVENTQUEUE]: OnRegisterCaps: agentID {0} caps {1} region {2}",
// agentID, caps, m_scene.RegionInfo.RegionName);
// Let's instantiate a Queue for this agent right now
@@ -317,7 +317,7 @@ namespace OpenSim.Region.ClientStack.Linden
{
return ProcessQueue(m_dhttpMethod, agentID, caps);
}));
-
+
// This will persist this beyond the expiry of the caps handlers
MainServer.Instance.AddPollServiceHTTPHandler(
capsBase + EventQueueGetUUID.ToString() + "/", EventQueuePoll, new PollServiceEventArgs(null, HasEvents, GetEvents, NoEvents, agentID));
diff --git a/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml b/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml
index a0009a8..8a6735f 100644
--- a/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml
+++ b/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml
@@ -17,7 +17,6 @@
-
--
cgit v1.1