diff options
author | MW | 2009-07-10 11:03:38 +0000 |
---|---|---|
committer | MW | 2009-07-10 11:03:38 +0000 |
commit | 78d7f4696ec58aea95e0c351a38713f1df0bb279 (patch) | |
tree | c011e833bb929492587d8de5ab660e650f7e7e72 /OpenSim/Region/Application | |
parent | Switch runprebuild.bat from VS2005 to VS2008. Remove runprebuild2008.bat. (diff) | |
download | opensim-SC-78d7f4696ec58aea95e0c351a38713f1df0bb279.zip opensim-SC-78d7f4696ec58aea95e0c351a38713f1df0bb279.tar.gz opensim-SC-78d7f4696ec58aea95e0c351a38713f1df0bb279.tar.bz2 opensim-SC-78d7f4696ec58aea95e0c351a38713f1df0bb279.tar.xz |
Now we are past revision 10000, I think its time to start to fix that massive bug that was introduced in revision 1. So here is the first part of that fix.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Application/OpenSim.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Application/OpenSimBackground.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Application/OpenSimBase.cs | 10 |
3 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs index 3babe72..524dd4c 100644 --- a/OpenSim/Region/Application/OpenSim.cs +++ b/OpenSim/Region/Application/OpenSim.cs | |||
@@ -1130,7 +1130,7 @@ namespace OpenSim | |||
1130 | } | 1130 | } |
1131 | 1131 | ||
1132 | /// <summary> | 1132 | /// <summary> |
1133 | /// Load a whole region from an opensim archive. | 1133 | /// Load a whole region from an opensimulator archive. |
1134 | /// </summary> | 1134 | /// </summary> |
1135 | /// <param name="cmdparams"></param> | 1135 | /// <param name="cmdparams"></param> |
1136 | protected void LoadOar(string module, string[] cmdparams) | 1136 | protected void LoadOar(string module, string[] cmdparams) |
diff --git a/OpenSim/Region/Application/OpenSimBackground.cs b/OpenSim/Region/Application/OpenSimBackground.cs index cc4bb56..ac5e241 100644 --- a/OpenSim/Region/Application/OpenSimBackground.cs +++ b/OpenSim/Region/Application/OpenSimBackground.cs | |||
@@ -33,7 +33,7 @@ using Nini.Config; | |||
33 | namespace OpenSim | 33 | namespace OpenSim |
34 | { | 34 | { |
35 | /// <summary> | 35 | /// <summary> |
36 | /// Consoleless OpenSim region server | 36 | /// Consoleless OpenSimulator region server |
37 | /// </summary> | 37 | /// </summary> |
38 | public class OpenSimBackground : OpenSim | 38 | public class OpenSimBackground : OpenSim |
39 | { | 39 | { |
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs index 671ea67..412c6c3 100644 --- a/OpenSim/Region/Application/OpenSimBase.cs +++ b/OpenSim/Region/Application/OpenSimBase.cs | |||
@@ -51,7 +51,7 @@ using OpenSim.Region.Physics.Manager; | |||
51 | namespace OpenSim | 51 | namespace OpenSim |
52 | { | 52 | { |
53 | /// <summary> | 53 | /// <summary> |
54 | /// Common OpenSim simulator code | 54 | /// Common OpenSimulator simulator code |
55 | /// </summary> | 55 | /// </summary> |
56 | public class OpenSimBase : RegionApplicationBase | 56 | public class OpenSimBase : RegionApplicationBase |
57 | { | 57 | { |
@@ -76,7 +76,7 @@ namespace OpenSim | |||
76 | protected const string DEFAULT_PRIM_BACKUP_FILENAME = "prim-backup.xml"; | 76 | protected const string DEFAULT_PRIM_BACKUP_FILENAME = "prim-backup.xml"; |
77 | 77 | ||
78 | /// <summary> | 78 | /// <summary> |
79 | /// The file used to load and save an opensim archive if no filename has been specified | 79 | /// The file used to load and save an opensimulator archive if no filename has been specified |
80 | /// </summary> | 80 | /// </summary> |
81 | protected const string DEFAULT_OAR_BACKUP_FILENAME = "region.oar"; | 81 | protected const string DEFAULT_OAR_BACKUP_FILENAME = "region.oar"; |
82 | 82 | ||
@@ -97,7 +97,7 @@ namespace OpenSim | |||
97 | protected List<IApplicationPlugin> m_plugins = new List<IApplicationPlugin>(); | 97 | protected List<IApplicationPlugin> m_plugins = new List<IApplicationPlugin>(); |
98 | 98 | ||
99 | /// <value> | 99 | /// <value> |
100 | /// The config information passed into the OpenSim region server. | 100 | /// The config information passed into the OpenSimulator region server. |
101 | /// </value> | 101 | /// </value> |
102 | public OpenSimConfigSource ConfigSource | 102 | public OpenSimConfigSource ConfigSource |
103 | { | 103 | { |
@@ -751,7 +751,7 @@ namespace OpenSim | |||
751 | 751 | ||
752 | public string Path | 752 | public string Path |
753 | { | 753 | { |
754 | // This is for the OpenSim instance and is the osSecret hashed | 754 | // This is for the OpenSimulator instance and is the osSecret hashed |
755 | get { return "/" + osXStatsURI + "/"; } | 755 | get { return "/" + osXStatsURI + "/"; } |
756 | } | 756 | } |
757 | } | 757 | } |
@@ -792,7 +792,7 @@ namespace OpenSim | |||
792 | 792 | ||
793 | public string Path | 793 | public string Path |
794 | { | 794 | { |
795 | // This is for the OpenSim instance and is the user provided URI | 795 | // This is for the OpenSimulator instance and is the user provided URI |
796 | get { return "/" + osUXStatsURI + "/"; } | 796 | get { return "/" + osUXStatsURI + "/"; } |
797 | } | 797 | } |
798 | } | 798 | } |