OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit '95910f03d454e678a04ae7e800a445ba609b6003' into bigmerge

avinationmerge
Melanie 2011-10-12 07:03:58 +01:00
parent 265e9d094d 95910f03d4
commit 86e28724bd
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
OpenSim/Region/UserStatistics/WebStatsModule.cs
View File

@ -89,21 +89,21 @@ namespace OpenSim.Region.UserStatistics
dbConn.Open(); dbConn.Open();
CheckAndUpdateDatabase(dbConn); CheckAndUpdateDatabase(dbConn);
Default_Report rep = new Default_Report();
Prototype_distributor protodep = new Prototype_distributor(); Prototype_distributor protodep = new Prototype_distributor();
Updater_distributor updatedep = new Updater_distributor(); Updater_distributor updatedep = new Updater_distributor();
ActiveConnectionsAJAX ajConnections = new ActiveConnectionsAJAX(); ActiveConnectionsAJAX ajConnections = new ActiveConnectionsAJAX();
SimStatsAJAX ajSimStats = new SimStatsAJAX(); SimStatsAJAX ajSimStats = new SimStatsAJAX();
LogLinesAJAX ajLogLines = new LogLinesAJAX(); LogLinesAJAX ajLogLines = new LogLinesAJAX();
Default_Report defaultReport = new Default_Report();
Clients_report clientReport = new Clients_report(); Clients_report clientReport = new Clients_report();
Sessions_Report sessionsReport = new Sessions_Report(); Sessions_Report sessionsReport = new Sessions_Report();
reports.Add("", rep);
reports.Add("prototype.js", protodep); reports.Add("prototype.js", protodep);
reports.Add("updater.js", updatedep); reports.Add("updater.js", updatedep);
reports.Add("activeconnectionsajax.html", ajConnections); reports.Add("activeconnectionsajax.html", ajConnections);
reports.Add("simstatsajax.html", ajSimStats); reports.Add("simstatsajax.html", ajSimStats);
reports.Add("activelogajax.html", ajLogLines); reports.Add("activelogajax.html", ajLogLines);
reports.Add("default.report", defaultReport);
reports.Add("clients.report", clientReport); reports.Add("clients.report", clientReport);
reports.Add("sessions.report", sessionsReport); reports.Add("sessions.report", sessionsReport);
@ -186,6 +186,7 @@ namespace OpenSim.Region.UserStatistics
string strOut = string.Empty; string strOut = string.Empty;
regpath = regpath.Remove(0, 8); regpath = regpath.Remove(0, 8);
if (regpath.Length == 0) regpath = "default.report";
if (reports.ContainsKey(regpath)) if (reports.ContainsKey(regpath))
{ {
IStatsController rep = reports[regpath]; IStatsController rep = reports[regpath];