diff --git a/bin/Axiom.MathLib.dll b/bin/Axiom.MathLib.dll
new file mode 100644
index 0000000000..21ce3a8b18
Binary files /dev/null and b/bin/Axiom.MathLib.dll differ
diff --git a/bin/Db4objects.Db4o.dll b/bin/Db4objects.Db4o.dll
new file mode 100755
index 0000000000..be976a108c
Binary files /dev/null and b/bin/Db4objects.Db4o.dll differ
diff --git a/bin/libsecondlife.dll b/bin/libsecondlife.dll
new file mode 100755
index 0000000000..89d692a324
Binary files /dev/null and b/bin/libsecondlife.dll differ
diff --git a/bin/log4net.dll b/bin/log4net.dll
new file mode 100644
index 0000000000..ffc57e1125
Binary files /dev/null and b/bin/log4net.dll differ
diff --git a/genvers.sh b/genvers.sh
new file mode 100755
index 0000000000..3da91d7ec6
--- /dev/null
+++ b/genvers.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+MAJOR=0
+MINOR=1
+BUILD=`date +%s`
+REVISION=`svnversion | sed s/:// | sed s/M//`
+REALREVISION=`svnversion`
+cat src/VersionInfo.cs.template | sed s/@@VERSION/"$MAJOR.$MINOR, Build $BUILD, Revision $REALREVISION"/g >src/VersionInfo.cs
+echo -n $MAJOR.$MINOR.*.$REVISION >VERSION
diff --git a/opensim.build b/opensim.build
new file mode 100644
index 0000000000..279f8360e6
--- /dev/null
+++ b/opensim.build
@@ -0,0 +1,80 @@
+
+
+ nant buildfile for OpenSim
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Assets/AssetCache.cs b/src/Assets/AssetCache.cs
index 3baebd601e..d35b4828c6 100644
--- a/src/Assets/AssetCache.cs
+++ b/src/Assets/AssetCache.cs
@@ -59,6 +59,8 @@ namespace OpenSim.Assets
{
_assetServer = assetServer;
_assetServer.SetReceiver(this);
+ Assets = new Dictionary ();
+ Textures = new Dictionary ();
this._assetCacheThread = new Thread( new ThreadStart(RunAssetManager));
this._assetCacheThread.IsBackground = true;
this._assetCacheThread.Start();
diff --git a/src/Config/SimConfig/AssemblyInfo.cs b/src/Config/SimConfig/AssemblyInfo.cs
index 96c3e7383d..f8931bd9df 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;
+
+// ------------------------------------------------------------------------------
+//
+// 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.
+//
+// ------------------------------------------------------------------------------
+
+[assembly: ComVisibleAttribute(false)]
+[assembly: CLSCompliantAttribute(false)]
+[assembly: AssemblyVersionAttribute("0.1.*.148")]
+[assembly: AssemblyTitleAttribute("opensim-simconfig")]
+[assembly: AssemblyDescriptionAttribute("The default configuration handler")]
+[assembly: AssemblyCopyrightAttribute("Copyright © OGS development team 2007")]
+
diff --git a/src/Config/default.build b/src/Config/default.build
new file mode 100644
index 0000000000..2ee0c52d3f
--- /dev/null
+++ b/src/Config/default.build
@@ -0,0 +1,52 @@
+
+
+ nant buildfile for OpenSim
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/GridInterfaces/AssemblyInfo.cs b/src/GridInterfaces/AssemblyInfo.cs
index 89731a1f0d..32ad78b64c 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;
+
+// ------------------------------------------------------------------------------
+//
+// 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.
+//
+// ------------------------------------------------------------------------------
+
+[assembly: ComVisibleAttribute(false)]
+[assembly: CLSCompliantAttribute(false)]
+[assembly: AssemblyVersionAttribute("0.1.*.148")]
+[assembly: AssemblyTitleAttribute("opensim-gridinterfaces")]
+[assembly: AssemblyDescriptionAttribute("Definitions for OGS interface")]
+[assembly: AssemblyCopyrightAttribute("Copyright © OGS development team 2007")]
+
diff --git a/src/GridInterfaces/default.build b/src/GridInterfaces/default.build
new file mode 100644
index 0000000000..f29f1083ea
--- /dev/null
+++ b/src/GridInterfaces/default.build
@@ -0,0 +1,49 @@
+
+
+ nant buildfile for OpenSim
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/LocalServers/LocalGridServers/AssemblyInfo.cs b/src/LocalServers/LocalGridServers/AssemblyInfo.cs
index 103b49a207..c523a99c21 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;
+
+// ------------------------------------------------------------------------------
+//
+// 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.
+//
+// ------------------------------------------------------------------------------
+
+[assembly: ComVisibleAttribute(false)]
+[assembly: CLSCompliantAttribute(false)]
+[assembly: AssemblyVersionAttribute("0.1.*.148")]
+[assembly: AssemblyTitleAttribute("opensim-localservers")]
+[assembly: AssemblyDescriptionAttribute("local grid servers")]
+[assembly: AssemblyCopyrightAttribute("Copyright © OGS development team 2007")]
+
diff --git a/src/LocalServers/default.build b/src/LocalServers/default.build
new file mode 100644
index 0000000000..06bfcaa9a0
--- /dev/null
+++ b/src/LocalServers/default.build
@@ -0,0 +1,51 @@
+
+
+ nant buildfile for OpenSim
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Main.cs b/src/Main.cs
index f76a7a9a4e..f728928295 100644
--- a/src/Main.cs
+++ b/src/Main.cs
@@ -121,7 +121,7 @@ namespace OpenSim
sim.Startup();
while(true) {
- ServerConsole.MainConsole.Instance.MainConsolePrompt();
+ ServerConsole.MainConsole.Instance.MainConsolePrompt();
}
}
@@ -237,7 +237,8 @@ namespace OpenSim
void Timer1Tick( object sender, System.EventArgs e )
{
- local_world.Update();
+ Console.WriteLine("UPDATE WORLD!");
+ local_world.Update();
}
}
diff --git a/src/RemoteServers/RemoteGridServers/AssemblyInfo.cs b/src/RemoteServers/RemoteGridServers/AssemblyInfo.cs
index 0fa7d6ea66..2eec0d5e5e 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;
+
+// ------------------------------------------------------------------------------
+//
+// 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.
+//
+// ------------------------------------------------------------------------------
+
+[assembly: ComVisibleAttribute(false)]
+[assembly: CLSCompliantAttribute(false)]
+[assembly: AssemblyVersionAttribute("0.1.*.148")]
+[assembly: AssemblyTitleAttribute("opensim-remoteservers")]
+[assembly: AssemblyDescriptionAttribute("Connects to remote OGS installation")]
+[assembly: AssemblyCopyrightAttribute("Copyright © OGS development team 2007")]
+
diff --git a/src/RemoteServers/default.build b/src/RemoteServers/default.build
new file mode 100644
index 0000000000..88196004c9
--- /dev/null
+++ b/src/RemoteServers/default.build
@@ -0,0 +1,51 @@
+
+
+ nant buildfile for OpenSim
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/ServerConsole/ServerConsole/AssemblyInfo.cs b/src/ServerConsole/ServerConsole/AssemblyInfo.cs
index 00a9b7d748..db928ea40d 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;
+
+// ------------------------------------------------------------------------------
+//
+// 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.
+//
+// ------------------------------------------------------------------------------
+
+[assembly: ComVisibleAttribute(false)]
+[assembly: CLSCompliantAttribute(false)]
+[assembly: AssemblyVersionAttribute("0.1.*.148")]
+[assembly: AssemblyTitleAttribute("opensim-serverconsole")]
+[assembly: AssemblyDescriptionAttribute("The default server console")]
+[assembly: AssemblyCopyrightAttribute("Copyright © OGS development team 2007")]
+
diff --git a/src/ServerConsole/default.build b/src/ServerConsole/default.build
new file mode 100644
index 0000000000..a6f6dc2660
--- /dev/null
+++ b/src/ServerConsole/default.build
@@ -0,0 +1,48 @@
+
+
+ nant buildfile for OpenSim
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/VersionInfo.cs b/src/VersionInfo.cs
index d443e516eb..949462ccba 100644
--- a/src/VersionInfo.cs
+++ b/src/VersionInfo.cs
@@ -32,6 +32,6 @@ namespace OpenSim
///
public class VersionInfo
{
- public static string Version = "0.0.1-*";
+ public static string Version = "0.1, Build 1173288035, Revision 148M";
}
}
diff --git a/src/VersionInfo.cs.template b/src/VersionInfo.cs.template
new file mode 100644
index 0000000000..e4e1b95ae3
--- /dev/null
+++ b/src/VersionInfo.cs.template
@@ -0,0 +1,37 @@
+/*
+Copyright (c) OpenSim project, http://osgrid.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 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 ``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 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 OpenSim
+{
+ ///
+ ///
+ public class VersionInfo
+ {
+ public static string Version = "@@VERSION";
+ }
+}
diff --git a/src/physics/AssemblyInfo.cs b/src/physics/AssemblyInfo.cs
index 57a8913d33..f6a450e4fc 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;
+
+// ------------------------------------------------------------------------------
+//
+// 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.
+//
+// ------------------------------------------------------------------------------
+
+[assembly: ComVisibleAttribute(false)]
+[assembly: CLSCompliantAttribute(false)]
+[assembly: AssemblyVersionAttribute("0.1.*.148")]
+[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 208e35fad4..098650120f 100644
--- a/src/physics/PhysicsManager.cs
+++ b/src/physics/PhysicsManager.cs
@@ -61,7 +61,7 @@ namespace PhysicsSystem
public void LoadPlugins()
{
string path = Path.Combine(System.AppDomain.CurrentDomain.BaseDirectory ,"Physics");
- string[] pluginFiles = Directory.GetFiles(path, "*.Dll");
+ string[] pluginFiles = Directory.GetFiles(path, "*.dll");
for(int i= 0; i
+
+ nant buildfile for OpenSim
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/physics/plugins/AssemblyInfo.cs b/src/physics/plugins/AssemblyInfo.cs
index 0c9c06c43d..c2986adc93 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;
+
+// ------------------------------------------------------------------------------
+//
+// 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.
+//
+// ------------------------------------------------------------------------------
+
+[assembly: ComVisibleAttribute(false)]
+[assembly: CLSCompliantAttribute(false)]
+[assembly: AssemblyVersionAttribute("0.1.*.148")]
+[assembly: AssemblyTitleAttribute("opensim-physicsmanager-physx")]
+[assembly: AssemblyDescriptionAttribute("PhysX plugin for OpenSim")]
+[assembly: AssemblyCopyrightAttribute("Copyright © OGS development team 2007")]
+
diff --git a/src/physics/plugins/PhysXplugin.cs b/src/physics/plugins/PhysXplugin.cs
index 8f0d043ca4..163b65bd68 100644
--- a/src/physics/plugins/PhysXplugin.cs
+++ b/src/physics/plugins/PhysXplugin.cs
@@ -87,8 +87,10 @@ namespace PhysXplugin
public override void Simulate(float timeStep)
{
+ Console.WriteLine("SIMULATE!");
foreach (PhysXActor actor in _actors)
{
+ Console.WriteLine("AN ACTOR!");
actor.Position.X = actor.Position.X + actor.Velocity.X * timeStep;
actor.Position.Y = actor.Position.Y + actor.Velocity.Y * timeStep;
actor.Position.Z = actor.Position.Z + actor.Velocity.Z * timeStep;
@@ -118,7 +120,7 @@ namespace PhysXplugin
public override void GetResults()
{
-
+ Console.WriteLine("GET RESULTS!");
}
public override bool IsThreaded
@@ -143,7 +145,9 @@ namespace PhysXplugin
public PhysXActor()
{
-
+ _velocity = new PhysicsVector();
+ _position = new PhysicsVector();
+ _acceleration = new PhysicsVector();
}
public override PhysicsVector Position
diff --git a/src/physics/plugins/default.build b/src/physics/plugins/default.build
new file mode 100644
index 0000000000..c40fea1ce7
--- /dev/null
+++ b/src/physics/plugins/default.build
@@ -0,0 +1,49 @@
+
+
+ nant buildfile for OpenSim
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/world/Avatar.cs b/src/world/Avatar.cs
index 054fc816ae..a3443832d7 100644
--- a/src/world/Avatar.cs
+++ b/src/world/Avatar.cs
@@ -35,7 +35,7 @@ namespace OpenSim.world
this._physActor = value;
}
}
- public override void addFroces()
+ public override void addForces()
{
lock(this.forcesList)
{
@@ -43,6 +43,7 @@ namespace OpenSim.world
{
for(int i=0 ; i < this.forcesList.Count; i++)
{
+ Console.WriteLine("ADDING A FORCE!");
NewForce force = this.forcesList[i];
PhysicsVector phyVector = new PhysicsVector(force.X, force.Y, force.Z);
this._physActor.Velocity = phyVector;
@@ -60,7 +61,8 @@ namespace OpenSim.world
public override void update()
{
- if(this.updateflag)
+ Console.WriteLine("UPDATING AVATAR!");
+ if(this.updateflag)
{
//need to send movement info
//so create the improvedterseobjectupdate packet
@@ -75,7 +77,7 @@ namespace OpenSim.world
client.OutPacket(terse);
}
- updateflag =false;
+ updateflag =false;
this._updateCount = 0;
}
else
diff --git a/src/world/Entity.cs b/src/world/Entity.cs
index 1a4ced98d2..7e986a5e97 100644
--- a/src/world/Entity.cs
+++ b/src/world/Entity.cs
@@ -27,11 +27,11 @@ namespace OpenSim.world
name = "(basic entity)";
children = new List();
}
- public virtual void addFroces()
+ public virtual void addForces()
{
foreach (Entity child in children)
{
- child.addFroces();
+ child.addForces();
}
}
public virtual void update() {
diff --git a/src/world/World.cs b/src/world/World.cs
index 57b698d944..2645113151 100644
--- a/src/world/World.cs
+++ b/src/world/World.cs
@@ -46,7 +46,8 @@ namespace OpenSim.world
public void Update()
{
- if(this.phyScene.IsThreaded)
+
+ if(this.phyScene.IsThreaded)
{
this.phyScene.GetResults();
@@ -54,7 +55,7 @@ namespace OpenSim.world
foreach (libsecondlife.LLUUID UUID in Entities.Keys)
{
- Entities[UUID].addFroces();
+ Entities[UUID].addForces();
}
this.phyScene.Simulate(timeStep);
@@ -87,13 +88,13 @@ namespace OpenSim.world
ServerConsole.MainConsole.Instance.WriteLine("World.cs:AddViewerAgent() - Creating new avatar for remote viewer agent");
Avatar NewAvatar = new Avatar(AgentClient);
ServerConsole.MainConsole.Instance.WriteLine("World.cs:AddViewerAgent() - Adding new avatar to world");
- this.Entities.Add(AgentClient.AgentID, NewAvatar);
ServerConsole.MainConsole.Instance.WriteLine("World.cs:AddViewerAgent() - Starting RegionHandshake ");
NewAvatar.SendRegionHandshake(this);
NewAvatar.PhysActor = this.phyScene.AddAvatar(new PhysicsVector(NewAvatar.position.X, NewAvatar.position.Y, NewAvatar.position.Z));
//this.Update(); // will work for now, but needs to be optimised so we don't update everything in the sim for each new user
- }
+ this.Entities.Add(AgentClient.AgentID, NewAvatar);
+ }
public bool Backup() {
/* TODO: Save the current world entities state. */