diff options
| author | Melanie | 2013-03-30 21:19:10 +0000 |
|---|---|---|
| committer | Melanie | 2013-03-30 21:19:10 +0000 |
| commit | 64a56059b12470121d1d7c38ac070e4f2f0d2f42 (patch) | |
| tree | 8258e2d42f9e2991ba219a8c05d40c4b54f236c5 /OpenSim/Services/AssetService/AssetService.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | refactor: move the append magic number processing for attachments back up int... (diff) | |
| download | opensim-SC-64a56059b12470121d1d7c38ac070e4f2f0d2f42.zip opensim-SC-64a56059b12470121d1d7c38ac070e4f2f0d2f42.tar.gz opensim-SC-64a56059b12470121d1d7c38ac070e4f2f0d2f42.tar.bz2 opensim-SC-64a56059b12470121d1d7c38ac070e4f2f0d2f42.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
Diffstat (limited to 'OpenSim/Services/AssetService/AssetService.cs')
0 files changed, 0 insertions, 0 deletions