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/OdePlugin.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/OdePlugin.cs')
| -rw-r--r-- | OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs index 478dd95..07663b3 100644 --- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs +++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | |||
| @@ -72,7 +72,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
| 72 | // http://opensimulator.org/mantis/view.php?id=2750). | 72 | // http://opensimulator.org/mantis/view.php?id=2750). |
| 73 | d.InitODE(); | 73 | d.InitODE(); |
| 74 | 74 | ||
| 75 | m_scene = new OdeScene(sceneIdentifier); | 75 | m_scene = new OdeScene(GetName(), sceneIdentifier); |
| 76 | } | 76 | } |
| 77 | 77 | ||
| 78 | return m_scene; | 78 | return m_scene; |