OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* removed unused new-login.dat 

* cleared up verbose/noverbose/disableOutput douple negation confusion in ConsoleBase
* 2d chat radius is now 3d chat sphere
* removed unused fast 2d radius calc
* added chat type 0xFF : broadcast (no sphere checking)
* OpenSimMain now exposes its LocalWorld
zircon^2
lbsa71 2007-05-16 17:12:17 +00:00
parent bd6e69b97c
commit 6056247ac3
10 changed files with 194 additions and 282 deletions

22
OpenSim.Framework.Console/ConsoleBase.cs
View File

@ -19,25 +19,13 @@ namespace OpenSim.Framework.Console
StreamWriter Log; StreamWriter Log;
public conscmd_callback cmdparser; public conscmd_callback cmdparser;
public string componentname; public string componentname;
private bool disableOutput; private bool m_silent;
// STUPID HACK ALERT!!!! STUPID HACK ALERT!!!!! public ConsoleBase(string LogFile, string componentname, conscmd_callback cmdparser, bool silent )
// constype - the type of console to use (see enum ConsoleType)
// sparam - depending on the console type:
// TCP - the IP to bind to (127.0.0.1 if blank)
// Local - param ignored
// and for the iparam:
// TCP - the port to bind to
// Local - param ignored
// LogFile - duh
// componentname - which component of the OGS system? (user, asset etc)
// cmdparser - a reference to a conscmd_callback object
public ConsoleBase(string LogFile, string componentname, conscmd_callback cmdparser, bool disableSystemConsole )
{ {
this.componentname = componentname; this.componentname = componentname;
this.cmdparser = cmdparser; this.cmdparser = cmdparser;
this.disableOutput = disableSystemConsole; this.m_silent = silent;
System.Console.WriteLine("ServerConsole.cs - creating new local console"); System.Console.WriteLine("ServerConsole.cs - creating new local console");
System.Console.WriteLine("Logs will be saved to current directory in " + LogFile); System.Console.WriteLine("Logs will be saved to current directory in " + LogFile);
Log = File.AppendText(LogFile); Log = File.AppendText(LogFile);
@ -62,7 +50,7 @@ namespace OpenSim.Framework.Console
{ {
Log.WriteLine(format, args); Log.WriteLine(format, args);
Log.Flush(); Log.Flush();
if(!disableOutput) if(!m_silent)
{ {
System.Console.WriteLine(format, args); System.Console.WriteLine(format, args);
} }
@ -73,7 +61,7 @@ namespace OpenSim.Framework.Console
{ {
Log.WriteLine(format, args); Log.WriteLine(format, args);
Log.Flush(); Log.Flush();
if (!disableOutput) if (!m_silent)
{ {
System.Console.WriteLine(format, args); System.Console.WriteLine(format, args);
} }

15
OpenSim.Framework/Util.cs
View File

@ -36,15 +36,15 @@ namespace OpenSim.Framework.Utilities
return id; return id;
} }
public static int fast_distance2d(int x, int y) //public static int fast_distance2d(int x, int y)
{ //{
x = System.Math.Abs(x); // x = System.Math.Abs(x);
y = System.Math.Abs(y); // y = System.Math.Abs(y);
int min = System.Math.Min(x, y); // int min = System.Math.Min(x, y);
return (x + y - (min >> 1) - (min >> 2) + (min >> 4)); // return (x + y - (min >> 1) - (min >> 2) + (min >> 4));
} //}
public static string FieldToString(byte[] bytes) public static string FieldToString(byte[] bytes)
{ {
@ -130,5 +130,4 @@ namespace OpenSim.Framework.Utilities
} }
} }
} }

9
OpenSim.RegionServer/OpenSim.RegionServer.csproj
View File

