diff options
author | Melanie | 2013-03-18 23:21:01 +0000 |
---|---|---|
committer | Melanie | 2013-03-18 23:21:01 +0000 |
commit | 0635d9d174596b793c32c6adf70ad37cd93d9945 (patch) | |
tree | 7692829b9d3002b2d0acb64295ceebf3385f1584 /OpenSim/Region/ScriptEngine | |
parent | Limit each attachment point to 5 items as per spec (diff) | |
parent | Get attachment script state before taking sp.AttachmentsSyncLock() to avoid r... (diff) | |
download | opensim-SC_OLD-0635d9d174596b793c32c6adf70ad37cd93d9945.zip opensim-SC_OLD-0635d9d174596b793c32c6adf70ad37cd93d9945.tar.gz opensim-SC_OLD-0635d9d174596b793c32c6adf70ad37cd93d9945.tar.bz2 opensim-SC_OLD-0635d9d174596b793c32c6adf70ad37cd93d9945.tar.xz |
Merge commit 'ccd6f443e1092cb410f565e921f7cf4dd8cd2dac' into newmultiattach
Conflicts:
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
0 files changed, 0 insertions, 0 deletions