aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorTeravus Ovares2009-07-21 06:47:29 +0000
committerTeravus Ovares2009-07-21 06:47:29 +0000
commitc243ae43f23be20ec3388ed30e8b7b806ad2a2a7 (patch)
tree2c38ab90f6c81e08ada7ef4f4dbad6da77afd75a /OpenSim/Region
parent* nothing in this commit, re-triggering panda.. which crashed while testing. (diff)
downloadopensim-SC-c243ae43f23be20ec3388ed30e8b7b806ad2a2a7.zip
opensim-SC-c243ae43f23be20ec3388ed30e8b7b806ad2a2a7.tar.gz
opensim-SC-c243ae43f23be20ec3388ed30e8b7b806ad2a2a7.tar.bz2
opensim-SC-c243ae43f23be20ec3388ed30e8b7b806ad2a2a7.tar.xz
* Updated C# WebServer to the latest available source download (r19869) and applied a few mods from the old version (now up on opensim-libs (VS 3.5 project).
* Made various changes to BaseHttpServer to accommodate the new interfaces. * This version has been significantly re-architected and may fail in unusual and insidious ways. * Please pay attention to any errors you get and post a Mantis if you can reproduce an issue with the HTTPServer. I'm including the pdb and having the http server compiled in debug for a few weeks so that when an error occurs, it'll print the pertenant data. * Once again, this is the full C# WebServer, not the lite branch that is included in LibOMV (we need SSL!)
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/UserStatistics/Default_Report.cs6
-rw-r--r--OpenSim/Region/UserStatistics/WebStatsModule.cs6
2 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Region/UserStatistics/Default_Report.cs b/OpenSim/Region/UserStatistics/Default_Report.cs
index 668fd45..0e17630 100644
--- a/OpenSim/Region/UserStatistics/Default_Report.cs
+++ b/OpenSim/Region/UserStatistics/Default_Report.cs
@@ -112,15 +112,15 @@ TD.align_top { vertical-align: top; }
112 112
113 ajaxUpdaterDivs[0] = "activeconnections"; 113 ajaxUpdaterDivs[0] = "activeconnections";
114 ajaxUpdaterSeconds[0] = 10; 114 ajaxUpdaterSeconds[0] = 10;
115 ajaxUpdaterReportFragments[0] = "activeconnectionsajax.ajax"; 115 ajaxUpdaterReportFragments[0] = "activeconnectionsajax.html";
116 116
117 ajaxUpdaterDivs[1] = "activesimstats"; 117 ajaxUpdaterDivs[1] = "activesimstats";
118 ajaxUpdaterSeconds[1] = 20; 118 ajaxUpdaterSeconds[1] = 20;
119 ajaxUpdaterReportFragments[1] = "simstatsajax.ajax"; 119 ajaxUpdaterReportFragments[1] = "simstatsajax.html";
120 120
121 ajaxUpdaterDivs[2] = "activelog"; 121 ajaxUpdaterDivs[2] = "activelog";
122 ajaxUpdaterSeconds[2] = 5; 122 ajaxUpdaterSeconds[2] = 5;
123 ajaxUpdaterReportFragments[2] = "activelogajax.ajax"; 123 ajaxUpdaterReportFragments[2] = "activelogajax.html";
124 124
125 HTMLUtil.InsertPeriodicUpdaters(ref output, ajaxUpdaterDivs, ajaxUpdaterSeconds, ajaxUpdaterReportFragments); 125 HTMLUtil.InsertPeriodicUpdaters(ref output, ajaxUpdaterDivs, ajaxUpdaterSeconds, ajaxUpdaterReportFragments);
126 126
diff --git a/OpenSim/Region/UserStatistics/WebStatsModule.cs b/OpenSim/Region/UserStatistics/WebStatsModule.cs
index 0807607..a65b84c 100644
--- a/OpenSim/Region/UserStatistics/WebStatsModule.cs
+++ b/OpenSim/Region/UserStatistics/WebStatsModule.cs
@@ -110,9 +110,9 @@ namespace OpenSim.Region.UserStatistics
110 reports.Add("", rep); 110 reports.Add("", rep);
111 reports.Add("prototype.js", protodep); 111 reports.Add("prototype.js", protodep);
112 reports.Add("updater.js", updatedep); 112 reports.Add("updater.js", updatedep);
113 reports.Add("activeconnectionsajax.ajax", ajConnections); 113 reports.Add("activeconnectionsajax.html", ajConnections);
114 reports.Add("simstatsajax.ajax", ajSimStats); 114 reports.Add("simstatsajax.html", ajSimStats);
115 reports.Add("activelogajax.ajax", ajLogLines); 115 reports.Add("activelogajax.html", ajLogLines);
116 reports.Add("clients.report", clientReport); 116 reports.Add("clients.report", clientReport);
117 reports.Add("sessions.report", sessionsReport); 117 reports.Add("sessions.report", sessionsReport);
118 118