aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenGridServices/OpenGrid.Framework.Data
diff options
context:
space:
mode:
authormingchen2007-06-08 19:10:55 +0000
committermingchen2007-06-08 19:10:55 +0000
commit2239ecba188b0435d9a6d58b1c66f2b6eb591116 (patch)
treebd07f5ddd43dc11077dc445d7b50a983ed37535f /OpenGridServices/OpenGrid.Framework.Data
parent*Added EstateSettings.cs and ParcelData.cs to OpenSim.Framework.Types (diff)
downloadopensim-SC-2239ecba188b0435d9a6d58b1c66f2b6eb591116.zip
opensim-SC-2239ecba188b0435d9a6d58b1c66f2b6eb591116.tar.gz
opensim-SC-2239ecba188b0435d9a6d58b1c66f2b6eb591116.tar.bz2
opensim-SC-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 '')
-rw-r--r--OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj114
-rw-r--r--OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj.user2
-rw-r--r--OpenGridServices/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.csproj.user2
-rw-r--r--OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.csproj120
-rw-r--r--OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.csproj.user2
-rw-r--r--OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.csproj111
-rw-r--r--OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.csproj.user2
-rw-r--r--OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj116
-rw-r--r--OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj.user2
9 files changed, 5 insertions, 466 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>
diff --git a/OpenGridServices/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.csproj.user b/OpenGridServices/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.csproj.user
index 1b6b14d..082d673 100644
--- a/OpenGridServices/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.csproj.user
+++ b/OpenGridServices/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.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>
diff --git a/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.csproj b/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.csproj
index 351de2a..5fe0cf7 100644
--- a/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.csproj
+++ b/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.csproj
@@ -1,122 +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>{0F3C3AC1-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.MySQL</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.MySQL</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="MySql.Data.dll" >
79 <HintPath>..\..\bin\MySql.Data.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="MySQLGridData.cs">
93 <SubType>Code</SubType>
94 </Compile>
95 <Compile Include="MySQLInventoryData.cs">
96 <SubType>Code</SubType>
97 </Compile>
98 <Compile Include="MySQLLogData.cs">
99 <SubType>Code</SubType>
100 </Compile>
101 <Compile Include="MySQLManager.cs">
102 <SubType>Code</SubType>
103 </Compile>
104 <Compile Include="MySQLUserData.cs">
105 <SubType>Code</SubType>
106 </Compile>
107 <Compile Include="Properties\AssemblyInfo.cs">
108 <SubType>Code</SubType>
109 </Compile>
110 </ItemGroup>
111 <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
112 <PropertyGroup>
113 <PreBuildEvent>
114 </PreBuildEvent>
115 <PostBuildEvent>
116 </PostBuildEvent>
117 </PropertyGroup>
118</Project>
119=======
120<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> 1<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
121 <PropertyGroup> 2 <PropertyGroup>
122 <ProjectType>Local</ProjectType> 3 <ProjectType>Local</ProjectType>
@@ -234,4 +115,3 @@
234 </PostBuildEvent> 115 </PostBuildEvent>
235 </PropertyGroup> 116 </PropertyGroup>
236</Project> 117</Project>
237>>>>>>> .r921
diff --git a/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.csproj.user b/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.csproj.user
index 1b6b14d..082d673 100644
--- a/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.csproj.user
+++ b/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.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>
diff --git a/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.csproj b/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.csproj
index 4360031..fa17367 100644
--- a/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.csproj
+++ b/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.csproj
@@ -1,113 +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>{1E3F341A-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.SQLite</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.SQLite</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="System.Data.SQLite.dll" >
75 <HintPath>..\..\bin\System.Data.SQLite.dll</HintPath>
76 <Private>False</Private>
77 </Reference>
78 <Reference Include="libsecondlife.dll" >
79 <HintPath>..\..\bin\libsecondlife.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="SQLiteGridData.cs">
93 <SubType>Code</SubType>
94 </Compile>
95 <Compile Include="SQLiteManager.cs">
96 <SubType>Code</SubType>
97 </Compile>
98 <Compile Include="Properties\AssemblyInfo.cs">
99 <SubType>Code</SubType>
100 </Compile>
101 </ItemGroup>
102 <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
103 <PropertyGroup>
104 <PreBuildEvent>
105 </PreBuildEvent>
106 <PostBuildEvent>
107 </PostBuildEvent>
108 </PropertyGroup>
109</Project>
110=======
111<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> 1<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
112 <PropertyGroup> 2 <PropertyGroup>
113 <ProjectType>Local</ProjectType> 3 <ProjectType>Local</ProjectType>
@@ -216,4 +106,3 @@
216 </PostBuildEvent> 106 </PostBuildEvent>
217 </PropertyGroup> 107 </PropertyGroup>
218</Project> 108</Project>
219>>>>>>> .r921
diff --git a/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.csproj.user b/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.csproj.user
index 1b6b14d..082d673 100644
--- a/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.csproj.user
+++ b/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.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>
diff --git a/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj b/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj
index c0684a2..990cd16 100644
--- a/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj
+++ b/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj
@@ -1,118 +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>{62CDF671-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</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</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 </ItemGroup>
79 <ItemGroup>
80 </ItemGroup>
81 <ItemGroup>
82 <Compile Include="GridData.cs">
83 <SubType>Code</SubType>
84 </Compile>
85 <Compile Include="ILogData.cs">
86 <SubType>Code</SubType>
87 </Compile>
88 <Compile Include="IniConfig.cs">
89 <SubType>Code</SubType>
90 </Compile>
91 <Compile Include="InventoryData.cs">
92 <SubType>Code</SubType>
93 </Compile>
94 <Compile Include="SimProfileData.cs">
95 <SubType>Code</SubType>
96 </Compile>
97 <Compile Include="UserData.cs">
98 <SubType>Code</SubType>
99 </Compile>
100 <Compile Include="UserProfileData.cs">
101 <SubType>Code</SubType>
102 </Compile>
103 <Compile Include="Properties\AssemblyInfo.cs">
104 <SubType>Code</SubType>
105 </Compile>
106 </ItemGroup>
107 <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
108 <PropertyGroup>
109 <PreBuildEvent>
110 </PreBuildEvent>
111 <PostBuildEvent>
112 </PostBuildEvent>
113 </PropertyGroup>
114</Project>
115=======
116<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> 1<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
117 <PropertyGroup> 2 <PropertyGroup>
118 <ProjectType>Local</ProjectType> 3 <ProjectType>Local</ProjectType>
@@ -226,4 +111,3 @@
226 </PostBuildEvent> 111 </PostBuildEvent>
227 </PropertyGroup> 112 </PropertyGroup>
228</Project> 113</Project>
229>>>>>>> .r921
diff --git a/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj.user b/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj.user
index 1b6b14d..082d673 100644
--- a/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj.user
+++ b/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.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>
generated by cgit v1.1 at 2024-12-15 17:49:56 +0000