2 files changed, 126 insertions, 76 deletions

diff --git a/OpenSim/Region/UserStatistics/Properties/AssemblyInfo.cs b/OpenSim/Region/UserStatistics/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..100cf99
--- /dev/null
+++ b/OpenSim/Region/UserStatistics/Properties/AssemblyInfo.cs
@@ -0,0 +1,33 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("OpenSim.Region.UserStatistics")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("http://opensimulator.org")]
+[assembly: AssemblyProduct("OpenSim")]
+[assembly: AssemblyCopyright("OpenSimulator developers")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("42b28288-5fdd-478f-8903-8dccbbb2d5f9")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+[assembly: AssemblyVersion("0.7.5.*")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/OpenSim/Region/UserStatistics/WebStatsModule.cs b/OpenSim/Region/UserStatistics/WebStatsModule.cs
index 625eba4..b08233c 100644
--- a/OpenSim/Region/UserStatistics/WebStatsModule.cs
+++ b/OpenSim/Region/UserStatistics/WebStatsModule.cs
@@ -43,15 +43,20 @@ using OpenSim.Framework.Servers.HttpServer;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 using Mono.Data.SqliteClient;
+using Mono.Addins;
 
 using Caps = OpenSim.Framework.Capabilities.Caps;
 
 using OSD = OpenMetaverse.StructuredData.OSD;
 using OSDMap = OpenMetaverse.StructuredData.OSDMap;
 
+[assembly: Addin("WebStats", "1.0")]
+[assembly: AddinDependency("OpenSim", "0.5")]
+
 namespace OpenSim.Region.UserStatistics
 {
-    public class WebStatsModule : IRegionModule
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "WebStatsModule")]
+    public class WebStatsModule : ISharedRegionModule
     {
         private static readonly ILog m_log =
             LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@@ -74,59 +79,69 @@ namespace OpenSim.Region.UserStatistics
         private string m_loglines = String.Empty;
         private volatile int lastHit = 12000;
 
-        public virtual void Initialise(Scene scene, IConfigSource config)
+        #region ISharedRegionModule
+
+        public virtual void Initialise(IConfigSource config)
         {
             IConfig cnfg = config.Configs["WebStats"];
 
             if (cnfg != null)
                 enabled = cnfg.GetBoolean("enabled", false);
-            
+        }
+
+        public virtual void PostInitialise()
+        {
+            if (!enabled)
+                return;
+
+            AddEventHandlers();
+
+            if (Util.IsWindows())
+                Util.LoadArchSpecificWindowsDll("sqlite3.dll");
+
+            //IConfig startupConfig = config.Configs["Startup"];
+
+            dbConn = new SqliteConnection("URI=file:LocalUserStatistics.db,version=3");
+            dbConn.Open();
+            CreateTables(dbConn);
+
+            Prototype_distributor protodep = new Prototype_distributor();
+            Updater_distributor updatedep = new Updater_distributor();
+            ActiveConnectionsAJAX ajConnections = new ActiveConnectionsAJAX();
+            SimStatsAJAX ajSimStats = new SimStatsAJAX();
+            LogLinesAJAX ajLogLines = new LogLinesAJAX();
+            Default_Report defaultReport = new Default_Report();
+            Clients_report clientReport = new Clients_report();
+            Sessions_Report sessionsReport = new Sessions_Report();
+
+            reports.Add("prototype.js", protodep);
+            reports.Add("updater.js", updatedep);
+            reports.Add("activeconnectionsajax.html", ajConnections);
+            reports.Add("simstatsajax.html", ajSimStats);
+            reports.Add("activelogajax.html", ajLogLines);
+            reports.Add("default.report", defaultReport);
+            reports.Add("clients.report", clientReport);
+            reports.Add("sessions.report", sessionsReport);
+
+            ////
+            // Add Your own Reports here (Do Not Modify Lines here Devs!)
+            ////
+
+            ////
+            // End Own reports section
+            ////
+
+            MainServer.Instance.AddHTTPHandler("/SStats/", HandleStatsRequest);
+            MainServer.Instance.AddHTTPHandler("/CAPS/VS/", HandleUnknownCAPSRequest);
+        }
+
+        public virtual void AddRegion(Scene scene)
+        {
             if (!enabled)
                 return;
 
             lock (m_scenes)
             {
-                if (m_scenes.Count == 0)
-                {
-                    if (Util.IsWindows())
-                        Util.LoadArchSpecificWindowsDll("sqlite3.dll");
-                    
-                    //IConfig startupConfig = config.Configs["Startup"];
-
-                    dbConn = new SqliteConnection("URI=file:LocalUserStatistics.db,version=3");
-                    dbConn.Open();
-                    CreateTables(dbConn);
-
-                    Prototype_distributor protodep = new Prototype_distributor();
-                    Updater_distributor updatedep = new Updater_distributor();
-                    ActiveConnectionsAJAX ajConnections = new ActiveConnectionsAJAX();
-                    SimStatsAJAX ajSimStats = new SimStatsAJAX();
-                    LogLinesAJAX ajLogLines = new LogLinesAJAX();
-                    Default_Report defaultReport = new Default_Report();
-                    Clients_report clientReport = new Clients_report();
-                    Sessions_Report sessionsReport = new Sessions_Report();
-
-                    reports.Add("prototype.js", protodep);
-                    reports.Add("updater.js", updatedep);
-                    reports.Add("activeconnectionsajax.html", ajConnections);
-                    reports.Add("simstatsajax.html", ajSimStats);
-                    reports.Add("activelogajax.html", ajLogLines);
-                    reports.Add("default.report", defaultReport);
-                    reports.Add("clients.report", clientReport);
-                    reports.Add("sessions.report", sessionsReport);
-
-                    ////
-                    // Add Your own Reports here (Do Not Modify Lines here Devs!)
-                    ////
-
-                    ////
-                    // End Own reports section
-                    ////
-
-                    MainServer.Instance.AddHTTPHandler("/SStats/", HandleStatsRequest);
-                    MainServer.Instance.AddHTTPHandler("/CAPS/VS/", HandleUnknownCAPSRequest);
-                }
-                
                 m_scenes.Add(scene);
                 if (m_simstatsCounters.ContainsKey(scene.RegionInfo.RegionID))
                     m_simstatsCounters.Remove(scene.RegionInfo.RegionID);
@@ -136,6 +151,39 @@ namespace OpenSim.Region.UserStatistics
             }
         }
 
+        public void RegionLoaded(Scene scene)
+        {
+        }
+
+        public void RemoveRegion(Scene scene)
+        {
+        }
+
+        public virtual void Close()
+        {
+            if (!enabled)
+                return;
+
+            dbConn.Close();
+            dbConn.Dispose();
+            m_sessions.Clear();
+            m_scenes.Clear();
+            reports.Clear();
+            m_simstatsCounters.Clear();
+        }
+
+        public virtual string Name
+        {
+            get { return "ViewerStatsModule"; }
+        }
+
+        public Type ReplaceableInterface
+        {
+            get { return null; }
+        }
+
+        #endregion
+
         private void ReceiveClassicSimStatsPacket(SimStats stats)
         {
             if (!enabled)
@@ -251,37 +299,6 @@ namespace OpenSim.Region.UserStatistics
             }
         }
 
-        public virtual void PostInitialise()
-        {
-            if (!enabled)
-                return;
-
-            AddHandlers();
-        }
-
-        public virtual void Close()
-        {
-            if (!enabled)
-                return;
-
-            dbConn.Close();
-            dbConn.Dispose();
-            m_sessions.Clear();
-            m_scenes.Clear();
-            reports.Clear();
-            m_simstatsCounters.Clear(); 
-        }
-
-        public virtual string Name
-        {
-            get { return "ViewerStatsModule"; }
-        }
-
-        public bool IsSharedModule
-        {
-            get { return true; }
-        }
-
         private void OnRegisterCaps(UUID agentID, Caps caps)
         {
 //            m_log.DebugFormat("[WEB STATS MODULE]: OnRegisterCaps: agentID {0} caps {1}", agentID, caps);
@@ -302,7 +319,7 @@ namespace OpenSim.Region.UserStatistics
         {
         }
 
-        protected virtual void AddHandlers()
+        protected virtual void AddEventHandlers()
         {
             lock (m_scenes)
             {