diff options
| author | Dan Lake | 2011-10-06 22:50:03 -0700 |
|---|---|---|
| committer | Dan Lake | 2011-10-06 22:50:03 -0700 |
| commit | f26a966b8e79688ca2ed81c236492d694f34ac7d (patch) | |
| tree | ccbe8444046ec641c39a4d38088dfee7bb0263db /OpenSim/Region/Application | |
| parent | Refactored "known child region" in ScenePresence. There were 4 different (diff) | |
| parent | remove the pointless slashes on the end of the (5!) different server stat ret... (diff) | |
| download | opensim-SC-f26a966b8e79688ca2ed81c236492d694f34ac7d.zip opensim-SC-f26a966b8e79688ca2ed81c236492d694f34ac7d.tar.gz opensim-SC-f26a966b8e79688ca2ed81c236492d694f34ac7d.tar.bz2 opensim-SC-f26a966b8e79688ca2ed81c236492d694f34ac7d.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Application')
| -rw-r--r-- | OpenSim/Region/Application/OpenSimBase.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs index 6fba71e..e867bc2 100644 --- a/OpenSim/Region/Application/OpenSimBase.cs +++ b/OpenSim/Region/Application/OpenSimBase.cs | |||
| @@ -728,7 +728,7 @@ namespace OpenSim | |||
| 728 | 728 | ||
| 729 | public string Path | 729 | public string Path |
| 730 | { | 730 | { |
| 731 | get { return "/simstatus/"; } | 731 | get { return "/simstatus"; } |
| 732 | } | 732 | } |
| 733 | } | 733 | } |
| 734 | 734 | ||
| @@ -766,7 +766,7 @@ namespace OpenSim | |||
| 766 | public string Path | 766 | public string Path |
| 767 | { | 767 | { |
| 768 | // This is for the OpenSimulator instance and is the osSecret hashed | 768 | // This is for the OpenSimulator instance and is the osSecret hashed |
| 769 | get { return "/" + osXStatsURI + "/"; } | 769 | get { return "/" + osXStatsURI; } |
| 770 | } | 770 | } |
| 771 | } | 771 | } |
| 772 | 772 | ||
| @@ -807,7 +807,7 @@ namespace OpenSim | |||
| 807 | public string Path | 807 | public string Path |
| 808 | { | 808 | { |
| 809 | // This is for the OpenSimulator instance and is the user provided URI | 809 | // This is for the OpenSimulator instance and is the user provided URI |
| 810 | get { return "/" + osUXStatsURI + "/"; } | 810 | get { return "/" + osUXStatsURI; } |
| 811 | } | 811 | } |
| 812 | } | 812 | } |
| 813 | 813 | ||