diff options
| author | Melanie | 2013-03-29 02:15:47 +0000 |
|---|---|---|
| committer | Melanie | 2013-03-29 02:15:47 +0000 |
| commit | 05810e48b013f4ca67beae68b2b7fb8030bd9c3b (patch) | |
| tree | 1df064176b61b95d18dd6d8faf46676f6f684162 /share | |
| parent | Merge commit '2b142f2f9e888d5cb7317cc51c12ac7152c54459' into careminster (diff) | |
| parent | Stop attempts to update/add existing attachments in user inventory when telep... (diff) | |
| download | opensim-SC_OLD-05810e48b013f4ca67beae68b2b7fb8030bd9c3b.zip opensim-SC_OLD-05810e48b013f4ca67beae68b2b7fb8030bd9c3b.tar.gz opensim-SC_OLD-05810e48b013f4ca67beae68b2b7fb8030bd9c3b.tar.bz2 opensim-SC_OLD-05810e48b013f4ca67beae68b2b7fb8030bd9c3b.tar.xz | |
Merge commit 'c92654fb43f303da8e1623f9fff8a404aad72374' into careminster
Conflicts:
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs
Diffstat (limited to 'share')
0 files changed, 0 insertions, 0 deletions