22 files changed, 210 insertions, 82 deletions

diff --git a/OpenSim/OpenSim.RegionServer/world/Avatar.Client.cs b/OpenSim/OpenSim.World/Avatar.Client.cs
index 7656a89..7656a89 100644
--- a/OpenSim/OpenSim.RegionServer/world/Avatar.Client.cs
+++ b/OpenSim/OpenSim.World/Avatar.Client.cs
diff --git a/OpenSim/OpenSim.RegionServer/world/Avatar.Update.cs b/OpenSim/OpenSim.World/Avatar.Update.cs
index 33132cf..33132cf 100644
--- a/OpenSim/OpenSim.RegionServer/world/Avatar.Update.cs
+++ b/OpenSim/OpenSim.World/Avatar.Update.cs
diff --git a/OpenSim/OpenSim.RegionServer/world/Avatar.cs b/OpenSim/OpenSim.World/Avatar.cs
index cca266b..cca266b 100644
--- a/OpenSim/OpenSim.RegionServer/world/Avatar.cs
+++ b/OpenSim/OpenSim.World/Avatar.cs
diff --git a/OpenSim/OpenSim.RegionServer/world/AvatarAnimations.cs b/OpenSim/OpenSim.World/AvatarAnimations.cs
index b554af8..b554af8 100644
--- a/OpenSim/OpenSim.RegionServer/world/AvatarAnimations.cs
+++ b/OpenSim/OpenSim.World/AvatarAnimations.cs
diff --git a/OpenSim/OpenSim.RegionServer/world/Entity.cs b/OpenSim/OpenSim.World/Entity.cs
index 96e039a..96e039a 100644
--- a/OpenSim/OpenSim.RegionServer/world/Entity.cs
+++ b/OpenSim/OpenSim.World/Entity.cs
diff --git a/OpenSim/OpenSim.World/OpenSim.World.csproj b/OpenSim/OpenSim.World/OpenSim.World.csproj
new file mode 100644
index 0000000..471f148
--- /dev/null
+++ b/OpenSim/OpenSim.World/OpenSim.World.csproj
@@ -0,0 +1,195 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <PropertyGroup>

+    <ProjectType>Local</ProjectType>

+    <ProductVersion>8.0.50727</ProductVersion>

+    <SchemaVersion>2.0</SchemaVersion>

+    <ProjectGuid>{642A14A8-0000-0000-0000-000000000000}</ProjectGuid>

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

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

+    <ApplicationIcon></ApplicationIcon>

+    <AssemblyKeyContainerName>

+    </AssemblyKeyContainerName>

+    <AssemblyName>OpenSim.World</AssemblyName>

+    <DefaultClientScript>JScript</DefaultClientScript>

+    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>

+    <DefaultTargetSchema>IE50</DefaultTargetSchema>

+    <DelaySign>false</DelaySign>

+    <OutputType>Library</OutputType>

+    <AppDesignerFolder></AppDesignerFolder>

+    <RootNamespace>OpenSim.World</RootNamespace>

+    <StartupObject></StartupObject>

+    <FileUpgradeFlags>

+    </FileUpgradeFlags>

+  </PropertyGroup>

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

+    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>

+    <BaseAddress>285212672</BaseAddress>

+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>

+    <ConfigurationOverrideFile>

+    </ConfigurationOverrideFile>

+    <DefineConstants>TRACE;DEBUG</DefineConstants>

+    <DocumentationFile></DocumentationFile>

+    <DebugSymbols>True</DebugSymbols>

+    <FileAlignment>4096</FileAlignment>

+    <Optimize>False</Optimize>

+    <OutputPath>..\..\bin\</OutputPath>

+    <RegisterForComInterop>False</RegisterForComInterop>

+    <RemoveIntegerChecks>False</RemoveIntegerChecks>

+    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>

+    <WarningLevel>4</WarningLevel>

+    <NoWarn></NoWarn>

+  </PropertyGroup>

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

