Rolled back all but the VS solution

15 files changed, 219 insertions, 421 deletions

diff --git a/src/Config/SimConfig/AssemblyInfo.cs b/src/Config/SimConfig/AssemblyInfo.cs
index 96c3e73..b205b4b 100644
--- a/src/Config/SimConfig/AssemblyInfo.cs
+++ b/src/Config/SimConfig/AssemblyInfo.cs
@@ -1,31 +1,21 @@
-using System.Reflection;

-using System.Runtime.CompilerServices;

-using System.Runtime.InteropServices;

-

-// Information about this assembly is defined by the following

-// attributes.

-//

-// change them to the information which is associated with the assembly

-// you compile.

-

-[assembly: AssemblyTitle("SimConfig")]

-[assembly: AssemblyDescription("")]

-[assembly: AssemblyConfiguration("")]

-[assembly: AssemblyCompany("")]

-[assembly: AssemblyProduct("SimConfig")]

-[assembly: AssemblyCopyright("")]

-[assembly: AssemblyTrademark("")]

-[assembly: AssemblyCulture("")]

-

-// This sets the default COM visibility of types in the assembly to invisible.

-// If you need to expose a type to COM, use [ComVisible(true)] on that type.

-[assembly: ComVisible(false)]

-

-// The assembly version has following format :

-//

-// Major.Minor.Build.Revision

-//

-// You can specify all values by your own or you can build default build and revision

-// numbers with the '*' character (the default):

-

-[assembly: AssemblyVersion("1.0.*")]

+using System;
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+// ------------------------------------------------------------------------------
+//  <autogenerated>
+//      This code was generated by a tool.
+//      Mono Runtime Version: 2.0.50727.42
+// 
+//      Changes to this file may cause incorrect behavior and will be lost if 
+//      the code is regenerated.
+//  </autogenerated>
+// ------------------------------------------------------------------------------
+
+[assembly: ComVisibleAttribute(false)]
+[assembly: CLSCompliantAttribute(false)]
+[assembly: AssemblyVersionAttribute("0.1.*.191")]
+[assembly: AssemblyTitleAttribute("opensim-simconfig")]
+[assembly: AssemblyDescriptionAttribute("The default configuration handler")]
+[assembly: AssemblyCopyrightAttribute("Copyright © OGS development team 2007")]
+
diff --git a/src/Config/SimConfig/SimConfig.csproj b/src/Config/SimConfig/SimConfig.csproj
index 5aee907..3131405 100644
--- a/src/Config/SimConfig/SimConfig.csproj
+++ b/src/Config/SimConfig/SimConfig.csproj
@@ -8,7 +8,7 @@
     <ProjectGuid>{B063760D-DB8D-4F64-B6FE-335FAD1E650A}</ProjectGuid>

   </PropertyGroup>

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

-    <OutputPath>..\..\..\bin\</OutputPath>

+    <OutputPath>bin\Debug\</OutputPath>

     <Optimize>False</Optimize>

     <DefineConstants>DEBUG;TRACE</DefineConstants>

     <DebugSymbols>True</DebugSymbols>

diff --git a/src/GridInterfaces/AssemblyInfo.cs b/src/GridInterfaces/AssemblyInfo.cs
index 89731a1..9ec5236 100644
--- a/src/GridInterfaces/AssemblyInfo.cs
+++ b/src/GridInterfaces/AssemblyInfo.cs
@@ -1,31 +1,21 @@
-using System.Reflection;

-using System.Runtime.CompilerServices;

-using System.Runtime.InteropServices;

-

-// Information about this assembly is defined by the following

-// attributes.

-//

-// change them to the information which is associated with the assembly

-// you compile.

-

-[assembly: AssemblyTitle("GridInterfaces")]

-[assembly: AssemblyDescription("")]

-[assembly: AssemblyConfiguration("")]

-[assembly: AssemblyCompany("")]

-[assembly: AssemblyProduct("GridInterfaces")]

-[assembly: AssemblyCopyright("")]

-[assembly: AssemblyTrademark("")]

-[assembly: AssemblyCulture("")]

-

-// This sets the default COM visibility of types in the assembly to invisible.

-// If you need to expose a type to COM, use [ComVisible(true)] on that type.

-[assembly: ComVisible(false)]

-

-// The assembly version has following format :

-//

-// Major.Minor.Build.Revision

-//

-// You can specify all values by your own or you can build default build and revision

