3 files changed, 14 insertions, 10 deletions

diff --git a/src/Main.cs b/src/Main.cs
index 506f87b..8446c5e 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 b4f2690..7b1616a 100644
--- a/src/physics/RealPhysX/RealPhysXplugin/RealPhysXplugin.csproj
+++ b/src/physics/RealPhysX/RealPhysXplugin/RealPhysXplugin.csproj
@@ -1,4 +1,4 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

   <PropertyGroup>

     <OutputType>Library</OutputType>

     <RootNamespace>RealPhysXplugin</RootNamespace>

@@ -8,7 +8,7 @@
     <ProjectGuid>{56C1D214-F389-4228-921A-0A3A0712C159}</ProjectGuid>

   </PropertyGroup>

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

-    <OutputPath>bin\Debug\</OutputPath>

+    <OutputPath>..\..\..\..\bin\Physics\</OutputPath>

     <Optimize>False</Optimize>

     <DefineConstants>DEBUG;TRACE</DefineConstants>

     <DebugSymbols>True</DebugSymbols>

@@ -29,6 +29,7 @@
     <Reference Include="PhysX_Wrapper_Dotnet">

       <HintPath>..\..\..\..\bin\PhysX_Wrapper_Dotnet.dll</HintPath>

       <SpecificVersion>False</SpecificVersion>

+      <Private>False</Private>

     </Reference>

   </ItemGroup>

   <ItemGroup>

@@ -39,6 +40,7 @@
     <ProjectReference Include="..\..\PhysicsManager.csproj">

       <Project>{3C86A846-7977-4EE7-A8DC-DD487FA5DC2B}</Project>

       <Name>PhysicsManager</Name>

+      <Private>False</Private>

     </ProjectReference>

   </ItemGroup>

   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />

diff --git a/src/physics/plugins/BasicPhysicsplugin.csproj b/src/physics/plugins/BasicPhysicsplugin.csproj
index 57cd885..e9eaf03 100644
--- a/src/physics/plugins/BasicPhysicsplugin.csproj
+++ b/src/physics/plugins/BasicPhysicsplugin.csproj
@@ -1,4 +1,4 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

   <PropertyGroup>

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

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

@@ -14,7 +14,7 @@
     <DebugSymbols>true</DebugSymbols>

     <DebugType>full</DebugType>

     <Optimize>false</Optimize>

-    <OutputPath>bin\Debug\</OutputPath>

+    <OutputPath>..\..\..\bin\Physics\</OutputPath>

     <DefineConstants>DEBUG;TRACE</DefineConstants>

     <ErrorReport>prompt</ErrorReport>

     <WarningLevel>4</WarningLevel>

@@ -31,6 +31,7 @@
     <Reference Include="Axiom.MathLib, Version=0.7.0.25497, Culture=neutral">

       <SpecificVersion>False</SpecificVersion>

       <HintPath>..\..\..\bin\Axiom.MathLib.dll</HintPath>

+      <Private>False</Private>

     </Reference>

     <Reference Include="System" />

     <Reference Include="System.Data" />

@@ -44,6 +45,7 @@
     <ProjectReference Include="..\PhysicsManager.csproj">

       <Project>{3C86A846-7977-4EE7-A8DC-DD487FA5DC2B}</Project>

       <Name>PhysicsManager</Name>

+      <Private>False</Private>

     </ProjectReference>

   </ItemGroup>

   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />