aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/OpenSim.csproj294
-rw-r--r--OpenSim/OpenSim.exe.build104
-rw-r--r--OpenSim/OpenSimMain.cs5
3 files changed, 203 insertions, 200 deletions
diff --git a/OpenSim/OpenSim.csproj b/OpenSim/OpenSim.csproj
index 1c7b808..4456fc7 100644
--- a/OpenSim/OpenSim.csproj
+++ b/OpenSim/OpenSim.csproj
@@ -1,147 +1,147 @@
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>
5 <SchemaVersion>2.0</SchemaVersion> 5 <SchemaVersion>2.0</SchemaVersion>
6 <ProjectGuid>{17ED9A0D-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></ApplicationIcon> 9 <ApplicationIcon></ApplicationIcon>
10 <AssemblyKeyContainerName> 10 <AssemblyKeyContainerName>
11 </AssemblyKeyContainerName> 11 </AssemblyKeyContainerName>
12 <AssemblyName>OpenSim</AssemblyName> 12 <AssemblyName>OpenSim</AssemblyName>
13 <DefaultClientScript>JScript</DefaultClientScript> 13 <DefaultClientScript>JScript</DefaultClientScript>
14 <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout> 14 <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
15 <DefaultTargetSchema>IE50</DefaultTargetSchema> 15 <DefaultTargetSchema>IE50</DefaultTargetSchema>
16 <DelaySign>false</DelaySign> 16 <DelaySign>false</DelaySign>
17 <OutputType>Exe</OutputType> 17 <OutputType>Exe</OutputType>
18 <AppDesignerFolder></AppDesignerFolder> 18 <AppDesignerFolder></AppDesignerFolder>
19 <RootNamespace>OpenSim</RootNamespace> 19 <RootNamespace>OpenSim</RootNamespace>
20 <StartupObject></StartupObject> 20 <StartupObject></StartupObject>
21 <FileUpgradeFlags> 21 <FileUpgradeFlags>
22 </FileUpgradeFlags> 22 </FileUpgradeFlags>
23 </PropertyGroup> 23 </PropertyGroup>
24 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> 24 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
25 <AllowUnsafeBlocks>False</AllowUnsafeBlocks> 25 <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
26 <BaseAddress>285212672</BaseAddress> 26 <BaseAddress>285212672</BaseAddress>
27 <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow> 27 <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
28 <ConfigurationOverrideFile> 28 <ConfigurationOverrideFile>
29 </ConfigurationOverrideFile> 29 </ConfigurationOverrideFile>
30 <DefineConstants>TRACE</DefineConstants> 30 <DefineConstants>TRACE;DEBUG</DefineConstants>
31 <DocumentationFile></DocumentationFile> 31 <DocumentationFile></DocumentationFile>
32 <DebugSymbols>False</DebugSymbols> 32 <DebugSymbols>True</DebugSymbols>
33 <FileAlignment>4096</FileAlignment> 33 <FileAlignment>4096</FileAlignment>
34 <Optimize>True</Optimize> 34 <Optimize>False</Optimize>
35 <OutputPath>../bin/</OutputPath> 35 <OutputPath>..\bin\</OutputPath>
36 <RegisterForComInterop>False</RegisterForComInterop> 36 <RegisterForComInterop>False</RegisterForComInterop>
37 <RemoveIntegerChecks>False</RemoveIntegerChecks> 37 <RemoveIntegerChecks>False</RemoveIntegerChecks>
38 <TreatWarningsAsErrors>False</TreatWarningsAsErrors> 38 <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
39 <WarningLevel>4</WarningLevel> 39 <WarningLevel>4</WarningLevel>
40 <NoWarn></NoWarn> 40 <NoWarn></NoWarn>
41 </PropertyGroup> 41 </PropertyGroup>
42 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> 42 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
43 <AllowUnsafeBlocks>False</AllowUnsafeBlocks> 43 <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
44 <BaseAddress>285212672</BaseAddress> 44 <BaseAddress>285212672</BaseAddress>
45 <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow> 45 <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
46 <ConfigurationOverrideFile> 46 <ConfigurationOverrideFile>
47 </ConfigurationOverrideFile> 47 </ConfigurationOverrideFile>
48 <DefineConstants>TRACE;DEBUG</DefineConstants> 48 <DefineConstants>TRACE</DefineConstants>
49 <DocumentationFile></DocumentationFile> 49 <DocumentationFile></DocumentationFile>
50 <DebugSymbols>True</DebugSymbols> 50 <DebugSymbols>False</DebugSymbols>
51 <FileAlignment>4096</FileAlignment> 51 <FileAlignment>4096</FileAlignment>
52 <Optimize>False</Optimize> 52 <Optimize>True</Optimize>
53 <OutputPath>../bin/</OutputPath> 53 <OutputPath>..\bin\</OutputPath>
54 <RegisterForComInterop>False</RegisterForComInterop> 54 <RegisterForComInterop>False</RegisterForComInterop>
55 <RemoveIntegerChecks>False</RemoveIntegerChecks> 55 <RemoveIntegerChecks>False</RemoveIntegerChecks>
56 <TreatWarningsAsErrors>False</TreatWarningsAsErrors> 56 <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
57 <WarningLevel>4</WarningLevel> 57 <WarningLevel>4</WarningLevel>
58 <NoWarn></NoWarn> 58 <NoWarn></NoWarn>
59 </PropertyGroup> 59 </PropertyGroup>
60 <ItemGroup> 60 <ItemGroup>
61 <Reference Include="System" > 61 <Reference Include="System" >
62 <HintPath>System.dll</HintPath> 62 <HintPath>System.dll</HintPath>
63 <Private>False</Private> 63 <Private>False</Private>
64 </Reference> 64 </Reference>
65 <Reference Include="System.Xml" > 65 <Reference Include="System.Xml" >
66 <HintPath>System.Xml.dll</HintPath> 66 <HintPath>System.Xml.dll</HintPath>
67 <Private>False</Private> 67 <Private>False</Private>
68 </Reference> 68 </Reference>
69 <Reference Include="libsecondlife.dll" > 69 <Reference Include="libsecondlife.dll" >
70 <HintPath>..\bin\libsecondlife.dll</HintPath> 70 <HintPath>..\bin\libsecondlife.dll</HintPath>
71 <Private>False</Private> 71 <Private>False</Private>
72 </Reference> 72 </Reference>
73 <Reference Include="Axiom.MathLib.dll" > 73 <Reference Include="Axiom.MathLib.dll" >
74 <HintPath>..\bin\Axiom.MathLib.dll</HintPath> 74 <HintPath>..\bin\Axiom.MathLib.dll</HintPath>
75 <Private>False</Private> 75 <Private>False</Private>
76 </Reference> 76 </Reference>
77 <Reference Include="Db4objects.Db4o.dll" > 77 <Reference Include="Db4objects.Db4o.dll" >
78 <HintPath>..\bin\Db4objects.Db4o.dll</HintPath> 78 <HintPath>..\bin\Db4objects.Db4o.dll</HintPath>
79 <Private>False</Private> 79 <Private>False</Private>
80 </Reference> 80 </Reference>
81 </ItemGroup> 81 </ItemGroup>
82 <ItemGroup> 82 <ItemGroup>
83 <ProjectReference Include="../OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.csproj"> 83 <ProjectReference Include="..\OpenSim.Terrain.BasicTerrain\OpenSim.Terrain.BasicTerrain.csproj">
84 <Name>OpenSim.Terrain.BasicTerrain</Name> 84 <Name>OpenSim.Terrain.BasicTerrain</Name>
85 <Project>{9CBFE2C1-0000-0000-0000-000000000000}</Project> 85 <Project>{2270B8FE-0000-0000-0000-000000000000}</Project>
86 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 86 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
87 <Private>False</Private> 87 <Private>False</Private>
88 </ProjectReference> 88 </ProjectReference>
89 <ProjectReference Include="../OpenSim.Framework/OpenSim.Framework.csproj"> 89 <ProjectReference Include="..\OpenSim.Framework\OpenSim.Framework.csproj">
90 <Name>OpenSim.Framework</Name> 90 <Name>OpenSim.Framework</Name>
91 <Project>{7404933D-0000-0000-0000-000000000000}</Project> 91 <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>
92 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 92 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
93 <Private>False</Private> 93 <Private>False</Private>
94 </ProjectReference> 94 </ProjectReference>
95 <ProjectReference Include="../OpenSim.Framework.Console/OpenSim.Framework.Console.csproj"> 95 <ProjectReference Include="..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj">
96 <Name>OpenSim.Framework.Console</Name> 96 <Name>OpenSim.Framework.Console</Name>
97 <Project>{16759386-0000-0000-0000-000000000000}</Project> 97 <Project>{A7CD0630-0000-0000-0000-000000000000}</Project>
98 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 98 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
99 <Private>False</Private> 99 <Private>False</Private>
100 </ProjectReference> 100 </ProjectReference>
101 <ProjectReference Include="../OpenSim.Physics/Manager/OpenSim.Physics.Manager.csproj"> 101 <ProjectReference Include="..\OpenSim.Physics\Manager\OpenSim.Physics.Manager.csproj">
102 <Name>OpenSim.Physics.Manager</Name> 102 <Name>OpenSim.Physics.Manager</Name>
103 <Project>{DA1FDCE5-0000-0000-0000-000000000000}</Project> 103 <Project>{8BE16150-0000-0000-0000-000000000000}</Project>
104 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 104 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
105 <Private>False</Private> 105 <Private>False</Private>
106 </ProjectReference> 106 </ProjectReference>
107 <ProjectReference Include="../OpenSim.Servers/OpenSim.Servers.csproj"> 107 <ProjectReference Include="..\OpenSim.Servers\OpenSim.Servers.csproj">
108 <Name>OpenSim.Servers</Name> 108 <Name>OpenSim.Servers</Name>
109 <Project>{111F9E8F-0000-0000-0000-000000000000}</Project> 109 <Project>{8BB20F0A-0000-0000-0000-000000000000}</Project>
110 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 110 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
111 <Private>False</Private> 111 <Private>False</Private>
112 </ProjectReference> 112 </ProjectReference>
113 <ProjectReference Include="../OpenSim.RegionServer/OpenSim.RegionServer.csproj"> 113 <ProjectReference Include="..\OpenSim.RegionServer\OpenSim.RegionServer.csproj">
114 <Name>OpenSim.RegionServer</Name> 114 <Name>OpenSim.RegionServer</Name>
115 <Project>{58019DB8-0000-0000-0000-000000000000}</Project> 115 <Project>{632E1BFD-0000-0000-0000-000000000000}</Project>
116 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 116 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
117 <Private>False</Private> 117 <Private>False</Private>
118 </ProjectReference> 118 </ProjectReference>
119 <ProjectReference Include="../OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.csproj"> 119 <ProjectReference Include="..\OpenSim.GenericConfig\Xml\OpenSim.GenericConfig.Xml.csproj">
120 <Name>OpenSim.GenericConfig.Xml</Name> 120 <Name>OpenSim.GenericConfig.Xml</Name>
121 <Project>{CAC10AC1-0000-0000-0000-000000000000}</Project> 121 <Project>{E88EF749-0000-0000-0000-000000000000}</Project>
122 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 122 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
123 <Private>False</Private> 123 <Private>False</Private>
124 </ProjectReference> 124 </ProjectReference>
125 <ProjectReference Include="../XmlRpcCS/XMLRPC.csproj"> 125 <ProjectReference Include="..\XmlRpcCS\XMLRPC.csproj">
126 <Name>XMLRPC</Name> 126 <Name>XMLRPC</Name>
127 <Project>{9A8B526E-0000-0000-0000-000000000000}</Project> 127 <Project>{8E81D43C-0000-0000-0000-000000000000}</Project>
128 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 128 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
129 <Private>False</Private> 129 <Private>False</Private>
130 </ProjectReference> 130 </ProjectReference>
131 </ItemGroup> 131 </ItemGroup>
132 <ItemGroup> 132 <ItemGroup>
133 <Compile Include="Application.cs"> 133 <Compile Include="Application.cs">
134 <SubType>Code</SubType> 134 <SubType>Code</SubType>
135 </Compile> 135 </Compile>
136 <Compile Include="OpenSimMain.cs"> 136 <Compile Include="OpenSimMain.cs">
137 <SubType>Code</SubType> 137 <SubType>Code</SubType>
138 </Compile> 138 </Compile>
139 </ItemGroup> 139 </ItemGroup>
140 <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" /> 140 <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
141 <PropertyGroup> 141 <PropertyGroup>
142 <PreBuildEvent> 142 <PreBuildEvent>
143 </PreBuildEvent> 143 </PreBuildEvent>
144 <PostBuildEvent> 144 <PostBuildEvent>
145 </PostBuildEvent> 145 </PostBuildEvent>
146 </PropertyGroup> 146 </PropertyGroup>
147</Project> 147</Project>
diff --git a/OpenSim/OpenSim.exe.build b/OpenSim/OpenSim.exe.build
index 9ee8bb1..19d0b28 100644
--- a/OpenSim/OpenSim.exe.build
+++ b/OpenSim/OpenSim.exe.build
@@ -1,52 +1,52 @@
1<?xml version="1.0" ?> 1<?xml version="1.0" ?>
2<project name="OpenSim" default="build"> 2<project name="OpenSim" default="build">
3 <target name="build"> 3 <target name="build">
4 <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> 4 <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
5 <mkdir dir="${project::get-base-directory()}/${build.dir}" /> 5 <mkdir dir="${project::get-base-directory()}/${build.dir}" />
6 <copy todir="${project::get-base-directory()}/${build.dir}"> 6 <copy todir="${project::get-base-directory()}/${build.dir}">
7 <fileset basedir="${project::get-base-directory()}"> 7 <fileset basedir="${project::get-base-directory()}">
8 </fileset> 8 </fileset>
9 </copy> 9 </copy>
10 <csc target="exe" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.exe"> 10 <csc target="exe" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.exe">
11 <resources prefix="OpenSim" dynamicprefix="true" > 11 <resources prefix="OpenSim" dynamicprefix="true" >
12 </resources> 12 </resources>
13 <sources failonempty="true"> 13 <sources failonempty="true">
14 <include name="Application.cs" /> 14 <include name="Application.cs" />
15 <include name="OpenSimMain.cs" /> 15 <include name="OpenSimMain.cs" />
16 </sources> 16 </sources>
17 <references basedir="${project::get-base-directory()}"> 17 <references basedir="${project::get-base-directory()}">
18 <lib> 18 <lib>
19 <include name="${project::get-base-directory()}" /> 19 <include name="${project::get-base-directory()}" />
20 <include name="${project::get-base-directory()}/${build.dir}" /> 20 <include name="${project::get-base-directory()}/${build.dir}" />
21 </lib> 21 </lib>
22 <include name="System.dll" /> 22 <include name="System.dll" />
23 <include name="System.Xml.dll" /> 23 <include name="System.Xml.dll" />
24 <include name="../bin/libsecondlife.dll" /> 24 <include name="../bin/libsecondlife.dll" />
25 <include name="../bin/Axiom.MathLib.dll" /> 25 <include name="../bin/Axiom.MathLib.dll" />
26 <include name="../bin/Db4objects.Db4o.dll" /> 26 <include name="../bin/Db4objects.Db4o.dll" />
27 <include name="../bin/OpenSim.Terrain.BasicTerrain.dll" /> 27 <include name="../bin/OpenSim.Terrain.BasicTerrain.dll" />
28 <include name="../bin/OpenSim.Framework.dll" /> 28 <include name="../bin/OpenSim.Framework.dll" />
29 <include name="../bin/OpenSim.Framework.Console.dll" /> 29 <include name="../bin/OpenSim.Framework.Console.dll" />
30 <include name="../bin/OpenSim.Physics.Manager.dll" /> 30 <include name="../bin/OpenSim.Physics.Manager.dll" />
31 <include name="../bin/OpenSim.Servers.dll" /> 31 <include name="../bin/OpenSim.Servers.dll" />
32 <include name="../bin/OpenSim.RegionServer.dll" /> 32 <include name="../bin/OpenSim.RegionServer.dll" />
33 <include name="../bin/OpenSim.GenericConfig.Xml.dll" /> 33 <include name="../bin/OpenSim.GenericConfig.Xml.dll" />
34 <include name="../bin/XMLRPC.dll" /> 34 <include name="../bin/XMLRPC.dll" />
35 </references> 35 </references>
36 </csc> 36 </csc>
37 <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" /> 37 <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" />
38 <mkdir dir="${project::get-base-directory()}/../bin/"/> 38 <mkdir dir="${project::get-base-directory()}/../bin/"/>
39 <copy todir="${project::get-base-directory()}/../bin/"> 39 <copy todir="${project::get-base-directory()}/../bin/">
40 <fileset basedir="${project::get-base-directory()}/${build.dir}/" > 40 <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
41 <include name="*.dll"/> 41 <include name="*.dll"/>
42 <include name="*.exe"/> 42 <include name="*.exe"/>
43 </fileset> 43 </fileset>
44 </copy> 44 </copy>
45 </target> 45 </target>
46 <target name="clean"> 46 <target name="clean">
47 <delete dir="${bin.dir}" failonerror="false" /> 47 <delete dir="${bin.dir}" failonerror="false" />
48 <delete dir="${obj.dir}" failonerror="false" /> 48 <delete dir="${obj.dir}" failonerror="false" />
49 </target> 49 </target>
50 <target name="doc" description="Creates documentation."> 50 <target name="doc" description="Creates documentation.">
51 </target> 51 </target>
52</project> 52</project>
diff --git a/OpenSim/OpenSimMain.cs b/OpenSim/OpenSimMain.cs
index 8da76ca..0b614f8 100644
--- a/OpenSim/OpenSimMain.cs
+++ b/OpenSim/OpenSimMain.cs
@@ -144,6 +144,7 @@ namespace OpenSim
144 144
145 this.SetupHttpListener(); 145 this.SetupHttpListener();
146 146
147 //Login server setup
147 LoginServer loginServer = null; 148 LoginServer loginServer = null;
148 LoginServer adminLoginServer = null; 149 LoginServer adminLoginServer = null;
149 150
@@ -169,13 +170,15 @@ namespace OpenSim
169 } 170 }
170 } 171 }
171 172
173 //Web front end setup
172 AdminWebFront adminWebFront = new AdminWebFront("Admin", LocalWorld, InventoryCache, adminLoginServer); 174 AdminWebFront adminWebFront = new AdminWebFront("Admin", LocalWorld, InventoryCache, adminLoginServer);
173 adminWebFront.LoadMethods(httpServer); 175 adminWebFront.LoadMethods(httpServer);
174 176
177 //Start http server
175 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Main.cs:Startup() - Starting HTTP server"); 178 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Main.cs:Startup() - Starting HTTP server");
176 httpServer.Start(); 179 httpServer.Start();
177 180
178 //MainServerListener(); 181 // Start UDP server
179 this.m_udpServer.ServerListener(); 182 this.m_udpServer.ServerListener();
180 183
181 m_heartbeatTimer.Enabled = true; 184 m_heartbeatTimer.Enabled = true;
generated by cgit v1.1 at 2024-12-21 17:46:10 +0000