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

* Now there's one Console class, and instead the apps responds to cmd's and show's 

* Removed Golden Future TCP/SimChat options
* Moved Ode.NET.dll to bin and changed prebuild accordingly (due to Prebuild limitations)
* Normalized some namespaces
* Added FxCop project
* Added (temp disabled) Servers project (for great justice)
tourmaline
lbsa71 2007-03-27 08:10:15 +00:00
parent b43f0801eb
commit a4fc6b5fbb
60 changed files with 9065 additions and 2092 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
OpenGridServices.GridServer/ConsoleCmds.cs
View File

@ -1,57 +0,0 @@
/*
Copyright (c) OpenSim project, http://osgrid.org/
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* * Neither the name of the <organization> nor the
* names of its contributors may be used to endorse or promote products
* derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY <copyright holder> ``AS IS'' AND ANY
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL <copyright holder> BE LIABLE FOR ANY
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
using System;
using System.Text;
using ServerConsole;
namespace OpenGridServices
{
public class GridConsole : conscmd_callback {
public GridConsole() { }
public override void RunCmd(string cmd, string[] cmdparams) {
switch(cmd) {
case "help":
ServerConsole.MainConsole.Instance.WriteLine("shutdown - shutdown the grid (USE CAUTION!)"
);
break;
case "shutdown":
ServerConsole.MainConsole.Instance.Close();
Environment.Exit(0);
break;
}
}
public override void Show(string ShowWhat) {
}
}
}

8
OpenGridServices.GridServer/GridHttp.cs
View File

@ -37,23 +37,23 @@ using System.IO;
using System.Collections; using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using libsecondlife; using libsecondlife;
using ServerConsole;
using OpenSim.Framework.Sims; using OpenSim.Framework.Sims;
using OpenSim.Framework.Console;
namespace OpenGridServices namespace OpenGridServices.GridServer
{ {
public class GridHTTPServer { public class GridHTTPServer {
public Thread HTTPD; public Thread HTTPD;
public HttpListener Listener; public HttpListener Listener;
public GridHTTPServer() { public GridHTTPServer() {
ServerConsole.MainConsole.Instance.WriteLine("Starting up HTTP Server"); MainConsole.Instance.WriteLine("Starting up HTTP Server");
HTTPD = new Thread(new ThreadStart(StartHTTP)); HTTPD = new Thread(new ThreadStart(StartHTTP));
HTTPD.Start(); HTTPD.Start();
} }
public void StartHTTP() { public void StartHTTP() {
ServerConsole.MainConsole.Instance.WriteLine("GridHttp.cs:StartHTTP() - Spawned main thread OK"); MainConsole.Instance.WriteLine("GridHttp.cs:StartHTTP() - Spawned main thread OK");
Listener = new HttpListener(); Listener = new HttpListener();
Listener.Prefixes.Add("http://+:8001/gridserver/"); Listener.Prefixes.Add("http://+:8001/gridserver/");

255
OpenGridServices.GridServer/Main.cs
View File

@ -31,207 +31,96 @@ using System;
using System.IO; using System.IO;
using System.Text; using System.Text;
using libsecondlife; using libsecondlife;
using ServerConsole; using OpenSim.Framework.Console;
namespace OpenGridServices namespace OpenGridServices.GridServer
{ {
/// <summary> /// <summary>
/// </summary> /// </summary>
public class OpenGrid_Main public class OpenGrid_Main : conscmd_callback
{ {
public static OpenGrid_Main thegrid; public static OpenGrid_Main thegrid;
public string GridOwner; public string GridOwner;
public string DefaultStartupMsg; public string DefaultStartupMsg;
public string DefaultAssetServer; public string DefaultAssetServer;
public string AssetSendKey; public string AssetSendKey;
public string AssetRecvKey; public string AssetRecvKey;
public string DefaultUserServer; public string DefaultUserServer;
public string UserSendKey; public string UserSendKey;
public string UserRecvKey; public string UserRecvKey;
public GridHTTPServer _httpd; public GridHTTPServer _httpd;
public SimProfileManager _regionmanager; public SimProfileManager _regionmanager;
[STAThread] private ConsoleBase m_console;
public static void Main( string[] args )
{
Console.WriteLine("Starting...\n");
ServerConsole.MainConsole.Instance = new MServerConsole(ServerConsole.ConsoleBase.ConsoleType.Local, "", 0, "opengrid-console.log", "OpenGrid", new GridConsole());
thegrid = new OpenGrid_Main(); [STAThread]
thegrid.Startup(); public static void Main(string[] args)
{
Console.WriteLine("Starting...\n");
ServerConsole.MainConsole.Instance.WriteLine("\nEnter help for a list of commands\n"); thegrid = new OpenGrid_Main();
thegrid.Startup();
while(true) { thegrid.Work();
ServerConsole.MainConsole.Instance.MainConsolePrompt(); }
}
}
public void Startup() { private void Work()
ServerConsole.MainConsole.Instance.WriteLine("Main.cs:Startup() - Please press enter to retain default settings"); {
m_console.WriteLine("\nEnter help for a list of commands\n");
this.GridOwner=ServerConsole.MainConsole.Instance.CmdPrompt("Grid owner [OGS development team]: ","OGS development team"); while (true)
this.DefaultStartupMsg=ServerConsole.MainConsole.Instance.CmdPrompt("Default startup message for clients [Welcome to OGS!]: ","Welcome to OGS!"); {
m_console.MainConsolePrompt();
}
}
this.DefaultAssetServer=ServerConsole.MainConsole.Instance.CmdPrompt("Default asset server [no default]: "); private OpenGrid_Main()
this.AssetSendKey=ServerConsole.MainConsole.Instance.CmdPrompt("Key to send to asset server: "); {
this.AssetRecvKey=ServerConsole.MainConsole.Instance.CmdPrompt("Key to expect from asset server: "); m_console = new ConsoleBase("opengrid-console.log", "OpenGrid", this);
MainConsole.Instance = m_console;
}
this.DefaultUserServer=ServerConsole.MainConsole.Instance.CmdPrompt("Default user server [no default]: "); public void Startup()
this.UserSendKey=ServerConsole.MainConsole.Instance.CmdPrompt("Key to send to user server: "); {
this.UserRecvKey=ServerConsole.MainConsole.Instance.CmdPrompt("Key to expect from user server: "); m_console.WriteLine("Main.cs:Startup() - Please press enter to retain default settings");
ServerConsole.MainConsole.Instance.WriteLine("Main.cs:Startup() - Starting HTTP process"); this.GridOwner = m_console.CmdPrompt("Grid owner [OGS development team]: ", "OGS development team");
_httpd = new GridHTTPServer(); this.DefaultStartupMsg = m_console.CmdPrompt("Default startup message for clients [Welcome to OGS!]: ", "Welcome to OGS!");
this._regionmanager=new SimProfileManager(); this.DefaultAssetServer = m_console.CmdPrompt("Default asset server [no default]: ");
_regionmanager.CreateNewProfile("OpenSim Test", "http://there-is-no-caps.com", "4.78.190.75", 9000, 997, 996, this.UserSendKey, this.UserRecvKey); this.AssetSendKey = m_console.CmdPrompt("Key to send to asset server: ");
this.AssetRecvKey = m_console.CmdPrompt("Key to expect from asset server: ");
} this.DefaultUserServer = m_console.CmdPrompt("Default user server [no default]: ");
} this.UserSendKey = m_console.CmdPrompt("Key to send to user server: ");
/// <summary> this.UserRecvKey = m_console.CmdPrompt("Key to expect from user server: ");
/// Description of ServerConsole.
/// </summary>
public class MServerConsole : ConsoleBase
{
private ConsoleType ConsType; m_console.WriteLine("Main.cs:Startup() - Starting HTTP process");
StreamWriter Log; _httpd = new GridHTTPServer();
public conscmd_callback cmdparser;
public string componentname;
// STUPID HACK ALERT!!!! STUPID HACK ALERT!!!!! this._regionmanager = new SimProfileManager();
// constype - the type of console to use (see enum ConsoleType) _regionmanager.CreateNewProfile("OpenSim Test", "http://there-is-no-caps.com", "4.78.190.75", 9000, 997, 996, this.UserSendKey, this.UserRecvKey);
// 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 MServerConsole(ConsoleType constype, string sparam, int iparam, string LogFile, string componentname, conscmd_callback cmdparser) { public void RunCmd(string cmd, string[] cmdparams)
ConsType = constype; {
this.componentname = componentname; switch (cmd)
this.cmdparser = cmdparser; {
switch(constype) { case "help":
case ConsoleType.Local: m_console.WriteLine("shutdown - shutdown the grid (USE CAUTION!)");
Console.WriteLine("ServerConsole.cs - creating new local console"); break;
Console.WriteLine("Logs will be saved to current directory in " + LogFile);
Log=File.AppendText(LogFile);
Log.WriteLine("========================================================================");
Log.WriteLine(componentname + " Started at " + DateTime.Now.ToString());
break;
case ConsoleType.TCP: case "shutdown":
break; m_console.Close();
Environment.Exit(0);
break;
}
}
default: public void Show(string ShowWhat)
Console.WriteLine("ServerConsole.cs - what are you smoking? that isn't a valid console type!"); {
break; }
} }
}
public override void Close() {
Log.WriteLine("Shutdown at " + DateTime.Now.ToString());
Log.Close();
}
// You know what ReadLine() and WriteLine() do, right? And Read() and Write()? Right, you do actually know C#, right? Are you actually a programmer? Do you know english? Do you find my sense of humour in comments irritating? Good, glad you're still here
public override void WriteLine(string Line) {
Log.WriteLine(Line);
Console.WriteLine(Line);
return;
}
public override string ReadLine() {
string TempStr=Console.ReadLine();
Log.WriteLine(TempStr);
return TempStr;
}
public override int Read() {
int TempInt= Console.Read();
Log.Write((char)TempInt);
return TempInt;
}
public override void Write(string Line) {
Console.Write(Line);
Log.Write(Line);
return;
}
// Displays a prompt and waits for the user to enter a string, then returns that string
// Done with no echo and suitable for passwords
public override string PasswdPrompt(string prompt) {
// FIXME: Needs to be better abstracted
Log.WriteLine(prompt);
this.Write(prompt);
ConsoleColor oldfg=Console.ForegroundColor;
Console.ForegroundColor=Console.BackgroundColor;
string temp=Console.ReadLine();
Console.ForegroundColor=oldfg;
return temp;
}
// Displays a command prompt and waits for the user to enter a string, then returns that string
public override string CmdPrompt(string prompt) {
this.Write(prompt);
return this.ReadLine();
}
// Displays a command prompt and returns a default value if the user simply presses enter
public override string CmdPrompt(string prompt, string defaultresponse) {
string temp=CmdPrompt(prompt);
if(temp=="") {
return defaultresponse;
} else {
return temp;
}
}
// Displays a command prompt and returns a default value, user may only enter 1 of 2 options
public override string CmdPrompt(string prompt, string defaultresponse, string OptionA, string OptionB) {
bool itisdone=false;
string temp=CmdPrompt(prompt,defaultresponse);
while(itisdone==false) {
if((temp==OptionA) || (temp==OptionB)) {
itisdone=true;
} else {
this.WriteLine("Valid options are " + OptionA + " or " + OptionB);
temp=CmdPrompt(prompt,defaultresponse);
}
}
return temp;
}
// Runs a command with a number of parameters
public override Object RunCmd(string Cmd, string[] cmdparams) {
cmdparser.RunCmd(Cmd, cmdparams);
return null;
}
// Shows data about something
public override void ShowCommands(string ShowWhat) {
cmdparser.Show(ShowWhat);
}
public override void MainConsolePrompt() {
string[] tempstrarray;
string tempstr = this.CmdPrompt(this.componentname + "# ");
tempstrarray = tempstr.Split(' ');
string cmd=tempstrarray[0];
Array.Reverse(tempstrarray);
Array.Resize<string>(ref tempstrarray,tempstrarray.Length-1);
Array.Reverse(tempstrarray);
string[] cmdparams=(string[])tempstrarray;
RunCmd(cmd,cmdparams);
}
}
} }

9
OpenGridServices.GridServer/OpenGridServices.GridServer.csproj
View File

@ -3,7 +3,7 @@
<ProjectType>Local</ProjectType> <ProjectType>Local</ProjectType>
<ProductVersion>8.0.50727</ProductVersion> <ProductVersion>8.0.50727</ProductVersion>
<SchemaVersion>2.0</SchemaVersion> <SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{F7DE71C5-CD20-4AD8-83A4-1363066853A6}</ProjectGuid> <ProjectGuid>{3378EE78-2D72-4C21-8F9D-680B33AAFFEE}</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>
@ -78,10 +78,6 @@
<HintPath>..\bin\OpenSim.Framework.Console.dll</HintPath> <HintPath>..\bin\OpenSim.Framework.Console.dll</HintPath>
<Private>False</Private> <Private>False</Private>
</Reference> </Reference>
<Reference Include="OpenGridServices.ServerConsole.dll" >
<HintPath>..\bin\OpenGridServices.ServerConsole.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="libsecondlife.dll" > <Reference Include="libsecondlife.dll" >
<HintPath>..\bin\libsecondlife.dll</HintPath> <HintPath>..\bin\libsecondlife.dll</HintPath>
<Private>False</Private> <Private>False</Private>
@ -90,9 +86,6 @@
<ItemGroup> <ItemGroup>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="ConsoleCmds.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="GridHttp.cs"> <Compile Include="GridHttp.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>

4
OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build
View File

@ -7,11 +7,10 @@
<fileset basedir="${project::get-base-directory()}"> <fileset basedir="${project::get-base-directory()}">
</fileset> </fileset>
</copy> </copy>
<csc target="exe" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.exe"> <csc target="exe" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.exe">
<resources prefix="OpenGridServices.GridServer" dynamicprefix="true" > <resources prefix="OpenGridServices.GridServer" dynamicprefix="true" >
</resources> </resources>
<sources failonempty="true"> <sources failonempty="true">
<include name="ConsoleCmds.cs" />
<include name="GridHttp.cs" /> <include name="GridHttp.cs" />
<include name="Main.cs" /> <include name="Main.cs" />
<include name="SimProfiles.cs" /> <include name="SimProfiles.cs" />
@ -27,7 +26,6 @@
<include name="System.Xml.dll" /> <include name="System.Xml.dll" />
<include name="../bin/OpenSim.Framework.dll" /> <include name="../bin/OpenSim.Framework.dll" />
<include name="../bin/OpenSim.Framework.Console.dll" /> <include name="../bin/OpenSim.Framework.Console.dll" />
<include name="../bin/OpenGridServices.ServerConsole.dll" />
<include name="../bin/libsecondlife.dll" /> <include name="../bin/libsecondlife.dll" />
</references> </references>
</csc> </csc>

3
OpenGridServices.GridServer/SimProfiles.cs
View File

@ -32,11 +32,10 @@ using System.Text;
using System.Collections; using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using libsecondlife; using libsecondlife;
using ServerConsole;
using OpenSim.Framework.Utilities; using OpenSim.Framework.Utilities;
using OpenSim.Framework.Sims; using OpenSim.Framework.Sims;
namespace OpenGridServices namespace OpenGridServices.GridServer
{ {
/// <summary> /// <summary>
/// </summary> /// </summary>

33
OpenGridServices.ServerConsole/Properties/AssemblyInfo.cs
View File

@ -1,33 +0,0 @@
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("ServerConsole")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("ServerConsole")]
[assembly: AssemblyCopyright("Copyright © 2007")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
// COM, set the ComVisible attribute to true on that type.
[assembly: ComVisible(false)]
// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("c4d85def-4c2e-449d-bf4a-449b8cf03736")]
// Version information for an assembly consists of the following four values:
//
// Major Version
// Minor Version
// Build Number
// Revision
//
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]

98
OpenGridServices.ServerConsole/ServerConsole.cs
View File

@ -1,98 +0,0 @@
/*
* Copyright (c) OpenSim project, http://sim.opensecondlife.org/
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* * Neither the name of the <organization> nor the
* names of its contributors may be used to endorse or promote products
* derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY <copyright holder> ``AS IS'' AND ANY
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL <copyright holder> BE LIABLE FOR ANY
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
*/
using System;
namespace ServerConsole
{
public class MainConsole {
private static ConsoleBase instance;
public static ConsoleBase Instance
{
get
{
return instance;
}
set
{
instance = value;
}
}
public MainConsole()
{
}
}
public abstract class conscmd_callback {
public abstract void RunCmd(string cmd, string[] cmdparams);
public abstract void Show(string ShowWhat);
}
public abstract class ConsoleBase
{
public enum ConsoleType {
Local, // Use stdio
TCP, // Use TCP/telnet
SimChat // Use in-world chat (for gods)
}
public abstract void Close();
// You know what ReadLine() and WriteLine() do, right? And Read() and Write()? Right, you do actually know C#, right? Are you actually a programmer? Do you know english? Do you find my sense of humour in comments irritating? Good, glad you're still here
public abstract void WriteLine(string Line) ;
public abstract string ReadLine();
public abstract int Read() ;
public abstract void Write(string Line) ;
public abstract string PasswdPrompt(string prompt);
// Displays a command prompt and waits for the user to enter a string, then returns that string
public abstract string CmdPrompt(string prompt) ;
// Displays a command prompt and returns a default value if the user simply presses enter
public abstract string CmdPrompt(string prompt, string defaultresponse);
// Displays a command prompt and returns a default value, user may only enter 1 of 2 options
public abstract string CmdPrompt(string prompt, string defaultresponse, string OptionA, string OptionB) ;
// Runs a command with a number of parameters
public abstract Object RunCmd(string Cmd, string[] cmdparams) ;
// Shows data about something
public abstract void ShowCommands(string ShowWhat) ;
// Displays a prompt to the user and then runs the command they entered
public abstract void MainConsolePrompt() ;
}
}

