diff options
| author | Melanie | 2012-06-08 01:12:37 +0100 |
|---|---|---|
| committer | Melanie | 2012-06-08 01:12:37 +0100 |
| commit | 8ebe2cd3daf9fccfe45171893794d3d7d91d1462 (patch) | |
| tree | 51ad026e72126256c3931c5eb0628e437042f576 /OpenSim/Region/Physics/UbitMeshing/SculptMap.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Don't make duplicate call to ScenePresence.Close() separately in ETM.DoTelepo... (diff) | |
| download | opensim-SC-8ebe2cd3daf9fccfe45171893794d3d7d91d1462.zip opensim-SC-8ebe2cd3daf9fccfe45171893794d3d7d91d1462.tar.gz opensim-SC-8ebe2cd3daf9fccfe45171893794d3d7d91d1462.tar.bz2 opensim-SC-8ebe2cd3daf9fccfe45171893794d3d7d91d1462.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to 'OpenSim/Region/Physics/UbitMeshing/SculptMap.cs')
0 files changed, 0 insertions, 0 deletions