5 files changed, 4 insertions, 40 deletions
diff --git a/OpenSim/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.csproj.user b/OpenSim/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.csproj.user
deleted file mode 100644
index 082d673..0000000
--- a/OpenSim/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.csproj.user
+++ /dev/null
@@ -1,12 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ReferencePath>C:\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.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj b/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj
index af8285b..15ae5bf 100644
--- a/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj
+++ b/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj
@@ -93,6 +93,9 @@
    <Compile Include="AssemblyInfo.cs">
      <SubType>Code</SubType>
    </Compile>
+    <Compile Include="Db4LocalStorage.cs">
+      <SubType>Code</SubType>
+    </Compile>
    <Compile Include="MapStorage.cs">
      <SubType>Code</SubType>
    </Compile>
@@ -102,9 +105,6 @@
    <Compile Include="UUIDPrimQuery.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="Db4LocalStorage.cs">
-      <SubType>Code</SubType>
-    </Compile>
  </ItemGroup>
  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
  <PropertyGroup>
diff --git a/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj.user b/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj.user
deleted file mode 100644
index 082d673..0000000
--- a/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj.user
+++ /dev/null
@@ -1,12 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ReferencePath>C:\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.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build b/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build
index 72aac2a..c2fd2bd 100644
--- a/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build
+++ b/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build
@@ -12,10 +12,10 @@
            </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" />
            </sources>
            <references basedir="${project::get-base-directory()}">
                <lib>
diff --git a/OpenSim/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.csproj.user b/OpenSim/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.csproj.user
deleted file mode 100644
index 082d673..0000000
--- a/OpenSim/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.csproj.user
+++ /dev/null
@@ -1,12 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ReferencePath>C:\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.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.csproj.user b/OpenSim/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.csproj.user deleted file mode 100644 index 082d673..0000000 --- a/OpenSim/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.csproj.user +++ /dev/null
@@ -1,12 +0,0 @@
1	<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2	<PropertyGroup>
3	<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
4	<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
5	<ReferencePath>C:\sugilite\bin\</ReferencePath>
6	<LastOpenVersion>8.0.50727</LastOpenVersion>
7	<ProjectView>ProjectFiles</ProjectView>
8	<ProjectTrust>0</ProjectTrust>
9	</PropertyGroup>
10	<PropertyGroup Condition = " '$(Configuration)\|$(Platform)' == 'Debug\|AnyCPU' " />
11	<PropertyGroup Condition = " '$(Configuration)\|$(Platform)' == 'Release\|AnyCPU' " />
12	</Project>


diff --git a/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj b/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj index af8285b..15ae5bf 100644 --- a/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj +++ b/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj
@@ -93,6 +93,9 @@
93	<Compile Include="AssemblyInfo.cs">	93	<Compile Include="AssemblyInfo.cs">
94	<SubType>Code</SubType>	94	<SubType>Code</SubType>
95	</Compile>	95	</Compile>
		96	<Compile Include="Db4LocalStorage.cs">
		97	<SubType>Code</SubType>
		98	</Compile>
96	<Compile Include="MapStorage.cs">	99	<Compile Include="MapStorage.cs">
97	<SubType>Code</SubType>	100	<SubType>Code</SubType>
98	</Compile>	101	</Compile>
@@ -102,9 +105,6 @@
102	<Compile Include="UUIDPrimQuery.cs">	105	<Compile Include="UUIDPrimQuery.cs">
103	<SubType>Code</SubType>	106	<SubType>Code</SubType>
104	</Compile>	107	</Compile>
105	<Compile Include="Db4LocalStorage.cs">
106	<SubType>Code</SubType>
107	</Compile>
108	</ItemGroup>	108	</ItemGroup>
109	<Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />	109	<Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
110	<PropertyGroup>	110	<PropertyGroup>


diff --git a/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj.user b/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj.user deleted file mode 100644 index 082d673..0000000 --- a/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj.user +++ /dev/null
@@ -1,12 +0,0 @@
1	<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2	<PropertyGroup>
3	<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
4	<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
5	<ReferencePath>C:\sugilite\bin\</ReferencePath>
6	<LastOpenVersion>8.0.50727</LastOpenVersion>
7	<ProjectView>ProjectFiles</ProjectView>
8	<ProjectTrust>0</ProjectTrust>
9	</PropertyGroup>
10	<PropertyGroup Condition = " '$(Configuration)\|$(Platform)' == 'Debug\|AnyCPU' " />
11	<PropertyGroup Condition = " '$(Configuration)\|$(Platform)' == 'Release\|AnyCPU' " />
12	</Project>


diff --git a/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build b/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build index 72aac2a..c2fd2bd 100644 --- a/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build +++ b/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build
@@ -12,10 +12,10 @@
12	</resources>	12	</resources>
13	<sources failonempty="true">	13	<sources failonempty="true">
14	<include name="AssemblyInfo.cs" />	14	<include name="AssemblyInfo.cs" />
		15	<include name="Db4LocalStorage.cs" />
15	<include name="MapStorage.cs" />	16	<include name="MapStorage.cs" />
16	<include name="UUIDParcelQuery.cs" />	17	<include name="UUIDParcelQuery.cs" />
17	<include name="UUIDPrimQuery.cs" />	18	<include name="UUIDPrimQuery.cs" />
18	<include name="Db4LocalStorage.cs" />
19	</sources>	19	</sources>
20	<references basedir="${project::get-base-directory()}">	20	<references basedir="${project::get-base-directory()}">
21	<lib>	21	<lib>


diff --git a/OpenSim/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.csproj.user b/OpenSim/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.csproj.user deleted file mode 100644 index 082d673..0000000 --- a/OpenSim/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.csproj.user +++ /dev/null
@@ -1,12 +0,0 @@
1	<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2	<PropertyGroup>
3	<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
4	<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
5	<ReferencePath>C:\sugilite\bin\</ReferencePath>
6	<LastOpenVersion>8.0.50727</LastOpenVersion>
7	<ProjectView>ProjectFiles</ProjectView>
8	<ProjectTrust>0</ProjectTrust>
9	</PropertyGroup>
10	<PropertyGroup Condition = " '$(Configuration)\|$(Platform)' == 'Debug\|AnyCPU' " />
11	<PropertyGroup Condition = " '$(Configuration)\|$(Platform)' == 'Release\|AnyCPU' " />
12	</Project>