diff options
| author | Tom Grimshaw | 2010-07-04 06:51:01 -0700 |
|---|---|---|
| committer | Tom Grimshaw | 2010-07-04 06:51:01 -0700 |
| commit | 14ab22dcd43740e1ece2840a1b10dea155b55ebe (patch) | |
| tree | 7a58bca4a2e584b383d1d95942267f2393f1f06c /OpenSim/Region/Framework/Scenes/ScenePresence.cs | |
| parent | Check cached asset to make sure it contains data, and if not, re-request (diff) | |
| parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
| download | opensim-SC-14ab22dcd43740e1ece2840a1b10dea155b55ebe.zip opensim-SC-14ab22dcd43740e1ece2840a1b10dea155b55ebe.tar.gz opensim-SC-14ab22dcd43740e1ece2840a1b10dea155b55ebe.tar.bz2 opensim-SC-14ab22dcd43740e1ece2840a1b10dea155b55ebe.tar.xz | |
Merge branch 'careminster-presence-refactor' of ssh://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 | ||