diff options
| author | Melanie | 2012-01-26 10:32:22 +0000 |
|---|---|---|
| committer | Melanie | 2012-01-26 10:32:22 +0000 |
| commit | 7229f6e64b9205942e3e6dda4e34dbe203ba2954 (patch) | |
| tree | a5a88a4f839ce89f8fba5bc69d3e68a7ecf04f5c /bin/HttpServer_OpenSim.xml | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Support rejecting a teleport if a user is banned in all parcels that have (diff) | |
| download | opensim-SC-7229f6e64b9205942e3e6dda4e34dbe203ba2954.zip opensim-SC-7229f6e64b9205942e3e6dda4e34dbe203ba2954.tar.gz opensim-SC-7229f6e64b9205942e3e6dda4e34dbe203ba2954.tar.bz2 opensim-SC-7229f6e64b9205942e3e6dda4e34dbe203ba2954.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to 'bin/HttpServer_OpenSim.xml')
0 files changed, 0 insertions, 0 deletions