aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/OpenSim.csproj10
-rw-r--r--OpenSim/OpenSim.exe.build94
-rw-r--r--OpenSim/RegionServer.cs6
3 files changed, 55 insertions, 55 deletions
diff --git a/OpenSim/OpenSim.csproj b/OpenSim/OpenSim.csproj
index e873a91..bf57515 100644
--- a/OpenSim/OpenSim.csproj
+++ b/OpenSim/OpenSim.csproj
@@ -3,7 +3,7 @@
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>{455F3378-FE4B-4A17-907D-52AEA3C1045F}</ProjectGuid> 6 <ProjectGuid>{5304CCD5-4902-4C6B-ADDE-2181B2F42FD6}</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>
@@ -82,25 +82,25 @@
82 <ItemGroup> 82 <ItemGroup>
83 <ProjectReference Include="..\OpenSim.Framework\OpenSim.Framework.csproj"> 83 <ProjectReference Include="..\OpenSim.Framework\OpenSim.Framework.csproj">
84 <Name>OpenSim.Framework</Name> 84 <Name>OpenSim.Framework</Name>
85 <Project>{26E437F6-BA50-44CD-BB44-E911E25CA88C}</Project> 85 <Project>{90D4F7AF-D75E-4DE8-A0E1-70CC242B31A1}</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.Console\OpenSim.Framework.Console.csproj"> 89 <ProjectReference Include="..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj">
90 <Name>OpenSim.Framework.Console</Name> 90 <Name>OpenSim.Framework.Console</Name>
91 <Project>{F5AD51E9-CF59-4C70-A586-CBD161EBB85F}</Project> 91 <Project>{7AED7536-7D6B-4E28-8016-B5A554C663B4}</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.Physics\Manager\OpenSim.Physics.Manager.csproj"> 95 <ProjectReference Include="..\OpenSim.Physics\Manager\OpenSim.Physics.Manager.csproj">
96 <Name>OpenSim.Physics.Manager</Name> 96 <Name>OpenSim.Physics.Manager</Name>
97 <Project>{12F74CC6-E820-4716-8A34-A7B67B9EB3CC}</Project> 97 <Project>{0AAA0EEB-1F2C-4B4B-9BFA-7C3E45BCD348}</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.RegionServer\OpenSim.RegionServer.csproj"> 101 <ProjectReference Include="..\OpenSim.RegionServer\OpenSim.RegionServer.csproj">
102 <Name>OpenSim.RegionServer</Name> 102 <Name>OpenSim.RegionServer</Name>
103 <Project>{A88526E3-397A-479D-93E1-8865F3336A87}</Project> 103 <Project>{4171D545-81F5-4C64-AD29-6D7414C38181}</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>
diff --git a/OpenSim/OpenSim.exe.build b/OpenSim/OpenSim.exe.build
index fc516df..7d69d90 100644
--- a/OpenSim/OpenSim.exe.build
+++ b/OpenSim/OpenSim.exe.build
@@ -1,47 +1,47 @@
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="RegionServer.cs" /> 14 <include name="RegionServer.cs" />
15 </sources> 15 </sources>
16 <references basedir="${project::get-base-directory()}"> 16 <references basedir="${project::get-base-directory()}">
17 <lib> 17 <lib>
18 <include name="${project::get-base-directory()}" /> 18 <include name="${project::get-base-directory()}" />
19 <include name="${project::get-base-directory()}/${build.dir}" /> 19 <include name="${project::get-base-directory()}/${build.dir}" />
20 </lib> 20 </lib>
21 <include name="System.dll" /> 21 <include name="System.dll" />
22 <include name="System.Xml.dll" /> 22 <include name="System.Xml.dll" />
23 <include name="../bin/libsecondlife.dll" /> 23 <include name="../bin/libsecondlife.dll" />
24 <include name="../bin/Axiom.MathLib.dll" /> 24 <include name="../bin/Axiom.MathLib.dll" />
25 <include name="../bin/Db4objects.Db4o.dll" /> 25 <include name="../bin/Db4objects.Db4o.dll" />
26 <include name="../OpenSim.Framework/${build.dir}/OpenSim.Framework.dll" /> 26 <include name="../OpenSim.Framework/${build.dir}/OpenSim.Framework.dll" />
27 <include name="../OpenSim.Framework.Console/${build.dir}/OpenSim.Framework.Console.dll" /> 27 <include name="../OpenSim.Framework.Console/${build.dir}/OpenSim.Framework.Console.dll" />
28 <include name="../OpenSim.Physics/Manager/${build.dir}/OpenSim.Physics.Manager.dll" /> 28 <include name="../OpenSim.Physics/Manager/${build.dir}/OpenSim.Physics.Manager.dll" />
29 <include name="../OpenSim.RegionServer/${build.dir}/OpenSim.RegionServer.dll" /> 29 <include name="../OpenSim.RegionServer/${build.dir}/OpenSim.RegionServer.dll" />
30 </references> 30 </references>
31 </csc> 31 </csc>
32 <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" /> 32 <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" />
33 <mkdir dir="${project::get-base-directory()}/../bin/"/> 33 <mkdir dir="${project::get-base-directory()}/../bin/"/>
34 <copy todir="${project::get-base-directory()}/../bin/"> 34 <copy todir="${project::get-base-directory()}/../bin/">
35 <fileset basedir="${project::get-base-directory()}/${build.dir}/" > 35 <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
36 <include name="*.dll"/> 36 <include name="*.dll"/>
37 <include name="*.exe"/> 37 <include name="*.exe"/>
38 </fileset> 38 </fileset>
39 </copy> 39 </copy>
40 </target> 40 </target>
41 <target name="clean"> 41 <target name="clean">
42 <delete dir="${bin.dir}" failonerror="false" /> 42 <delete dir="${bin.dir}" failonerror="false" />
43 <delete dir="${obj.dir}" failonerror="false" /> 43 <delete dir="${obj.dir}" failonerror="false" />
44 </target> 44 </target>
45 <target name="doc" description="Creates documentation."> 45 <target name="doc" description="Creates documentation.">
46 </target> 46 </target>
47</project> 47</project>
diff --git a/OpenSim/RegionServer.cs b/OpenSim/RegionServer.cs
index d6d0af9..3612d49 100644
--- a/OpenSim/RegionServer.cs
+++ b/OpenSim/RegionServer.cs
@@ -2,6 +2,7 @@ using System;
2using System.Collections.Generic; 2using System.Collections.Generic;
3using System.Text; 3using System.Text;
4using OpenSim.UserServer; 4using OpenSim.UserServer;
5using OpenSim.Framework.Console;
5 6
6namespace OpenSim 7namespace OpenSim
7{ 8{
@@ -12,12 +13,11 @@ namespace OpenSim
12 { 13 {
13 Console.WriteLine("OpenSim " + VersionInfo.Version + "\n"); 14 Console.WriteLine("OpenSim " + VersionInfo.Version + "\n");
14 Console.WriteLine("Starting...\n"); 15 Console.WriteLine("Starting...\n");
15 OpenSim.Framework.Console.MainConsole.Instance = new SimConsole(OpenSim.Framework.Console.ConsoleBase.ConsoleType.Local, "", 0); 16
16
17 //OpenSimRoot.instance = new OpenSimRoot(); 17 //OpenSimRoot.instance = new OpenSimRoot();
18 OpenSimMain sim = new OpenSimMain(); 18 OpenSimMain sim = new OpenSimMain();
19 OpenSimRoot.Instance.Application = sim; 19 OpenSimRoot.Instance.Application = sim;
20 20
21 sim.sandbox = false; 21 sim.sandbox = false;
22 sim.loginserver = false; 22 sim.loginserver = false;
23 sim._physicsEngine = "basicphysics"; 23 sim._physicsEngine = "basicphysics";