From edcfaf60c99b7cde324621c2ffcfbb16e4eb4c5e Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Sat, 3 Jul 2010 20:27:00 +0200
Subject: Fix IMs the right way. This sets it up so that timestamps are
 actually in PST (to match viewer time), does correct storage and retrieval of
 IMs, corrects the session ID and makes sure IMs don't get marked "saved" if
 they're live. Removes the group IM save option, which our group IM module
 never had in the first place, as saving group chatter makes no sense at all.

---
 OpenSim/Region/Framework/Scenes/ScenePresence.cs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Region/Framework/Scenes')

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);
                 {
                     CollidingMessage.Colliders = colliding;
 
-                    foreach (SceneObjectGroup att in Attachments)
-                        Scene.EventManager.TriggerScriptColliding(att.LocalId, CollidingMessage);
+                    lock (m_attachments)
+                    {
+                        foreach (SceneObjectGroup att in m_attachments)
+                            Scene.EventManager.TriggerScriptColliding(att.LocalId, CollidingMessage);
+                    }
                 }
             }
 
-- 
cgit v1.1