diff options
author | Melanie Thielker | 2016-04-25 20:02:11 +0200 |
---|---|---|
committer | Melanie Thielker | 2016-04-25 20:02:11 +0200 |
commit | 8f668ec88855868681c225e69f092502cf0959e8 (patch) | |
tree | b8acae38bb2148ca272bf4c121949182d3f1a0d4 /OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | |
parent | Since the OptionalModules tests have been removed, also stop trying to run them (diff) | |
download | opensim-SC_OLD-8f668ec88855868681c225e69f092502cf0959e8.zip opensim-SC_OLD-8f668ec88855868681c225e69f092502cf0959e8.tar.gz opensim-SC_OLD-8f668ec88855868681c225e69f092502cf0959e8.tar.bz2 opensim-SC_OLD-8f668ec88855868681c225e69f092502cf0959e8.tar.xz |
Stop serializing and storing assets for objects that were never rezzed from inventory items.
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs index 7380b63..3d90fa6 100644 --- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | |||
@@ -775,6 +775,18 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments | |||
775 | return; | 775 | return; |
776 | } | 776 | } |
777 | 777 | ||
778 | // If this didn't come from inventory, it also shouldn't go there | ||
779 | // on detach. It's likely a temp attachment. | ||
780 | if (so.FromItemID != UUID.Zero) | ||
781 | { | ||
782 | sp.RemoveAttachment(so); | ||
783 | m_scene.DeleteSceneObject(so, false, false); | ||
784 | so.RemoveScriptInstances(true); | ||
785 | so.Clear(); | ||
786 | |||
787 | return; | ||
788 | } | ||
789 | |||
778 | if (DebugLevel > 0) | 790 | if (DebugLevel > 0) |
779 | m_log.DebugFormat( | 791 | m_log.DebugFormat( |
780 | "[ATTACHMENTS MODULE]: Detaching object {0} {1} (FromItemID {2}) for {3} in {4}", | 792 | "[ATTACHMENTS MODULE]: Detaching object {0} {1} (FromItemID {2}) for {3} in {4}", |