40
OpenGridServices.ServerConsole/ServerConsole.csproj
View File

@ -1,40 +0,0 @@
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>8.0.50727</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{7667E6E2-F227-41A2-B1B2-315613E1BAFC}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>ServerConsole</RootNamespace>
<AssemblyName>ServerConsole</AssemblyName>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>..\common\bin\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="ServerConsole.cs" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
</Project>

48
OpenGridServices.ServerConsole/default.build
View File

@ -1,48 +0,0 @@
<?xml version="1.0"?>
<project name="ServerConsole" default="build" basedir=".">
<property name="debug" value="true" overwrite="false" />
<target name="clean" description="remove all generated files">
<delete file="../common/bin/ServerConsole.dll" failonerror="false" />
<delete file="../common/bin/ServerConsole.dll.mdb" failonerror="false" />
</target>
<target name="svnupdate" description="updates to latest SVN">
<exec program="svn">
<arg value="update" />
</exec>
</target>
<target name="upgrade" description="updates from SVN and then builds" depends="clean,svnupdate,build">
</target>
<target name="build" description="compiles the source code">
<loadfile file="../VERSION" property="svnver"/>
<asminfo output="AssemblyInfo.cs" language="CSharp">
<imports>
<import namespace="System" />
<import namespace="System.Reflection" />
<import namespace="System.Runtime.InteropServices" />
</imports>
<attributes>
<attribute type="ComVisibleAttribute" value="false" />
<attribute type="CLSCompliantAttribute" value="false" />
<attribute type="AssemblyVersionAttribute" value="${svnver}" />
<attribute type="AssemblyTitleAttribute" value="ogs-serverconsole" />
<attribute type="AssemblyDescriptionAttribute" value="The default server console" />
<attribute type="AssemblyCopyrightAttribute" value="Copyright © OGS development team 2007"/>
</attributes>
</asminfo>
<csc target="library" output="../common/bin/ServerConsole.dll" debug="${debug}" verbose="true" warninglevel="4">
<references>
<include name="System" />
<include name="System.Xml" />
</references>
<sources>
<include name="*.cs" />
</sources>
</csc>
</target>
</project>

57
OpenGridServices.UserServer/ConsoleCmds.cs
View File

