Revert "Updates all IRegionModules to the new style region modules."

This reverts commit ec3c31e61e.
This commit is contained in:
Melanie
2010-01-29 07:20:13 +00:00
parent ad75a53d60
commit a87a247f05
76 changed files with 940 additions and 1872 deletions

View File

@@ -34,7 +34,6 @@ using System.Reflection;
using System.Text;
using System.Threading;
using log4net;
using Mono.Addins;
using Nini.Config;
using OpenMetaverse;
using OpenMetaverse.StructuredData;
@@ -53,8 +52,7 @@ using OSDMap = OpenMetaverse.StructuredData.OSDMap;
namespace OpenSim.Region.UserStatistics
{
[Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]
public class WebStatsModule : ISharedRegionModule
public class WebStatsModule : IRegionModule
{
private static readonly ILog m_log =
LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@@ -72,7 +70,7 @@ namespace OpenSim.Region.UserStatistics
private string m_loglines = String.Empty;
private volatile int lastHit = 12000;
public virtual void Initialise(IConfigSource config)
public virtual void Initialise(Scene scene, IConfigSource config)
{
IConfig cnfg;
try
@@ -84,17 +82,11 @@ namespace OpenSim.Region.UserStatistics
{
enabled = false;
}
}
public Type ReplaceableInterface
{
get { return null; }
}
public void AddRegion(Scene scene)
{
if (!enabled)
{
return;
}
lock (m_scene)
{
@@ -138,7 +130,7 @@ namespace OpenSim.Region.UserStatistics
MainServer.Instance.AddHTTPHandler("/SStats/", HandleStatsRequest);
MainServer.Instance.AddHTTPHandler("/CAPS/VS/", HandleUnknownCAPSRequest);
}
m_scene.Add(scene);
if (m_simstatsCounters.ContainsKey(scene.RegionInfo.RegionID))
m_simstatsCounters.Remove(scene.RegionInfo.RegionID);
@@ -148,14 +140,6 @@ namespace OpenSim.Region.UserStatistics
}
}
public void RegionLoaded(Scene scene)
{
}
public void RemoveRegion(Scene scene)
{
}
public void ReceiveClassicSimStatsPacket(SimStats stats)
{
if (!enabled)
@@ -324,6 +308,11 @@ namespace OpenSim.Region.UserStatistics
get { return "ViewerStatsModule"; }
}
public bool IsSharedModule
{
get { return true; }
}
public void OnRegisterCaps(UUID agentID, Caps caps)
{
m_log.DebugFormat("[VC]: OnRegisterCaps: agentID {0} caps {1}", agentID, caps);