diff options
| author | Justin Clark-Casey (justincc) | 2013-01-15 00:24:51 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2013-01-15 00:24:51 +0000 |
| commit | c846cefda97bd59b7707147d7ae1a520c9121127 (patch) | |
| tree | ee23e4b451087874a8149348e010a905817121f7 /OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsScene.cs | |
| parent | refactor: Simplify ScriptInstance by retaining reference to SceneObjectPart i... (diff) | |
| parent | BulletSim: fix not moving physical objects below terrain to over terrain. (diff) | |
| download | opensim-SC_OLD-c846cefda97bd59b7707147d7ae1a520c9121127.zip opensim-SC_OLD-c846cefda97bd59b7707147d7ae1a520c9121127.tar.gz opensim-SC_OLD-c846cefda97bd59b7707147d7ae1a520c9121127.tar.bz2 opensim-SC_OLD-c846cefda97bd59b7707147d7ae1a520c9121127.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsScene.cs')
| -rw-r--r-- | OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsScene.cs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsScene.cs b/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsScene.cs index f5826ed..c4b9117 100644 --- a/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsScene.cs +++ b/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsScene.cs | |||
| @@ -49,8 +49,10 @@ namespace OpenSim.Region.Physics.BasicPhysicsPlugin | |||
| 49 | 49 | ||
| 50 | //protected internal string sceneIdentifier; | 50 | //protected internal string sceneIdentifier; |
| 51 | 51 | ||
| 52 | public BasicScene(string _sceneIdentifier) | 52 | public BasicScene(string engineType, string _sceneIdentifier) |
| 53 | { | 53 | { |
| 54 | EngineType = engineType; | ||
| 55 | Name = EngineType + "/" + _sceneIdentifier; | ||
| 54 | //sceneIdentifier = _sceneIdentifier; | 56 | //sceneIdentifier = _sceneIdentifier; |
| 55 | } | 57 | } |
| 56 | 58 | ||