diff options
author | Diva Canto | 2015-08-31 13:02:51 -0700 |
---|---|---|
committer | Diva Canto | 2015-08-31 13:02:51 -0700 |
commit | 134d4300f0b6e9b0df0326cfe0b5df9f41f42865 (patch) | |
tree | 86420f55292ec2f566c10b30cdb52a54e6c0f14c /OpenSim/Region/PhysicsModules/BulletS/BSShapes.cs | |
parent | Fixed a namespace dependency. Also started preparing prebuild.xml for making ... (diff) | |
download | opensim-SC_OLD-134d4300f0b6e9b0df0326cfe0b5df9f41f42865.zip opensim-SC_OLD-134d4300f0b6e9b0df0326cfe0b5df9f41f42865.tar.gz opensim-SC_OLD-134d4300f0b6e9b0df0326cfe0b5df9f41f42865.tar.bz2 opensim-SC_OLD-134d4300f0b6e9b0df0326cfe0b5df9f41f42865.tar.xz |
All physics plugins are now region modules. Compiles but doesn't run.
Diffstat (limited to 'OpenSim/Region/PhysicsModules/BulletS/BSShapes.cs')
-rwxr-xr-x | OpenSim/Region/PhysicsModules/BulletS/BSShapes.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/PhysicsModules/BulletS/BSShapes.cs b/OpenSim/Region/PhysicsModules/BulletS/BSShapes.cs index 1c55b51..086a412 100755 --- a/OpenSim/Region/PhysicsModules/BulletS/BSShapes.cs +++ b/OpenSim/Region/PhysicsModules/BulletS/BSShapes.cs | |||
@@ -299,7 +299,7 @@ public abstract class BSShape | |||
299 | { | 299 | { |
300 | xprim.PrimAssetState = BSPhysObject.PrimAssetCondition.FailedAssetFetch; | 300 | xprim.PrimAssetState = BSPhysObject.PrimAssetCondition.FailedAssetFetch; |
301 | physicsScene.Logger.ErrorFormat("{0} Physical object requires asset but no asset provider. Name={1}", | 301 | physicsScene.Logger.ErrorFormat("{0} Physical object requires asset but no asset provider. Name={1}", |
302 | LogHeader, physicsScene.Name); | 302 | LogHeader, physicsScene.PhysicsSceneName); |
303 | } | 303 | } |
304 | } | 304 | } |
305 | else | 305 | else |
@@ -336,7 +336,7 @@ public abstract class BSShape | |||
336 | if (pScene != null) | 336 | if (pScene != null) |
337 | { | 337 | { |
338 | buff.Append("/rgn="); | 338 | buff.Append("/rgn="); |
339 | buff.Append(pScene.Name); | 339 | buff.Append(pScene.PhysicsSceneName); |
340 | } | 340 | } |
341 | return buff.ToString(); | 341 | return buff.ToString(); |
342 | } | 342 | } |