diff options
author | Adam Frisby | 2007-06-05 13:18:44 +0000 |
---|---|---|
committer | Adam Frisby | 2007-06-05 13:18:44 +0000 |
commit | 75f9b25b41b5a80025e17808b5b2d9fe7295d54e (patch) | |
tree | cd96e948447cc9a030c7ce537d25da06ea40db5e /Common/OpenSim.Framework | |
parent | * "We are" message is now a status text message. (diff) | |
download | opensim-SC-75f9b25b41b5a80025e17808b5b2d9fe7295d54e.zip opensim-SC-75f9b25b41b5a80025e17808b5b2d9fe7295d54e.tar.gz opensim-SC-75f9b25b41b5a80025e17808b5b2d9fe7295d54e.tar.bz2 opensim-SC-75f9b25b41b5a80025e17808b5b2d9fe7295d54e.tar.xz |
* Fixed OGS build
* Converted to new console interfaces
* Fixed other minor issues which somehow snuck in
Diffstat (limited to 'Common/OpenSim.Framework')
-rw-r--r-- | Common/OpenSim.Framework/OpenSim.Framework.csproj | 39 | ||||
-rw-r--r-- | Common/OpenSim.Framework/OpenSim.Framework.dll.build | 1 |
2 files changed, 18 insertions, 22 deletions
diff --git a/Common/OpenSim.Framework/OpenSim.Framework.csproj b/Common/OpenSim.Framework/OpenSim.Framework.csproj index 38245f7..89802d5 100644 --- a/Common/OpenSim.Framework/OpenSim.Framework.csproj +++ b/Common/OpenSim.Framework/OpenSim.Framework.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>{8ACA2445-0000-0000-0000-000000000000}</ProjectGuid> | 6 | <ProjectGuid>{8ACA2445-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.Framework</AssemblyName> | 12 | <AssemblyName>OpenSim.Framework</AssemblyName> |
@@ -16,11 +15,9 @@ | |||
16 | <DefaultTargetSchema>IE50</DefaultTargetSchema> | 15 | <DefaultTargetSchema>IE50</DefaultTargetSchema> |
17 | <DelaySign>false</DelaySign> | 16 | <DelaySign>false</DelaySign> |
18 | <OutputType>Library</OutputType> | 17 | <OutputType>Library</OutputType> |
19 | <AppDesignerFolder> | 18 | <AppDesignerFolder></AppDesignerFolder> |
20 | </AppDesignerFolder> | ||
21 | <RootNamespace>OpenSim.Framework</RootNamespace> | 19 | <RootNamespace>OpenSim.Framework</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,23 +55,22 @@ | |||
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="System"> | 61 | <Reference Include="System" > |
69 | <HintPath>System.dll</HintPath> | 62 | <HintPath>System.dll</HintPath> |
70 | <Private>False</Private> | 63 | <Private>False</Private> |
71 | </Reference> | 64 | </Reference> |
72 | <Reference Include="System.Xml"> | 65 | <Reference Include="System.Xml" > |
73 | <HintPath>System.Xml.dll</HintPath> | 66 | <HintPath>System.Xml.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="Db4objects.Db4o.dll"> | 73 | <Reference Include="Db4objects.Db4o.dll" > |
81 | <HintPath>..\..\bin\Db4objects.Db4o.dll</HintPath> | 74 | <HintPath>..\..\bin\Db4objects.Db4o.dll</HintPath> |
82 | <Private>False</Private> | 75 | <Private>False</Private> |
83 | </Reference> | 76 | </Reference> |
@@ -87,7 +80,7 @@ | |||
87 | <Name>XMLRPC</Name> | 80 | <Name>XMLRPC</Name> |
88 | <Project>{8E81D43C-0000-0000-0000-000000000000}</Project> | 81 | <Project>{8E81D43C-0000-0000-0000-000000000000}</Project> |
89 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 82 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
90 | <Private>False</Private> | 83 | <Private>False</Private> |
91 | </ProjectReference> | 84 | </ProjectReference> |
92 | </ItemGroup> | 85 | </ItemGroup> |
93 | <ItemGroup> | 86 | <ItemGroup> |
@@ -112,7 +105,6 @@ | |||
112 | <Compile Include="SimProfileBase.cs"> | 105 | <Compile Include="SimProfileBase.cs"> |
113 | <SubType>Code</SubType> | 106 | <SubType>Code</SubType> |
114 | </Compile> | 107 | </Compile> |
115 | <Compile Include="Types\ParcelData.cs" /> | ||
116 | <Compile Include="UserProfile.cs"> | 108 | <Compile Include="UserProfile.cs"> |
117 | <SubType>Code</SubType> | 109 | <SubType>Code</SubType> |
118 | </Compile> | 110 | </Compile> |
@@ -188,6 +180,9 @@ | |||
188 | <Compile Include="Types\OSVector3.cs"> | 180 | <Compile Include="Types\OSVector3.cs"> |
189 | <SubType>Code</SubType> | 181 | <SubType>Code</SubType> |
190 | </Compile> | 182 | </Compile> |
183 | <Compile Include="Types\ParcelData.cs"> | ||
184 | <SubType>Code</SubType> | ||
185 | </Compile> | ||
191 | <Compile Include="Types\PrimData.cs"> | 186 | <Compile Include="Types\PrimData.cs"> |
192 | <SubType>Code</SubType> | 187 | <SubType>Code</SubType> |
193 | </Compile> | 188 | </Compile> |
@@ -199,4 +194,4 @@ | |||
199 | <PostBuildEvent> | 194 | <PostBuildEvent> |
200 | </PostBuildEvent> | 195 | </PostBuildEvent> |
201 | </PropertyGroup> | 196 | </PropertyGroup> |
202 | </Project> \ No newline at end of file | 197 | </Project> |
diff --git a/Common/OpenSim.Framework/OpenSim.Framework.dll.build b/Common/OpenSim.Framework/OpenSim.Framework.dll.build index 34be1c8..4f58ae1 100644 --- a/Common/OpenSim.Framework/OpenSim.Framework.dll.build +++ b/Common/OpenSim.Framework/OpenSim.Framework.dll.build | |||
@@ -43,6 +43,7 @@ | |||
43 | <include name="Types/Login.cs" /> | 43 | <include name="Types/Login.cs" /> |
44 | <include name="Types/NeighbourInfo.cs" /> | 44 | <include name="Types/NeighbourInfo.cs" /> |
45 | <include name="Types/OSVector3.cs" /> | 45 | <include name="Types/OSVector3.cs" /> |
46 | <include name="Types/ParcelData.cs" /> | ||
46 | <include name="Types/PrimData.cs" /> | 47 | <include name="Types/PrimData.cs" /> |
47 | </sources> | 48 | </sources> |
48 | <references basedir="${project::get-base-directory()}"> | 49 | <references basedir="${project::get-base-directory()}"> |