4 files changed, 7 insertions, 7 deletions

diff --git a/OpenSim/OpenSim.Region/Scene/Entities/Avatar.cs b/OpenSim/OpenSim.Region/Scene/Entities/Avatar.cs
index c88e0cc..989c53d 100644
--- a/OpenSim/OpenSim.Region/Scene/Entities/Avatar.cs
+++ b/OpenSim/OpenSim.Region/Scene/Entities/Avatar.cs
@@ -70,7 +70,7 @@ namespace OpenSim.Region
         /// <param name="world"></param>

         /// <param name="clientThreads"></param>

         /// <param name="regionDat"></param>

-        public Avatar(IClientAPI theClient, World world, Dictionary<uint, IClientAPI> clientThreads, RegionInfo reginfo)

+        public Avatar(IClientAPI theClient, Scene world, Dictionary<uint, IClientAPI> clientThreads, RegionInfo reginfo)

         {

 

             m_world = world;

diff --git a/OpenSim/OpenSim.Region/Scene/Entities/Entity.cs b/OpenSim/OpenSim.Region/Scene/Entities/Entity.cs
index 3d6ba64..9e288d7 100644
--- a/OpenSim/OpenSim.Region/Scene/Entities/Entity.cs
+++ b/OpenSim/OpenSim.Region/Scene/Entities/Entity.cs
@@ -44,7 +44,7 @@ namespace OpenSim.Region
         protected List<Entity> children;

         protected LLVector3 m_pos;

         protected PhysicsActor _physActor;

-        protected World m_world;

+        protected Scene m_world;

         protected string m_name;

 

         /// <summary>

diff --git a/OpenSim/OpenSim.Region/Scene/Entities/Primitive.cs b/OpenSim/OpenSim.Region/Scene/Entities/Primitive.cs
index 6efdd66..aa747d3 100644
--- a/OpenSim/OpenSim.Region/Scene/Entities/Primitive.cs
+++ b/OpenSim/OpenSim.Region/Scene/Entities/Primitive.cs
@@ -92,7 +92,7 @@ namespace OpenSim.Region
         /// <param name="clientThreads"></param>

         /// <param name="regionHandle"></param>

         /// <param name="world"></param>

-        public Primitive( ulong regionHandle, World world)

+        public Primitive( ulong regionHandle, Scene world)

         {

            // m_clientThreads = clientThreads;

             m_regionHandle = regionHandle;

@@ -108,7 +108,7 @@ namespace OpenSim.Region
         /// <param name="addPacket"></param>

         /// <param name="ownerID"></param>

         /// <param name="localID"></param>

-        public Primitive(ulong regionHandle, World world, ObjectAddPacket addPacket, LLUUID ownerID, uint localID)

+        public Primitive(ulong regionHandle, Scene world, ObjectAddPacket addPacket, LLUUID ownerID, uint localID)

         {

             // m_clientThreads = clientThreads;

             m_regionHandle = regionHandle;

@@ -126,7 +126,7 @@ namespace OpenSim.Region
         /// <param name="owner"></param>

         /// <param name="fullID"></param>

         /// <param name="localID"></param>

-        public Primitive( ulong regionHandle, World world, LLUUID owner, LLUUID fullID, uint localID)

+        public Primitive( ulong regionHandle, Scene world, LLUUID owner, LLUUID fullID, uint localID)

         {

           //  m_clientThreads = clientThreads;

             m_regionHandle = regionHandle;

@@ -148,7 +148,7 @@ namespace OpenSim.Region
         /// <param name="owner"></param>

         /// <param name="localID"></param>

         /// <param name="position"></param>

-        public Primitive( ulong regionHandle, World world, LLUUID owner, uint localID, LLVector3 position)

+        public Primitive( ulong regionHandle, Scene world, LLUUID owner, uint localID, LLVector3 position)

         {

             //m_clientThreads = clientThreads;

             m_regionHandle = regionHandle;

diff --git a/OpenSim/OpenSim.Region/Scene/Entities/SceneObject.cs b/OpenSim/OpenSim.Region/Scene/Entities/SceneObject.cs
index 7284b73..e15e871 100644
--- a/OpenSim/OpenSim.Region/Scene/Entities/SceneObject.cs
+++ b/OpenSim/OpenSim.Region/Scene/Entities/SceneObject.cs
@@ -42,7 +42,7 @@ namespace OpenSim.Region
         private LLUUID rootUUID;

         //private Dictionary<LLUUID, Primitive> ChildPrimitives = new Dictionary<LLUUID, Primitive>();

         protected Primitive rootPrimitive;

-        private World m_world;

+        private Scene m_world;

         protected ulong regionHandle;

 

         /// <summary>