7 files changed, 129 insertions, 108 deletions

diff --git a/OpenSim/OpenSim.World/Avatar.cs b/OpenSim/OpenSim.World/Avatar.cs
index c251d57..4ab576c 100644
--- a/OpenSim/OpenSim.World/Avatar.cs
+++ b/OpenSim/OpenSim.World/Avatar.cs
@@ -55,21 +55,16 @@ namespace OpenSim.world
             ControllingClient = theClient;

             this.firstname = ControllingClient.FirstName;

             this.lastname = ControllingClient.LastName;

-            localid = 8880000 + (this.m_world._localNumber++);

+            localid = this.m_world.NextLocalId;

             Pos = ControllingClient.StartPos;

             visualParams = new byte[218];

             for (int i = 0; i < 218; i++)

             {

                 visualParams[i] = 100;

             }

-            Wearables = new AvatarWearable[13]; //should be 13 of these

-            for (int i = 0; i < 13; i++)

-            {

-                Wearables[i] = new AvatarWearable();

-            }

-            this.Wearables[0].AssetID = new LLUUID("66c41e39-38f9-f75a-024e-585989bfab73");

-            this.Wearables[0].ItemID = LLUUID.Random();

 

+            Wearables = AvatarWearable.DefaultWearables;

+            

             this.avatarAppearanceTexture = new LLObject.TextureEntry(new LLUUID("00000000-0000-0000-5005-000000000005"));

             Console.WriteLine("avatar point 4");

             

