diff options
| author | Melanie | 2011-12-22 16:37:25 +0000 |
|---|---|---|
| committer | Melanie | 2011-12-22 16:37:25 +0000 |
| commit | b970d4f976ec7f264c33948c734a15a2dbf0ac7d (patch) | |
| tree | 93a3365e4a8a32bdfce1ef92bafc02f79f98d449 /OpenSim/Services/AssetService/AssetService.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Fixing a bug introduced yesterday. This put the precondition test inside Chec... (diff) | |
| download | opensim-SC-b970d4f976ec7f264c33948c734a15a2dbf0ac7d.zip opensim-SC-b970d4f976ec7f264c33948c734a15a2dbf0ac7d.tar.gz opensim-SC-b970d4f976ec7f264c33948c734a15a2dbf0ac7d.tar.bz2 opensim-SC-b970d4f976ec7f264c33948c734a15a2dbf0ac7d.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
Diffstat (limited to 'OpenSim/Services/AssetService/AssetService.cs')
0 files changed, 0 insertions, 0 deletions