* Updates LSL2CS converter

* All objects are not touchable by default now
* When a script listens for one of the touch events in the state, an object becomes touchable.
* All LSL scripts report which events they consume now
** This uses semi-complicated Regex to discover the events, stick them in a dictionary, and then write a method call into each script state's state_entry() event.
** Tedd may figure out a better way to do this in the future.  For now, this works for LSL.

4 files changed, 149 insertions, 3 deletions

diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs
index 3f14fff..495b604 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs
@@ -51,6 +51,7 @@ namespace OpenSim.Region.Environment.Scenes
             if (part != null)
             {
                 part.StartScript(itemID);
+               
             }
             else
             {
@@ -119,6 +120,7 @@ namespace OpenSim.Region.Environment.Scenes
             if (part != null)
             {
                 part.StopScript(itemID);
+                RemoveScriptEvents(itemID);
             }
             else
             {
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
index 1f38e4f..7abaaee 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
@@ -41,6 +41,40 @@ using OpenSim.Region.Physics.Manager;
 
 namespace OpenSim.Region.Environment.Scenes
 {
+
+    [Flags]
+    public enum scriptEvents : int
+    {
+        None = 0,
+        attach = 1,
+        collision = 15,
+        collision_end = 32,
+        collision_start = 64,
+        control = 128,
+        dataserver = 256,
+        email = 512,
+        http_response = 1024,
+        land_collision = 2048,
+        land_collision_end = 4096,
+        land_collision_start = 8192,
+        link_message = 16384,
+        listen = 32768,
+        money = 65536,
+        moving_end = 131072,
+        moving_start = 262144,
+        not_at_rot_target = 524288,
+        not_at_target = 1048576,
+        remote_data = 8388608,
+        run_time_permissions = 268435456,
+        state_entry = 1073741824,
+        state_exit = 2,
+        timer = 4,
+        touch = 8,
+        touch_end = 536870912,
+        touch_start = 2097152,
+        object_rez = 4194304
+    }
+
     public delegate void PrimCountTaintedDelegate();
 
     public partial class SceneObjectGroup : EntityBase
@@ -67,6 +101,9 @@ namespace OpenSim.Region.Environment.Scenes
         private LLVector3 lastPhysGroupPos;
         private LLQuaternion lastPhysGroupRot;
 
+        private Dictionary<LLUUID, scriptEvents> m_scriptEvents = new Dictionary<LLUUID, scriptEvents>();
+        private scriptEvents m_aggregateScriptEvents = scriptEvents.None;
+
         #region Properties
 
         /// <summary>
@@ -2042,6 +2079,104 @@ namespace OpenSim.Region.Environment.Scenes
             d.AddActiveScripts(count);
         }
 
+        public void RemoveScriptEvents(LLUUID scriptid)
+        {
+            lock (m_scriptEvents)
+            {
+                if (m_scriptEvents.ContainsKey(scriptid))
+                {
+                    scriptEvents oldparts = scriptEvents.None;
+                    oldparts = (scriptEvents)m_scriptEvents[scriptid];
+
+                    // remove values from aggregated script events
+                    m_aggregateScriptEvents &= ~oldparts;
+                    m_scriptEvents.Remove(scriptid);
+                }
+
+            }
+            aggregateScriptEvents();
+        }
+
+        public void SetScriptEvents(LLUUID scriptid, int events)
+        {
+
+            scriptEvents oldparts = scriptEvents.None;
+            lock (m_scriptEvents)
+            {
+                if (m_scriptEvents.ContainsKey(scriptid))
+                {
+                    oldparts = (scriptEvents)m_scriptEvents[scriptid];
+
+                    // remove values from aggregated script events
+                    m_aggregateScriptEvents &= ~oldparts;
+                    m_scriptEvents[scriptid] = (scriptEvents)events;
+                }
+                else
+                {
+                    m_scriptEvents.Add(scriptid, (scriptEvents)events);
+                }
+
+            }
+
+            aggregateScriptEvents();
+        }
+        public void aggregateScriptEvents()
+        {
+            // Aggregate script events
+            lock (m_scriptEvents)
+            {
+                foreach (scriptEvents s in m_scriptEvents.Values)
+                {
+                    m_aggregateScriptEvents |= s;
+                }
+            }
+            uint objectflagupdate = m_rootPart.ObjectFlags;
+
+            if (
+                ((m_aggregateScriptEvents & scriptEvents.touch) != 0) ||
+                ((m_aggregateScriptEvents & scriptEvents.touch_end) != 0) ||
+                ((m_aggregateScriptEvents & scriptEvents.touch_start) != 0)
+                )
+            {
+                objectflagupdate |= (uint)LLObject.ObjectFlags.Touch;
+            }
+            else
+            {
+                objectflagupdate &= ~(uint)LLObject.ObjectFlags.Touch;
+            }
+
+            if ((m_aggregateScriptEvents & scriptEvents.money) != 0)
+            {
+                objectflagupdate |= (uint)LLObject.ObjectFlags.Money;
+            }
+            else
+            {
+                objectflagupdate &= ~(uint)LLObject.ObjectFlags.Money;
+            }
+
+            if (
+                ((m_aggregateScriptEvents & scriptEvents.collision) != 0) ||
+                ((m_aggregateScriptEvents & scriptEvents.collision_end) != 0) ||
+                ((m_aggregateScriptEvents & scriptEvents.collision_start) != 0)
+                )
+            {
+                // subscribe to physics updates.
+            }
+            else
+            {
+                // unsubscribe to physics updates.
+            }
+            lock (m_parts)
+            {
+                foreach (SceneObjectPart part in m_parts.Values)
+                {
+                    part.ObjectFlags = objectflagupdate;
+                }
+            }
+            ScheduleGroupForFullUpdate();
+
+        }
+
         public override void SetText(string text, Vector3 color, double alpha)
         {
             Color = Color.FromArgb(0xff - (int) (alpha*0xff),
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs
index 16da516..8ce71c4 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs
@@ -147,6 +147,7 @@ namespace OpenSim.Region.Environment.Scenes
                     if (10 == item.Type)
                     {
                         StopScript(item.ItemID);
+                        m_parentGroup.RemoveScriptEvents(item.ItemID);
                     }
                 }
             }
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
index b42375f..61d10c9 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
@@ -83,6 +83,7 @@ namespace OpenSim.Region.Environment.Scenes
         SCALE = 0x40
     }
 
+    
     [Serializable]
     public partial class SceneObjectPart : IScriptHost, ISerializable
     {
@@ -729,8 +730,7 @@ namespace OpenSim.Region.Environment.Scenes
             m_folderID = LLUUID.Random();
 
             Flags = 0;
-            Flags |= LLObject.ObjectFlags.Touch |
-                       LLObject.ObjectFlags.AllowInventoryDrop |
+            Flags |=   LLObject.ObjectFlags.AllowInventoryDrop |
                        LLObject.ObjectFlags.CreateSelected;
 
 
@@ -774,7 +774,7 @@ namespace OpenSim.Region.Environment.Scenes
             
             // Since we don't store script state, this is only a 'temporary' objectflag now
             // If the object is scripted, the script will get loaded and this will be set again
-            ObjectFlags &= ~(uint)LLObject.ObjectFlags.Scripted; 
+            ObjectFlags &= ~(uint)(LLObject.ObjectFlags.Scripted | LLObject.ObjectFlags.Touch); 
             
             TrimPermissions();
             // ApplyPhysics();
@@ -2312,6 +2312,14 @@ namespace OpenSim.Region.Environment.Scenes
             SetText( text );
         }
 
+        public void setScriptEvents(LLUUID scriptID, int events)
+        {
+            if (m_parentGroup != null)
+            {
+                m_parentGroup.SetScriptEvents(scriptID, events);
+            }
+        }
+
         protected SceneObjectPart(SerializationInfo info, StreamingContext context)
         {
             //System.Console.WriteLine("SceneObjectPart Deserialize BGN");