13 files changed, 52 insertions, 52 deletions

diff --git a/OpenSim/OpenSim.Region/Estate/EstateManager.cs b/OpenSim/OpenSim.Region/Estate/EstateManager.cs
index 688182d..875defd 100644
--- a/OpenSim/OpenSim.Region/Estate/EstateManager.cs
+++ b/OpenSim/OpenSim.Region/Estate/EstateManager.cs
@@ -45,10 +45,10 @@ namespace OpenSim.Region.Estate
     /// </summary>

     public class EstateManager

     {

-        private World m_world;

+        private Scene m_world;

         private RegionInfo m_regInfo;

 

-        public EstateManager(World world,RegionInfo reginfo)

+        public EstateManager(Scene world,RegionInfo reginfo)

         {

             m_world = world; //Estate settings found at world.m_regInfo.estateSettings      

             m_regInfo = reginfo;

diff --git a/OpenSim/OpenSim.Region/OpenSim.Region.csproj b/OpenSim/OpenSim.Region/OpenSim.Region.csproj
index 4447819..ff916d1 100644
--- a/OpenSim/OpenSim.Region/OpenSim.Region.csproj
+++ b/OpenSim/OpenSim.Region/OpenSim.Region.csproj
@@ -136,52 +136,52 @@
     <Compile Include="Estate\EstateManager.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="World\World.cs">

+    <Compile Include="Scene\Scene.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="World\World.PacketHandlers.cs">

+    <Compile Include="Scene\Scene.PacketHandlers.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="World\World.Scripting.cs">

+    <Compile Include="Scene\Scene.Scripting.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="World\WorldBase.cs">

+    <Compile Include="Scene\SceneBase.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="World\Entities\Avatar.Animations.cs">

+    <Compile Include="Scene\Entities\Avatar.Animations.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="World\Entities\Avatar.cs">

+    <Compile Include="Scene\Entities\Avatar.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="World\Entities\Avatar.Update.cs">

+    <Compile Include="Scene\Entities\Avatar.Update.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="World\Entities\Entity.cs">

+    <Compile Include="Scene\Entities\Entity.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="World\Entities\Primitive.cs">

+    <Compile Include="Scene\Entities\Primitive.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="World\Entities\SceneObject.cs">

+    <Compile Include="Scene\Entities\SceneObject.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="World\scripting\IScriptContext.cs">

+    <Compile Include="Scene\scripting\IScriptContext.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="World\scripting\IScriptEntity.cs">

+    <Compile Include="Scene\scripting\IScriptEntity.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="World\scripting\IScriptHandler.cs">

+    <Compile Include="Scene\scripting\IScriptHandler.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="World\scripting\Script.cs">

+    <Compile Include="Scene\scripting\Script.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="World\scripting\ScriptFactory.cs">

+    <Compile Include="Scene\scripting\ScriptFactory.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="World\scripting\Scripts\FollowRandomAvatar.cs">

+    <Compile Include="Scene\scripting\Scripts\FollowRandomAvatar.cs">

       <SubType>Code</SubType>

     </Compile>

   </ItemGroup>

diff --git a/OpenSim/OpenSim.Region/OpenSim.Region.dll.build b/OpenSim/OpenSim.Region/OpenSim.Region.dll.build
index f0d1a34..a49c08f 100644
--- a/OpenSim/OpenSim.Region/OpenSim.Region.dll.build
+++ b/OpenSim/OpenSim.Region/OpenSim.Region.dll.build
@@ -13,22 +13,22 @@
             <sources failonempty="true">

                 <include name="ParcelManager.cs" />

                 <include name="Estate/EstateManager.cs" />

-                <include name="World/World.cs" />

-                <include name="World/World.PacketHandlers.cs" />

-                <include name="World/World.Scripting.cs" />

-                <include name="World/WorldBase.cs" />

-                <include name="World/Entities/Avatar.Animations.cs" />

-                <include name="World/Entities/Avatar.cs" />

-                <include name="World/Entities/Avatar.Update.cs" />

-                <include name="World/Entities/Entity.cs" />

-                <include name="World/Entities/Primitive.cs" />

-                <include name="World/Entities/SceneObject.cs" />

-                <include name="World/scripting/IScriptContext.cs" />

-                <include name="World/scripting/IScriptEntity.cs" />

-                <include name="World/scripting/IScriptHandler.cs" />

-                <include name="World/scripting/Script.cs" />

-                <include name="World/scripting/ScriptFactory.cs" />

-                <include name="World/scripting/Scripts/FollowRandomAvatar.cs" />

+                <include name="Scene/Scene.cs" />

+                <include name="Scene/Scene.PacketHandlers.cs" />

+                <include name="Scene/Scene.Scripting.cs" />

+                <include name="Scene/SceneBase.cs" />

+                <include name="Scene/Entities/Avatar.Animations.cs" />

+                <include name="Scene/Entities/Avatar.cs" />

+                <include name="Scene/Entities/Avatar.Update.cs" />

+                <include name="Scene/Entities/Entity.cs" />

+                <include name="Scene/Entities/Primitive.cs" />

+                <include name="Scene/Entities/SceneObject.cs" />

+                <include name="Scene/scripting/IScriptContext.cs" />

+                <include name="Scene/scripting/IScriptEntity.cs" />

+                <include name="Scene/scripting/IScriptHandler.cs" />

+                <include name="Scene/scripting/Script.cs" />

+                <include name="Scene/scripting/ScriptFactory.cs" />

+                <include name="Scene/scripting/Scripts/FollowRandomAvatar.cs" />

             </sources>

             <references basedir="${project::get-base-directory()}">

                 <lib>

diff --git a/OpenSim/OpenSim.Region/ParcelManager.cs b/OpenSim/OpenSim.Region/ParcelManager.cs
index 37dd24f..081f9a2 100644
--- a/OpenSim/OpenSim.Region/ParcelManager.cs
+++ b/OpenSim/OpenSim.Region/ParcelManager.cs
@@ -74,13 +74,13 @@ namespace OpenSim.Region
         private int lastParcelLocalID = START_PARCEL_LOCAL_ID - 1;

         private int[,] parcelIDList = new int[64, 64];

 

-        private World m_world;

+        private Scene m_world;

         private RegionInfo m_regInfo;

 

         #endregion

 

         #region Constructors

-        public ParcelManager(World world, RegionInfo reginfo)

+        public ParcelManager(Scene world, RegionInfo reginfo)

         {

 

             m_world = world;

@@ -497,7 +497,7 @@ namespace OpenSim.Region
     {

         #region Member Variables

         public ParcelData parcelData = new ParcelData();

-        public World m_world;

+        public Scene m_world;

 

         private bool[,] parcelBitmap = new bool[64, 64];

 

@@ -505,7 +505,7 @@ namespace OpenSim.Region
 

 

         #region Constructors

-        public Parcel(LLUUID owner_id, bool is_group_owned, World world)

+        public Parcel(LLUUID owner_id, bool is_group_owned, Scene world)

         {

             m_world = world;

             parcelData.ownerID = owner_id;

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>

diff --git a/OpenSim/OpenSim.Region/Scene/World.PacketHandlers.cs b/OpenSim/OpenSim.Region/Scene/Scene.PacketHandlers.cs
index 85ca247..1c6fbcd 100644
--- a/OpenSim/OpenSim.Region/Scene/World.PacketHandlers.cs
+++ b/OpenSim/OpenSim.Region/Scene/Scene.PacketHandlers.cs
@@ -38,7 +38,7 @@ using OpenSim.Framework.Utilities;
 

 namespace OpenSim.Region

 {

-    public partial class World

+    public partial class Scene

     {

         /// <summary>

         /// 

diff --git a/OpenSim/OpenSim.Region/Scene/World.Scripting.cs b/OpenSim/OpenSim.Region/Scene/Scene.Scripting.cs
index e4b5d02..df5ca9b 100644
--- a/OpenSim/OpenSim.Region/Scene/World.Scripting.cs
+++ b/OpenSim/OpenSim.Region/Scene/Scene.Scripting.cs
@@ -37,7 +37,7 @@ using libsecondlife;
 

 namespace OpenSim.Region

 {

-    public partial class World

+    public partial class Scene

     {

         private Dictionary<string, IScriptEngine> scriptEngines = new Dictionary<string, IScriptEngine>();

 

diff --git a/OpenSim/OpenSim.Region/Scene/World.cs b/OpenSim/OpenSim.Region/Scene/Scene.cs
index 40eb7ef..e3ffca4 100644
--- a/OpenSim/OpenSim.Region/Scene/World.cs
+++ b/OpenSim/OpenSim.Region/Scene/Scene.cs
@@ -49,7 +49,7 @@ namespace OpenSim.Region
 {

     public delegate bool FilterAvatarList(Avatar avatar);

 

-    public partial class World : WorldBase, ILocalStorageReceiver, IScriptAPI

+    public partial class Scene : SceneBase, ILocalStorageReceiver, IScriptAPI

     {

         protected System.Timers.Timer m_heartbeatTimer = new System.Timers.Timer();

         protected Dictionary<libsecondlife.LLUUID, Avatar> Avatars;

@@ -96,7 +96,7 @@ namespace OpenSim.Region
         /// <param name="clientThreads">Dictionary to contain client threads</param>

         /// <param name="regionHandle">Region Handle for this region</param>

         /// <param name="regionName">Region Name for this region</param>

-        public World(Dictionary<uint, IClientAPI> clientThreads, RegionInfo regInfo, AuthenticateSessionsBase authen, RegionServerCommsManager commsMan)

+        public Scene(Dictionary<uint, IClientAPI> clientThreads, RegionInfo regInfo, AuthenticateSessionsBase authen, RegionServerCommsManager commsMan)

         {

             try

             {

diff --git a/OpenSim/OpenSim.Region/Scene/WorldBase.cs b/OpenSim/OpenSim.Region/Scene/SceneBase.cs
index d77d2cf..114b6a3 100644
--- a/OpenSim/OpenSim.Region/Scene/WorldBase.cs
+++ b/OpenSim/OpenSim.Region/Scene/SceneBase.cs
@@ -42,7 +42,7 @@ using OpenSim.Terrain;
 

 namespace OpenSim.Region

 {

-    public abstract class WorldBase : IWorld

+    public abstract class SceneBase : IWorld

     {

         public Dictionary<libsecondlife.LLUUID, Entity> Entities;

         protected Dictionary<uint, IClientAPI> m_clientThreads;

diff --git a/OpenSim/OpenSim.Region/Scene/scripting/IScriptHandler.cs b/OpenSim/OpenSim.Region/Scene/scripting/IScriptHandler.cs
index f1a236f..e45473b 100644
--- a/OpenSim/OpenSim.Region/Scene/scripting/IScriptHandler.cs
+++ b/OpenSim/OpenSim.Region/Scene/scripting/IScriptHandler.cs
@@ -40,7 +40,7 @@ namespace OpenSim.Region.Scripting
 

     public class ScriptHandler : IScriptContext, IScriptEntity, IScriptReadonlyEntity

     {

-        private World m_world;

+        private Scene m_world;

         private Script m_script;

         private Entity m_entity;

 

@@ -57,7 +57,7 @@ namespace OpenSim.Region.Scripting
             m_script.OnFrame(this);

         }

 

-        public ScriptHandler(Script script, Entity entity, World world)

+        public ScriptHandler(Script script, Entity entity, Scene world)

         {

             m_script = script;

             m_entity = entity;