diff options
author | Robert Adams | 2013-01-10 17:03:19 -0800 |
---|---|---|
committer | Robert Adams | 2013-01-11 16:47:35 -0800 |
commit | eacc2561d14dbe9cba6966e3b32bfd776e044f8a (patch) | |
tree | 8ddaebdd22286becd5dd57a84d3582a1f582d1f2 /OpenSim/Region/Physics/BulletSPlugin/BSScene.cs | |
parent | BulletSim: Add IsSelected attribute to physical objects. Have vehicles check ... (diff) | |
download | opensim-SC-eacc2561d14dbe9cba6966e3b32bfd776e044f8a.zip opensim-SC-eacc2561d14dbe9cba6966e3b32bfd776e044f8a.tar.gz opensim-SC-eacc2561d14dbe9cba6966e3b32bfd776e044f8a.tar.bz2 opensim-SC-eacc2561d14dbe9cba6966e3b32bfd776e044f8a.tar.xz |
BulletSim: add osGetPhysicsEngineType() LSL function and update
the physics engines to return the name that is specified in the INI
file ("physics = XXX") as the type of engine.
This os function is a little different than the others in that it
does not throw an exception of one is not privilaged to use it.
It merely returns an empty string.
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSScene.cs')
-rw-r--r-- | OpenSim/Region/Physics/BulletSPlugin/BSScene.cs | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs index 4a6cebd..a5bdc07 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs | |||
@@ -167,11 +167,16 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters | |||
167 | public bool VehiclePhysicalLoggingEnabled { get; private set; } | 167 | public bool VehiclePhysicalLoggingEnabled { get; private set; } |
168 | 168 | ||
169 | #region Construction and Initialization | 169 | #region Construction and Initialization |
170 | public BSScene(string identifier) | 170 | public BSScene(string engineType, string identifier) |
171 | { | 171 | { |
172 | m_initialized = false; | 172 | m_initialized = false; |
173 | // we are passed the name of the region we're working for. | 173 | |
174 | // The name of the region we're working for is passed to us. Keep for identification. | ||
174 | RegionName = identifier; | 175 | RegionName = identifier; |
176 | |||
177 | // Set identifying variables in the PhysicsScene interface. | ||
178 | EngineType = engineType; | ||
179 | Name = EngineType + "/" + RegionName; | ||
175 | } | 180 | } |
176 | 181 | ||
177 | public override void Initialise(IMesher meshmerizer, IConfigSource config) | 182 | public override void Initialise(IMesher meshmerizer, IConfigSource config) |