From 5c3a4f52f4b4413832a6942aa75a21b157cd48dc Mon Sep 17 00:00:00 2001
From: mingchen
Date: Mon, 11 Jun 2007 18:27:07 +0000
Subject: *Removed SimProfileBase from OpenSim (Unused/Depreciated) *Updated
 prebuild.xml

---
 OpenSim/OpenSim.Region/OpenSim.Region.csproj       | 10 ++--
 OpenSim/OpenSim.Region/OpenSim.Region.dll.build    |  4 +-
 .../OpenSim.RegionServer.csproj                    | 57 ++++++++++------------
 .../OpenSim.RegionServer.dll.build                 |  5 +-
 .../OpenSim.Scripting.EmbeddedJVM.csproj           | 45 ++++++++---------
 .../OpenSim.Scripting.EmbeddedJVM.dll.build        |  3 +-
 .../OpenSim.Storage.LocalStorageDb4o.csproj        | 10 ++--
 .../OpenSim.Storage.LocalStorageDb4o.dll.build     |  6 +--
 8 files changed, 63 insertions(+), 77 deletions(-)

(limited to 'OpenSim')

diff --git a/OpenSim/OpenSim.Region/OpenSim.Region.csproj b/OpenSim/OpenSim.Region/OpenSim.Region.csproj
index 5c30810..365af66 100644
--- a/OpenSim/OpenSim.Region/OpenSim.Region.csproj
+++ b/OpenSim/OpenSim.Region/OpenSim.Region.csproj
@@ -136,6 +136,9 @@
     <Compile Include="Estate\EstateManager.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="World\AvatarAnimations.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="World\Avatar.Client.cs">
       <SubType>Code</SubType>
     </Compile>
@@ -145,9 +148,6 @@
     <Compile Include="World\Avatar.Update.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="World\AvatarAnimations.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="World\Entity.cs">
       <SubType>Code</SubType>
     </Compile>
@@ -163,10 +163,10 @@
     <Compile Include="World\World.PacketHandlers.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="World\World.Scripting.cs">
+    <Compile Include="World\WorldBase.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="World\WorldBase.cs">
+    <Compile Include="World\World.Scripting.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="World\scripting\IScriptContext.cs">
diff --git a/OpenSim/OpenSim.Region/OpenSim.Region.dll.build b/OpenSim/OpenSim.Region/OpenSim.Region.dll.build
index ae46c6b..a33d214 100644
--- a/OpenSim/OpenSim.Region/OpenSim.Region.dll.build
+++ b/OpenSim/OpenSim.Region/OpenSim.Region.dll.build
@@ -13,17 +13,17 @@
             <sources failonempty="true">
                 <include name="ParcelManager.cs" />
                 <include name="Estate/EstateManager.cs" />
+                <include name="World/AvatarAnimations.cs" />
                 <include name="World/Avatar.Client.cs" />
                 <include name="World/Avatar.cs" />
                 <include name="World/Avatar.Update.cs" />
-                <include name="World/AvatarAnimations.cs" />
                 <include name="World/Entity.cs" />
                 <include name="World/Primitive.cs" />
                 <include name="World/SceneObject.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/World.Scripting.cs" />
                 <include name="World/scripting/IScriptContext.cs" />
                 <include name="World/scripting/IScriptEntity.cs" />
                 <include name="World/scripting/IScriptHandler.cs" />
diff --git a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj
index 75b70b4..259d839 100644
--- a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj
+++ b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.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,8 +6,7 @@
     <ProjectGuid>{632E1BFD-0000-0000-0000-000000000000}</ProjectGuid>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon>
-    </ApplicationIcon>
+    <ApplicationIcon></ApplicationIcon>
     <AssemblyKeyContainerName>
     </AssemblyKeyContainerName>
     <AssemblyName>OpenSim.RegionServer</AssemblyName>
@@ -16,11 +15,9 @@
     <DefaultTargetSchema>IE50</DefaultTargetSchema>
     <DelaySign>false</DelaySign>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>
-    </AppDesignerFolder>
+    <AppDesignerFolder></AppDesignerFolder>
     <RootNamespace>OpenSim.RegionServer</RootNamespace>
