1 files changed, 7 insertions, 2 deletions

diff --git a/OpenSim/OpenSim.World/World.cs b/OpenSim/OpenSim.World/World.cs
index 1d56ea3..1f97820 100644
--- a/OpenSim/OpenSim.World/World.cs
+++ b/OpenSim/OpenSim.World/World.cs
@@ -15,6 +15,8 @@ using OpenSim.Framework;
 using OpenSim.RegionServer.world.scripting;

 using OpenSim.Terrain;

 using OpenGrid.Framework.Communications;

+using OpenSim.world.Estate;

+

 

 namespace OpenSim.world

 {

@@ -40,6 +42,9 @@ namespace OpenSim.world
         protected RegionCommsHostBase regionCommsHost;

         protected RegionServerCommsManager commsManager;

 

+        public ParcelManager parcelManager;

+        public EstateManager estateManager;

+

         #region Properties

         /// <summary>

         /// 

@@ -444,7 +449,7 @@ namespace OpenSim.world
         /// <summary>

         /// 

         /// </summary>

-        /// <param name="remoteClient"></param>

+        /// <param name="remoteClient"></param          

         /// <param name="agentID"></param>

         /// <param name="child"></param>

         public override void AddNewAvatar(IClientAPI remoteClient, LLUUID agentID, bool child)

@@ -458,7 +463,7 @@ namespace OpenSim.world
             try

             {

                 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs:AddViewerAgent() - Creating new avatar for remote viewer agent");

-                newAvatar = new Avatar(remoteClient, this, m_clientThreads, this.m_regInfo);

+                newAvatar = new Avatar(remoteClient, this, m_clientThreads);

                 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs:AddViewerAgent() - Adding new avatar to world");

                 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs:AddViewerAgent() - Starting RegionHandshake ");

                 newAvatar.SendRegionHandshake();