diff options
author | UbitUmarov | 2014-08-03 19:08:13 +0100 |
---|---|---|
committer | UbitUmarov | 2014-08-03 19:08:13 +0100 |
commit | c2d9a6499ac2655e6d43f528b839d81e14fdb64f (patch) | |
tree | ef3aae37c93a3015b1ea0a38c11f07df814754e8 /OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | |
parent | replace debug msgs by others (diff) | |
download | opensim-SC_OLD-c2d9a6499ac2655e6d43f528b839d81e14fdb64f.zip opensim-SC_OLD-c2d9a6499ac2655e6d43f528b839d81e14fdb64f.tar.gz opensim-SC_OLD-c2d9a6499ac2655e6d43f528b839d81e14fdb64f.tar.bz2 opensim-SC_OLD-c2d9a6499ac2655e6d43f528b839d81e14fdb64f.tar.xz |
dont get script states for NPCs on deRez
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs index c8a25dd..9e6ed91 100644 --- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | |||
@@ -388,15 +388,18 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments | |||
388 | 388 | ||
389 | Dictionary<SceneObjectGroup, string> scriptStates = new Dictionary<SceneObjectGroup, string>(); | 389 | Dictionary<SceneObjectGroup, string> scriptStates = new Dictionary<SceneObjectGroup, string>(); |
390 | 390 | ||
391 | m_log.DebugFormat("[ATTACHMENTS MODULE]: enter PrepareScriptInstanceForSave loop"); | 391 | if (sp.PresenceType != PresenceType.Npc) |
392 | foreach (SceneObjectGroup so in attachments) | ||
393 | { | 392 | { |
394 | // Scripts MUST be snapshotted before the object is | 393 | m_log.DebugFormat("[ATTACHMENTS MODULE]: enter PrepareScriptInstanceForSave loop"); |
395 | // removed from the scene because doing otherwise will | 394 | foreach (SceneObjectGroup so in attachments) |
396 | // clobber the run flag | 395 | { |
397 | // This must be done outside the sp.AttachmentSyncLock so that there is no risk of a deadlock from | 396 | // Scripts MUST be snapshotted before the object is |
398 | // scripts performing attachment operations at the same time. Getting object states stops the scripts. | 397 | // removed from the scene because doing otherwise will |
399 | scriptStates[so] = PrepareScriptInstanceForSave(so, false); | 398 | // clobber the run flag |
399 | // This must be done outside the sp.AttachmentSyncLock so that there is no risk of a deadlock from | ||
400 | // scripts performing attachment operations at the same time. Getting object states stops the scripts. | ||
401 | scriptStates[so] = PrepareScriptInstanceForSave(so, false); | ||
402 | } | ||
400 | } | 403 | } |
401 | 404 | ||
402 | m_log.DebugFormat("[ATTACHMENTS MODULE]: enter UpdateDetachedObject loop"); | 405 | m_log.DebugFormat("[ATTACHMENTS MODULE]: enter UpdateDetachedObject loop"); |