diff options
author | lbsa71 | 2007-07-02 08:03:11 +0000 |
---|---|---|
committer | lbsa71 | 2007-07-02 08:03:11 +0000 |
commit | 686f6a83319eaccd27f426eda82c020246566963 (patch) | |
tree | 1a2f4d75316282d4d36de11789af7d0e91950254 /OpenSim | |
parent | * Applied Weathros/tedd's IP v6 patch (diff) | |
download | opensim-SC_OLD-686f6a83319eaccd27f426eda82c020246566963.zip opensim-SC_OLD-686f6a83319eaccd27f426eda82c020246566963.tar.gz opensim-SC_OLD-686f6a83319eaccd27f426eda82c020246566963.tar.bz2 opensim-SC_OLD-686f6a83319eaccd27f426eda82c020246566963.tar.xz |
* Fixed Issue #161 by using PhysicsScene.Null instead of BasePhysicsScene
* Hid NullPhysicsScene for great justice
* Fixed broken Grid build
Diffstat (limited to '')
-rw-r--r-- | OpenSim.sln | 2 | ||||
-rw-r--r-- | OpenSim/Grid/AssetServer/AssetHttpServer.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Examples/SimpleApp/Program.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/Examples/SimpleApp/SimpleApp.csproj | 6 | ||||
-rw-r--r-- | OpenSim/Region/Examples/SimpleApp/SimpleApp.exe.build | 1 | ||||
-rw-r--r-- | OpenSim/Region/Physics/Manager/PhysicsManager.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Physics/Manager/PhysicsScene.cs | 74 |
7 files changed, 42 insertions, 49 deletions
diff --git a/OpenSim.sln b/OpenSim.sln index 66e79d2..bd39235 100644 --- a/OpenSim.sln +++ b/OpenSim.sln | |||
@@ -1,5 +1,5 @@ | |||
1 | Microsoft Visual Studio Solution File, Format Version 9.00 | 1 | Microsoft Visual Studio Solution File, Format Version 9.00 |
2 | # Visual C# Express 2005 | 2 | # Visual Studio 2005 |
3 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim", "OpenSim\Region\Application\OpenSim.csproj", "{438A9556-0000-0000-0000-000000000000}" | 3 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim", "OpenSim\Region\Application\OpenSim.csproj", "{438A9556-0000-0000-0000-000000000000}" |
4 | EndProject | 4 | EndProject |
5 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework", "OpenSim\Framework\General\OpenSim.Framework.csproj", "{8ACA2445-0000-0000-0000-000000000000}" | 5 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework", "OpenSim\Framework\General\OpenSim.Framework.csproj", "{8ACA2445-0000-0000-0000-000000000000}" |
diff --git a/OpenSim/Grid/AssetServer/AssetHttpServer.cs b/OpenSim/Grid/AssetServer/AssetHttpServer.cs index ad8733f..31cb379 100644 --- a/OpenSim/Grid/AssetServer/AssetHttpServer.cs +++ b/OpenSim/Grid/AssetServer/AssetHttpServer.cs | |||
@@ -94,7 +94,7 @@ namespace OpenSim.Grid.AssetServer | |||
94 | 94 | ||
95 | case "application/xml": | 95 | case "application/xml": |
96 | // probably LLSD we hope, otherwise it should be ignored by the parser | 96 | // probably LLSD we hope, otherwise it should be ignored by the parser |
97 | responseString = ParseLLSDXML(requestBody); | 97 | responseString = ParseREST(requestBody, request.RawUrl, request.HttpMethod); |
98 | response.AddHeader("Content-type", "application/xml"); | 98 | response.AddHeader("Content-type", "application/xml"); |
99 | break; | 99 | break; |
100 | 100 | ||
diff --git a/OpenSim/Region/Examples/SimpleApp/Program.cs b/OpenSim/Region/Examples/SimpleApp/Program.cs index 8e9ad75..3d9dd0d 100644 --- a/OpenSim/Region/Examples/SimpleApp/Program.cs +++ b/OpenSim/Region/Examples/SimpleApp/Program.cs | |||
@@ -14,9 +14,9 @@ using OpenSim.Region.Caches; | |||
14 | using OpenSim.Framework.Communications; | 14 | using OpenSim.Framework.Communications; |
15 | using OpenSim.Region.Communications.Local; | 15 | using OpenSim.Region.Communications.Local; |
16 | using OpenSim.Region.ClientStack; | 16 | using OpenSim.Region.ClientStack; |
17 | using OpenSim.Region.Physics.BasicPhysicsPlugin; | ||
18 | using System.Net; | 17 | using System.Net; |
19 | using libsecondlife.Packets; | 18 | using libsecondlife.Packets; |
19 | using OpenSim.Physics.Manager; | ||
20 | 20 | ||
21 | namespace SimpleApp | 21 | namespace SimpleApp |
22 | { | 22 | { |
@@ -59,7 +59,7 @@ namespace SimpleApp | |||
59 | 59 | ||
60 | BaseHttpServer httpServer = new BaseHttpServer( internalEndPoint.Port ); | 60 | BaseHttpServer httpServer = new BaseHttpServer( internalEndPoint.Port ); |
61 | MyWorld world = new MyWorld(packetServer.ClientAPIs, regionInfo, m_circuitManager, communicationsManager, assetCache, httpServer); | 61 | MyWorld world = new MyWorld(packetServer.ClientAPIs, regionInfo, m_circuitManager, communicationsManager, assetCache, httpServer); |
62 | world.PhysScene = new BasicScene(); | 62 | world.PhysScene = PhysicsScene.Null; |
63 | udpServer.LocalWorld = world; | 63 | udpServer.LocalWorld = world; |
64 | 64 | ||
65 | httpServer.AddXmlRPCHandler("login_to_simulator", communicationsManager.UserServices.XmlRpcLoginMethod ); | 65 | httpServer.AddXmlRPCHandler("login_to_simulator", communicationsManager.UserServices.XmlRpcLoginMethod ); |
diff --git a/OpenSim/Region/Examples/SimpleApp/SimpleApp.csproj b/OpenSim/Region/Examples/SimpleApp/SimpleApp.csproj index d39d091..bb8dcc0 100644 --- a/OpenSim/Region/Examples/SimpleApp/SimpleApp.csproj +++ b/OpenSim/Region/Examples/SimpleApp/SimpleApp.csproj | |||
@@ -140,12 +140,6 @@ | |||
140 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 140 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
141 | <Private>False</Private> | 141 | <Private>False</Private> |
142 | </ProjectReference> | 142 | </ProjectReference> |
143 | <ProjectReference Include="..\..\Physics\BasicPhysicsPlugin\OpenSim.Region.Physics.BasicPhysicsPlugin.csproj"> | ||
144 | <Name>OpenSim.Region.Physics.BasicPhysicsPlugin</Name> | ||
145 | <Project>{15B4FEF3-0000-0000-0000-000000000000}</Project> | ||
146 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | ||
147 | <Private>False</Private> | ||
148 | </ProjectReference> | ||
149 | <ProjectReference Include="..\..\Physics\Manager\OpenSim.Region.Physics.Manager.csproj"> | 143 | <ProjectReference Include="..\..\Physics\Manager\OpenSim.Region.Physics.Manager.csproj"> |
150 | <Name>OpenSim.Region.Physics.Manager</Name> | 144 | <Name>OpenSim.Region.Physics.Manager</Name> |
151 | <Project>{F4FF31EB-0000-0000-0000-000000000000}</Project> | 145 | <Project>{F4FF31EB-0000-0000-0000-000000000000}</Project> |
diff --git a/OpenSim/Region/Examples/SimpleApp/SimpleApp.exe.build b/OpenSim/Region/Examples/SimpleApp/SimpleApp.exe.build index db44992..aab0826 100644 --- a/OpenSim/Region/Examples/SimpleApp/SimpleApp.exe.build +++ b/OpenSim/Region/Examples/SimpleApp/SimpleApp.exe.build | |||
@@ -31,7 +31,6 @@ | |||
31 | <include name="../../../../bin/OpenSim.Region.Communications.Local.dll" /> | 31 | <include name="../../../../bin/OpenSim.Region.Communications.Local.dll" /> |
32 | <include name="../../../../bin/OpenSim.Region.Environment.dll" /> | 32 | <include name="../../../../bin/OpenSim.Region.Environment.dll" /> |
33 | <include name="../../../../bin/OpenSim.Region.GridInterfaces.Local.dll" /> | 33 | <include name="../../../../bin/OpenSim.Region.GridInterfaces.Local.dll" /> |
34 | <include name="../../../../bin/OpenSim.Region.Physics.BasicPhysicsPlugin.dll" /> | ||
35 | <include name="../../../../bin/OpenSim.Region.Physics.Manager.dll" /> | 34 | <include name="../../../../bin/OpenSim.Region.Physics.Manager.dll" /> |
36 | <include name="System.dll" /> | 35 | <include name="System.dll" /> |
37 | <include name="System.Data.dll.dll" /> | 36 | <include name="System.Data.dll.dll" /> |
diff --git a/OpenSim/Region/Physics/Manager/PhysicsManager.cs b/OpenSim/Region/Physics/Manager/PhysicsManager.cs index efccb36..0e28522 100644 --- a/OpenSim/Region/Physics/Manager/PhysicsManager.cs +++ b/OpenSim/Region/Physics/Manager/PhysicsManager.cs | |||
@@ -51,7 +51,7 @@ namespace OpenSim.Physics.Manager | |||
51 | { | 51 | { |
52 | if (String.IsNullOrEmpty(engineName)) | 52 | if (String.IsNullOrEmpty(engineName)) |
53 | { | 53 | { |
54 | return new NullPhysicsScene(); | 54 | return PhysicsScene.Null; |
55 | } | 55 | } |
56 | 56 | ||
57 | if(_plugins.ContainsKey(engineName)) | 57 | if(_plugins.ContainsKey(engineName)) |
diff --git a/OpenSim/Region/Physics/Manager/PhysicsScene.cs b/OpenSim/Region/Physics/Manager/PhysicsScene.cs index 0901c2f..3f22585 100644 --- a/OpenSim/Region/Physics/Manager/PhysicsScene.cs +++ b/OpenSim/Region/Physics/Manager/PhysicsScene.cs | |||
@@ -53,61 +53,61 @@ namespace OpenSim.Physics.Manager | |||
53 | public abstract void GetResults(); | 53 | public abstract void GetResults(); |
54 | 54 | ||
55 | public abstract void SetTerrain(float[] heightMap); | 55 | public abstract void SetTerrain(float[] heightMap); |
56 | 56 | ||
57 | public abstract void DeleteTerrain(); | 57 | public abstract void DeleteTerrain(); |
58 | 58 | ||
59 | public abstract bool IsThreaded | 59 | public abstract bool IsThreaded |
60 | { | 60 | { |
61 | get; | 61 | get; |
62 | } | 62 | } |
63 | } | ||
64 | 63 | ||
65 | public class NullPhysicsScene : PhysicsScene | 64 | private class NullPhysicsScene : PhysicsScene |
66 | { | ||
67 | private static int m_workIndicator; | ||
68 | |||
69 | public override PhysicsActor AddAvatar(PhysicsVector position) | ||
70 | { | 65 | { |
71 | OpenSim.Framework.Console.MainLog.Instance.Verbose("NullPhysicsScene : AddAvatar({0})", position); | 66 | private static int m_workIndicator; |
72 | return PhysicsActor.Null; | ||
73 | } | ||
74 | 67 | ||
75 | public override void RemoveAvatar(PhysicsActor actor) | 68 | public override PhysicsActor AddAvatar(PhysicsVector position) |
76 | { | 69 | { |
70 | OpenSim.Framework.Console.MainLog.Instance.Verbose("NullPhysicsScene : AddAvatar({0})", position); | ||
71 | return PhysicsActor.Null; | ||
72 | } | ||
77 | 73 | ||
78 | } | 74 | public override void RemoveAvatar(PhysicsActor actor) |
75 | { | ||
79 | 76 | ||
80 | public override PhysicsActor AddPrim(PhysicsVector position, PhysicsVector size) | 77 | } |
81 | { | ||
82 | OpenSim.Framework.Console.MainLog.Instance.Verbose( "NullPhysicsScene : AddPrim({0},{1})", position, size); | ||
83 | return PhysicsActor.Null; | ||
84 | } | ||
85 | 78 | ||
86 | public override void Simulate(float timeStep) | 79 | public override PhysicsActor AddPrim(PhysicsVector position, PhysicsVector size) |
87 | { | 80 | { |
88 | m_workIndicator = (m_workIndicator + 1) % 10; | 81 | OpenSim.Framework.Console.MainLog.Instance.Verbose("NullPhysicsScene : AddPrim({0},{1})", position, size); |
82 | return PhysicsActor.Null; | ||
83 | } | ||
89 | 84 | ||
90 | //OpenSim.Framework.Console.MainLog.Instance.SetStatus(m_workIndicator.ToString()); | 85 | public override void Simulate(float timeStep) |
91 | } | 86 | { |
87 | m_workIndicator = (m_workIndicator + 1) % 10; | ||
92 | 88 | ||
93 | public override void GetResults() | 89 | //OpenSim.Framework.Console.MainLog.Instance.SetStatus(m_workIndicator.ToString()); |
94 | { | 90 | } |
95 | OpenSim.Framework.Console.MainLog.Instance.Verbose( "NullPhysicsScene : GetResults()"); | ||
96 | } | ||
97 | 91 | ||
98 | public override void SetTerrain(float[] heightMap) | 92 | public override void GetResults() |
99 | { | 93 | { |
100 | OpenSim.Framework.Console.MainLog.Instance.Verbose( "NullPhysicsScene : SetTerrain({0} items)", heightMap.Length); | 94 | OpenSim.Framework.Console.MainLog.Instance.Verbose("NullPhysicsScene : GetResults()"); |
101 | } | 95 | } |
102 | 96 | ||
103 | public override void DeleteTerrain() | 97 | public override void SetTerrain(float[] heightMap) |
104 | { | 98 | { |
99 | OpenSim.Framework.Console.MainLog.Instance.Verbose("NullPhysicsScene : SetTerrain({0} items)", heightMap.Length); | ||
100 | } | ||
105 | 101 | ||
106 | } | 102 | public override void DeleteTerrain() |
103 | { | ||
107 | 104 | ||
108 | public override bool IsThreaded | 105 | } |
109 | { | 106 | |
110 | get { return false; } | 107 | public override bool IsThreaded |
108 | { | ||
109 | get { return false; } | ||
110 | } | ||
111 | } | 111 | } |
112 | } | 112 | } |
113 | } | 113 | } |