diff options
Merge commit '8bf0a9f85dda4b1831630b65620d5c6868196c11' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSPlugin.cs')
| -rw-r--r-- | OpenSim/Region/Physics/BulletSPlugin/BSPlugin.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPlugin.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPlugin.cs index 65be52a..9442854 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/BSPlugin.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSPlugin.cs | |||
| @@ -59,7 +59,7 @@ public class BSPlugin : IPhysicsPlugin | |||
| 59 | { | 59 | { |
| 60 | if (_mScene == null) | 60 | if (_mScene == null) |
| 61 | { | 61 | { |
| 62 | _mScene = new BSScene(sceneIdentifier); | 62 | _mScene = new BSScene(GetName(), sceneIdentifier); |
| 63 | } | 63 | } |
| 64 | return (_mScene); | 64 | return (_mScene); |
| 65 | } | 65 | } |