-// numbers with the '*' character (the default):

-

-[assembly: AssemblyVersion("1.0.*")]

+using System;
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+// ------------------------------------------------------------------------------
+//  <autogenerated>
+//      This code was generated by a tool.
+//      Mono Runtime Version: 2.0.50727.42
+// 
+//      Changes to this file may cause incorrect behavior and will be lost if 
+//      the code is regenerated.
+//  </autogenerated>
+// ------------------------------------------------------------------------------
+
+[assembly: ComVisibleAttribute(false)]
+[assembly: CLSCompliantAttribute(false)]
+[assembly: AssemblyVersionAttribute("0.1.*.191")]
+[assembly: AssemblyTitleAttribute("opensim-gridinterfaces")]
+[assembly: AssemblyDescriptionAttribute("Definitions for OGS interface")]
+[assembly: AssemblyCopyrightAttribute("Copyright © OGS development team 2007")]
+
diff --git a/src/LocalServers/LocalGridServers/AssemblyInfo.cs b/src/LocalServers/LocalGridServers/AssemblyInfo.cs
index 103b49a..64f467b 100644
--- a/src/LocalServers/LocalGridServers/AssemblyInfo.cs
+++ b/src/LocalServers/LocalGridServers/AssemblyInfo.cs
@@ -1,31 +1,21 @@
-using System.Reflection;

-using System.Runtime.CompilerServices;

-using System.Runtime.InteropServices;

-

-// Information about this assembly is defined by the following

-// attributes.

-//

-// change them to the information which is associated with the assembly

-// you compile.

-

-[assembly: AssemblyTitle("LocalGridServers")]

-[assembly: AssemblyDescription("")]

-[assembly: AssemblyConfiguration("")]

-[assembly: AssemblyCompany("")]

-[assembly: AssemblyProduct("LocalGridServers")]

-[assembly: AssemblyCopyright("")]

-[assembly: AssemblyTrademark("")]

-[assembly: AssemblyCulture("")]

-

-// This sets the default COM visibility of types in the assembly to invisible.

-// If you need to expose a type to COM, use [ComVisible(true)] on that type.

-[assembly: ComVisible(false)]

-

-// The assembly version has following format :

-//

-// Major.Minor.Build.Revision

-//

-// You can specify all values by your own or you can build default build and revision

-// numbers with the '*' character (the default):

-

-[assembly: AssemblyVersion("1.0.*")]

+using System;
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+// ------------------------------------------------------------------------------
+//  <autogenerated>
+//      This code was generated by a tool.
+//      Mono Runtime Version: 2.0.50727.42
+// 
+//      Changes to this file may cause incorrect behavior and will be lost if 
+//      the code is regenerated.
+//  </autogenerated>
+// ------------------------------------------------------------------------------
+
+[assembly: ComVisibleAttribute(false)]
+[assembly: CLSCompliantAttribute(false)]
+[assembly: AssemblyVersionAttribute("0.1.*.191")]
+[assembly: AssemblyTitleAttribute("opensim-localservers")]
+[assembly: AssemblyDescriptionAttribute("local grid servers")]
+[assembly: AssemblyCopyrightAttribute("Copyright © OGS development team 2007")]
+
diff --git a/src/LocalStorage/Db4LocalStorage/AssemblyInfo.cs b/src/LocalStorage/Db4LocalStorage/AssemblyInfo.cs
index 6610606..dda233d 100644
--- a/src/LocalStorage/Db4LocalStorage/AssemblyInfo.cs
+++ b/src/LocalStorage/Db4LocalStorage/AssemblyInfo.cs
@@ -1,31 +1,21 @@
-using System.Reflection;

-using System.Runtime.CompilerServices;

-using System.Runtime.InteropServices;

-

-// Information about this assembly is defined by the following

-// attributes.

-//

-// change them to the information which is associated with the assembly

-// you compile.

-

-[assembly: AssemblyTitle("Db4LocalStorage")]

-[assembly: AssemblyDescription("")]

-[assembly: AssemblyConfiguration("")]

-[assembly: AssemblyCompany("")]

-[assembly: AssemblyProduct("Db4LocalStorage")]

-[assembly: AssemblyCopyright("")]

-[assembly: AssemblyTrademark("")]

-[assembly: AssemblyCulture("")]

-

-// This sets the default COM visibility of types in the assembly to invisible.

-// If you need to expose a type to COM, use [ComVisible(true)] on that type.

