diff options
author | MW | 2007-05-31 12:05:32 +0000 |
---|---|---|
committer | MW | 2007-05-31 12:05:32 +0000 |
commit | 33b8fe52d61b5d0aa786ba9b1ce11d4caf9da5d1 (patch) | |
tree | ce87042013bd75aae144b17a813ba2a24a4e5a5b /OpenSim | |
parent | The cleaning lady must be looking for a bonus (diff) | |
download | opensim-SC_OLD-33b8fe52d61b5d0aa786ba9b1ce11d4caf9da5d1.zip opensim-SC_OLD-33b8fe52d61b5d0aa786ba9b1ce11d4caf9da5d1.tar.gz opensim-SC_OLD-33b8fe52d61b5d0aa786ba9b1ce11d4caf9da5d1.tar.bz2 opensim-SC_OLD-33b8fe52d61b5d0aa786ba9b1ce11d4caf9da5d1.tar.xz |
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/OpenSim.RegionServer/RegionServerBase.cs | 2 | ||||
-rw-r--r-- | OpenSim/OpenSim/OpenSimMain.cs | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/OpenSim.RegionServer/RegionServerBase.cs b/OpenSim/OpenSim.RegionServer/RegionServerBase.cs index b7129c5..e2e3512 100644 --- a/OpenSim/OpenSim.RegionServer/RegionServerBase.cs +++ b/OpenSim/OpenSim.RegionServer/RegionServerBase.cs | |||
@@ -87,7 +87,7 @@ namespace OpenSim | |||
87 | 87 | ||
88 | } | 88 | } |
89 | 89 | ||
90 | protected virtual void SetupLocalWorld() | 90 | protected virtual void SetupWorld() |
91 | { | 91 | { |
92 | } | 92 | } |
93 | 93 | ||
diff --git a/OpenSim/OpenSim/OpenSimMain.cs b/OpenSim/OpenSim/OpenSimMain.cs index 95b8e10..7c3bca4 100644 --- a/OpenSim/OpenSim/OpenSimMain.cs +++ b/OpenSim/OpenSim/OpenSimMain.cs | |||
@@ -112,7 +112,7 @@ namespace OpenSim | |||
112 | this.physManager = new OpenSim.Physics.Manager.PhysicsManager(); | 112 | this.physManager = new OpenSim.Physics.Manager.PhysicsManager(); |
113 | this.physManager.LoadPlugins(); | 113 | this.physManager.LoadPlugins(); |
114 | 114 | ||
115 | this.SetupLocalWorld(); | 115 | this.SetupWorld(); |
116 | 116 | ||
117 | m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Main.cs:Startup() - Initialising HTTP server"); | 117 | m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Main.cs:Startup() - Initialising HTTP server"); |
118 | 118 | ||
@@ -178,7 +178,7 @@ namespace OpenSim | |||
178 | } | 178 | } |
179 | } | 179 | } |
180 | 180 | ||
181 | protected override void SetupLocalWorld() | 181 | protected override void SetupWorld() |
182 | { | 182 | { |
183 | IGenericConfig regionConfig; | 183 | IGenericConfig regionConfig; |
184 | World LocalWorld; | 184 | World LocalWorld; |