diff options
| author | Melanie | 2011-10-25 01:55:01 +0100 |
|---|---|---|
| committer | Melanie | 2011-10-25 01:55:01 +0100 |
| commit | f50538c81afe4c44e491c867cebb1674b682147b (patch) | |
| tree | d2e7b8e9e4eb7cb41217265ad25da6153d477b79 /OpenSim/Data | |
| parent | Merge commit '5ddefc256468e4b394d82a2c4bc69fe28c4b59ea' into bigmerge (diff) | |
| parent | fetch physical_prim switch from [Startup] config from inside scene, as is don... (diff) | |
| download | opensim-SC-f50538c81afe4c44e491c867cebb1674b682147b.zip opensim-SC-f50538c81afe4c44e491c867cebb1674b682147b.tar.gz opensim-SC-f50538c81afe4c44e491c867cebb1674b682147b.tar.bz2 opensim-SC-f50538c81afe4c44e491c867cebb1674b682147b.tar.xz | |
Merge commit '528cc8136e567b5bac583728fbb0235baaba2f02' into bigmerge
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
Diffstat (limited to 'OpenSim/Data')
0 files changed, 0 insertions, 0 deletions