diff options
| author | Justin Clark-Casey (justincc) | 2011-08-31 17:53:58 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2011-08-31 17:53:58 +0100 |
| commit | 7d58b5fa157b4c3e842573d9fb02a9822034f4b0 (patch) | |
| tree | b726d3c045a2ccbad3530b27c00e8a03027f5548 /OpenSim/Region/OptionalModules/World | |
| parent | If a FireAndForget thread terminates with an exception, then catch and log ra... (diff) | |
| download | opensim-SC_OLD-7d58b5fa157b4c3e842573d9fb02a9822034f4b0.zip opensim-SC_OLD-7d58b5fa157b4c3e842573d9fb02a9822034f4b0.tar.gz opensim-SC_OLD-7d58b5fa157b4c3e842573d9fb02a9822034f4b0.tar.bz2 opensim-SC_OLD-7d58b5fa157b4c3e842573d9fb02a9822034f4b0.tar.xz | |
move common code into AttachmentsModule.DeleteAttachmentsFromScene()
Diffstat (limited to 'OpenSim/Region/OptionalModules/World')
| -rw-r--r-- | OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs index e58dca2..2fdeeab 100644 --- a/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs +++ b/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs | |||
| @@ -143,11 +143,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
| 143 | if (!m_avatars.ContainsKey(agentId)) | 143 | if (!m_avatars.ContainsKey(agentId)) |
| 144 | return false; | 144 | return false; |
| 145 | 145 | ||
| 146 | // FIXME: An extremely bad bit of code that reaches directly into the attachments list and manipulates it | 146 | scene.AttachmentsModule.DeleteAttachmentsFromScene(sp, false); |
| 147 | foreach (SceneObjectGroup att in sp.GetAttachments()) | ||
| 148 | scene.DeleteSceneObject(att, false); | ||
| 149 | |||
| 150 | sp.ClearAttachments(); | ||
| 151 | 147 | ||
| 152 | AvatarAppearance npcAppearance = new AvatarAppearance(appearance, true); | 148 | AvatarAppearance npcAppearance = new AvatarAppearance(appearance, true); |
| 153 | sp.Appearance = npcAppearance; | 149 | sp.Appearance = npcAppearance; |