diff options
| author | Melanie | 2012-06-11 16:56:40 +0100 |
|---|---|---|
| committer | Melanie | 2012-06-11 16:56:40 +0100 |
| commit | 84377a23db64c67fc8f673edf4acc0c4a1541d5c (patch) | |
| tree | c22592aaf31bee652924b8016b60d24096d441c5 /OpenSim/Region/Framework/Scenes/Scene.Permissions.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Make llTeleportAgent conform to Magnum SL Server and add llTeleportAgentGloba... (diff) | |
| download | opensim-SC-84377a23db64c67fc8f673edf4acc0c4a1541d5c.zip opensim-SC-84377a23db64c67fc8f673edf4acc0c4a1541d5c.tar.gz opensim-SC-84377a23db64c67fc8f673edf4acc0c4a1541d5c.tar.bz2 opensim-SC-84377a23db64c67fc8f673edf4acc0c4a1541d5c.tar.xz | |
Merge branch 'avination' into careminster
Conflicts:
OpenSim/Region/Framework/Interfaces/ISimulationDataService.cs
OpenSim/Services/Connectors/Simulation/SimulationDataService.cs
OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.Permissions.cs')
0 files changed, 0 insertions, 0 deletions