diff --git a/README.txt b/README.txt new file mode 100644 index 0000000000..9aa8c903d9 --- /dev/null +++ b/README.txt @@ -0,0 +1,19 @@ +Build Instructions + +=== Microsoft Visual Studio 2005 Sandbox Build === + +* Check out the trunk code + +* Build the /src/opensim.sln solution + +* open cmd window, go to /bin and launch +OpenSim.exe -sandbox -loginserver + +* open another cmd window, locate the secondlife executable +(In something like C:\Program Files\SecondLife ) + +* run the viewer with +secondlife.exe -loginuri http://localhost:8080/ + +* Have fun with your own sandbox! + diff --git a/src/Main.cs b/src/Main.cs index 506f87b39d..8446c5ef5f 100644 --- a/src/Main.cs +++ b/src/Main.cs @@ -154,16 +154,12 @@ namespace OpenSim 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"); local_world.PhysScene = this.physManager.GetPhysicsScene(this._physicsEngine); //should be reading from the config file what physics engine to use local_world.PhysScene.SetTerrain(local_world.LandMap); - + OpenSim_Main.gridServers.AssetServer.SetServerInfo(OpenSim_Main.cfg.AssetURL, OpenSim_Main.cfg.AssetSendKey); OpenSim_Main.gridServers.GridServer.SetServerInfo(OpenSim_Main.cfg.GridURL, OpenSim_Main.cfg.GridSendKey); @@ -173,7 +169,11 @@ namespace OpenSim ServerConsole.MainConsole.Instance.WriteLine("Main.cs:Startup() - Starting CAPS HTTP server"); http_server = new SimCAPSHTTPServer(); - MainServerListener(); + timer1.Enabled = true; + timer1.Interval = 100; + timer1.Elapsed += new ElapsedEventHandler(this.Timer1Tick); + + MainServerListener(); } diff --git a/src/physics/RealPhysX/RealPhysXplugin/RealPhysXplugin.csproj b/src/physics/RealPhysX/RealPhysXplugin/RealPhysXplugin.csproj index b4f2690a90..7b1616adb2 100644 --- a/src/physics/RealPhysX/RealPhysXplugin/RealPhysXplugin.csproj +++ b/src/physics/RealPhysX/RealPhysXplugin/RealPhysXplugin.csproj @@ -1,4 +1,4 @@ - + Library RealPhysXplugin @@ -8,7 +8,7 @@ {56C1D214-F389-4228-921A-0A3A0712C159} - bin\Debug\ + ..\..\..\..\bin\Physics\ False DEBUG;TRACE True @@ -29,6 +29,7 @@ ..\..\..\..\bin\PhysX_Wrapper_Dotnet.dll False + False @@ -39,6 +40,7 @@ {3C86A846-7977-4EE7-A8DC-DD487FA5DC2B} PhysicsManager + False diff --git a/src/physics/plugins/BasicPhysicsplugin.csproj b/src/physics/plugins/BasicPhysicsplugin.csproj index 57cd8850a3..e9eaf033b7 100644 --- a/src/physics/plugins/BasicPhysicsplugin.csproj +++ b/src/physics/plugins/BasicPhysicsplugin.csproj @@ -1,4 +1,4 @@ - + Debug AnyCPU @@ -14,7 +14,7 @@ true full false - bin\Debug\ + ..\..\..\bin\Physics\ DEBUG;TRACE prompt 4 @@ -31,6 +31,7 @@ False ..\..\..\bin\Axiom.MathLib.dll + False @@ -44,6 +45,7 @@ {3C86A846-7977-4EE7-A8DC-DD487FA5DC2B} PhysicsManager + False