diff options
author | Melanie | 2013-03-19 01:00:09 +0000 |
---|---|---|
committer | Melanie | 2013-03-19 01:00:09 +0000 |
commit | 8553a37881f5f85056816751cf9eb38b3d4c9957 (patch) | |
tree | ce29ffc381a1c1762454619aa643c4d903cf5d9f /bin/data | |
parent | Merge commit '464201b41d5f5fdd7c88ab5e95dd7b6fbae6d766' into careminster (diff) | |
parent | Improve rejection of any attempt to reattach an object that is already attached. (diff) | |
download | opensim-SC-8553a37881f5f85056816751cf9eb38b3d4c9957.zip opensim-SC-8553a37881f5f85056816751cf9eb38b3d4c9957.tar.gz opensim-SC-8553a37881f5f85056816751cf9eb38b3d4c9957.tar.bz2 opensim-SC-8553a37881f5f85056816751cf9eb38b3d4c9957.tar.xz |
Merge commit '3611d33b00650ccc71994b331e4c6595f95d3131' into careminster
Conflicts:
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
Diffstat (limited to 'bin/data')
0 files changed, 0 insertions, 0 deletions