diff options
| author | Mike Rieker | 2010-07-06 02:23:10 +0000 |
|---|---|---|
| committer | Mike Rieker | 2010-07-06 02:23:10 +0000 |
| commit | 6e7f1a3ac11b889175c87f59a3c5361c704363a6 (patch) | |
| tree | 2ed5bebf54db3adc420e1510045b84b880ecb157 /OpenSim/Region/Framework/Scenes/ScenePresence.cs | |
| parent | rewrote hanging llParseStringKeepNulls() (diff) | |
| parent | Undo fix is now complete. This commit repairs the special case of the root pr... (diff) | |
| download | opensim-SC-6e7f1a3ac11b889175c87f59a3c5361c704363a6.zip opensim-SC-6e7f1a3ac11b889175c87f59a3c5361c704363a6.tar.gz opensim-SC-6e7f1a3ac11b889175c87f59a3c5361c704363a6.tar.bz2 opensim-SC-6e7f1a3ac11b889175c87f59a3c5361c704363a6.tar.xz | |
Merge branch 'careminster-presence-refactor' of www.3dhosting.de:/var/git/careminster into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/ScenePresence.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 4a4cac9..e51d9ee 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
| @@ -3730,8 +3730,11 @@ Console.WriteLine("Scripted Sit ofset {0}", m_pos); | |||
| 3730 | { | 3730 | { |
| 3731 | CollidingMessage.Colliders = colliding; | 3731 | CollidingMessage.Colliders = colliding; |
| 3732 | 3732 | ||
| 3733 | foreach (SceneObjectGroup att in Attachments) | 3733 | lock (m_attachments) |
| 3734 | Scene.EventManager.TriggerScriptColliding(att.LocalId, CollidingMessage); | 3734 | { |
| 3735 | foreach (SceneObjectGroup att in m_attachments) | ||
| 3736 | Scene.EventManager.TriggerScriptColliding(att.LocalId, CollidingMessage); | ||
| 3737 | } | ||
| 3735 | } | 3738 | } |
| 3736 | } | 3739 | } |
| 3737 | 3740 | ||