@ -150,24 +150,19 @@
</Compile> </Compile>
<Compile Include="SimClient.Grid.cs"> <Compile Include="SimClient.Grid.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
<DependentUpon>SimClient.cs</DependentUpon>
</Compile> </Compile>
<Compile Include="SimClient.PacketHandlers.cs"> <Compile Include="SimClient.PacketHandlers.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
<DependentUpon>SimClient.cs</DependentUpon>
</Compile> </Compile>
<Compile Include="SimClient.ProcessPackets.cs"> <Compile Include="SimClient.ProcessPackets.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
<DependentUpon>SimClient.cs</DependentUpon>
</Compile> </Compile>
<Compile Include="SimClientBase.cs"> <Compile Include="SimClientBase.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="UDPServer.cs"> <Compile Include="UDPServer.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="VersionInfo.cs"> <Compile Include="VersionInfo.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
@ -188,14 +183,12 @@
</Compile> </Compile>
<Compile Include="world\Avatar.Client.cs"> <Compile Include="world\Avatar.Client.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
<DependentUpon>Avatar.cs</DependentUpon>
</Compile> </Compile>
<Compile Include="world\Avatar.cs"> <Compile Include="world\Avatar.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="world\Avatar.Update.cs"> <Compile Include="world\Avatar.Update.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
<DependentUpon>Avatar.cs</DependentUpon>
</Compile> </Compile>
<Compile Include="world\AvatarAnimations.cs"> <Compile Include="world\AvatarAnimations.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
@ -217,11 +210,9 @@
</Compile> </Compile>
<Compile Include="world\World.PacketHandlers.cs"> <Compile Include="world\World.PacketHandlers.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
<DependentUpon>World.cs</DependentUpon>
</Compile> </Compile>
<Compile Include="world\World.Scripting.cs"> <Compile Include="world\World.Scripting.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
<DependentUpon>World.cs</DependentUpon>
</Compile> </Compile>
<Compile Include="world\scripting\IScriptContext.cs"> <Compile Include="world\scripting\IScriptContext.cs">
<SubType>Code</SubType> <SubType>Code</SubType>

13
OpenSim.RegionServer/OpenSimMain.cs
View File

@ -60,7 +60,6 @@ namespace OpenSim
//private IGenericConfig remoteConfig; //private IGenericConfig remoteConfig;
private PhysicsManager physManager; private PhysicsManager physManager;
private Grid GridServers; private Grid GridServers;
private World LocalWorld;
private AssetCache AssetCache; private AssetCache AssetCache;
private InventoryCache InventoryCache; private InventoryCache InventoryCache;
private Dictionary<EndPoint, uint> clientCircuits = new Dictionary<EndPoint, uint>(); private Dictionary<EndPoint, uint> clientCircuits = new Dictionary<EndPoint, uint>();
@ -81,7 +80,7 @@ namespace OpenSim
protected ConsoleBase m_console; protected ConsoleBase m_console;
public OpenSimMain(bool sandBoxMode, bool startLoginServer, string physicsEngine, bool useConfigFile, bool verbose, string configFile) public OpenSimMain(bool sandBoxMode, bool startLoginServer, string physicsEngine, bool useConfigFile, bool silent, string configFile)
{ {
this.configFileSetup = useConfigFile; this.configFileSetup = useConfigFile;
m_sandbox = sandBoxMode; m_sandbox = sandBoxMode;
@ -89,10 +88,16 @@ namespace OpenSim
m_physicsEngine = physicsEngine; m_physicsEngine = physicsEngine;
m_config = configFile; m_config = configFile;
m_console = new ConsoleBase("region-console-" + Guid.NewGuid().ToString() + ".log", "Region", this, verbose); m_console = new ConsoleBase("region-console-" + Guid.NewGuid().ToString() + ".log", "Region", this, silent);
OpenSim.Framework.Console.MainConsole.Instance = m_console; OpenSim.Framework.Console.MainConsole.Instance = m_console;
} }
private World m_localWorld;
public World LocalWorld
{
get { return m_localWorld; }
}
/// <summary> /// <summary>
/// Performs initialisation of the world, such as loading configuration from disk. /// Performs initialisation of the world, such as loading configuration from disk.
/// </summary> /// </summary>
@ -251,7 +256,7 @@ namespace OpenSim
m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Initialising world"); m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Initialising world");
m_console.componentname = "Region " + regionData.RegionName; m_console.componentname = "Region " + regionData.RegionName;
LocalWorld = new World(this.m_udpServer.PacketServer.ClientThreads, regionData, regionData.RegionHandle, regionData.RegionName); m_localWorld = new World(this.m_udpServer.PacketServer.ClientThreads, regionData, regionData.RegionHandle, regionData.RegionName);
LocalWorld.InventoryCache = InventoryCache; LocalWorld.InventoryCache = InventoryCache;
LocalWorld.AssetCache = AssetCache; LocalWorld.AssetCache = AssetCache;

35
OpenSim.RegionServer/world/World.PacketHandlers.cs
View File

