aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--README.txt19
-rw-r--r--src/Main.cs12
-rw-r--r--src/physics/RealPhysX/RealPhysXplugin/RealPhysXplugin.csproj6
-rw-r--r--src/physics/plugins/BasicPhysicsplugin.csproj6
4 files changed, 33 insertions, 10 deletions
diff --git a/README.txt b/README.txt
new file mode 100644
index 0000000..9aa8c90
--- /dev/null
+++ b/README.txt
@@ -0,0 +1,19 @@
1Build Instructions
2
3=== Microsoft Visual Studio 2005 Sandbox Build ===
4
5* Check out the trunk code
6
7* Build the /src/opensim.sln solution
8
9* open cmd window, go to /bin and launch
10OpenSim.exe -sandbox -loginserver
11
12* open another cmd window, locate the secondlife executable
13(In something like C:\Program Files\SecondLife )
14
15* run the viewer with
16secondlife.exe -loginuri http://localhost:8080/
17
18* Have fun with your own sandbox!
19
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
154 ServerConsole.MainConsole.Instance.WriteLine("Initialising world"); 154 ServerConsole.MainConsole.Instance.WriteLine("Initialising world");
155 local_world = cfg.LoadWorld(); 155 local_world = cfg.LoadWorld();
156 156
157 timer1.Enabled = true;
158 timer1.Interval = 100;
159 timer1.Elapsed += new ElapsedEventHandler(this.Timer1Tick);
160
161 this.physManager = new PhysicsSystem.PhysicsManager(); 157 this.physManager = new PhysicsSystem.PhysicsManager();
162 this.physManager.LoadPlugins(); 158 this.physManager.LoadPlugins();
163 ServerConsole.MainConsole.Instance.WriteLine("Main.cs:Startup() - Starting up messaging system"); 159 ServerConsole.MainConsole.Instance.WriteLine("Main.cs:Startup() - Starting up messaging system");
164 local_world.PhysScene = this.physManager.GetPhysicsScene(this._physicsEngine); //should be reading from the config file what physics engine to use 160 local_world.PhysScene = this.physManager.GetPhysicsScene(this._physicsEngine); //should be reading from the config file what physics engine to use
165 local_world.PhysScene.SetTerrain(local_world.LandMap); 161 local_world.PhysScene.SetTerrain(local_world.LandMap);
166 162
167 OpenSim_Main.gridServers.AssetServer.SetServerInfo(OpenSim_Main.cfg.AssetURL, OpenSim_Main.cfg.AssetSendKey); 163 OpenSim_Main.gridServers.AssetServer.SetServerInfo(OpenSim_Main.cfg.AssetURL, OpenSim_Main.cfg.AssetSendKey);
168 OpenSim_Main.gridServers.GridServer.SetServerInfo(OpenSim_Main.cfg.GridURL, OpenSim_Main.cfg.GridSendKey); 164 OpenSim_Main.gridServers.GridServer.SetServerInfo(OpenSim_Main.cfg.GridURL, OpenSim_Main.cfg.GridSendKey);
169 165
@@ -173,7 +169,11 @@ namespace OpenSim
173 ServerConsole.MainConsole.Instance.WriteLine("Main.cs:Startup() - Starting CAPS HTTP server"); 169 ServerConsole.MainConsole.Instance.WriteLine("Main.cs:Startup() - Starting CAPS HTTP server");
174 http_server = new SimCAPSHTTPServer(); 170 http_server = new SimCAPSHTTPServer();
175 171
176 MainServerListener(); 172 timer1.Enabled = true;
173 timer1.Interval = 100;
174 timer1.Elapsed += new ElapsedEventHandler(this.Timer1Tick);
175
176 MainServerListener();
177 177
178 } 178 }
179 179
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 @@
1<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> 1<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2 <PropertyGroup> 2 <PropertyGroup>
3 <OutputType>Library</OutputType> 3 <OutputType>Library</OutputType>
4 <RootNamespace>RealPhysXplugin</RootNamespace> 4 <RootNamespace>RealPhysXplugin</RootNamespace>
@@ -8,7 +8,7 @@
8 <ProjectGuid>{56C1D214-F389-4228-921A-0A3A0712C159}</ProjectGuid> 8 <ProjectGuid>{56C1D214-F389-4228-921A-0A3A0712C159}</ProjectGuid>
9 </PropertyGroup> 9 </PropertyGroup>
10 <PropertyGroup Condition=" '$(Configuration)' == 'Debug' "> 10 <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
11 <OutputPath>bin\Debug\</OutputPath> 11 <OutputPath>..\..\..\..\bin\Physics\</OutputPath>
12 <Optimize>False</Optimize> 12 <Optimize>False</Optimize>
13 <DefineConstants>DEBUG;TRACE</DefineConstants> 13 <DefineConstants>DEBUG;TRACE</DefineConstants>
14 <DebugSymbols>True</DebugSymbols> 14 <DebugSymbols>True</DebugSymbols>
@@ -29,6 +29,7 @@
29 <Reference Include="PhysX_Wrapper_Dotnet"> 29 <Reference Include="PhysX_Wrapper_Dotnet">
30 <HintPath>..\..\..\..\bin\PhysX_Wrapper_Dotnet.dll</HintPath> 30 <HintPath>..\..\..\..\bin\PhysX_Wrapper_Dotnet.dll</HintPath>
31 <SpecificVersion>False</SpecificVersion> 31 <SpecificVersion>False</SpecificVersion>
32 <Private>False</Private>
32 </Reference> 33 </Reference>
33 </ItemGroup> 34 </ItemGroup>
34 <ItemGroup> 35 <ItemGroup>
@@ -39,6 +40,7 @@
39 <ProjectReference Include="..\..\PhysicsManager.csproj"> 40 <ProjectReference Include="..\..\PhysicsManager.csproj">
40 <Project>{3C86A846-7977-4EE7-A8DC-DD487FA5DC2B}</Project> 41 <Project>{3C86A846-7977-4EE7-A8DC-DD487FA5DC2B}</Project>
41 <Name>PhysicsManager</Name> 42 <Name>PhysicsManager</Name>
43 <Private>False</Private>
42 </ProjectReference> 44 </ProjectReference>
43 </ItemGroup> 45 </ItemGroup>
44 <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" /> 46 <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 @@
1<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> 1<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2 <PropertyGroup> 2 <PropertyGroup>
3 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> 3 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
4 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> 4 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -14,7 +14,7 @@
14 <DebugSymbols>true</DebugSymbols> 14 <DebugSymbols>true</DebugSymbols>
15 <DebugType>full</DebugType> 15 <DebugType>full</DebugType>
16 <Optimize>false</Optimize> 16 <Optimize>false</Optimize>
17 <OutputPath>bin\Debug\</OutputPath> 17 <OutputPath>..\..\..\bin\Physics\</OutputPath>
18 <DefineConstants>DEBUG;TRACE</DefineConstants> 18 <DefineConstants>DEBUG;TRACE</DefineConstants>
19 <ErrorReport>prompt</ErrorReport> 19 <ErrorReport>prompt</ErrorReport>
20 <WarningLevel>4</WarningLevel> 20 <WarningLevel>4</WarningLevel>
@@ -31,6 +31,7 @@
31 <Reference Include="Axiom.MathLib, Version=0.7.0.25497, Culture=neutral"> 31 <Reference Include="Axiom.MathLib, Version=0.7.0.25497, Culture=neutral">
32 <SpecificVersion>False</SpecificVersion> 32 <SpecificVersion>False</SpecificVersion>
33 <HintPath>..\..\..\bin\Axiom.MathLib.dll</HintPath> 33 <HintPath>..\..\..\bin\Axiom.MathLib.dll</HintPath>
34 <Private>False</Private>
34 </Reference> 35 </Reference>
35 <Reference Include="System" /> 36 <Reference Include="System" />
36 <Reference Include="System.Data" /> 37 <Reference Include="System.Data" />
@@ -44,6 +45,7 @@
44 <ProjectReference Include="..\PhysicsManager.csproj"> 45 <ProjectReference Include="..\PhysicsManager.csproj">
45 <Project>{3C86A846-7977-4EE7-A8DC-DD487FA5DC2B}</Project> 46 <Project>{3C86A846-7977-4EE7-A8DC-DD487FA5DC2B}</Project>
46 <Name>PhysicsManager</Name> 47 <Name>PhysicsManager</Name>
48 <Private>False</Private>
47 </ProjectReference> 49 </ProjectReference>
48 </ItemGroup> 50 </ItemGroup>
49 <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> 51 <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />