diff options
| author | Melanie | 2012-11-30 01:54:13 +0000 |
|---|---|---|
| committer | Melanie | 2012-11-30 01:54:13 +0000 |
| commit | 56b2bc71017ebec9fe4b7ecd358819c8d7499f76 (patch) | |
| tree | eea2b7a38ef1c191e41928f12cefe2254a4454e0 /OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | BulletSim: add expanded call to IMesher/Meshmerizer which enables/disables me... (diff) | |
| download | opensim-SC-56b2bc71017ebec9fe4b7ecd358819c8d7499f76.zip opensim-SC-56b2bc71017ebec9fe4b7ecd358819c8d7499f76.tar.gz opensim-SC-56b2bc71017ebec9fe4b7ecd358819c8d7499f76.tar.bz2 opensim-SC-56b2bc71017ebec9fe4b7ecd358819c8d7499f76.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Physics/Manager/IMesher.cs
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs index 8de70ef..ba24aa7 100644 --- a/OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs +++ b/OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs | |||
| @@ -2190,7 +2190,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
| 2190 | convex = false; | 2190 | convex = false; |
| 2191 | try | 2191 | try |
| 2192 | { | 2192 | { |
| 2193 | _mesh = _parent_scene.mesher.CreateMesh(m_primName, _pbs, _size, (int)LevelOfDetail.High, true,convex,false); | 2193 | _mesh = _parent_scene.mesher.CreateMesh(m_primName, _pbs, _size, (int)LevelOfDetail.High, true,false,convex,false); |
| 2194 | } | 2194 | } |
| 2195 | catch | 2195 | catch |
| 2196 | { | 2196 | { |
| @@ -2557,7 +2557,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
| 2557 | 2557 | ||
| 2558 | try | 2558 | try |
| 2559 | { | 2559 | { |
| 2560 | mesh = _parent_scene.mesher.CreateMesh(oldname, _pbs, _size, (int)LevelOfDetail.High, true, convex,false); | 2560 | mesh = _parent_scene.mesher.CreateMesh(oldname, _pbs, _size, (int)LevelOfDetail.High, true, false,convex,false); |
| 2561 | } | 2561 | } |
| 2562 | catch | 2562 | catch |
| 2563 | { | 2563 | { |