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/ServiceManager/ServiceManager.csproj | |
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 '')
-rw-r--r-- | OpenGridServices/ServiceManager/ServiceManager.csproj | 117 | ||||
-rw-r--r-- | OpenGridServices/ServiceManager/ServiceManager.csproj.user | 2 |
2 files changed, 1 insertions, 118 deletions
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> |