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 @@
     <DebugSymbols>True</DebugSymbols>

     <FileAlignment>4096</FileAlignment>

     <Optimize>False</Optimize>

-    <OutputPath>..\bin\</OutputPath>

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

     <RegisterForComInterop>False</RegisterForComInterop>

     <RemoveIntegerChecks>False</RemoveIntegerChecks>

     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>

@@ -50,7 +50,7 @@
     <DebugSymbols>False</DebugSymbols>

     <FileAlignment>4096</FileAlignment>

     <Optimize>True</Optimize>

-    <OutputPath>..\bin\</OutputPath>

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

     <RegisterForComInterop>False</RegisterForComInterop>

     <RemoveIntegerChecks>False</RemoveIntegerChecks>

     <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 @@
                 </lib>

                 <include name="System.dll" />

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

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

+                <include name="../../bin/OpenSim.Framework.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/">

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

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;
 using OpenSim.CAPS;

 using OpenSim.Framework.Console;

 using OpenSim.Physics.Manager;

-using OpenSim.GenericConfig;

 using Nwc.XmlRpc;

 using OpenSim.Servers;

+using OpenSim.GenericConfig;

 

 namespace OpenSim

 {

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 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

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

   <PropertyGroup>

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

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

+    <ProjectType>Local</ProjectType>

     <ProductVersion>8.0.50727</ProductVersion>

     <SchemaVersion>2.0</SchemaVersion>

-    <ProjectGuid>{5D7AB19E-5673-4DDB-8B6B-E3105B826CB4}</ProjectGuid>

+    <ProjectGuid>{EE9E5D96-0000-0000-0000-000000000000}</ProjectGuid>

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

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

+    <ApplicationIcon></ApplicationIcon>

+    <AssemblyKeyContainerName>

+    </AssemblyKeyContainerName>

+    <AssemblyName>OpenSim.Storage.LocalStorageBerkeleyDB</AssemblyName>

+    <DefaultClientScript>JScript</DefaultClientScript>

+    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>

+    <DefaultTargetSchema>IE50</DefaultTargetSchema>

+    <DelaySign>false</DelaySign>

     <OutputType>Library</OutputType>

-    <AppDesignerFolder>Properties</AppDesignerFolder>

+    <AppDesignerFolder></AppDesignerFolder>

     <RootNamespace>OpenSim.Storage.LocalStorageBerkeleyDB</RootNamespace>

-    <AssemblyName>OpenSim.Storage.LocalStorageBerkeleyDB</AssemblyName>

+    <StartupObject></StartupObject>

+    <FileUpgradeFlags>

+    </FileUpgradeFlags>

   </PropertyGroup>

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

-    <DebugSymbols>true</DebugSymbols>

-    <DebugType>full</DebugType>

-    <Optimize>false</Optimize>

-    <OutputPath>bin\Debug\</OutputPath>

-    <DefineConstants>DEBUG;TRACE</DefineConstants>

-    <ErrorReport>prompt</ErrorReport>

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

-    <DebugType>pdbonly</DebugType>

-    <Optimize>true</Optimize>

-    <OutputPath>bin\Release\</OutputPath>

+    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>

+    <BaseAddress>285212672</BaseAddress>

+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>

+    <ConfigurationOverrideFile>

+    </ConfigurationOverrideFile>

     <DefineConstants>TRACE</DefineConstants>

-    <ErrorReport>prompt</ErrorReport>

+    <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="Kds.Serialization, Version=0.8.1.26141, Culture=neutral, PublicKeyToken=07e6449d79bffb34, processorArchitecture=MSIL">

-      <SpecificVersion>False</SpecificVersion>

-      <HintPath>bin\Kds.Serialization.dll</HintPath>

+    <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="libdb_dotNET43, Version=0.9.1.26139, Culture=neutral, PublicKeyToken=0f0d57806cebdc08, processorArchitecture=MSIL">

-      <SpecificVersion>False</SpecificVersion>

-      <HintPath>bin\libdb_dotNET43.dll</HintPath>

+    <Reference Include="System.Data" >

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

+      <Private>False</Private>

     </Reference>

-    <Reference Include="libsecondlife, Version=0.9.0.0, Culture=neutral, processorArchitecture=MSIL">

-      <SpecificVersion>False</SpecificVersion>

+    <Reference Include="Kds.Serialization.dll" >

+      <HintPath>..\bin\Kds.Serialization.dll</HintPath>

+      <Private>False</Private>

+    </Reference>

+    <Reference Include="libDB_dotNET43.dll" >

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

+      <Private>False</Private>

+    </Reference>

+    <Reference Include="libsecondlife.dll" >

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

+      <Private>False</Private>

     </Reference>

-    <Reference Include="System" />

-    <Reference Include="System.Data" />

-    <Reference Include="System.Xml" />

-  </ItemGroup>

-  <ItemGroup>

-    <Compile Include="BDBLocalStorage.cs" />

-    <Compile Include="Properties\AssemblyInfo.cs" />

   </ItemGroup>

   <ItemGroup>

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

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

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

-    </ProjectReference>

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

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

       <Name>OpenSim.Framework</Name>

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

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

+                        <Private>False</Private>

+    </ProjectReference>

+    <ProjectReference Include="..\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>

   </ItemGroup>

-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />

-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

-       Other similar extension points exist, see Microsoft.Common.targets.

-  <Target Name="BeforeBuild">

-  </Target>

-  <Target Name="AfterBuild">

-  </Target>

-  -->

-</Project>
\ No newline at end of file
+  <ItemGroup>

+    <Compile Include="BDBLocalStorage.cs">

+      <SubType>Code</SubType>

+    </Compile>

+    <Compile Include="Properties\AssemblyInfo.cs">

+      <SubType>Code</SubType>

+    </Compile>

+  </ItemGroup>

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

+  <PropertyGroup>

+    <PreBuildEvent>

+    </PreBuildEvent>

+    <PostBuildEvent>

+    </PostBuildEvent>

+  </PropertyGroup>

+</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 @@
+<?xml version="1.0" ?>

+<project name="OpenSim.Storage.LocalStorageBerkeleyDB" 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.Storage.LocalStorageBerkeleyDB" dynamicprefix="true" >

+            </resources>

+            <sources failonempty="true">

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

+                <include name="Properties/AssemblyInfo.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="System.Data.dll" />

+                <include name="../bin/Kds.Serialization.dll" />

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

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

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

+                <include name="../bin/OpenSim.Framework.Console.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.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
 obj\Debug\ResolveAssemblyReference.cache

 obj\Debug\OpenSim.Storage.LocalStorageBerkeleyDB.dll

 obj\Debug\OpenSim.Storage.LocalStorageBerkeleyDB.pdb

+..\bin\OpenSim.Storage.LocalStorageBerkeleyDB.dll

+..\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 @@
       <HintPath>System.Data.dll</HintPath>

       <Private>False</Private>

     </Reference>

-    <Reference Include="System.Data.SQLite.DLL" >

-      <HintPath>..\bin\System.Data.SQLite.DLL</HintPath>

+    <Reference Include="System.Data.SQLite.dll" >

+      <HintPath>..\bin\System.Data.SQLite.dll</HintPath>

       <Private>False</Private>

     </Reference>

     <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 @@
                 <include name="System.dll" />

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

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

-                <include name="System.Data.SQLite.DLL.dll" />

+                <include name="../bin/System.Data.SQLite.dll" />

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

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

                 <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 @@
         <delete dir="${bin.dir}" failonerror="false" />

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

         <nant buildfile="OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.dll.build" target="clean" />

+        <nant buildfile="OpenSim.Storage.LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.dll.build" target="clean" />

         <nant buildfile="OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build" target="clean" />

         <nant buildfile="OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build" target="clean" />

         <nant buildfile="OpenSim/OpenSim.exe.build" target="clean" />

@@ -87,6 +88,7 @@
         <nant buildfile="OpenSim/OpenSim.exe.build" target="build" />

         <nant buildfile="OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build" target="build" />

         <nant buildfile="OpenSim.Storage.LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build" target="build" />

+        <nant buildfile="OpenSim.Storage.LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.dll.build" target="build" />

     </target>

 

     <target name="build-release" depends="Release, init, build" description="Builds in Release mode" />

@@ -98,6 +100,7 @@
     <target name="doc" depends="build-release">

         <echo message="Generating all documentation from all builds" />

         <nant buildfile="OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.dll.build" target="doc" />

+        <nant buildfile="OpenSim.Storage.LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.dll.build" target="doc" />

         <nant buildfile="OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build" target="doc" />

         <nant buildfile="OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build" target="doc" />

         <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
 # Visual Studio 2005

 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Terrain.BasicTerrain", "OpenSim.Terrain.BasicTerrain\OpenSim.Terrain.BasicTerrain.csproj", "{2270B8FE-0000-0000-0000-000000000000}"

 EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Storage.LocalStorageBerkeleyDB", "OpenSim.Storage.LocalStorageBerkeleyDB\OpenSim.Storage.LocalStorageBerkeleyDB.csproj", "{EE9E5D96-0000-0000-0000-000000000000}"

+EndProject

 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.OdePlugin", "OpenSim.Physics\OdePlugin\OpenSim.Physics.OdePlugin.csproj", "{63A05FE9-0000-0000-0000-000000000000}"

 EndProject

 Project("{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
                 {2270B8FE-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

                 {2270B8FE-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

                 {2270B8FE-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU

+                {EE9E5D96-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+                {EE9E5D96-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

+                {EE9E5D96-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

+                {EE9E5D96-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU

                 {63A05FE9-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

                 {63A05FE9-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

                 {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
diff --git a/prebuild.xml b/prebuild.xml
index 0c37ab1..b0ea3be 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -346,16 +346,16 @@
      <Project name="OpenSim.GenericConfig.Xml" path="OpenSim.GenericConfig/Xml" type="Library">
       <Configuration name="Debug">
         <Options>
-          <OutputPath>../bin/</OutputPath>
+          <OutputPath>../../bin/</OutputPath>
         </Options>
       </Configuration>
       <Configuration name="Release">
         <Options>
-          <OutputPath>../bin/</OutputPath>
+          <OutputPath>../../bin/</OutputPath>
         </Options>
       </Configuration>
 
-      <ReferencePath>../bin/</ReferencePath>
+      <ReferencePath>../../bin/</ReferencePath>
       <Reference name="System"/>
       <Reference name="System.Xml"/>
      <Reference name="OpenSim.Framework"/>
@@ -490,7 +490,7 @@
       <Reference name="System" localCopy="false"/>
       <Reference name="System.Xml"/>
       <Reference name="System.Data"/>
-      <Reference name="System.Data.SQLite.DLL"/>
+      <Reference name="System.Data.SQLite.dll"/>
       <Reference name="libsecondlife.dll"/>
       <Reference name="OpenSim.Framework"/>
       <Reference name="OpenSim.Framework.Console"/>