aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application
diff options
context:
space:
mode:
authorlbsa712007-08-06 13:40:45 +0000
committerlbsa712007-08-06 13:40:45 +0000
commit07b011af3aef4455ad183bf00d3eccb4ba7e69dc (patch)
treeb62b36f38025fdf95c7b097e125a19c0411ecac7 /OpenSim/Region/Application
parent* The empty Regions dir now back in svn (diff)
downloadopensim-SC_OLD-07b011af3aef4455ad183bf00d3eccb4ba7e69dc.zip
opensim-SC_OLD-07b011af3aef4455ad183bf00d3eccb4ba7e69dc.tar.gz
opensim-SC_OLD-07b011af3aef4455ad183bf00d3eccb4ba7e69dc.tar.bz2
opensim-SC_OLD-07b011af3aef4455ad183bf00d3eccb4ba7e69dc.tar.xz
* renamed some scene to world
* passing on NotImplemented from Update()
Diffstat (limited to 'OpenSim/Region/Application')
-rw-r--r--OpenSim/Region/Application/OpenSimMain.cs104
1 files changed, 2 insertions, 102 deletions
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index 28d0477..cf3ed85 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -110,6 +110,7 @@ namespace OpenSim
110 { 110 {
111 Directory.CreateDirectory(Util.logDir()); 111 Directory.CreateDirectory(Util.logDir());
112 } 112 }
113
113 m_log = new LogBase(Path.Combine(Util.logDir(), m_logFilename), "Region", this, m_silent); 114 m_log = new LogBase(Path.Combine(Util.logDir(), m_logFilename), "Region", this, m_silent);
114 MainLog.Instance = m_log; 115 MainLog.Instance = m_log;
115 116
@@ -226,107 +227,6 @@ namespace OpenSim
226 } 227 }
227 228
228 #endregion 229 #endregion
229
230 /*private void SetupFromConfigFile(IGenericConfig configData)
231 {
232 // Log filename
233 string attri = "";
234 attri = configData.GetAttribute("LogFilename");
235 if (String.IsNullOrEmpty(attri))
236 {
237 }
238 else
239 {
240 m_logFilename = attri;
241 }
242
243 // SandBoxMode
244 attri = "";
245 attri = configData.GetAttribute("SandBox");
246 if ((attri == "") || ((attri != "false") && (attri != "true")))
247 {
248 this.m_sandbox = false;
249 configData.SetAttribute("SandBox", "false");
250 }
251 else
252 {
253 this.m_sandbox = Convert.ToBoolean(attri);
254 }
255
256 // LoginServer
257 attri = "";
258 attri = configData.GetAttribute("LoginServer");
259 if ((attri == "") || ((attri != "false") && (attri != "true")))
260 {
261 this.m_loginserver = false;
262 configData.SetAttribute("LoginServer", "false");
263 }
264 else
265 {
266 this.m_loginserver = Convert.ToBoolean(attri);
267 }
268
269 // Sandbox User accounts
270 attri = "";
271 attri = configData.GetAttribute("UserAccount");
272 if ((attri == "") || ((attri != "false") && (attri != "true")))
273 {
274 this.user_accounts = false;
275 configData.SetAttribute("UserAccounts", "false");
276 }
277 else if (attri == "true")
278 {
279 this.user_accounts = Convert.ToBoolean(attri);
280 }
281
282 // Grid mode hack to use local asset server
283 attri = "";
284 attri = configData.GetAttribute("LocalAssets");
285 if ((attri == "") || ((attri != "false") && (attri != "true")))
286 {
287 this.m_gridLocalAsset = false;
288 configData.SetAttribute("LocalAssets", "false");
289 }
290 else if (attri == "true")
291 {
292 this.m_gridLocalAsset = Convert.ToBoolean(attri);
293 }
294
295
296 attri = "";
297 attri = configData.GetAttribute("PhysicsEngine");
298 switch (attri)
299 {
300 default:
301 throw new ArgumentException(String.Format( "Invalid value [{0}] for PhysicsEngine attribute, terminating", attri ) );
302
303 case "":
304 case "basicphysics":
305 this.m_physicsEngine = "basicphysics";
306 configData.SetAttribute("PhysicsEngine", "basicphysics");
307 ScenePresence.PhysicsEngineFlying = false;
308 break;
309
310 case "RealPhysX":
311 this.m_physicsEngine = "RealPhysX";
312 ScenePresence.PhysicsEngineFlying = true;
313 break;
314
315 case "OpenDynamicsEngine":
316 this.m_physicsEngine = "OpenDynamicsEngine";
317 ScenePresence.PhysicsEngineFlying = true;
318 break;
319
320 case "BulletXEngine":
321 this.m_physicsEngine = "BulletXEngine";
322 ScenePresence.PhysicsEngineFlying = true;
323 break;
324 }
325
326 configData.Commit();
327
328 }*/
329
330 /// <summary> 230 /// <summary>
331 /// Performs any last-minute sanity checking and shuts down the region server 231 /// Performs any last-minute sanity checking and shuts down the region server
332 /// </summary> 232 /// </summary>
@@ -339,7 +239,7 @@ namespace OpenSim
339 m_log.Verbose("Closing console and terminating"); 239 m_log.Verbose("Closing console and terminating");
340 for (int i = 0; i < m_localScenes.Count; i++) 240 for (int i = 0; i < m_localScenes.Count; i++)
341 { 241 {
342 ((Scene)m_localScenes[i]).Close(); 242 m_localScenes[i].Close();
343 } 243 }
344 m_log.Close(); 244 m_log.Close();
345 Environment.Exit(0); 245 Environment.Exit(0);