diff options
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Region/Application/OpenSimMain.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/ClientStack/RegionApplicationBase.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Examples/SimpleApp/Program.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs (renamed from OpenSim/Region/Physics/Manager/PhysicsManager.cs) | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs index 269c54c..d7bed31 100644 --- a/OpenSim/Region/Application/OpenSimMain.cs +++ b/OpenSim/Region/Application/OpenSimMain.cs | |||
@@ -119,7 +119,7 @@ namespace OpenSim | |||
119 | 119 | ||
120 | startuptime = DateTime.Now; | 120 | startuptime = DateTime.Now; |
121 | 121 | ||
122 | this.m_physicsManager = new PhysicsManager(); | 122 | this.m_physicsManager = new PhysicsPluginManager(); |
123 | this.m_physicsManager.LoadPlugins(); | 123 | this.m_physicsManager.LoadPlugins(); |
124 | 124 | ||
125 | this.SetupScene(); | 125 | this.SetupScene(); |
diff --git a/OpenSim/Region/ClientStack/RegionApplicationBase.cs b/OpenSim/Region/ClientStack/RegionApplicationBase.cs index 610f2d9..b67fdfa 100644 --- a/OpenSim/Region/ClientStack/RegionApplicationBase.cs +++ b/OpenSim/Region/ClientStack/RegionApplicationBase.cs | |||
@@ -42,7 +42,7 @@ namespace OpenSim.Region.ClientStack | |||
42 | { | 42 | { |
43 | public class RegionApplicationBase | 43 | public class RegionApplicationBase |
44 | { | 44 | { |
45 | protected PhysicsManager m_physicsManager; | 45 | protected PhysicsPluginManager m_physicsManager; |
46 | protected AssetCache AssetCache; | 46 | protected AssetCache AssetCache; |
47 | protected InventoryCache InventoryCache; | 47 | protected InventoryCache InventoryCache; |
48 | protected Dictionary<EndPoint, uint> clientCircuits = new Dictionary<EndPoint, uint>(); | 48 | protected Dictionary<EndPoint, uint> clientCircuits = new Dictionary<EndPoint, uint>(); |
diff --git a/OpenSim/Region/Examples/SimpleApp/Program.cs b/OpenSim/Region/Examples/SimpleApp/Program.cs index f82bdcb..131159e 100644 --- a/OpenSim/Region/Examples/SimpleApp/Program.cs +++ b/OpenSim/Region/Examples/SimpleApp/Program.cs | |||
@@ -50,7 +50,7 @@ namespace SimpleApp | |||
50 | ScenePresence.LoadTextureFile("avatar-texture.dat"); | 50 | ScenePresence.LoadTextureFile("avatar-texture.dat"); |
51 | ScenePresence.PhysicsEngineFlying = true; | 51 | ScenePresence.PhysicsEngineFlying = true; |
52 | 52 | ||
53 | PhysicsManager physManager = new PhysicsManager(); | 53 | PhysicsPluginManager physManager = new PhysicsPluginManager(); |
54 | physManager.LoadPlugins(); | 54 | physManager.LoadPlugins(); |
55 | 55 | ||
56 | UDPServer udpServer = new UDPServer(internalEndPoint.Port, assetCache, inventoryCache, m_log, m_circuitManager); | 56 | UDPServer udpServer = new UDPServer(internalEndPoint.Port, assetCache, inventoryCache, m_log, m_circuitManager); |
diff --git a/OpenSim/Region/Physics/Manager/PhysicsManager.cs b/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs index 7c475e7..cb77405 100644 --- a/OpenSim/Region/Physics/Manager/PhysicsManager.cs +++ b/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs | |||
@@ -36,11 +36,11 @@ namespace OpenSim.Physics.Manager | |||
36 | /// <summary> | 36 | /// <summary> |
37 | /// Description of MyClass. | 37 | /// Description of MyClass. |
38 | /// </summary> | 38 | /// </summary> |
39 | public class PhysicsManager | 39 | public class PhysicsPluginManager |
40 | { | 40 | { |
41 | private Dictionary<string, IPhysicsPlugin> _plugins=new Dictionary<string, IPhysicsPlugin>(); | 41 | private Dictionary<string, IPhysicsPlugin> _plugins=new Dictionary<string, IPhysicsPlugin>(); |
42 | 42 | ||
43 | public PhysicsManager() | 43 | public PhysicsPluginManager() |
44 | { | 44 | { |
45 | 45 | ||
46 | } | 46 | } |