diff options
author | Teravus Ovares | 2008-09-06 07:52:41 +0000 |
---|---|---|
committer | Teravus Ovares | 2008-09-06 07:52:41 +0000 |
commit | 7d89e122930be39e84a6d174548fa2d12ac0484a (patch) | |
tree | e5aa5752f988a9aba2a969f49e5e208985eda80c /OpenSim/Region/ScriptEngine/XEngine/EventManager.cs | |
parent | * minor: speculatively try a change to bamboo.build to see if this generates ... (diff) | |
download | opensim-SC-7d89e122930be39e84a6d174548fa2d12ac0484a.zip opensim-SC-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.gz opensim-SC-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.bz2 opensim-SC-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.xz |
* This is the fabled LibOMV update with all of the libOMV types from JHurliman
* This is a HUGE OMG update and will definitely have unknown side effects.. so this is really only for the strong hearted at this point. Regular people should let the dust settle.
* This has been tested to work with most basic functions. However.. make sure you back up 'everything' before using this. It's that big!
* Essentially we're back at square 1 in the testing phase.. so lets identify things that broke.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ScriptEngine/XEngine/EventManager.cs | 35 |
1 files changed, 17 insertions, 18 deletions
diff --git a/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs b/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs index d431286..22abd79 100644 --- a/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs +++ b/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs | |||
@@ -28,7 +28,7 @@ | |||
28 | using System; | 28 | using System; |
29 | using System.Collections; | 29 | using System.Collections; |
30 | using System.Collections.Generic; | 30 | using System.Collections.Generic; |
31 | using libsecondlife; | 31 | using OpenMetaverse; |
32 | using OpenSim.Framework; | 32 | using OpenSim.Framework; |
33 | using OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney; | 33 | using OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney; |
34 | using OpenSim.Region.Interfaces; | 34 | using OpenSim.Region.Interfaces; |
@@ -36,7 +36,6 @@ using OpenSim.Region.Environment.Scenes; | |||
36 | using OpenSim.Region.Environment.Interfaces; | 36 | using OpenSim.Region.Environment.Interfaces; |
37 | using OpenSim.Region.ScriptEngine.Shared; | 37 | using OpenSim.Region.ScriptEngine.Shared; |
38 | using OpenSim.Region.ScriptEngine.Interfaces; | 38 | using OpenSim.Region.ScriptEngine.Interfaces; |
39 | using Axiom.Math; | ||
40 | 39 | ||
41 | namespace OpenSim.Region.ScriptEngine.XEngine | 40 | namespace OpenSim.Region.ScriptEngine.XEngine |
42 | { | 41 | { |
@@ -68,7 +67,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
68 | } | 67 | } |
69 | } | 68 | } |
70 | 69 | ||
71 | private void HandleObjectPaid(LLUUID objectID, LLUUID agentID, | 70 | private void HandleObjectPaid(UUID objectID, UUID agentID, |
72 | int amount) | 71 | int amount) |
73 | { | 72 | { |
74 | SceneObjectPart part = | 73 | SceneObjectPart part = |
@@ -80,7 +79,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
80 | } | 79 | } |
81 | } | 80 | } |
82 | 81 | ||
83 | public void touch_start(uint localID, uint originalID, LLVector3 offsetPos, | 82 | public void touch_start(uint localID, uint originalID, Vector3 offsetPos, |
84 | IClientAPI remoteClient) | 83 | IClientAPI remoteClient) |
85 | { | 84 | { |
86 | // Add to queue for all scripts in ObjectID object | 85 | // Add to queue for all scripts in ObjectID object |
@@ -108,7 +107,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
108 | det)); | 107 | det)); |
109 | } | 108 | } |
110 | 109 | ||
111 | public void touch(uint localID, uint originalID, LLVector3 offsetPos, | 110 | public void touch(uint localID, uint originalID, Vector3 offsetPos, |
112 | IClientAPI remoteClient) | 111 | IClientAPI remoteClient) |
113 | { | 112 | { |
114 | // Add to queue for all scripts in ObjectID object | 113 | // Add to queue for all scripts in ObjectID object |
@@ -177,7 +176,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
177 | // state_entry: not processed here | 176 | // state_entry: not processed here |
178 | // state_exit: not processed here | 177 | // state_exit: not processed here |
179 | 178 | ||
180 | public void money(uint localID, LLUUID agentID, int amount) | 179 | public void money(uint localID, UUID agentID, int amount) |
181 | { | 180 | { |
182 | myScriptEngine.PostObjectEvent(localID, new EventParams( | 181 | myScriptEngine.PostObjectEvent(localID, new EventParams( |
183 | "money", new object[] { | 182 | "money", new object[] { |
@@ -242,7 +241,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
242 | det.ToArray())); | 241 | det.ToArray())); |
243 | } | 242 | } |
244 | 243 | ||
245 | public void land_collision_start(uint localID, LLUUID itemID) | 244 | public void land_collision_start(uint localID, UUID itemID) |
246 | { | 245 | { |
247 | myScriptEngine.PostObjectEvent(localID, new EventParams( | 246 | myScriptEngine.PostObjectEvent(localID, new EventParams( |
248 | "land_collision_start", | 247 | "land_collision_start", |
@@ -250,7 +249,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
250 | new DetectParams[0])); | 249 | new DetectParams[0])); |
251 | } | 250 | } |
252 | 251 | ||
253 | public void land_collision(uint localID, LLUUID itemID) | 252 | public void land_collision(uint localID, UUID itemID) |
254 | { | 253 | { |
255 | myScriptEngine.PostObjectEvent(localID, new EventParams( | 254 | myScriptEngine.PostObjectEvent(localID, new EventParams( |
256 | "land_collision", | 255 | "land_collision", |
@@ -258,7 +257,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
258 | new DetectParams[0])); | 257 | new DetectParams[0])); |
259 | } | 258 | } |
260 | 259 | ||
261 | public void land_collision_end(uint localID, LLUUID itemID) | 260 | public void land_collision_end(uint localID, UUID itemID) |
262 | { | 261 | { |
263 | myScriptEngine.PostObjectEvent(localID, new EventParams( | 262 | myScriptEngine.PostObjectEvent(localID, new EventParams( |
264 | "land_collision_end", | 263 | "land_collision_end", |
@@ -269,7 +268,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
269 | // timer: not handled here | 268 | // timer: not handled here |
270 | // listen: not handled here | 269 | // listen: not handled here |
271 | 270 | ||
272 | public void control(uint localID, LLUUID itemID, LLUUID agentID, uint held, uint change) | 271 | public void control(uint localID, UUID itemID, UUID agentID, uint held, uint change) |
273 | { | 272 | { |
274 | myScriptEngine.PostObjectEvent(localID, new EventParams( | 273 | myScriptEngine.PostObjectEvent(localID, new EventParams( |
275 | "control",new object[] { | 274 | "control",new object[] { |
@@ -279,7 +278,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
279 | new DetectParams[0])); | 278 | new DetectParams[0])); |
280 | } | 279 | } |
281 | 280 | ||
282 | public void email(uint localID, LLUUID itemID, string timeSent, | 281 | public void email(uint localID, UUID itemID, string timeSent, |
283 | string address, string subject, string message, int numLeft) | 282 | string address, string subject, string message, int numLeft) |
284 | { | 283 | { |
285 | myScriptEngine.PostObjectEvent(localID, new EventParams( | 284 | myScriptEngine.PostObjectEvent(localID, new EventParams( |
@@ -292,8 +291,8 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
292 | new DetectParams[0])); | 291 | new DetectParams[0])); |
293 | } | 292 | } |
294 | 293 | ||
295 | public void at_target(uint localID, uint handle, LLVector3 targetpos, | 294 | public void at_target(uint localID, uint handle, Vector3 targetpos, |
296 | LLVector3 atpos) | 295 | Vector3 atpos) |
297 | { | 296 | { |
298 | myScriptEngine.PostObjectEvent(localID, new EventParams( | 297 | myScriptEngine.PostObjectEvent(localID, new EventParams( |
299 | "at_target", new object[] { | 298 | "at_target", new object[] { |
@@ -310,14 +309,14 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
310 | new DetectParams[0])); | 309 | new DetectParams[0])); |
311 | } | 310 | } |
312 | 311 | ||
313 | public void at_rot_target(uint localID, LLUUID itemID) | 312 | public void at_rot_target(uint localID, UUID itemID) |
314 | { | 313 | { |
315 | myScriptEngine.PostObjectEvent(localID, new EventParams( | 314 | myScriptEngine.PostObjectEvent(localID, new EventParams( |
316 | "at_rot_target",new object[0], | 315 | "at_rot_target",new object[0], |
317 | new DetectParams[0])); | 316 | new DetectParams[0])); |
318 | } | 317 | } |
319 | 318 | ||
320 | public void not_at_rot_target(uint localID, LLUUID itemID) | 319 | public void not_at_rot_target(uint localID, UUID itemID) |
321 | { | 320 | { |
322 | myScriptEngine.PostObjectEvent(localID, new EventParams( | 321 | myScriptEngine.PostObjectEvent(localID, new EventParams( |
323 | "not_at_rot_target",new object[0], | 322 | "not_at_rot_target",new object[0], |
@@ -326,7 +325,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
326 | 325 | ||
327 | // run_time_permissions: not handled here | 326 | // run_time_permissions: not handled here |
328 | 327 | ||
329 | public void attach(uint localID, LLUUID itemID, LLUUID avatar) | 328 | public void attach(uint localID, UUID itemID, UUID avatar) |
330 | { | 329 | { |
331 | myScriptEngine.PostObjectEvent(localID, new EventParams( | 330 | myScriptEngine.PostObjectEvent(localID, new EventParams( |
332 | "attach",new object[] { | 331 | "attach",new object[] { |
@@ -337,14 +336,14 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
337 | // dataserver: not handled here | 336 | // dataserver: not handled here |
338 | // link_message: not handled here | 337 | // link_message: not handled here |
339 | 338 | ||
340 | public void moving_start(uint localID, LLUUID itemID) | 339 | public void moving_start(uint localID, UUID itemID) |
341 | { | 340 | { |
342 | myScriptEngine.PostObjectEvent(localID, new EventParams( | 341 | myScriptEngine.PostObjectEvent(localID, new EventParams( |
343 | "moving_start",new object[0], | 342 | "moving_start",new object[0], |
344 | new DetectParams[0])); | 343 | new DetectParams[0])); |
345 | } | 344 | } |
346 | 345 | ||
347 | public void moving_end(uint localID, LLUUID itemID) | 346 | public void moving_end(uint localID, UUID itemID) |
348 | { | 347 | { |
349 | myScriptEngine.PostObjectEvent(localID, new EventParams( | 348 | myScriptEngine.PostObjectEvent(localID, new EventParams( |
350 | "moving_end",new object[0], | 349 | "moving_end",new object[0], |