dont get script states for NPCs on deRez

avinationmerge
UbitUmarov 2014-08-03 19:08:13 +01:00
parent ca8b0e6a1d
commit c2d9a6499a
1 changed files with 11 additions and 8 deletions

View File

@ -388,6 +388,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
Dictionary<SceneObjectGroup, string> scriptStates = new Dictionary<SceneObjectGroup, string>(); Dictionary<SceneObjectGroup, string> scriptStates = new Dictionary<SceneObjectGroup, string>();
if (sp.PresenceType != PresenceType.Npc)
{
m_log.DebugFormat("[ATTACHMENTS MODULE]: enter PrepareScriptInstanceForSave loop"); m_log.DebugFormat("[ATTACHMENTS MODULE]: enter PrepareScriptInstanceForSave loop");
foreach (SceneObjectGroup so in attachments) foreach (SceneObjectGroup so in attachments)
{ {
@ -398,6 +400,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
// scripts performing attachment operations at the same time. Getting object states stops the scripts. // scripts performing attachment operations at the same time. Getting object states stops the scripts.
scriptStates[so] = PrepareScriptInstanceForSave(so, false); scriptStates[so] = PrepareScriptInstanceForSave(so, false);
} }
}
m_log.DebugFormat("[ATTACHMENTS MODULE]: enter UpdateDetachedObject loop"); m_log.DebugFormat("[ATTACHMENTS MODULE]: enter UpdateDetachedObject loop");
lock (sp.AttachmentsSyncLock) lock (sp.AttachmentsSyncLock)