+    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>

+    <BaseAddress>285212672</BaseAddress>

+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>

+    <ConfigurationOverrideFile>

+    </ConfigurationOverrideFile>

+    <DefineConstants>TRACE</DefineConstants>

+    <DocumentationFile></DocumentationFile>

+    <DebugSymbols>False</DebugSymbols>

+    <FileAlignment>4096</FileAlignment>

+    <Optimize>True</Optimize>

+    <OutputPath>..\..\bin\</OutputPath>

+    <RegisterForComInterop>False</RegisterForComInterop>

+    <RemoveIntegerChecks>False</RemoveIntegerChecks>

+    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>

+    <WarningLevel>4</WarningLevel>

+    <NoWarn></NoWarn>

+  </PropertyGroup>

+  <ItemGroup>

+    <Reference Include="System" >

+      <HintPath>System.dll</HintPath>

+      <Private>False</Private>

+    </Reference>

+    <Reference Include="System.Xml" >

+      <HintPath>System.Xml.dll</HintPath>

+      <Private>False</Private>

+    </Reference>

+    <Reference Include="libsecondlife.dll" >

+      <HintPath>..\..\bin\libsecondlife.dll</HintPath>

+      <Private>False</Private>

+    </Reference>

+    <Reference Include="Axiom.MathLib.dll" >

+      <HintPath>..\..\bin\Axiom.MathLib.dll</HintPath>

+      <Private>False</Private>

+    </Reference>

+    <Reference Include="Db4objects.Db4o.dll" >

+      <HintPath>..\..\bin\Db4objects.Db4o.dll</HintPath>

+      <Private>False</Private>

+    </Reference>

+  </ItemGroup>

+  <ItemGroup>

+    <ProjectReference Include="..\OpenSim.Terrain.BasicTerrain\OpenSim.Terrain.BasicTerrain.csproj">

+      <Name>OpenSim.Terrain.BasicTerrain</Name>

+      <Project>{2270B8FE-0000-0000-0000-000000000000}</Project>

+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>

+                        <Private>False</Private>

+    </ProjectReference>

+    <ProjectReference Include="..\..\Common\OpenSim.Framework\OpenSim.Framework.csproj">

+      <Name>OpenSim.Framework</Name>

+      <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>

+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>

+                        <Private>False</Private>

+    </ProjectReference>

+    <ProjectReference Include="..\..\Common\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj">

+      <Name>OpenSim.Framework.Console</Name>

+      <Project>{A7CD0630-0000-0000-0000-000000000000}</Project>

+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>

+                        <Private>False</Private>

+    </ProjectReference>

+    <ProjectReference Include="..\..\Common\OpenSim.GenericConfig\Xml\OpenSim.GenericConfig.Xml.csproj">

+      <Name>OpenSim.GenericConfig.Xml</Name>

+      <Project>{E88EF749-0000-0000-0000-000000000000}</Project>

+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>

+                        <Private>False</Private>

+    </ProjectReference>

+    <ProjectReference Include="..\OpenSim.Physics\Manager\OpenSim.Physics.Manager.csproj">

+      <Name>OpenSim.Physics.Manager</Name>

+      <Project>{8BE16150-0000-0000-0000-000000000000}</Project>

+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>

+                        <Private>False</Private>

+    </ProjectReference>

+    <ProjectReference Include="..\..\Common\OpenSim.Servers\OpenSim.Servers.csproj">

+      <Name>OpenSim.Servers</Name>

+      <Project>{8BB20F0A-0000-0000-0000-000000000000}</Project>

+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>

+                        <Private>False</Private>

+    </ProjectReference>

+    <ProjectReference Include="..\..\Common\XmlRpcCS\XMLRPC.csproj">

+      <Name>XMLRPC</Name>

+      <Project>{8E81D43C-0000-0000-0000-000000000000}</Project>

+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>

+                        <Private>False</Private>

+    </ProjectReference>

+  </ItemGroup>

