* 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)

3 files changed, 55 insertions, 55 deletions

diff --git a/OpenSim/OpenSim.csproj b/OpenSim/OpenSim.csproj
index e873a91..bf57515 100644
--- a/OpenSim/OpenSim.csproj
+++ b/OpenSim/OpenSim.csproj
@@ -3,7 +3,7 @@
     <ProjectType>Local</ProjectType>

     <ProductVersion>8.0.50727</ProductVersion>

     <SchemaVersion>2.0</SchemaVersion>

-    <ProjectGuid>{455F3378-FE4B-4A17-907D-52AEA3C1045F}</ProjectGuid>

+    <ProjectGuid>{5304CCD5-4902-4C6B-ADDE-2181B2F42FD6}</ProjectGuid>

     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

     <ApplicationIcon></ApplicationIcon>

@@ -82,25 +82,25 @@
   <ItemGroup>

     <ProjectReference Include="..\OpenSim.Framework\OpenSim.Framework.csproj">

       <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>

                         <Private>False</Private>

     </ProjectReference>

     <ProjectReference Include="..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj">

       <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>

                         <Private>False</Private>

     </ProjectReference>

     <ProjectReference Include="..\OpenSim.Physics\Manager\OpenSim.Physics.Manager.csproj">

       <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>

                         <Private>False</Private>

     </ProjectReference>

     <ProjectReference Include="..\OpenSim.RegionServer\OpenSim.RegionServer.csproj">

       <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>

                         <Private>False</Private>

     </ProjectReference>

diff --git a/OpenSim/OpenSim.exe.build b/OpenSim/OpenSim.exe.build
index fc516df..7d69d90 100644
--- a/OpenSim/OpenSim.exe.build
+++ b/OpenSim/OpenSim.exe.build
@@ -1,47 +1,47 @@
-<?xml version="1.0" ?>
-<project name="OpenSim" default="build">
-    <target name="build">
-        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
-        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
-        <copy todir="${project::get-base-directory()}/${build.dir}">
-            <fileset basedir="${project::get-base-directory()}">
-            </fileset>
-        </copy>
-        <csc target="exe" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.exe">
-            <resources prefix="OpenSim" dynamicprefix="true" >
-            </resources>
-            <sources failonempty="true">
-                <include name="RegionServer.cs" />
-            </sources>
-            <references basedir="${project::get-base-directory()}">
-                <lib>
-                    <include name="${project::get-base-directory()}" />
-                    <include name="${project::get-base-directory()}/${build.dir}" />
-                </lib>
-                <include name="System.dll" />
-                <include name="System.Xml.dll" />
-                <include name="../bin/libsecondlife.dll" />
-                <include name="../bin/Axiom.MathLib.dll" />
-                <include name="../bin/Db4objects.Db4o.dll" />
-                <include name="../OpenSim.Framework/${build.dir}/OpenSim.Framework.dll" />
-                <include name="../OpenSim.Framework.Console/${build.dir}/OpenSim.Framework.Console.dll" />
-                <include name="../OpenSim.Physics/Manager/${build.dir}/OpenSim.Physics.Manager.dll" />
-                <include name="../OpenSim.RegionServer/${build.dir}/OpenSim.RegionServer.dll" />
-            </references>
-        </csc>
-        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" />
-        <mkdir dir="${project::get-base-directory()}/../bin/"/>
-        <copy todir="${project::get-base-directory()}/../bin/">
-            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
-                <include name="*.dll"/>
-                <include name="*.exe"/>
-            </fileset>
-        </copy>
-    </target>
-    <target name="clean">
-        <delete dir="${bin.dir}" failonerror="false" />
-        <delete dir="${obj.dir}" failonerror="false" />
-    </target>
-    <target name="doc" description="Creates documentation.">
-    </target>
-</project>
+<?xml version="1.0" ?>

+<project name="OpenSim" default="build">

+    <target name="build">

+        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />

+        <mkdir dir="${project::get-base-directory()}/${build.dir}" />

+        <copy todir="${project::get-base-directory()}/${build.dir}">

+            <fileset basedir="${project::get-base-directory()}">

+            </fileset>

+        </copy>

+        <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>

+            <sources failonempty="true">

+                <include name="RegionServer.cs" />

+            </sources>

+            <references basedir="${project::get-base-directory()}">

+                <lib>

+                    <include name="${project::get-base-directory()}" />

+                    <include name="${project::get-base-directory()}/${build.dir}" />

+                </lib>

+                <include name="System.dll" />

+                <include name="System.Xml.dll" />

+                <include name="../bin/libsecondlife.dll" />

+                <include name="../bin/Axiom.MathLib.dll" />

+                <include name="../bin/Db4objects.Db4o.dll" />

+                <include name="../OpenSim.Framework/${build.dir}/OpenSim.Framework.dll" />

+                <include name="../OpenSim.Framework.Console/${build.dir}/OpenSim.Framework.Console.dll" />

+                <include name="../OpenSim.Physics/Manager/${build.dir}/OpenSim.Physics.Manager.dll" />

+                <include name="../OpenSim.RegionServer/${build.dir}/OpenSim.RegionServer.dll" />

+            </references>

+        </csc>

+        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" />

+        <mkdir dir="${project::get-base-directory()}/../bin/"/>

+        <copy todir="${project::get-base-directory()}/../bin/">

+            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >

+                <include name="*.dll"/>

+                <include name="*.exe"/>

+            </fileset>

+        </copy>

+    </target>

+    <target name="clean">

+        <delete dir="${bin.dir}" failonerror="false" />

+        <delete dir="${obj.dir}" failonerror="false" />

+    </target>

+    <target name="doc" description="Creates documentation.">

+    </target>

+</project>

diff --git a/OpenSim/RegionServer.cs b/OpenSim/RegionServer.cs
index d6d0af9..3612d49 100644
--- a/OpenSim/RegionServer.cs
+++ b/OpenSim/RegionServer.cs
@@ -2,6 +2,7 @@ using System;
 using System.Collections.Generic;

 using System.Text;

 using OpenSim.UserServer;

+using OpenSim.Framework.Console;

 

 namespace OpenSim

 {

@@ -12,12 +13,11 @@ namespace OpenSim
         {

             Console.WriteLine("OpenSim " + VersionInfo.Version + "\n");

             Console.WriteLine("Starting...\n");

-            OpenSim.Framework.Console.MainConsole.Instance = new SimConsole(OpenSim.Framework.Console.ConsoleBase.ConsoleType.Local, "", 0);

-

+            

             //OpenSimRoot.instance = new OpenSimRoot();

             OpenSimMain sim = new OpenSimMain();

             OpenSimRoot.Instance.Application = sim;

-

+            

             sim.sandbox = false;

             sim.loginserver = false;

             sim._physicsEngine = "basicphysics";