diff options
| author | Melanie | 2013-03-18 23:31:27 +0000 |
|---|---|---|
| committer | Melanie | 2013-03-18 23:31:27 +0000 |
| commit | 5e1f651e21ba81d8be9693d7e8a47d49daa9fce5 (patch) | |
| tree | 4856d3aa25fcd942a26af39e1510f58fef3c934d /bin/Regions | |
| parent | Merge commit 'ccd6f443e1092cb410f565e921f7cf4dd8cd2dac' into newmultiattach (diff) | |
| parent | Improve rejection of any attempt to reattach an object that is already attached. (diff) | |
| download | opensim-SC-5e1f651e21ba81d8be9693d7e8a47d49daa9fce5.zip opensim-SC-5e1f651e21ba81d8be9693d7e8a47d49daa9fce5.tar.gz opensim-SC-5e1f651e21ba81d8be9693d7e8a47d49daa9fce5.tar.bz2 opensim-SC-5e1f651e21ba81d8be9693d7e8a47d49daa9fce5.tar.xz | |
Merge branch 'master' into newmultiattach
Conflicts:
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
Diffstat (limited to 'bin/Regions')
0 files changed, 0 insertions, 0 deletions