diff options
| author | Melanie | 2012-04-23 20:44:41 +0100 |
|---|---|---|
| committer | Melanie | 2012-04-23 20:44:41 +0100 |
| commit | e9037098475202c02d3327d2dff877d0fd108c93 (patch) | |
| tree | cd52623e1f12ffe0ca98609f270d27d30afc35af /OpenSim/Framework/EstateSettings.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Mantis 5977 Corrections to llRegionSayTo (diff) | |
| download | opensim-SC-e9037098475202c02d3327d2dff877d0fd108c93.zip opensim-SC-e9037098475202c02d3327d2dff877d0fd108c93.tar.gz opensim-SC-e9037098475202c02d3327d2dff877d0fd108c93.tar.bz2 opensim-SC-e9037098475202c02d3327d2dff877d0fd108c93.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
Diffstat (limited to 'OpenSim/Framework/EstateSettings.cs')
0 files changed, 0 insertions, 0 deletions