diff options
author | Adam Frisby | 2007-05-12 15:32:04 +0000 |
---|---|---|
committer | Adam Frisby | 2007-05-12 15:32:04 +0000 |
commit | bd05850be1ce0dcf45c37b5e7b7c53ace2682b2b (patch) | |
tree | f4b4af88ceba3f9cb2d861fadae901280c40147f /OpenSim.RegionServer/world/World.cs | |
parent | Only 193 warnings to go! (diff) | |
download | opensim-SC-bd05850be1ce0dcf45c37b5e7b7c53ace2682b2b.zip opensim-SC-bd05850be1ce0dcf45c37b5e7b7c53ace2682b2b.tar.gz opensim-SC-bd05850be1ce0dcf45c37b5e7b7c53ace2682b2b.tar.bz2 opensim-SC-bd05850be1ce0dcf45c37b5e7b7c53ace2682b2b.tar.xz |
93 warnings in the compiler, 93 warnings appear, you fix one up, create two more, 94 warnings in the compiler...
Diffstat (limited to 'OpenSim.RegionServer/world/World.cs')
-rw-r--r-- | OpenSim.RegionServer/world/World.cs | 62 |
1 files changed, 31 insertions, 31 deletions
diff --git a/OpenSim.RegionServer/world/World.cs b/OpenSim.RegionServer/world/World.cs index 0ae4ae2..225ce81 100644 --- a/OpenSim.RegionServer/world/World.cs +++ b/OpenSim.RegionServer/world/World.cs | |||
@@ -64,12 +64,12 @@ namespace OpenSim.world | |||
64 | m_scriptHandlers = new Dictionary<LLUUID, ScriptHandler>(); | 64 | m_scriptHandlers = new Dictionary<LLUUID, ScriptHandler>(); |
65 | m_scripts = new Dictionary<string, ScriptFactory>(); | 65 | m_scripts = new Dictionary<string, ScriptFactory>(); |
66 | 66 | ||
67 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs - creating new entitities instance"); | 67 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"World.cs - creating new entitities instance"); |
68 | Entities = new Dictionary<libsecondlife.LLUUID, Entity>(); | 68 | Entities = new Dictionary<libsecondlife.LLUUID, Entity>(); |
69 | Avatars = new Dictionary<LLUUID, Avatar>(); | 69 | Avatars = new Dictionary<LLUUID, Avatar>(); |
70 | Prims = new Dictionary<LLUUID, Primitive>(); | 70 | Prims = new Dictionary<LLUUID, Primitive>(); |
71 | 71 | ||
72 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs - creating LandMap"); | 72 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"World.cs - creating LandMap"); |
73 | TerrainManager = new TerrainManager(new SecondLife()); | 73 | TerrainManager = new TerrainManager(new SecondLife()); |
74 | Terrain = new TerrainEngine(); | 74 | Terrain = new TerrainEngine(); |
75 | Avatar.SetupTemplate("avatar-texture.dat"); | 75 | Avatar.SetupTemplate("avatar-texture.dat"); |
@@ -82,7 +82,7 @@ namespace OpenSim.world | |||
82 | } | 82 | } |
83 | catch (Exception e) | 83 | catch (Exception e) |
84 | { | 84 | { |
85 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs: Constructor failed with exception " + e.ToString()); | 85 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.CRITICAL,"World.cs: Constructor failed with exception " + e.ToString()); |
86 | } | 86 | } |
87 | } | 87 | } |
88 | 88 | ||
@@ -100,7 +100,7 @@ namespace OpenSim.world | |||
100 | } | 100 | } |
101 | catch (Exception e) | 101 | catch (Exception e) |
102 | { | 102 | { |
103 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs: AddScript() - Failed with exception " + e.ToString()); | 103 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM,"World.cs: AddScript() - Failed with exception " + e.ToString()); |
104 | } | 104 | } |
105 | } | 105 | } |
106 | 106 | ||
@@ -152,7 +152,7 @@ namespace OpenSim.world | |||
152 | } | 152 | } |
153 | catch (Exception e) | 153 | catch (Exception e) |
154 | { | 154 | { |
155 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs: AddScript() - Failed with exception " + e.ToString()); | 155 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM,"World.cs: AddScript() - Failed with exception " + e.ToString()); |
156 | } | 156 | } |
157 | } | 157 | } |
158 | 158 | ||
@@ -230,7 +230,7 @@ namespace OpenSim.world | |||
230 | } | 230 | } |
231 | catch (Exception e) | 231 | catch (Exception e) |
232 | { | 232 | { |
233 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs: Update() - Failed with exception " + e.ToString()); | 233 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM,"World.cs: Update() - Failed with exception " + e.ToString()); |
234 | } | 234 | } |
235 | updateLock.ReleaseMutex(); | 235 | updateLock.ReleaseMutex(); |
236 | } | 236 | } |
@@ -274,7 +274,7 @@ namespace OpenSim.world | |||
274 | } | 274 | } |
275 | catch (Exception e) | 275 | catch (Exception e) |
276 | { | 276 | { |
277 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs: LoadStorageDLL() - Failed with exception " + e.ToString()); | 277 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM,"World.cs: LoadStorageDLL() - Failed with exception " + e.ToString()); |
278 | return false; | 278 | return false; |
279 | } | 279 | } |
280 | } | 280 | } |
@@ -308,7 +308,7 @@ namespace OpenSim.world | |||
308 | } | 308 | } |
309 | catch (Exception e) | 309 | catch (Exception e) |
310 | { | 310 | { |
311 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs: RegenerateTerrain() - Failed with exception " + e.ToString()); | 311 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM,"World.cs: RegenerateTerrain() - Failed with exception " + e.ToString()); |
312 | } | 312 | } |
313 | } | 313 | } |
314 | 314 | ||
@@ -339,7 +339,7 @@ namespace OpenSim.world | |||
339 | } | 339 | } |
340 | catch (Exception e) | 340 | catch (Exception e) |
341 | { | 341 | { |
342 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs: RegenerateTerrain() - Failed with exception " + e.ToString()); | 342 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM,"World.cs: RegenerateTerrain() - Failed with exception " + e.ToString()); |
343 | } | 343 | } |
344 | } | 344 | } |
345 | 345 | ||
@@ -369,7 +369,7 @@ namespace OpenSim.world | |||
369 | } | 369 | } |
370 | catch (Exception e) | 370 | catch (Exception e) |
371 | { | 371 | { |
372 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs: RegenerateTerrain() - Failed with exception " + e.ToString()); | 372 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM,"World.cs: RegenerateTerrain() - Failed with exception " + e.ToString()); |
373 | } | 373 | } |
374 | } | 374 | } |
375 | 375 | ||
@@ -397,7 +397,7 @@ namespace OpenSim.world | |||
397 | } | 397 | } |
398 | catch (Exception e) | 398 | catch (Exception e) |
399 | { | 399 | { |
400 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs: LoadWorldMap() - Failed with exception " + e.ToString()); | 400 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM,"World.cs: LoadWorldMap() - Failed with exception " + e.ToString()); |
401 | } | 401 | } |
402 | } | 402 | } |
403 | 403 | ||
@@ -408,12 +408,12 @@ namespace OpenSim.world | |||
408 | { | 408 | { |
409 | try | 409 | try |
410 | { | 410 | { |
411 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs: LoadPrimsFromStorage() - Loading primitives"); | 411 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"World.cs: LoadPrimsFromStorage() - Loading primitives"); |
412 | this.localStorage.LoadPrimitives(this); | 412 | this.localStorage.LoadPrimitives(this); |
413 | } | 413 | } |
414 | catch (Exception e) | 414 | catch (Exception e) |
415 | { | 415 | { |
416 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs: LoadPrimsFromStorage() - Failed with exception " + e.ToString()); | 416 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM,"World.cs: LoadPrimsFromStorage() - Failed with exception " + e.ToString()); |
417 | } | 417 | } |
418 | } | 418 | } |
419 | 419 | ||
@@ -429,14 +429,14 @@ namespace OpenSim.world | |||
429 | { | 429 | { |
430 | _primCount = prim.LocalID + 1; | 430 | _primCount = prim.LocalID + 1; |
431 | } | 431 | } |
432 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs: PrimFromStorage() - Reloading prim (localId " + prim.LocalID + " ) from storage"); | 432 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"World.cs: PrimFromStorage() - Reloading prim (localId " + prim.LocalID + " ) from storage"); |
433 | Primitive nPrim = new Primitive(m_clientThreads, m_regionHandle, this); | 433 | Primitive nPrim = new Primitive(m_clientThreads, m_regionHandle, this); |
434 | nPrim.CreateFromStorage(prim); | 434 | nPrim.CreateFromStorage(prim); |
435 | this.Entities.Add(nPrim.uuid, nPrim); | 435 | this.Entities.Add(nPrim.uuid, nPrim); |
436 | } | 436 | } |
437 | catch (Exception e) | 437 | catch (Exception e) |
438 | { | 438 | { |
439 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs: PrimFromStorage() - Failed with exception " + e.ToString()); | 439 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM,"World.cs: PrimFromStorage() - Failed with exception " + e.ToString()); |
440 | } | 440 | } |
441 | } | 441 | } |
442 | 442 | ||
@@ -451,7 +451,7 @@ namespace OpenSim.world | |||
451 | } | 451 | } |
452 | catch (Exception e) | 452 | catch (Exception e) |
453 | { | 453 | { |
454 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs: Close() - Failed with exception " + e.ToString()); | 454 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH,"World.cs: Close() - Failed with exception " + e.ToString()); |
455 | } | 455 | } |
456 | } | 456 | } |
457 | 457 | ||
@@ -481,7 +481,7 @@ namespace OpenSim.world | |||
481 | } | 481 | } |
482 | catch (Exception e) | 482 | catch (Exception e) |
483 | { | 483 | { |
484 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs: SendLayerData() - Failed with exception " + e.ToString()); | 484 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM,"World.cs: SendLayerData() - Failed with exception " + e.ToString()); |
485 | } | 485 | } |
486 | } | 486 | } |
487 | 487 | ||
@@ -514,7 +514,7 @@ namespace OpenSim.world | |||
514 | } | 514 | } |
515 | catch (Exception e) | 515 | catch (Exception e) |
516 | { | 516 | { |
517 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs: SendLayerData() - Failed with exception " + e.ToString()); | 517 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM,"World.cs: SendLayerData() - Failed with exception " + e.ToString()); |
518 | } | 518 | } |
519 | } | 519 | } |
520 | 520 | ||
@@ -537,7 +537,7 @@ namespace OpenSim.world | |||
537 | } | 537 | } |
538 | catch (Exception e) | 538 | catch (Exception e) |
539 | { | 539 | { |
540 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs: GetInitialPrims() - Failed with exception " + e.ToString()); | 540 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM,"World.cs: GetInitialPrims() - Failed with exception " + e.ToString()); |
541 | } | 541 | } |
542 | } | 542 | } |
543 | 543 | ||
@@ -545,10 +545,10 @@ namespace OpenSim.world | |||
545 | { | 545 | { |
546 | try | 546 | try |
547 | { | 547 | { |
548 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs:AddViewerAgent() - Creating new avatar for remote viewer agent"); | 548 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"World.cs:AddViewerAgent() - Creating new avatar for remote viewer agent"); |
549 | Avatar newAvatar = new Avatar(agentClient, this, m_regionName, m_clientThreads, m_regionHandle, true, 20); | 549 | Avatar newAvatar = new Avatar(agentClient, this, m_regionName, m_clientThreads, m_regionHandle, true, 20); |
550 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs:AddViewerAgent() - Adding new avatar to world"); | 550 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"World.cs:AddViewerAgent() - Adding new avatar to world"); |
551 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs:AddViewerAgent() - Starting RegionHandshake "); | 551 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"World.cs:AddViewerAgent() - Starting RegionHandshake "); |
552 | newAvatar.SendRegionHandshake(this); | 552 | newAvatar.SendRegionHandshake(this); |
553 | if (!agentClient.m_child) | 553 | if (!agentClient.m_child) |
554 | { | 554 | { |
@@ -569,7 +569,7 @@ namespace OpenSim.world | |||
569 | } | 569 | } |
570 | catch (Exception e) | 570 | catch (Exception e) |
571 | { | 571 | { |
572 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs: AddViewerAgent() - Failed with exception " + e.ToString()); | 572 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM,"World.cs: AddViewerAgent() - Failed with exception " + e.ToString()); |
573 | } | 573 | } |
574 | } | 574 | } |
575 | 575 | ||
@@ -588,7 +588,7 @@ namespace OpenSim.world | |||
588 | } | 588 | } |
589 | catch (Exception e) | 589 | catch (Exception e) |
590 | { | 590 | { |
591 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs: RemoveViewerAgent() - Failed with exception " + e.ToString()); | 591 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM,"World.cs: RemoveViewerAgent() - Failed with exception " + e.ToString()); |
592 | } | 592 | } |
593 | } | 593 | } |
594 | 594 | ||
@@ -596,7 +596,7 @@ namespace OpenSim.world | |||
596 | { | 596 | { |
597 | try | 597 | try |
598 | { | 598 | { |
599 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs: AddNewPrim() - Creating new prim"); | 599 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"World.cs: AddNewPrim() - Creating new prim"); |
600 | Primitive prim = new Primitive(m_clientThreads, m_regionHandle, this); | 600 | Primitive prim = new Primitive(m_clientThreads, m_regionHandle, this); |
601 | prim.CreateFromPacket(addPacket, AgentClient.AgentID, this._primCount); | 601 | prim.CreateFromPacket(addPacket, AgentClient.AgentID, this._primCount); |
602 | PhysicsVector pVec = new PhysicsVector(prim.Pos.X, prim.Pos.Y, prim.Pos.Z); | 602 | PhysicsVector pVec = new PhysicsVector(prim.Pos.X, prim.Pos.Y, prim.Pos.Z); |
@@ -614,7 +614,7 @@ namespace OpenSim.world | |||
614 | } | 614 | } |
615 | catch (Exception e) | 615 | catch (Exception e) |
616 | { | 616 | { |
617 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs: AddNewPrim() - Failed with exception " + e.ToString()); | 617 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM,"World.cs: AddNewPrim() - Failed with exception " + e.ToString()); |
618 | } | 618 | } |
619 | } | 619 | } |
620 | 620 | ||
@@ -626,14 +626,14 @@ namespace OpenSim.world | |||
626 | if (Terrain.tainted > 0) | 626 | if (Terrain.tainted > 0) |
627 | { | 627 | { |
628 | Terrain.tainted = 0; | 628 | Terrain.tainted = 0; |
629 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs: Backup() - Terrain tainted, saving."); | 629 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"World.cs: Backup() - Terrain tainted, saving."); |
630 | localStorage.SaveMap(Terrain.getHeights1D()); | 630 | localStorage.SaveMap(Terrain.getHeights1D()); |
631 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs: Backup() - Terrain saved, informing Physics."); | 631 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"World.cs: Backup() - Terrain saved, informing Physics."); |
632 | phyScene.SetTerrain(Terrain.getHeights1D()); | 632 | phyScene.SetTerrain(Terrain.getHeights1D()); |
633 | } | 633 | } |
634 | 634 | ||
635 | // Primitive backup routines | 635 | // Primitive backup routines |
636 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs: Backup() - Backing up Primitives"); | 636 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"World.cs: Backup() - Backing up Primitives"); |
637 | foreach (libsecondlife.LLUUID UUID in Entities.Keys) | 637 | foreach (libsecondlife.LLUUID UUID in Entities.Keys) |
638 | { | 638 | { |
639 | Entities[UUID].BackUp(); | 639 | Entities[UUID].BackUp(); |
@@ -645,7 +645,7 @@ namespace OpenSim.world | |||
645 | catch (Exception e) | 645 | catch (Exception e) |
646 | { | 646 | { |
647 | // Backup failed | 647 | // Backup failed |
648 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs: Backup() - Backup Failed with exception " + e.ToString()); | 648 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH,"World.cs: Backup() - Backup Failed with exception " + e.ToString()); |
649 | return false; | 649 | return false; |
650 | } | 650 | } |
651 | } | 651 | } |
@@ -661,7 +661,7 @@ namespace OpenSim.world | |||
661 | } | 661 | } |
662 | catch (Exception e) | 662 | catch (Exception e) |
663 | { | 663 | { |
664 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs: SetDefaultScripts() - Failed with exception " + e.ToString()); | 664 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM,"World.cs: SetDefaultScripts() - Failed with exception " + e.ToString()); |
665 | } | 665 | } |
666 | } | 666 | } |
667 | 667 | ||