diff options
Diffstat (limited to '')
3 files changed, 11 insertions, 4 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs index a46c24a..5c6bc1c 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs | |||
@@ -207,9 +207,15 @@ namespace OpenSim.Region.ClientStack.Linden | |||
207 | m_HostCapsObj.RegisterHandler("UpdateNotecardAgentInventory", req); | 207 | m_HostCapsObj.RegisterHandler("UpdateNotecardAgentInventory", req); |
208 | m_HostCapsObj.RegisterHandler("UpdateScriptAgentInventory", req); | 208 | m_HostCapsObj.RegisterHandler("UpdateScriptAgentInventory", req); |
209 | m_HostCapsObj.RegisterHandler("UpdateScriptAgent", req); | 209 | m_HostCapsObj.RegisterHandler("UpdateScriptAgent", req); |
210 | IRequestHandler getObjectPhysicsDataHandler = new RestStreamHandler("POST", capsBase + m_getObjectPhysicsDataPath, GetObjectPhysicsData); | 210 | |
211 | IRequestHandler getObjectPhysicsDataHandler | ||
212 | = new RestStreamHandler( | ||
213 | "POST", capsBase + m_getObjectPhysicsDataPath, GetObjectPhysicsData, "GetObjectPhysicsData", null); | ||
211 | m_HostCapsObj.RegisterHandler("GetObjectPhysicsData", getObjectPhysicsDataHandler); | 214 | m_HostCapsObj.RegisterHandler("GetObjectPhysicsData", getObjectPhysicsDataHandler); |
212 | IRequestHandler UpdateAgentInformationHandler = new RestStreamHandler("POST", capsBase + m_UpdateAgentInformationPath, UpdateAgentInformation); | 215 | |
216 | IRequestHandler UpdateAgentInformationHandler | ||
217 | = new RestStreamHandler( | ||
218 | "POST", capsBase + m_UpdateAgentInformationPath, UpdateAgentInformation, "UpdateAgentInformation", null); | ||
213 | m_HostCapsObj.RegisterHandler("UpdateAgentInformation", UpdateAgentInformationHandler); | 219 | m_HostCapsObj.RegisterHandler("UpdateAgentInformation", UpdateAgentInformationHandler); |
214 | 220 | ||
215 | m_HostCapsObj.RegisterHandler( | 221 | m_HostCapsObj.RegisterHandler( |
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs index e73a04a..50bfda1 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs | |||
@@ -366,7 +366,8 @@ namespace OpenSim.Region.ClientStack.Linden | |||
366 | // EventQueueGet when it receive capability information, but then we replace the rest handler immediately | 366 | // EventQueueGet when it receive capability information, but then we replace the rest handler immediately |
367 | // afterwards with the poll service. So for now, we'll pass a null instead to simplify code reading, but | 367 | // afterwards with the poll service. So for now, we'll pass a null instead to simplify code reading, but |
368 | // really it should be possible to directly register the poll handler as a capability. | 368 | // really it should be possible to directly register the poll handler as a capability. |
369 | caps.RegisterHandler("EventQueueGet", new RestHTTPHandler("POST", eventQueueGetPath, null)); | 369 | caps.RegisterHandler( |
370 | "EventQueueGet", new RestHTTPHandler("POST", eventQueueGetPath, null, "EventQueueGet", null)); | ||
370 | // delegate(Hashtable m_dhttpMethod) | 371 | // delegate(Hashtable m_dhttpMethod) |
371 | // { | 372 | // { |
372 | // return ProcessQueue(m_dhttpMethod, agentID, caps); | 373 | // return ProcessQueue(m_dhttpMethod, agentID, caps); |
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/RegionConsoleModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/RegionConsoleModule.cs index 69dd76f..a133a69 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/RegionConsoleModule.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/RegionConsoleModule.cs | |||
@@ -176,7 +176,7 @@ namespace OpenSim.Region.ClientStack.Linden | |||
176 | m_isGod = m_scene.Permissions.IsGod(agentID); | 176 | m_isGod = m_scene.Permissions.IsGod(agentID); |
177 | } | 177 | } |
178 | 178 | ||
179 | public override byte[] Handle(string path, Stream request, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) | 179 | protected override byte[] ProcessRequest(string path, Stream request, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) |
180 | { | 180 | { |
181 | StreamReader reader = new StreamReader(request); | 181 | StreamReader reader = new StreamReader(request); |
182 | string message = reader.ReadToEnd(); | 182 | string message = reader.ReadToEnd(); |