diff options
| author | Melanie | 2012-11-04 23:30:11 +0000 |
|---|---|---|
| committer | Melanie | 2012-11-04 23:30:11 +0000 |
| commit | 4d6ee1aea6053d434f05e0f6f8959fc851358ed6 (patch) | |
| tree | a5cfdc3fca945e47b22ca028cd6ad81c73e6510c /OpenSim/Region/Physics/Meshing/SculptMap.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Prevent IMs being sent to prims when avies decline inventory offers from them. (diff) | |
| download | opensim-SC-4d6ee1aea6053d434f05e0f6f8959fc851358ed6.zip opensim-SC-4d6ee1aea6053d434f05e0f6f8959fc851358ed6.tar.gz opensim-SC-4d6ee1aea6053d434f05e0f6f8959fc851358ed6.tar.bz2 opensim-SC-4d6ee1aea6053d434f05e0f6f8959fc851358ed6.tar.xz | |
Merge branch 'avination' into careminster
Conflicts:
OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
Diffstat (limited to 'OpenSim/Region/Physics/Meshing/SculptMap.cs')
0 files changed, 0 insertions, 0 deletions