aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.csproj4
-rw-r--r--OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.dll.build8
-rw-r--r--OpenSim.RegionServer/OpenSimMain.cs2
-rw-r--r--OpenSim.Storage.LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.csproj136
-rw-r--r--OpenSim.Storage.LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.dll.build47
-rw-r--r--OpenSim.Storage.LocalStorageBerkeleyDB/obj/OpenSim.Storage.LocalStorageBerkeleyDB.csproj.FileList.txt2
-rw-r--r--OpenSim.Storage.LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.csproj4
-rw-r--r--OpenSim.Storage.LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build2
-rw-r--r--OpenSim.build3
-rw-r--r--OpenSim.sln6
-rw-r--r--bin/OpenSim.Terrain.BasicTerrain.dllbin16384 -> 16384 bytes
-rw-r--r--prebuild.xml8
12 files changed, 163 insertions, 59 deletions
diff --git a/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.csproj b/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.csproj
index af282ea..98e813e 100644
--- a/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.csproj
+++ b/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.csproj
@@ -32,7 +32,7 @@
32 <DebugSymbols>True</DebugSymbols> 32 <DebugSymbols>True</DebugSymbols>
33 <FileAlignment>4096</FileAlignment> 33 <FileAlignment>4096</FileAlignment>
34 <Optimize>False</Optimize> 34 <Optimize>False</Optimize>
35 <OutputPath>..\bin\</OutputPath> 35 <OutputPath>..\..\bin\</OutputPath>
36 <RegisterForComInterop>False</RegisterForComInterop> 36 <RegisterForComInterop>False</RegisterForComInterop>
37 <RemoveIntegerChecks>False</RemoveIntegerChecks> 37 <RemoveIntegerChecks>False</RemoveIntegerChecks>
38 <TreatWarningsAsErrors>False</TreatWarningsAsErrors> 38 <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
@@ -50,7 +50,7 @@
50 <DebugSymbols>False</DebugSymbols> 50 <DebugSymbols>False</DebugSymbols>
51 <FileAlignment>4096</FileAlignment> 51 <FileAlignment>4096</FileAlignment>
52 <Optimize>True</Optimize> 52 <Optimize>True</Optimize>
53 <OutputPath>..\bin\</OutputPath> 53 <OutputPath>..\..\bin\</OutputPath>
54 <RegisterForComInterop>False</RegisterForComInterop> 54 <RegisterForComInterop>False</RegisterForComInterop>
55 <RemoveIntegerChecks>False</RemoveIntegerChecks> 55 <RemoveIntegerChecks>False</RemoveIntegerChecks>
56 <TreatWarningsAsErrors>False</TreatWarningsAsErrors> 56 <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
diff --git a/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.dll.build b/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.dll.build
index b68ad03..f34e4ac 100644
--- a/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.dll.build
+++ b/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.dll.build
@@ -21,12 +21,12 @@
21 </lib> 21 </lib>
22 <include name="System.dll" /> 22 <include name="System.dll" />
23 <include name="System.Xml.dll" /> 23 <include name="System.Xml.dll" />
24 <include name="../bin/OpenSim.Framework.dll" /> 24 <include name="../../bin/OpenSim.Framework.dll" />
25 </references> 25 </references>
26 </csc> 26 </csc>
27 <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" /> 27 <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" />
28 <mkdir dir="${project::get-base-directory()}/../bin/"/> 28 <mkdir dir="${project::get-base-directory()}/../../bin/"/>
29 <copy todir="${project::get-base-directory()}/../bin/"> 29 <copy todir="${project::get-base-directory()}/../../bin/">
30 <fileset basedir="${project::get-base-directory()}/${build.dir}/" > 30 <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
31 <include name="*.dll"/> 31 <include name="*.dll"/>
32 <include name="*.exe"/> 32 <include name="*.exe"/>
diff --git a/OpenSim.RegionServer/OpenSimMain.cs b/OpenSim.RegionServer/OpenSimMain.cs
index fab9db4..34fa243 100644
--- a/OpenSim.RegionServer/OpenSimMain.cs
+++ b/OpenSim.RegionServer/OpenSimMain.cs
@@ -46,9 +46,9 @@ using OpenSim.Assets;
46using OpenSim.CAPS; 46using OpenSim.CAPS;
47using OpenSim.Framework.Console; 47using OpenSim.Framework.Console;
48using OpenSim.Physics.Manager; 48using OpenSim.Physics.Manager;
49using OpenSim.GenericConfig;
50using Nwc.XmlRpc; 49using Nwc.XmlRpc;
51using OpenSim.Servers; 50using OpenSim.Servers;
51using OpenSim.GenericConfig;
52 52
53namespace OpenSim 53namespace OpenSim
54{ 54{
diff --git a/OpenSim.Storage.LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.csproj b/OpenSim.Storage.LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.csproj
index 4d2856a..72a07a0 100644
--- a/OpenSim.Storage.LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.csproj
+++ b/OpenSim.Storage.LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.csproj
@@ -1,69 +1,115 @@
1<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> 1<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2 <PropertyGroup> 2 <PropertyGroup>
3 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> 3 <ProjectType>Local</ProjectType>
4 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
5 <ProductVersion>8.0.50727</ProductVersion> 4 <ProductVersion>8.0.50727</ProductVersion>
6 <SchemaVersion>2.0</SchemaVersion> 5 <SchemaVersion>2.0</SchemaVersion>
7 <ProjectGuid>{5D7AB19E-5673-4DDB-8B6B-E3105B826CB4}</ProjectGuid> 6 <ProjectGuid>{EE9E5D96-0000-0000-0000-000000000000}</ProjectGuid>
7 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
8 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
9 <ApplicationIcon></ApplicationIcon>
10 <AssemblyKeyContainerName>
11 </AssemblyKeyContainerName>
12 <AssemblyName>OpenSim.Storage.LocalStorageBerkeleyDB</AssemblyName>
13 <DefaultClientScript>JScript</DefaultClientScript>
14 <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
15 <DefaultTargetSchema>IE50</DefaultTargetSchema>
16 <DelaySign>false</DelaySign>
8 <OutputType>Library</OutputType> 17 <OutputType>Library</OutputType>
9 <AppDesignerFolder>Properties</AppDesignerFolder> 18 <AppDesignerFolder></AppDesignerFolder>
10 <RootNamespace>OpenSim.Storage.LocalStorageBerkeleyDB</RootNamespace> 19 <RootNamespace>OpenSim.Storage.LocalStorageBerkeleyDB</RootNamespace>
11 <AssemblyName>OpenSim.Storage.LocalStorageBerkeleyDB</AssemblyName> 20 <StartupObject></StartupObject>
21 <FileUpgradeFlags>
22 </FileUpgradeFlags>
12 </PropertyGroup> 23 </PropertyGroup>
13 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> 24 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
14 <DebugSymbols>true</DebugSymbols> 25 <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
15 <DebugType>full</DebugType> 26 <BaseAddress>285212672</BaseAddress>
16 <Optimize>false</Optimize> 27 <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
17 <OutputPath>bin\Debug\</OutputPath> 28 <ConfigurationOverrideFile>
18 <DefineConstants>DEBUG;TRACE</DefineConstants> 29 </ConfigurationOverrideFile>
19 <ErrorReport>prompt</ErrorReport> 30 <DefineConstants>TRACE;DEBUG</DefineConstants>
31 <DocumentationFile></DocumentationFile>
32 <DebugSymbols>True</DebugSymbols>
33 <FileAlignment>4096</FileAlignment>
34 <Optimize>False</Optimize>
35 <OutputPath>..\bin\</OutputPath>
36 <RegisterForComInterop>False</RegisterForComInterop>
37 <RemoveIntegerChecks>False</RemoveIntegerChecks>
38 <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
20 <WarningLevel>4</WarningLevel> 39 <WarningLevel>4</WarningLevel>
40 <NoWarn></NoWarn>
21 </PropertyGroup> 41 </PropertyGroup>
22 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> 42 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
23 <DebugType>pdbonly</DebugType> 43 <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
24 <Optimize>true</Optimize> 44 <BaseAddress>285212672</BaseAddress>
25 <OutputPath>bin\Release\</OutputPath> 45 <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
46 <ConfigurationOverrideFile>
47 </ConfigurationOverrideFile>
26 <DefineConstants>TRACE</DefineConstants> 48 <DefineConstants>TRACE</DefineConstants>
27 <ErrorReport>prompt</ErrorReport> 49 <DocumentationFile></DocumentationFile>
50 <DebugSymbols>False</DebugSymbols>
51 <FileAlignment>4096</FileAlignment>
52 <Optimize>True</Optimize>
53 <OutputPath>..\bin\</OutputPath>
54 <RegisterForComInterop>False</RegisterForComInterop>
55 <RemoveIntegerChecks>False</RemoveIntegerChecks>
56 <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
28 <WarningLevel>4</WarningLevel> 57 <WarningLevel>4</WarningLevel>
58 <NoWarn></NoWarn>
29 </PropertyGroup> 59 </PropertyGroup>
30 <ItemGroup> 60 <ItemGroup>
31 <Reference Include="Kds.Serialization, Version=0.8.1.26141, Culture=neutral, PublicKeyToken=07e6449d79bffb34, processorArchitecture=MSIL"> 61 <Reference Include="System" >
32 <SpecificVersion>False</SpecificVersion> 62 <HintPath>System.dll</HintPath>
33 <HintPath>bin\Kds.Serialization.dll</HintPath> 63 <Private>False</Private>
64 </Reference>
65 <Reference Include="System.Xml" >
66 <HintPath>System.Xml.dll</HintPath>
67 <Private>False</Private>
34 </Reference> 68 </Reference>
35 <Reference Include="libdb_dotNET43, Version=0.9.1.26139, Culture=neutral, PublicKeyToken=0f0d57806cebdc08, processorArchitecture=MSIL"> 69 <Reference Include="System.Data" >
36 <SpecificVersion>False</SpecificVersion> 70 <HintPath>System.Data.dll</HintPath>
37 <HintPath>bin\libdb_dotNET43.dll</HintPath> 71 <Private>False</Private>
38 </Reference> 72 </Reference>
39 <Reference Include="libsecondlife, Version=0.9.0.0, Culture=neutral, processorArchitecture=MSIL"> 73 <Reference Include="Kds.Serialization.dll" >
40 <SpecificVersion>False</SpecificVersion> 74 <HintPath>..\bin\Kds.Serialization.dll</HintPath>
75 <Private>False</Private>
76 </Reference>
77 <Reference Include="libDB_dotNET43.dll" >
78 <HintPath>..\bin\libDB_dotNET43.dll</HintPath>
79 <Private>False</Private>
80 </Reference>
81 <Reference Include="libsecondlife.dll" >
41 <HintPath>..\bin\libsecondlife.dll</HintPath> 82 <HintPath>..\bin\libsecondlife.dll</HintPath>
83 <Private>False</Private>
42 </Reference> 84 </Reference>
43 <Reference Include="System" />
44 <Reference Include="System.Data" />
45 <Reference Include="System.Xml" />
46 </ItemGroup>
47 <ItemGroup>
48 <Compile Include="BDBLocalStorage.cs" />
49 <Compile Include="Properties\AssemblyInfo.cs" />
50 </ItemGroup> 85 </ItemGroup>
51 <ItemGroup> 86 <ItemGroup>
52 <ProjectReference Include="..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj">
53 <Project>{A7CD0630-0000-0000-0000-000000000000}</Project>
54 <Name>OpenSim.Framework.Console</Name>
55 </ProjectReference>
56 <ProjectReference Include="..\OpenSim.Framework\OpenSim.Framework.csproj"> 87 <ProjectReference Include="..\OpenSim.Framework\OpenSim.Framework.csproj">
57 <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>
58 <Name>OpenSim.Framework</Name> 88 <Name>OpenSim.Framework</Name>
89 <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>
90 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
91 <Private>False</Private>
92 </ProjectReference>
93 <ProjectReference Include="..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj">
94 <Name>OpenSim.Framework.Console</Name>
95 <Project>{A7CD0630-0000-0000-0000-000000000000}</Project>
96 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
97 <Private>False</Private>
59 </ProjectReference> 98 </ProjectReference>
60 </ItemGroup> 99 </ItemGroup>
61 <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> 100 <ItemGroup>
62 <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 101 <Compile Include="BDBLocalStorage.cs">
63 Other similar extension points exist, see Microsoft.Common.targets. 102 <SubType>Code</SubType>
64 <Target Name="BeforeBuild"> 103 </Compile>
65 </Target> 104 <Compile Include="Properties\AssemblyInfo.cs">
66 <Target Name="AfterBuild"> 105 <SubType>Code</SubType>
67 </Target> 106 </Compile>
68 --> 107 </ItemGroup>
69</Project> \ No newline at end of file 108 <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
109 <PropertyGroup>
110 <PreBuildEvent>
111 </PreBuildEvent>
112 <PostBuildEvent>
113 </PostBuildEvent>
114 </PropertyGroup>
115</Project>
diff --git a/OpenSim.Storage.LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.dll.build b/OpenSim.Storage.LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.dll.build
new file mode 100644
index 0000000..f28d224
--- /dev/null
+++ b/OpenSim.Storage.LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.dll.build
@@ -0,0 +1,47 @@
1<?xml version="1.0" ?>
2<project name="OpenSim.Storage.LocalStorageBerkeleyDB" default="build">
3 <target name="build">
4 <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
5 <mkdir dir="${project::get-base-directory()}/${build.dir}" />
6 <copy todir="${project::get-base-directory()}/${build.dir}">
7 <fileset basedir="${project::get-base-directory()}">
8 </fileset>
9 </copy>
10 <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
11 <resources prefix="OpenSim.Storage.LocalStorageBerkeleyDB" dynamicprefix="true" >
12 </resources>
13 <sources failonempty="true">
14 <include name="BDBLocalStorage.cs" />
15 <include name="Properties/AssemblyInfo.cs" />
16 </sources>
17 <references basedir="${project::get-base-directory()}">
18 <lib>
19 <include name="${project::get-base-directory()}" />
20 <include name="${project::get-base-directory()}/${build.dir}" />
21 </lib>
22 <include name="System.dll" />
23 <include name="System.Xml.dll" />
24 <include name="System.Data.dll" />
25 <include name="../bin/Kds.Serialization.dll" />
26 <include name="../bin/libDB_dotNET43.dll" />
27 <include name="../bin/libsecondlife.dll" />
28 <include name="../bin/OpenSim.Framework.dll" />
29 <include name="../bin/OpenSim.Framework.Console.dll" />
30 </references>
31 </csc>
32 <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" />
33 <mkdir dir="${project::get-base-directory()}/../bin/"/>
34 <copy todir="${project::get-base-directory()}/../bin/">
35 <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
36 <include name="*.dll"/>
37 <include name="*.exe"/>
38 </fileset>
39 </copy>
40 </target>
41 <target name="clean">
42 <delete dir="${bin.dir}" failonerror="false" />
43 <delete dir="${obj.dir}" failonerror="false" />
44 </target>
45 <target name="doc" description="Creates documentation.">
46 </target>
47</project>
diff --git a/OpenSim.Storage.LocalStorageBerkeleyDB/obj/OpenSim.Storage.LocalStorageBerkeleyDB.csproj.FileList.txt b/OpenSim.Storage.LocalStorageBerkeleyDB/obj/OpenSim.Storage.LocalStorageBerkeleyDB.csproj.FileList.txt
index 533fee8..da4be96 100644
--- a/OpenSim.Storage.LocalStorageBerkeleyDB/obj/OpenSim.Storage.LocalStorageBerkeleyDB.csproj.FileList.txt
+++ b/OpenSim.Storage.LocalStorageBerkeleyDB/obj/OpenSim.Storage.LocalStorageBerkeleyDB.csproj.FileList.txt
@@ -11,3 +11,5 @@ bin\Debug\OpenSim.Framework.Console.pdb
11obj\Debug\ResolveAssemblyReference.cache 11obj\Debug\ResolveAssemblyReference.cache
12obj\Debug\OpenSim.Storage.LocalStorageBerkeleyDB.dll 12obj\Debug\OpenSim.Storage.LocalStorageBerkeleyDB.dll
13obj\Debug\OpenSim.Storage.LocalStorageBerkeleyDB.pdb 13obj\Debug\OpenSim.Storage.LocalStorageBerkeleyDB.pdb
14..\bin\OpenSim.Storage.LocalStorageBerkeleyDB.dll
15..\bin\OpenSim.Storage.LocalStorageBerkeleyDB.pdb
diff --git a/OpenSim.Storage.LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.csproj b/OpenSim.Storage.LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.csproj
index 2932b51..a6facb9 100644
--- a/OpenSim.Storage.LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.csproj
+++ b/OpenSim.Storage.LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.csproj
@@ -70,8 +70,8 @@
70 <HintPath>System.Data.dll</HintPath> 70 <HintPath>System.Data.dll</HintPath>
71 <Private>False</Private> 71 <Private>False</Private>
72 </Reference> 72 </Reference>
73 <Reference Include="System.Data.SQLite.DLL" > 73 <Reference Include="System.Data.SQLite.dll" >
74 <HintPath>..\bin\System.Data.SQLite.DLL</HintPath> 74 <HintPath>..\bin\System.Data.SQLite.dll</HintPath>
75 <Private>False</Private> 75 <Private>False</Private>
76 </Reference> 76 </Reference>
77 <Reference Include="libsecondlife.dll" > 77 <Reference Include="libsecondlife.dll" >
diff --git a/OpenSim.Storage.LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build b/OpenSim.Storage.LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build
index fe62990..f3a6683 100644
--- a/OpenSim.Storage.LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build
+++ b/OpenSim.Storage.LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build
@@ -22,7 +22,7 @@
22 <include name="System.dll" /> 22 <include name="System.dll" />
23 <include name="System.Xml.dll" /> 23 <include name="System.Xml.dll" />
24 <include name="System.Data.dll" /> 24 <include name="System.Data.dll" />
25 <include name="System.Data.SQLite.DLL.dll" /> 25 <include name="../bin/System.Data.SQLite.dll" />
26 <include name="../bin/libsecondlife.dll" /> 26 <include name="../bin/libsecondlife.dll" />
27 <include name="../bin/OpenSim.Framework.dll" /> 27 <include name="../bin/OpenSim.Framework.dll" />
28 <include name="../bin/OpenSim.Framework.Console.dll" /> 28 <include name="../bin/OpenSim.Framework.Console.dll" />
diff --git a/OpenSim.build b/OpenSim.build
index ff2ecb9..a807110 100644
--- a/OpenSim.build
+++ b/OpenSim.build
@@ -47,6 +47,7 @@
47 <delete dir="${bin.dir}" failonerror="false" /> 47 <delete dir="${bin.dir}" failonerror="false" />
48 <delete dir="${obj.dir}" failonerror="false" /> 48 <delete dir="${obj.dir}" failonerror="false" />
49 <nant buildfile="OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.dll.build" target="clean" /> 49 <nant buildfile="OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.dll.build" target="clean" />
50 <nant buildfile="OpenSim.Storage.LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.dll.build" target="clean" />
50 <nant buildfile="OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build" target="clean" /> 51 <nant buildfile="OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build" target="clean" />
51 <nant buildfile="OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build" target="clean" /> 52 <nant buildfile="OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build" target="clean" />
52 <nant buildfile="OpenSim/OpenSim.exe.build" target="clean" /> 53 <nant buildfile="OpenSim/OpenSim.exe.build" target="clean" />
@@ -87,6 +88,7 @@
87 <nant buildfile="OpenSim/OpenSim.exe.build" target="build" /> 88 <nant buildfile="OpenSim/OpenSim.exe.build" target="build" />
88 <nant buildfile="OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build" target="build" /> 89 <nant buildfile="OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build" target="build" />
89 <nant buildfile="OpenSim.Storage.LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build" target="build" /> 90 <nant buildfile="OpenSim.Storage.LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build" target="build" />
91 <nant buildfile="OpenSim.Storage.LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.dll.build" target="build" />
90 </target> 92 </target>
91 93
92 <target name="build-release" depends="Release, init, build" description="Builds in Release mode" /> 94 <target name="build-release" depends="Release, init, build" description="Builds in Release mode" />
@@ -98,6 +100,7 @@
98 <target name="doc" depends="build-release"> 100 <target name="doc" depends="build-release">
99 <echo message="Generating all documentation from all builds" /> 101 <echo message="Generating all documentation from all builds" />
100 <nant buildfile="OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.dll.build" target="doc" /> 102 <nant buildfile="OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.dll.build" target="doc" />
103 <nant buildfile="OpenSim.Storage.LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.dll.build" target="doc" />
101 <nant buildfile="OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build" target="doc" /> 104 <nant buildfile="OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build" target="doc" />
102 <nant buildfile="OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build" target="doc" /> 105 <nant buildfile="OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build" target="doc" />
103 <nant buildfile="OpenSim/OpenSim.exe.build" target="doc" /> 106 <nant buildfile="OpenSim/OpenSim.exe.build" target="doc" />
diff --git a/OpenSim.sln b/OpenSim.sln
index de2ee25..9f61774 100644
--- a/OpenSim.sln
+++ b/OpenSim.sln
@@ -2,6 +2,8 @@ Microsoft Visual Studio Solution File, Format Version 9.00
2# Visual Studio 2005 2# Visual Studio 2005
3Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Terrain.BasicTerrain", "OpenSim.Terrain.BasicTerrain\OpenSim.Terrain.BasicTerrain.csproj", "{2270B8FE-0000-0000-0000-000000000000}" 3Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Terrain.BasicTerrain", "OpenSim.Terrain.BasicTerrain\OpenSim.Terrain.BasicTerrain.csproj", "{2270B8FE-0000-0000-0000-000000000000}"
4EndProject 4EndProject
5Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Storage.LocalStorageBerkeleyDB", "OpenSim.Storage.LocalStorageBerkeleyDB\OpenSim.Storage.LocalStorageBerkeleyDB.csproj", "{EE9E5D96-0000-0000-0000-000000000000}"
6EndProject
5Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.OdePlugin", "OpenSim.Physics\OdePlugin\OpenSim.Physics.OdePlugin.csproj", "{63A05FE9-0000-0000-0000-000000000000}" 7Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.OdePlugin", "OpenSim.Physics\OdePlugin\OpenSim.Physics.OdePlugin.csproj", "{63A05FE9-0000-0000-0000-000000000000}"
6EndProject 8EndProject
7Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Console", "OpenSim.Framework.Console\OpenSim.Framework.Console.csproj", "{A7CD0630-0000-0000-0000-000000000000}" 9Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Console", "OpenSim.Framework.Console\OpenSim.Framework.Console.csproj", "{A7CD0630-0000-0000-0000-000000000000}"
@@ -48,6 +50,10 @@ Global
48 {2270B8FE-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 50 {2270B8FE-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
49 {2270B8FE-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 51 {2270B8FE-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
50 {2270B8FE-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 52 {2270B8FE-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
53 {EE9E5D96-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
54 {EE9E5D96-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
55 {EE9E5D96-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
56 {EE9E5D96-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
51 {63A05FE9-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 57 {63A05FE9-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
52 {63A05FE9-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 58 {63A05FE9-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
53 {63A05FE9-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 59 {63A05FE9-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
diff --git a/bin/OpenSim.Terrain.BasicTerrain.dll b/bin/OpenSim.Terrain.BasicTerrain.dll
index 57ca47a..089f0c8 100644
--- a/bin/OpenSim.Terrain.BasicTerrain.dll
+++ b/bin/OpenSim.Terrain.BasicTerrain.dll
Binary files differ
diff --git a/prebuild.xml b/prebuild.xml
index 0c37ab1..b0ea3be 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -346,16 +346,16 @@
346 <Project name="OpenSim.GenericConfig.Xml" path="OpenSim.GenericConfig/Xml" type="Library"> 346 <Project name="OpenSim.GenericConfig.Xml" path="OpenSim.GenericConfig/Xml" type="Library">
347 <Configuration name="Debug"> 347 <Configuration name="Debug">
348 <Options> 348 <Options>
349 <OutputPath>../bin/</OutputPath> 349 <OutputPath>../../bin/</OutputPath>
350 </Options> 350 </Options>
351 </Configuration> 351 </Configuration>
352 <Configuration name="Release"> 352 <Configuration name="Release">
353 <Options> 353 <Options>
354 <OutputPath>../bin/</OutputPath> 354 <OutputPath>../../bin/</OutputPath>
355 </Options> 355 </Options>
356 </Configuration> 356 </Configuration>
357 357
358 <ReferencePath>../bin/</ReferencePath> 358 <ReferencePath>../../bin/</ReferencePath>
359 <Reference name="System"/> 359 <Reference name="System"/>
360 <Reference name="System.Xml"/> 360 <Reference name="System.Xml"/>
361 <Reference name="OpenSim.Framework"/> 361 <Reference name="OpenSim.Framework"/>
@@ -490,7 +490,7 @@
490 <Reference name="System" localCopy="false"/> 490 <Reference name="System" localCopy="false"/>
491 <Reference name="System.Xml"/> 491 <Reference name="System.Xml"/>
492 <Reference name="System.Data"/> 492 <Reference name="System.Data"/>
493 <Reference name="System.Data.SQLite.DLL"/> 493 <Reference name="System.Data.SQLite.dll"/>
494 <Reference name="libsecondlife.dll"/> 494 <Reference name="libsecondlife.dll"/>
495 <Reference name="OpenSim.Framework"/> 495 <Reference name="OpenSim.Framework"/>
496 <Reference name="OpenSim.Framework.Console"/> 496 <Reference name="OpenSim.Framework.Console"/>