6 files changed, 32 insertions, 179 deletions

diff --git a/OpenSim/OpenSim.Region/OpenSim.Region.csproj b/OpenSim/OpenSim.Region/OpenSim.Region.csproj
index a2b50f4..3e3f617 100644
--- a/OpenSim/OpenSim.Region/OpenSim.Region.csproj
+++ b/OpenSim/OpenSim.Region/OpenSim.Region.csproj
@@ -1,4 +1,4 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

   <PropertyGroup>

     <ProjectType>Local</ProjectType>

     <ProductVersion>8.0.50727</ProductVersion>

@@ -6,7 +6,8 @@
     <ProjectGuid>{196916AF-0000-0000-0000-000000000000}</ProjectGuid>

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

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

-    <ApplicationIcon></ApplicationIcon>

+    <ApplicationIcon>

+    </ApplicationIcon>

     <AssemblyKeyContainerName>

     </AssemblyKeyContainerName>

     <AssemblyName>OpenSim.Region</AssemblyName>

@@ -15,9 +16,11 @@
     <DefaultTargetSchema>IE50</DefaultTargetSchema>

     <DelaySign>false</DelaySign>

     <OutputType>Library</OutputType>

-    <AppDesignerFolder></AppDesignerFolder>

+    <AppDesignerFolder>

+    </AppDesignerFolder>

     <RootNamespace>OpenSim.Region</RootNamespace>

-    <StartupObject></StartupObject>

+    <StartupObject>

+    </StartupObject>

     <FileUpgradeFlags>

     </FileUpgradeFlags>

   </PropertyGroup>

@@ -28,7 +31,8 @@
     <ConfigurationOverrideFile>

     </ConfigurationOverrideFile>

     <DefineConstants>TRACE;DEBUG</DefineConstants>

-    <DocumentationFile></DocumentationFile>

+    <DocumentationFile>

+    </DocumentationFile>

     <DebugSymbols>True</DebugSymbols>

     <FileAlignment>4096</FileAlignment>

     <Optimize>False</Optimize>

@@ -37,7 +41,8 @@
     <RemoveIntegerChecks>False</RemoveIntegerChecks>

     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>

     <WarningLevel>4</WarningLevel>

-    <NoWarn></NoWarn>

+    <NoWarn>

+    </NoWarn>

   </PropertyGroup>

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

     <AllowUnsafeBlocks>False</AllowUnsafeBlocks>

@@ -46,7 +51,8 @@
     <ConfigurationOverrideFile>

     </ConfigurationOverrideFile>

     <DefineConstants>TRACE</DefineConstants>

-    <DocumentationFile></DocumentationFile>

+    <DocumentationFile>

+    </DocumentationFile>

     <DebugSymbols>False</DebugSymbols>

     <FileAlignment>4096</FileAlignment>

     <Optimize>True</Optimize>

@@ -55,26 +61,27 @@
     <RemoveIntegerChecks>False</RemoveIntegerChecks>

     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>

     <WarningLevel>4</WarningLevel>

-    <NoWarn></NoWarn>

+    <NoWarn>

+    </NoWarn>

   </PropertyGroup>

   <ItemGroup>

-    <Reference Include="System" >

+    <Reference Include="System">

       <HintPath>System.dll</HintPath>

       <Private>False</Private>

     </Reference>

-    <Reference Include="System.Xml" >

+    <Reference Include="System.Xml">

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

       <Private>False</Private>

     </Reference>

-    <Reference Include="libsecondlife.dll" >

+    <Reference Include="libsecondlife.dll">

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

       <Private>False</Private>

     </Reference>

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

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

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

       <Private>False</Private>

     </Reference>

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

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

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

       <Private>False</Private>

     </Reference>

@@ -84,49 +91,49 @@
       <Name>OpenSim.Terrain.BasicTerrain</Name>

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

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

-                        <Private>False</Private>

+      <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>

+      <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>

+      <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>

+      <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>

+      <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>

+      <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>

+      <Private>False</Private>

     </ProjectReference>

     <ProjectReference Include="..\..\Common\OpenGrid.Framework.Communications\OpenGrid.Framework.Communications.csproj">

       <Name>OpenGrid.Framework.Communications</Name>

       <Project>{683344D5-0000-0000-0000-000000000000}</Project>

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

-                        <Private>False</Private>

+      <Private>False</Private>

     </ProjectReference>

   </ItemGroup>

   <ItemGroup>

@@ -184,12 +191,9 @@
     <Compile Include="World\scripting\Scripts\FollowRandomAvatar.cs">

       <SubType>Code</SubType>

     </Compile>

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

-      <SubType>Code</SubType>

-    </Compile>

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

-      <SubType>Code</SubType>

-    </Compile>

+  </ItemGroup>

+  <ItemGroup>

+    <Folder Include="World\types\" />

   </ItemGroup>

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

   <PropertyGroup>

@@ -198,4 +202,4 @@
     <PostBuildEvent>

     </PostBuildEvent>

   </PropertyGroup>

-</Project>

+</Project>
\ No newline at end of file
diff --git a/OpenSim/OpenSim.Region/World/Entities/Entity.cs b/OpenSim/OpenSim.Region/World/Entities/Entity.cs
index 1620c89..3d6ba64 100644
--- a/OpenSim/OpenSim.Region/World/Entities/Entity.cs
+++ b/OpenSim/OpenSim.Region/World/Entities/Entity.cs
@@ -30,7 +30,6 @@ using System.Collections.Generic;
 using System.Text;

 using Axiom.MathLib;

 using OpenSim.Physics.Manager;