@ -1,57 +0,0 @@
/*
Copyright (c) OpenSim project, http://osgrid.org/
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* * Neither the name of the <organization> nor the
* names of its contributors may be used to endorse or promote products
* derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY <copyright holder> ``AS IS'' AND ANY
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL <copyright holder> BE LIABLE FOR ANY
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
using System;
using System.Text;
using ServerConsole;
namespace OpenGridServices
{
public class UserConsole : conscmd_callback {
public UserConsole() { }
public override void RunCmd(string cmd, string[] cmdparams) {
switch(cmd) {
case "help":
ServerConsole.MainConsole.Instance.WriteLine("shutdown - shutdown the user server (USE CAUTION!)"
);
break;
case "shutdown":
ServerConsole.MainConsole.Instance.Close();
Environment.Exit(0);
break;
}
}
public override void Show(string ShowWhat) {
}
}
}

207
OpenGridServices.UserServer/Main.cs
View File

@ -33,16 +33,16 @@ using System.Collections.Generic;
using System.IO; using System.IO;
using System.Text; using System.Text;
using libsecondlife; using libsecondlife;
using ServerConsole;
using OpenSim.Framework.User; using OpenSim.Framework.User;
using OpenSim.Framework.Sims; using OpenSim.Framework.Sims;
using OpenSim.Framework.Inventory; using OpenSim.Framework.Inventory;
using OpenSim.Framework.Console;
namespace OpenGridServices namespace OpenGridServices.UserServer
{ {
/// <summary> /// <summary>
/// </summary> /// </summary>
public class OpenUser_Main public class OpenUser_Main : conscmd_callback
{ {
public static OpenUser_Main userserver; public static OpenUser_Main userserver;
@ -57,32 +57,45 @@ namespace OpenGridServices
public Dictionary<LLUUID, UserProfile> UserSessions = new Dictionary<LLUUID, UserProfile>(); public Dictionary<LLUUID, UserProfile> UserSessions = new Dictionary<LLUUID, UserProfile>();
ConsoleBase m_console;
[STAThread] [STAThread]
public static void Main( string[] args ) public static void Main( string[] args )
{ {
Console.WriteLine("Starting...\n"); Console.WriteLine("Starting...\n");
ServerConsole.MainConsole.Instance = new MServerConsole(ServerConsole.ConsoleBase.ConsoleType.Local, "", 0, "opengrid-console.log", "OpenUser", new UserConsole());
userserver = new OpenUser_Main(); userserver = new OpenUser_Main();
userserver.Startup(); userserver.Startup();
ServerConsole.MainConsole.Instance.WriteLine("\nEnter help for a list of commands\n"); userserver.Work();
while(true) {
ServerConsole.MainConsole.Instance.MainConsolePrompt();
}
} }
private OpenUser_Main()
{
m_console = new ConsoleBase("opengrid-console.log", "OpenUser", this);
MainConsole.Instance = m_console;
}
private void Work()
{
m_console.WriteLine("\nEnter help for a list of commands\n");
while (true)
{
m_console.MainConsolePrompt();
}
}
public void Startup() { public void Startup() {
ServerConsole.MainConsole.Instance.WriteLine("Main.cs:Startup() - Please press enter to retain default settings"); MainConsole.Instance.WriteLine("Main.cs:Startup() - Please press enter to retain default settings");
this.GridURL=ServerConsole.MainConsole.Instance.CmdPrompt("Grid URL: "); this.GridURL=MainConsole.Instance.CmdPrompt("Grid URL: ");
this.GridSendKey=ServerConsole.MainConsole.Instance.CmdPrompt("Key to send to grid: "); this.GridSendKey=MainConsole.Instance.CmdPrompt("Key to send to grid: ");
this.GridRecvKey=ServerConsole.MainConsole.Instance.CmdPrompt("Key to expect from grid: "); this.GridRecvKey=MainConsole.Instance.CmdPrompt("Key to expect from grid: ");
this.DefaultStartupMsg=ServerConsole.MainConsole.Instance.CmdPrompt("Default startup message for clients [Welcome to OGS!] :","Welcome to OGS!"); this.DefaultStartupMsg=MainConsole.Instance.CmdPrompt("Default startup message for clients [Welcome to OGS!] :","Welcome to OGS!");
ServerConsole.MainConsole.Instance.WriteLine("Main.cs:Startup() - Creating user profile manager"); MainConsole.Instance.WriteLine("Main.cs:Startup() - Creating user profile manager");
_profilemanager = new UserProfileManager(); _profilemanager = new UserProfileManager();
_profilemanager.InitUserProfiles(); _profilemanager.InitUserProfiles();
_profilemanager.SetKeys(GridSendKey, GridRecvKey, GridURL, DefaultStartupMsg); _profilemanager.SetKeys(GridSendKey, GridRecvKey, GridURL, DefaultStartupMsg);
@ -91,10 +104,10 @@ namespace OpenGridServices
string tempfirstname; string tempfirstname;
string templastname; string templastname;
string tempMD5Passwd; string tempMD5Passwd;
ServerConsole.MainConsole.Instance.WriteLine("Main.cs:Startup() - Please configure the grid god user:"); MainConsole.Instance.WriteLine("Main.cs:Startup() - Please configure the grid god user:");
tempfirstname=ServerConsole.MainConsole.Instance.CmdPrompt("First name: "); tempfirstname=MainConsole.Instance.CmdPrompt("First name: ");
templastname=ServerConsole.MainConsole.Instance.CmdPrompt("Last name: "); templastname=MainConsole.Instance.CmdPrompt("Last name: ");
tempMD5Passwd=ServerConsole.MainConsole.Instance.PasswdPrompt("Password: "); tempMD5Passwd=MainConsole.Instance.PasswdPrompt("Password: ");
System.Security.Cryptography.MD5CryptoServiceProvider x = new System.Security.Cryptography.MD5CryptoServiceProvider(); System.Security.Cryptography.MD5CryptoServiceProvider x = new System.Security.Cryptography.MD5CryptoServiceProvider();
byte[] bs = System.Text.Encoding.UTF8.GetBytes(tempMD5Passwd); byte[] bs = System.Text.Encoding.UTF8.GetBytes(tempMD5Passwd);
@ -111,149 +124,27 @@ namespace OpenGridServices
GridGod.homelookat = new LLVector3(-0.57343f, -0.819255f, 0f); GridGod.homelookat = new LLVector3(-0.57343f, -0.819255f, 0f);
GridGod.homepos = new LLVector3(128f,128f,23f); GridGod.homepos = new LLVector3(128f,128f,23f);
ServerConsole.MainConsole.Instance.WriteLine("Main.cs:Startup() - Starting HTTP process"); MainConsole.Instance.WriteLine("Main.cs:Startup() - Starting HTTP process");
_httpd = new UserHTTPServer(); _httpd = new UserHTTPServer();
} }
}
public class MServerConsole : ConsoleBase public void RunCmd(string cmd, string[] cmdparams)
{ {
switch (cmd)
{
case "help":
m_console.WriteLine("shutdown - shutdown the grid (USE CAUTION!)");
break;
private ConsoleType ConsType; case "shutdown":
StreamWriter Log; m_console.Close();
public conscmd_callback cmdparser; Environment.Exit(0);
public string componentname; break;
}
}
// STUPID HACK ALERT!!!! STUPID HACK ALERT!!!!! public void Show(string ShowWhat)
// 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 MServerConsole(ConsoleType constype, string sparam, int iparam, string LogFile, string componentname, conscmd_callback cmdparser) {
ConsType = constype;
this.componentname = componentname;
this.cmdparser = cmdparser;
switch(constype) {
case ConsoleType.Local:
Console.WriteLine("ServerConsole.cs - creating new local console");
Console.WriteLine("Logs will be saved to current directory in " + LogFile);
Log=File.AppendText(LogFile);
Log.WriteLine("========================================================================");
Log.WriteLine(componentname + " Started at " + DateTime.Now.ToString());
break;
case ConsoleType.TCP:
break;
default:
Console.WriteLine("ServerConsole.cs - what are you smoking? that isn't a valid console type!");
break;
}
}
public override void Close() {
Log.WriteLine("Shutdown at " + DateTime.Now.ToString());
Log.Close();
}
// You know what ReadLine() and WriteLine() do, right? And Read() and Write()? Right, you do actually know C#, right? Are you actually a programmer? Do you know english? Do you find my sense of humour in comments irritating? Good, glad you're still here
public override void WriteLine(string Line) {
Log.WriteLine(Line);
Console.WriteLine(Line);
return;
}
public override string ReadLine() {
string TempStr=Console.ReadLine();
Log.WriteLine(TempStr);
return TempStr;
}
public override int Read() {
int TempInt= Console.Read();
Log.Write((char)TempInt);
return TempInt;
}
public override void Write(string Line) {
Console.Write(Line);
Log.Write(Line);
return;
}
// Displays a prompt and waits for the user to enter a string, then returns that string
// Done with no echo and suitable for passwords
public override string PasswdPrompt(string prompt) {
// FIXME: Needs to be better abstracted
Log.WriteLine(prompt);
this.Write(prompt);
ConsoleColor oldfg=Console.ForegroundColor;
Console.ForegroundColor=Console.BackgroundColor;
string temp=Console.ReadLine();
Console.ForegroundColor=oldfg;
return temp;
}
// Displays a command prompt and waits for the user to enter a string, then returns that string
public override string CmdPrompt(string prompt) {
this.Write(prompt);
return this.ReadLine();
}
// Displays a command prompt and returns a default value if the user simply presses enter
public override string CmdPrompt(string prompt, string defaultresponse) {
string temp=CmdPrompt(prompt);
if(temp=="") {
return defaultresponse;
} else {
return temp;
}
}
// Displays a command prompt and returns a default value, user may only enter 1 of 2 options
public override string CmdPrompt(string prompt, string defaultresponse, string OptionA, string OptionB) {
bool itisdone=false;
string temp=CmdPrompt(prompt,defaultresponse);
while(itisdone==false) {
if((temp==OptionA) || (temp==OptionB)) {
itisdone=true;
} else {
this.WriteLine("Valid options are " + OptionA + " or " + OptionB);
temp=CmdPrompt(prompt,defaultresponse);
}
}
return temp;
}
// Runs a command with a number of parameters
public override Object RunCmd(string Cmd, string[] cmdparams) {
cmdparser.RunCmd(Cmd, cmdparams);
return null;
}
// Shows data about something
public override void ShowCommands(string ShowWhat) {
cmdparser.Show(ShowWhat);
}
public override void MainConsolePrompt() {
string[] tempstrarray;
string tempstr = this.CmdPrompt(this.componentname + "# ");
tempstrarray = tempstr.Split(' ');
string cmd=tempstrarray[0];
Array.Reverse(tempstrarray);
Array.Resize<string>(ref tempstrarray,tempstrarray.Length-1);
Array.Reverse(tempstrarray);
string[] cmdparams=(string[])tempstrarray;
RunCmd(cmd,cmdparams);
}
} }
} }

6
OpenGridServices.UserServer/OpenGridServices.UserServer.csproj
View File

@ -3,7 +3,7 @@
<ProjectType>Local</ProjectType> <ProjectType>Local</ProjectType>
<ProductVersion>8.0.50727</ProductVersion> <ProductVersion>8.0.50727</ProductVersion>
<SchemaVersion>2.0</SchemaVersion> <SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{3FE545CA-1179-42DF-BDF1-F14DEA463A21}</ProjectGuid> <ProjectGuid>{36895293-A627-42EC-BA77-6AF6F5A4A7DF}</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>
@ -78,10 +78,6 @@
<HintPath>..\bin\OpenSim.Framework.Console.dll</HintPath> <HintPath>..\bin\OpenSim.Framework.Console.dll</HintPath>
<Private>False</Private> <Private>False</Private>
</Reference> </Reference>
<Reference Include="OpenGridServices.ServerConsole.dll" >
<HintPath>..\bin\OpenGridServices.ServerConsole.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="libsecondlife.dll" > <Reference Include="libsecondlife.dll" >
<HintPath>..\bin\libsecondlife.dll</HintPath> <HintPath>..\bin\libsecondlife.dll</HintPath>
<Private>False</Private> <Private>False</Private>

3
OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build
View File

@ -7,7 +7,7 @@
<fileset basedir="${project::get-base-directory()}"> <fileset basedir="${project::get-base-directory()}">
</fileset> </fileset>
</copy> </copy>
<csc target="exe" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.exe"> <csc target="exe" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.exe">
<resources prefix="OpenGridServices.UserServer" dynamicprefix="true" > <resources prefix="OpenGridServices.UserServer" dynamicprefix="true" >
</resources> </resources>
<sources failonempty="true"> <sources failonempty="true">
@ -26,7 +26,6 @@
<include name="System.Xml.dll" /> <include name="System.Xml.dll" />
<include name="../bin/OpenSim.Framework.dll" /> <include name="../bin/OpenSim.Framework.dll" />
<include name="../bin/OpenSim.Framework.Console.dll" /> <include name="../bin/OpenSim.Framework.Console.dll" />
<include name="../bin/OpenGridServices.ServerConsole.dll" />
<include name="../bin/libsecondlife.dll" /> <include name="../bin/libsecondlife.dll" />
</references> </references>
</csc> </csc>

11
OpenGridServices.UserServer/UserHttp.cs
View File

@ -37,25 +37,25 @@ using System.IO;
using System.Collections; using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using libsecondlife; using libsecondlife;
using ServerConsole;
using OpenSim.Framework.User; using OpenSim.Framework.User;
using OpenSim.Framework.Sims; using OpenSim.Framework.Sims;
using OpenSim.Framework.Inventory; using OpenSim.Framework.Inventory;
using OpenSim.Framework.Console;
namespace OpenGridServices namespace OpenGridServices.UserServer
{ {
public class UserHTTPServer { public class UserHTTPServer {
public Thread HTTPD; public Thread HTTPD;
public HttpListener Listener; public HttpListener Listener;
public UserHTTPServer() { public UserHTTPServer() {
ServerConsole.MainConsole.Instance.WriteLine("Starting up HTTP Server"); MainConsole.Instance.WriteLine("Starting up HTTP Server");
HTTPD = new Thread(new ThreadStart(StartHTTP)); HTTPD = new Thread(new ThreadStart(StartHTTP));
HTTPD.Start(); HTTPD.Start();
} }
public void StartHTTP() { public void StartHTTP() {
ServerConsole.MainConsole.Instance.WriteLine("UserHttp.cs:StartHTTP() - Spawned main thread OK"); MainConsole.Instance.WriteLine("UserHttp.cs:StartHTTP() - Spawned main thread OK");
Listener = new HttpListener(); Listener = new HttpListener();
Listener.Prefixes.Add("http://+:8002/userserver/"); Listener.Prefixes.Add("http://+:8002/userserver/");
@ -70,7 +70,7 @@ namespace OpenGridServices
} }
static string ParseXMLRPC(string requestBody) { static string ParseXMLRPC(string requestBody) {
return OpenGridServices.OpenUser_Main.userserver._profilemanager.ParseXMLRPC(requestBody); return OpenUser_Main.userserver._profilemanager.ParseXMLRPC(requestBody);
} }
static string ParseREST(HttpListenerRequest www_req) { static string ParseREST(HttpListenerRequest www_req) {
@ -93,7 +93,6 @@ namespace OpenGridServices
} }
return "OK"; return "OK";
break;
} }
return ""; return "";

6
OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.csproj
View File

@ -3,7 +3,7 @@
<ProjectType>Local</ProjectType> <ProjectType>Local</ProjectType>
<ProductVersion>8.0.50727</ProductVersion> <ProductVersion>8.0.50727</ProductVersion>
<SchemaVersion>2.0</SchemaVersion> <SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{C7215018-D379-492D-9BB0-4B9DA0C6B9A0}</ProjectGuid> <ProjectGuid>{C83C9D5B-655E-447D-90CA-7C4AB2F814DD}</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>
@ -82,13 +82,13 @@
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\OpenSim.Framework\OpenSim.Framework.csproj"> <ProjectReference Include="..\..\OpenSim.Framework\OpenSim.Framework.csproj">
<Name>OpenSim.Framework</Name> <Name>OpenSim.Framework</Name>
<Project>{26E437F6-BA50-44CD-BB44-E911E25CA88C}</Project> <Project>{90D4F7AF-D75E-4DE8-A0E1-70CC242B31A1}</Project>
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
<Private>False</Private> <Private>False</Private>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj"> <ProjectReference Include="..\..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj">
<Name>OpenSim.Framework.Console</Name> <Name>OpenSim.Framework.Console</Name>
<Project>{F5AD51E9-CF59-4C70-A586-CBD161EBB85F}</Project> <Project>{7AED7536-7D6B-4E28-8016-B5A554C663B4}</Project>
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
<Private>False</Private> <Private>False</Private>
</ProjectReference> </ProjectReference>

2
OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.dll.build
View File

@ -7,7 +7,7 @@
<fileset basedir="${project::get-base-directory()}"> <fileset basedir="${project::get-base-directory()}">
</fileset> </fileset>
</copy> </copy>
<csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
<resources prefix="OpenSim.Config.SimConfigDb4o" dynamicprefix="true" > <resources prefix="OpenSim.Config.SimConfigDb4o" dynamicprefix="true" >
</resources> </resources>
<sources failonempty="true"> <sources failonempty="true">

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

@ -1,45 +1,151 @@
using System; using System;
using System.IO;
namespace OpenSim.Framework.Console namespace OpenSim.Framework.Console
{ {
public abstract class ConsoleBase public class ConsoleBase
{ {
StreamWriter Log;
public conscmd_callback cmdparser;
public string componentname;
public enum ConsoleType // STUPID HACK ALERT!!!! STUPID HACK ALERT!!!!!
// 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)
{ {
Local, // Use stdio this.componentname = componentname;
TCP, // Use TCP/telnet this.cmdparser = cmdparser;
SimChat // Use in-world chat (for gods)
System.Console.WriteLine("ServerConsole.cs - creating new local console");
System.Console.WriteLine("Logs will be saved to current directory in " + LogFile);
Log = File.AppendText(LogFile);
Log.WriteLine("========================================================================");
Log.WriteLine(componentname + " Started at " + DateTime.Now.ToString());
} }
public abstract void Close(); public void Close()
{
Log.WriteLine("Shutdown at " + DateTime.Now.ToString());
Log.Close();
}
public abstract void Write(string format, params object[] args); public void Write(string format, params object[] args)
{
Log.Write(format, args);
System.Console.Write(format, args);
return;
}
public abstract void WriteLine(string format, params object[] args); public void WriteLine(string format, params object[] args)
{
Log.WriteLine(format, args);
System.Console.WriteLine(format, args);
return;
}
public abstract string ReadLine(); public string ReadLine()
{
string TempStr = System.Console.ReadLine();
Log.WriteLine(TempStr);
return TempStr;
}
public abstract int Read(); public int Read()
{
int TempInt = System.Console.Read();
Log.Write((char)TempInt);
return TempInt;
}
// Displays a prompt and waits for the user to enter a string, then returns that string
// Done with no echo and suitable for passwords
public string PasswdPrompt(string prompt)
{
// FIXME: Needs to be better abstracted
Log.WriteLine(prompt);
this.Write(prompt);
ConsoleColor oldfg = System.Console.ForegroundColor;
System.Console.ForegroundColor = System.Console.BackgroundColor;
string temp = System.Console.ReadLine();
System.Console.ForegroundColor = oldfg;
return temp;
}
// Displays a command prompt and waits for the user to enter a string, then returns that string // Displays a command prompt and waits for the user to enter a string, then returns that string
public abstract string CmdPrompt(string prompt); public string CmdPrompt(string prompt)
{
this.Write(prompt);
return this.ReadLine();
}
// Displays a command prompt and returns a default value if the user simply presses enter // Displays a command prompt and returns a default value if the user simply presses enter
public abstract string CmdPrompt(string prompt, string defaultresponse); public string CmdPrompt(string prompt, string defaultresponse)
{
string temp = CmdPrompt(prompt);
if (temp == "")
{
return defaultresponse;
}
else
{
return temp;
}
}
// Displays a command prompt and returns a default value, user may only enter 1 of 2 options // Displays a command prompt and returns a default value, user may only enter 1 of 2 options
public abstract string CmdPrompt(string prompt, string defaultresponse, string OptionA, string OptionB); public string CmdPrompt(string prompt, string defaultresponse, string OptionA, string OptionB)
{
bool itisdone = false;
string temp = CmdPrompt(prompt, defaultresponse);
while (itisdone == false)
{
if ((temp == OptionA) || (temp == OptionB))
{
itisdone = true;
}
else
{
this.WriteLine("Valid options are " + OptionA + " or " + OptionB);
temp = CmdPrompt(prompt, defaultresponse);
}
}
return temp;
}
// Runs a command with a number of parameters // Runs a command with a number of parameters
public abstract Object RunCmd(string Cmd, string[] cmdparams); public Object RunCmd(string Cmd, string[] cmdparams)
{
cmdparser.RunCmd(Cmd, cmdparams);
return null;
}
// Shows data about something // Shows data about something
public abstract void ShowCommands(string ShowWhat); public void ShowCommands(string ShowWhat)
{
cmdparser.Show(ShowWhat);
}
// Displays a prompt to the user and then runs the command they entered public void MainConsolePrompt()
public abstract void MainConsolePrompt(); {
string[] tempstrarray;
public abstract void SetStatus(string status); string tempstr = this.CmdPrompt(this.componentname + "# ");
tempstrarray = tempstr.Split(' ');
string cmd = tempstrarray[0];
Array.Reverse(tempstrarray);
Array.Resize<string>(ref tempstrarray, tempstrarray.Length - 1);
Array.Reverse(tempstrarray);
string[] cmdparams = (string[])tempstrarray;
RunCmd(cmd, cmdparams);
}
} }
} }

12
OpenSim.Framework.Console/ConsoleCallbacksBase.cs Normal file
View File

@ -0,0 +1,12 @@
using System;
using System.Collections.Generic;
using System.Text;
namespace OpenSim.Framework.Console
{
public interface conscmd_callback
{
void RunCmd(string cmd, string[] cmdparams);
void Show(string ShowWhat);
}
}

5
OpenSim.Framework.Console/OpenSim.Framework.Console.csproj
View File

@ -3,7 +3,7 @@
<ProjectType>Local</ProjectType> <ProjectType>Local</ProjectType>
<ProductVersion>8.0.50727</ProductVersion> <ProductVersion>8.0.50727</ProductVersion>
<SchemaVersion>2.0</SchemaVersion> <SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{F5AD51E9-CF59-4C70-A586-CBD161EBB85F}</ProjectGuid> <ProjectGuid>{7AED7536-7D6B-4E28-8016-B5A554C663B4}</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>
@ -72,6 +72,9 @@
<Compile Include="ConsoleBase.cs"> <Compile Include="ConsoleBase.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="ConsoleCallbacksBase.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="MainConsole.cs"> <Compile Include="MainConsole.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>

3
OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build
View File

@ -7,12 +7,13 @@
<fileset basedir="${project::get-base-directory()}"> <fileset basedir="${project::get-base-directory()}">
</fileset> </fileset>
</copy> </copy>
<csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
<resources prefix="OpenSim.Framework.Console" dynamicprefix="true" > <resources prefix="OpenSim.Framework.Console" dynamicprefix="true" >
</resources> </resources>
<sources failonempty="true"> <sources failonempty="true">
<include name="AssemblyInfo.cs" /> <include name="AssemblyInfo.cs" />
<include name="ConsoleBase.cs" /> <include name="ConsoleBase.cs" />
<include name="ConsoleCallbacksBase.cs" />
<include name="MainConsole.cs" /> <include name="MainConsole.cs" />
</sources> </sources>
<references basedir="${project::get-base-directory()}"> <references basedir="${project::get-base-directory()}">

2
OpenSim.Framework/OpenSim.Framework.csproj
View File

@ -3,7 +3,7 @@
<ProjectType>Local</ProjectType> <ProjectType>Local</ProjectType>
<ProductVersion>8.0.50727</ProductVersion> <ProductVersion>8.0.50727</ProductVersion>
<SchemaVersion>2.0</SchemaVersion> <SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{26E437F6-BA50-44CD-BB44-E911E25CA88C}</ProjectGuid> <ProjectGuid>{90D4F7AF-D75E-4DE8-A0E1-70CC242B31A1}</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>

2
OpenSim.Framework/OpenSim.Framework.dll.build
View File

@ -7,7 +7,7 @@
<fileset basedir="${project::get-base-directory()}"> <fileset basedir="${project::get-base-directory()}">
</fileset> </fileset>
</copy> </copy>
<csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
<resources prefix="OpenSim.Framework" dynamicprefix="true" > <resources prefix="OpenSim.Framework" dynamicprefix="true" >
</resources> </resources>
<sources failonempty="true"> <sources failonempty="true">

7241
OpenSim.FxCop Normal file
View File

File diff suppressed because it is too large Load Diff

6
OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.csproj
View File

@ -3,7 +3,7 @@
<ProjectType>Local</ProjectType> <ProjectType>Local</ProjectType>
<ProductVersion>8.0.50727</ProductVersion> <ProductVersion>8.0.50727</ProductVersion>
<SchemaVersion>2.0</SchemaVersion> <SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{DB2D6331-438F-4C3F-83FD-B958E261CB0C}</ProjectGuid> <ProjectGuid>{21403281-9649-4CE8-869C-E4F2075DEE94}</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>
@ -78,13 +78,13 @@
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\OpenSim.Framework\OpenSim.Framework.csproj"> <ProjectReference Include="..\..\OpenSim.Framework\OpenSim.Framework.csproj">
<Name>OpenSim.Framework</Name> <Name>OpenSim.Framework</Name>
<Project>{26E437F6-BA50-44CD-BB44-E911E25CA88C}</Project> <Project>{90D4F7AF-D75E-4DE8-A0E1-70CC242B31A1}</Project>
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
<Private>False</Private> <Private>False</Private>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj"> <ProjectReference Include="..\..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj">
<Name>OpenSim.Framework.Console</Name> <Name>OpenSim.Framework.Console</Name>
<Project>{F5AD51E9-CF59-4C70-A586-CBD161EBB85F}</Project> <Project>{7AED7536-7D6B-4E28-8016-B5A554C663B4}</Project>
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
<Private>False</Private> <Private>False</Private>
</ProjectReference> </ProjectReference>

2
OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build
View File

@ -7,7 +7,7 @@
<fileset basedir="${project::get-base-directory()}"> <fileset basedir="${project::get-base-directory()}">
</fileset> </fileset>
</copy> </copy>
<csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
<resources prefix="OpenSim.GridInterfaces.Local" dynamicprefix="true" > <resources prefix="OpenSim.GridInterfaces.Local" dynamicprefix="true" >
</resources> </resources>
<sources failonempty="true"> <sources failonempty="true">

6
OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.csproj
View File

@ -3,7 +3,7 @@
<ProjectType>Local</ProjectType> <ProjectType>Local</ProjectType>
<ProductVersion>8.0.50727</ProductVersion> <ProductVersion>8.0.50727</ProductVersion>
<SchemaVersion>2.0</SchemaVersion> <SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{A6D9D790-2B1F-4088-BE12-91C4A69C1586}</ProjectGuid> <ProjectGuid>{BFCBC85D-2071-4294-923C-EC62D841A219}</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>
@ -74,13 +74,13 @@
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\OpenSim.Framework\OpenSim.Framework.csproj"> <ProjectReference Include="..\..\OpenSim.Framework\OpenSim.Framework.csproj">
<Name>OpenSim.Framework</Name> <Name>OpenSim.Framework</Name>
<Project>{26E437F6-BA50-44CD-BB44-E911E25CA88C}</Project> <Project>{90D4F7AF-D75E-4DE8-A0E1-70CC242B31A1}</Project>
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
<Private>False</Private> <Private>False</Private>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj"> <ProjectReference Include="..\..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj">
<Name>OpenSim.Framework.Console</Name> <Name>OpenSim.Framework.Console</Name>
<Project>{F5AD51E9-CF59-4C70-A586-CBD161EBB85F}</Project> <Project>{7AED7536-7D6B-4E28-8016-B5A554C663B4}</Project>
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
<Private>False</Private> <Private>False</Private>
</ProjectReference> </ProjectReference>

2
OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build
View File

@ -7,7 +7,7 @@
<fileset basedir="${project::get-base-directory()}"> <fileset basedir="${project::get-base-directory()}">
</fileset> </fileset>
</copy> </copy>
<csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
<resources prefix="OpenSim.GridInterfaces.Remote" dynamicprefix="true" > <resources prefix="OpenSim.GridInterfaces.Remote" dynamicprefix="true" >
</resources> </resources>
<sources failonempty="true"> <sources failonempty="true">

4
OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj
View File

@ -3,7 +3,7 @@
<ProjectType>Local</ProjectType> <ProjectType>Local</ProjectType>
<ProductVersion>8.0.50727</ProductVersion> <ProductVersion>8.0.50727</ProductVersion>
<SchemaVersion>2.0</SchemaVersion> <SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{5FBFB649-50BB-4CAB-B26C-29410D885559}</ProjectGuid> <ProjectGuid>{1F6E0D7F-D82D-4A21-B61D-970294EC1CAD}</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>
@ -70,7 +70,7 @@
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\Manager\OpenSim.Physics.Manager.csproj"> <ProjectReference Include="..\Manager\OpenSim.Physics.Manager.csproj">
<Name>OpenSim.Physics.Manager</Name> <Name>OpenSim.Physics.Manager</Name>
<Project>{12F74CC6-E820-4716-8A34-A7B67B9EB3CC}</Project> <Project>{0AAA0EEB-1F2C-4B4B-9BFA-7C3E45BCD348}</Project>
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
<Private>False</Private> <Private>False</Private>
</ProjectReference> </ProjectReference>

2
OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build
View File

@ -7,7 +7,7 @@
<fileset basedir="${project::get-base-directory()}"> <fileset basedir="${project::get-base-directory()}">
</fileset> </fileset>
</copy> </copy>
<csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
<resources prefix="OpenSim.Physics.BasicPhysicsPlugin" dynamicprefix="true" > <resources prefix="OpenSim.Physics.BasicPhysicsPlugin" dynamicprefix="true" >
</resources> </resources>
<sources failonempty="true"> <sources failonempty="true">

4
OpenSim.Physics/Manager/OpenSim.Physics.Manager.csproj
View File

@ -3,7 +3,7 @@
<ProjectType>Local</ProjectType> <ProjectType>Local</ProjectType>
<ProductVersion>8.0.50727</ProductVersion> <ProductVersion>8.0.50727</ProductVersion>
<SchemaVersion>2.0</SchemaVersion> <SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{12F74CC6-E820-4716-8A34-A7B67B9EB3CC}</ProjectGuid> <ProjectGuid>{0AAA0EEB-1F2C-4B4B-9BFA-7C3E45BCD348}</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>
@ -74,7 +74,7 @@
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj"> <ProjectReference Include="..\..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj">
<Name>OpenSim.Framework.Console</Name> <Name>OpenSim.Framework.Console</Name>
<Project>{F5AD51E9-CF59-4C70-A586-CBD161EBB85F}</Project> <Project>{7AED7536-7D6B-4E28-8016-B5A554C663B4}</Project>
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
<Private>False</Private> <Private>False</Private>
</ProjectReference> </ProjectReference>

2
OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build
View File

@ -7,7 +7,7 @@
<fileset basedir="${project::get-base-directory()}"> <fileset basedir="${project::get-base-directory()}">
</fileset> </fileset>
</copy> </copy>
<csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
<resources prefix="OpenSim.Physics.Manager" dynamicprefix="true" > <resources prefix="OpenSim.Physics.Manager" dynamicprefix="true" >
</resources> </resources>
<sources failonempty="true"> <sources failonempty="true">

2
OpenSim.Physics/Manager/PhysicsScene.cs
View File

@ -76,8 +76,6 @@ namespace OpenSim.Physics.Manager
public override void Simulate(float timeStep) public override void Simulate(float timeStep)
{ {
m_workIndicator = (m_workIndicator + 1) % 10; m_workIndicator = (m_workIndicator + 1) % 10;
OpenSim.Framework.Console.MainConsole.Instance.SetStatus(m_workIndicator.ToString());
} }
public override void GetResults() public override void GetResults()

8
OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.csproj
View File

@ -3,7 +3,7 @@
<ProjectType>Local</ProjectType> <ProjectType>Local</ProjectType>
<ProductVersion>8.0.50727</ProductVersion> <ProductVersion>8.0.50727</ProductVersion>
<SchemaVersion>2.0</SchemaVersion> <SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{58E9E005-093A-4E83-AB76-CA02CD14E53D}</ProjectGuid> <ProjectGuid>{C81B7E61-943D-4190-87C3-CB02BF67A2B3}</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>
@ -66,15 +66,15 @@
<HintPath>..\..\bin\Axiom.MathLib.dll</HintPath> <HintPath>..\..\bin\Axiom.MathLib.dll</HintPath>
<Private>False</Private> <Private>False</Private>
</Reference> </Reference>
<Reference Include="../lib/Ode.NET.dll" > <Reference Include="Ode.NET.dll" >
<HintPath>..\..\bin\..\lib\Ode.NET.dll</HintPath> <HintPath>..\..\bin\Ode.NET.dll</HintPath>
<Private>False</Private> <Private>False</Private>
</Reference> </Reference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\Manager\OpenSim.Physics.Manager.csproj"> <ProjectReference Include="..\Manager\OpenSim.Physics.Manager.csproj">
<Name>OpenSim.Physics.Manager</Name> <Name>OpenSim.Physics.Manager</Name>
<Project>{12F74CC6-E820-4716-8A34-A7B67B9EB3CC}</Project> <Project>{0AAA0EEB-1F2C-4B4B-9BFA-7C3E45BCD348}</Project>
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
<Private>False</Private> <Private>False</Private>
</ProjectReference> </ProjectReference>

4
OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build
View File

@ -7,7 +7,7 @@
<fileset basedir="${project::get-base-directory()}"> <fileset basedir="${project::get-base-directory()}">
</fileset> </fileset>
</copy> </copy>
<csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
<resources prefix="OpenSim.Physics.OdePlugin" dynamicprefix="true" > <resources prefix="OpenSim.Physics.OdePlugin" dynamicprefix="true" >
</resources> </resources>
<sources failonempty="true"> <sources failonempty="true">
@ -22,7 +22,7 @@
<include name="System.dll" /> <include name="System.dll" />
<include name="../../bin/Axiom.MathLib.dll" /> <include name="../../bin/Axiom.MathLib.dll" />
<include name="../Manager/${build.dir}/OpenSim.Physics.Manager.dll" /> <include name="../Manager/${build.dir}/OpenSim.Physics.Manager.dll" />
<include name="../../bin/../lib/Ode.NET.dll" /> <include name="../../bin/Ode.NET.dll" />
</references> </references>
</csc> </csc>
<echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/Physics/" /> <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/Physics/" />

4
OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.csproj
View File

@ -3,7 +3,7 @@
<ProjectType>Local</ProjectType> <ProjectType>Local</ProjectType>
<ProductVersion>8.0.50727</ProductVersion> <ProductVersion>8.0.50727</ProductVersion>
<SchemaVersion>2.0</SchemaVersion> <SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{69C8F939-AF90-46A1-8888-D779C5A8868E}</ProjectGuid> <ProjectGuid>{E1510E0F-EFCB-4702-BCB6-96A084454B55}</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>
@ -74,7 +74,7 @@
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\Manager\OpenSim.Physics.Manager.csproj"> <ProjectReference Include="..\Manager\OpenSim.Physics.Manager.csproj">
<Name>OpenSim.Physics.Manager</Name> <Name>OpenSim.Physics.Manager</Name>
<Project>{12F74CC6-E820-4716-8A34-A7B67B9EB3CC}</Project> <Project>{0AAA0EEB-1F2C-4B4B-9BFA-7C3E45BCD348}</Project>
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
<Private>False</Private> <Private>False</Private>
</ProjectReference> </ProjectReference>

2
OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build
View File

@ -7,7 +7,7 @@
<fileset basedir="${project::get-base-directory()}"> <fileset basedir="${project::get-base-directory()}">
</fileset> </fileset>
</copy> </copy>
<csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
<resources prefix="OpenSim.Physics.PhysXPlugin" dynamicprefix="true" > <resources prefix="OpenSim.Physics.PhysXPlugin" dynamicprefix="true" >
</resources> </resources>
<sources failonempty="true"> <sources failonempty="true">

0
OpenSim.RegionServer/ConsoleCmds.cs Normal file
View File

11
OpenSim.RegionServer/OpenSim.RegionServer.csproj
View File

@ -3,7 +3,7 @@
<ProjectType>Local</ProjectType> <ProjectType>Local</ProjectType>
<ProductVersion>8.0.50727</ProductVersion> <ProductVersion>8.0.50727</ProductVersion>
<SchemaVersion>2.0</SchemaVersion> <SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{A88526E3-397A-479D-93E1-8865F3336A87}</ProjectGuid> <ProjectGuid>{4171D545-81F5-4C64-AD29-6D7414C38181}</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>
@ -82,19 +82,19 @@
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj"> <ProjectReference Include="..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj">
<Name>OpenSim.Framework.Console</Name> <Name>OpenSim.Framework.Console</Name>
<Project>{F5AD51E9-CF59-4C70-A586-CBD161EBB85F}</Project> <Project>{7AED7536-7D6B-4E28-8016-B5A554C663B4}</Project>
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
<Private>False</Private> <Private>False</Private>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\OpenSim.Physics\Manager\OpenSim.Physics.Manager.csproj"> <ProjectReference Include="..\OpenSim.Physics\Manager\OpenSim.Physics.Manager.csproj">
<Name>OpenSim.Physics.Manager</Name> <Name>OpenSim.Physics.Manager</Name>
<Project>{12F74CC6-E820-4716-8A34-A7B67B9EB3CC}</Project> <Project>{0AAA0EEB-1F2C-4B4B-9BFA-7C3E45BCD348}</Project>
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
<Private>False</Private> <Private>False</Private>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\OpenSim.Framework\OpenSim.Framework.csproj"> <ProjectReference Include="..\OpenSim.Framework\OpenSim.Framework.csproj">
<Name>OpenSim.Framework</Name> <Name>OpenSim.Framework</Name>
<Project>{26E437F6-BA50-44CD-BB44-E911E25CA88C}</Project> <Project>{90D4F7AF-D75E-4DE8-A0E1-70CC242B31A1}</Project>
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
<Private>False</Private> <Private>False</Private>
</ProjectReference> </ProjectReference>
@ -103,6 +103,9 @@
<Compile Include="AgentAssetUpload.cs"> <Compile Include="AgentAssetUpload.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="ConsoleCmds.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Grid.cs"> <Compile Include="Grid.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>

7
OpenSim.RegionServer/OpenSim.RegionServer.dll.build
View File

@ -7,11 +7,12 @@
<fileset basedir="${project::get-base-directory()}"> <fileset basedir="${project::get-base-directory()}">
</fileset> </fileset>
</copy> </copy>
<csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
<resources prefix="OpenSim.RegionServer" dynamicprefix="true" > <resources prefix="OpenSim.RegionServer" dynamicprefix="true" >
</resources> </resources>
<sources failonempty="true"> <sources failonempty="true">
<include name="AgentAssetUpload.cs" /> <include name="AgentAssetUpload.cs" />
<include name="ConsoleCmds.cs" />
<include name="Grid.cs" /> <include name="Grid.cs" />
<include name="OpenSimApplication.cs" /> <include name="OpenSimApplication.cs" />
<include name="OpenSimMain.cs" /> <include name="OpenSimMain.cs" />
@ -23,10 +24,10 @@
<include name="Assets/AssetCache.cs" /> <include name="Assets/AssetCache.cs" />
<include name="Assets/InventoryCache.cs" /> <include name="Assets/InventoryCache.cs" />
<include name="CAPS/SimHttp.cs" /> <include name="CAPS/SimHttp.cs" />
<include name="UserServer/LocalUserProfileManager.cs" />
<include name="UserServer/LoginServer.cs" />
<include name="types/Mesh.cs" /> <include name="types/Mesh.cs" />
<include name="types/Triangle.cs" /> <include name="types/Triangle.cs" />
<include name="UserServer/LocalUserProfileManager.cs" />
<include name="UserServer/LoginServer.cs" />
<include name="world/Avatar.cs" /> <include name="world/Avatar.cs" />
<include name="world/AvatarAnimations.cs" /> <include name="world/AvatarAnimations.cs" />
<include name="world/Entity.cs" /> <include name="world/Entity.cs" />

53
OpenSim.RegionServer/OpenSimMain.cs
View File

@ -48,7 +48,7 @@ using OpenSim.Physics.Manager;
namespace OpenSim namespace OpenSim
{ {
public class OpenSimMain : OpenSimApplication public class OpenSimMain : OpenSimApplication, conscmd_callback
{ {
private Dictionary<EndPoint, uint> clientCircuits = new Dictionary<EndPoint, uint>(); private Dictionary<EndPoint, uint> clientCircuits = new Dictionary<EndPoint, uint>();
private PhysicsManager physManager; private PhysicsManager physManager;
@ -67,8 +67,12 @@ namespace OpenSim
public bool sandbox = false; public bool sandbox = false;
public bool loginserver = false; public bool loginserver = false;
protected ConsoleBase m_console;
public OpenSimMain() public OpenSimMain()
{ {
m_console = new ConsoleBase("region-console.log", "Region", this);
OpenSim.Framework.Console.MainConsole.Instance = m_console;
} }
public override void StartUp() public override void StartUp()
@ -246,6 +250,53 @@ namespace OpenSim
{ {
OpenSimRoot.Instance.LocalWorld.Update(); OpenSimRoot.Instance.LocalWorld.Update();
} }
public void RunCmd(string command, string[] cmdparams)
{
switch (command)
{
case "help":
m_console.WriteLine("show users - show info about connected users");
m_console.WriteLine("shutdown - disconnect all clients and shutdown");
m_console.WriteLine("regenerate - regenerate the sim's terrain");
break;
case "show":
Show(cmdparams[0]);
break;
case "regenerate":
OpenSimRoot.Instance.LocalWorld.RegenerateTerrain();
break;
case "shutdown":
OpenSimRoot.Instance.Shutdown();
break;
}
}
public void Show(string ShowWhat)
{
switch (ShowWhat)
{
case "uptime":
m_console.WriteLine("OpenSim has been running since " + OpenSimRoot.Instance.startuptime.ToString());
m_console.WriteLine("That is " + (DateTime.Now - OpenSimRoot.Instance.startuptime).ToString());
break;
case "users":
OpenSim.world.Avatar TempAv;
m_console.WriteLine(String.Format("{0,-16}{1,-16}{2,-25}{3,-25}{4,-16}{5,-16}", "Firstname", "Lastname", "Agent ID", "Session ID", "Circuit", "IP"));
foreach (libsecondlife.LLUUID UUID in OpenSimRoot.Instance.LocalWorld.Entities.Keys)
{
if (OpenSimRoot.Instance.LocalWorld.Entities[UUID].ToString() == "OpenSim.world.Avatar")
{
TempAv = (OpenSim.world.Avatar)OpenSimRoot.Instance.LocalWorld.Entities[UUID];
m_console.WriteLine(String.Format("{0,-16}{1,-16}{2,-25}{3,-25}{4,-16},{5,-16}", TempAv.firstname, TempAv.lastname, UUID, TempAv.ControllingClient.SessionID, TempAv.ControllingClient.CircuitCode, TempAv.ControllingClient.userEP.ToString()));
}
}
break;
}
}
} }

2
OpenSim.RegionServer/SimClient.cs
View File

@ -490,7 +490,7 @@ namespace OpenSim
} }
} }
//ServerConsole.MainConsole.Instance.WriteLine("OUT: \n" + Pack.ToString()); //MainConsole.Instance.WriteLine("OUT: \n" + Pack.ToString());
byte[] ZeroOutBuffer = new byte[4096]; byte[] ZeroOutBuffer = new byte[4096];
byte[] sendbuffer; byte[] sendbuffer;

211
OpenSim.RegionServer/SimConsole.cs
View File

@ -1,211 +0,0 @@
/*
* Copyright (c) OpenSim project, http://sim.opensecondlife.org/
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* * Neither the name of the <organization> nor the
* names of its contributors may be used to endorse or promote products
* derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY <copyright holder> ``AS IS'' AND ANY
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL <copyright holder> BE LIABLE FOR ANY
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
*/
using System;
using System.Collections;
using System.Collections.Generic;
using System.Threading;
using System.IO;
using System.Net;
using libsecondlife;
using libsecondlife.Packets;
using OpenSim.Framework.Console;
namespace OpenSim
{
/// <summary>
/// Description of ServerConsole.
/// </summary>
public class SimConsole : ConsoleBase
{
private ConsoleType ConsType;
StreamWriter Log;
// STUPID HACK ALERT!!!! STUPID HACK ALERT!!!!!
// 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
// SimChat - the AgentID of this sim's admin
// and for the iparam:
// TCP - the port to bind to
// Local - param ignored
// SimChat - the chat channel to accept commands from
public SimConsole(ConsoleType constype, string sparam, int iparam) {
ConsType = constype;
switch(constype) {
case ConsoleType.Local:
Console.WriteLine("ServerConsole.cs - creating new local console");
Console.WriteLine("Logs will be saved to current directory in opensim-console.log");
Log=File.AppendText("opensim-console.log");
Log.WriteLine("========================================================================");
//Log.WriteLine("OpenSim " + VersionInfo.Version + " Started at " + DateTime.Now.ToString());
break;
case ConsoleType.TCP:
break;
case ConsoleType.SimChat:
break;
default:
Console.WriteLine("ServerConsole.cs - what are you smoking? that isn't a valid console type!");
break;
}
}
public override void Close() {
Log.WriteLine("OpenSim shutdown at " + DateTime.Now.ToString());
Log.Close();
}
public override void Write(string format, params object[] args)
{
Log.Write(format, args);
Console.Write(format, args);
return;
}
public override void WriteLine(string format, params object[] args)
{
Log.WriteLine(format, args);
Console.WriteLine(format, args);
return;
}
public override string ReadLine()
{
string TempStr=Console.ReadLine();
Log.WriteLine(TempStr);
return TempStr;
}
public override int Read() {
int TempInt= Console.Read();
Log.Write((char)TempInt);
return TempInt;
}
// Displays a command prompt and waits for the user to enter a string, then returns that string
public override string CmdPrompt(string prompt) {
this.Write(prompt);
return this.ReadLine();
}
// Displays a command prompt and returns a default value if the user simply presses enter
public override string CmdPrompt(string prompt, string defaultresponse) {
string temp=CmdPrompt(prompt);
if(temp=="") {
return defaultresponse;
} else {
return temp;
}
}
// Displays a command prompt and returns a default value, user may only enter 1 of 2 options
public override string CmdPrompt(string prompt, string defaultresponse, string OptionA, string OptionB) {
bool itisdone=false;
string temp=CmdPrompt(prompt,defaultresponse);
while(itisdone==false) {
if((temp==OptionA) || (temp==OptionB)) {
itisdone=true;
} else {
this.WriteLine("Valid options are " + OptionA + " or " + OptionB);
temp=CmdPrompt(prompt,defaultresponse);
}
}
return temp;
}
// Runs a command with a number of parameters
public override Object RunCmd(string Cmd, string[] cmdparams) {
switch(Cmd) {
case "help":
this.WriteLine("show users - show info about connected users");
this.WriteLine("shutdown - disconnect all clients and shutdown");
this.WriteLine("regenerate - regenerate the sim's terrain");
break;
case "show":
ShowCommands(cmdparams[0]);
break;
case "regenerate":
OpenSimRoot.Instance.LocalWorld.RegenerateTerrain();
break;
case "shutdown":
OpenSimRoot.Instance.Shutdown();
break;
}
return null;
}
// Shows data about something
public override void ShowCommands(string ShowWhat) {
switch(ShowWhat) {
case "uptime":
this.WriteLine("OpenSim has been running since " + OpenSimRoot.Instance.startuptime.ToString());
this.WriteLine("That is " + (DateTime.Now-OpenSimRoot.Instance.startuptime).ToString());
break;
case "users":
OpenSim.world.Avatar TempAv;
this.WriteLine(String.Format("{0,-16}{1,-16}{2,-25}{3,-25}{4,-16}{5,-16}","Firstname", "Lastname","Agent ID", "Session ID", "Circuit", "IP"));
foreach (libsecondlife.LLUUID UUID in OpenSimRoot.Instance.LocalWorld.Entities.Keys) {
if(OpenSimRoot.Instance.LocalWorld.Entities[UUID].ToString()== "OpenSim.world.Avatar")
{
TempAv=(OpenSim.world.Avatar)OpenSimRoot.Instance.LocalWorld.Entities[UUID];
this.WriteLine(String.Format("{0,-16}{1,-16}{2,-25}{3,-25}{4,-16},{5,-16}",TempAv.firstname, TempAv.lastname,UUID, TempAv.ControllingClient.SessionID, TempAv.ControllingClient.CircuitCode, TempAv.ControllingClient.userEP.ToString()));
}
}
break;
}
}
// Displays a prompt to the user and then runs the command they entered
public override void MainConsolePrompt() {
string[] tempstrarray;
string tempstr = this.CmdPrompt("OpenSim-" + OpenSimRoot.Instance.Cfg.RegionHandle.ToString() + " # ");
tempstrarray = tempstr.Split(' ');
string cmd=tempstrarray[0];
Array.Reverse(tempstrarray);
Array.Resize<string>(ref tempstrarray,tempstrarray.Length-1);
Array.Reverse(tempstrarray);
string[] cmdparams=(string[])tempstrarray;
RunCmd(cmd,cmdparams);
}
public override void SetStatus(string status)
{
Console.Write( status + "\r" );
}
}
}

