diff options
| author | John Hurliman | 2009-09-30 15:28:23 -0700 |
|---|---|---|
| committer | John Hurliman | 2009-09-30 15:28:23 -0700 |
| commit | acfe2d9f4e5a55d38b16cac7d0d0a25b64b6b009 (patch) | |
| tree | 305349e1bd0a5849fd7f96483e24d5e07b24b8f4 /OpenSim/Region/Framework/Scenes/RegionStatsHandler.cs | |
| parent | * Adding Scale to EntityBase * Fixing the incorrect initialization of EntityB... (diff) | |
| parent | Formatting cleanup. (diff) | |
| download | opensim-SC_OLD-acfe2d9f4e5a55d38b16cac7d0d0a25b64b6b009.zip opensim-SC_OLD-acfe2d9f4e5a55d38b16cac7d0d0a25b64b6b009.tar.gz opensim-SC_OLD-acfe2d9f4e5a55d38b16cac7d0d0a25b64b6b009.tar.bz2 opensim-SC_OLD-acfe2d9f4e5a55d38b16cac7d0d0a25b64b6b009.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/RegionStatsHandler.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/RegionStatsHandler.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/RegionStatsHandler.cs b/OpenSim/Region/Framework/Scenes/RegionStatsHandler.cs index 7c02f9a..73f918e 100644 --- a/OpenSim/Region/Framework/Scenes/RegionStatsHandler.cs +++ b/OpenSim/Region/Framework/Scenes/RegionStatsHandler.cs | |||
| @@ -53,7 +53,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 53 | 53 | ||
| 54 | 54 | ||
| 55 | public class RegionStatsHandler : IStreamedRequestHandler | 55 | public class RegionStatsHandler : IStreamedRequestHandler |
| 56 | { | 56 | { |
| 57 | private string osRXStatsURI = String.Empty; | 57 | private string osRXStatsURI = String.Empty; |
| 58 | private string osXStatsURI = String.Empty; | 58 | private string osXStatsURI = String.Empty; |
| 59 | //private string osSecret = String.Empty; | 59 | //private string osSecret = String.Empty; |
| @@ -87,13 +87,13 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 87 | } | 87 | } |
| 88 | 88 | ||
| 89 | public string Path | 89 | public string Path |
| 90 | { | 90 | { |
| 91 | // This is for the region and is the regionSecret hashed | 91 | // This is for the region and is the regionSecret hashed |
| 92 | get { return "/" + osRXStatsURI + "/"; } | 92 | get { return "/" + osRXStatsURI + "/"; } |
| 93 | } | 93 | } |
| 94 | 94 | ||
| 95 | private string Report() | 95 | private string Report() |
| 96 | { | 96 | { |
| 97 | OSDMap args = new OSDMap(30); | 97 | OSDMap args = new OSDMap(30); |
| 98 | //int time = Util.ToUnixTime(DateTime.Now); | 98 | //int time = Util.ToUnixTime(DateTime.Now); |
| 99 | args["OSStatsURI"] = OSD.FromString("http://" + regionInfo.ExternalHostName + ":" + regionInfo.HttpPort + "/" + osXStatsURI + "/"); | 99 | args["OSStatsURI"] = OSD.FromString("http://" + regionInfo.ExternalHostName + ":" + regionInfo.HttpPort + "/" + osXStatsURI + "/"); |