From f9b7cc53deb93fc3528929385d3f76519083c927 Mon Sep 17 00:00:00 2001
From: gareth
Date: Sun, 15 Apr 2007 02:31:34 +0000
Subject: W00t! multiple sims! Misc bugfixes Child agents!!!!!! General sexy
 stuff

---
 OpenSim.RegionServer/world/AvatarUpdate.cs |  3 ++-
 OpenSim.RegionServer/world/World.cs        | 29 ++++++++++++++++-------------
 2 files changed, 18 insertions(+), 14 deletions(-)

(limited to 'OpenSim.RegionServer/world')

diff --git a/OpenSim.RegionServer/world/AvatarUpdate.cs b/OpenSim.RegionServer/world/AvatarUpdate.cs
index d315de7..453f419 100644
--- a/OpenSim.RegionServer/world/AvatarUpdate.cs
+++ b/OpenSim.RegionServer/world/AvatarUpdate.cs
@@ -89,7 +89,8 @@ namespace OpenSim.world
         {
             System.Text.Encoding _enc = System.Text.Encoding.ASCII;
             //send a objectupdate packet with information about the clients avatar
-            ObjectUpdatePacket objupdate = new ObjectUpdatePacket();
+            
+	    ObjectUpdatePacket objupdate = new ObjectUpdatePacket();
             objupdate.RegionData.RegionHandle = m_regionHandle;
             objupdate.RegionData.TimeDilation = 64096;
             objupdate.ObjectData = new libsecondlife.Packets.ObjectUpdatePacket.ObjectDataBlock[1];
diff --git a/OpenSim.RegionServer/world/World.cs b/OpenSim.RegionServer/world/World.cs
index a973c6c..425a135 100644
--- a/OpenSim.RegionServer/world/World.cs
+++ b/OpenSim.RegionServer/world/World.cs
@@ -371,19 +371,22 @@ namespace OpenSim.world
             OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs:AddViewerAgent() - Adding new avatar to world");
             OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs:AddViewerAgent() - Starting RegionHandshake ");
             newAvatar.SendRegionHandshake(this);
-            PhysicsVector pVec = new PhysicsVector(newAvatar.Pos.X, newAvatar.Pos.Y, newAvatar.Pos.Z);
-            lock (this.LockPhysicsEngine)
-            {
-                newAvatar.PhysActor = this.phyScene.AddAvatar(pVec);
-            }
-            lock (Entities)
-            {
-                this.Entities.Add(agentClient.AgentID, newAvatar);
-            }
-            lock (Avatars)
-            {
-                this.Avatars.Add(agentClient.AgentID, newAvatar);
-            }
+	    if(!agentClient.m_child) {
+	            PhysicsVector pVec = new PhysicsVector(newAvatar.Pos.X, newAvatar.Pos.Y, newAvatar.Pos.Z);
+	            lock (this.LockPhysicsEngine)
+	            {
+	                newAvatar.PhysActor = this.phyScene.AddAvatar(pVec);
+	            }
+	    }
+	            lock (Entities)
+	            {
+	                this.Entities.Add(agentClient.AgentID, newAvatar);
+	            }
+	            lock (Avatars)
+	            {
+	                this.Avatars.Add(agentClient.AgentID, newAvatar);
+	            }
+
         }
 
         public void RemoveViewerAgent(SimClient agentClient)
-- 
cgit v1.1