From d842699ef3e99c9815781a3e5adacdfcfcf6ff94 Mon Sep 17 00:00:00 2001 From: Teravus Ovares Date: Wed, 6 Feb 2008 09:53:59 +0000 Subject: [PATCH] * Put the script run limiter on the SceneObjectPart as otherwise you can drop scripts in prim and they'll still run with scripts disabled. --- .../Scenes/SceneObjectPart.Inventory.cs | 28 ++++++++++--------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs index e8ffe0e794..a9eba00a9f 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs @@ -151,21 +151,23 @@ namespace OpenSim.Region.Environment.Scenes // "[PRIMINVENTORY]: " + // "Starting script {0}, {1} in prim {2}, {3}", // item.Name, item.ItemID, Name, UUID)); - - AssetBase rezAsset = m_parentGroup.Scene.AssetCache.GetAsset(item.AssetID, false); - - if (rezAsset != null) + if (!((m_parentGroup.Scene.RegionInfo.EstateSettings.regionFlags & Simulator.RegionFlags.SkipScripts) == Simulator.RegionFlags.SkipScripts)) { - string script = Helpers.FieldToUTF8String(rezAsset.Data); - m_parentGroup.Scene.EventManager.TriggerRezScript(LocalID, item.ItemID, script); + AssetBase rezAsset = m_parentGroup.Scene.AssetCache.GetAsset(item.AssetID, false); - } - else - { - m_log.Error(String.Format( - "[PRIMINVENTORY]: " + - "Couldn't start script {0}, {1} since asset ID {2} could not be found", - item.Name, item.ItemID, item.AssetID)); + if (rezAsset != null) + { + string script = Helpers.FieldToUTF8String(rezAsset.Data); + m_parentGroup.Scene.EventManager.TriggerRezScript(LocalID, item.ItemID, script); + + } + else + { + m_log.Error(String.Format( + "[PRIMINVENTORY]: " + + "Couldn't start script {0}, {1} since asset ID {2} could not be found", + item.Name, item.ItemID, item.AssetID)); + } } }