diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Application/OpenSimBase.cs | 6 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/Monitoring/MonitorModule.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/RegionStatsHandler.cs | 11 |
3 files changed, 6 insertions, 13 deletions
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs index 7df974b..5918843 100644 --- a/OpenSim/Region/Application/OpenSimBase.cs +++ b/OpenSim/Region/Application/OpenSimBase.cs | |||
@@ -811,7 +811,7 @@ namespace OpenSim | |||
811 | 811 | ||
812 | public string Path | 812 | public string Path |
813 | { | 813 | { |
814 | get { return "/simstatus/"; } | 814 | get { return "/simstatus"; } |
815 | } | 815 | } |
816 | } | 816 | } |
817 | 817 | ||
@@ -849,7 +849,7 @@ namespace OpenSim | |||
849 | public string Path | 849 | public string Path |
850 | { | 850 | { |
851 | // This is for the OpenSimulator instance and is the osSecret hashed | 851 | // This is for the OpenSimulator instance and is the osSecret hashed |
852 | get { return "/" + osXStatsURI + "/"; } | 852 | get { return "/" + osXStatsURI; } |
853 | } | 853 | } |
854 | } | 854 | } |
855 | 855 | ||
@@ -890,7 +890,7 @@ namespace OpenSim | |||
890 | public string Path | 890 | public string Path |
891 | { | 891 | { |
892 | // This is for the OpenSimulator instance and is the user provided URI | 892 | // This is for the OpenSimulator instance and is the user provided URI |
893 | get { return "/" + osUXStatsURI + "/"; } | 893 | get { return "/" + osUXStatsURI; } |
894 | } | 894 | } |
895 | } | 895 | } |
896 | 896 | ||
diff --git a/OpenSim/Region/CoreModules/Framework/Monitoring/MonitorModule.cs b/OpenSim/Region/CoreModules/Framework/Monitoring/MonitorModule.cs index b5cbcbb..09095c2 100644 --- a/OpenSim/Region/CoreModules/Framework/Monitoring/MonitorModule.cs +++ b/OpenSim/Region/CoreModules/Framework/Monitoring/MonitorModule.cs | |||
@@ -73,7 +73,7 @@ namespace OpenSim.Region.CoreModules.Framework.Monitoring | |||
73 | "Returns a variety of statistics about the current region and/or simulator", | 73 | "Returns a variety of statistics about the current region and/or simulator", |
74 | DebugMonitors); | 74 | DebugMonitors); |
75 | 75 | ||
76 | MainServer.Instance.AddHTTPHandler("/monitorstats/" + m_scene.RegionInfo.RegionID + "/", StatsPage); | 76 | MainServer.Instance.AddHTTPHandler("/monitorstats/" + m_scene.RegionInfo.RegionID, StatsPage); |
77 | } | 77 | } |
78 | 78 | ||
79 | public Hashtable StatsPage(Hashtable request) | 79 | public Hashtable StatsPage(Hashtable request) |
diff --git a/OpenSim/Region/Framework/Scenes/RegionStatsHandler.cs b/OpenSim/Region/Framework/Scenes/RegionStatsHandler.cs index d25d5dd..4578236 100644 --- a/OpenSim/Region/Framework/Scenes/RegionStatsHandler.cs +++ b/OpenSim/Region/Framework/Scenes/RegionStatsHandler.cs | |||
@@ -36,7 +36,6 @@ using OpenMetaverse; | |||
36 | using OpenMetaverse.StructuredData; | 36 | using OpenMetaverse.StructuredData; |
37 | using OpenSim.Framework; | 37 | using OpenSim.Framework; |
38 | using OpenSim.Framework.Communications; | 38 | using OpenSim.Framework.Communications; |
39 | |||
40 | using OpenSim.Framework.Console; | 39 | using OpenSim.Framework.Console; |
41 | using OpenSim.Framework.Servers; | 40 | using OpenSim.Framework.Servers; |
42 | using OpenSim.Framework.Servers.HttpServer; | 41 | using OpenSim.Framework.Servers.HttpServer; |
@@ -45,12 +44,8 @@ using OpenSim.Region.Framework; | |||
45 | using OpenSim.Region.Framework.Interfaces; | 44 | using OpenSim.Region.Framework.Interfaces; |
46 | using OpenSim.Region.Framework.Scenes; | 45 | using OpenSim.Region.Framework.Scenes; |
47 | 46 | ||
48 | |||
49 | |||
50 | namespace OpenSim.Region.Framework.Scenes | 47 | namespace OpenSim.Region.Framework.Scenes |
51 | { | 48 | { |
52 | |||
53 | |||
54 | public class RegionStatsHandler : IStreamedRequestHandler | 49 | public class RegionStatsHandler : IStreamedRequestHandler |
55 | { | 50 | { |
56 | private string osRXStatsURI = String.Empty; | 51 | private string osRXStatsURI = String.Empty; |
@@ -67,7 +62,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
67 | regionInfo = region_info; | 62 | regionInfo = region_info; |
68 | osRXStatsURI = Util.SHA1Hash(regionInfo.regionSecret); | 63 | osRXStatsURI = Util.SHA1Hash(regionInfo.regionSecret); |
69 | osXStatsURI = Util.SHA1Hash(regionInfo.osSecret); | 64 | osXStatsURI = Util.SHA1Hash(regionInfo.osSecret); |
70 | |||
71 | } | 65 | } |
72 | 66 | ||
73 | public byte[] Handle(string path, Stream request, OSHttpRequest httpRequest, OSHttpResponse httpResponse) | 67 | public byte[] Handle(string path, Stream request, OSHttpRequest httpRequest, OSHttpResponse httpResponse) |
@@ -88,7 +82,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
88 | public string Path | 82 | public string Path |
89 | { | 83 | { |
90 | // This is for the region and is the regionSecret hashed | 84 | // This is for the region and is the regionSecret hashed |
91 | get { return "/" + osRXStatsURI + "/"; } | 85 | get { return "/" + osRXStatsURI; } |
92 | } | 86 | } |
93 | 87 | ||
94 | private string Report() | 88 | private string Report() |
@@ -106,7 +100,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
106 | strBuffer = OSDParser.SerializeJsonString(args); | 100 | strBuffer = OSDParser.SerializeJsonString(args); |
107 | 101 | ||
108 | return strBuffer; | 102 | return strBuffer; |
109 | |||
110 | } | 103 | } |
111 | } | 104 | } |
112 | } | 105 | } \ No newline at end of file |