aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/OdePlugin/OdeScene.cs
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2013-01-15 00:24:51 +0000
committerJustin Clark-Casey (justincc)2013-01-15 00:24:51 +0000
commitc846cefda97bd59b7707147d7ae1a520c9121127 (patch)
treeee23e4b451087874a8149348e010a905817121f7 /OpenSim/Region/Physics/OdePlugin/OdeScene.cs
parentrefactor: Simplify ScriptInstance by retaining reference to SceneObjectPart i... (diff)
parentBulletSim: fix not moving physical objects below terrain to over terrain. (diff)
downloadopensim-SC-c846cefda97bd59b7707147d7ae1a520c9121127.zip
opensim-SC-c846cefda97bd59b7707147d7ae1a520c9121127.tar.gz
opensim-SC-c846cefda97bd59b7707147d7ae1a520c9121127.tar.bz2
opensim-SC-c846cefda97bd59b7707147d7ae1a520c9121127.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Physics/OdePlugin/OdeScene.cs')
-rw-r--r--OpenSim/Region/Physics/OdePlugin/OdeScene.cs3
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;