diff options
| author | Diva Canto | 2012-09-30 06:52:19 -0700 |
|---|---|---|
| committer | Diva Canto | 2012-09-30 06:52:19 -0700 |
| commit | 14a4b146bf7f3552defcbe1e99fdbc64cb8fbf9c (patch) | |
| tree | 3c76fe34e863fa990c6da0f72d8350c7476cf1e4 /OpenSim/Region/Physics/BulletSPlugin/BSPlugin.cs | |
| parent | Made a method of GridUserService virtual so it can be overridden. (diff) | |
| parent | Get rid of some unnecessary casts in RemoteAdminPlugin. (diff) | |
| download | opensim-SC-14a4b146bf7f3552defcbe1e99fdbc64cb8fbf9c.zip opensim-SC-14a4b146bf7f3552defcbe1e99fdbc64cb8fbf9c.tar.gz opensim-SC-14a4b146bf7f3552defcbe1e99fdbc64cb8fbf9c.tar.bz2 opensim-SC-14a4b146bf7f3552defcbe1e99fdbc64cb8fbf9c.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSPlugin.cs')
| -rw-r--r-- | OpenSim/Region/Physics/BulletSPlugin/BSPlugin.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPlugin.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPlugin.cs index 0f027b8..20f5180 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/BSPlugin.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSPlugin.cs | |||
| @@ -33,7 +33,7 @@ using OpenMetaverse; | |||
| 33 | namespace OpenSim.Region.Physics.BulletSPlugin | 33 | namespace OpenSim.Region.Physics.BulletSPlugin |
| 34 | { | 34 | { |
| 35 | /// <summary> | 35 | /// <summary> |
| 36 | /// Entry for a port of Bullet (http://bulletphysics.org/) to OpenSim. | 36 | /// Entry for a port of Bullet (http://bulletphysics.org/) to OpenSim. |
| 37 | /// This module interfaces to an unmanaged C++ library which makes the | 37 | /// This module interfaces to an unmanaged C++ library which makes the |
| 38 | /// actual calls into the Bullet physics engine. | 38 | /// actual calls into the Bullet physics engine. |
| 39 | /// The unmanaged library is found in opensim-libs::trunk/unmanaged/BulletSim/. | 39 | /// The unmanaged library is found in opensim-libs::trunk/unmanaged/BulletSim/. |
| @@ -62,7 +62,7 @@ public class BSPlugin : IPhysicsPlugin | |||
| 62 | if (Util.IsWindows()) | 62 | if (Util.IsWindows()) |
| 63 | Util.LoadArchSpecificWindowsDll("BulletSim.dll"); | 63 | Util.LoadArchSpecificWindowsDll("BulletSim.dll"); |
| 64 | // If not Windows, loading is performed by the | 64 | // If not Windows, loading is performed by the |
| 65 | // Mono loader as specified in | 65 | // Mono loader as specified in |
| 66 | // "bin/Physics/OpenSim.Region.Physics.BulletSPlugin.dll.config". | 66 | // "bin/Physics/OpenSim.Region.Physics.BulletSPlugin.dll.config". |
| 67 | 67 | ||
| 68 | _mScene = new BSScene(sceneIdentifier); | 68 | _mScene = new BSScene(sceneIdentifier); |