@ -51,40 +51,51 @@ namespace OpenSim.world
return true; return true;
} }
string fromName = simClient.ClientAvatar.firstname + " " + simClient.ClientAvatar.lastname;
byte[] message = inchatpack.ChatData.Message;
byte type = inchatpack.ChatData.Type;
LLVector3 fromPos = simClient.ClientAvatar.Pos;
LLUUID fromAgentID = simClient.AgentID;
libsecondlife.Packets.ChatFromSimulatorPacket reply = new ChatFromSimulatorPacket(); libsecondlife.Packets.ChatFromSimulatorPacket reply = new ChatFromSimulatorPacket();
reply.ChatData.Audible = 1; reply.ChatData.Audible = 1;
reply.ChatData.Message = inchatpack.ChatData.Message; reply.ChatData.Message = message;
reply.ChatData.ChatType = inchatpack.ChatData.Type; reply.ChatData.ChatType = type;
reply.ChatData.SourceType = 1; reply.ChatData.SourceType = 1;
reply.ChatData.Position = simClient.ClientAvatar.Pos; reply.ChatData.Position = fromPos;
reply.ChatData.FromName = enc.GetBytes(simClient.ClientAvatar.firstname + " " + simClient.ClientAvatar.lastname + "\0"); reply.ChatData.FromName = enc.GetBytes(fromName + "\0");
reply.ChatData.OwnerID = simClient.AgentID; reply.ChatData.OwnerID = fromAgentID;
reply.ChatData.SourceID = simClient.AgentID; reply.ChatData.SourceID = fromAgentID;
foreach (SimClient client in m_clientThreads.Values) foreach (SimClient client in m_clientThreads.Values)
{ {
// int dis = Util.fast_distance2d((int)(client.ClientAvatar.Pos.X - simClient.ClientAvatar.Pos.X), (int)(client.ClientAvatar.Pos.Y - simClient.ClientAvatar.Pos.Y));
int dis = (int)client.ClientAvatar.Pos.GetDistanceTo(simClient.ClientAvatar.Pos);
switch (inchatpack.ChatData.Type) switch (inchatpack.ChatData.Type)
{ {
case 0: case 0: // Whisper
int dis = Util.fast_distance2d((int)(client.ClientAvatar.Pos.X - simClient.ClientAvatar.Pos.X), (int)(client.ClientAvatar.Pos.Y - simClient.ClientAvatar.Pos.Y));
if ((dis < 10) && (dis > -10)) if ((dis < 10) && (dis > -10))
{ {
client.OutPacket(reply); client.OutPacket(reply);
} }
break; break;
case 1: case 1: // Say
dis = Util.fast_distance2d((int)(client.ClientAvatar.Pos.X - simClient.ClientAvatar.Pos.X), (int)(client.ClientAvatar.Pos.Y - simClient.ClientAvatar.Pos.Y));
if ((dis < 30) && (dis > -30)) if ((dis < 30) && (dis > -30))
{ {
client.OutPacket(reply); client.OutPacket(reply);
} }
break; break;
case 2: case 2: // Shout
dis = Util.fast_distance2d((int)(client.ClientAvatar.Pos.X - simClient.ClientAvatar.Pos.X), (int)(client.ClientAvatar.Pos.Y - simClient.ClientAvatar.Pos.Y));
if ((dis < 100) && (dis > -100)) if ((dis < 100) && (dis > -100))
{ {
client.OutPacket(reply); client.OutPacket(reply);
} }
break; break;
case 0xff: // Broadcast
client.OutPacket(reply);
break;
} }
} }

12
OpenSim.Servers/LoginServer.cs
View File