-[assembly: ComVisible(false)]

-

-// The assembly version has following format :

-//

-// Major.Minor.Build.Revision

-//

-// You can specify all values by your own or you can build default build and revision

-// numbers with the '*' character (the default):

-

-[assembly: AssemblyVersion("1.0.*")]

+using System;
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+// ------------------------------------------------------------------------------
+//  <autogenerated>
+//      This code was generated by a tool.
+//      Mono Runtime Version: 2.0.50727.42
+// 
+//      Changes to this file may cause incorrect behavior and will be lost if 
+//      the code is regenerated.
+//  </autogenerated>
+// ------------------------------------------------------------------------------
+
+[assembly: ComVisibleAttribute(false)]
+[assembly: CLSCompliantAttribute(false)]
+[assembly: AssemblyVersionAttribute("0.1.*.191")]
+[assembly: AssemblyTitleAttribute("opensim-localstorage")]
+[assembly: AssemblyDescriptionAttribute("The local storage handler")]
+[assembly: AssemblyCopyrightAttribute("Copyright © OGS development team 2007")]
+
diff --git a/src/Main.cs b/src/Main.cs
index 0680cbb..18418d1 100644
--- a/src/Main.cs
+++ b/src/Main.cs
@@ -71,7 +71,7 @@ namespace OpenSim
                 private PhysicsManager physManager;

                 private System.Timers.Timer timer1 = new System.Timers.Timer();

                 private string ConfigDll = "SimConfig.dll";

-                private string _physicsEngine = "";

+                private string _physicsEngine = "PhysX";

                 public bool sandbox = false;

                 public bool loginserver = false;

                 

@@ -83,18 +83,13 @@ namespace OpenSim
                         ServerConsole.MainConsole.Instance = new MServerConsole(ServerConsole.ConsoleBase.ConsoleType.Local,"",0);

                         

                         sim = new OpenSim_Main();

-

-            sim.sandbox = false;

-            sim.loginserver = false;

-            sim._physicsEngine = "";

-                    

+                        

                         for (int i = 0; i < args.Length; i++)

                         {

                                 if(args[i] == "-sandbox")

                                 {

                                         sim.sandbox = true;

                                 }

-                            

                                 if(args[i] == "-loginserver")

                                 {

                                         sim.loginserver = true;

@@ -141,6 +136,9 @@ namespace OpenSim
                 

                 private void Startup() {

                         startuptime=DateTime.Now;

+                        timer1.Enabled = true;

+                        timer1.Interval = 100;

+                        timer1.Elapsed +=new ElapsedEventHandler( this.Timer1Tick );

                         

                         // We check our local database first, then the grid for config options

                         ServerConsole.MainConsole.Instance.WriteLine("Main.cs:Startup() - Loading configuration");

@@ -152,11 +150,7 @@ namespace OpenSim
                         ServerConsole.MainConsole.Instance.WriteLine("Main.cs:Startup() - We are " + cfg.RegionName + " at " + cfg.RegionLocX.ToString() + "," + cfg.RegionLocY.ToString());

                         ServerConsole.MainConsole.Instance.WriteLine("Initialising world");

                         local_world = cfg.LoadWorld();

-

-            timer1.Enabled = true;

-            timer1.Interval = 100;

-            timer1.Elapsed += new ElapsedEventHandler(this.Timer1Tick);

-

+                        

                         this.physManager = new PhysicsSystem.PhysicsManager();

                         this.physManager.LoadPlugins();

                         ServerConsole.MainConsole.Instance.WriteLine("Main.cs:Startup() - Starting up messaging system");

@@ -216,7 +210,7 @@ namespace OpenSim
                                 OpenSimClient newuser = new OpenSimClient(epSender,(UseCircuitCodePacket)packet);

                                 ClientThreads.Add(epSender, newuser);

                         } else { // invalid client

-                                Console.Error.WriteLine("Main.cs:OnReceivedData() - WARNING: Got a packet from an invalid client - " + epSender.ToString());

+                                Console.Error.WriteLine("Main.cs:OnReceivedData() - WARNING: Got a " + packet.ToString() + " packet from an invalid client - " + epSender.ToString());

                         }

                         Server.BeginReceiveFrom(RecvBuffer, 0, RecvBuffer.Length, SocketFlags.None, ref epSender, ReceivedData, null);

                 }

diff --git a/src/OpenSimConsole.cs b/src/OpenSimConsole.cs
index 00a4cee..11bc648 100644
--- a/src/OpenSimConsole.cs
+++ b/src/OpenSimConsole.cs
@@ -61,7 +61,6 @@ namespace OpenSim
                         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");

@@ -76,30 +75,22 @@ namespace OpenSim
                                 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()

-        {

+        

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

@@ -111,6 +102,12 @@ namespace OpenSim
                         return TempInt;

                 }

 

+                public override void Write(string Line) {

+                        Console.Write(Line);

+                        Log.Write(Line);

+                        return;

+                }

+

                 // 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);

@@ -199,13 +196,7 @@ namespace OpenSim
                         string[] cmdparams=(string[])tempstrarray;

                         RunCmd(cmd,cmdparams);

                 }

