diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ScriptEngine/XEngine/EventManager.cs | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs b/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs index ad775ff..f1b1e66 100644 --- a/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs +++ b/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs | |||
@@ -244,7 +244,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
244 | { | 244 | { |
245 | DetectParams d = new DetectParams(); | 245 | DetectParams d = new DetectParams(); |
246 | d.Key =detobj.keyUUID; | 246 | d.Key =detobj.keyUUID; |
247 | d.Populate(myScriptEngine.World); | 247 | d.Populate(myScriptEngine.World, detobj); |
248 | d.LinkNum = detobj.linkNumber; // do it here since currently linknum is collided part | 248 | d.LinkNum = detobj.linkNumber; // do it here since currently linknum is collided part |
249 | det.Add(d); | 249 | det.Add(d); |
250 | } | 250 | } |
@@ -264,9 +264,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
264 | foreach (DetectedObject detobj in col.Colliders) | 264 | foreach (DetectedObject detobj in col.Colliders) |
265 | { | 265 | { |
266 | DetectParams d = new DetectParams(); | 266 | DetectParams d = new DetectParams(); |
267 | d.Key =detobj.keyUUID; | 267 | d.Populate(myScriptEngine.World, detobj); |
268 | d.Populate(myScriptEngine.World); | ||
269 | d.LinkNum = detobj.linkNumber; // do it here since currently linknum is collided part | ||
270 | det.Add(d); | 268 | det.Add(d); |
271 | } | 269 | } |
272 | 270 | ||
@@ -284,9 +282,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
284 | foreach (DetectedObject detobj in col.Colliders) | 282 | foreach (DetectedObject detobj in col.Colliders) |
285 | { | 283 | { |
286 | DetectParams d = new DetectParams(); | 284 | DetectParams d = new DetectParams(); |
287 | d.Key =detobj.keyUUID; | 285 | d.Populate(myScriptEngine.World, detobj); |
288 | d.Populate(myScriptEngine.World); | ||
289 | d.LinkNum = detobj.linkNumber; // do it here since currently linknum is collided part | ||
290 | det.Add(d); | 286 | det.Add(d); |
291 | } | 287 | } |
292 | 288 | ||
@@ -304,8 +300,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
304 | foreach (DetectedObject detobj in col.Colliders) | 300 | foreach (DetectedObject detobj in col.Colliders) |
305 | { | 301 | { |
306 | DetectParams d = new DetectParams(); | 302 | DetectParams d = new DetectParams(); |
307 | d.Position = detobj.posVector; | 303 | d.Populate(myScriptEngine.World, detobj); |
308 | d.Populate(myScriptEngine.World); | ||
309 | det.Add(d); | 304 | det.Add(d); |
310 | myScriptEngine.PostObjectEvent(localID, new EventParams( | 305 | myScriptEngine.PostObjectEvent(localID, new EventParams( |
311 | "land_collision_start", | 306 | "land_collision_start", |
@@ -322,8 +317,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
322 | foreach (DetectedObject detobj in col.Colliders) | 317 | foreach (DetectedObject detobj in col.Colliders) |
323 | { | 318 | { |
324 | DetectParams d = new DetectParams(); | 319 | DetectParams d = new DetectParams(); |
325 | d.Position = detobj.posVector; | 320 | d.Populate(myScriptEngine.World,detobj); |
326 | d.Populate(myScriptEngine.World); | ||
327 | det.Add(d); | 321 | det.Add(d); |
328 | myScriptEngine.PostObjectEvent(localID, new EventParams( | 322 | myScriptEngine.PostObjectEvent(localID, new EventParams( |
329 | "land_collision", | 323 | "land_collision", |
@@ -339,8 +333,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
339 | foreach (DetectedObject detobj in col.Colliders) | 333 | foreach (DetectedObject detobj in col.Colliders) |
340 | { | 334 | { |
341 | DetectParams d = new DetectParams(); | 335 | DetectParams d = new DetectParams(); |
342 | d.Position = detobj.posVector; | 336 | d.Populate(myScriptEngine.World,detobj); |
343 | d.Populate(myScriptEngine.World); | ||
344 | det.Add(d); | 337 | det.Add(d); |
345 | myScriptEngine.PostObjectEvent(localID, new EventParams( | 338 | myScriptEngine.PostObjectEvent(localID, new EventParams( |
346 | "land_collision_end", | 339 | "land_collision_end", |