diff options
| author | Melanie Thielker | 2014-07-19 22:32:07 +0200 |
|---|---|---|
| committer | Melanie Thielker | 2014-07-19 22:32:07 +0200 |
| commit | e1b2ecdfdc5d465ee86d2a726eff2e504c846e79 (patch) | |
| tree | fa54372d3e4434ed14ff773c0889364895f87529 /OpenSim/Region/Physics/Meshing/Meshmerizer.cs | |
| parent | fix attachments (diff) | |
| parent | revert to capsule representation of avatar collider (diff) | |
| download | opensim-SC_OLD-e1b2ecdfdc5d465ee86d2a726eff2e504c846e79.zip opensim-SC_OLD-e1b2ecdfdc5d465ee86d2a726eff2e504c846e79.tar.gz opensim-SC_OLD-e1b2ecdfdc5d465ee86d2a726eff2e504c846e79.tar.bz2 opensim-SC_OLD-e1b2ecdfdc5d465ee86d2a726eff2e504c846e79.tar.xz | |
Merge branch 'avination-current'
Conflicts:
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
Diffstat (limited to 'OpenSim/Region/Physics/Meshing/Meshmerizer.cs')
| -rw-r--r-- | OpenSim/Region/Physics/Meshing/Meshmerizer.cs | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs index 6938e55..d67d4d2 100644 --- a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs +++ b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs | |||
| @@ -918,6 +918,11 @@ namespace OpenSim.Region.Physics.Meshing | |||
| 918 | return CreateMesh(primName, primShape, size, lod, isPhysical, true); | 918 | return CreateMesh(primName, primShape, size, lod, isPhysical, true); |
| 919 | } | 919 | } |
| 920 | 920 | ||
| 921 | public IMesh CreateMesh(String primName, PrimitiveBaseShape primShape, Vector3 size, float lod, bool isPhysical, bool convex, bool forOde) | ||
| 922 | { | ||
| 923 | return CreateMesh(primName, primShape, size, lod, isPhysical, true); | ||
| 924 | } | ||
| 925 | |||
| 921 | public IMesh CreateMesh(String primName, PrimitiveBaseShape primShape, Vector3 size, float lod, bool isPhysical, bool shouldCache) | 926 | public IMesh CreateMesh(String primName, PrimitiveBaseShape primShape, Vector3 size, float lod, bool isPhysical, bool shouldCache) |
| 922 | { | 927 | { |
| 923 | #if SPAM | 928 | #if SPAM |