-

-

-        public override void SetStatus(string status)

-        {

-            Console.Write( status + "\r" );           

-        }

-    }

+        }

 }

         

 

diff --git a/src/RemoteServers/RemoteGridServers/AssemblyInfo.cs b/src/RemoteServers/RemoteGridServers/AssemblyInfo.cs
index 0fa7d6e..21d481a 100644
--- a/src/RemoteServers/RemoteGridServers/AssemblyInfo.cs
+++ b/src/RemoteServers/RemoteGridServers/AssemblyInfo.cs
@@ -1,31 +1,21 @@
-using System.Reflection;

-using System.Runtime.CompilerServices;

-using System.Runtime.InteropServices;

-

-// Information about this assembly is defined by the following

-// attributes.

-//

-// change them to the information which is associated with the assembly

-// you compile.

-

-[assembly: AssemblyTitle("RemoteGridServers")]

-[assembly: AssemblyDescription("")]

-[assembly: AssemblyConfiguration("")]

-[assembly: AssemblyCompany("")]

-[assembly: AssemblyProduct("RemoteGridServers")]

-[assembly: AssemblyCopyright("")]

-[assembly: AssemblyTrademark("")]

-[assembly: AssemblyCulture("")]

-

-// This sets the default COM visibility of types in the assembly to invisible.

-// If you need to expose a type to COM, use [ComVisible(true)] on that type.

-[assembly: ComVisible(false)]

-

-// The assembly version has following format :

-//

-// Major.Minor.Build.Revision

-//

-// You can specify all values by your own or you can build default build and revision

-// numbers with the '*' character (the default):

-

-[assembly: AssemblyVersion("1.0.*")]

+using System;
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+// ------------------------------------------------------------------------------
+//  <autogenerated>
+//      This code was generated by a tool.
+//      Mono Runtime Version: 2.0.50727.42
+// 
+//      Changes to this file may cause incorrect behavior and will be lost if 
+//      the code is regenerated.
+//  </autogenerated>
+// ------------------------------------------------------------------------------
+
+[assembly: ComVisibleAttribute(false)]
+[assembly: CLSCompliantAttribute(false)]
+[assembly: AssemblyVersionAttribute("0.1.*.191")]
+[assembly: AssemblyTitleAttribute("opensim-remoteservers")]
+[assembly: AssemblyDescriptionAttribute("Connects to remote OGS installation")]
+[assembly: AssemblyCopyrightAttribute("Copyright © OGS development team 2007")]
+
diff --git a/src/RemoteServers/RemoteGridServers/RemoteGrid.cs b/src/RemoteServers/RemoteGridServers/RemoteGrid.cs
index 428d5f5..e50360a 100644
--- a/src/RemoteServers/RemoteGridServers/RemoteGrid.cs
+++ b/src/RemoteServers/RemoteGridServers/RemoteGrid.cs
@@ -89,8 +89,8 @@ namespace RemoteGridServers
                         String grTest = sr.ReadLine();

                         sr.Close();

                         GridResponse.Close();

-                        if(String.IsNullOrEmpty(grTest) || grTest.Equals("1")) 

-                        {

+                        //if(String.IsNullOrEmpty(grTest) || grTest.Equals("1")) 

+                        //{

                                 // YAY! Valid login

                                 user.Authorised = true;

                                 user.LoginInfo = new Login();

@@ -99,12 +99,12 @@ namespace RemoteGridServers
                                 user.LoginInfo.First = "";

                                 user.LoginInfo.Last = "";

                                 

-                        }

-                        else 

-                        {

-                                // Invalid

-                                user.Authorised = false;        

-                        }

+                        //}