diff --git a/OpenSim/OpenSim.World/Entity.cs b/OpenSim/OpenSim.World/Entity.cs
index b14beed..dd5f9a6 100644
--- a/OpenSim/OpenSim.World/Entity.cs
+++ b/OpenSim/OpenSim.World/Entity.cs
@@ -51,7 +51,7 @@ namespace OpenSim.world
                 {

                     try

                     {

-                        lock (this.m_world.LockPhysicsEngine)

+                        lock (this.m_world.SyncRoot)

                         {

 

                             this._physActor.Position = new PhysicsVector(value.X, value.Y, value.Z);

diff --git a/OpenSim/OpenSim.World/OpenSim.World.csproj b/OpenSim/OpenSim.World/OpenSim.World.csproj
index f2fb596..46803d6 100644
--- a/OpenSim/OpenSim.World/OpenSim.World.csproj
+++ b/OpenSim/OpenSim.World/OpenSim.World.csproj
@@ -130,58 +130,58 @@
     </ProjectReference>

   </ItemGroup>

   <ItemGroup>

-    <Compile Include="Entity.cs">

+    <Compile Include="Avatar.Client.cs">

       <SubType>Code</SubType>

     </Compile>

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

+    <Compile Include="Avatar.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="WorldBase.cs">

+    <Compile Include="Avatar.Update.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="SceneObject.cs">

+    <Compile Include="AvatarAnimations.cs">

       <SubType>Code</SubType>

     </Compile>

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

+    <Compile Include="Entity.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Avatar.Client.cs">

+    <Compile Include="ParcelManager.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Avatar.Update.cs">

+    <Compile Include="Primitive.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="AvatarAnimations.cs">

+    <Compile Include="SceneObject.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Primitive.cs">

+    <Compile Include="World.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Avatar.cs">

+    <Compile Include="World.PacketHandlers.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="ParcelManager.cs">

+    <Compile Include="World.Scripting.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="World.cs">

+    <Compile Include="WorldBase.cs">

       <SubType>Code</SubType>

     </Compile>

     <Compile Include="Estate\EstateManager.cs">

       <SubType>Code</SubType>

     </Compile>

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

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

       <SubType>Code</SubType>

     </Compile>

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

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

       <SubType>Code</SubType>

     </Compile>

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

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

       <SubType>Code</SubType>

     </Compile>

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

       <SubType>Code</SubType>

     </Compile>

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

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

       <SubType>Code</SubType>

     </Compile>

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

diff --git a/OpenSim/OpenSim.World/OpenSim.World.csproj.user b/OpenSim/OpenSim.World/OpenSim.World.csproj.user
deleted file mode 100644
index 082d673..0000000
--- a/OpenSim/OpenSim.World/OpenSim.World.csproj.user
+++ /dev/null
@@ -1,12 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <PropertyGroup>

-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

-    <ReferencePath>C:\sugilite\bin\</ReferencePath>

-    <LastOpenVersion>8.0.50727</LastOpenVersion>

-    <ProjectView>ProjectFiles</ProjectView>

-    <ProjectTrust>0</ProjectTrust>

-  </PropertyGroup>

-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />

-  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />

-</Project>

diff --git a/OpenSim/OpenSim.World/OpenSim.World.dll.build b/OpenSim/OpenSim.World/OpenSim.World.dll.build
new file mode 100644
index 0000000..3fa534e
--- /dev/null
+++ b/OpenSim/OpenSim.World/OpenSim.World.dll.build
@@ -0,0 +1,71 @@
+<?xml version="1.0" ?>

+<project name="OpenSim.World" default="build">

+    <target name="build">

+        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />

+        <mkdir dir="${project::get-base-directory()}/${build.dir}" />

+        <copy todir="${project::get-base-directory()}/${build.dir}">

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

+            </fileset>

+        </copy>

+        <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">

+            <resources prefix="OpenSim.World" dynamicprefix="true" >

+            </resources>

+            <sources failonempty="true">

+                <include name="Avatar.Client.cs" />

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

+                <include name="types/Mesh.cs" />

+                <include name="types/Triangle.cs" />

+            </sources>

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

+                <lib>

+                    <include name="${project::get-base-directory()}" />

+                    <include name="${project::get-base-directory()}/${build.dir}" />

+                </lib>

+                <include name="System.dll" />

+                <include name="System.Xml.dll" />

+                <include name="../../bin/libsecondlife.dll" />

+                <include name="../../bin/Axiom.MathLib.dll" />

+                <include name="../../bin/Db4objects.Db4o.dll" />

+                <include name="../../bin/OpenSim.Terrain.BasicTerrain.dll" />

+                <include name="../../bin/OpenSim.Framework.dll" />

+                <include name="../../bin/OpenSim.Framework.Console.dll" />

+                <include name="../../bin/OpenSim.GenericConfig.Xml.dll" />

+                <include name="../../bin/OpenSim.Physics.Manager.dll" />

+                <include name="../../bin/OpenSim.Servers.dll" />

+                <include name="../../bin/XMLRPC.dll" />

+                <include name="../../bin/OpenGrid.Framework.Communications.dll" />

+            </references>

+        </csc>

+        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" />

+        <mkdir dir="${project::get-base-directory()}/../../bin/"/>

+        <copy todir="${project::get-base-directory()}/../../bin/">

+            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >

+                <include name="*.dll"/>

+                <include name="*.exe"/>

+            </fileset>

+        </copy>

+    </target>

+    <target name="clean">

+        <delete dir="${bin.dir}" failonerror="false" />

+        <delete dir="${obj.dir}" failonerror="false" />

+    </target>

+    <target name="doc" description="Creates documentation.">

+    </target>

+</project>

diff --git a/OpenSim/OpenSim.World/World.cs b/OpenSim/OpenSim.World/World.cs
index 011e39a..7ef06e2 100644
--- a/OpenSim/OpenSim.World/World.cs
+++ b/OpenSim/OpenSim.World/World.cs
@@ -23,10 +23,8 @@ namespace OpenSim.world
     public partial class World : WorldBase, ILocalStorageReceiver, IScriptAPI

     {

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

-        public object LockPhysicsEngine = new object();

         protected Dictionary<libsecondlife.LLUUID, Avatar> Avatars;

         protected Dictionary<libsecondlife.LLUUID, Primitive> Prims;

-        public uint _localNumber = 0;

         private PhysicsScene phyScene;

         private float timeStep = 0.1f;

         public ILocalStorage localStorage;

@@ -59,6 +57,7 @@ namespace OpenSim.world
                 return (this.phyScene);

             }

         }

+

         #endregion

 

         #region Constructors

@@ -155,7 +154,7 @@ namespace OpenSim.world
                     Entities[UUID].addForces();

                 }

 

-                lock (this.LockPhysicsEngine)

+                lock (this.m_syncRoot)

                 {

                     this.phyScene.Simulate(timeStep);

                 }

@@ -203,7 +202,7 @@ namespace OpenSim.world
                     OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs: Backup() - Terrain tainted, saving.");

                     localStorage.SaveMap(Terrain.getHeights1D());

                     OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs: Backup() - Terrain saved, informing Physics.");

-                    lock (this.LockPhysicsEngine)

+                    lock (this.m_syncRoot)

                     {

                         phyScene.SetTerrain(Terrain.getHeights1D());

                     }

@@ -297,7 +296,7 @@ namespace OpenSim.world
             {

                 Terrain.hills();

 

-                lock (this.LockPhysicsEngine)

+                lock (this.m_syncRoot)

                 {

                     this.phyScene.SetTerrain(Terrain.getHeights1D());

                 }

@@ -328,7 +327,7 @@ namespace OpenSim.world
             try

             {

                 this.Terrain.setHeights2D(newMap);

-                lock (this.LockPhysicsEngine)

+                lock (this.m_syncRoot)

                 {

                     this.phyScene.SetTerrain(this.Terrain.getHeights1D());

                 }

@@ -483,7 +482,7 @@ namespace OpenSim.world
                 this.estateManager.sendRegionHandshake(remoteClient);

 

                 PhysicsVector pVec = new PhysicsVector(newAvatar.Pos.X, newAvatar.Pos.Y, newAvatar.Pos.Z);

-                lock (this.LockPhysicsEngine)

+                lock (this.m_syncRoot)

                 {

                     newAvatar.PhysActor = this.phyScene.AddAvatar(pVec);

                 }

@@ -612,5 +611,10 @@ namespace OpenSim.world
         }

 

         #endregion

+

+        public override void SendLayerData(int px, int py, IClientAPI RemoteClient)

+        {

+            RemoteClient.SendLayerData( Terrain.getHeights1D() );

+        }

     }

 }