-    <StartupObject>
-    </StartupObject>
+    <StartupObject></StartupObject>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
   </PropertyGroup>
@@ -31,8 +28,7 @@
     <ConfigurationOverrideFile>
     </ConfigurationOverrideFile>
     <DefineConstants>TRACE;DEBUG</DefineConstants>
-    <DocumentationFile>
-    </DocumentationFile>
+    <DocumentationFile></DocumentationFile>
     <DebugSymbols>True</DebugSymbols>
     <FileAlignment>4096</FileAlignment>
     <Optimize>False</Optimize>
@@ -41,8 +37,7 @@
     <RemoveIntegerChecks>False</RemoveIntegerChecks>
     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
     <WarningLevel>4</WarningLevel>
-    <NoWarn>
-    </NoWarn>
+    <NoWarn></NoWarn>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
@@ -51,8 +46,7 @@
     <ConfigurationOverrideFile>
     </ConfigurationOverrideFile>
     <DefineConstants>TRACE</DefineConstants>
-    <DocumentationFile>
-    </DocumentationFile>
+    <DocumentationFile></DocumentationFile>
     <DebugSymbols>False</DebugSymbols>
     <FileAlignment>4096</FileAlignment>
     <Optimize>True</Optimize>
@@ -61,27 +55,26 @@
     <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>
@@ -91,43 +84,43 @@
       <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>
   </ItemGroup>
   <ItemGroup>
@@ -161,16 +154,16 @@
     <Compile Include="PacketServer.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="RegionServerBase.cs">
+    <Compile Include="UserConfigUtility.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="UDPServer.cs">
+    <Compile Include="VersionInfo.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="UserConfigUtility.cs">
+    <Compile Include="RegionServerBase.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="VersionInfo.cs">
+    <Compile Include="UDPServer.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Assets\AssetCache.cs">
@@ -187,4 +180,4 @@
     <PostBuildEvent>
     </PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
index 5b3e60b..32c1699 100644
--- a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
+++ b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
@@ -21,13 +21,12 @@
                 <include name="NetworkServersInfo.cs" />
                 <include name="OpenSimNetworkHandler.cs" />
                 <include name="PacketServer.cs" />
-                <include name="RegionServerBase.cs" />
-                <include name="UDPServer.cs" />
                 <include name="UserConfigUtility.cs" />
                 <include name="VersionInfo.cs" />
+                <include name="RegionServerBase.cs" />
+                <include name="UDPServer.cs" />
                 <include name="Assets/AssetCache.cs" />
                 <include name="Assets/InventoryCache.cs" />
-                <include name="CAPS/AdminWebFront.cs" />
             </sources>
             <references basedir="${project::get-base-directory()}">
                 <lib>
diff --git a/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj b/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj
index 0750742..6bcf38a 100644
--- a/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj
+++ b/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.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,8 +6,7 @@
     <ProjectGuid>{97A82740-0000-0000-0000-000000000000}</ProjectGuid>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon>
-    </ApplicationIcon>
+    <ApplicationIcon></ApplicationIcon>
     <AssemblyKeyContainerName>
     </AssemblyKeyContainerName>
     <AssemblyName>OpenSim.Scripting.EmbeddedJVM</AssemblyName>
@@ -16,11 +15,9 @@
     <DefaultTargetSchema>IE50</DefaultTargetSchema>
     <DelaySign>false</DelaySign>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>
-    </AppDesignerFolder>
+    <AppDesignerFolder></AppDesignerFolder>
     <RootNamespace>OpenSim.Scripting.EmbeddedJVM</RootNamespace>
-    <StartupObject>
-    </StartupObject>
+    <StartupObject></StartupObject>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
   </PropertyGroup>
@@ -31,8 +28,7 @@
     <ConfigurationOverrideFile>
     </ConfigurationOverrideFile>
     <DefineConstants>TRACE;DEBUG</DefineConstants>
-    <DocumentationFile>
-    </DocumentationFile>
+    <DocumentationFile></DocumentationFile>
     <DebugSymbols>True</DebugSymbols>
     <FileAlignment>4096</FileAlignment>
     <Optimize>False</Optimize>
@@ -41,8 +37,7 @@
     <RemoveIntegerChecks>False</RemoveIntegerChecks>
     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
     <WarningLevel>4</WarningLevel>
