diff options
| author | Melanie | 2012-10-18 20:56:34 +0100 |
|---|---|---|
| committer | Melanie | 2012-10-18 20:56:34 +0100 |
| commit | 72c925a6c9eb4dea6f9134db10c3af28ea83df48 (patch) | |
| tree | 9f991ade4e71f91fc612759b4e783c9f01a740f3 /OpenSim/Region/Physics/ChOdePlugin | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Remove redundant and annoyingly modal message box in upload processing. (diff) | |
| download | opensim-SC-72c925a6c9eb4dea6f9134db10c3af28ea83df48.zip opensim-SC-72c925a6c9eb4dea6f9134db10c3af28ea83df48.tar.gz opensim-SC-72c925a6c9eb4dea6f9134db10c3af28ea83df48.tar.bz2 opensim-SC-72c925a6c9eb4dea6f9134db10c3af28ea83df48.tar.xz | |
Merge branch 'avination' into careminster
Conflicts:
OpenSim/Framework/WebUtil.cs
OpenSim/Region/Physics/OdePlugin/OdeScene.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 5b743e8..8de70ef 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); | 2193 | _mesh = _parent_scene.mesher.CreateMesh(m_primName, _pbs, _size, (int)LevelOfDetail.High, true,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); | 2560 | mesh = _parent_scene.mesher.CreateMesh(oldname, _pbs, _size, (int)LevelOfDetail.High, true, convex,false); |
| 2561 | } | 2561 | } |
| 2562 | catch | 2562 | catch |
| 2563 | { | 2563 | { |