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/Manager/IMesher.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 'OpenSim/Region/Physics/Manager/IMesher.cs')
| -rw-r--r-- | OpenSim/Region/Physics/Manager/IMesher.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/Manager/IMesher.cs b/OpenSim/Region/Physics/Manager/IMesher.cs index ecc2918..df980ab 100644 --- a/OpenSim/Region/Physics/Manager/IMesher.cs +++ b/OpenSim/Region/Physics/Manager/IMesher.cs | |||
| @@ -37,7 +37,7 @@ namespace OpenSim.Region.Physics.Manager | |||
| 37 | { | 37 | { |
| 38 | IMesh CreateMesh(String primName, PrimitiveBaseShape primShape, Vector3 size, float lod); | 38 | IMesh CreateMesh(String primName, PrimitiveBaseShape primShape, Vector3 size, float lod); |
| 39 | IMesh CreateMesh(String primName, PrimitiveBaseShape primShape, Vector3 size, float lod, bool isPhysical); | 39 | IMesh CreateMesh(String primName, PrimitiveBaseShape primShape, Vector3 size, float lod, bool isPhysical); |
| 40 | IMesh CreateMesh(String primName, PrimitiveBaseShape primShape, Vector3 size, float lod, bool isPhysical, bool convex, bool forOde); | 40 | IMesh CreateMesh(String primName, PrimitiveBaseShape primShape, Vector3 size, float lod, bool isPhysical, bool shouldCache, bool convex, bool forOde); |
| 41 | IMesh GetMesh(String primName, PrimitiveBaseShape primShape, Vector3 size, float lod, bool isPhysical, bool convex); | 41 | IMesh GetMesh(String primName, PrimitiveBaseShape primShape, Vector3 size, float lod, bool isPhysical, bool convex); |
| 42 | void ReleaseMesh(IMesh mesh); | 42 | void ReleaseMesh(IMesh mesh); |
| 43 | void ExpireReleaseMeshs(); | 43 | void ExpireReleaseMeshs(); |