diff options
author | BlueWall | 2013-01-15 10:08:27 -0500 |
---|---|---|
committer | BlueWall | 2013-01-15 10:08:27 -0500 |
commit | f54b398540698e6e09022fe77b6405624b532f5c (patch) | |
tree | 74581e7176d06dd8e2bff43720a3033ccfe6df0e /OpenSim/Region/Physics/OdePlugin/OdeScene.cs | |
parent | Add Json-Rpc 2.0 To Registered Handlers (diff) | |
parent | BulletSim: tweeks to improve hover. (diff) | |
download | opensim-SC-f54b398540698e6e09022fe77b6405624b532f5c.zip opensim-SC-f54b398540698e6e09022fe77b6405624b532f5c.tar.gz opensim-SC-f54b398540698e6e09022fe77b6405624b532f5c.tar.bz2 opensim-SC-f54b398540698e6e09022fe77b6405624b532f5c.tar.xz |
Merge branch 'master' of /home/opensim/var/repo/opensim
Diffstat (limited to 'OpenSim/Region/Physics/OdePlugin/OdeScene.cs')
-rw-r--r-- | OpenSim/Region/Physics/OdePlugin/OdeScene.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/OdeScene.cs b/OpenSim/Region/Physics/OdePlugin/OdeScene.cs index d53bd90..02a0b15 100644 --- a/OpenSim/Region/Physics/OdePlugin/OdeScene.cs +++ b/OpenSim/Region/Physics/OdePlugin/OdeScene.cs | |||
@@ -526,11 +526,12 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
526 | /// These settings need to be tweaked 'exactly' right or weird stuff happens. | 526 | /// These settings need to be tweaked 'exactly' right or weird stuff happens. |
527 | /// </summary> | 527 | /// </summary> |
528 | /// <param value="name">Name of the scene. Useful in debug messages.</param> | 528 | /// <param value="name">Name of the scene. Useful in debug messages.</param> |
529 | public OdeScene(string name) | 529 | public OdeScene(string engineType, string name) |
530 | { | 530 | { |
531 | m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType.ToString() + "." + name); | 531 | m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType.ToString() + "." + name); |
532 | 532 | ||
533 | Name = name; | 533 | Name = name; |
534 | EngineType = engineType; | ||
534 | 535 | ||
535 | nearCallback = near; | 536 | nearCallback = near; |
536 | triCallback = TriCallback; | 537 | triCallback = TriCallback; |