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/Framework/EventQueueHelper.cs | |
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/EventQueueHelper.cs | 22 |
1 files changed, 16 insertions, 6 deletions
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()); |