aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs8
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs2
2 files changed, 9 insertions, 1 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(
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index 59107de..e2a045b 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -2344,7 +2344,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2344 2344
2345 public void osNpcPlayAnimation(LSL_Key npc, string animation) 2345 public void osNpcPlayAnimation(LSL_Key npc, string animation)
2346 { 2346 {
2347 CheckThreatLevel(ThreatLevel.High, "osPlayAnimation"); 2347 CheckThreatLevel(ThreatLevel.High, "osNpcPlayAnimation");
2348 2348
2349 INPCModule module = World.RequestModuleInterface<INPCModule>(); 2349 INPCModule module = World.RequestModuleInterface<INPCModule>();
2350 if (module != null) 2350 if (module != null)