-using OpenSim.Region.types;

 using libsecondlife;

 using OpenSim.Region.Scripting;

 

@@ -131,22 +130,6 @@ namespace OpenSim.Region
         }

 

         /// <summary>

-        /// Returns a mesh for this object and any dependents

-        /// </summary>

-        /// <returns>The mesh of this entity tree</returns>

-        public virtual Mesh getMesh()

-        {

-            Mesh mesh = new Mesh();

-

-            foreach (Entity child in children)

-            {

-                mesh += child.getMesh();

-            }

-

-            return mesh;

-        }

-        

-        /// <summary>

         /// Called at a set interval to inform entities that they should back themsleves up to the DB 

         /// </summary>

         public virtual void BackUp()

diff --git a/OpenSim/OpenSim.Region/World/Entities/Primitive.cs b/OpenSim/OpenSim.Region/World/Entities/Primitive.cs
index 3d915a1..6efdd66 100644
--- a/OpenSim/OpenSim.Region/World/Entities/Primitive.cs
+++ b/OpenSim/OpenSim.Region/World/Entities/Primitive.cs
@@ -29,7 +29,6 @@
 using System;

 using System.Collections.Generic;

 using System.Text;

-using OpenSim.Region.types;

 using libsecondlife;

 using libsecondlife.Packets;

 using OpenSim.Framework.Interfaces;

diff --git a/OpenSim/OpenSim.Region/World/Entities/SceneObject.cs b/OpenSim/OpenSim.Region/World/Entities/SceneObject.cs
index 558dc6b..7284b73 100644
--- a/OpenSim/OpenSim.Region/World/Entities/SceneObject.cs
+++ b/OpenSim/OpenSim.Region/World/Entities/SceneObject.cs
@@ -28,7 +28,6 @@
 using System;

 using System.Collections.Generic;

 using System.Text;

-using OpenSim.Region.types;

 using libsecondlife;

 using libsecondlife.Packets;

 using OpenSim.Framework.Interfaces;

diff --git a/OpenSim/OpenSim.Region/World/types/Mesh.cs b/OpenSim/OpenSim.Region/World/types/Mesh.cs
deleted file mode 100644
index a196449..0000000
--- a/OpenSim/OpenSim.Region/World/types/Mesh.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-/*

-* Copyright (c) Contributors, http://www.openmetaverse.org/

-* See CONTRIBUTORS.TXT for a full list of copyright holders.

-*

-* Redistribution and use in source and binary forms, with or without

-* modification, are permitted provided that the following conditions are met:

-*     * Redistributions of source code must retain the above copyright

-*       notice, this list of conditions and the following disclaimer.

-*     * Redistributions in binary form must reproduce the above copyright

-*       notice, this list of conditions and the following disclaimer in the

-*       documentation and/or other materials provided with the distribution.

-*     * Neither the name of the OpenSim Project nor the

-*       names of its contributors may be used to endorse or promote products

-*       derived from this software without specific prior written permission.

-*

-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY

-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED

-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE

-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY

-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;

-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND

-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-* 

-*/

-using System;

-using System.Collections.Generic;

-using System.Text;

-

-namespace OpenSim.Region.types

-{

-    // TODO: This will need some performance tuning no doubt.

-    public class Mesh

-    {

-        public List<Triangle> mesh;

-

-        /// <summary>

-        /// 

-        /// </summary>

-        public Mesh()

-        {

-            mesh = new List<Triangle>();

-        }

-

-        /// <summary>

-        /// 

-        /// </summary>

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

-        public void AddTri(Triangle tri)

-        {

-            mesh.Add(tri);

-        }

-

-        /// <summary>

-        /// 

-        /// </summary>

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

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

-        /// <returns></returns>

-        public static Mesh operator +(Mesh a, Mesh b)

-        {

-            a.mesh.AddRange(b.mesh);

-            return a;

-        }

-    }

-}

diff --git a/OpenSim/OpenSim.Region/World/types/Triangle.cs b/OpenSim/OpenSim.Region/World/types/Triangle.cs
deleted file mode 100644
index aee92a5..0000000
--- a/OpenSim/OpenSim.Region/World/types/Triangle.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-/*

-* Copyright (c) Contributors, http://www.openmetaverse.org/

-* See CONTRIBUTORS.TXT for a full list of copyright holders.

-*

-* Redistribution and use in source and binary forms, with or without

-* modification, are permitted provided that the following conditions are met:

-*     * Redistributions of source code must retain the above copyright

-*       notice, this list of conditions and the following disclaimer.

-*     * Redistributions in binary form must reproduce the above copyright

-*       notice, this list of conditions and the following disclaimer in the

-*       documentation and/or other materials provided with the distribution.

-*     * Neither the name of the OpenSim Project nor the

-*       names of its contributors may be used to endorse or promote products

-*       derived from this software without specific prior written permission.

-*

-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY

-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED

-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE

-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY

-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;

-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND

-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-* 

-*/

-using System;

-using System.Collections.Generic;

-using System.Text;

-using Axiom.MathLib;

-

-namespace OpenSim.Region.types

-{

-    public class Triangle

-    {

-        Vector3 a;

-        Vector3 b;

-        Vector3 c;

-

-        /// <summary>

-        /// 

-        /// </summary>

-        public Triangle()

-        {

-            a = new Vector3();

-            b = new Vector3();

-            c = new Vector3();

-        }

-

-        /// <summary>

-        /// 

-        /// </summary>

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

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

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

-        public Triangle(Vector3 A, Vector3 B, Vector3 C)

-        {

-            a = A;

-            b = B;

-            c = C;

-        }

-    }

-}