diff options
author | Charles Krinke | 2008-06-28 16:08:12 +0000 |
---|---|---|
committer | Charles Krinke | 2008-06-28 16:08:12 +0000 |
commit | 9a0ef22ed979433f4d017a252173f38fe5e56892 (patch) | |
tree | 98bd25e3a49a38922b37728df4de9e0fa5b7366a /OpenSim/Region/ClientStack | |
parent | plumbing for multiple inventory servers. Mostly done on the region server side. (diff) | |
download | opensim-SC-9a0ef22ed979433f4d017a252173f38fe5e56892.zip opensim-SC-9a0ef22ed979433f4d017a252173f38fe5e56892.tar.gz opensim-SC-9a0ef22ed979433f4d017a252173f38fe5e56892.tar.bz2 opensim-SC-9a0ef22ed979433f4d017a252173f38fe5e56892.tar.xz |
Mantis#1616. Applied Melanie's patch. This may or may
not break trunk.
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 29 |
1 files changed, 28 insertions, 1 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index 0294ca7..cd3efe3 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
@@ -277,6 +277,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
277 | 277 | ||
278 | private RequestObjectPropertiesFamily handlerObjectGroupRequest = null; | 278 | private RequestObjectPropertiesFamily handlerObjectGroupRequest = null; |
279 | private ScriptReset handlerScriptReset = null; | 279 | private ScriptReset handlerScriptReset = null; |
280 | private GetScriptRunning handlerGetScriptRunning = null; | ||
281 | private SetScriptRunning handlerSetScriptRunning = null; | ||
280 | private UpdateVector handlerAutoPilotGo = null; | 282 | private UpdateVector handlerAutoPilotGo = null; |
281 | 283 | ||
282 | /* Properties */ | 284 | /* Properties */ |
@@ -921,6 +923,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
921 | public event EstateDebugRegionRequest OnEstateDebugRegionRequest; | 923 | public event EstateDebugRegionRequest OnEstateDebugRegionRequest; |
922 | public event EstateTeleportOneUserHomeRequest OnEstateTeleportOneUserHomeRequest; | 924 | public event EstateTeleportOneUserHomeRequest OnEstateTeleportOneUserHomeRequest; |
923 | public event ScriptReset OnScriptReset; | 925 | public event ScriptReset OnScriptReset; |
926 | public event GetScriptRunning OnGetScriptRunning; | ||
927 | public event SetScriptRunning OnSetScriptRunning; | ||
924 | public event UpdateVector OnAutoPilotGo; | 928 | public event UpdateVector OnAutoPilotGo; |
925 | 929 | ||
926 | #region Scene/Avatar to Client | 930 | #region Scene/Avatar to Client |
@@ -6187,7 +6191,20 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
6187 | m_log.Warn("[CLIENT]: unhandled InventoryDescent packet"); | 6191 | m_log.Warn("[CLIENT]: unhandled InventoryDescent packet"); |
6188 | break; | 6192 | break; |
6189 | case PacketType.GetScriptRunning: | 6193 | case PacketType.GetScriptRunning: |
6190 | m_log.Warn("[CLIENT]: unhandled GetScriptRunning packet"); | 6194 | GetScriptRunningPacket scriptRunning = (GetScriptRunningPacket)Pack; |
6195 | handlerGetScriptRunning = OnGetScriptRunning; | ||
6196 | if (handlerGetScriptRunning != null) | ||
6197 | { | ||
6198 | handlerGetScriptRunning(this, scriptRunning.Script.ObjectID, scriptRunning.Script.ItemID); | ||
6199 | } | ||
6200 | break; | ||
6201 | case PacketType.SetScriptRunning: | ||
6202 | SetScriptRunningPacket setScriptRunning = (SetScriptRunningPacket)Pack; | ||
6203 | handlerSetScriptRunning = OnSetScriptRunning; | ||
6204 | if (handlerSetScriptRunning != null) | ||
6205 | { | ||
6206 | handlerSetScriptRunning(this, setScriptRunning.Script.ObjectID, setScriptRunning.Script.ItemID, setScriptRunning.Script.Running); | ||
6207 | } | ||
6191 | break; | 6208 | break; |
6192 | default: | 6209 | default: |
6193 | m_log.Warn("[CLIENT]: unhandled packet " + Pack.ToString()); | 6210 | m_log.Warn("[CLIENT]: unhandled packet " + Pack.ToString()); |
@@ -6390,6 +6407,16 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
6390 | OutPacket(lsrp, ThrottleOutPacketType.Task); | 6407 | OutPacket(lsrp, ThrottleOutPacketType.Task); |
6391 | } | 6408 | } |
6392 | 6409 | ||
6410 | public void SendScriptRunningReply(LLUUID objectID, LLUUID itemID, bool running) | ||
6411 | { | ||
6412 | ScriptRunningReplyPacket scriptRunningReply = new ScriptRunningReplyPacket(); | ||
6413 | scriptRunningReply.Script.ObjectID = objectID; | ||
6414 | scriptRunningReply.Script.ItemID = itemID; | ||
6415 | scriptRunningReply.Script.Running = running; | ||
6416 | |||
6417 | OutPacket(scriptRunningReply, ThrottleOutPacketType.Task); | ||
6418 | } | ||
6419 | |||
6393 | public void SendAsset(AssetRequestToClient req) | 6420 | public void SendAsset(AssetRequestToClient req) |
6394 | { | 6421 | { |
6395 | 6422 | ||