+  <ItemGroup>

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

+      <SubType>Code</SubType>

+    </Compile>

+    <Compile Include="Avatar.cs">

+      <SubType>Code</SubType>

+    </Compile>

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

+      <SubType>Code</SubType>

+    </Compile>

+    <Compile Include="AvatarAnimations.cs">

+      <SubType>Code</SubType>

+    </Compile>

+    <Compile Include="Entity.cs">

+      <SubType>Code</SubType>

+    </Compile>

+    <Compile Include="Primitive.cs">

+      <SubType>Code</SubType>

+    </Compile>

+    <Compile Include="Primitive2.cs">

+      <SubType>Code</SubType>

+    </Compile>

+    <Compile Include="SceneObject.cs">

+      <SubType>Code</SubType>

+    </Compile>

+    <Compile Include="World.cs">

+      <SubType>Code</SubType>

+    </Compile>

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

+      <SubType>Code</SubType>

+    </Compile>

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

+      <SubType>Code</SubType>

+    </Compile>

+    <Compile Include="WorldBase.cs">

+      <SubType>Code</SubType>

+    </Compile>

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

+      <SubType>Code</SubType>

+    </Compile>

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

+      <SubType>Code</SubType>

+    </Compile>

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

+      <SubType>Code</SubType>

+    </Compile>

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

+      <SubType>Code</SubType>

+    </Compile>

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

+      <SubType>Code</SubType>

+    </Compile>

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

+      <SubType>Code</SubType>

+    </Compile>

+    <Compile Include="types\Mesh.cs">

+      <SubType>Code</SubType>

+    </Compile>

+    <Compile Include="types\Triangle.cs">

+      <SubType>Code</SubType>

+    </Compile>

+  </ItemGroup>

+  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />

+  <PropertyGroup>

+    <PreBuildEvent>

+    </PreBuildEvent>

+    <PostBuildEvent>

+    </PostBuildEvent>

+  </PropertyGroup>

+</Project>

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

+  <PropertyGroup>

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

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

+    <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim26-05\branches\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.RegionServer/world/Primitive.cs b/OpenSim/OpenSim.World/Primitive.cs
index 433ea9e..433ea9e 100644
--- a/OpenSim/OpenSim.RegionServer/world/Primitive.cs
+++ b/OpenSim/OpenSim.World/Primitive.cs
diff --git a/OpenSim/OpenSim.RegionServer/world/Primitive2.cs b/OpenSim/OpenSim.World/Primitive2.cs
index 6d071d4..6d071d4 100644
--- a/OpenSim/OpenSim.RegionServer/world/Primitive2.cs
+++ b/OpenSim/OpenSim.World/Primitive2.cs
diff --git a/OpenSim/OpenSim.RegionServer/world/SceneObject.cs b/OpenSim/OpenSim.World/SceneObject.cs
index a846fb5..a846fb5 100644
--- a/OpenSim/OpenSim.RegionServer/world/SceneObject.cs
+++ b/OpenSim/OpenSim.World/SceneObject.cs
diff --git a/OpenSim/OpenSim.RegionServer/world/World.PacketHandlers.cs b/OpenSim/OpenSim.World/World.PacketHandlers.cs
index ee5a23a..ee5a23a 100644
--- a/OpenSim/OpenSim.RegionServer/world/World.PacketHandlers.cs
+++ b/OpenSim/OpenSim.World/World.PacketHandlers.cs
diff --git a/OpenSim/OpenSim.RegionServer/world/World.Scripting.cs b/OpenSim/OpenSim.World/World.Scripting.cs
index 44ef05a..44ef05a 100644
--- a/OpenSim/OpenSim.RegionServer/world/World.Scripting.cs
+++ b/OpenSim/OpenSim.World/World.Scripting.cs
diff --git a/OpenSim/OpenSim.RegionServer/world/World.cs b/OpenSim/OpenSim.World/World.cs
index ec9bbc9..d840d10 100644
--- a/OpenSim/OpenSim.RegionServer/world/World.cs
+++ b/OpenSim/OpenSim.World/World.cs
@@ -57,7 +57,7 @@ namespace OpenSim.world
         /// <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, ClientView> clientThreads, RegionInfo regInfo, ulong regionHandle, string regionName)

