aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
diff options
context:
space:
mode:
authorMelanie2013-03-30 21:19:10 +0000
committerMelanie2013-03-30 21:19:10 +0000
commit64a56059b12470121d1d7c38ac070e4f2f0d2f42 (patch)
tree8258e2d42f9e2991ba219a8c05d40c4b54f236c5 /OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
parentMerge branch 'master' into careminster (diff)
parentrefactor: move the append magic number processing for attachments back up int... (diff)
downloadopensim-SC-64a56059b12470121d1d7c38ac070e4f2f0d2f42.zip
opensim-SC-64a56059b12470121d1d7c38ac070e4f2f0d2f42.tar.gz
opensim-SC-64a56059b12470121d1d7c38ac070e4f2f0d2f42.tar.bz2
opensim-SC-64a56059b12470121d1d7c38ac070e4f2f0d2f42.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs')
0 files changed, 0 insertions, 0 deletions
generated by cgit v1.1 at 2024-12-21 15:15:16 +0000