2
OpenSim.RegionServer/world/World.cs
View File

@ -34,7 +34,7 @@ namespace OpenSim.world
OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs - creating LandMap"); OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs - creating LandMap");
TerrainManager = new TerrainManager(new SecondLife()); TerrainManager = new TerrainManager(new SecondLife());
Avatar.SetupTemplate("avatar-template.dat"); Avatar.SetupTemplate("avatar-template.dat");
// ServerConsole.MainConsole.Instance.WriteLine("World.cs - Creating script engine instance"); // MainConsole.Instance.WriteLine("World.cs - Creating script engine instance");
// Initialise this only after the world has loaded // Initialise this only after the world has loaded
// Scripts = new ScriptEngine(this); // Scripts = new ScriptEngine(this);
Avatar.LoadAnims(); Avatar.LoadAnims();

6
OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj
View File

@ -3,7 +3,7 @@
<ProjectType>Local</ProjectType> <ProjectType>Local</ProjectType>
<ProductVersion>8.0.50727</ProductVersion> <ProductVersion>8.0.50727</ProductVersion>
<SchemaVersion>2.0</SchemaVersion> <SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{77247AFE-B2E3-4721-BA74-C01B10105E11}</ProjectGuid> <ProjectGuid>{CB1411EF-BF7B-49B4-814B-A1D50D1AC7D2}</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>
@ -78,13 +78,13 @@
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\OpenSim.Framework\OpenSim.Framework.csproj"> <ProjectReference Include="..\..\OpenSim.Framework\OpenSim.Framework.csproj">
<Name>OpenSim.Framework</Name> <Name>OpenSim.Framework</Name>
<Project>{26E437F6-BA50-44CD-BB44-E911E25CA88C}</Project> <Project>{90D4F7AF-D75E-4DE8-A0E1-70CC242B31A1}</Project>
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
<Private>False</Private> <Private>False</Private>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj"> <ProjectReference Include="..\..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj">
<Name>OpenSim.Framework.Console</Name> <Name>OpenSim.Framework.Console</Name>
<Project>{F5AD51E9-CF59-4C70-A586-CBD161EBB85F}</Project> <Project>{7AED7536-7D6B-4E28-8016-B5A554C663B4}</Project>
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
<Private>False</Private> <Private>False</Private>
</ProjectReference> </ProjectReference>