+        public World(Dictionary<uint, IClientAPI> clientThreads, RegionInfo regInfo, ulong regionHandle, string regionName)

         {

             try

             {

@@ -531,92 +531,13 @@ namespace OpenSim.world
 

         public override Avatar AddViewerAgent(ClientView agentClient)

         {

-            //register for events

-            agentClient.OnChatFromViewer += new ChatFromViewer(this.SimChat);

-            agentClient.OnRezObject += new RezObject(this.RezObject);

-            agentClient.OnModifyTerrain += new ModifyTerrain(this.ModifyTerrain);

-            agentClient.OnRegionHandShakeReply += new ClientView.GenericCall(this.SendLayerData);

-            agentClient.OnRequestWearables += new ClientView.GenericCall(this.GetInitialPrims);

-            agentClient.OnRequestAvatarsData += new ClientView.GenericCall(this.SendAvatarsToClient);

-            agentClient.OnLinkObjects += new LinkObjects(this.LinkObjects);

-            agentClient.OnAddPrim += new ClientView.GenericCall4(this.AddNewPrim);

-            agentClient.OnUpdatePrimShape += new ClientView.UpdateShape(this.UpdatePrimShape);

-            agentClient.OnObjectSelect += new ClientView.ObjectSelect(this.SelectPrim);

-            agentClient.OnUpdatePrimFlags += new ClientView.UpdatePrimFlags(this.UpdatePrimFlags);

-            agentClient.OnUpdatePrimTexture += new ClientView.UpdatePrimTexture(this.UpdatePrimTexture);

-            agentClient.OnUpdatePrimPosition += new ClientView.UpdatePrimVector(this.UpdatePrimPosition);

-            agentClient.OnUpdatePrimRotation += new ClientView.UpdatePrimRotation(this.UpdatePrimRotation);

-            agentClient.OnUpdatePrimScale += new ClientView.UpdatePrimVector(this.UpdatePrimScale);

-            agentClient.OnDeRezObject += new ClientView.GenericCall4(this.DeRezObject);

-           

             Avatar newAvatar = null;

-            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(agentClient, this, m_regionName, m_clientThreads, m_regionHandle, true, 20);

-                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(this);

-                //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)

-                {

-                    if (!Entities.ContainsKey(agentClient.AgentID))

-                    {

-                        this.Entities.Add(agentClient.AgentID, newAvatar);

-                    }

-                    else

-                    {

-                        Entities[agentClient.AgentID] = newAvatar;

-                    }

-                }

-                lock (Avatars)

-                {

-                    if (Avatars.ContainsKey(agentClient.AgentID))

-                    {

-                        Avatars[agentClient.AgentID] = newAvatar;

-                    }

-                    else

-                    {

-                        this.Avatars.Add(agentClient.AgentID, newAvatar);

-                    }

-                }

-            }

-            catch (Exception e)

-            {

-                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "World.cs: AddViewerAgent() - Failed with exception " + e.ToString());

-            }

             return newAvatar;

         }

 

         public override void RemoveViewerAgent(ClientView agentClient)

         {

-            try

-            {

-                lock (Entities)

-                {

-                    Entities.Remove(agentClient.AgentID);

-                }

-                lock (Avatars)

-                {

-                    Avatars.Remove(agentClient.AgentID);

-                }

-                if (agentClient.ClientAvatar.PhysActor != null)

-                {

-                    this.phyScene.RemoveAvatar(agentClient.ClientAvatar.PhysActor);

-                }

-            }

-            catch (Exception e)

-            {

-                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "World.cs: RemoveViewerAgent() - Failed with exception " + e.ToString());

-            }

