diff options
author | mingchen | 2008-06-09 15:20:08 +0000 |
---|---|---|
committer | mingchen | 2008-06-09 15:20:08 +0000 |
commit | db151bcec7843162c6dadf92afb1cf59957df943 (patch) | |
tree | de5769d913ee2f2f0429567a807e52f3ea82baca /OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs | |
parent | *Patched CreateItemsTable.sql (MSSQL). Patch by Kyle and Chris from G2. (diff) | |
download | opensim-SC-db151bcec7843162c6dadf92afb1cf59957df943.zip opensim-SC-db151bcec7843162c6dadf92afb1cf59957df943.tar.gz opensim-SC-db151bcec7843162c6dadf92afb1cf59957df943.tar.bz2 opensim-SC-db151bcec7843162c6dadf92afb1cf59957df943.tar.xz |
*Fixed bug that caused failure when System.Console.Readline returns null (no stdin)
*Fixed bug that would crash the simulator if there were two physics/meshing engines loaded with the same name.
Diffstat (limited to 'OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs')
-rw-r--r-- | OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs b/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs index 6a71581..4927cc5 100644 --- a/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs +++ b/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs | |||
@@ -130,8 +130,11 @@ namespace OpenSim.Region.Physics.Manager | |||
130 | IPhysicsPlugin plug = | 130 | IPhysicsPlugin plug = |
131 | (IPhysicsPlugin) Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString())); | 131 | (IPhysicsPlugin) Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString())); |
132 | plug.Init(); | 132 | plug.Init(); |
133 | _PhysPlugins.Add(plug.GetName(), plug); | 133 | if(!_PhysPlugins.ContainsKey(plug.GetName())) |
134 | m_log.Info("[PHYSICS]: Added physics engine: " + plug.GetName()); | 134 | { |
135 | _PhysPlugins.Add(plug.GetName(), plug); | ||
136 | m_log.Info("[PHYSICS]: Added physics engine: " + plug.GetName()); | ||
137 | } | ||
135 | } | 138 | } |
136 | 139 | ||
137 | Type meshTypeInterface = pluginType.GetInterface("IMeshingPlugin", true); | 140 | Type meshTypeInterface = pluginType.GetInterface("IMeshingPlugin", true); |
@@ -140,8 +143,11 @@ namespace OpenSim.Region.Physics.Manager | |||
140 | { | 143 | { |
141 | IMeshingPlugin plug = | 144 | IMeshingPlugin plug = |
142 | (IMeshingPlugin) Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString())); | 145 | (IMeshingPlugin) Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString())); |
143 | _MeshPlugins.Add(plug.GetName(), plug); | 146 | if(!_MeshPlugins.ContainsKey(plug.GetName())) |
144 | m_log.Info("[PHYSICS]: Added meshing engine: " + plug.GetName()); | 147 | { |
148 | _MeshPlugins.Add(plug.GetName(), plug); | ||
149 | m_log.Info("[PHYSICS]: Added meshing engine: " + plug.GetName()); | ||
150 | } | ||
145 | } | 151 | } |
146 | 152 | ||
147 | physTypeInterface = null; | 153 | physTypeInterface = null; |