2
OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build
View File

@ -7,7 +7,7 @@
<fileset basedir="${project::get-base-directory()}"> <fileset basedir="${project::get-base-directory()}">
</fileset> </fileset>
</copy> </copy>
<csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
<resources prefix="OpenSim.Storage.LocalStorageDb4o" dynamicprefix="true" > <resources prefix="OpenSim.Storage.LocalStorageDb4o" dynamicprefix="true" >
</resources> </resources>
<sources failonempty="true"> <sources failonempty="true">

52
OpenSim.build
View File

@ -6,6 +6,12 @@
<property name="obj.dir" value="obj" /> <property name="obj.dir" value="obj" />
<property name="doc.dir" value="doc" /> <property name="doc.dir" value="doc" />
<property name="project.main.dir" value="${project::get-base-directory()}" /> <property name="project.main.dir" value="${project::get-base-directory()}" />
<target name="Debug" description="">
<property name="project.config" value="Debug" />
<property name="build.debug" value="true" />
</target>
<property name="project.config" value="Release" /> <property name="project.config" value="Release" />
<target name="Release" description=""> <target name="Release" description="">
@ -13,12 +19,6 @@
<property name="build.debug" value="false" /> <property name="build.debug" value="false" />
</target> </target>
<target name="Debug" description="">
<property name="project.config" value="Debug" />
<property name="build.debug" value="true" />
</target>
<target name="net-1.1" description="Sets framework to .NET 1.1"> <target name="net-1.1" description="Sets framework to .NET 1.1">
<property name="nant.settings.currentframework" value="net-1.1" /> <property name="nant.settings.currentframework" value="net-1.1" />
</target> </target>
@ -46,27 +46,26 @@
<echo message="Deleting all builds from all configurations" /> <echo message="Deleting all builds from all configurations" />
<delete dir="${bin.dir}" failonerror="false" /> <delete dir="${bin.dir}" failonerror="false" />
<delete dir="${obj.dir}" failonerror="false" /> <delete dir="${obj.dir}" failonerror="false" />
<nant buildfile="OpenSim.Framework/OpenSim.Framework.dll.build" target="clean" /> <nant buildfile="OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build" target="clean" />
<nant buildfile="OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build" target="clean" /> <nant buildfile="OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build" target="clean" />
<nant buildfile="OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build" target="clean" />
<nant buildfile="OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build" target="clean" />
<nant buildfile="OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build" target="clean" />
<nant buildfile="OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build" target="clean" />
<nant buildfile="OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.dll.build" target="clean" /> <nant buildfile="OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.dll.build" target="clean" />
<nant buildfile="OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build" target="clean" /> <nant buildfile="OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build" target="clean" />
<nant buildfile="OpenGridServices.ServerConsole/OpenGridServices.ServerConsole.dll.build" target="clean" />
<nant buildfile="OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build" target="clean" />
<nant buildfile="OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build" target="clean" />
<nant buildfile="OpenSim/OpenSim.exe.build" target="clean" />
<nant buildfile="OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build" target="clean" />
<nant buildfile="OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build" target="clean" /> <nant buildfile="OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build" target="clean" />
<nant buildfile="OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build" target="clean" />
<nant buildfile="OpenSim.Framework/OpenSim.Framework.dll.build" target="clean" />
<nant buildfile="OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build" target="clean" />
<nant buildfile="OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build" target="clean" />
<nant buildfile="OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build" target="clean" />
<nant buildfile="OpenSim.RegionServer/OpenSim.RegionServer.dll.build" target="clean" /> <nant buildfile="OpenSim.RegionServer/OpenSim.RegionServer.dll.build" target="clean" />
<nant buildfile="OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build" target="clean" />
<nant buildfile="OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build" target="clean" />
<nant buildfile="OpenSim/OpenSim.exe.build" target="clean" />
</target> </target>
<target name="build" depends="init" description=""> <target name="build" depends="init" description="">
<nant buildfile="OpenSim.Framework/OpenSim.Framework.dll.build" target="build" /> <nant buildfile="OpenSim.Framework/OpenSim.Framework.dll.build" target="build" />
<nant buildfile="OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build" target="build" /> <nant buildfile="OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build" target="build" />
<nant buildfile="OpenGridServices.ServerConsole/OpenGridServices.ServerConsole.dll.build" target="build" /> <nant buildfile="OpenSim.Framework/OpenSim.Framework.dll.build" target="build" />
<nant buildfile="OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build" target="build" /> <nant buildfile="OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build" target="build" />
<nant buildfile="OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build" target="build" /> <nant buildfile="OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build" target="build" />
<nant buildfile="OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build" target="build" /> <nant buildfile="OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build" target="build" />
@ -89,21 +88,20 @@
<target name="doc" depends="build-release"> <target name="doc" depends="build-release">
<echo message="Generating all documentation from all builds" /> <echo message="Generating all documentation from all builds" />
<nant buildfile="OpenSim.Framework/OpenSim.Framework.dll.build" target="doc" /> <nant buildfile="OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build" target="doc" />
<nant buildfile="OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build" target="doc" /> <nant buildfile="OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build" target="doc" />
<nant buildfile="OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build" target="doc" />
<nant buildfile="OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build" target="doc" />
<nant buildfile="OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build" target="doc" />
<nant buildfile="OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build" target="doc" />
<nant buildfile="OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.dll.build" target="doc" /> <nant buildfile="OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.dll.build" target="doc" />
<nant buildfile="OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build" target="doc" /> <nant buildfile="OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build" target="doc" />
<nant buildfile="OpenGridServices.ServerConsole/OpenGridServices.ServerConsole.dll.build" target="doc" />
<nant buildfile="OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build" target="doc" />
<nant buildfile="OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build" target="doc" />
<nant buildfile="OpenSim/OpenSim.exe.build" target="doc" />
<nant buildfile="OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build" target="doc" />
<nant buildfile="OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build" target="doc" /> <nant buildfile="OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build" target="doc" />
<nant buildfile="OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build" target="doc" />
<nant buildfile="OpenSim.Framework/OpenSim.Framework.dll.build" target="doc" />
<nant buildfile="OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build" target="doc" />
<nant buildfile="OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build" target="doc" />
<nant buildfile="OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build" target="doc" />
<nant buildfile="OpenSim.RegionServer/OpenSim.RegionServer.dll.build" target="doc" /> <nant buildfile="OpenSim.RegionServer/OpenSim.RegionServer.dll.build" target="doc" />
<nant buildfile="OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build" target="doc" />
<nant buildfile="OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build" target="doc" />
<nant buildfile="OpenSim/OpenSim.exe.build" target="doc" />
</target> </target>
</project> </project>

