aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie2011-10-12 07:03:58 +0100
committerMelanie2011-10-12 07:03:58 +0100
commit86e28724bdeeb68bf31fcdfb90bcb2b77152c930 (patch)
tree25e4cf2f060fcc573b900e1e9cb8c95aefea6849
parentMerge commit '9a16e76f5151c11fbf76e41b89f8eb03b1731828' into bigmerge (diff)
parentWebStats - Home Link Fix (diff)
downloadopensim-SC-86e28724bdeeb68bf31fcdfb90bcb2b77152c930.zip
opensim-SC-86e28724bdeeb68bf31fcdfb90bcb2b77152c930.tar.gz
opensim-SC-86e28724bdeeb68bf31fcdfb90bcb2b77152c930.tar.bz2
opensim-SC-86e28724bdeeb68bf31fcdfb90bcb2b77152c930.tar.xz
Merge commit '95910f03d454e678a04ae7e800a445ba609b6003' into bigmerge
-rw-r--r--OpenSim/Region/UserStatistics/WebStatsModule.cs5
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Region/UserStatistics/WebStatsModule.cs b/OpenSim/Region/UserStatistics/WebStatsModule.cs
index 9d87c45..0251ee8 100644
--- a/OpenSim/Region/UserStatistics/WebStatsModule.cs
+++ b/OpenSim/Region/UserStatistics/WebStatsModule.cs
@@ -89,21 +89,21 @@ namespace OpenSim.Region.UserStatistics
89 dbConn.Open(); 89 dbConn.Open();
90 CheckAndUpdateDatabase(dbConn); 90 CheckAndUpdateDatabase(dbConn);
91 91
92 Default_Report rep = new Default_Report();
93 Prototype_distributor protodep = new Prototype_distributor(); 92 Prototype_distributor protodep = new Prototype_distributor();
94 Updater_distributor updatedep = new Updater_distributor(); 93 Updater_distributor updatedep = new Updater_distributor();
95 ActiveConnectionsAJAX ajConnections = new ActiveConnectionsAJAX(); 94 ActiveConnectionsAJAX ajConnections = new ActiveConnectionsAJAX();
96 SimStatsAJAX ajSimStats = new SimStatsAJAX(); 95 SimStatsAJAX ajSimStats = new SimStatsAJAX();
97 LogLinesAJAX ajLogLines = new LogLinesAJAX(); 96 LogLinesAJAX ajLogLines = new LogLinesAJAX();
97 Default_Report defaultReport = new Default_Report();
98 Clients_report clientReport = new Clients_report(); 98 Clients_report clientReport = new Clients_report();
99 Sessions_Report sessionsReport = new Sessions_Report(); 99 Sessions_Report sessionsReport = new Sessions_Report();
100 100
101 reports.Add("", rep);
102 reports.Add("prototype.js", protodep); 101 reports.Add("prototype.js", protodep);
103 reports.Add("updater.js", updatedep); 102 reports.Add("updater.js", updatedep);
104 reports.Add("activeconnectionsajax.html", ajConnections); 103 reports.Add("activeconnectionsajax.html", ajConnections);
105 reports.Add("simstatsajax.html", ajSimStats); 104 reports.Add("simstatsajax.html", ajSimStats);
106 reports.Add("activelogajax.html", ajLogLines); 105 reports.Add("activelogajax.html", ajLogLines);
106 reports.Add("default.report", defaultReport);
107 reports.Add("clients.report", clientReport); 107 reports.Add("clients.report", clientReport);
108 reports.Add("sessions.report", sessionsReport); 108 reports.Add("sessions.report", sessionsReport);
109 109
@@ -186,6 +186,7 @@ namespace OpenSim.Region.UserStatistics
186 string strOut = string.Empty; 186 string strOut = string.Empty;
187 187
188 regpath = regpath.Remove(0, 8); 188 regpath = regpath.Remove(0, 8);
189 if (regpath.Length == 0) regpath = "default.report";
189 if (reports.ContainsKey(regpath)) 190 if (reports.ContainsKey(regpath))
190 { 191 {
191 IStatsController rep = reports[regpath]; 192 IStatsController rep = reports[regpath];