aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/OpenSim.Region/Scenes/Scene.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/OpenSim.Region/Scenes/Scene.cs')
-rw-r--r--OpenSim/OpenSim.Region/Scenes/Scene.cs44
1 files changed, 22 insertions, 22 deletions
diff --git a/OpenSim/OpenSim.Region/Scenes/Scene.cs b/OpenSim/OpenSim.Region/Scenes/Scene.cs
index 724d215..ffcc0c8 100644
--- a/OpenSim/OpenSim.Region/Scenes/Scene.cs
+++ b/OpenSim/OpenSim.Region/Scenes/Scene.cs
@@ -117,12 +117,12 @@ namespace OpenSim.Region.Scenes
117 m_scriptHandlers = new Dictionary<LLUUID, ScriptHandler>(); 117 m_scriptHandlers = new Dictionary<LLUUID, ScriptHandler>();
118 m_scripts = new Dictionary<string, ScriptFactory>(); 118 m_scripts = new Dictionary<string, ScriptFactory>();
119 119
120 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs - creating new entitities instance"); 120 OpenSim.Framework.Console.MainLog.Instance.Verbose( "World.cs - creating new entitities instance");
121 Entities = new Dictionary<libsecondlife.LLUUID, Entity>(); 121 Entities = new Dictionary<libsecondlife.LLUUID, Entity>();
122 Avatars = new Dictionary<LLUUID, Avatar>(); 122 Avatars = new Dictionary<LLUUID, Avatar>();
123 Prims = new Dictionary<LLUUID, Primitive>(); 123 Prims = new Dictionary<LLUUID, Primitive>();
124 124
125 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs - creating LandMap"); 125 OpenSim.Framework.Console.MainLog.Instance.Verbose( "World.cs - creating LandMap");
126 TerrainManager = new TerrainManager(new SecondLife()); 126 TerrainManager = new TerrainManager(new SecondLife());
127 Terrain = new TerrainEngine(); 127 Terrain = new TerrainEngine();
128 128
@@ -130,7 +130,7 @@ namespace OpenSim.Region.Scenes
130 } 130 }
131 catch (Exception e) 131 catch (Exception e)
132 { 132 {
133 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.CRITICAL, "World.cs: Constructor failed with exception " + e.ToString()); 133 OpenSim.Framework.Console.MainLog.Instance.Error( "World.cs: Constructor failed with exception " + e.ToString());
134 } 134 }
135 } 135 }
136 #endregion 136 #endregion
@@ -206,7 +206,7 @@ namespace OpenSim.Region.Scenes
206 } 206 }
207 catch (Exception e) 207 catch (Exception e)
208 { 208 {
209 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "World.cs: Update() - Failed with exception " + e.ToString()); 209 OpenSim.Framework.Console.MainLog.Instance.Warn("World.cs: Update() - Failed with exception " + e.ToString());
210 } 210 }
211 updateLock.ReleaseMutex(); 211 updateLock.ReleaseMutex();
212 212
@@ -225,9 +225,9 @@ namespace OpenSim.Region.Scenes
225 if (Terrain.tainted > 0) 225 if (Terrain.tainted > 0)
226 { 226 {
227 Terrain.tainted = 0; 227 Terrain.tainted = 0;
228 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs: Backup() - Terrain tainted, saving."); 228 OpenSim.Framework.Console.MainLog.Instance.Verbose( "World.cs: Backup() - Terrain tainted, saving.");
229 localStorage.SaveMap(Terrain.getHeights1D()); 229 localStorage.SaveMap(Terrain.getHeights1D());
230 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs: Backup() - Terrain saved, informing Physics."); 230 OpenSim.Framework.Console.MainLog.Instance.Verbose( "World.cs: Backup() - Terrain saved, informing Physics.");
231 lock (this.m_syncRoot) 231 lock (this.m_syncRoot)
232 { 232 {
233 phyScene.SetTerrain(Terrain.getHeights1D()); 233 phyScene.SetTerrain(Terrain.getHeights1D());
@@ -235,7 +235,7 @@ namespace OpenSim.Region.Scenes
235 } 235 }
236 236
237 // Primitive backup routines 237 // Primitive backup routines
238 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs: Backup() - Backing up Primitives"); 238 OpenSim.Framework.Console.MainLog.Instance.Verbose( "World.cs: Backup() - Backing up Primitives");
239 foreach (libsecondlife.LLUUID UUID in Entities.Keys) 239 foreach (libsecondlife.LLUUID UUID in Entities.Keys)
240 { 240 {
241 Entities[UUID].BackUp(); 241 Entities[UUID].BackUp();
@@ -257,7 +257,7 @@ namespace OpenSim.Region.Scenes
257 catch (Exception e) 257 catch (Exception e)
258 { 258 {
259 // Backup failed 259 // Backup failed
260 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH, "World.cs: Backup() - Backup Failed with exception " + e.ToString()); 260 OpenSim.Framework.Console.MainLog.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH, "World.cs: Backup() - Backup Failed with exception " + e.ToString());
261 return false; 261 return false;
262 } 262 }
263 */ 263 */
@@ -305,7 +305,7 @@ namespace OpenSim.Region.Scenes
305 } 305 }
306 catch (Exception e) 306 catch (Exception e)
307 { 307 {
308 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "World.cs: LoadStorageDLL() - Failed with exception " + e.ToString()); 308 OpenSim.Framework.Console.MainLog.Instance.Warn("World.cs: LoadStorageDLL() - Failed with exception " + e.ToString());
309 return false; 309 return false;
310 } 310 }
311 } 311 }
@@ -341,7 +341,7 @@ namespace OpenSim.Region.Scenes
341 } 341 }
342 catch (Exception e) 342 catch (Exception e)
343 { 343 {
344 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "World.cs: RegenerateTerrain() - Failed with exception " + e.ToString()); 344 OpenSim.Framework.Console.MainLog.Instance.Warn("World.cs: RegenerateTerrain() - Failed with exception " + e.ToString());
345 } 345 }
346 } 346 }
347 347
@@ -372,7 +372,7 @@ namespace OpenSim.Region.Scenes
372 } 372 }
373 catch (Exception e) 373 catch (Exception e)
374 { 374 {
375 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "World.cs: RegenerateTerrain() - Failed with exception " + e.ToString()); 375 OpenSim.Framework.Console.MainLog.Instance.Warn("World.cs: RegenerateTerrain() - Failed with exception " + e.ToString());
376 } 376 }
377 } 377 }
378 378
@@ -398,7 +398,7 @@ namespace OpenSim.Region.Scenes
398 } 398 }
399 catch (Exception e) 399 catch (Exception e)
400 { 400 {
401 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "World.cs: RegenerateTerrain() - Failed with exception " + e.ToString()); 401 OpenSim.Framework.Console.MainLog.Instance.Warn("World.cs: RegenerateTerrain() - Failed with exception " + e.ToString());
402 } 402 }
403 } 403 }
404 404
@@ -451,7 +451,7 @@ namespace OpenSim.Region.Scenes
451 } 451 }
452 catch (Exception e) 452 catch (Exception e)
453 { 453 {
454 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "World.cs: LoadWorldMap() - Failed with exception " + e.ToString()); 454 OpenSim.Framework.Console.MainLog.Instance.Warn("World.cs: LoadWorldMap() - Failed with exception " + e.ToString());
455 } 455 }
456 } 456 }
457 457
@@ -483,12 +483,12 @@ namespace OpenSim.Region.Scenes
483 { 483 {
484 try 484 try
485 { 485 {
486 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs: LoadPrimsFromStorage() - Loading primitives"); 486 OpenSim.Framework.Console.MainLog.Instance.Verbose( "World.cs: LoadPrimsFromStorage() - Loading primitives");
487 this.localStorage.LoadPrimitives(this); 487 this.localStorage.LoadPrimitives(this);
488 } 488 }
489 catch (Exception e) 489 catch (Exception e)
490 { 490 {
491 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "World.cs: LoadPrimsFromStorage() - Failed with exception " + e.ToString()); 491 OpenSim.Framework.Console.MainLog.Instance.Warn("World.cs: LoadPrimsFromStorage() - Failed with exception " + e.ToString());
492 } 492 }
493 } 493 }
494 494
@@ -520,7 +520,7 @@ namespace OpenSim.Region.Scenes
520 { 520 {
521 try 521 try
522 { 522 {
523 // MainConsole.Instance.Notice("World.cs: AddNewPrim() - Creating new prim"); 523 // MainLog.Instance.Notice("World.cs: AddNewPrim() - Creating new prim");
524 Primitive prim = new Primitive(m_regionHandle, this, addPacket, ownerID, this._primCount); 524 Primitive prim = new Primitive(m_regionHandle, this, addPacket, ownerID, this._primCount);
525 525
526 this.Entities.Add(prim.uuid, prim); 526 this.Entities.Add(prim.uuid, prim);
@@ -528,7 +528,7 @@ namespace OpenSim.Region.Scenes
528 } 528 }
529 catch (Exception e) 529 catch (Exception e)
530 { 530 {
531 // MainConsole.Instance.Warn("World.cs: AddNewPrim() - Failed with exception " + e.ToString()); 531 // MainLog.Instance.Warn("World.cs: AddNewPrim() - Failed with exception " + e.ToString());
532 } 532 }
533 } 533 }
534 534
@@ -563,10 +563,10 @@ namespace OpenSim.Region.Scenes
563 Avatar newAvatar = null; 563 Avatar newAvatar = null;
564 try 564 try
565 { 565 {
566 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs:AddViewerAgent() - Creating new avatar for remote viewer agent"); 566 OpenSim.Framework.Console.MainLog.Instance.Verbose( "World.cs:AddViewerAgent() - Creating new avatar for remote viewer agent");
567 newAvatar = new Avatar(remoteClient, this, this.m_regInfo); 567 newAvatar = new Avatar(remoteClient, this, this.m_regInfo);
568 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs:AddViewerAgent() - Adding new avatar to world"); 568 OpenSim.Framework.Console.MainLog.Instance.Verbose( "World.cs:AddViewerAgent() - Adding new avatar to world");
569 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs:AddViewerAgent() - Starting RegionHandshake "); 569 OpenSim.Framework.Console.MainLog.Instance.Verbose( "World.cs:AddViewerAgent() - Starting RegionHandshake ");
570 570
571 //newAvatar.SendRegionHandshake(); 571 //newAvatar.SendRegionHandshake();
572 this.estateManager.sendRegionHandshake(remoteClient); 572 this.estateManager.sendRegionHandshake(remoteClient);
@@ -602,7 +602,7 @@ namespace OpenSim.Region.Scenes
602 } 602 }
603 catch (Exception e) 603 catch (Exception e)
604 { 604 {
605 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "World.cs: AddViewerAgent() - Failed with exception " + e.ToString()); 605 OpenSim.Framework.Console.MainLog.Instance.Warn("World.cs: AddViewerAgent() - Failed with exception " + e.ToString());
606 } 606 }
607 return; 607 return;
608 } 608 }
@@ -685,7 +685,7 @@ namespace OpenSim.Region.Scenes
685 } 685 }
686 catch (Exception e) 686 catch (Exception e)
687 { 687 {
688 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH, "World.cs: Close() - Failed with exception " + e.ToString()); 688 OpenSim.Framework.Console.MainLog.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH, "World.cs: Close() - Failed with exception " + e.ToString());
689 } 689 }
690 } 690 }
691 #endregion 691 #endregion