aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenGridServices
diff options
context:
space:
mode:
authormingchen2007-06-08 19:10:55 +0000
committermingchen2007-06-08 19:10:55 +0000
commit2239ecba188b0435d9a6d58b1c66f2b6eb591116 (patch)
treebd07f5ddd43dc11077dc445d7b50a983ed37535f /OpenGridServices
parent*Added EstateSettings.cs and ParcelData.cs to OpenSim.Framework.Types (diff)
downloadopensim-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')
-rw-r--r--OpenGridServices/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.csproj.user2
-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
-rw-r--r--OpenGridServices/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.csproj8
-rw-r--r--OpenGridServices/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.csproj.user2
-rw-r--r--OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.csproj129
-rw-r--r--OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.csproj.user2
-rw-r--r--OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.exe.build1
-rw-r--r--OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.csproj.user2
-rw-r--r--OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj.user2
-rw-r--r--OpenGridServices/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.csproj.user2
-rw-r--r--OpenGridServices/ServiceManager/ServiceManager.csproj117
-rw-r--r--OpenGridServices/ServiceManager/ServiceManager.csproj.user2
-rw-r--r--OpenGridServices/ServiceManager/ServiceManager.exe.build3
21 files changed, 16 insertions, 727 deletions
diff --git a/OpenGridServices/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.csproj.user b/OpenGridServices/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.csproj.user
index 1b6b14d..082d673 100644
--- a/OpenGridServices/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.csproj.user
+++ b/OpenGridServices/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.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.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>
diff --git a/OpenGridServices/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.csproj b/OpenGridServices/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.csproj
index dad56cb..ea7548a 100644
--- a/OpenGridServices/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.csproj
+++ b/OpenGridServices/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.csproj
@@ -62,12 +62,12 @@
62 <HintPath>System.dll</HintPath> 62 <HintPath>System.dll</HintPath>
63 <Private>False</Private> 63 <Private>False</Private>
64 </Reference> 64 </Reference>
65 <Reference Include="OpenSim.Framework.dll" > 65 <Reference Include="OpenSim.Framework" >
66 <HintPath>..\..\bin\OpenSim.Framework.dll</HintPath> 66 <HintPath>OpenSim.Framework.dll</HintPath>
67 <Private>False</Private> 67 <Private>False</Private>
68 </Reference> 68 </Reference>
69 <Reference Include="OpenSim.Servers.dll" > 69 <Reference Include="OpenSim.Servers" >
70 <HintPath>..\..\bin\OpenSim.Servers.dll</HintPath> 70 <HintPath>OpenSim.Servers.dll</HintPath>
71 <Private>False</Private> 71 <Private>False</Private>
72 </Reference> 72 </Reference>
73 <Reference Include="libsecondlife.dll" > 73 <Reference Include="libsecondlife.dll" >
diff --git a/OpenGridServices/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.csproj.user b/OpenGridServices/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.csproj.user
index 1b6b14d..082d673 100644
--- a/OpenGridServices/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.csproj.user
+++ b/OpenGridServices/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.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/OpenGridServices.AssetServer/OpenGridServices.AssetServer.csproj b/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.csproj
index 53afe16..a281e4f 100644
--- a/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.csproj
+++ b/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.csproj
@@ -1,4 +1,3 @@
1<<<<<<< .mine
2<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> 1<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3 <PropertyGroup> 2 <PropertyGroup>
4 <ProjectType>Local</ProjectType> 3 <ProjectType>Local</ProjectType>
@@ -79,133 +78,6 @@
79 <HintPath>OpenSim.Framework.Console.dll</HintPath> 78 <HintPath>OpenSim.Framework.Console.dll</HintPath>
80 <Private>False</Private> 79 <Private>False</Private>
81 </Reference> 80 </Reference>
82 <Reference Include="OpenSim.GridInterfaces.Local" >
83 <HintPath>OpenSim.GridInterfaces.Local.dll</HintPath>
84 <Private>False</Private>
85 </Reference>
86 <Reference Include="OpenSim.Servers" >
87 <HintPath>OpenSim.Servers.dll</HintPath>
88 <Private>False</Private>
89 </Reference>
90 <Reference Include="libsecondlife.dll" >
91 <HintPath>..\..\bin\libsecondlife.dll</HintPath>
92 <Private>False</Private>
93 </Reference>
94 <Reference Include="Db4objects.Db4o.dll" >
95 <HintPath>..\..\bin\Db4objects.Db4o.dll</HintPath>
96 <Private>False</Private>
97 </Reference>
98 <Reference Include="XMLRPC" >
99 <HintPath>XMLRPC.dll</HintPath>
100 <Private>False</Private>
101 </Reference>
102 </ItemGroup>
103 <ItemGroup>
104 </ItemGroup>
105 <ItemGroup>
106 <Compile Include="AssetHttpServer.cs">
107 <SubType>Code</SubType>
108 </Compile>
109 <Compile Include="Main.cs">
110 <SubType>Code</SubType>
111 </Compile>
112 <Compile Include="Properties\AssemblyInfo.cs">
113 <SubType>Code</SubType>
114 </Compile>
115 </ItemGroup>
116 <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
117 <PropertyGroup>
118 <PreBuildEvent>
119 </PreBuildEvent>
120 <PostBuildEvent>
121 </PostBuildEvent>
122 </PropertyGroup>
123</Project>
124=======
125<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
126 <PropertyGroup>
127 <ProjectType>Local</ProjectType>
128 <ProductVersion>8.0.50727</ProductVersion>
129 <SchemaVersion>2.0</SchemaVersion>
130 <ProjectGuid>{0021261B-0000-0000-0000-000000000000}</ProjectGuid>
131 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
132 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
133 <ApplicationIcon></ApplicationIcon>
134 <AssemblyKeyContainerName>
135 </AssemblyKeyContainerName>
136 <AssemblyName>OpenGridServices.AssetServer</AssemblyName>
137 <DefaultClientScript>JScript</DefaultClientScript>
138 <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
139 <DefaultTargetSchema>IE50</DefaultTargetSchema>
140 <DelaySign>false</DelaySign>
141 <OutputType>Exe</OutputType>
142 <AppDesignerFolder></AppDesignerFolder>
143 <RootNamespace>OpenGridServices.AssetServer</RootNamespace>
144 <StartupObject></StartupObject>
145 <FileUpgradeFlags>
146 </FileUpgradeFlags>
147 </PropertyGroup>
148 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
149 <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
150 <BaseAddress>285212672</BaseAddress>
151 <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
152 <ConfigurationOverrideFile>
153 </ConfigurationOverrideFile>
154 <DefineConstants>TRACE;DEBUG</DefineConstants>
155 <DocumentationFile></DocumentationFile>
156 <DebugSymbols>True</DebugSymbols>
157 <FileAlignment>4096</FileAlignment>
158 <Optimize>False</Optimize>
159 <OutputPath>..\..\bin\</OutputPath>
160 <RegisterForComInterop>False</RegisterForComInterop>
161 <RemoveIntegerChecks>False</RemoveIntegerChecks>
162 <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
163 <WarningLevel>4</WarningLevel>
164 <NoWarn></NoWarn>
165 </PropertyGroup>
166 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
167 <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
168 <BaseAddress>285212672</BaseAddress>
169 <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
170 <ConfigurationOverrideFile>
171 </ConfigurationOverrideFile>
172 <DefineConstants>TRACE</DefineConstants>
173 <DocumentationFile></DocumentationFile>
174 <DebugSymbols>False</DebugSymbols>
175 <FileAlignment>4096</FileAlignment>
176 <Optimize>True</Optimize>
177 <OutputPath>..\..\bin\</OutputPath>
178 <RegisterForComInterop>False</RegisterForComInterop>
179 <RemoveIntegerChecks>False</RemoveIntegerChecks>
180 <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
181 <WarningLevel>4</WarningLevel>
182 <NoWarn></NoWarn>
183 </PropertyGroup>
184 <ItemGroup>
185 <Reference Include="System" >
186 <HintPath>System.dll</HintPath>
187 <Private>False</Private>
188 </Reference>
189 <Reference Include="System.Data" >
190 <HintPath>System.Data.dll</HintPath>
191 <Private>False</Private>
192 </Reference>
193 <Reference Include="System.Xml" >
194 <HintPath>System.Xml.dll</HintPath>
195 <Private>False</Private>
196 </Reference>
197 <Reference Include="OpenSim.Framework" >
198 <HintPath>OpenSim.Framework.dll</HintPath>
199 <Private>False</Private>
200 </Reference>
201 <Reference Include="OpenSim.Framework.Console" >
202 <HintPath>OpenSim.Framework.Console.dll</HintPath>
203 <Private>False</Private>
204 </Reference>
205 <Reference Include="OpenSim.GridInterfaces.Local" >
206 <HintPath>OpenSim.GridInterfaces.Local.dll</HintPath>
207 <Private>False</Private>
208 </Reference>
209 <Reference Include="OpenSim.Servers" > 81 <Reference Include="OpenSim.Servers" >
210 <HintPath>OpenSim.Servers.dll</HintPath> 82 <HintPath>OpenSim.Servers.dll</HintPath>
211 <Private>False</Private> 83 <Private>False</Private>
@@ -244,4 +116,3 @@
244 </PostBuildEvent> 116 </PostBuildEvent>
245 </PropertyGroup> 117 </PropertyGroup>
246</Project> 118</Project>
247>>>>>>> .r921
diff --git a/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.csproj.user b/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.csproj.user
index 1b6b14d..082d673 100644
--- a/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.csproj.user
+++ b/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.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/OpenGridServices.AssetServer/OpenGridServices.AssetServer.exe.build b/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.exe.build
index 0da1d34..700e32b 100644
--- a/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.exe.build
+++ b/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.exe.build
@@ -25,7 +25,6 @@
25 <include name="System.Xml.dll" /> 25 <include name="System.Xml.dll" />
26 <include name="../../bin/OpenSim.Framework.dll" /> 26 <include name="../../bin/OpenSim.Framework.dll" />
27 <include name="../../bin/OpenSim.Framework.Console.dll" /> 27 <include name="../../bin/OpenSim.Framework.Console.dll" />
28 <include name="../../bin/OpenSim.GridInterfaces.Local.dll" />
29 <include name="../../bin/OpenSim.Servers.dll" /> 28 <include name="../../bin/OpenSim.Servers.dll" />
30 <include name="../../bin/libsecondlife.dll" /> 29 <include name="../../bin/libsecondlife.dll" />
31 <include name="../../bin/Db4objects.Db4o.dll" /> 30 <include name="../../bin/Db4objects.Db4o.dll" />
diff --git a/OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.csproj.user b/OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.csproj.user
index 1b6b14d..082d673 100644
--- a/OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.csproj.user
+++ b/OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.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/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj.user b/OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj.user
index 1b6b14d..082d673 100644
--- a/OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj.user
+++ b/OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.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/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.csproj.user b/OpenGridServices/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.csproj.user
index 1b6b14d..082d673 100644
--- a/OpenGridServices/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.csproj.user
+++ b/OpenGridServices/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.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/ServiceManager/ServiceManager.csproj b/OpenGridServices/ServiceManager/ServiceManager.csproj
index 0b89633..54d31b2 100644
--- a/OpenGridServices/ServiceManager/ServiceManager.csproj
+++ b/OpenGridServices/ServiceManager/ServiceManager.csproj
@@ -1,107 +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>{E141F4EE-0000-0000-0000-000000000000}</ProjectGuid>
8 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
9 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
10 <ApplicationIcon>
11 </ApplicationIcon>
12 <AssemblyKeyContainerName>
13 </AssemblyKeyContainerName>
14 <AssemblyName>ServiceManager</AssemblyName>
15 <DefaultClientScript>JScript</DefaultClientScript>
16 <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
17 <DefaultTargetSchema>IE50</DefaultTargetSchema>
18 <DelaySign>false</DelaySign>
19 <OutputType>Exe</OutputType>
20 <AppDesignerFolder>
21 </AppDesignerFolder>
22 <RootNamespace>ServiceManager</RootNamespace>
23 <StartupObject>
24 </StartupObject>
25 <FileUpgradeFlags>
26 </FileUpgradeFlags>
27 </PropertyGroup>
28 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
29 <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
30 <BaseAddress>285212672</BaseAddress>
31 <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
32 <ConfigurationOverrideFile>
33 </ConfigurationOverrideFile>
34 <DefineConstants>TRACE;DEBUG</DefineConstants>
35 <DocumentationFile>
36 </DocumentationFile>
37 <DebugSymbols>True</DebugSymbols>
38 <FileAlignment>4096</FileAlignment>
39 <Optimize>False</Optimize>
40 <OutputPath>..\..\bin\</OutputPath>
41 <RegisterForComInterop>False</RegisterForComInterop>
42 <RemoveIntegerChecks>False</RemoveIntegerChecks>
43 <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
44 <WarningLevel>4</WarningLevel>
45 <NoWarn>
46 </NoWarn>
47 </PropertyGroup>
48 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
49 <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
50 <BaseAddress>285212672</BaseAddress>
51 <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
52 <ConfigurationOverrideFile>
53 </ConfigurationOverrideFile>
54 <DefineConstants>TRACE</DefineConstants>
55 <DocumentationFile>
56 </DocumentationFile>
57 <DebugSymbols>False</DebugSymbols>
58 <FileAlignment>4096</FileAlignment>
59 <Optimize>True</Optimize>
60 <OutputPath>..\..\bin\</OutputPath>
61 <RegisterForComInterop>False</RegisterForComInterop>
62 <RemoveIntegerChecks>False</RemoveIntegerChecks>
63 <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
64 <WarningLevel>4</WarningLevel>
65 <NoWarn>
66 </NoWarn>
67 </PropertyGroup>
68 <ItemGroup>
69 <Reference Include="System">
70 <HintPath>System.dll</HintPath>
71 <Private>False</Private>
72 </Reference>
73 <Reference Include="System.ServiceProcess">
74 <HintPath>System.ServiceProcess.dll</HintPath>
75 <Private>False</Private>
76 </Reference>
77 <Reference Include="System.Xml">
78 <HintPath>System.Xml.dll</HintPath>
79 <Private>False</Private>
80 </Reference>
81 <Reference Include="libsecondlife.dll">
82 <HintPath>..\..\bin\libsecondlife.dll</HintPath>
83 <Private>False</Private>
84 </Reference>
85 <Reference Include="OpenSim.GenericConfig.Xml">
86 <HintPath>OpenSim.GenericConfig.Xml.dll</HintPath>
87 <Private>False</Private>
88 </Reference>
89 </ItemGroup>
90 <ItemGroup>
91 </ItemGroup>
92 <ItemGroup>
93 <Compile Include="ServiceManager.cs">
94 <SubType>Component</SubType>
95 </Compile>
96 </ItemGroup>
97 <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
98 <PropertyGroup>
99 <PreBuildEvent>
100 </PreBuildEvent>
101 <PostBuildEvent>
102 </PostBuildEvent>
103 </PropertyGroup>
104</Project>=======
105<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> 1<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
106 <PropertyGroup> 2 <PropertyGroup>
107 <ProjectType>Local</ProjectType> 3 <ProjectType>Local</ProjectType>
@@ -174,18 +70,6 @@
174 <HintPath>System.Xml.dll</HintPath> 70 <HintPath>System.Xml.dll</HintPath>
175 <Private>False</Private> 71 <Private>False</Private>
176 </Reference> 72 </Reference>
177 <Reference Include="libsecondlife.dll" >
178 <HintPath>..\..\bin\libsecondlife.dll</HintPath>
179 <Private>False</Private>
180 </Reference>
181 <Reference Include="OpenSim.GenericConfig.Xml" >
182 <HintPath>OpenSim.GenericConfig.Xml.dll</HintPath>
183 <Private>False</Private>
184 </Reference>
185 <Reference Include="OpenSim.Framework.dll" >
186 <HintPath>..\..\bin\OpenSim.Framework.dll</HintPath>
187 <Private>False</Private>
188 </Reference>
189 </ItemGroup> 73 </ItemGroup>
190 <ItemGroup> 74 <ItemGroup>
191 </ItemGroup> 75 </ItemGroup>
@@ -202,4 +86,3 @@
202 </PostBuildEvent> 86 </PostBuildEvent>
203 </PropertyGroup> 87 </PropertyGroup>
204</Project> 88</Project>
205>>>>>>> .r921
diff --git a/OpenGridServices/ServiceManager/ServiceManager.csproj.user b/OpenGridServices/ServiceManager/ServiceManager.csproj.user
index 1b6b14d..082d673 100644
--- a/OpenGridServices/ServiceManager/ServiceManager.csproj.user
+++ b/OpenGridServices/ServiceManager/ServiceManager.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/ServiceManager/ServiceManager.exe.build b/OpenGridServices/ServiceManager/ServiceManager.exe.build
index 5e1dd72..163e086 100644
--- a/OpenGridServices/ServiceManager/ServiceManager.exe.build
+++ b/OpenGridServices/ServiceManager/ServiceManager.exe.build
@@ -21,9 +21,6 @@
21 <include name="System.dll" /> 21 <include name="System.dll" />
22 <include name="System.ServiceProcess.dll" /> 22 <include name="System.ServiceProcess.dll" />
23 <include name="System.Xml.dll" /> 23 <include name="System.Xml.dll" />
24 <include name="../../bin/libsecondlife.dll" />
25 <include name="../../bin/OpenSim.GenericConfig.Xml.dll" />
26 <include name="../../bin/OpenSim.Framework.dll" />
27 </references> 24 </references>
28 </csc> 25 </csc>
29 <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" /> 26 <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" />