diff options
author | gareth | 2007-03-22 10:11:15 +0000 |
---|---|---|
committer | gareth | 2007-03-22 10:11:15 +0000 |
commit | 7daa3955bc3a1918e40962851f9e8d38597a245e (patch) | |
tree | bee3e1372a7eed0c1b220a8a49f7bee7d29a6b91 /OGS/userserver/src/OGS-UserServer.csproj | |
parent | Load XML for neighbourinfo from grid (diff) | |
download | opensim-SC-7daa3955bc3a1918e40962851f9e8d38597a245e.zip opensim-SC-7daa3955bc3a1918e40962851f9e8d38597a245e.tar.gz opensim-SC-7daa3955bc3a1918e40962851f9e8d38597a245e.tar.bz2 opensim-SC-7daa3955bc3a1918e40962851f9e8d38597a245e.tar.xz |
brought zircon branch into trunk
Diffstat (limited to '')
-rw-r--r-- | OGS/userserver/src/OGS-UserServer.csproj (renamed from ogs/userserver/src/OGS-UserServer.csproj) | 13 | ||||
-rw-r--r-- | OGS/userserver/src/OGS-UserServer.csproj.user (renamed from ogs/userserver/src/OGS-UserServer.csproj.user) | 8 |
2 files changed, 4 insertions, 17 deletions
diff --git a/ogs/userserver/src/OGS-UserServer.csproj b/OGS/userserver/src/OGS-UserServer.csproj index f6737c8..f4fa8b6 100644 --- a/ogs/userserver/src/OGS-UserServer.csproj +++ b/OGS/userserver/src/OGS-UserServer.csproj | |||
@@ -48,21 +48,16 @@ | |||
48 | <Compile Include="Main.cs" /> | 48 | <Compile Include="Main.cs" /> |
49 | <Compile Include="Properties\AssemblyInfo.cs" /> | 49 | <Compile Include="Properties\AssemblyInfo.cs" /> |
50 | <Compile Include="UserHttp.cs" /> | 50 | <Compile Include="UserHttp.cs" /> |
51 | <Compile Include="UserProfiles.cs" /> | ||
52 | <Compile Include="Util.cs" /> | ||
53 | </ItemGroup> | 51 | </ItemGroup> |
54 | <ItemGroup> | 52 | <ItemGroup> |
53 | <ProjectReference Include="..\..\..\OpenSim.FrameWork\OpenSim.Framework.csproj"> | ||
54 | <Project>{2E46A825-3168-492F-93BC-637126B5B72B}</Project> | ||
55 | <Name>OpenSim.Framework</Name> | ||
56 | </ProjectReference> | ||
55 | <ProjectReference Include="..\..\ServerConsole\ServerConsole.csproj"> | 57 | <ProjectReference Include="..\..\ServerConsole\ServerConsole.csproj"> |
56 | <Project>{7667E6E2-F227-41A2-B1B2-315613E1BAFC}</Project> | 58 | <Project>{7667E6E2-F227-41A2-B1B2-315613E1BAFC}</Project> |
57 | <Name>ServerConsole</Name> | 59 | <Name>ServerConsole</Name> |
58 | </ProjectReference> | 60 | </ProjectReference> |
59 | </ItemGroup> | 61 | </ItemGroup> |
60 | <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> | 62 | <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> |
61 | <!-- To modify your build process, add your task inside one of the targets below and uncomment it. | ||
62 | Other similar extension points exist, see Microsoft.Common.targets. | ||
63 | <Target Name="BeforeBuild"> | ||
64 | </Target> | ||
65 | <Target Name="AfterBuild"> | ||
66 | </Target> | ||
67 | --> | ||
68 | </Project> \ No newline at end of file | 63 | </Project> \ No newline at end of file |
diff --git a/ogs/userserver/src/OGS-UserServer.csproj.user b/OGS/userserver/src/OGS-UserServer.csproj.user index 9c0b2d9..aa75a3d 100644 --- a/ogs/userserver/src/OGS-UserServer.csproj.user +++ b/OGS/userserver/src/OGS-UserServer.csproj.user | |||
@@ -1,14 +1,6 @@ | |||
1 | <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | 1 | <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
2 | <PropertyGroup> | 2 | <PropertyGroup> |
3 | <PublishUrlHistory>publish\</PublishUrlHistory> | 3 | <PublishUrlHistory>publish\</PublishUrlHistory> |
4 | <InstallUrlHistory> | ||
5 | </InstallUrlHistory> | ||
6 | <SupportUrlHistory> | ||
7 | </SupportUrlHistory> | ||
8 | <UpdateUrlHistory> | ||
9 | </UpdateUrlHistory> | ||
10 | <BootstrapperUrlHistory> | ||
11 | </BootstrapperUrlHistory> | ||
12 | <ApplicationRevision>0</ApplicationRevision> | 4 | <ApplicationRevision>0</ApplicationRevision> |
13 | <FallbackCulture>en-US</FallbackCulture> | 5 | <FallbackCulture>en-US</FallbackCulture> |
14 | <VerifyUploadedFiles>false</VerifyUploadedFiles> | 6 | <VerifyUploadedFiles>false</VerifyUploadedFiles> |