aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/OpenSim.RegionServer/Simulator/World.cs
diff options
context:
space:
mode:
authormingchen2007-06-08 03:54:03 +0000
committermingchen2007-06-08 03:54:03 +0000
commit269ff893df525ad5ea8ad8fbe2528f7045dec8d9 (patch)
tree6b3957c356c76a59b360bf938ddea9c64932a26e /OpenSim/OpenSim.RegionServer/Simulator/World.cs
parent*Added basic support for EstateOwnerMessage (diff)
downloadopensim-SC_OLD-269ff893df525ad5ea8ad8fbe2528f7045dec8d9.zip
opensim-SC_OLD-269ff893df525ad5ea8ad8fbe2528f7045dec8d9.tar.gz
opensim-SC_OLD-269ff893df525ad5ea8ad8fbe2528f7045dec8d9.tar.bz2
opensim-SC_OLD-269ff893df525ad5ea8ad8fbe2528f7045dec8d9.tar.xz
*Added Estate Tools for terrain texturing, terrain texturing heights per corner, water height, region flags, etc basic settings
*Parcel now sends ParcelProperties when the owner changes information as soon as the information is changed
Diffstat (limited to 'OpenSim/OpenSim.RegionServer/Simulator/World.cs')
-rw-r--r--OpenSim/OpenSim.RegionServer/Simulator/World.cs19
1 files changed, 9 insertions, 10 deletions
diff --git a/OpenSim/OpenSim.RegionServer/Simulator/World.cs b/OpenSim/OpenSim.RegionServer/Simulator/World.cs
index dda8ac4..765c74e 100644
--- a/OpenSim/OpenSim.RegionServer/Simulator/World.cs
+++ b/OpenSim/OpenSim.RegionServer/Simulator/World.cs
@@ -627,19 +627,18 @@ namespace OpenSim.RegionServer.Simulator
627 try 627 try
628 { 628 {
629 MainConsole.Instance.Notice("World.cs:AddViewerAgent() - Creating new avatar for remote viewer agent"); 629 MainConsole.Instance.Notice("World.cs:AddViewerAgent() - Creating new avatar for remote viewer agent");
630 newAvatar = new Avatar(agentClient, this, m_regionName, m_clientThreads, m_regionHandle, true, 20); 630 newAvatar = new Avatar(agentClient, this);
631 MainConsole.Instance.Notice("World.cs:AddViewerAgent() - Adding new avatar to world"); 631 MainConsole.Instance.Notice("World.cs:AddViewerAgent() - Adding new avatar to world");
632 MainConsole.Instance.Notice("World.cs:AddViewerAgent() - Starting RegionHandshake "); 632 MainConsole.Instance.Notice("World.cs:AddViewerAgent() - Starting RegionHandshake ");
633 newAvatar.SendRegionHandshake(this); 633 estateManager.sendRegionHandshake(newAvatar.ControllingClient);
634 //if (!agentClient.m_child)
635 //{
636 634
637 PhysicsVector pVec = new PhysicsVector(newAvatar.Pos.X, newAvatar.Pos.Y, newAvatar.Pos.Z); 635 PhysicsVector pVec = new PhysicsVector(newAvatar.Pos.X, newAvatar.Pos.Y, newAvatar.Pos.Z);
638 lock (this.LockPhysicsEngine) 636 lock (this.LockPhysicsEngine)
639 { 637 {
640 newAvatar.PhysActor = this.phyScene.AddAvatar(pVec); 638 newAvatar.PhysActor = this.phyScene.AddAvatar(pVec);
641 } 639 }
642 // } 640
641
643 lock (Entities) 642 lock (Entities)
644 { 643 {
645 if (!Entities.ContainsKey(agentClient.AgentID)) 644 if (!Entities.ContainsKey(agentClient.AgentID))