@ -86,18 +86,6 @@ namespace OpenSim.UserServer
public void Startup() public void Startup()
{ {
this._needPasswd = false; this._needPasswd = false;
// read in default response string
/* StreamReader SR;
string lines;
SR = File.OpenText("new-login.dat");
while (!SR.EndOfStream)
{
lines = SR.ReadLine();
_defaultResponse += lines;
}
SR.Close();
* */
this._mpasswd = EncodePassword("testpass"); this._mpasswd = EncodePassword("testpass");

23
OpenSim.Servers/OpenSim.Servers.csproj
View File

@ -1,4 +1,4 @@
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<ProjectType>Local</ProjectType> <ProjectType>Local</ProjectType>
<ProductVersion>8.0.50727</ProductVersion> <ProductVersion>8.0.50727</ProductVersion>
@ -6,8 +6,7 @@
<ProjectGuid>{8BB20F0A-0000-0000-0000-000000000000}</ProjectGuid> <ProjectGuid>{8BB20F0A-0000-0000-0000-000000000000}</ProjectGuid>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ApplicationIcon> <ApplicationIcon></ApplicationIcon>
</ApplicationIcon>
<AssemblyKeyContainerName> <AssemblyKeyContainerName>
</AssemblyKeyContainerName> </AssemblyKeyContainerName>
<AssemblyName>OpenSim.Servers</AssemblyName> <AssemblyName>OpenSim.Servers</AssemblyName>
@ -16,11 +15,9 @@
<DefaultTargetSchema>IE50</DefaultTargetSchema> <DefaultTargetSchema>IE50</DefaultTargetSchema>
<DelaySign>false</DelaySign> <DelaySign>false</DelaySign>
<OutputType>Library</OutputType> <OutputType>Library</OutputType>
<AppDesignerFolder> <AppDesignerFolder></AppDesignerFolder>
</AppDesignerFolder>
<RootNamespace>OpenSim.Servers</RootNamespace> <RootNamespace>OpenSim.Servers</RootNamespace>
<StartupObject> <StartupObject></StartupObject>
</StartupObject>
<FileUpgradeFlags> <FileUpgradeFlags>
</FileUpgradeFlags> </FileUpgradeFlags>
</PropertyGroup> </PropertyGroup>
@ -31,8 +28,7 @@
<ConfigurationOverrideFile> <ConfigurationOverrideFile>
</ConfigurationOverrideFile> </ConfigurationOverrideFile>
<DefineConstants>TRACE;DEBUG</DefineConstants> <DefineConstants>TRACE;DEBUG</DefineConstants>
<DocumentationFile> <DocumentationFile></DocumentationFile>
</DocumentationFile>
<DebugSymbols>True</DebugSymbols> <DebugSymbols>True</DebugSymbols>
<FileAlignment>4096</FileAlignment> <FileAlignment>4096</FileAlignment>
<Optimize>False</Optimize> <Optimize>False</Optimize>
@ -41,8 +37,7 @@
<RemoveIntegerChecks>False</RemoveIntegerChecks> <RemoveIntegerChecks>False</RemoveIntegerChecks>
<TreatWarningsAsErrors>False</TreatWarningsAsErrors> <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
<NoWarn> <NoWarn></NoWarn>
</NoWarn>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<AllowUnsafeBlocks>False</AllowUnsafeBlocks> <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
@ -51,8 +46,7 @@
<ConfigurationOverrideFile> <ConfigurationOverrideFile>
</ConfigurationOverrideFile> </ConfigurationOverrideFile>
<DefineConstants>TRACE</DefineConstants> <DefineConstants>TRACE</DefineConstants>
<DocumentationFile> <DocumentationFile></DocumentationFile>
</DocumentationFile>
<DebugSymbols>False</DebugSymbols> <DebugSymbols>False</DebugSymbols>
<FileAlignment>4096</FileAlignment> <FileAlignment>4096</FileAlignment>
<Optimize>True</Optimize> <Optimize>True</Optimize>
@ -61,8 +55,7 @@
<RemoveIntegerChecks>False</RemoveIntegerChecks> <RemoveIntegerChecks>False</RemoveIntegerChecks>
<TreatWarningsAsErrors>False</TreatWarningsAsErrors> <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
<NoWarn> <NoWarn></NoWarn>
</NoWarn>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="System" > <Reference Include="System" >

62
OpenSim.sln
View File

@ -65,68 +65,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
({EE9E5D96-0000-0000-0000-000000000000}).6 = ({8ACA2445-0000-0000-0000-000000000000})
({EE9E5D96-0000-0000-0000-000000000000}).7 = ({A7CD0630-0000-0000-0000-000000000000})
({63A05FE9-0000-0000-0000-000000000000}).2 = ({8BE16150-0000-0000-0000-000000000000})
({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})
({632E1BFD-0000-0000-0000-000000000000}).5 = ({2270B8FE-0000-0000-0000-000000000000})
({632E1BFD-0000-0000-0000-000000000000}).6 = ({8ACA2445-0000-0000-0000-000000000000})
({632E1BFD-0000-0000-0000-000000000000}).7 = ({A7CD0630-0000-0000-0000-000000000000})
({632E1BFD-0000-0000-0000-000000000000}).8 = ({E88EF749-0000-0000-0000-000000000000})
({632E1BFD-0000-0000-0000-000000000000}).9 = ({8BE16150-0000-0000-0000-000000000000})
({632E1BFD-0000-0000-0000-000000000000}).10 = ({8BB20F0A-0000-0000-0000-000000000000})
({632E1BFD-0000-0000-0000-000000000000}).11 = ({8E81D43C-0000-0000-0000-000000000000})
({8ACA2445-0000-0000-0000-000000000000}).4 = ({8E81D43C-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})
({97A82740-0000-0000-0000-000000000000}).2 = ({8ACA2445-0000-0000-0000-000000000000})
({0F3C3AC1-0000-0000-0000-000000000000}).3 = ({62CDF671-0000-0000-0000-000000000000})
({E88EF749-0000-0000-0000-000000000000}).2 = ({8ACA2445-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})
({66591469-0000-0000-0000-000000000000}).5 = ({8BB20F0A-0000-0000-0000-000000000000})
({66591469-0000-0000-0000-000000000000}).8 = ({8E81D43C-0000-0000-0000-000000000000})
({4F874463-0000-0000-0000-000000000000}).2 = ({8BE16150-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})
({8BB20F0A-0000-0000-0000-000000000000}).5 = ({8E81D43C-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})
({988F0AC4-0000-0000-0000-000000000000}).3 = ({8BE16150-0000-0000-0000-000000000000})
({0A563AC1-0000-0000-0000-000000000000}).3 = ({62CDF671-0000-0000-0000-000000000000})
({7924FD35-0000-0000-0000-000000000000}).1 = ({8ACA2445-0000-0000-0000-000000000000})
({7924FD35-0000-0000-0000-000000000000}).2 = ({8BB20F0A-0000-0000-0000-000000000000})
({7924FD35-0000-0000-0000-000000000000}).3 = ({8E81D43C-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})
({B55C0B5D-0000-0000-0000-000000000000}).5 = ({8E81D43C-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})
({21BFC8E2-0000-0000-0000-000000000000}).5 = ({8BB20F0A-0000-0000-0000-000000000000})
({21BFC8E2-0000-0000-0000-000000000000}).6 = ({62CDF671-0000-0000-0000-000000000000})
({21BFC8E2-0000-0000-0000-000000000000}).7 = ({7924FD35-0000-0000-0000-000000000000})
({21BFC8E2-0000-0000-0000-000000000000}).10 = ({8E81D43C-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})
({6B20B603-0000-0000-0000-000000000000}).5 = ({8ACA2445-0000-0000-0000-000000000000})
({6B20B603-0000-0000-0000-000000000000}).6 = ({A7CD0630-0000-0000-0000-000000000000})
({39BD9497-0000-0000-0000-000000000000}).3 = ({62CDF671-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})
({1E3F341A-0000-0000-0000-000000000000}).4 = ({62CDF671-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})
({0021261B-0000-0000-0000-000000000000}).3 = ({8ACA2445-0000-0000-0000-000000000000})
({0021261B-0000-0000-0000-000000000000}).4 = ({A7CD0630-0000-0000-0000-000000000000})
({0021261B-0000-0000-0000-000000000000}).5 = ({546099CD-0000-0000-0000-000000000000})
({0021261B-0000-0000-0000-000000000000}).6 = ({8BB20F0A-0000-0000-0000-000000000000})
({0021261B-0000-0000-0000-000000000000}).9 = ({8E81D43C-0000-0000-0000-000000000000})
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution GlobalSection(ProjectConfigurationPlatforms) = postSolution
{2270B8FE-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {2270B8FE-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2270B8FE-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU {2270B8FE-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

6
OpenSim/Application.cs
View File

@ -21,7 +21,7 @@ namespace OpenSim
bool userAccounts = false; bool userAccounts = false;
bool gridLocalAsset = false; bool gridLocalAsset = false;
bool useConfigFile = false; bool useConfigFile = false;
bool noverbose = false; bool silent = false;
string configFile = "simconfig.xml"; string configFile = "simconfig.xml";
for (int i = 0; i < args.Length; i++) for (int i = 0; i < args.Length; i++)
@ -60,7 +60,7 @@ namespace OpenSim
} }
if (args[i] == "-noverbose") if (args[i] == "-noverbose")
{ {
noverbose = true; silent = true;
} }
if (args[i] == "-config") if (args[i] == "-config")
{ {
@ -76,7 +76,7 @@ namespace OpenSim
} }
} }
OpenSimMain sim = new OpenSimMain(sandBoxMode, startLoginServer, physicsEngine, useConfigFile, noverbose, configFile); OpenSimMain sim = new OpenSimMain(sandBoxMode, startLoginServer, physicsEngine, useConfigFile, silent, configFile);
// OpenSimRoot.Instance.Application = sim; // OpenSimRoot.Instance.Application = sim;
sim.m_sandbox = sandBoxMode; sim.m_sandbox = sandBoxMode;
sim.user_accounts = userAccounts; sim.user_accounts = userAccounts;

1
bin/new-login.dat
View File

File diff suppressed because one or more lines are too long