aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics
diff options
context:
space:
mode:
authorMelanie2012-10-28 18:43:28 +0000
committerMelanie2012-10-28 18:43:28 +0000
commit502efdb894dce21e6b5ad7b45222765af6510d92 (patch)
tree0d4ad5ec40a862c301538196fe89fbf8883dc04e /OpenSim/Region/Physics
parentMerge branch 'master' into careminster (diff)
parentDeep copy the collection of at_target objects so it can't be modified while (diff)
downloadopensim-SC-502efdb894dce21e6b5ad7b45222765af6510d92.zip
opensim-SC-502efdb894dce21e6b5ad7b45222765af6510d92.tar.gz
opensim-SC-502efdb894dce21e6b5ad7b45222765af6510d92.tar.bz2
opensim-SC-502efdb894dce21e6b5ad7b45222765af6510d92.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to 'OpenSim/Region/Physics')
0 files changed, 0 insertions, 0 deletions