aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim.RegionServer/world/World.cs
diff options
context:
space:
mode:
authorMW2007-04-17 12:03:52 +0000
committerMW2007-04-17 12:03:52 +0000
commitd5406fe77309770234524f6afa38ae1502f01eab (patch)
tree1eacbc4c4f803087b7a2df77c43e8de65d91dbf2 /OpenSim.RegionServer/world/World.cs
parentCreated skeleton SimComms.cs for sim<->sim UDP circuits (diff)
downloadopensim-SC_OLD-d5406fe77309770234524f6afa38ae1502f01eab.zip
opensim-SC_OLD-d5406fe77309770234524f6afa38ae1502f01eab.tar.gz
opensim-SC_OLD-d5406fe77309770234524f6afa38ae1502f01eab.tar.bz2
opensim-SC_OLD-d5406fe77309770234524f6afa38ae1502f01eab.tar.xz
A few fixes and stopped sim crossing being attempted in sandbox mode
Diffstat (limited to 'OpenSim.RegionServer/world/World.cs')
-rw-r--r--OpenSim.RegionServer/world/World.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim.RegionServer/world/World.cs b/OpenSim.RegionServer/world/World.cs
index 425a135..749305f 100644
--- a/OpenSim.RegionServer/world/World.cs
+++ b/OpenSim.RegionServer/world/World.cs
@@ -371,13 +371,13 @@ namespace OpenSim.world
371 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs:AddViewerAgent() - Adding new avatar to world"); 371 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs:AddViewerAgent() - Adding new avatar to world");
372 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs:AddViewerAgent() - Starting RegionHandshake "); 372 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs:AddViewerAgent() - Starting RegionHandshake ");
373 newAvatar.SendRegionHandshake(this); 373 newAvatar.SendRegionHandshake(this);
374 if(!agentClient.m_child) { 374 if(!agentClient.m_child) {
375 PhysicsVector pVec = new PhysicsVector(newAvatar.Pos.X, newAvatar.Pos.Y, newAvatar.Pos.Z); 375 PhysicsVector pVec = new PhysicsVector(newAvatar.Pos.X, newAvatar.Pos.Y, newAvatar.Pos.Z);
376 lock (this.LockPhysicsEngine) 376 lock (this.LockPhysicsEngine)
377 { 377 {
378 newAvatar.PhysActor = this.phyScene.AddAvatar(pVec); 378 newAvatar.PhysActor = this.phyScene.AddAvatar(pVec);
379 } 379 }
380 } 380 }
381 lock (Entities) 381 lock (Entities)
382 { 382 {
383 this.Entities.Add(agentClient.AgentID, newAvatar); 383 this.Entities.Add(agentClient.AgentID, newAvatar);
@@ -385,7 +385,7 @@ namespace OpenSim.world
385 lock (Avatars) 385 lock (Avatars)
386 { 386 {
387 this.Avatars.Add(agentClient.AgentID, newAvatar); 387 this.Avatars.Add(agentClient.AgentID, newAvatar);
388 } 388 }
389 389
390 } 390 }
391 391