diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Application/OpenSim.csproj | 75 | ||||
-rw-r--r-- | OpenSim/Region/Application/OpenSim.csproj.user | 13 |
2 files changed, 36 insertions, 52 deletions
diff --git a/OpenSim/Region/Application/OpenSim.csproj b/OpenSim/Region/Application/OpenSim.csproj index fcde555..d5730a4 100644 --- a/OpenSim/Region/Application/OpenSim.csproj +++ b/OpenSim/Region/Application/OpenSim.csproj | |||
@@ -1,4 +1,4 @@ | |||
1 | <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | 1 | <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
2 | <PropertyGroup> | 2 | <PropertyGroup> |
3 | <ProjectType>Local</ProjectType> | 3 | <ProjectType>Local</ProjectType> |
4 | <ProductVersion>8.0.50727</ProductVersion> | 4 | <ProductVersion>8.0.50727</ProductVersion> |
@@ -6,8 +6,7 @@ | |||
6 | <ProjectGuid>{438A9556-0000-0000-0000-000000000000}</ProjectGuid> | 6 | <ProjectGuid>{438A9556-0000-0000-0000-000000000000}</ProjectGuid> |
7 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | 7 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> |
8 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> | 8 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> |
9 | <ApplicationIcon> | 9 | <ApplicationIcon></ApplicationIcon> |
10 | </ApplicationIcon> | ||
11 | <AssemblyKeyContainerName> | 10 | <AssemblyKeyContainerName> |
12 | </AssemblyKeyContainerName> | 11 | </AssemblyKeyContainerName> |
13 | <AssemblyName>OpenSim</AssemblyName> | 12 | <AssemblyName>OpenSim</AssemblyName> |
@@ -16,11 +15,9 @@ | |||
16 | <DefaultTargetSchema>IE50</DefaultTargetSchema> | 15 | <DefaultTargetSchema>IE50</DefaultTargetSchema> |
17 | <DelaySign>false</DelaySign> | 16 | <DelaySign>false</DelaySign> |
18 | <OutputType>Exe</OutputType> | 17 | <OutputType>Exe</OutputType> |
19 | <AppDesignerFolder> | 18 | <AppDesignerFolder></AppDesignerFolder> |
20 | </AppDesignerFolder> | ||
21 | <RootNamespace>OpenSim</RootNamespace> | 19 | <RootNamespace>OpenSim</RootNamespace> |
22 | <StartupObject> | 20 | <StartupObject></StartupObject> |
23 | </StartupObject> | ||
24 | <FileUpgradeFlags> | 21 | <FileUpgradeFlags> |
25 | </FileUpgradeFlags> | 22 | </FileUpgradeFlags> |
26 | </PropertyGroup> | 23 | </PropertyGroup> |
@@ -31,8 +28,7 @@ | |||
31 | <ConfigurationOverrideFile> | 28 | <ConfigurationOverrideFile> |
32 | </ConfigurationOverrideFile> | 29 | </ConfigurationOverrideFile> |
33 | <DefineConstants>TRACE;DEBUG</DefineConstants> | 30 | <DefineConstants>TRACE;DEBUG</DefineConstants> |
34 | <DocumentationFile> | 31 | <DocumentationFile></DocumentationFile> |
35 | </DocumentationFile> | ||
36 | <DebugSymbols>True</DebugSymbols> | 32 | <DebugSymbols>True</DebugSymbols> |
37 | <FileAlignment>4096</FileAlignment> | 33 | <FileAlignment>4096</FileAlignment> |
38 | <Optimize>False</Optimize> | 34 | <Optimize>False</Optimize> |
@@ -41,8 +37,7 @@ | |||
41 | <RemoveIntegerChecks>False</RemoveIntegerChecks> | 37 | <RemoveIntegerChecks>False</RemoveIntegerChecks> |
42 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> | 38 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> |
43 | <WarningLevel>4</WarningLevel> | 39 | <WarningLevel>4</WarningLevel> |
44 | <NoWarn> | 40 | <NoWarn></NoWarn> |
45 | </NoWarn> | ||
46 | </PropertyGroup> | 41 | </PropertyGroup> |
47 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> | 42 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> |
48 | <AllowUnsafeBlocks>False</AllowUnsafeBlocks> | 43 | <AllowUnsafeBlocks>False</AllowUnsafeBlocks> |
@@ -51,8 +46,7 @@ | |||
51 | <ConfigurationOverrideFile> | 46 | <ConfigurationOverrideFile> |
52 | </ConfigurationOverrideFile> | 47 | </ConfigurationOverrideFile> |
53 | <DefineConstants>TRACE</DefineConstants> | 48 | <DefineConstants>TRACE</DefineConstants> |
54 | <DocumentationFile> | 49 | <DocumentationFile></DocumentationFile> |
55 | </DocumentationFile> | ||
56 | <DebugSymbols>False</DebugSymbols> | 50 | <DebugSymbols>False</DebugSymbols> |
57 | <FileAlignment>4096</FileAlignment> | 51 | <FileAlignment>4096</FileAlignment> |
58 | <Optimize>True</Optimize> | 52 | <Optimize>True</Optimize> |
@@ -61,31 +55,30 @@ | |||
61 | <RemoveIntegerChecks>False</RemoveIntegerChecks> | 55 | <RemoveIntegerChecks>False</RemoveIntegerChecks> |
62 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> | 56 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> |
63 | <WarningLevel>4</WarningLevel> | 57 | <WarningLevel>4</WarningLevel> |
64 | <NoWarn> | 58 | <NoWarn></NoWarn> |
65 | </NoWarn> | ||
66 | </PropertyGroup> | 59 | </PropertyGroup> |
67 | <ItemGroup> | 60 | <ItemGroup> |
68 | <Reference Include="Axiom.MathLib.dll"> | 61 | <Reference Include="Axiom.MathLib.dll" > |
69 | <HintPath>..\..\..\bin\Axiom.MathLib.dll</HintPath> | 62 | <HintPath>..\..\..\bin\Axiom.MathLib.dll</HintPath> |
70 | <Private>False</Private> | 63 | <Private>False</Private> |
71 | </Reference> | 64 | </Reference> |
72 | <Reference Include="Db4objects.Db4o.dll"> | 65 | <Reference Include="Db4objects.Db4o.dll" > |
73 | <HintPath>..\..\..\bin\Db4objects.Db4o.dll</HintPath> | 66 | <HintPath>..\..\..\bin\Db4objects.Db4o.dll</HintPath> |
74 | <Private>False</Private> | 67 | <Private>False</Private> |
75 | </Reference> | 68 | </Reference> |
76 | <Reference Include="libsecondlife.dll"> | 69 | <Reference Include="libsecondlife.dll" > |
77 | <HintPath>..\..\..\bin\libsecondlife.dll</HintPath> | 70 | <HintPath>..\..\..\bin\libsecondlife.dll</HintPath> |
78 | <Private>False</Private> | 71 | <Private>False</Private> |
79 | </Reference> | 72 | </Reference> |
80 | <Reference Include="System"> | 73 | <Reference Include="System" > |
81 | <HintPath>System.dll</HintPath> | 74 | <HintPath>System.dll</HintPath> |
82 | <Private>False</Private> | 75 | <Private>False</Private> |
83 | </Reference> | 76 | </Reference> |
84 | <Reference Include="System.Xml"> | 77 | <Reference Include="System.Xml" > |
85 | <HintPath>System.Xml.dll</HintPath> | 78 | <HintPath>System.Xml.dll</HintPath> |
86 | <Private>False</Private> | 79 | <Private>False</Private> |
87 | </Reference> | 80 | </Reference> |
88 | <Reference Include="XMLRPC.dll"> | 81 | <Reference Include="XMLRPC.dll" > |
89 | <HintPath>..\..\..\bin\XMLRPC.dll</HintPath> | 82 | <HintPath>..\..\..\bin\XMLRPC.dll</HintPath> |
90 | <Private>False</Private> | 83 | <Private>False</Private> |
91 | </Reference> | 84 | </Reference> |
@@ -95,82 +88,86 @@ | |||
95 | <Name>OpenSim.Framework</Name> | 88 | <Name>OpenSim.Framework</Name> |
96 | <Project>{8ACA2445-0000-0000-0000-000000000000}</Project> | 89 | <Project>{8ACA2445-0000-0000-0000-000000000000}</Project> |
97 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 90 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
98 | <Private>False</Private> | 91 | <Private>False</Private> |
99 | </ProjectReference> | 92 | </ProjectReference> |
100 | <ProjectReference Include="..\..\Framework\Communications\OpenSim.Framework.Communications.csproj"> | 93 | <ProjectReference Include="..\..\Framework\Communications\OpenSim.Framework.Communications.csproj"> |
101 | <Name>OpenSim.Framework.Communications</Name> | 94 | <Name>OpenSim.Framework.Communications</Name> |
102 | <Project>{CB52B7E7-0000-0000-0000-000000000000}</Project> | 95 | <Project>{CB52B7E7-0000-0000-0000-000000000000}</Project> |
103 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 96 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
104 | <Private>False</Private> | 97 | <Private>False</Private> |
105 | </ProjectReference> | 98 | </ProjectReference> |
106 | <ProjectReference Include="..\..\Framework\Console\OpenSim.Framework.Console.csproj"> | 99 | <ProjectReference Include="..\..\Framework\Console\OpenSim.Framework.Console.csproj"> |
107 | <Name>OpenSim.Framework.Console</Name> | 100 | <Name>OpenSim.Framework.Console</Name> |
108 | <Project>{A7CD0630-0000-0000-0000-000000000000}</Project> | 101 | <Project>{A7CD0630-0000-0000-0000-000000000000}</Project> |
109 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 102 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
110 | <Private>False</Private> | 103 | <Private>False</Private> |
111 | </ProjectReference> | 104 | </ProjectReference> |
112 | <ProjectReference Include="..\..\Framework\GenericConfig\Xml\OpenSim.Framework.GenericConfig.Xml.csproj"> | 105 | <ProjectReference Include="..\..\Framework\GenericConfig\Xml\OpenSim.Framework.GenericConfig.Xml.csproj"> |
113 | <Name>OpenSim.Framework.GenericConfig.Xml</Name> | 106 | <Name>OpenSim.Framework.GenericConfig.Xml</Name> |
114 | <Project>{C74E4A30-0000-0000-0000-000000000000}</Project> | 107 | <Project>{C74E4A30-0000-0000-0000-000000000000}</Project> |
115 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 108 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
116 | <Private>False</Private> | 109 | <Private>False</Private> |
117 | </ProjectReference> | 110 | </ProjectReference> |
118 | <ProjectReference Include="..\..\Framework\Servers\OpenSim.Framework.Servers.csproj"> | 111 | <ProjectReference Include="..\..\Framework\Servers\OpenSim.Framework.Servers.csproj"> |
119 | <Name>OpenSim.Framework.Servers</Name> | 112 | <Name>OpenSim.Framework.Servers</Name> |
120 | <Project>{2CC71860-0000-0000-0000-000000000000}</Project> | 113 | <Project>{2CC71860-0000-0000-0000-000000000000}</Project> |
121 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 114 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
122 | <Private>False</Private> | 115 | <Private>False</Private> |
123 | </ProjectReference> | 116 | </ProjectReference> |
124 | <ProjectReference Include="..\..\Framework\UserManager\OpenSim.Framework.UserManagement.csproj"> | 117 | <ProjectReference Include="..\..\Framework\UserManager\OpenSim.Framework.UserManagement.csproj"> |
125 | <Name>OpenSim.Framework.UserManagement</Name> | 118 | <Name>OpenSim.Framework.UserManagement</Name> |
126 | <Project>{586E2916-0000-0000-0000-000000000000}</Project> | 119 | <Project>{586E2916-0000-0000-0000-000000000000}</Project> |
127 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 120 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
128 | <Private>False</Private> | 121 | <Private>False</Private> |
129 | </ProjectReference> | 122 | </ProjectReference> |
130 | <ProjectReference Include="..\Caches\OpenSim.Region.Caches.csproj"> | 123 | <ProjectReference Include="..\Caches\OpenSim.Region.Caches.csproj"> |
131 | <Name>OpenSim.Region.Caches</Name> | 124 | <Name>OpenSim.Region.Caches</Name> |
132 | <Project>{61FCCDB3-0000-0000-0000-000000000000}</Project> | 125 | <Project>{61FCCDB3-0000-0000-0000-000000000000}</Project> |
133 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 126 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
134 | <Private>False</Private> | 127 | <Private>False</Private> |
135 | </ProjectReference> | 128 | </ProjectReference> |
136 | <ProjectReference Include="..\ClientStack\OpenSim.Region.ClientStack.csproj"> | 129 | <ProjectReference Include="..\ClientStack\OpenSim.Region.ClientStack.csproj"> |
137 | <Name>OpenSim.Region.ClientStack</Name> | 130 | <Name>OpenSim.Region.ClientStack</Name> |
138 | <Project>{DC3698B2-0000-0000-0000-000000000000}</Project> | 131 | <Project>{DC3698B2-0000-0000-0000-000000000000}</Project> |
139 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 132 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
140 | <Private>False</Private> | 133 | <Private>False</Private> |
141 | </ProjectReference> | 134 | </ProjectReference> |
142 | <ProjectReference Include="..\Communications\Local\OpenSim.Region.Communications.Local.csproj"> | 135 | <ProjectReference Include="..\Communications\Local\OpenSim.Region.Communications.Local.csproj"> |
143 | <Project>{EB3A1BA8-0000-0000-0000-000000000000}</Project> | ||
144 | <Name>OpenSim.Region.Communications.Local</Name> | 136 | <Name>OpenSim.Region.Communications.Local</Name> |
137 | <Project>{BFB5D807-0000-0000-0000-000000000000}</Project> | ||
138 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | ||
139 | <Private>False</Private> | ||
145 | </ProjectReference> | 140 | </ProjectReference> |
146 | <ProjectReference Include="..\Communications\OGS1\OpenSim.Region.Communications.OGS1.csproj"> | 141 | <ProjectReference Include="..\Communications\OGS1\OpenSim.Region.Communications.OGS1.csproj"> |
147 | <Project>{6109024D-0000-0000-0000-000000000000}</Project> | ||
148 | <Name>OpenSim.Region.Communications.OGS1</Name> | 142 | <Name>OpenSim.Region.Communications.OGS1</Name> |
143 | <Project>{4806E378-0000-0000-0000-000000000000}</Project> | ||
144 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | ||
145 | <Private>False</Private> | ||
149 | </ProjectReference> | 146 | </ProjectReference> |
150 | <ProjectReference Include="..\Physics\Manager\OpenSim.Region.Physics.Manager.csproj"> | 147 | <ProjectReference Include="..\Physics\Manager\OpenSim.Region.Physics.Manager.csproj"> |
151 | <Name>OpenSim.Region.Physics.Manager</Name> | 148 | <Name>OpenSim.Region.Physics.Manager</Name> |
152 | <Project>{F4FF31EB-0000-0000-0000-000000000000}</Project> | 149 | <Project>{F4FF31EB-0000-0000-0000-000000000000}</Project> |
153 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 150 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
154 | <Private>False</Private> | 151 | <Private>False</Private> |
155 | </ProjectReference> | 152 | </ProjectReference> |
156 | <ProjectReference Include="..\Simulation\OpenSim.Region.Environment.csproj"> | 153 | <ProjectReference Include="..\Simulation\OpenSim.Region.Simulation.csproj"> |
157 | <Name>OpenSim.Region.Environment</Name> | 154 | <Name>OpenSim.Region.Simulation</Name> |
158 | <Project>{C0DAB338-0000-0000-0000-000000000000}</Project> | 155 | <Project>{C0DAB338-0000-0000-0000-000000000000}</Project> |
159 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 156 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
160 | <Private>False</Private> | 157 | <Private>False</Private> |
161 | </ProjectReference> | 158 | </ProjectReference> |
162 | <ProjectReference Include="..\Terrain.BasicTerrain\OpenSim.Region.Terrain.BasicTerrain.csproj"> | 159 | <ProjectReference Include="..\Terrain.BasicTerrain\OpenSim.Region.Terrain.BasicTerrain.csproj"> |
163 | <Name>OpenSim.Region.Terrain.BasicTerrain</Name> | 160 | <Name>OpenSim.Region.Terrain.BasicTerrain</Name> |
164 | <Project>{C9E0F891-0000-0000-0000-000000000000}</Project> | 161 | <Project>{C9E0F891-0000-0000-0000-000000000000}</Project> |
165 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 162 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
166 | <Private>False</Private> | 163 | <Private>False</Private> |
167 | </ProjectReference> | 164 | </ProjectReference> |
168 | </ItemGroup> | 165 | </ItemGroup> |
169 | <ItemGroup> | 166 | <ItemGroup> |
170 | <Compile Include="Application.cs"> | 167 | <Compile Include="OpenSimMain.cs"> |
171 | <SubType>Code</SubType> | 168 | <SubType>Code</SubType> |
172 | </Compile> | 169 | </Compile> |
173 | <Compile Include="OpenSimMain.cs"> | 170 | <Compile Include="Application.cs"> |
174 | <SubType>Code</SubType> | 171 | <SubType>Code</SubType> |
175 | </Compile> | 172 | </Compile> |
176 | </ItemGroup> | 173 | </ItemGroup> |
@@ -181,4 +178,4 @@ | |||
181 | <PostBuildEvent> | 178 | <PostBuildEvent> |
182 | </PostBuildEvent> | 179 | </PostBuildEvent> |
183 | </PropertyGroup> | 180 | </PropertyGroup> |
184 | </Project> \ No newline at end of file | 181 | </Project> |
diff --git a/OpenSim/Region/Application/OpenSim.csproj.user b/OpenSim/Region/Application/OpenSim.csproj.user deleted file mode 100644 index 2ff1c4c..0000000 --- a/OpenSim/Region/Application/OpenSim.csproj.user +++ /dev/null | |||
@@ -1,13 +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 | <StartArguments>-loginserver -sandbox -accounts</StartArguments> | ||
6 | <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-06\NameSpaceChanges\bin\</ReferencePath> | ||
7 | <LastOpenVersion>8.0.50727</LastOpenVersion> | ||
8 | <ProjectView>ProjectFiles</ProjectView> | ||
9 | <ProjectTrust>0</ProjectTrust> | ||
10 | </PropertyGroup> | ||
11 | <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " /> | ||
12 | <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " /> | ||
13 | </Project> | ||