aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid/AssetServer
diff options
context:
space:
mode:
authormingchen2007-06-27 17:12:32 +0000
committermingchen2007-06-27 17:12:32 +0000
commitfe120533efd0ec6b2248d96b9a1f8b7637c5dadd (patch)
tree2da9d7a0b0cce8caae8a49d40bc274506d36f6d3 /OpenSim/Grid/AssetServer
parent*Ran prebuild (diff)
downloadopensim-SC-fe120533efd0ec6b2248d96b9a1f8b7637c5dadd.zip
opensim-SC-fe120533efd0ec6b2248d96b9a1f8b7637c5dadd.tar.gz
opensim-SC-fe120533efd0ec6b2248d96b9a1f8b7637c5dadd.tar.bz2
opensim-SC-fe120533efd0ec6b2248d96b9a1f8b7637c5dadd.tar.xz
*Updated prebuild.xml and ran prebuild again
*Removed .user, .suo, and unneccessary files in /bin/Physics/ *OpenSim.sln should compile with nant and on windows now
Diffstat (limited to 'OpenSim/Grid/AssetServer')
-rw-r--r--OpenSim/Grid/AssetServer/OpenSim.Grid.AssetServer.csproj4
-rw-r--r--OpenSim/Grid/AssetServer/OpenSim.Grid.AssetServer.csproj.user12
2 files changed, 2 insertions, 14 deletions
diff --git a/OpenSim/Grid/AssetServer/OpenSim.Grid.AssetServer.csproj b/OpenSim/Grid/AssetServer/OpenSim.Grid.AssetServer.csproj
index caebca3..945b7a5 100644
--- a/OpenSim/Grid/AssetServer/OpenSim.Grid.AssetServer.csproj
+++ b/OpenSim/Grid/AssetServer/OpenSim.Grid.AssetServer.csproj
@@ -98,10 +98,10 @@
98 <ItemGroup> 98 <ItemGroup>
99 </ItemGroup> 99 </ItemGroup>
100 <ItemGroup> 100 <ItemGroup>
101 <Compile Include="AssetHttpServer.cs"> 101 <Compile Include="Main.cs">
102 <SubType>Code</SubType> 102 <SubType>Code</SubType>
103 </Compile> 103 </Compile>
104 <Compile Include="Main.cs"> 104 <Compile Include="AssetHttpServer.cs">
105 <SubType>Code</SubType> 105 <SubType>Code</SubType>
106 </Compile> 106 </Compile>
107 <Compile Include="Properties\AssemblyInfo.cs"> 107 <Compile Include="Properties\AssemblyInfo.cs">
diff --git a/OpenSim/Grid/AssetServer/OpenSim.Grid.AssetServer.csproj.user b/OpenSim/Grid/AssetServer/OpenSim.Grid.AssetServer.csproj.user
deleted file mode 100644
index 6841907..0000000
--- a/OpenSim/Grid/AssetServer/OpenSim.Grid.AssetServer.csproj.user
+++ /dev/null
@@ -1,12 +0,0 @@
1<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2 <PropertyGroup>
3 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
4 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
5 <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-06\NameSpaceChanges\bin\</ReferencePath>
6 <LastOpenVersion>8.0.50727</LastOpenVersion>
7 <ProjectView>ProjectFiles</ProjectView>
8 <ProjectTrust>0</ProjectTrust>
9 </PropertyGroup>
10 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
11 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
12</Project>