aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application
diff options
context:
space:
mode:
authorMelanie2013-03-29 02:15:47 +0000
committerMelanie2013-03-29 02:15:47 +0000
commit05810e48b013f4ca67beae68b2b7fb8030bd9c3b (patch)
tree1df064176b61b95d18dd6d8faf46676f6f684162 /OpenSim/Region/Application
parentMerge commit '2b142f2f9e888d5cb7317cc51c12ac7152c54459' into careminster (diff)
parentStop attempts to update/add existing attachments in user inventory when telep... (diff)
downloadopensim-SC-05810e48b013f4ca67beae68b2b7fb8030bd9c3b.zip
opensim-SC-05810e48b013f4ca67beae68b2b7fb8030bd9c3b.tar.gz
opensim-SC-05810e48b013f4ca67beae68b2b7fb8030bd9c3b.tar.bz2
opensim-SC-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 'OpenSim/Region/Application')
0 files changed, 0 insertions, 0 deletions
generated by cgit v1.1 at 2024-12-14 22:23:39 +0000