+                        //else 

+                        //{

+                        //      // Invalid

+                        //      user.Authorised = false;        

+                        //}

                         

                         return(user);

                 }

diff --git a/src/ServerConsole/ServerConsole/AssemblyInfo.cs b/src/ServerConsole/ServerConsole/AssemblyInfo.cs
index 00a9b7d..88b4019 100644
--- a/src/ServerConsole/ServerConsole/AssemblyInfo.cs
+++ b/src/ServerConsole/ServerConsole/AssemblyInfo.cs
@@ -1,31 +1,21 @@
-using System.Reflection;

-using System.Runtime.CompilerServices;

-using System.Runtime.InteropServices;

-

-// Information about this assembly is defined by the following

-// attributes.

-//

-// change them to the information which is associated with the assembly

-// you compile.

-

-[assembly: AssemblyTitle("ServerConsole")]

-[assembly: AssemblyDescription("")]

-[assembly: AssemblyConfiguration("")]

-[assembly: AssemblyCompany("")]

-[assembly: AssemblyProduct("ServerConsole")]

-[assembly: AssemblyCopyright("")]

-[assembly: AssemblyTrademark("")]

-[assembly: AssemblyCulture("")]

-

-// This sets the default COM visibility of types in the assembly to invisible.

-// If you need to expose a type to COM, use [ComVisible(true)] on that type.

-[assembly: ComVisible(false)]

-

-// The assembly version has following format :

-//

-// Major.Minor.Build.Revision

-//

-// You can specify all values by your own or you can build default build and revision

-// numbers with the '*' character (the default):

-

-[assembly: AssemblyVersion("1.0.*")]

+using System;
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+// ------------------------------------------------------------------------------
+//  <autogenerated>
+//      This code was generated by a tool.
+//      Mono Runtime Version: 2.0.50727.42
+// 
+//      Changes to this file may cause incorrect behavior and will be lost if 
+//      the code is regenerated.
+//  </autogenerated>
+// ------------------------------------------------------------------------------
+
+[assembly: ComVisibleAttribute(false)]
+[assembly: CLSCompliantAttribute(false)]
+[assembly: AssemblyVersionAttribute("0.1.*.191")]
+[assembly: AssemblyTitleAttribute("opensim-serverconsole")]
+[assembly: AssemblyDescriptionAttribute("The default server console")]
+[assembly: AssemblyCopyrightAttribute("Copyright © OGS development team 2007")]
+
diff --git a/src/ServerConsole/ServerConsole/ServerConsole.cs b/src/ServerConsole/ServerConsole/ServerConsole.cs
index 27d97e5..93c8114 100644
--- a/src/ServerConsole/ServerConsole/ServerConsole.cs
+++ b/src/ServerConsole/ServerConsole/ServerConsole.cs
@@ -43,7 +43,12 @@ namespace ServerConsole
                                 instance = value;

                         }

                 }

-    }

+                

+                public MainConsole()

+                {

+                        

+                }

+        }

         

         public abstract class ConsoleBase

         {

@@ -55,15 +60,16 @@ namespace ServerConsole
                 }

 

                 public abstract void Close();

-

-        public abstract void Write(string format, params object[] args);

-

-        public abstract void WriteLine(string format, params object[] args);    

-            

+        

+                // 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) ;

+

                 // Displays a command prompt and waits for the user to enter a string, then returns that string

                 public abstract string CmdPrompt(string prompt) ;

                 

@@ -81,7 +87,5 @@ namespace ServerConsole
         

                 // Displays a prompt to the user and then runs the command they entered

                 public abstract void MainConsolePrompt() ;

-

-        public abstract void SetStatus( string status );

-    }

+        }

 }

diff --git a/src/VersionInfo.cs b/src/VersionInfo.cs
index 949462c..b3cc6a5 100644
--- a/src/VersionInfo.cs
+++ b/src/VersionInfo.cs
@@ -32,6 +32,6 @@ namespace OpenSim
         /// </summary>

         public class VersionInfo

         {

-                public static string Version = "0.1, Build 1173288035, Revision 148M"; 

+                public static string Version = "0.1, Build 1173778834, Revision 191M"; 

         }

 }

diff --git a/src/physics/AssemblyInfo.cs b/src/physics/AssemblyInfo.cs
index 57a8913..1cc3ee1 100644
--- a/src/physics/AssemblyInfo.cs
+++ b/src/physics/AssemblyInfo.cs
@@ -1,31 +1,21 @@
-using System.Reflection;

