aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/Scene.Inventory.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.Inventory.cs20
1 files changed, 13 insertions, 7 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
index f5cb0b9..18f9148 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
@@ -1018,13 +1018,16 @@ namespace OpenSim.Region.Environment.Scenes
1018 SceneObjectPart part = GetSceneObjectPart(localID); 1018 SceneObjectPart part = GetSceneObjectPart(localID);
1019 if (part != null) 1019 if (part != null)
1020 { 1020 {
1021 part.ParentGroup.AddInventoryItem(remoteClient, localID, item, copyID); 1021 if (ExternalChecks.ExternalChecksCanRunScript(item.ID, part.UUID, remoteClient.AgentId))
1022 part.ParentGroup.StartScript(localID, copyID); 1022 {
1023 part.GetProperties(remoteClient); 1023 part.ParentGroup.AddInventoryItem(remoteClient, localID, item, copyID);
1024 part.ParentGroup.StartScript(localID, copyID);
1025 part.GetProperties(remoteClient);
1024 1026
1025 // m_log.InfoFormat("[PRIMINVENTORY]: " + 1027 // m_log.InfoFormat("[PRIMINVENTORY]: " +
1026 // "Rezzed script {0} into prim local ID {1} for user {2}", 1028 // "Rezzed script {0} into prim local ID {1} for user {2}",
1027 // item.inventoryName, localID, remoteClient.Name); 1029 // item.inventoryName, localID, remoteClient.Name);
1030 }
1028 } 1031 }
1029 else 1032 else
1030 { 1033 {
@@ -1076,7 +1079,10 @@ namespace OpenSim.Region.Environment.Scenes
1076 1079
1077 part.AddInventoryItem(taskItem); 1080 part.AddInventoryItem(taskItem);
1078 part.GetProperties(remoteClient); 1081 part.GetProperties(remoteClient);
1079 part.StartScript(taskItem); 1082 if (ExternalChecks.ExternalChecksCanRunScript(taskItem.AssetID, part.UUID, remoteClient.AgentId))
1083 {
1084 part.StartScript(taskItem);
1085 }
1080 } 1086 }
1081 } 1087 }
1082 1088