+            

         }

         #endregion

 

diff --git a/OpenSim/OpenSim.RegionServer/world/WorldBase.cs b/OpenSim/OpenSim.World/WorldBase.cs
index ea71411..8fe98d3 100644
--- a/OpenSim/OpenSim.RegionServer/world/WorldBase.cs
+++ b/OpenSim/OpenSim.World/WorldBase.cs
@@ -20,7 +20,7 @@ namespace OpenSim.world
     public class WorldBase

     {

         public Dictionary<libsecondlife.LLUUID, Entity> Entities;

-        protected Dictionary<uint, ClientView> m_clientThreads;

+        protected Dictionary<uint, IClientAPI> m_clientThreads;

         protected ulong m_regionHandle;

         protected string m_regionName;

         protected InventoryCache _inventoryCache;

diff --git a/OpenSim/OpenSim.RegionServer/world/scripting/IScriptContext.cs b/OpenSim/OpenSim.World/scripting/IScriptContext.cs
index 465c23b..465c23b 100644
--- a/OpenSim/OpenSim.RegionServer/world/scripting/IScriptContext.cs
+++ b/OpenSim/OpenSim.World/scripting/IScriptContext.cs
diff --git a/OpenSim/OpenSim.RegionServer/world/scripting/IScriptEntity.cs b/OpenSim/OpenSim.World/scripting/IScriptEntity.cs
index 2ef16a4..2ef16a4 100644
--- a/OpenSim/OpenSim.RegionServer/world/scripting/IScriptEntity.cs
+++ b/OpenSim/OpenSim.World/scripting/IScriptEntity.cs
diff --git a/OpenSim/OpenSim.RegionServer/world/scripting/IScriptHandler.cs b/OpenSim/OpenSim.World/scripting/IScriptHandler.cs
index 15efc49..15efc49 100644
--- a/OpenSim/OpenSim.RegionServer/world/scripting/IScriptHandler.cs
+++ b/OpenSim/OpenSim.World/scripting/IScriptHandler.cs
diff --git a/OpenSim/OpenSim.RegionServer/world/scripting/Script.cs b/OpenSim/OpenSim.World/scripting/Script.cs
index 48c18ff..48c18ff 100644
--- a/OpenSim/OpenSim.RegionServer/world/scripting/Script.cs
+++ b/OpenSim/OpenSim.World/scripting/Script.cs
diff --git a/OpenSim/OpenSim.RegionServer/world/scripting/ScriptFactory.cs b/OpenSim/OpenSim.World/scripting/ScriptFactory.cs
index 4c6d373..4c6d373 100644
--- a/OpenSim/OpenSim.RegionServer/world/scripting/ScriptFactory.cs
+++ b/OpenSim/OpenSim.World/scripting/ScriptFactory.cs
diff --git a/OpenSim/OpenSim.RegionServer/world/scripting/Scripts/FollowRandomAvatar.cs b/OpenSim/OpenSim.World/scripting/Scripts/FollowRandomAvatar.cs
index 6a689ab..6a689ab 100644
--- a/OpenSim/OpenSim.RegionServer/world/scripting/Scripts/FollowRandomAvatar.cs
+++ b/OpenSim/OpenSim.World/scripting/Scripts/FollowRandomAvatar.cs
diff --git a/OpenSim/OpenSim.RegionServer/types/Mesh.cs b/OpenSim/OpenSim.World/types/Mesh.cs
index 3e00c91..3e00c91 100644
--- a/OpenSim/OpenSim.RegionServer/types/Mesh.cs
+++ b/OpenSim/OpenSim.World/types/Mesh.cs
diff --git a/OpenSim/OpenSim.RegionServer/types/Triangle.cs b/OpenSim/OpenSim.World/types/Triangle.cs
index 8dfea6e..8dfea6e 100644
--- a/OpenSim/OpenSim.RegionServer/types/Triangle.cs
+++ b/OpenSim/OpenSim.World/types/Triangle.cs