diff options
| author | Melanie | 2012-01-07 12:06:21 +0100 |
|---|---|---|
| committer | Melanie | 2012-01-07 18:09:45 +0000 |
| commit | 6f19e231b69377e312425bfae284cc8de40ce0fb (patch) | |
| tree | b9b88aaa4db91e40d087f7fb4327627381c6e985 | |
| parent | fix a typo "osNpcCreated" to "osNpcCreate" in OSSL threat level check (diff) | |
| download | opensim-SC_OLD-6f19e231b69377e312425bfae284cc8de40ce0fb.zip opensim-SC_OLD-6f19e231b69377e312425bfae284cc8de40ce0fb.tar.gz opensim-SC_OLD-6f19e231b69377e312425bfae284cc8de40ce0fb.tar.bz2 opensim-SC_OLD-6f19e231b69377e312425bfae284cc8de40ce0fb.tar.xz | |
Don't try to save a NPCs attachment states on NPC delete
| -rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs index 280fdc7..2142d02 100644 --- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | |||
| @@ -462,6 +462,14 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments | |||
| 462 | /// <param name="grp"></param> | 462 | /// <param name="grp"></param> |
| 463 | private void UpdateKnownItem(IScenePresence sp, SceneObjectGroup grp) | 463 | private void UpdateKnownItem(IScenePresence sp, SceneObjectGroup grp) |
| 464 | { | 464 | { |
| 465 | // Saving attachments for NPCs messes them up for the real owner! | ||
| 466 | INPCModule module = m_scene.RequestModuleInterface<INPCModule>(); | ||
| 467 | if (module != null) | ||
| 468 | { | ||
| 469 | if (module.IsNPC(sp.UUID, m_scene)) | ||
| 470 | return; | ||
| 471 | } | ||
| 472 | |||
| 465 | if (grp.HasGroupChanged || grp.ContainsScripts()) | 473 | if (grp.HasGroupChanged || grp.ContainsScripts()) |
| 466 | { | 474 | { |
| 467 | m_log.DebugFormat( | 475 | m_log.DebugFormat( |