diff options
author | Charles Krinke | 2008-12-14 02:17:12 +0000 |
---|---|---|
committer | Charles Krinke | 2008-12-14 02:17:12 +0000 |
commit | e6eb571c1d19972fe7eb4c3f7de113b1b91f5e02 (patch) | |
tree | 2140979c8cf3f4d4d2b60a355be65abd659508b9 /OpenSim/Region/Environment/Modules | |
parent | Mantis#2811. Thank you kindly, Diva for a patch that resolves (diff) | |
download | opensim-SC_OLD-e6eb571c1d19972fe7eb4c3f7de113b1b91f5e02.zip opensim-SC_OLD-e6eb571c1d19972fe7eb4c3f7de113b1b91f5e02.tar.gz opensim-SC_OLD-e6eb571c1d19972fe7eb4c3f7de113b1b91f5e02.tar.bz2 opensim-SC_OLD-e6eb571c1d19972fe7eb4c3f7de113b1b91f5e02.tar.xz |
Mantis#2725. Thank you kindly, Diva, for a patch that:
Adds missing protocol pieces for EstablishAgentCommunication
event which allows the client to activate CAPS and the EQ for
child agents.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Modules/Framework/EventQueueGetModule.cs | 9 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Modules/Framework/EventQueueHelper.cs | 22 |
2 files changed, 22 insertions, 9 deletions
diff --git a/OpenSim/Region/Environment/Modules/Framework/EventQueueGetModule.cs b/OpenSim/Region/Environment/Modules/Framework/EventQueueGetModule.cs index 6d3391a..f1f70ff 100644 --- a/OpenSim/Region/Environment/Modules/Framework/EventQueueGetModule.cs +++ b/OpenSim/Region/Environment/Modules/Framework/EventQueueGetModule.cs | |||
@@ -202,6 +202,7 @@ namespace OpenSim.Region.Environment.Modules.Framework | |||
202 | { | 202 | { |
203 | m_AvatarQueueUUIDMapping.Remove(ky); | 203 | m_AvatarQueueUUIDMapping.Remove(ky); |
204 | m_scene.RemoveHTTPHandler("","/CAPS/EQG/" + ky.ToString() + "/"); | 204 | m_scene.RemoveHTTPHandler("","/CAPS/EQG/" + ky.ToString() + "/"); |
205 | m_log.Debug("[EVENTQUEUE]: Removing " + "/CAPS/EQG/" + ky.ToString() + "/"); | ||
205 | } | 206 | } |
206 | 207 | ||
207 | } | 208 | } |
@@ -225,6 +226,7 @@ namespace OpenSim.Region.Environment.Modules.Framework | |||
225 | m_QueueUUIDAvatarMapping.Remove(ky); | 226 | m_QueueUUIDAvatarMapping.Remove(ky); |
226 | 227 | ||
227 | } | 228 | } |
229 | |||
228 | m_log.DebugFormat("[EVENTQUEUE]: Client {0} deregistered in region {1}.", AgentID, m_scene.RegionInfo.RegionName); | 230 | m_log.DebugFormat("[EVENTQUEUE]: Client {0} deregistered in region {1}.", AgentID, m_scene.RegionInfo.RegionName); |
229 | } | 231 | } |
230 | 232 | ||
@@ -326,13 +328,14 @@ namespace OpenSim.Region.Environment.Modules.Framework | |||
326 | 328 | ||
327 | if (element == null) | 329 | if (element == null) |
328 | { | 330 | { |
329 | // m_log.ErrorFormat("[EVENTQUEUE]: Failed to process queue"); | 331 | //m_log.ErrorFormat("[EVENTQUEUE]: Nothing to process in " + m_scene.RegionInfo.RegionName); |
330 | if (thisID == -1) // close-request | 332 | if (thisID == -1) // close-request |
331 | { | 333 | { |
332 | responsedata["int_response_code"] = 404; | 334 | m_log.ErrorFormat("[EVENTQUEUE]: 404 in " + m_scene.RegionInfo.RegionName); |
335 | responsedata["int_response_code"] = 404; //501; //410; //404; | ||
333 | responsedata["content_type"] = "text/plain"; | 336 | responsedata["content_type"] = "text/plain"; |
334 | responsedata["keepalive"] = false; | 337 | responsedata["keepalive"] = false; |
335 | responsedata["str_response_string"] = ""; | 338 | responsedata["str_response_string"] = "Closed EQG"; |
336 | return responsedata; | 339 | return responsedata; |
337 | } | 340 | } |
338 | responsedata["int_response_code"] = 502; | 341 | responsedata["int_response_code"] = 502; |
diff --git a/OpenSim/Region/Environment/Modules/Framework/EventQueueHelper.cs b/OpenSim/Region/Environment/Modules/Framework/EventQueueHelper.cs index 4833f27..0ffa8aa 100644 --- a/OpenSim/Region/Environment/Modules/Framework/EventQueueHelper.cs +++ b/OpenSim/Region/Environment/Modules/Framework/EventQueueHelper.cs | |||
@@ -80,15 +80,15 @@ namespace OpenSim.Region.Environment | |||
80 | 80 | ||
81 | public static OSD DisableSimulator(ulong Handle) | 81 | public static OSD DisableSimulator(ulong Handle) |
82 | { | 82 | { |
83 | OSDMap llsdSimInfo = new OSDMap(1); | 83 | //OSDMap llsdSimInfo = new OSDMap(1); |
84 | 84 | ||
85 | llsdSimInfo.Add("Handle", new OSDBinary(regionHandleToByteArray(Handle))); | 85 | //llsdSimInfo.Add("Handle", new OSDBinary(regionHandleToByteArray(Handle))); |
86 | 86 | ||
87 | OSDArray arr = new OSDArray(1); | 87 | //OSDArray arr = new OSDArray(1); |
88 | arr.Add(llsdSimInfo); | 88 | //arr.Add(llsdSimInfo); |
89 | 89 | ||
90 | OSDMap llsdBody = new OSDMap(1); | 90 | OSDMap llsdBody = new OSDMap(0); |
91 | llsdBody.Add("SimulatorInfo", arr); | 91 | //llsdBody.Add("SimulatorInfo", arr); |
92 | 92 | ||
93 | return buildEvent("DisableSimulator", llsdBody); | 93 | return buildEvent("DisableSimulator", llsdBody); |
94 | } | 94 | } |
@@ -178,6 +178,16 @@ namespace OpenSim.Region.Environment | |||
178 | return buildEvent("ScriptRunningReply", body); | 178 | return buildEvent("ScriptRunningReply", body); |
179 | } | 179 | } |
180 | 180 | ||
181 | public static OSD EstablishAgentCommunication(UUID agentID, string simIpAndPort, string seedcap) | ||
182 | { | ||
183 | OSDMap body = new OSDMap(3); | ||
184 | body.Add("agent-id", new OSDUUID(agentID)); | ||
185 | body.Add("sim-ip-and-port", new OSDString(simIpAndPort)); | ||
186 | body.Add("seed-capability", new OSDString(seedcap)); | ||
187 | |||
188 | return buildEvent("EstablishAgentCommunication", body); | ||
189 | } | ||
190 | |||
181 | public static OSD KeepAliveEvent() | 191 | public static OSD KeepAliveEvent() |
182 | { | 192 | { |
183 | return buildEvent("FAKEEVENT", new OSDMap()); | 193 | return buildEvent("FAKEEVENT", new OSDMap()); |