diff options
author | mingchen | 2007-06-08 19:10:55 +0000 |
---|---|---|
committer | mingchen | 2007-06-08 19:10:55 +0000 |
commit | 2239ecba188b0435d9a6d58b1c66f2b6eb591116 (patch) | |
tree | bd07f5ddd43dc11077dc445d7b50a983ed37535f /OpenGridServices/OpenGrid.Framework.Data.DB4o | |
parent | *Added EstateSettings.cs and ParcelData.cs to OpenSim.Framework.Types (diff) | |
download | opensim-SC_OLD-2239ecba188b0435d9a6d58b1c66f2b6eb591116.zip opensim-SC_OLD-2239ecba188b0435d9a6d58b1c66f2b6eb591116.tar.gz opensim-SC_OLD-2239ecba188b0435d9a6d58b1c66f2b6eb591116.tar.bz2 opensim-SC_OLD-2239ecba188b0435d9a6d58b1c66f2b6eb591116.tar.xz |
*Merged EstateManager, EstateSettings, ParcelManager,Parcel, and ParcelData classes
*Incorporated EstateSettings into the RegionInfo class
*Next step is to load from db, save to db the parcel and estate settings
Diffstat (limited to 'OpenGridServices/OpenGrid.Framework.Data.DB4o')
-rw-r--r-- | OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj | 114 | ||||
-rw-r--r-- | OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj.user | 2 |
2 files changed, 1 insertions, 115 deletions
diff --git a/OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj b/OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj index 6ced216..3b783ca 100644 --- a/OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj +++ b/OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj | |||
@@ -1,116 +1,3 @@ | |||
1 | <<<<<<< .mine | ||
2 | <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
3 | <PropertyGroup> | ||
4 | <ProjectType>Local</ProjectType> | ||
5 | <ProductVersion>8.0.50727</ProductVersion> | ||
6 | <SchemaVersion>2.0</SchemaVersion> | ||
7 | <ProjectGuid>{39BD9497-0000-0000-0000-000000000000}</ProjectGuid> | ||
8 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | ||
9 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> | ||
10 | <ApplicationIcon></ApplicationIcon> | ||
11 | <AssemblyKeyContainerName> | ||
12 | </AssemblyKeyContainerName> | ||
13 | <AssemblyName>OpenGrid.Framework.Data.DB4o</AssemblyName> | ||
14 | <DefaultClientScript>JScript</DefaultClientScript> | ||
15 | <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout> | ||
16 | <DefaultTargetSchema>IE50</DefaultTargetSchema> | ||
17 | <DelaySign>false</DelaySign> | ||
18 | <OutputType>Library</OutputType> | ||
19 | <AppDesignerFolder></AppDesignerFolder> | ||
20 | <RootNamespace>OpenGrid.Framework.Data.DB4o</RootNamespace> | ||
21 | <StartupObject></StartupObject> | ||
22 | <FileUpgradeFlags> | ||
23 | </FileUpgradeFlags> | ||
24 | </PropertyGroup> | ||
25 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> | ||
26 | <AllowUnsafeBlocks>False</AllowUnsafeBlocks> | ||
27 | <BaseAddress>285212672</BaseAddress> | ||
28 | <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow> | ||
29 | <ConfigurationOverrideFile> | ||
30 | </ConfigurationOverrideFile> | ||
31 | <DefineConstants>TRACE;DEBUG</DefineConstants> | ||
32 | <DocumentationFile></DocumentationFile> | ||
33 | <DebugSymbols>True</DebugSymbols> | ||
34 | <FileAlignment>4096</FileAlignment> | ||
35 | <Optimize>False</Optimize> | ||
36 | <OutputPath>..\..\bin\</OutputPath> | ||
37 | <RegisterForComInterop>False</RegisterForComInterop> | ||
38 | <RemoveIntegerChecks>False</RemoveIntegerChecks> | ||
39 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> | ||
40 | <WarningLevel>4</WarningLevel> | ||
41 | <NoWarn></NoWarn> | ||
42 | </PropertyGroup> | ||
43 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> | ||
44 | <AllowUnsafeBlocks>False</AllowUnsafeBlocks> | ||
45 | <BaseAddress>285212672</BaseAddress> | ||
46 | <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow> | ||
47 | <ConfigurationOverrideFile> | ||
48 | </ConfigurationOverrideFile> | ||
49 | <DefineConstants>TRACE</DefineConstants> | ||
50 | <DocumentationFile></DocumentationFile> | ||
51 | <DebugSymbols>False</DebugSymbols> | ||
52 | <FileAlignment>4096</FileAlignment> | ||
53 | <Optimize>True</Optimize> | ||
54 | <OutputPath>..\..\bin\</OutputPath> | ||
55 | <RegisterForComInterop>False</RegisterForComInterop> | ||
56 | <RemoveIntegerChecks>False</RemoveIntegerChecks> | ||
57 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> | ||
58 | <WarningLevel>4</WarningLevel> | ||
59 | <NoWarn></NoWarn> | ||
60 | </PropertyGroup> | ||
61 | <ItemGroup> | ||
62 | <Reference Include="System" > | ||
63 | <HintPath>System.dll</HintPath> | ||
64 | <Private>False</Private> | ||
65 | </Reference> | ||
66 | <Reference Include="System.Xml" > | ||
67 | <HintPath>System.Xml.dll</HintPath> | ||
68 | <Private>False</Private> | ||
69 | </Reference> | ||
70 | <Reference Include="System.Data" > | ||
71 | <HintPath>System.Data.dll</HintPath> | ||
72 | <Private>False</Private> | ||
73 | </Reference> | ||
74 | <Reference Include="libsecondlife.dll" > | ||
75 | <HintPath>..\..\bin\libsecondlife.dll</HintPath> | ||
76 | <Private>False</Private> | ||
77 | </Reference> | ||
78 | <Reference Include="Db4objects.Db4o.dll" > | ||
79 | <HintPath>..\..\bin\Db4objects.Db4o.dll</HintPath> | ||
80 | <Private>False</Private> | ||
81 | </Reference> | ||
82 | </ItemGroup> | ||
83 | <ItemGroup> | ||
84 | <ProjectReference Include="..\OpenGrid.Framework.Data\OpenGrid.Framework.Data.csproj"> | ||
85 | <Name>OpenGrid.Framework.Data</Name> | ||
86 | <Project>{62CDF671-0000-0000-0000-000000000000}</Project> | ||
87 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | ||
88 | <Private>False</Private> | ||
89 | </ProjectReference> | ||
90 | </ItemGroup> | ||
91 | <ItemGroup> | ||
92 | <Compile Include="DB4oGridData.cs"> | ||
93 | <SubType>Code</SubType> | ||
94 | </Compile> | ||
95 | <Compile Include="DB4oManager.cs"> | ||
96 | <SubType>Code</SubType> | ||
97 | </Compile> | ||
98 | <Compile Include="DB4oUserData.cs"> | ||
99 | <SubType>Code</SubType> | ||
100 | </Compile> | ||
101 | <Compile Include="Properties\AssemblyInfo.cs"> | ||
102 | <SubType>Code</SubType> | ||
103 | </Compile> | ||
104 | </ItemGroup> | ||
105 | <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" /> | ||
106 | <PropertyGroup> | ||
107 | <PreBuildEvent> | ||
108 | </PreBuildEvent> | ||
109 | <PostBuildEvent> | ||
110 | </PostBuildEvent> | ||
111 | </PropertyGroup> | ||
112 | </Project> | ||
113 | ======= | ||
114 | <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | 1 | <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
115 | <PropertyGroup> | 2 | <PropertyGroup> |
116 | <ProjectType>Local</ProjectType> | 3 | <ProjectType>Local</ProjectType> |
@@ -222,4 +109,3 @@ | |||
222 | </PostBuildEvent> | 109 | </PostBuildEvent> |
223 | </PropertyGroup> | 110 | </PropertyGroup> |
224 | </Project> | 111 | </Project> |
225 | >>>>>>> .r921 | ||
diff --git a/OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj.user b/OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj.user index 1b6b14d..082d673 100644 --- a/OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj.user +++ b/OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj.user | |||
@@ -2,7 +2,7 @@ | |||
2 | <PropertyGroup> | 2 | <PropertyGroup> |
3 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | 3 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> |
4 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> | 4 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> |
5 | <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim26-05\trunk\bin\</ReferencePath> | 5 | <ReferencePath>C:\sugilite\bin\</ReferencePath> |
6 | <LastOpenVersion>8.0.50727</LastOpenVersion> | 6 | <LastOpenVersion>8.0.50727</LastOpenVersion> |
7 | <ProjectView>ProjectFiles</ProjectView> | 7 | <ProjectView>ProjectFiles</ProjectView> |
8 | <ProjectTrust>0</ProjectTrust> | 8 | <ProjectTrust>0</ProjectTrust> |