diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Storage/LocalStorageBerkeleyDB/BDBLocalStorage.cs (renamed from OpenSim/OpenSim.Storage/LocalStorageBerkeleyDB/BDBLocalStorage.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/Storage/LocalStorageBerkeleyDB/OpenSim.Region.Storage.LocalStorageBerkeleyDB.csproj (renamed from OpenSim/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.csproj) | 20 | ||||
-rw-r--r-- | OpenSim/Region/Storage/LocalStorageBerkeleyDB/OpenSim.Region.Storage.LocalStorageBerkeleyDB.dll.build | 46 | ||||
-rw-r--r-- | OpenSim/Region/Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.dll.build (renamed from OpenSim/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.dll.build) | 0 | ||||
-rw-r--r-- | OpenSim/Region/Storage/LocalStorageDb4o/AssemblyInfo.cs (renamed from OpenSim/OpenSim.Storage/LocalStorageDb4o/AssemblyInfo.cs) | 0 | ||||
-rw-r--r-- | OpenSim/Region/Storage/LocalStorageDb4o/Db4LocalStorage.cs (renamed from OpenSim/OpenSim.Storage/LocalStorageDb4o/Db4LocalStorage.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/Storage/LocalStorageDb4o/MapStorage.cs (renamed from OpenSim/OpenSim.Storage/LocalStorageDb4o/MapStorage.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.csproj (renamed from OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj) | 18 | ||||
-rw-r--r-- | OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.dll.build (renamed from OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build) | 18 | ||||
-rw-r--r-- | OpenSim/Region/Storage/LocalStorageDb4o/UUIDParcelQuery.cs (renamed from OpenSim/OpenSim.Storage/LocalStorageDb4o/UUIDParcelQuery.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/Storage/LocalStorageDb4o/UUIDPrimQuery.cs (renamed from OpenSim/OpenSim.Storage/LocalStorageDb4o/UUIDPrimQuery.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/Storage/LocalStorageSQLite/OpenSim.Region.Storage.LocalStorageSQLite.csproj (renamed from OpenSim/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.csproj) | 18 | ||||
-rw-r--r-- | OpenSim/Region/Storage/LocalStorageSQLite/OpenSim.Region.Storage.LocalStorageSQLite.dll.build (renamed from Common/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.dll.build) | 21 | ||||
-rw-r--r-- | OpenSim/Region/Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build (renamed from OpenSim/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build) | 0 | ||||
-rw-r--r-- | OpenSim/Region/Storage/LocalStorageSQLite/Properties/AssemblyInfo.cs (renamed from OpenSim/OpenSim.Storage/LocalStorageSQLite/Properties/AssemblyInfo.cs) | 4 | ||||
-rw-r--r-- | OpenSim/Region/Storage/LocalStorageSQLite/SQLiteLocalStorage.cs (renamed from OpenSim/OpenSim.Storage/LocalStorageSQLite/SQLiteLocalStorage.cs) | 2 |
16 files changed, 101 insertions, 56 deletions
diff --git a/OpenSim/OpenSim.Storage/LocalStorageBerkeleyDB/BDBLocalStorage.cs b/OpenSim/Region/Storage/LocalStorageBerkeleyDB/BDBLocalStorage.cs index ab3c34c..3bc6f25 100644 --- a/OpenSim/OpenSim.Storage/LocalStorageBerkeleyDB/BDBLocalStorage.cs +++ b/OpenSim/Region/Storage/LocalStorageBerkeleyDB/BDBLocalStorage.cs | |||
@@ -39,7 +39,7 @@ using BerkeleyDb; | |||
39 | using Kds.Serialization; | 39 | using Kds.Serialization; |
40 | using Kds.Serialization.Buffer; | 40 | using Kds.Serialization.Buffer; |
41 | 41 | ||
42 | namespace OpenSim.Storage.LocalStorageBDB | 42 | namespace OpenSim.Region.Storage.LocalStorageBDB |
43 | { | 43 | { |
44 | public class BDBLocalStorage : ILocalStorage | 44 | public class BDBLocalStorage : ILocalStorage |
45 | { | 45 | { |
diff --git a/OpenSim/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.csproj b/OpenSim/Region/Storage/LocalStorageBerkeleyDB/OpenSim.Region.Storage.LocalStorageBerkeleyDB.csproj index 417643f..b956c9b 100644 --- a/OpenSim/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.csproj +++ b/OpenSim/Region/Storage/LocalStorageBerkeleyDB/OpenSim.Region.Storage.LocalStorageBerkeleyDB.csproj | |||
@@ -3,20 +3,20 @@ | |||
3 | <ProjectType>Local</ProjectType> | 3 | <ProjectType>Local</ProjectType> |
4 | <ProductVersion>8.0.50727</ProductVersion> | 4 | <ProductVersion>8.0.50727</ProductVersion> |
5 | <SchemaVersion>2.0</SchemaVersion> | 5 | <SchemaVersion>2.0</SchemaVersion> |
6 | <ProjectGuid>{EE9E5D96-0000-0000-0000-000000000000}</ProjectGuid> | 6 | <ProjectGuid>{A4691E59-0000-0000-0000-000000000000}</ProjectGuid> |
7 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | 7 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> |
8 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> | 8 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> |
9 | <ApplicationIcon></ApplicationIcon> | 9 | <ApplicationIcon></ApplicationIcon> |
10 | <AssemblyKeyContainerName> | 10 | <AssemblyKeyContainerName> |
11 | </AssemblyKeyContainerName> | 11 | </AssemblyKeyContainerName> |
12 | <AssemblyName>OpenSim.Storage.LocalStorageBerkeleyDB</AssemblyName> | 12 | <AssemblyName>OpenSim.Region.Storage.LocalStorageBerkeleyDB</AssemblyName> |
13 | <DefaultClientScript>JScript</DefaultClientScript> | 13 | <DefaultClientScript>JScript</DefaultClientScript> |
14 | <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout> | 14 | <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout> |
15 | <DefaultTargetSchema>IE50</DefaultTargetSchema> | 15 | <DefaultTargetSchema>IE50</DefaultTargetSchema> |
16 | <DelaySign>false</DelaySign> | 16 | <DelaySign>false</DelaySign> |
17 | <OutputType>Library</OutputType> | 17 | <OutputType>Library</OutputType> |
18 | <AppDesignerFolder></AppDesignerFolder> | 18 | <AppDesignerFolder></AppDesignerFolder> |
19 | <RootNamespace>OpenSim.Storage.LocalStorageBerkeleyDB</RootNamespace> | 19 | <RootNamespace>OpenSim.Region.Storage.LocalStorageBerkeleyDB</RootNamespace> |
20 | <StartupObject></StartupObject> | 20 | <StartupObject></StartupObject> |
21 | <FileUpgradeFlags> | 21 | <FileUpgradeFlags> |
22 | </FileUpgradeFlags> | 22 | </FileUpgradeFlags> |
@@ -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> |
@@ -59,15 +59,15 @@ | |||
59 | </PropertyGroup> | 59 | </PropertyGroup> |
60 | <ItemGroup> | 60 | <ItemGroup> |
61 | <Reference Include="Kds.Serialization.dll" > | 61 | <Reference Include="Kds.Serialization.dll" > |
62 | <HintPath>..\..\..\bin\Kds.Serialization.dll</HintPath> | 62 | <HintPath>..\..\..\..\bin\Kds.Serialization.dll</HintPath> |
63 | <Private>False</Private> | 63 | <Private>False</Private> |
64 | </Reference> | 64 | </Reference> |
65 | <Reference Include="libdb_dotNET43.dll" > | 65 | <Reference Include="libdb_dotNET43.dll" > |
66 | <HintPath>..\..\..\bin\libdb_dotNET43.dll</HintPath> | 66 | <HintPath>..\..\..\..\bin\libdb_dotNET43.dll</HintPath> |
67 | <Private>False</Private> | 67 | <Private>False</Private> |
68 | </Reference> | 68 | </Reference> |
69 | <Reference Include="libsecondlife.dll" > | 69 | <Reference Include="libsecondlife.dll" > |
70 | <HintPath>..\..\..\bin\libsecondlife.dll</HintPath> | 70 | <HintPath>..\..\..\..\bin\libsecondlife.dll</HintPath> |
71 | <Private>False</Private> | 71 | <Private>False</Private> |
72 | </Reference> | 72 | </Reference> |
73 | <Reference Include="System" > | 73 | <Reference Include="System" > |
@@ -84,13 +84,13 @@ | |||
84 | </Reference> | 84 | </Reference> |
85 | </ItemGroup> | 85 | </ItemGroup> |
86 | <ItemGroup> | 86 | <ItemGroup> |
87 | <ProjectReference Include="..\..\..\Common\OpenSim.Framework\OpenSim.Framework.csproj"> | 87 | <ProjectReference Include="..\..\..\Framework\General\OpenSim.Framework.csproj"> |
88 | <Name>OpenSim.Framework</Name> | 88 | <Name>OpenSim.Framework</Name> |
89 | <Project>{8ACA2445-0000-0000-0000-000000000000}</Project> | 89 | <Project>{8ACA2445-0000-0000-0000-000000000000}</Project> |
90 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 90 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
91 | <Private>False</Private> | 91 | <Private>False</Private> |
92 | </ProjectReference> | 92 | </ProjectReference> |
93 | <ProjectReference Include="..\..\..\Common\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj"> | 93 | <ProjectReference Include="..\..\..\Framework\Console\OpenSim.Framework.Console.csproj"> |
94 | <Name>OpenSim.Framework.Console</Name> | 94 | <Name>OpenSim.Framework.Console</Name> |
95 | <Project>{A7CD0630-0000-0000-0000-000000000000}</Project> | 95 | <Project>{A7CD0630-0000-0000-0000-000000000000}</Project> |
96 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 96 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
diff --git a/OpenSim/Region/Storage/LocalStorageBerkeleyDB/OpenSim.Region.Storage.LocalStorageBerkeleyDB.dll.build b/OpenSim/Region/Storage/LocalStorageBerkeleyDB/OpenSim.Region.Storage.LocalStorageBerkeleyDB.dll.build new file mode 100644 index 0000000..20f5171 --- /dev/null +++ b/OpenSim/Region/Storage/LocalStorageBerkeleyDB/OpenSim.Region.Storage.LocalStorageBerkeleyDB.dll.build | |||
@@ -0,0 +1,46 @@ | |||
1 | <?xml version="1.0" ?> | ||
2 | <project name="OpenSim.Region.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.Region.Storage.LocalStorageBerkeleyDB" dynamicprefix="true" > | ||
12 | </resources> | ||
13 | <sources failonempty="true"> | ||
14 | <include name="BDBLocalStorage.cs" /> | ||
15 | </sources> | ||
16 | <references basedir="${project::get-base-directory()}"> | ||
17 | <lib> | ||
18 | <include name="${project::get-base-directory()}" /> | ||
19 | <include name="${project::get-base-directory()}/${build.dir}" /> | ||
20 | </lib> | ||
21 | <include name="../../../../bin/Kds.Serialization.dll" /> | ||
22 | <include name="../../../../bin/libdb_dotNET43.dll" /> | ||
23 | <include name="../../../../bin/libsecondlife.dll" /> | ||
24 | <include name="../../../../bin/OpenSim.Framework.dll" /> | ||
25 | <include name="../../../../bin/OpenSim.Framework.Console.dll" /> | ||
26 | <include name="System.dll" /> | ||
27 | <include name="System.Data.dll" /> | ||
28 | <include name="System.Xml.dll" /> | ||
29 | </references> | ||
30 | </csc> | ||
31 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../../bin/" /> | ||
32 | <mkdir dir="${project::get-base-directory()}/../../../../bin/"/> | ||
33 | <copy todir="${project::get-base-directory()}/../../../../bin/"> | ||
34 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | ||
35 | <include name="*.dll"/> | ||
36 | <include name="*.exe"/> | ||
37 | </fileset> | ||
38 | </copy> | ||
39 | </target> | ||
40 | <target name="clean"> | ||
41 | <delete dir="${bin.dir}" failonerror="false" /> | ||
42 | <delete dir="${obj.dir}" failonerror="false" /> | ||
43 | </target> | ||
44 | <target name="doc" description="Creates documentation."> | ||
45 | </target> | ||
46 | </project> | ||
diff --git a/OpenSim/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.dll.build b/OpenSim/Region/Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.dll.build index bc2d8ec..bc2d8ec 100644 --- a/OpenSim/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.dll.build +++ b/OpenSim/Region/Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.dll.build | |||
diff --git a/OpenSim/OpenSim.Storage/LocalStorageDb4o/AssemblyInfo.cs b/OpenSim/Region/Storage/LocalStorageDb4o/AssemblyInfo.cs index ea2b62e..ea2b62e 100644 --- a/OpenSim/OpenSim.Storage/LocalStorageDb4o/AssemblyInfo.cs +++ b/OpenSim/Region/Storage/LocalStorageDb4o/AssemblyInfo.cs | |||
diff --git a/OpenSim/OpenSim.Storage/LocalStorageDb4o/Db4LocalStorage.cs b/OpenSim/Region/Storage/LocalStorageDb4o/Db4LocalStorage.cs index 8e6b04d..5cb4861 100644 --- a/OpenSim/OpenSim.Storage/LocalStorageDb4o/Db4LocalStorage.cs +++ b/OpenSim/Region/Storage/LocalStorageDb4o/Db4LocalStorage.cs | |||
@@ -36,7 +36,7 @@ using OpenSim.Framework.Types; | |||
36 | using OpenSim.Framework.Console; | 36 | using OpenSim.Framework.Console; |
37 | 37 | ||
38 | 38 | ||
39 | namespace OpenSim.Storage.LocalStorageDb4o | 39 | namespace OpenSim.Region.Storage.LocalStorageDb4o |
40 | { | 40 | { |
41 | /// <summary> | 41 | /// <summary> |
42 | /// | 42 | /// |
diff --git a/OpenSim/OpenSim.Storage/LocalStorageDb4o/MapStorage.cs b/OpenSim/Region/Storage/LocalStorageDb4o/MapStorage.cs index 56387ac..22f3392 100644 --- a/OpenSim/OpenSim.Storage/LocalStorageDb4o/MapStorage.cs +++ b/OpenSim/Region/Storage/LocalStorageDb4o/MapStorage.cs | |||
@@ -29,7 +29,7 @@ using System; | |||
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using System.Text; | 30 | using System.Text; |
31 | 31 | ||
32 | namespace OpenSim.Storage.LocalStorageDb4o | 32 | namespace OpenSim.Region.Storage.LocalStorageDb4o |
33 | { | 33 | { |
34 | public class MapStorage | 34 | public class MapStorage |
35 | { | 35 | { |
diff --git a/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj b/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.csproj index 5b8f1c1..147158c 100644 --- a/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj +++ b/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.csproj | |||
@@ -3,20 +3,20 @@ | |||
3 | <ProjectType>Local</ProjectType> | 3 | <ProjectType>Local</ProjectType> |
4 | <ProductVersion>8.0.50727</ProductVersion> | 4 | <ProductVersion>8.0.50727</ProductVersion> |
5 | <SchemaVersion>2.0</SchemaVersion> | 5 | <SchemaVersion>2.0</SchemaVersion> |
6 | <ProjectGuid>{E1B79ECF-0000-0000-0000-000000000000}</ProjectGuid> | 6 | <ProjectGuid>{43DB702D-0000-0000-0000-000000000000}</ProjectGuid> |
7 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | 7 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> |
8 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> | 8 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> |
9 | <ApplicationIcon></ApplicationIcon> | 9 | <ApplicationIcon></ApplicationIcon> |
10 | <AssemblyKeyContainerName> | 10 | <AssemblyKeyContainerName> |
11 | </AssemblyKeyContainerName> | 11 | </AssemblyKeyContainerName> |
12 | <AssemblyName>OpenSim.Storage.LocalStorageDb4o</AssemblyName> | 12 | <AssemblyName>OpenSim.Region.Storage.LocalStorageDb4o</AssemblyName> |
13 | <DefaultClientScript>JScript</DefaultClientScript> | 13 | <DefaultClientScript>JScript</DefaultClientScript> |
14 | <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout> | 14 | <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout> |
15 | <DefaultTargetSchema>IE50</DefaultTargetSchema> | 15 | <DefaultTargetSchema>IE50</DefaultTargetSchema> |
16 | <DelaySign>false</DelaySign> | 16 | <DelaySign>false</DelaySign> |
17 | <OutputType>Library</OutputType> | 17 | <OutputType>Library</OutputType> |
18 | <AppDesignerFolder></AppDesignerFolder> | 18 | <AppDesignerFolder></AppDesignerFolder> |
19 | <RootNamespace>OpenSim.Storage.LocalStorageDb4o</RootNamespace> | 19 | <RootNamespace>OpenSim.Region.Storage.LocalStorageDb4o</RootNamespace> |
20 | <StartupObject></StartupObject> | 20 | <StartupObject></StartupObject> |
21 | <FileUpgradeFlags> | 21 | <FileUpgradeFlags> |
22 | </FileUpgradeFlags> | 22 | </FileUpgradeFlags> |
@@ -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> |
@@ -59,11 +59,11 @@ | |||
59 | </PropertyGroup> | 59 | </PropertyGroup> |
60 | <ItemGroup> | 60 | <ItemGroup> |
61 | <Reference Include="Db4objects.Db4o.dll" > | 61 | <Reference Include="Db4objects.Db4o.dll" > |
62 | <HintPath>..\..\..\bin\Db4objects.Db4o.dll</HintPath> | 62 | <HintPath>..\..\..\..\bin\Db4objects.Db4o.dll</HintPath> |
63 | <Private>False</Private> | 63 | <Private>False</Private> |
64 | </Reference> | 64 | </Reference> |
65 | <Reference Include="libsecondlife.dll" > | 65 | <Reference Include="libsecondlife.dll" > |
66 | <HintPath>..\..\..\bin\libsecondlife.dll</HintPath> | 66 | <HintPath>..\..\..\..\bin\libsecondlife.dll</HintPath> |
67 | <Private>False</Private> | 67 | <Private>False</Private> |
68 | </Reference> | 68 | </Reference> |
69 | <Reference Include="System" > | 69 | <Reference Include="System" > |
@@ -76,13 +76,13 @@ | |||
76 | </Reference> | 76 | </Reference> |
77 | </ItemGroup> | 77 | </ItemGroup> |
78 | <ItemGroup> | 78 | <ItemGroup> |
79 | <ProjectReference Include="..\..\..\Common\OpenSim.Framework\OpenSim.Framework.csproj"> | 79 | <ProjectReference Include="..\..\..\Framework\General\OpenSim.Framework.csproj"> |
80 | <Name>OpenSim.Framework</Name> | 80 | <Name>OpenSim.Framework</Name> |
81 | <Project>{8ACA2445-0000-0000-0000-000000000000}</Project> | 81 | <Project>{8ACA2445-0000-0000-0000-000000000000}</Project> |
82 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 82 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
83 | <Private>False</Private> | 83 | <Private>False</Private> |
84 | </ProjectReference> | 84 | </ProjectReference> |
85 | <ProjectReference Include="..\..\..\Common\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj"> | 85 | <ProjectReference Include="..\..\..\Framework\Console\OpenSim.Framework.Console.csproj"> |
86 | <Name>OpenSim.Framework.Console</Name> | 86 | <Name>OpenSim.Framework.Console</Name> |
87 | <Project>{A7CD0630-0000-0000-0000-000000000000}</Project> | 87 | <Project>{A7CD0630-0000-0000-0000-000000000000}</Project> |
88 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 88 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
diff --git a/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build b/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.dll.build index 739b98c..fc9f055 100644 --- a/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build +++ b/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.dll.build | |||
@@ -1,5 +1,5 @@ | |||
1 | <?xml version="1.0" ?> | 1 | <?xml version="1.0" ?> |
2 | <project name="OpenSim.Storage.LocalStorageDb4o" default="build"> | 2 | <project name="OpenSim.Region.Storage.LocalStorageDb4o" default="build"> |
3 | <target name="build"> | 3 | <target name="build"> |
4 | <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> | 4 | <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> |
5 | <mkdir dir="${project::get-base-directory()}/${build.dir}" /> | 5 | <mkdir dir="${project::get-base-directory()}/${build.dir}" /> |
@@ -8,7 +8,7 @@ | |||
8 | </fileset> | 8 | </fileset> |
9 | </copy> | 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"> | 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.LocalStorageDb4o" dynamicprefix="true" > | 11 | <resources prefix="OpenSim.Region.Storage.LocalStorageDb4o" dynamicprefix="true" > |
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="AssemblyInfo.cs" /> | 14 | <include name="AssemblyInfo.cs" /> |
@@ -22,17 +22,17 @@ | |||
22 | <include name="${project::get-base-directory()}" /> | 22 | <include name="${project::get-base-directory()}" /> |
23 | <include name="${project::get-base-directory()}/${build.dir}" /> | 23 | <include name="${project::get-base-directory()}/${build.dir}" /> |
24 | </lib> | 24 | </lib> |
25 | <include name="../../../bin/Db4objects.Db4o.dll" /> | 25 | <include name="../../../../bin/Db4objects.Db4o.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" /> |
29 | <include name="System.dll" /> | 29 | <include name="System.dll" /> |
30 | <include name="System.Xml.dll" /> | 30 | <include name="System.Xml.dll" /> |
31 | </references> | 31 | </references> |
32 | </csc> | 32 | </csc> |
33 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../bin/" /> | 33 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../../bin/" /> |
34 | <mkdir dir="${project::get-base-directory()}/../../../bin/"/> | 34 | <mkdir dir="${project::get-base-directory()}/../../../../bin/"/> |
35 | <copy todir="${project::get-base-directory()}/../../../bin/"> | 35 | <copy todir="${project::get-base-directory()}/../../../../bin/"> |
36 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | 36 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > |
37 | <include name="*.dll"/> | 37 | <include name="*.dll"/> |
38 | <include name="*.exe"/> | 38 | <include name="*.exe"/> |
diff --git a/OpenSim/OpenSim.Storage/LocalStorageDb4o/UUIDParcelQuery.cs b/OpenSim/Region/Storage/LocalStorageDb4o/UUIDParcelQuery.cs index d24fb5f..dcbe639 100644 --- a/OpenSim/OpenSim.Storage/LocalStorageDb4o/UUIDParcelQuery.cs +++ b/OpenSim/Region/Storage/LocalStorageDb4o/UUIDParcelQuery.cs | |||
@@ -34,7 +34,7 @@ using libsecondlife; | |||
34 | using OpenSim.Framework.Interfaces; | 34 | using OpenSim.Framework.Interfaces; |
35 | using OpenSim.Framework.Types; | 35 | using OpenSim.Framework.Types; |
36 | 36 | ||
37 | namespace OpenSim.Storage.LocalStorageDb4o | 37 | namespace OpenSim.Region.Storage.LocalStorageDb4o |
38 | { | 38 | { |
39 | public class UUIDParcelQuery : Predicate | 39 | public class UUIDParcelQuery : Predicate |
40 | { | 40 | { |
diff --git a/OpenSim/OpenSim.Storage/LocalStorageDb4o/UUIDPrimQuery.cs b/OpenSim/Region/Storage/LocalStorageDb4o/UUIDPrimQuery.cs index b2e8a91..23de6dd 100644 --- a/OpenSim/OpenSim.Storage/LocalStorageDb4o/UUIDPrimQuery.cs +++ b/OpenSim/Region/Storage/LocalStorageDb4o/UUIDPrimQuery.cs | |||
@@ -34,7 +34,7 @@ using libsecondlife; | |||
34 | using OpenSim.Framework.Interfaces; | 34 | using OpenSim.Framework.Interfaces; |
35 | using OpenSim.Framework.Types; | 35 | using OpenSim.Framework.Types; |
36 | 36 | ||
37 | namespace OpenSim.Storage.LocalStorageDb4o | 37 | namespace OpenSim.Region.Storage.LocalStorageDb4o |
38 | { | 38 | { |
39 | public class UUIDPrimQuery : Predicate | 39 | public class UUIDPrimQuery : Predicate |
40 | { | 40 | { |
diff --git a/OpenSim/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.csproj b/OpenSim/Region/Storage/LocalStorageSQLite/OpenSim.Region.Storage.LocalStorageSQLite.csproj index ff93a8f..d1353a5 100644 --- a/OpenSim/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.csproj +++ b/OpenSim/Region/Storage/LocalStorageSQLite/OpenSim.Region.Storage.LocalStorageSQLite.csproj | |||
@@ -3,20 +3,20 @@ | |||
3 | <ProjectType>Local</ProjectType> | 3 | <ProjectType>Local</ProjectType> |
4 | <ProductVersion>8.0.50727</ProductVersion> | 4 | <ProductVersion>8.0.50727</ProductVersion> |
5 | <SchemaVersion>2.0</SchemaVersion> | 5 | <SchemaVersion>2.0</SchemaVersion> |
6 | <ProjectGuid>{6B20B603-0000-0000-0000-000000000000}</ProjectGuid> | 6 | <ProjectGuid>{477B9270-0000-0000-0000-000000000000}</ProjectGuid> |
7 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | 7 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> |
8 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> | 8 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> |
9 | <ApplicationIcon></ApplicationIcon> | 9 | <ApplicationIcon></ApplicationIcon> |
10 | <AssemblyKeyContainerName> | 10 | <AssemblyKeyContainerName> |
11 | </AssemblyKeyContainerName> | 11 | </AssemblyKeyContainerName> |
12 | <AssemblyName>OpenSim.Storage.LocalStorageSQLite</AssemblyName> | 12 | <AssemblyName>OpenSim.Region.Storage.LocalStorageSQLite</AssemblyName> |
13 | <DefaultClientScript>JScript</DefaultClientScript> | 13 | <DefaultClientScript>JScript</DefaultClientScript> |
14 | <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout> | 14 | <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout> |
15 | <DefaultTargetSchema>IE50</DefaultTargetSchema> | 15 | <DefaultTargetSchema>IE50</DefaultTargetSchema> |
16 | <DelaySign>false</DelaySign> | 16 | <DelaySign>false</DelaySign> |
17 | <OutputType>Library</OutputType> | 17 | <OutputType>Library</OutputType> |
18 | <AppDesignerFolder></AppDesignerFolder> | 18 | <AppDesignerFolder></AppDesignerFolder> |
19 | <RootNamespace>OpenSim.Storage.LocalStorageSQLite</RootNamespace> | 19 | <RootNamespace>OpenSim.Region.Storage.LocalStorageSQLite</RootNamespace> |
20 | <StartupObject></StartupObject> | 20 | <StartupObject></StartupObject> |
21 | <FileUpgradeFlags> | 21 | <FileUpgradeFlags> |
22 | </FileUpgradeFlags> | 22 | </FileUpgradeFlags> |
@@ -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> |
@@ -59,7 +59,7 @@ | |||
59 | </PropertyGroup> | 59 | </PropertyGroup> |
60 | <ItemGroup> | 60 | <ItemGroup> |
61 | <Reference Include="libsecondlife.dll" > | 61 | <Reference Include="libsecondlife.dll" > |
62 | <HintPath>..\..\..\bin\libsecondlife.dll</HintPath> | 62 | <HintPath>..\..\..\..\bin\libsecondlife.dll</HintPath> |
63 | <Private>False</Private> | 63 | <Private>False</Private> |
64 | </Reference> | 64 | </Reference> |
65 | <Reference Include="System" > | 65 | <Reference Include="System" > |
@@ -71,7 +71,7 @@ | |||
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="System.Xml" > | 77 | <Reference Include="System.Xml" > |
@@ -80,13 +80,13 @@ | |||
80 | </Reference> | 80 | </Reference> |
81 | </ItemGroup> | 81 | </ItemGroup> |
82 | <ItemGroup> | 82 | <ItemGroup> |
83 | <ProjectReference Include="..\..\..\Common\OpenSim.Framework\OpenSim.Framework.csproj"> | 83 | <ProjectReference Include="..\..\..\Framework\General\OpenSim.Framework.csproj"> |
84 | <Name>OpenSim.Framework</Name> | 84 | <Name>OpenSim.Framework</Name> |
85 | <Project>{8ACA2445-0000-0000-0000-000000000000}</Project> | 85 | <Project>{8ACA2445-0000-0000-0000-000000000000}</Project> |
86 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 86 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
87 | <Private>False</Private> | 87 | <Private>False</Private> |
88 | </ProjectReference> | 88 | </ProjectReference> |
89 | <ProjectReference Include="..\..\..\Common\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj"> | 89 | <ProjectReference Include="..\..\..\Framework\Console\OpenSim.Framework.Console.csproj"> |
90 | <Name>OpenSim.Framework.Console</Name> | 90 | <Name>OpenSim.Framework.Console</Name> |
91 | <Project>{A7CD0630-0000-0000-0000-000000000000}</Project> | 91 | <Project>{A7CD0630-0000-0000-0000-000000000000}</Project> |
92 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 92 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
diff --git a/Common/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.dll.build b/OpenSim/Region/Storage/LocalStorageSQLite/OpenSim.Region.Storage.LocalStorageSQLite.dll.build index d82d751..9d12c33 100644 --- a/Common/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.dll.build +++ b/OpenSim/Region/Storage/LocalStorageSQLite/OpenSim.Region.Storage.LocalStorageSQLite.dll.build | |||
@@ -1,5 +1,5 @@ | |||
1 | <?xml version="1.0" ?> | 1 | <?xml version="1.0" ?> |
2 | <project name="OpenGrid.Framework.Data.DB4o" default="build"> | 2 | <project name="OpenSim.Region.Storage.LocalStorageSQLite" default="build"> |
3 | <target name="build"> | 3 | <target name="build"> |
4 | <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> | 4 | <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> |
5 | <mkdir dir="${project::get-base-directory()}/${build.dir}" /> | 5 | <mkdir dir="${project::get-base-directory()}/${build.dir}" /> |
@@ -8,12 +8,10 @@ | |||
8 | </fileset> | 8 | </fileset> |
9 | </copy> | 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"> | 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="OpenGrid.Framework.Data.DB4o" dynamicprefix="true" > | 11 | <resources prefix="OpenSim.Region.Storage.LocalStorageSQLite" dynamicprefix="true" > |
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="DB4oGridData.cs" /> | 14 | <include name="SQLiteLocalStorage.cs" /> |
15 | <include name="DB4oManager.cs" /> | ||
16 | <include name="DB4oUserData.cs" /> | ||
17 | <include name="Properties/AssemblyInfo.cs" /> | 15 | <include name="Properties/AssemblyInfo.cs" /> |
18 | </sources> | 16 | </sources> |
19 | <references basedir="${project::get-base-directory()}"> | 17 | <references basedir="${project::get-base-directory()}"> |
@@ -21,17 +19,18 @@ | |||
21 | <include name="${project::get-base-directory()}" /> | 19 | <include name="${project::get-base-directory()}" /> |
22 | <include name="${project::get-base-directory()}/${build.dir}" /> | 20 | <include name="${project::get-base-directory()}/${build.dir}" /> |
23 | </lib> | 21 | </lib> |
24 | <include name="../../bin/Db4objects.Db4o.dll" /> | 22 | <include name="../../../../bin/libsecondlife.dll" /> |
25 | <include name="../../bin/libsecondlife.dll" /> | 23 | <include name="../../../../bin/OpenSim.Framework.dll" /> |
26 | <include name="../../bin/OpenGrid.Framework.Data.dll" /> | 24 | <include name="../../../../bin/OpenSim.Framework.Console.dll" /> |
27 | <include name="System.dll" /> | 25 | <include name="System.dll" /> |
28 | <include name="System.Data.dll" /> | 26 | <include name="System.Data.dll" /> |
27 | <include name="../../../../bin/System.Data.SQLite.dll" /> | ||
29 | <include name="System.Xml.dll" /> | 28 | <include name="System.Xml.dll" /> |
30 | </references> | 29 | </references> |
31 | </csc> | 30 | </csc> |
32 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" /> | 31 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../../bin/" /> |
33 | <mkdir dir="${project::get-base-directory()}/../../bin/"/> | 32 | <mkdir dir="${project::get-base-directory()}/../../../../bin/"/> |
34 | <copy todir="${project::get-base-directory()}/../../bin/"> | 33 | <copy todir="${project::get-base-directory()}/../../../../bin/"> |
35 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | 34 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > |
36 | <include name="*.dll"/> | 35 | <include name="*.dll"/> |
37 | <include name="*.exe"/> | 36 | <include name="*.exe"/> |
diff --git a/OpenSim/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build b/OpenSim/Region/Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build index bd4c731..bd4c731 100644 --- a/OpenSim/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build +++ b/OpenSim/Region/Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build | |||
diff --git a/OpenSim/OpenSim.Storage/LocalStorageSQLite/Properties/AssemblyInfo.cs b/OpenSim/Region/Storage/LocalStorageSQLite/Properties/AssemblyInfo.cs index b45debf..80158d5 100644 --- a/OpenSim/OpenSim.Storage/LocalStorageSQLite/Properties/AssemblyInfo.cs +++ b/OpenSim/Region/Storage/LocalStorageSQLite/Properties/AssemblyInfo.cs | |||
@@ -32,11 +32,11 @@ using System.Runtime.InteropServices; | |||
32 | // General Information about an assembly is controlled through the following | 32 | // General Information about an assembly is controlled through the following |
33 | // set of attributes. Change these attribute values to modify the information | 33 | // set of attributes. Change these attribute values to modify the information |
34 | // associated with an assembly. | 34 | // associated with an assembly. |
35 | [assembly: AssemblyTitle("OpenSim.Storage.LocalStorageSQLite")] | 35 | [assembly: AssemblyTitle("OpenSim.Region.Storage.LocalStorageSQLite")] |
36 | [assembly: AssemblyDescription("")] | 36 | [assembly: AssemblyDescription("")] |
37 | [assembly: AssemblyConfiguration("")] | 37 | [assembly: AssemblyConfiguration("")] |
38 | [assembly: AssemblyCompany("")] | 38 | [assembly: AssemblyCompany("")] |
39 | [assembly: AssemblyProduct("OpenSim.Storage.LocalStorageSQLite")] | 39 | [assembly: AssemblyProduct("OpenSim.Region.Storage.LocalStorageSQLite")] |
40 | [assembly: AssemblyCopyright("Copyright © 2007")] | 40 | [assembly: AssemblyCopyright("Copyright © 2007")] |
41 | [assembly: AssemblyTrademark("")] | 41 | [assembly: AssemblyTrademark("")] |
42 | [assembly: AssemblyCulture("")] | 42 | [assembly: AssemblyCulture("")] |
diff --git a/OpenSim/OpenSim.Storage/LocalStorageSQLite/SQLiteLocalStorage.cs b/OpenSim/Region/Storage/LocalStorageSQLite/SQLiteLocalStorage.cs index 8a7893e..b407be4 100644 --- a/OpenSim/OpenSim.Storage/LocalStorageSQLite/SQLiteLocalStorage.cs +++ b/OpenSim/Region/Storage/LocalStorageSQLite/SQLiteLocalStorage.cs | |||
@@ -37,7 +37,7 @@ using libsecondlife; | |||
37 | using OpenSim.Framework.Interfaces; | 37 | using OpenSim.Framework.Interfaces; |
38 | using OpenSim.Framework.Types; | 38 | using OpenSim.Framework.Types; |
39 | 39 | ||
40 | namespace OpenSim.Storage.LocalStorageSQLite | 40 | namespace OpenSim.Region.Storage.LocalStorageSQLite |
41 | { | 41 | { |
42 | public class SQLiteLocalStorage : ILocalStorage | 42 | public class SQLiteLocalStorage : ILocalStorage |
43 | { | 43 | { |