-    <NoWarn>
-    </NoWarn>
+    <NoWarn></NoWarn>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
@@ -51,8 +46,7 @@
     <ConfigurationOverrideFile>
     </ConfigurationOverrideFile>
     <DefineConstants>TRACE</DefineConstants>
-    <DocumentationFile>
-    </DocumentationFile>
+    <DocumentationFile></DocumentationFile>
     <DebugSymbols>False</DebugSymbols>
     <FileAlignment>4096</FileAlignment>
     <Optimize>True</Optimize>
@@ -61,29 +55,28 @@
     <RemoveIntegerChecks>False</RemoveIntegerChecks>
     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
     <WarningLevel>4</WarningLevel>
-    <NoWarn>
-    </NoWarn>
+    <NoWarn></NoWarn>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="libsecondlife, Version=0.9.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\bin\libsecondlife.dll</HintPath>
-    </Reference>
-    <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" >
+      <HintPath>..\..\..\bin\libsecondlife.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <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>
   </ItemGroup>
   <ItemGroup>
@@ -102,9 +95,6 @@
     <Compile Include="InterpreterLogic.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="InterpreterMethods.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="InterpreterReturn.cs">
       <SubType>Code</SubType>
     </Compile>
@@ -129,6 +119,9 @@
     <Compile Include="Thread.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="InterpreterMethods.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="Properties\AssemblyInfo.cs">
       <SubType>Code</SubType>
     </Compile>
@@ -161,4 +154,4 @@
     <PostBuildEvent>
     </PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build b/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build
index c5255db..2ff51ef 100644
--- a/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build
+++ b/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build
@@ -16,7 +16,6 @@
                 <include name="Heap.cs" />
                 <include name="Interpreter.cs" />
                 <include name="InterpreterLogic.cs" />
-                <include name="InterpreterMethods.cs" />
                 <include name="InterpreterReturn.cs" />
                 <include name="MainMemory.cs" />
                 <include name="MethodMemory.cs" />
@@ -25,6 +24,7 @@
                 <include name="Stack.cs" />
                 <include name="StackFrame.cs" />
                 <include name="Thread.cs" />
+                <include name="InterpreterMethods.cs" />
                 <include name="Properties/AssemblyInfo.cs" />
                 <include name="Types/ArrayReference.cs" />
                 <include name="Types/BaseType.cs" />
@@ -41,6 +41,7 @@
                 </lib>
                 <include name="System.dll" />
                 <include name="System.Xml.dll" />
+                <include name="../../../bin/libsecondlife.dll" />
                 <include name="../../../bin/OpenSim.Framework.dll" />
             </references>
         </csc>
diff --git a/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj b/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj
index 15ae5bf..6f92e76 100644
--- a/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj
+++ b/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj
@@ -90,19 +90,19 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="AssemblyInfo.cs">
+    <Compile Include="UUIDParcelQuery.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Db4LocalStorage.cs">
+    <Compile Include="UUIDPrimQuery.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="MapStorage.cs">
+    <Compile Include="Db4LocalStorage.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="UUIDParcelQuery.cs">
+    <Compile Include="AssemblyInfo.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="UUIDPrimQuery.cs">
+    <Compile Include="MapStorage.cs">
       <SubType>Code</SubType>
     </Compile>
   </ItemGroup>
diff --git a/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build b/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build
index c2fd2bd..7fb50c8 100644
--- a/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build
+++ b/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build
@@ -11,11 +11,11 @@
             <resources prefix="OpenSim.Storage.LocalStorageDb4o" dynamicprefix="true" >
             </resources>
             <sources failonempty="true">
-                <include name="AssemblyInfo.cs" />
-                <include name="Db4LocalStorage.cs" />
-                <include name="MapStorage.cs" />
                 <include name="UUIDParcelQuery.cs" />
                 <include name="UUIDPrimQuery.cs" />
+                <include name="Db4LocalStorage.cs" />
+                <include name="AssemblyInfo.cs" />
+                <include name="MapStorage.cs" />
             </sources>
             <references basedir="${project::get-base-directory()}">
                 <lib>
-- 
cgit v1.1