-using System.Runtime.CompilerServices;

-using System.Runtime.InteropServices;

-

-// Information about this assembly is defined by the following

-// attributes.

-//

-// change them to the information which is associated with the assembly

-// you compile.

-

-[assembly: AssemblyTitle("PhysicsManager")]

-[assembly: AssemblyDescription("")]

-[assembly: AssemblyConfiguration("")]

-[assembly: AssemblyCompany("")]

-[assembly: AssemblyProduct("PhysicsManager")]

-[assembly: AssemblyCopyright("")]

-[assembly: AssemblyTrademark("")]

-[assembly: AssemblyCulture("")]

-

-// This sets the default COM visibility of types in the assembly to invisible.

-// If you need to expose a type to COM, use [ComVisible(true)] on that type.

-[assembly: ComVisible(false)]

-

-// The assembly version has following format :

-//

-// Major.Minor.Build.Revision

-//

-// You can specify all values by your own or you can build default build and revision

-// numbers with the '*' character (the default):

-

-[assembly: AssemblyVersion("1.0.*")]

+using System;
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+// ------------------------------------------------------------------------------
+//  <autogenerated>
+//      This code was generated by a tool.
+//      Mono Runtime Version: 2.0.50727.42
+// 
+//      Changes to this file may cause incorrect behavior and will be lost if 
+//      the code is regenerated.
+//  </autogenerated>
+// ------------------------------------------------------------------------------
+
+[assembly: ComVisibleAttribute(false)]
+[assembly: CLSCompliantAttribute(false)]
+[assembly: AssemblyVersionAttribute("0.1.*.191")]
+[assembly: AssemblyTitleAttribute("opensim-physicsmanager")]
+[assembly: AssemblyDescriptionAttribute("Handles physics plugins")]
+[assembly: AssemblyCopyrightAttribute("Copyright © OGS development team 2007")]
+
diff --git a/src/physics/PhysicsManager.cs b/src/physics/PhysicsManager.cs
index 1fee628..e5d5bd6 100644
--- a/src/physics/PhysicsManager.cs
+++ b/src/physics/PhysicsManager.cs
@@ -46,21 +46,15 @@ namespace PhysicsSystem
                 

                 public PhysicsScene GetPhysicsScene(string engineName)

                 {

-                    if( String.IsNullOrEmpty( engineName ) )

-                    {

-                return new NullPhysicsScene();

-                    }

-

-                    if(_plugins.ContainsKey(engineName))

+                        if(_plugins.ContainsKey(engineName))

                         {

                                 ServerConsole.MainConsole.Instance.WriteLine("creating "+engineName);

                                 return _plugins[engineName].GetScene();

                         }

                         else

                         {

-                string error = String.Format("couldn't find physicsEngine: {0}", engineName);

-                                ServerConsole.MainConsole.Instance.WriteLine( error );

-                throw new ArgumentException( error );

+                                ServerConsole.MainConsole.Instance.WriteLine("couldn't find physicsEngine: "+ engineName);

+                                return null;

                         }

                 }

                 

@@ -114,14 +108,6 @@ namespace PhysicsSystem
         

         public abstract class PhysicsScene

         {

-        public static PhysicsScene Null

-        {

-            get

-            {                

-                return new NullPhysicsScene();

-            }

-        }

-        

                 public abstract PhysicsActor AddAvatar(PhysicsVector position);

                 

                 public abstract PhysicsActor AddPrim(PhysicsVector position, PhysicsVector size);

@@ -138,49 +124,8 @@ namespace PhysicsSystem
                 }

         }

         

-    public class NullPhysicsScene : PhysicsScene

-    {

-        private static int m_workIndicator;

-        

-        public override PhysicsActor AddAvatar(PhysicsVector position)

-        {

-            ServerConsole.MainConsole.Instance.WriteLine("NullPhysicsScene : AddAvatar({0})", position );

-            return PhysicsActor.Null;

-        }

-

-        public override PhysicsActor AddPrim(PhysicsVector position, PhysicsVector size)

-        {

-            ServerConsole.MainConsole.Instance.WriteLine("NullPhysicsScene : AddPrim({0},{1})", position, size );

-            return PhysicsActor.Null;            

-        }

-

-        public override void Simulate(float timeStep)

-        {

-            m_workIndicator = ( m_workIndicator + 1 ) % 10;

-

-            ServerConsole.MainConsole.Instance.SetStatus( m_workIndicator.ToString() );

-        }

-

-        public override void GetResults()

-        {

-            ServerConsole.MainConsole.Instance.WriteLine("NullPhysicsScene : GetResults()" );

-        }

-

-        public override void SetTerrain(float[] heightMap)

-        {

-            ServerConsole.MainConsole.Instance.WriteLine("NullPhysicsScene : SetTerrain({0} items)", heightMap.Length );

-        }

-

-        public override bool IsThreaded

-        {

-            get { return false; }

-        }

-    }