146
OpenSim.sln
View File

@ -1,34 +1,32 @@
Microsoft Visual Studio Solution File, Format Version 9.00 Microsoft Visual Studio Solution File, Format Version 9.00
# Visual Studio 2005 # Visual Studio 2005
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGridServices.ServerConsole", "OpenGridServices.ServerConsole\OpenGridServices.ServerConsole.csproj", "{7DC4E7C8-89A4-4A8D-9617-3DF262990663}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.PhysXPlugin", "OpenSim.Physics\PhysXPlugin\OpenSim.Physics.PhysXPlugin.csproj", "{E1510E0F-EFCB-4702-BCB6-96A084454B55}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Console", "OpenSim.Framework.Console\OpenSim.Framework.Console.csproj", "{F5AD51E9-CF59-4C70-A586-CBD161EBB85F}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Console", "OpenSim.Framework.Console\OpenSim.Framework.Console.csproj", "{7AED7536-7D6B-4E28-8016-B5A554C663B4}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Config.SimConfigDb4o", "OpenSim.Config\SimConfigDb4o\OpenSim.Config.SimConfigDb4o.csproj", "{C7215018-D379-492D-9BB0-4B9DA0C6B9A0}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Config.SimConfigDb4o", "OpenSim.Config\SimConfigDb4o\OpenSim.Config.SimConfigDb4o.csproj", "{C83C9D5B-655E-447D-90CA-7C4AB2F814DD}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGridServices.UserServer", "OpenGridServices.UserServer\OpenGridServices.UserServer.csproj", "{3FE545CA-1179-42DF-BDF1-F14DEA463A21}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGridServices.UserServer", "OpenGridServices.UserServer\OpenGridServices.UserServer.csproj", "{36895293-A627-42EC-BA77-6AF6F5A4A7DF}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.GridInterfaces.Remote", "OpenSim.GridInterfaces\Remote\OpenSim.GridInterfaces.Remote.csproj", "{A6D9D790-2B1F-4088-BE12-91C4A69C1586}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.GridInterfaces.Remote", "OpenSim.GridInterfaces\Remote\OpenSim.GridInterfaces.Remote.csproj", "{BFCBC85D-2071-4294-923C-EC62D841A219}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Storage.LocalStorageDb4o", "OpenSim.Storage\LocalStorageDb4o\OpenSim.Storage.LocalStorageDb4o.csproj", "{77247AFE-B2E3-4721-BA74-C01B10105E11}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Storage.LocalStorageDb4o", "OpenSim.Storage\LocalStorageDb4o\OpenSim.Storage.LocalStorageDb4o.csproj", "{CB1411EF-BF7B-49B4-814B-A1D50D1AC7D2}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework", "OpenSim.Framework\OpenSim.Framework.csproj", "{26E437F6-BA50-44CD-BB44-E911E25CA88C}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework", "OpenSim.Framework\OpenSim.Framework.csproj", "{90D4F7AF-D75E-4DE8-A0E1-70CC242B31A1}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGridServices.GridServer", "OpenGridServices.GridServer\OpenGridServices.GridServer.csproj", "{F7DE71C5-CD20-4AD8-83A4-1363066853A6}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGridServices.GridServer", "OpenGridServices.GridServer\OpenGridServices.GridServer.csproj", "{3378EE78-2D72-4C21-8F9D-680B33AAFFEE}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.OdePlugin", "OpenSim.Physics\OdePlugin\OpenSim.Physics.OdePlugin.csproj", "{58E9E005-093A-4E83-AB76-CA02CD14E53D}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.OdePlugin", "OpenSim.Physics\OdePlugin\OpenSim.Physics.OdePlugin.csproj", "{C81B7E61-943D-4190-87C3-CB02BF67A2B3}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.BasicPhysicsPlugin", "OpenSim.Physics\BasicPhysicsPlugin\OpenSim.Physics.BasicPhysicsPlugin.csproj", "{5FBFB649-50BB-4CAB-B26C-29410D885559}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.BasicPhysicsPlugin", "OpenSim.Physics\BasicPhysicsPlugin\OpenSim.Physics.BasicPhysicsPlugin.csproj", "{1F6E0D7F-D82D-4A21-B61D-970294EC1CAD}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim", "OpenSim\OpenSim.csproj", "{455F3378-FE4B-4A17-907D-52AEA3C1045F}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.RegionServer", "OpenSim.RegionServer\OpenSim.RegionServer.csproj", "{4171D545-81F5-4C64-AD29-6D7414C38181}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.RegionServer", "OpenSim.RegionServer\OpenSim.RegionServer.csproj", "{A88526E3-397A-479D-93E1-8865F3336A87}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.Manager", "OpenSim.Physics\Manager\OpenSim.Physics.Manager.csproj", "{0AAA0EEB-1F2C-4B4B-9BFA-7C3E45BCD348}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.Manager", "OpenSim.Physics\Manager\OpenSim.Physics.Manager.csproj", "{12F74CC6-E820-4716-8A34-A7B67B9EB3CC}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.GridInterfaces.Local", "OpenSim.GridInterfaces\Local\OpenSim.GridInterfaces.Local.csproj", "{21403281-9649-4CE8-869C-E4F2075DEE94}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.GridInterfaces.Local", "OpenSim.GridInterfaces\Local\OpenSim.GridInterfaces.Local.csproj", "{DB2D6331-438F-4C3F-83FD-B958E261CB0C}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim", "OpenSim\OpenSim.csproj", "{5304CCD5-4902-4C6B-ADDE-2181B2F42FD6}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.PhysXPlugin", "OpenSim.Physics\PhysXPlugin\OpenSim.Physics.PhysXPlugin.csproj", "{69C8F939-AF90-46A1-8888-D779C5A8868E}"
EndProject EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
@ -36,66 +34,62 @@ Global
Release|Any CPU = Release|Any CPU Release|Any CPU = Release|Any CPU
EndGlobalSection EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution GlobalSection(ProjectConfigurationPlatforms) = postSolution
{7DC4E7C8-89A4-4A8D-9617-3DF262990663}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {E1510E0F-EFCB-4702-BCB6-96A084454B55}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7DC4E7C8-89A4-4A8D-9617-3DF262990663}.Debug|Any CPU.Build.0 = Debug|Any CPU {E1510E0F-EFCB-4702-BCB6-96A084454B55}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7DC4E7C8-89A4-4A8D-9617-3DF262990663}.Release|Any CPU.ActiveCfg = Release|Any CPU {E1510E0F-EFCB-4702-BCB6-96A084454B55}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7DC4E7C8-89A4-4A8D-9617-3DF262990663}.Release|Any CPU.Build.0 = Release|Any CPU {E1510E0F-EFCB-4702-BCB6-96A084454B55}.Release|Any CPU.Build.0 = Release|Any CPU
{F5AD51E9-CF59-4C70-A586-CBD161EBB85F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {7AED7536-7D6B-4E28-8016-B5A554C663B4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F5AD51E9-CF59-4C70-A586-CBD161EBB85F}.Debug|Any CPU.Build.0 = Debug|Any CPU {7AED7536-7D6B-4E28-8016-B5A554C663B4}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F5AD51E9-CF59-4C70-A586-CBD161EBB85F}.Release|Any CPU.ActiveCfg = Release|Any CPU {7AED7536-7D6B-4E28-8016-B5A554C663B4}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F5AD51E9-CF59-4C70-A586-CBD161EBB85F}.Release|Any CPU.Build.0 = Release|Any CPU {7AED7536-7D6B-4E28-8016-B5A554C663B4}.Release|Any CPU.Build.0 = Release|Any CPU
{C7215018-D379-492D-9BB0-4B9DA0C6B9A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {C83C9D5B-655E-447D-90CA-7C4AB2F814DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C7215018-D379-492D-9BB0-4B9DA0C6B9A0}.Debug|Any CPU.Build.0 = Debug|Any CPU {C83C9D5B-655E-447D-90CA-7C4AB2F814DD}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C7215018-D379-492D-9BB0-4B9DA0C6B9A0}.Release|Any CPU.ActiveCfg = Release|Any CPU {C83C9D5B-655E-447D-90CA-7C4AB2F814DD}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C7215018-D379-492D-9BB0-4B9DA0C6B9A0}.Release|Any CPU.Build.0 = Release|Any CPU {C83C9D5B-655E-447D-90CA-7C4AB2F814DD}.Release|Any CPU.Build.0 = Release|Any CPU
{3FE545CA-1179-42DF-BDF1-F14DEA463A21}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {36895293-A627-42EC-BA77-6AF6F5A4A7DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{3FE545CA-1179-42DF-BDF1-F14DEA463A21}.Debug|Any CPU.Build.0 = Debug|Any CPU {36895293-A627-42EC-BA77-6AF6F5A4A7DF}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3FE545CA-1179-42DF-BDF1-F14DEA463A21}.Release|Any CPU.ActiveCfg = Release|Any CPU {36895293-A627-42EC-BA77-6AF6F5A4A7DF}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3FE545CA-1179-42DF-BDF1-F14DEA463A21}.Release|Any CPU.Build.0 = Release|Any CPU {36895293-A627-42EC-BA77-6AF6F5A4A7DF}.Release|Any CPU.Build.0 = Release|Any CPU
{A6D9D790-2B1F-4088-BE12-91C4A69C1586}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {BFCBC85D-2071-4294-923C-EC62D841A219}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A6D9D790-2B1F-4088-BE12-91C4A69C1586}.Debug|Any CPU.Build.0 = Debug|Any CPU {BFCBC85D-2071-4294-923C-EC62D841A219}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A6D9D790-2B1F-4088-BE12-91C4A69C1586}.Release|Any CPU.ActiveCfg = Release|Any CPU {BFCBC85D-2071-4294-923C-EC62D841A219}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A6D9D790-2B1F-4088-BE12-91C4A69C1586}.Release|Any CPU.Build.0 = Release|Any CPU {BFCBC85D-2071-4294-923C-EC62D841A219}.Release|Any CPU.Build.0 = Release|Any CPU
{77247AFE-B2E3-4721-BA74-C01B10105E11}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {CB1411EF-BF7B-49B4-814B-A1D50D1AC7D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{77247AFE-B2E3-4721-BA74-C01B10105E11}.Debug|Any CPU.Build.0 = Debug|Any CPU {CB1411EF-BF7B-49B4-814B-A1D50D1AC7D2}.Debug|Any CPU.Build.0 = Debug|Any CPU
{77247AFE-B2E3-4721-BA74-C01B10105E11}.Release|Any CPU.ActiveCfg = Release|Any CPU {CB1411EF-BF7B-49B4-814B-A1D50D1AC7D2}.Release|Any CPU.ActiveCfg = Release|Any CPU
{77247AFE-B2E3-4721-BA74-C01B10105E11}.Release|Any CPU.Build.0 = Release|Any CPU {CB1411EF-BF7B-49B4-814B-A1D50D1AC7D2}.Release|Any CPU.Build.0 = Release|Any CPU
{26E437F6-BA50-44CD-BB44-E911E25CA88C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {90D4F7AF-D75E-4DE8-A0E1-70CC242B31A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{26E437F6-BA50-44CD-BB44-E911E25CA88C}.Debug|Any CPU.Build.0 = Debug|Any CPU {90D4F7AF-D75E-4DE8-A0E1-70CC242B31A1}.Debug|Any CPU.Build.0 = Debug|Any CPU
{26E437F6-BA50-44CD-BB44-E911E25CA88C}.Release|Any CPU.ActiveCfg = Release|Any CPU {90D4F7AF-D75E-4DE8-A0E1-70CC242B31A1}.Release|Any CPU.ActiveCfg = Release|Any CPU
{26E437F6-BA50-44CD-BB44-E911E25CA88C}.Release|Any CPU.Build.0 = Release|Any CPU {90D4F7AF-D75E-4DE8-A0E1-70CC242B31A1}.Release|Any CPU.Build.0 = Release|Any CPU
{F7DE71C5-CD20-4AD8-83A4-1363066853A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {3378EE78-2D72-4C21-8F9D-680B33AAFFEE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F7DE71C5-CD20-4AD8-83A4-1363066853A6}.Debug|Any CPU.Build.0 = Debug|Any CPU {3378EE78-2D72-4C21-8F9D-680B33AAFFEE}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F7DE71C5-CD20-4AD8-83A4-1363066853A6}.Release|Any CPU.ActiveCfg = Release|Any CPU {3378EE78-2D72-4C21-8F9D-680B33AAFFEE}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F7DE71C5-CD20-4AD8-83A4-1363066853A6}.Release|Any CPU.Build.0 = Release|Any CPU {3378EE78-2D72-4C21-8F9D-680B33AAFFEE}.Release|Any CPU.Build.0 = Release|Any CPU
{58E9E005-093A-4E83-AB76-CA02CD14E53D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {C81B7E61-943D-4190-87C3-CB02BF67A2B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{58E9E005-093A-4E83-AB76-CA02CD14E53D}.Debug|Any CPU.Build.0 = Debug|Any CPU {C81B7E61-943D-4190-87C3-CB02BF67A2B3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{58E9E005-093A-4E83-AB76-CA02CD14E53D}.Release|Any CPU.ActiveCfg = Release|Any CPU {C81B7E61-943D-4190-87C3-CB02BF67A2B3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{58E9E005-093A-4E83-AB76-CA02CD14E53D}.Release|Any CPU.Build.0 = Release|Any CPU {C81B7E61-943D-4190-87C3-CB02BF67A2B3}.Release|Any CPU.Build.0 = Release|Any CPU
{5FBFB649-50BB-4CAB-B26C-29410D885559}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {1F6E0D7F-D82D-4A21-B61D-970294EC1CAD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5FBFB649-50BB-4CAB-B26C-29410D885559}.Debug|Any CPU.Build.0 = Debug|Any CPU {1F6E0D7F-D82D-4A21-B61D-970294EC1CAD}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5FBFB649-50BB-4CAB-B26C-29410D885559}.Release|Any CPU.ActiveCfg = Release|Any CPU {1F6E0D7F-D82D-4A21-B61D-970294EC1CAD}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5FBFB649-50BB-4CAB-B26C-29410D885559}.Release|Any CPU.Build.0 = Release|Any CPU {1F6E0D7F-D82D-4A21-B61D-970294EC1CAD}.Release|Any CPU.Build.0 = Release|Any CPU
{455F3378-FE4B-4A17-907D-52AEA3C1045F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {4171D545-81F5-4C64-AD29-6D7414C38181}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{455F3378-FE4B-4A17-907D-52AEA3C1045F}.Debug|Any CPU.Build.0 = Debug|Any CPU {4171D545-81F5-4C64-AD29-6D7414C38181}.Debug|Any CPU.Build.0 = Debug|Any CPU
{455F3378-FE4B-4A17-907D-52AEA3C1045F}.Release|Any CPU.ActiveCfg = Release|Any CPU {4171D545-81F5-4C64-AD29-6D7414C38181}.Release|Any CPU.ActiveCfg = Release|Any CPU
{455F3378-FE4B-4A17-907D-52AEA3C1045F}.Release|Any CPU.Build.0 = Release|Any CPU {4171D545-81F5-4C64-AD29-6D7414C38181}.Release|Any CPU.Build.0 = Release|Any CPU
{A88526E3-397A-479D-93E1-8865F3336A87}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {0AAA0EEB-1F2C-4B4B-9BFA-7C3E45BCD348}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A88526E3-397A-479D-93E1-8865F3336A87}.Debug|Any CPU.Build.0 = Debug|Any CPU {0AAA0EEB-1F2C-4B4B-9BFA-7C3E45BCD348}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A88526E3-397A-479D-93E1-8865F3336A87}.Release|Any CPU.ActiveCfg = Release|Any CPU {0AAA0EEB-1F2C-4B4B-9BFA-7C3E45BCD348}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A88526E3-397A-479D-93E1-8865F3336A87}.Release|Any CPU.Build.0 = Release|Any CPU {0AAA0EEB-1F2C-4B4B-9BFA-7C3E45BCD348}.Release|Any CPU.Build.0 = Release|Any CPU
{12F74CC6-E820-4716-8A34-A7B67B9EB3CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {21403281-9649-4CE8-869C-E4F2075DEE94}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{12F74CC6-E820-4716-8A34-A7B67B9EB3CC}.Debug|Any CPU.Build.0 = Debug|Any CPU {21403281-9649-4CE8-869C-E4F2075DEE94}.Debug|Any CPU.Build.0 = Debug|Any CPU
{12F74CC6-E820-4716-8A34-A7B67B9EB3CC}.Release|Any CPU.ActiveCfg = Release|Any CPU {21403281-9649-4CE8-869C-E4F2075DEE94}.Release|Any CPU.ActiveCfg = Release|Any CPU
{12F74CC6-E820-4716-8A34-A7B67B9EB3CC}.Release|Any CPU.Build.0 = Release|Any CPU {21403281-9649-4CE8-869C-E4F2075DEE94}.Release|Any CPU.Build.0 = Release|Any CPU
{DB2D6331-438F-4C3F-83FD-B958E261CB0C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {5304CCD5-4902-4C6B-ADDE-2181B2F42FD6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{DB2D6331-438F-4C3F-83FD-B958E261CB0C}.Debug|Any CPU.Build.0 = Debug|Any CPU {5304CCD5-4902-4C6B-ADDE-2181B2F42FD6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{DB2D6331-438F-4C3F-83FD-B958E261CB0C}.Release|Any CPU.ActiveCfg = Release|Any CPU {5304CCD5-4902-4C6B-ADDE-2181B2F42FD6}.Release|Any CPU.ActiveCfg = Release|Any CPU
{DB2D6331-438F-4C3F-83FD-B958E261CB0C}.Release|Any CPU.Build.0 = Release|Any CPU {5304CCD5-4902-4C6B-ADDE-2181B2F42FD6}.Release|Any CPU.Build.0 = Release|Any CPU
{69C8F939-AF90-46A1-8888-D779C5A8868E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{69C8F939-AF90-46A1-8888-D779C5A8868E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{69C8F939-AF90-46A1-8888-D779C5A8868E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{69C8F939-AF90-46A1-8888-D779C5A8868E}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE

10
OpenSim/OpenSim.csproj
View File

@ -3,7 +3,7 @@
<ProjectType>Local</ProjectType> <ProjectType>Local</ProjectType>
<ProductVersion>8.0.50727</ProductVersion> <ProductVersion>8.0.50727</ProductVersion>
<SchemaVersion>2.0</SchemaVersion> <SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{455F3378-FE4B-4A17-907D-52AEA3C1045F}</ProjectGuid> <ProjectGuid>{5304CCD5-4902-4C6B-ADDE-2181B2F42FD6}</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>
@ -82,25 +82,25 @@
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\OpenSim.Framework\OpenSim.Framework.csproj"> <ProjectReference Include="..\OpenSim.Framework\OpenSim.Framework.csproj">
<Name>OpenSim.Framework</Name> <Name>OpenSim.Framework</Name>
<Project>{26E437F6-BA50-44CD-BB44-E911E25CA88C}</Project> <Project>{90D4F7AF-D75E-4DE8-A0E1-70CC242B31A1}</Project>
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
<Private>False</Private> <Private>False</Private>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj"> <ProjectReference Include="..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj">
<Name>OpenSim.Framework.Console</Name> <Name>OpenSim.Framework.Console</Name>
<Project>{F5AD51E9-CF59-4C70-A586-CBD161EBB85F}</Project> <Project>{7AED7536-7D6B-4E28-8016-B5A554C663B4}</Project>
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
<Private>False</Private> <Private>False</Private>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\OpenSim.Physics\Manager\OpenSim.Physics.Manager.csproj"> <ProjectReference Include="..\OpenSim.Physics\Manager\OpenSim.Physics.Manager.csproj">
<Name>OpenSim.Physics.Manager</Name> <Name>OpenSim.Physics.Manager</Name>
<Project>{12F74CC6-E820-4716-8A34-A7B67B9EB3CC}</Project> <Project>{0AAA0EEB-1F2C-4B4B-9BFA-7C3E45BCD348}</Project>
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
<Private>False</Private> <Private>False</Private>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\OpenSim.RegionServer\OpenSim.RegionServer.csproj"> <ProjectReference Include="..\OpenSim.RegionServer\OpenSim.RegionServer.csproj">
<Name>OpenSim.RegionServer</Name> <Name>OpenSim.RegionServer</Name>
<Project>{A88526E3-397A-479D-93E1-8865F3336A87}</Project> <Project>{4171D545-81F5-4C64-AD29-6D7414C38181}</Project>
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
<Private>False</Private> <Private>False</Private>
</ProjectReference> </ProjectReference>

2
OpenSim/OpenSim.exe.build
View File

@ -7,7 +7,7 @@
<fileset basedir="${project::get-base-directory()}"> <fileset basedir="${project::get-base-directory()}">
</fileset> </fileset>
</copy> </copy>
<csc target="exe" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.exe"> <csc target="exe" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.exe">
<resources prefix="OpenSim" dynamicprefix="true" > <resources prefix="OpenSim" dynamicprefix="true" >
</resources> </resources>
<sources failonempty="true"> <sources failonempty="true">

2
OpenSim/RegionServer.cs
View File

@ -2,6 +2,7 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Text; using System.Text;
using OpenSim.UserServer; using OpenSim.UserServer;
using OpenSim.Framework.Console;
namespace OpenSim namespace OpenSim
{ {
@ -12,7 +13,6 @@ namespace OpenSim
{ {
Console.WriteLine("OpenSim " + VersionInfo.Version + "\n"); Console.WriteLine("OpenSim " + VersionInfo.Version + "\n");
Console.WriteLine("Starting...\n"); Console.WriteLine("Starting...\n");
OpenSim.Framework.Console.MainConsole.Instance = new SimConsole(OpenSim.Framework.Console.ConsoleBase.ConsoleType.Local, "", 0);
//OpenSimRoot.instance = new OpenSimRoot(); //OpenSimRoot.instance = new OpenSimRoot();
OpenSimMain sim = new OpenSimMain(); OpenSimMain sim = new OpenSimMain();

12
Prebuild/Prebuild.build
View File

@ -6,6 +6,12 @@
<property name="obj.dir" value="obj" /> <property name="obj.dir" value="obj" />
<property name="doc.dir" value="doc" /> <property name="doc.dir" value="doc" />
<property name="project.main.dir" value="${project::get-base-directory()}" /> <property name="project.main.dir" value="${project::get-base-directory()}" />
<target name="Debug" description="">
<property name="project.config" value="Debug" />
<property name="build.debug" value="true" />
</target>
<property name="project.config" value="Release" /> <property name="project.config" value="Release" />
<target name="Release" description=""> <target name="Release" description="">
@ -13,12 +19,6 @@
<property name="build.debug" value="false" /> <property name="build.debug" value="false" />
</target> </target>
<target name="Debug" description="">
<property name="project.config" value="Debug" />
<property name="build.debug" value="true" />
</target>
<target name="net-1.1" description="Sets framework to .NET 1.1"> <target name="net-1.1" description="Sets framework to .NET 1.1">
<property name="nant.settings.currentframework" value="net-1.1" /> <property name="nant.settings.currentframework" value="net-1.1" />
</target> </target>

10
Prebuild/Prebuild.sln
View File

@ -1,6 +1,6 @@
Microsoft Visual Studio Solution File, Format Version 9.00 Microsoft Visual Studio Solution File, Format Version 9.00
# Visual Studio 2005 # Visual Studio 2005
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Prebuild", "src\Prebuild.csproj", "{2C6E5513-A51F-4F5C-9237-869A5ABEE7CF}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Prebuild", "src\Prebuild.csproj", "{912F8E52-C5A0-4912-A702-D6DC3F1B4B54}"
EndProject EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
@ -8,10 +8,10 @@ Global
Release|Any CPU = Release|Any CPU Release|Any CPU = Release|Any CPU
EndGlobalSection EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution GlobalSection(ProjectConfigurationPlatforms) = postSolution
{2C6E5513-A51F-4F5C-9237-869A5ABEE7CF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {912F8E52-C5A0-4912-A702-D6DC3F1B4B54}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2C6E5513-A51F-4F5C-9237-869A5ABEE7CF}.Debug|Any CPU.Build.0 = Debug|Any CPU {912F8E52-C5A0-4912-A702-D6DC3F1B4B54}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2C6E5513-A51F-4F5C-9237-869A5ABEE7CF}.Release|Any CPU.ActiveCfg = Release|Any CPU {912F8E52-C5A0-4912-A702-D6DC3F1B4B54}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2C6E5513-A51F-4F5C-9237-869A5ABEE7CF}.Release|Any CPU.Build.0 = Release|Any CPU {912F8E52-C5A0-4912-A702-D6DC3F1B4B54}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE

2
Prebuild/src/Prebuild.csproj
View File

@ -3,7 +3,7 @@
<ProjectType>Local</ProjectType> <ProjectType>Local</ProjectType>
<ProductVersion>8.0.50727</ProductVersion> <ProductVersion>8.0.50727</ProductVersion>
<SchemaVersion>2.0</SchemaVersion> <SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{2C6E5513-A51F-4F5C-9237-869A5ABEE7CF}</ProjectGuid> <ProjectGuid>{912F8E52-C5A0-4912-A702-D6DC3F1B4B54}</ProjectGuid>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ApplicationIcon>App.ico</ApplicationIcon> <ApplicationIcon>App.ico</ApplicationIcon>

2
Prebuild/src/Prebuild.exe.build
View File

@ -7,7 +7,7 @@
<fileset basedir="${project::get-base-directory()}"> <fileset basedir="${project::get-base-directory()}">
</fileset> </fileset>
</copy> </copy>
<csc target="exe" debug="${build.debug}" keyfile="Prebuild.snk" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.exe" win32icon="App.ico"> <csc target="exe" debug="${build.debug}" keyfile="Prebuild.snk" unsafe="False" define="DEBUG;TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.exe" win32icon="App.ico">
<resources prefix="Prebuild" dynamicprefix="true" > <resources prefix="Prebuild" dynamicprefix="true" >
<include name="App.ico" /> <include name="App.ico" />
<include name="data/prebuild-1.7.xsd" /> <include name="data/prebuild-1.7.xsd" />

332
Servers/CapsHttpServer.cs Normal file
View File

@ -0,0 +1,332 @@
/*
Copyright (c) OpenSimCAPS project, http://osgrid.org/
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* * Neither the name of the <organization> nor the
* names of its contributors may be used to endorse or promote products
* derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY <copyright holder> ``AS IS'' AND ANY
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL <copyright holder> BE LIABLE FOR ANY
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
using System;
using System.Text;
using Nwc.XmlRpc;
using System.Threading;
using System.Text.RegularExpressions;
using System.Net;
using System.IO;
using System.Collections;
using System.Collections.Generic;
using libsecondlife;
using OpenSim.Framework.Console;
using OpenSim.Framework.Interfaces;
namespace OpenSim.Servers
{
// Dummy HTTP server, does nothing useful for now
public class CapsHttpServer
{
public Thread HTTPD;
public HttpListener Listener;
private string AdminPage;
private string NewAccountForm;
private string LoginForm;
private string passWord = "Admin";
public CapsHttpServer()
{
OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Starting up HTTP Server");
HTTPD = new Thread(new ThreadStart(StartHTTP));
HTTPD.Start();
LoadAdminPage();
}
public void StartHTTP()
{
try
{
OpenSim.Framework.Console.MainConsole.Instance.WriteLine("SimHttp.cs:StartHTTP() - Spawned main thread OK");
Listener = new HttpListener();
Listener.Prefixes.Add("http://+:" + OpenSimRoot.Instance.Cfg.IPListenPort + "/");
Listener.Start();
HttpListenerContext context;
while (true)
{
context = Listener.GetContext();
ThreadPool.QueueUserWorkItem(new WaitCallback(HandleRequest), context);
}
}
catch (Exception e)
{
OpenSim.Framework.Console.MainConsole.Instance.WriteLine(e.Message);
}
}
private string ParseXMLRPC(string requestBody)
{
try
{
XmlRpcRequest request = (XmlRpcRequest)(new XmlRpcRequestDeserializer()).Deserialize(requestBody);
Hashtable requestData = (Hashtable)request.Params[0];
switch (request.MethodName)
{
case "expect_user":
AgentCircuitData agent_data = new AgentCircuitData();
agent_data.SessionID = new LLUUID((string)requestData["session_id"]);
agent_data.SecureSessionID = new LLUUID((string)requestData["secure_session_id"]);
agent_data.firstname = (string)requestData["firstname"];
agent_data.lastname = (string)requestData["lastname"];
agent_data.AgentID = new LLUUID((string)requestData["agent_id"]);
agent_data.circuitcode = Convert.ToUInt32(requestData["circuit_code"]);
if (OpenSimRoot.Instance.GridServers.GridServer.GetName() == "Remote")
{
((RemoteGridBase)OpenSimRoot.Instance.GridServers.GridServer).agentcircuits.Add((uint)agent_data.circuitcode, agent_data);
}
return "<?xml version=\"1.0\"?><methodResponse><params /></methodResponse>";
break;
}
}
catch (Exception e)
{
Console.WriteLine(e.ToString());
}
return "";
}
private string ParseREST(string requestBody, string requestURL, string requestMethod)
{
string responseString = "";
try
{
switch (requestURL)
{
case "/Admin/Accounts":
if (requestMethod == "GET")
{
responseString = "<p> Account management </p>";
responseString += "<br> ";
responseString += "<p> Create New Account </p>";
responseString += NewAccountForm;
}
break;
case "/Admin/Clients":
if (requestMethod == "GET")
{
responseString = " <p> Listing connected Clients </p>";
OpenSim.world.Avatar TempAv;
foreach (libsecondlife.LLUUID UUID in OpenSimRoot.Instance.LocalWorld.Entities.Keys)
{
if (OpenSimRoot.Instance.LocalWorld.Entities[UUID].ToString() == "OpenSim.world.Avatar")
{
TempAv = (OpenSim.world.Avatar)OpenSimRoot.Instance.LocalWorld.Entities[UUID];
responseString += "<p>";
responseString += String.Format("{0,-16}{1,-16}{2,-25}{3,-25}{4,-16},{5,-16}", TempAv.firstname, TempAv.lastname, UUID, TempAv.ControllingClient.SessionID, TempAv.ControllingClient.CircuitCode, TempAv.ControllingClient.userEP.ToString());
responseString += "</p>";
}
}
}
break;
case "/Admin/NewAccount":
if (requestMethod == "POST")
{
string[] comp = new string[10];
string[] passw = new string[3];
string delimStr = "&";
char[] delimiter = delimStr.ToCharArray();
string delimStr2 = "=";
char[] delimiter2 = delimStr2.ToCharArray();
//Console.WriteLine(requestBody);
comp = requestBody.Split(delimiter);
passw = comp[3].Split(delimiter2);
if (passw[1] == passWord)
{
responseString = "<p> New Account created </p>";
}
else
{
responseString = "<p> Admin password is incorrect, please login with the correct password</p>";
responseString += "<br><br>" + LoginForm;
}
}
break;
case "/Admin/Login":
if (requestMethod == "POST")
{
// Console.WriteLine(requestBody);
if (requestBody == passWord)
{
responseString = "<p> Login Successful </p>";
}
else
{
responseString = "<p> Password Error </p>";
responseString += "<p> Please Login with the correct password </p>";
responseString += "<br><br> " + LoginForm;
}
}
break;
case "/Admin/Welcome":
if (requestMethod == "GET")
{
responseString = "Welcome to the OpenSim Admin Page";
responseString += "<br><br><br> " + LoginForm;
}
break;
}
}
catch (Exception e)
{
Console.WriteLine(e.ToString());
}
return responseString;
}
private string ParseLLSDXML(string requestBody)
{
// dummy function for now - IMPLEMENT ME!
return "";
}
public void HandleRequest(Object stateinfo)
{
// Console.WriteLine("new http incoming");
HttpListenerContext context = (HttpListenerContext)stateinfo;
HttpListenerRequest request = context.Request;
HttpListenerResponse response = context.Response;
response.KeepAlive = false;
response.SendChunked = false;
System.IO.Stream body = request.InputStream;
System.Text.Encoding encoding = System.Text.Encoding.UTF8;
System.IO.StreamReader reader = new System.IO.StreamReader(body, encoding);
string requestBody = reader.ReadToEnd();
body.Close();
reader.Close();
//Console.WriteLine(request.HttpMethod + " " + request.RawUrl + " Http/" + request.ProtocolVersion.ToString() + " content type: " + request.ContentType);
//Console.WriteLine(requestBody);
string responseString = "";
switch (request.ContentType)
{
case "text/xml":
// must be XML-RPC, so pass to the XML-RPC parser
responseString = ParseXMLRPC(requestBody);
response.AddHeader("Content-type", "text/xml");
break;
case "application/xml":
// probably LLSD we hope, otherwise it should be ignored by the parser
responseString = ParseLLSDXML(requestBody);
response.AddHeader("Content-type", "application/xml");
break;
case "application/x-www-form-urlencoded":
// a form data POST so send to the REST parser
responseString = ParseREST(requestBody, request.RawUrl, request.HttpMethod);
response.AddHeader("Content-type", "text/html");
break;
case null:
if ((request.HttpMethod == "GET") && (request.RawUrl == "/Admin"))
{
responseString = AdminPage;
response.AddHeader("Content-type", "text/html");
}
else
{
// must be REST or invalid crap, so pass to the REST parser
responseString = ParseREST(requestBody, request.RawUrl, request.HttpMethod);
response.AddHeader("Content-type", "text/html");
}
break;
}
byte[] buffer = System.Text.Encoding.UTF8.GetBytes(responseString);
System.IO.Stream output = response.OutputStream;
response.SendChunked = false;
response.ContentLength64 = buffer.Length;
output.Write(buffer, 0, buffer.Length);
output.Close();
}
private void LoadAdminPage()
{
try
{
StreamReader SR;
string lines;
AdminPage = "";
NewAccountForm = "";
LoginForm = "";
SR = File.OpenText("testadmin.htm");
while (!SR.EndOfStream)
{
lines = SR.ReadLine();
AdminPage += lines + "\n";
}
SR.Close();
SR = File.OpenText("newaccountform.htm");
while (!SR.EndOfStream)
{
lines = SR.ReadLine();
NewAccountForm += lines + "\n";
}
SR.Close();
SR = File.OpenText("login.htm");
while (!SR.EndOfStream)
{
lines = SR.ReadLine();
LoginForm += lines + "\n";
}
SR.Close();
}
catch (Exception e)
{
Console.WriteLine(e.ToString());
}
}
}
}

60
OpenGridServices.ServerConsole/OpenGridServices.ServerConsole.csproj → Servers/OpenSim.Servers.csproj
View File

@ -1,26 +1,23 @@
<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>
<SchemaVersion>2.0</SchemaVersion> <SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{7DC4E7C8-89A4-4A8D-9617-3DF262990663}</ProjectGuid> <ProjectGuid>{A8E12EC9-CB2F-4D25-AFD0-626BF2162F5D}</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>OpenGridServices.ServerConsole</AssemblyName> <AssemblyName>OpenSim.Servers</AssemblyName>
<DefaultClientScript>JScript</DefaultClientScript> <DefaultClientScript>JScript</DefaultClientScript>
<DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout> <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
<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>OpenGridServices.ServerConsole</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,38 +55,36 @@
<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" >
<HintPath>System.dll</HintPath> <HintPath>System.dll</HintPath>
<Private>False</Private> <Private>False</Private>
</Reference> </Reference>
<Reference Include="System.Data"> <Reference Include="System.Xml" >
<HintPath>System.Data.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="System.Xml">
<HintPath>System.Xml.dll</HintPath> <HintPath>System.Xml.dll</HintPath>
<Private>False</Private> <Private>False</Private>
</Reference> </Reference>
<Reference Include="OpenSim.Framework.dll" >
<HintPath>..\bin\OpenSim.Framework.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="OpenSim.Framework.Console.dll" >
<HintPath>..\bin\OpenSim.Framework.Console.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="libsecondlife.dll" >
<HintPath>..\bin\libsecondlife.dll</HintPath>
<Private>False</Private>
</Reference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="ServerConsole.cs"> <Compile Include="CapsHttpServer.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="Properties\AssemblyInfo.cs">
<SubType>Code</SubType>
</Compile>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\OpenSim.Framework\OpenSim.Framework.csproj">
<Project>{26E437F6-BA50-44CD-BB44-E911E25CA88C}</Project>
<Name>OpenSim.Framework</Name>
</ProjectReference>
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" /> <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
<PropertyGroup> <PropertyGroup>

12
OpenGridServices.ServerConsole/OpenGridServices.ServerConsole.dll.build → Servers/OpenSim.Servers.dll.build
View File

@ -1,5 +1,5 @@
<?xml version="1.0" ?> <?xml version="1.0" ?>
<project name="OpenGridServices.ServerConsole" default="build"> <project name="OpenSim.Servers" default="build">
<target name="build"> <target name="build">
<echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
<mkdir dir="${project::get-base-directory()}/${build.dir}" /> <mkdir dir="${project::get-base-directory()}/${build.dir}" />
@ -7,12 +7,11 @@
<fileset basedir="${project::get-base-directory()}"> <fileset basedir="${project::get-base-directory()}">
</fileset> </fileset>
</copy> </copy>
<csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
<resources prefix="OpenGridServices.ServerConsole" dynamicprefix="true" > <resources prefix="OpenSim.Servers" dynamicprefix="true" >
</resources> </resources>
<sources failonempty="true"> <sources failonempty="true">
<include name="ServerConsole.cs" /> <include name="CapsHttpServer.cs" />
<include name="Properties/AssemblyInfo.cs" />
</sources> </sources>
<references basedir="${project::get-base-directory()}"> <references basedir="${project::get-base-directory()}">
<lib> <lib>
@ -20,9 +19,10 @@
<include name="${project::get-base-directory()}/${build.dir}" /> <include name="${project::get-base-directory()}/${build.dir}" />
</lib> </lib>
<include name="System.dll" /> <include name="System.dll" />
<include name="System.Data.dll" />
<include name="System.Xml.dll" /> <include name="System.Xml.dll" />
<include name="../bin/OpenSim.Framework.dll" /> <include name="../bin/OpenSim.Framework.dll" />
<include name="../bin/OpenSim.Framework.Console.dll" />
<include name="../bin/libsecondlife.dll" />
</references> </references>
</csc> </csc>
<echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" /> <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" />

0
lib/Ode.NET.dll → bin/Ode.NET.dll
View File

65
prebuild.xml
View File

@ -34,7 +34,7 @@
<!-- Core OpenSim Projects --> <!-- Core OpenSim Projects -->
<Project name="OpenSim.Framework" path="./OpenSim.Framework" type="Library"> <Project name="OpenSim.Framework" path="OpenSim.Framework" type="Library">
<Configuration name="Debug"> <Configuration name="Debug">
<Options> <Options>
<OutputPath>../bin/</OutputPath> <OutputPath>../bin/</OutputPath>
@ -55,7 +55,7 @@
</Files> </Files>
</Project> </Project>
<Project name="OpenSim.Framework.Console" path="./OpenSim.Framework.Console" type="Library"> <Project name="OpenSim.Framework.Console" path="OpenSim.Framework.Console" type="Library">
<Configuration name="Debug"> <Configuration name="Debug">
<Options> <Options>
<OutputPath>../bin/</OutputPath> <OutputPath>../bin/</OutputPath>
@ -74,8 +74,7 @@
</Files> </Files>
</Project> </Project>
<!-- OGS stuff --> <Project name="OpenSim.Framework" path="OpenSim.Framework" type="Library">
<Project name="OpenGridServices.ServerConsole" path="./OpenGridServices.ServerConsole" type="Library">
<Configuration name="Debug"> <Configuration name="Debug">
<Options> <Options>
<OutputPath>../bin/</OutputPath> <OutputPath>../bin/</OutputPath>
@ -87,18 +86,42 @@
</Options> </Options>
</Configuration> </Configuration>
<ReferencePath>../bin/</ReferencePath> <ReferencePath>../bin/</ReferencePath>
<Reference name="System" localCopy="false"/> <Reference name="System"/>
<Reference name="System.Data" localCopy="false"/> <Reference name="System.Xml"/>
<Reference name="System.Xml" localCopy="false"/> <Reference name="libsecondlife.dll"/>
<Reference name="OpenSim.Framework.dll"/> <Files>
<Match pattern="*.cs" recurse="true"/>
<Files> </Files>
<Match pattern="*.cs" recurse="true"/>
</Files>
</Project> </Project>
<Project name="OpenGridServices.GridServer" path="./OpenGridServices.GridServer" type="Exe"> <!-- Project name="OpenSim.Servers" path="Servers" type="Library">
<Configuration name="Debug">
<Options>
<OutputPath>../bin/</OutputPath>
</Options>
</Configuration>
<Configuration name="Release">
<Options>
<OutputPath>../bin/</OutputPath>
</Options>
</Configuration>
<ReferencePath>../bin/</ReferencePath>
<Reference name="System"/>
<Reference name="System.Xml"/>
<Reference name="OpenSim.Framework.dll"/>
<Reference name="OpenSim.Framework.Console.dll"/>
<Reference name="libsecondlife.dll"/>
<Files>
<Match pattern="*.cs" recurse="true"/>
</Files>
</Project -->
<!-- OGS projects -->
<Project name="OpenGridServices.GridServer" path="OpenGridServices.GridServer" type="Exe">
<Configuration name="Debug"> <Configuration name="Debug">
<Options> <Options>
<OutputPath>../bin/</OutputPath> <OutputPath>../bin/</OutputPath>
@ -116,7 +139,6 @@
<Reference name="System.Xml" localCopy="false"/> <Reference name="System.Xml" localCopy="false"/>
<Reference name="OpenSim.Framework.dll"/> <Reference name="OpenSim.Framework.dll"/>
<Reference name="OpenSim.Framework.Console.dll"/> <Reference name="OpenSim.Framework.Console.dll"/>
<Reference name="OpenGridServices.ServerConsole.dll"/>
<Reference name="libsecondlife.dll"/> <Reference name="libsecondlife.dll"/>
<Files> <Files>
@ -124,7 +146,7 @@
</Files> </Files>
</Project> </Project>
<Project name="OpenGridServices.UserServer" path="./OpenGridServices.UserServer" type="Exe"> <Project name="OpenGridServices.UserServer" path="OpenGridServices.UserServer" type="Exe">
<Configuration name="Debug"> <Configuration name="Debug">
<Options> <Options>
<OutputPath>../bin/</OutputPath> <OutputPath>../bin/</OutputPath>
@ -142,7 +164,6 @@
<Reference name="System.Xml" localCopy="false"/> <Reference name="System.Xml" localCopy="false"/>
<Reference name="OpenSim.Framework.dll"/> <Reference name="OpenSim.Framework.dll"/>
<Reference name="OpenSim.Framework.Console.dll"/> <Reference name="OpenSim.Framework.Console.dll"/>
<Reference name="OpenGridServices.ServerConsole.dll"/>
<Reference name="libsecondlife.dll"/> <Reference name="libsecondlife.dll"/>
<Files> <Files>
@ -151,7 +172,7 @@
</Project> </Project>
<Project name="OpenSim.Physics.Manager" path="./OpenSim.Physics/Manager" type="Library"> <Project name="OpenSim.Physics.Manager" path="OpenSim.Physics/Manager" type="Library">
<Configuration name="Debug"> <Configuration name="Debug">
<Options> <Options>
<OutputPath>../../bin/</OutputPath> <OutputPath>../../bin/</OutputPath>
@ -174,7 +195,7 @@
</Project> </Project>
<!-- Config Plug-ins --> <!-- Config Plug-ins -->
<Project name="OpenSim.Config.SimConfigDb4o" path="./OpenSim.Config/SimConfigDb4o" type="Library"> <Project name="OpenSim.Config.SimConfigDb4o" path="OpenSim.Config/SimConfigDb4o" type="Library">
<Configuration name="Debug"> <Configuration name="Debug">
<Options> <Options>
<OutputPath>../../bin/</OutputPath> <OutputPath>../../bin/</OutputPath>
@ -307,7 +328,7 @@
<Reference name="System" localCopy="false"/> <Reference name="System" localCopy="false"/>
<Reference name="Axiom.MathLib.dll" localCopy="false"/> <Reference name="Axiom.MathLib.dll" localCopy="false"/>
<Reference name="OpenSim.Physics.Manager" localCopy="false"/> <Reference name="OpenSim.Physics.Manager" localCopy="false"/>
<Reference name="../lib/Ode.NET.dll" localCopy="false"/> <Reference name="Ode.NET.dll" localCopy="false" />
<Files> <Files>
<Match pattern="*.cs" recurse="true"/> <Match pattern="*.cs" recurse="true"/>
@ -406,7 +427,7 @@
<!-- Prebuild tool --> <!-- Prebuild tool -->
<Solution name="Prebuild" path="./Prebuild/" > <Solution name="Prebuild" path="Prebuild/" >
<Configuration name="Debug"> <Configuration name="Debug">
<Options> <Options>
<CompilerDefines>DEBUG;TRACE</CompilerDefines> <CompilerDefines>DEBUG;TRACE</CompilerDefines>
@ -446,7 +467,7 @@
<SuppressWarnings>1595</SuppressWarnings> <SuppressWarnings>1595</SuppressWarnings>
</Options> </Options>
</Configuration> </Configuration>
<ReferencePath>../bin/</ReferencePath> <ReferencePath>../../bin/</ReferencePath>
<Reference name="System.EnterpriseServices" /> <Reference name="System.EnterpriseServices" />
<Reference name="System.Xml" /> <Reference name="System.Xml" />
<Reference name="System" /> <Reference name="System" />