* Renamed new event manager "SceneEvents" to "EventManager"

* Installed into Scene.cs
* TODO: Remove IScriptHandler and ScriptEng calls from Update() - they should use eventManager and bind as needed.

OpenSim/OpenSim.Region/Scenes/Scene.cs

@@ -73,6 +73,7 @@ namespace OpenSim.Region.Scenes
 
         public ParcelManager parcelManager;
         public EstateManager estateManager;
+        public EventManager eventManager;
 
         #region Properties
         /// <summary>
@@ -117,6 +118,8 @@ namespace OpenSim.Region.Scenes
                 parcelManager = new ParcelManager(this, this.m_regInfo);
                 estateManager = new EstateManager(this, this.m_regInfo);
 
+                eventManager = new EventManager();
+
                 m_scriptHandlers = new Dictionary<LLUUID, ScriptHandler>();
                 m_scripts = new Dictionary<string, ScriptFactory>();
 
@@ -192,6 +195,10 @@ namespace OpenSim.Region.Scenes
                     Entities[UUID].update();
                 }
 
+                // New
+                eventManager.TriggerOnFrame();
+
+                // TODO: Obsolete - Phase out
                 foreach (ScriptHandler scriptHandler in m_scriptHandlers.Values)
                 {
                     scriptHandler.OnFrame();
@@ -200,6 +207,7 @@ namespace OpenSim.Region.Scenes
                 {
                     scripteng.OnFrame();
                 }
+
                 //backup world data
                 this.storageCount++;
                 if (storageCount > 1200) //set to how often you want to backup 

OpenSim/OpenSim.Region/Scenes/SceneEvents.cs

@@ -7,7 +7,7 @@ namespace OpenSim.Region.Scenes
     /// <summary>
     /// A class for triggering remote scene events.
     /// </summary>
-    class SceneEvents
+    class EventManager
     {
         public delegate void OnFrameDelegate();
         public event OnFrameDelegate OnFrame;