diff options
*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/OpenGridServices.AssetServer/OpenGridServices.AssetServer.csproj')
-rw-r--r-- | OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.csproj | 129 |
1 files changed, 0 insertions, 129 deletions
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 | ||