diff options
author | UbitUmarov | 2014-09-23 23:59:05 +0100 |
---|---|---|
committer | UbitUmarov | 2014-09-23 23:59:05 +0100 |
commit | 6d2cdd31fe2bc330485cc519133e6d38562255ba (patch) | |
tree | ef49ab96b7074cb7a7ac6874fc71f0ed46297ee3 /OpenSim/Region/ScriptEngine | |
parent | Merge branch 'master' into ubitworkmaster (diff) | |
download | opensim-SC_OLD-6d2cdd31fe2bc330485cc519133e6d38562255ba.zip opensim-SC_OLD-6d2cdd31fe2bc330485cc519133e6d38562255ba.tar.gz opensim-SC_OLD-6d2cdd31fe2bc330485cc519133e6d38562255ba.tar.bz2 opensim-SC_OLD-6d2cdd31fe2bc330485cc519133e6d38562255ba.tar.xz |
populate collision lists with LinkNumber, and detected structure in
Xengine
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
-rw-r--r-- | OpenSim/Region/ScriptEngine/XEngine/EventManager.cs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs b/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs index 0ff2da3..ad775ff 100644 --- a/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs +++ b/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs | |||
@@ -245,6 +245,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
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); |
248 | d.LinkNum = detobj.linkNumber; // do it here since currently linknum is collided part | ||
248 | det.Add(d); | 249 | det.Add(d); |
249 | } | 250 | } |
250 | 251 | ||
@@ -265,6 +266,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
265 | DetectParams d = new DetectParams(); | 266 | DetectParams d = new DetectParams(); |
266 | d.Key =detobj.keyUUID; | 267 | d.Key =detobj.keyUUID; |
267 | d.Populate(myScriptEngine.World); | 268 | d.Populate(myScriptEngine.World); |
269 | d.LinkNum = detobj.linkNumber; // do it here since currently linknum is collided part | ||
268 | det.Add(d); | 270 | det.Add(d); |
269 | } | 271 | } |
270 | 272 | ||
@@ -284,6 +286,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
284 | DetectParams d = new DetectParams(); | 286 | DetectParams d = new DetectParams(); |
285 | d.Key =detobj.keyUUID; | 287 | d.Key =detobj.keyUUID; |
286 | d.Populate(myScriptEngine.World); | 288 | d.Populate(myScriptEngine.World); |
289 | d.LinkNum = detobj.linkNumber; // do it here since currently linknum is collided part | ||
287 | det.Add(d); | 290 | det.Add(d); |
288 | } | 291 | } |
289 | 292 | ||