* Fixad namespace clash

0.1-prestable
lbsa71 2007-04-03 20:31:46 +00:00
parent f12ceff692
commit d9ca661416
5 changed files with 149 additions and 181 deletions

View File

@ -41,42 +41,6 @@ Global
Debug|Any CPU = Debug|Any CPU Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU Release|Any CPU = Release|Any CPU
EndGlobalSection EndGlobalSection
GlobalSection(ProjectDependencies) = postSolution
({438A9556-0000-0000-0000-000000000000}).5 = ({8ACA2445-0000-0000-0000-000000000000})
({438A9556-0000-0000-0000-000000000000}).6 = ({A7CD0630-0000-0000-0000-000000000000})
({438A9556-0000-0000-0000-000000000000}).7 = ({8BE16150-0000-0000-0000-000000000000})
({438A9556-0000-0000-0000-000000000000}).8 = ({8BB20F0A-0000-0000-0000-000000000000})
({438A9556-0000-0000-0000-000000000000}).9 = ({632E1BFD-0000-0000-0000-000000000000})
({63A05FE9-0000-0000-0000-000000000000}).2 = ({8BE16150-0000-0000-0000-000000000000})
({E88EF749-0000-0000-0000-000000000000}).2 = ({8ACA2445-0000-0000-0000-000000000000})
({8BE16150-0000-0000-0000-000000000000}).3 = ({8ACA2445-0000-0000-0000-000000000000})
({8BE16150-0000-0000-0000-000000000000}).4 = ({A7CD0630-0000-0000-0000-000000000000})
({66591469-0000-0000-0000-000000000000}).3 = ({8ACA2445-0000-0000-0000-000000000000})
({66591469-0000-0000-0000-000000000000}).4 = ({A7CD0630-0000-0000-0000-000000000000})
({83C87BE6-0000-0000-0000-000000000000}).5 = ({8ACA2445-0000-0000-0000-000000000000})
({83C87BE6-0000-0000-0000-000000000000}).6 = ({A7CD0630-0000-0000-0000-000000000000})
({4F874463-0000-0000-0000-000000000000}).2 = ({8BE16150-0000-0000-0000-000000000000})
({B0027747-0000-0000-0000-000000000000}).5 = ({8ACA2445-0000-0000-0000-000000000000})
({B0027747-0000-0000-0000-000000000000}).6 = ({A7CD0630-0000-0000-0000-000000000000})
({8BB20F0A-0000-0000-0000-000000000000}).2 = ({8ACA2445-0000-0000-0000-000000000000})
({8BB20F0A-0000-0000-0000-000000000000}).3 = ({A7CD0630-0000-0000-0000-000000000000})
({988F0AC4-0000-0000-0000-000000000000}).3 = ({8BE16150-0000-0000-0000-000000000000})
({B55C0B5D-0000-0000-0000-000000000000}).3 = ({8ACA2445-0000-0000-0000-000000000000})
({B55C0B5D-0000-0000-0000-000000000000}).4 = ({A7CD0630-0000-0000-0000-000000000000})
({632E1BFD-0000-0000-0000-000000000000}).5 = ({8ACA2445-0000-0000-0000-000000000000})
({632E1BFD-0000-0000-0000-000000000000}).6 = ({A7CD0630-0000-0000-0000-000000000000})
({632E1BFD-0000-0000-0000-000000000000}).7 = ({E88EF749-0000-0000-0000-000000000000})
({632E1BFD-0000-0000-0000-000000000000}).8 = ({8BE16150-0000-0000-0000-000000000000})
({632E1BFD-0000-0000-0000-000000000000}).9 = ({8BB20F0A-0000-0000-0000-000000000000})
({E1B79ECF-0000-0000-0000-000000000000}).4 = ({8ACA2445-0000-0000-0000-000000000000})
({E1B79ECF-0000-0000-0000-000000000000}).5 = ({A7CD0630-0000-0000-0000-000000000000})
({7E494328-0000-0000-0000-000000000000}).5 = ({8ACA2445-0000-0000-0000-000000000000})
({7E494328-0000-0000-0000-000000000000}).6 = ({A7CD0630-0000-0000-0000-000000000000})
({546099CD-0000-0000-0000-000000000000}).4 = ({8ACA2445-0000-0000-0000-000000000000})
({546099CD-0000-0000-0000-000000000000}).5 = ({A7CD0630-0000-0000-0000-000000000000})
({21BFC8E2-0000-0000-0000-000000000000}).3 = ({8ACA2445-0000-0000-0000-000000000000})
({21BFC8E2-0000-0000-0000-000000000000}).4 = ({A7CD0630-0000-0000-0000-000000000000})
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution GlobalSection(ProjectConfigurationPlatforms) = postSolution
{438A9556-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {438A9556-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{438A9556-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU {438A9556-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

64
OpenSim/Application.cs Normal file
View File

@ -0,0 +1,64 @@
using System;
using System.Collections.Generic;
using System.Text;
using OpenSim.UserServer;
using OpenSim.Framework.Console;
namespace OpenSim
{
public class Application
{
[STAThread]
public static void Main(string[] args)
{
Console.WriteLine("OpenSim " + VersionInfo.Version + "\n");
Console.WriteLine("Starting...\n");
bool sandBoxMode = false;
bool startLoginServer = false;
string physicsEngine = "basicphysics";
bool allowFlying = false;
bool userAccounts = false;
for (int i = 0; i < args.Length; i++)
{
if (args[i] == "-sandbox")
{
sandBoxMode = true;
}
if (args[i] == "-loginserver")
{
startLoginServer = true;
}
if (args[i] == "-accounts")
{
userAccounts = true;
}
if (args[i] == "-realphysx")
{
physicsEngine = "RealPhysX";
allowFlying = true;
}
if (args[i] == "-ode")
{
physicsEngine = "OpenDynamicsEngine";
allowFlying = true;
}
}
OpenSimMain sim = new OpenSimMain( sandBoxMode, startLoginServer, physicsEngine );
// OpenSimRoot.Instance.Application = sim;
sim.m_sandbox = sandBoxMode;
sim.user_accounts = userAccounts;
OpenSim.world.Avatar.PhysicsEngineFlying = allowFlying;
sim.StartUp();
while (true)
{
OpenSim.Framework.Console.MainConsole.Instance.MainConsolePrompt();
}
}
}
}

View File

@ -112,6 +112,9 @@
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="Application.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="RegionServer.cs"> <Compile Include="RegionServer.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>

View File

@ -11,6 +11,7 @@
<resources prefix="OpenSim" dynamicprefix="true" > <resources prefix="OpenSim" dynamicprefix="true" >
</resources> </resources>
<sources failonempty="true"> <sources failonempty="true">
<include name="Application.cs" />
<include name="RegionServer.cs" /> <include name="RegionServer.cs" />
</sources> </sources>
<references basedir="${project::get-base-directory()}"> <references basedir="${project::get-base-directory()}">

View File

@ -1,64 +0,0 @@
using System;
using System.Collections.Generic;
using System.Text;
using OpenSim.UserServer;
using OpenSim.Framework.Console;
namespace OpenSim
{
public class RegionServer
{
[STAThread]
public static void Main(string[] args)
{
Console.WriteLine("OpenSim " + VersionInfo.Version + "\n");
Console.WriteLine("Starting...\n");
bool sandBoxMode = false;
bool startLoginServer = false;
string physicsEngine = "basicphysics";
bool allowFlying = false;
bool userAccounts = false;
for (int i = 0; i < args.Length; i++)
{
if (args[i] == "-sandbox")
{
sandBoxMode = true;
}
if (args[i] == "-loginserver")
{
startLoginServer = true;
}
if (args[i] == "-accounts")
{
userAccounts = true;
}
if (args[i] == "-realphysx")
{
physicsEngine = "RealPhysX";
allowFlying = true;
}
if (args[i] == "-ode")
{
physicsEngine = "OpenDynamicsEngine";
allowFlying = true;
}
}
OpenSimMain sim = new OpenSimMain( sandBoxMode, startLoginServer, physicsEngine );
// OpenSimRoot.Instance.Application = sim;
sim.m_sandbox = sandBoxMode;
sim.user_accounts = userAccounts;
OpenSim.world.Avatar.PhysicsEngineFlying = allowFlying;
sim.StartUp();
while (true)
{
OpenSim.Framework.Console.MainConsole.Instance.MainConsolePrompt();
}
}
}
}