-    

         public abstract class PhysicsActor

         {

-        public static readonly PhysicsActor Null = new NullPhysicsActor();

-            

                 public abstract PhysicsVector Position

                 {

                         get;

@@ -208,61 +153,7 @@ namespace PhysicsSystem
                 public abstract void SetMomentum(PhysicsVector momentum);

         }

 

-    public class NullPhysicsActor : PhysicsActor

-    {

-        public override PhysicsVector Position

-        {

-            get

-            {

-                return PhysicsVector.Zero;

-            }

-            set

-            {

-                return;

-            }

-        }

-

-        public override PhysicsVector Velocity

-        {

-            get

-            {

-                return PhysicsVector.Zero;

-            }

-            set

-            {

-                return;

-            }

-        }

-

-        public override PhysicsVector Acceleration

-        {

-            get { return PhysicsVector.Zero; }

-        }

-

-        public override bool Flying

-        {

-            get

-            {

-                return false;

-            }

-            set

-            {

-                return;

-            }

-        }

-

-        public override void AddForce(PhysicsVector force)

-        {

-            return;

-        }

-

-        public override void SetMomentum(PhysicsVector momentum)

-        {

-            return;

-        }

-    }

-

-    public class PhysicsVector

+        public class PhysicsVector

         {

                 public float X;

                 public float Y;

@@ -279,7 +170,5 @@ namespace PhysicsSystem
                         Y = y;

                         Z = z;

                 }

-

-        public static readonly PhysicsVector Zero = new PhysicsVector(0f, 0f, 0f);

         }

 }

diff --git a/src/physics/plugins/AssemblyInfo.cs b/src/physics/plugins/AssemblyInfo.cs
index 0c9c06c..2c12da4 100644
--- a/src/physics/plugins/AssemblyInfo.cs
+++ b/src/physics/plugins/AssemblyInfo.cs
@@ -1,31 +1,21 @@
-using System.Reflection;

-using System.Runtime.CompilerServices;

-using System.Runtime.InteropServices;

-

-// Information about this assembly is defined by the following

-// attributes.

-//

-// change them to the information which is associated with the assembly

-// you compile.

-

-[assembly: AssemblyTitle("PhysXplugin")]

-[assembly: AssemblyDescription("")]

-[assembly: AssemblyConfiguration("")]

-[assembly: AssemblyCompany("")]

-[assembly: AssemblyProduct("PhysXplugin")]

-[assembly: AssemblyCopyright("")]

-[assembly: AssemblyTrademark("")]

-[assembly: AssemblyCulture("")]

-

-// This sets the default COM visibility of types in the assembly to invisible.

-// If you need to expose a type to COM, use [ComVisible(true)] on that type.

-[assembly: ComVisible(false)]

-

-// The assembly version has following format :

-//

-// Major.Minor.Build.Revision

-//

-// You can specify all values by your own or you can build default build and revision

-// numbers with the '*' character (the default):

-

-[assembly: AssemblyVersion("1.0.*")]

+using System;
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+// ------------------------------------------------------------------------------
+//  <autogenerated>
+//      This code was generated by a tool.
+//      Mono Runtime Version: 2.0.50727.42
+// 
+//      Changes to this file may cause incorrect behavior and will be lost if 
+//      the code is regenerated.
+//  </autogenerated>
+// ------------------------------------------------------------------------------
+
+[assembly: ComVisibleAttribute(false)]
+[assembly: CLSCompliantAttribute(false)]
+[assembly: AssemblyVersionAttribute("0.1.*.191")]
+[assembly: AssemblyTitleAttribute("opensim-physicsmanager-physx")]
+[assembly: AssemblyDescriptionAttribute("PhysX plugin for OpenSim")]
+[assembly: AssemblyCopyrightAttribute("Copyright © OGS development team 2007")]
+