aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/BulletSPlugin/BSTerrainManager.cs
diff options
context:
space:
mode:
authorMelanie2012-11-30 01:54:13 +0000
committerMelanie2012-11-30 01:54:13 +0000
commit56b2bc71017ebec9fe4b7ecd358819c8d7499f76 (patch)
treeeea2b7a38ef1c191e41928f12cefe2254a4454e0 /OpenSim/Region/Physics/BulletSPlugin/BSTerrainManager.cs
parentMerge branch 'master' into careminster (diff)
parentBulletSim: add expanded call to IMesher/Meshmerizer which enables/disables me... (diff)
downloadopensim-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/BulletSPlugin/BSTerrainManager.cs')
0 files changed, 0 insertions, 0 deletions
generated by cgit v1.1 at 2024-12-22 22:44:14 +0000