OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Stop serializing and storing assets for objects that were never rezzed from inventory items.

LSLKeyTest
Melanie Thielker 2016-04-25 20:02:11 +02:00
parent 3637280aad
commit 8f668ec888
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
View File

@ -775,6 +775,18 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
return; return;
} }
// If this didn't come from inventory, it also shouldn't go there
// on detach. It's likely a temp attachment.
if (so.FromItemID != UUID.Zero)
{
sp.RemoveAttachment(so);
m_scene.DeleteSceneObject(so, false, false);
so.RemoveScriptInstances(true);
so.Clear();
return;
}
if (DebugLevel > 0) if (DebugLevel > 0)
m_log.DebugFormat( m_log.DebugFormat(
"[ATTACHMENTS MODULE]: Detaching object {0} {1} (FromItemID {2}) for {3} in {4}", "[ATTACHMENTS MODULE]: Detaching object {0} {1} (FromItemID {2}) for {3} in {4}",