diff --git a/OpenSim/OpenSim.World/WorldBase.cs b/OpenSim/OpenSim.World/WorldBase.cs
index 19a8fb5..92bc6a3 100644
--- a/OpenSim/OpenSim.World/WorldBase.cs
+++ b/OpenSim/OpenSim.World/WorldBase.cs
@@ -15,61 +15,25 @@ using OpenSim.Terrain;
 

 namespace OpenSim.world

 {

-    public class WorldBase : IWorld

+    public abstract class WorldBase : IWorld

     {

         public Dictionary<libsecondlife.LLUUID, Entity> Entities;

         protected Dictionary<uint, IClientAPI> m_clientThreads;

         protected ulong m_regionHandle;

         protected string m_regionName;

-       // protected InventoryCache _inventoryCache;

-       // protected AssetCache _assetCache;

         protected RegionInfo m_regInfo;

 

         public TerrainEngine Terrain; //TODO: Replace TerrainManager with this.

         protected libsecondlife.TerrainManager TerrainManager; // To be referenced via TerrainEngine

-

-        #region Properties

-        /*

-        public InventoryCache InventoryCache

-        {

-            set

-            {

-                this._inventoryCache = value;

-            }

-        }

-

-        public AssetCache AssetCache

-        {

-            set

-            {

-                this._assetCache = value;

-            }

-        }

-          */

-        #endregion

-

-        #region Constructors

-        /// <summary>

-        /// 

-        /// </summary>

-        public WorldBase()

-        {

-

-        }

-        #endregion

-

-        #region Setup Methods

-       

-        #endregion

+        protected object m_syncRoot = new object();

+        private uint m_nextLocalId = 8880000;

 

         #region Update Methods

         /// <summary>

         /// Normally called once every frame/tick to let the world preform anything required (like running the physics simulation)

         /// </summary>

-        public virtual void Update()

-        {

+        public abstract void Update();

 

-        }

         #endregion

 

         #region Terrain Methods

@@ -77,11 +41,8 @@ namespace OpenSim.world
         /// <summary>

         /// Loads the World heightmap

         /// </summary>

-        public virtual void LoadWorldMap()

-        {

-

-        }

-

+        public abstract void LoadWorldMap();

+        

         /// <summary>

         /// Send the region heightmap to the client

         /// </summary>

@@ -97,10 +58,8 @@ namespace OpenSim.world
         /// <param name="px">Patch coordinate (x) 0..16</param>

         /// <param name="py">Patch coordinate (y) 0..16</param>

         /// <param name="RemoteClient">The client to send to</param>

-        public void SendLayerData(int px, int py, IClientAPI RemoteClient)

-        {

-           

-        }

+        public abstract void SendLayerData(int px, int py, IClientAPI RemoteClient);

+

         #endregion

 

         #region Add/Remove Agent/Avatar

@@ -110,39 +69,43 @@ namespace OpenSim.world
         /// <param name="remoteClient"></param>

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

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

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

-        {

-            return ;

-        }

-

+        public abstract void AddNewAvatar(IClientAPI remoteClient, LLUUID agentID, bool child);

+        

         /// <summary>

         /// 

         /// </summary>

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

-        public virtual void RemoveAvatar(LLUUID agentID)

-        {

-            return ;

-        }

-

+        public abstract void RemoveAvatar(LLUUID agentID);

+       

         #endregion

 

         /// <summary>

         /// 

         /// </summary>

         /// <returns></returns>

-        public virtual RegionInfo GetRegionInfo()

+        public virtual RegionInfo RegionInfo

+        {

+            get { return null; }

+        }

+

+        public object SyncRoot

+        {

+            get { return m_syncRoot; }

+        }

+

+        public uint NextLocalId

         {

-            return null;

+            get { return m_nextLocalId++; }

         }

 

         #region Shutdown

         /// <summary>

         /// Tidy before shutdown

         /// </summary>

-        public virtual void Close()

-        {

+        public abstract void Close();

 

-        }

         #endregion

+

+ 

     }

 }