OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.

trunk
MW 2009-07-10 11:03:38 +00:00
parent f9ff986908
commit 78d7f4696e
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/ApplicationPlugins/Rest/RestPlugin.cs
View File

@ -240,8 +240,8 @@ namespace OpenSim.ApplicationPlugins.Rest
// the key lookup in Configs failed, which signals to // the key lookup in Configs failed, which signals to
// us that noone is interested in our services...they // us that noone is interested in our services...they
// don't know what they are missing out on... // don't know what they are missing out on...
// NOTE: Under the present OpenSim implementation it is // NOTE: Under the present OpenSimulator implementation it is
// not possible for the openSim pointer to be null. However // not possible for the openSimulator pointer to be null. However
// were the implementation to be changed, this could // were the implementation to be changed, this could
// result in a silent initialization failure. Harmless // result in a silent initialization failure. Harmless
// except for lack of function and lack of any // except for lack of function and lack of any

2
OpenSim/Region/Application/OpenSim.cs
View File

@ -1130,7 +1130,7 @@ namespace OpenSim
} }
/// <summary> /// <summary>
/// Load a whole region from an opensim archive. /// Load a whole region from an opensimulator archive.
/// </summary> /// </summary>
/// <param name="cmdparams"></param> /// <param name="cmdparams"></param>
protected void LoadOar(string module, string[] cmdparams) protected void LoadOar(string module, string[] cmdparams)

2
OpenSim/Region/Application/OpenSimBackground.cs
View File

@ -33,7 +33,7 @@ using Nini.Config;
namespace OpenSim namespace OpenSim
{ {
/// <summary> /// <summary>
/// Consoleless OpenSim region server /// Consoleless OpenSimulator region server
/// </summary> /// </summary>
public class OpenSimBackground : OpenSim public class OpenSimBackground : OpenSim
{ {

10
OpenSim/Region/Application/OpenSimBase.cs
View File

@ -51,7 +51,7 @@ using OpenSim.Region.Physics.Manager;
namespace OpenSim namespace OpenSim
{ {
/// <summary> /// <summary>
/// Common OpenSim simulator code /// Common OpenSimulator simulator code
/// </summary> /// </summary>
public class OpenSimBase : RegionApplicationBase public class OpenSimBase : RegionApplicationBase
{ {
@ -76,7 +76,7 @@ namespace OpenSim
protected const string DEFAULT_PRIM_BACKUP_FILENAME = "prim-backup.xml"; protected const string DEFAULT_PRIM_BACKUP_FILENAME = "prim-backup.xml";
/// <summary> /// <summary>
/// The file used to load and save an opensim archive if no filename has been specified /// The file used to load and save an opensimulator archive if no filename has been specified
/// </summary> /// </summary>
protected const string DEFAULT_OAR_BACKUP_FILENAME = "region.oar"; protected const string DEFAULT_OAR_BACKUP_FILENAME = "region.oar";
@ -97,7 +97,7 @@ namespace OpenSim
protected List<IApplicationPlugin> m_plugins = new List<IApplicationPlugin>(); protected List<IApplicationPlugin> m_plugins = new List<IApplicationPlugin>();
/// <value> /// <value>
/// The config information passed into the OpenSim region server. /// The config information passed into the OpenSimulator region server.
/// </value> /// </value>
public OpenSimConfigSource ConfigSource public OpenSimConfigSource ConfigSource
{ {
@ -751,7 +751,7 @@ namespace OpenSim
public string Path public string Path
{ {
// This is for the OpenSim instance and is the osSecret hashed // This is for the OpenSimulator instance and is the osSecret hashed
get { return "/" + osXStatsURI + "/"; } get { return "/" + osXStatsURI + "/"; }
} }
} }
@ -792,7 +792,7 @@ namespace OpenSim
public string Path public string Path
{ {
// This is for the OpenSim instance and is the user provided URI // This is for the OpenSimulator instance and is the user provided URI
get { return "/" + osUXStatsURI + "/"; } get { return "/" + osUXStatsURI + "/"; }
} }
} }