diff options
author | Justin Clark-Casey (justincc) | 2013-03-19 21:44:18 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2013-03-19 21:49:29 +0000 |
commit | 364816421985c052521cf7b444e124760c0a1025 (patch) | |
tree | b6e51feda080bd3e131fabfc990e6533bb7cd83c /OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | |
parent | For the moment, disable the output of the 'scene' statistics in SimExtraStats... (diff) | |
download | opensim-SC_OLD-364816421985c052521cf7b444e124760c0a1025.zip opensim-SC_OLD-364816421985c052521cf7b444e124760c0a1025.tar.gz opensim-SC_OLD-364816421985c052521cf7b444e124760c0a1025.tar.bz2 opensim-SC_OLD-364816421985c052521cf7b444e124760c0a1025.tar.xz |
Prevent multiple instances of the same item ID being appended to an AvatarAppearance
It looks like this was happening when AttachmentsModule.RezAttachments was doing a secondary set of each attachment to update with the asset ID (initially they only have the inventory ID).
However, with multi-attach this was appending a second copy of the same attachment rather than updating the data that was already there.
This commit requires both simulator and service to be updated.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs index 72ba3cf..ad17aa9 100644 --- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | |||
@@ -547,8 +547,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments | |||
547 | } | 547 | } |
548 | 548 | ||
549 | // m_log.DebugFormat( | 549 | // m_log.DebugFormat( |
550 | // "[ATTACHMENTS MODULE]: Detaching object {0} {1} for {2} in {3}", | 550 | // "[ATTACHMENTS MODULE]: Detaching object {0} {1} (FromItemID {2}) for {3} in {4}", |
551 | // so.Name, so.LocalId, sp.Name, m_scene.Name); | 551 | // so.Name, so.LocalId, so.FromItemID, sp.Name, m_scene.Name); |
552 | 552 | ||
553 | // Scripts MUST be snapshotted before the object is | 553 | // Scripts MUST be snapshotted before the object is |
554 | // removed from the scene because doing otherwise will | 554 | // removed from the scene because doing otherwise will |