aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/AuthenticationService
diff options
context:
space:
mode:
authorMelanie2012-12-28 08:32:34 +0000
committerMelanie2012-12-28 08:32:34 +0000
commit3ab1bd04031ca0bc1039e4e1d267ea19d0017430 (patch)
tree3f2417f3b96e151642158d29d1982dee2bd850a8 /OpenSim/Services/AuthenticationService
parentMerge branch 'master' into careminster (diff)
parentBulletSim: correct collision mask definition for linkset children. (diff)
downloadopensim-SC-3ab1bd04031ca0bc1039e4e1d267ea19d0017430.zip
opensim-SC-3ab1bd04031ca0bc1039e4e1d267ea19d0017430.tar.gz
opensim-SC-3ab1bd04031ca0bc1039e4e1d267ea19d0017430.tar.bz2
opensim-SC-3ab1bd04031ca0bc1039e4e1d267ea19d0017430.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions