aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/OpenSim.World/World.cs
diff options
context:
space:
mode:
authorMW2007-06-09 11:13:02 +0000
committerMW2007-06-09 11:13:02 +0000
commit3658015de8f614b99f116b2971957307f0960c55 (patch)
tree491156d6c9a5319bdf032c94abd70784c157854e /OpenSim/OpenSim.World/World.cs
parentProtip: Check for obvious errors before submitting (diff)
downloadopensim-SC_OLD-3658015de8f614b99f116b2971957307f0960c55.zip
opensim-SC_OLD-3658015de8f614b99f116b2971957307f0960c55.tar.gz
opensim-SC_OLD-3658015de8f614b99f116b2971957307f0960c55.tar.bz2
opensim-SC_OLD-3658015de8f614b99f116b2971957307f0960c55.tar.xz
Number of small changes.
Diffstat (limited to 'OpenSim/OpenSim.World/World.cs')
-rw-r--r--OpenSim/OpenSim.World/World.cs21
1 files changed, 11 insertions, 10 deletions
diff --git a/OpenSim/OpenSim.World/World.cs b/OpenSim/OpenSim.World/World.cs
index dc9602e..3e74501 100644
--- a/OpenSim/OpenSim.World/World.cs
+++ b/OpenSim/OpenSim.World/World.cs
@@ -24,9 +24,8 @@ namespace OpenSim.world
24 { 24 {
25 protected System.Timers.Timer m_heartbeatTimer = new System.Timers.Timer(); 25 protected System.Timers.Timer m_heartbeatTimer = new System.Timers.Timer();
26 public object LockPhysicsEngine = new object(); 26 public object LockPhysicsEngine = new object();
27 public Dictionary<libsecondlife.LLUUID, Avatar> Avatars; 27 protected Dictionary<libsecondlife.LLUUID, Avatar> Avatars;
28 public Dictionary<libsecondlife.LLUUID, Primitive> Prims; 28 protected Dictionary<libsecondlife.LLUUID, Primitive> Prims;
29 //public ScriptEngine Scripts;
30 public uint _localNumber = 0; 29 public uint _localNumber = 0;
31 private PhysicsScene phyScene; 30 private PhysicsScene phyScene;
32 private float timeStep = 0.1f; 31 private float timeStep = 0.1f;
@@ -83,8 +82,8 @@ namespace OpenSim.world
83 this.m_datastore = m_regInfo.DataStore; 82 this.m_datastore = m_regInfo.DataStore;
84 this.RegisterRegionWithComms(); 83 this.RegisterRegionWithComms();
85 84
86 parcelManager = new ParcelManager(this,this.m_regInfo); 85 parcelManager = new ParcelManager(this, this.m_regInfo);
87 estateManager = new EstateManager(this,this.m_regInfo); 86 estateManager = new EstateManager(this, this.m_regInfo);
88 87
89 m_scriptHandlers = new Dictionary<LLUUID, ScriptHandler>(); 88 m_scriptHandlers = new Dictionary<LLUUID, ScriptHandler>();
90 m_scripts = new Dictionary<string, ScriptFactory>(); 89 m_scripts = new Dictionary<string, ScriptFactory>();
@@ -476,10 +475,12 @@ namespace OpenSim.world
476 try 475 try
477 { 476 {
478 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs:AddViewerAgent() - Creating new avatar for remote viewer agent"); 477 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs:AddViewerAgent() - Creating new avatar for remote viewer agent");
479 newAvatar = new Avatar(remoteClient, this, m_clientThreads,this.m_regInfo); 478 newAvatar = new Avatar(remoteClient, this, m_clientThreads, this.m_regInfo);
480 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs:AddViewerAgent() - Adding new avatar to world"); 479 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs:AddViewerAgent() - Adding new avatar to world");
481 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs:AddViewerAgent() - Starting RegionHandshake "); 480 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs:AddViewerAgent() - Starting RegionHandshake ");
482 newAvatar.SendRegionHandshake(); 481
482 //newAvatar.SendRegionHandshake();
483 this.estateManager.sendRegionHandshake(remoteClient);
483 484
484 PhysicsVector pVec = new PhysicsVector(newAvatar.Pos.X, newAvatar.Pos.Y, newAvatar.Pos.Z); 485 PhysicsVector pVec = new PhysicsVector(newAvatar.Pos.X, newAvatar.Pos.Y, newAvatar.Pos.Z);
485 lock (this.LockPhysicsEngine) 486 lock (this.LockPhysicsEngine)
@@ -522,7 +523,7 @@ namespace OpenSim.world
522 /// </summary> 523 /// </summary>
523 protected void InformClientOfNeighbours(IClientAPI remoteClient) 524 protected void InformClientOfNeighbours(IClientAPI remoteClient)
524 { 525 {
525 // Console.WriteLine("informing client of neighbouring regions"); 526 // Console.WriteLine("informing client of neighbouring regions");
526 List<RegionInfo> neighbours = this.commsManager.RequestNeighbours(this.m_regInfo); 527 List<RegionInfo> neighbours = this.commsManager.RequestNeighbours(this.m_regInfo);
527 528
528 //Console.WriteLine("we have " + neighbours.Count + " neighbouring regions"); 529 //Console.WriteLine("we have " + neighbours.Count + " neighbouring regions");
@@ -530,7 +531,7 @@ namespace OpenSim.world
530 { 531 {
531 for (int i = 0; i < neighbours.Count; i++) 532 for (int i = 0; i < neighbours.Count; i++)
532 { 533 {
533 // Console.WriteLine("sending neighbours data"); 534 // Console.WriteLine("sending neighbours data");
534 AgentCircuitData agent = remoteClient.RequestClientInfo(); 535 AgentCircuitData agent = remoteClient.RequestClientInfo();
535 agent.BaseFolder = LLUUID.Zero; 536 agent.BaseFolder = LLUUID.Zero;
536 agent.InventoryFolder = LLUUID.Zero; 537 agent.InventoryFolder = LLUUID.Zero;
@@ -556,7 +557,7 @@ namespace OpenSim.world
556 // ie it could be all Avatars within a certain range of the calling prim/avatar. 557 // ie it could be all Avatars within a certain range of the calling prim/avatar.
557 558
558 /// <summary> 559 /// <summary>
559 /// 560 /// Request a List of all Avatars in this World
560 /// </summary> 561 /// </summary>
561 /// <returns></returns> 562 /// <returns></returns>
562 public List<Avatar> RequestAvatarList() 563 public List<Avatar> RequestAvatarList()