2 files changed, 1 insertions, 112 deletions
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 @@
-<<<<<<< .mine
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectType>Local</ProjectType>
-    <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{1E3F341A-0000-0000-0000-000000000000}</ProjectGuid>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon></ApplicationIcon>
-    <AssemblyKeyContainerName>
-    </AssemblyKeyContainerName>
-    <AssemblyName>OpenGrid.Framework.Data.SQLite</AssemblyName>
-    <DefaultClientScript>JScript</DefaultClientScript>
-    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
-    <DefaultTargetSchema>IE50</DefaultTargetSchema>
-    <DelaySign>false</DelaySign>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder></AppDesignerFolder>
-    <RootNamespace>OpenGrid.Framework.Data.SQLite</RootNamespace>
-    <StartupObject></StartupObject>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <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' ">
-    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE</DefineConstants>
-    <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="System" >
-      <HintPath>System.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System.Xml" >
-      <HintPath>System.Xml.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System.Data" >
-      <HintPath>System.Data.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System.Data.SQLite.dll" >
-      <HintPath>..\..\bin\System.Data.SQLite.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="libsecondlife.dll" >
-      <HintPath>..\..\bin\libsecondlife.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\OpenGrid.Framework.Data\OpenGrid.Framework.Data.csproj">
-      <Name>OpenGrid.Framework.Data</Name>
-      <Project>{62CDF671-0000-0000-0000-000000000000}</Project>
-      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-                        <Private>False</Private>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="SQLiteGridData.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="SQLiteManager.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>
-=======
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <ProjectType>Local</ProjectType>
@@ -216,4 +106,3 @@
    </PostBuildEvent>
  </PropertyGroup>
 </Project>
->>>>>>> .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 @@
  <PropertyGroup>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim26-05\trunk\bin\</ReferencePath>
+    <ReferencePath>C:\sugilite\bin\</ReferencePath>
    <LastOpenVersion>8.0.50727</LastOpenVersion>
    <ProjectView>ProjectFiles</ProjectView>
    <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>