aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/POSPlugin
diff options
context:
space:
mode:
authorMelanie2011-12-20 21:51:43 +0000
committerMelanie2011-12-20 21:51:43 +0000
commitca6113a4d5b76eb4d3b8a58335ccf939c6692ce5 (patch)
treed89152b691685be8b93699fec8ac5d254c01bb53 /OpenSim/Region/Physics/POSPlugin
parentMerge branch 'master' into careminster (diff)
parentThough the viewer warns about receiving this, not sending appears to break ba... (diff)
downloadopensim-SC-ca6113a4d5b76eb4d3b8a58335ccf939c6692ce5.zip
opensim-SC-ca6113a4d5b76eb4d3b8a58335ccf939c6692ce5.tar.gz
opensim-SC-ca6113a4d5b76eb4d3b8a58335ccf939c6692ce5.tar.bz2
opensim-SC-ca6113a4d5b76eb4d3b8a58335ccf939c6692ce5.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
Diffstat (limited to 'OpenSim/Region/Physics/POSPlugin')
0 files changed, 0 insertions, 0 deletions