OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* Put the script run limiter on the SceneObjectPart as otherwise you can drop scripts in prim and they'll still run with scripts disabled.

ThreadPoolClientBranch
Teravus Ovares 2008-02-06 09:53:59 +00:00
parent 9d6ea497e2
commit d842699ef3
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs
View File

@ -151,21 +151,23 @@ namespace OpenSim.Region.Environment.Scenes
// "[PRIMINVENTORY]: " + // "[PRIMINVENTORY]: " +
// "Starting script {0}, {1} in prim {2}, {3}", // "Starting script {0}, {1} in prim {2}, {3}",
// item.Name, item.ItemID, Name, UUID)); // item.Name, item.ItemID, Name, UUID));
if (!((m_parentGroup.Scene.RegionInfo.EstateSettings.regionFlags & Simulator.RegionFlags.SkipScripts) == Simulator.RegionFlags.SkipScripts))
AssetBase rezAsset = m_parentGroup.Scene.AssetCache.GetAsset(item.AssetID, false);
if (rezAsset != null)
{ {
string script = Helpers.FieldToUTF8String(rezAsset.Data); AssetBase rezAsset = m_parentGroup.Scene.AssetCache.GetAsset(item.AssetID, false);
m_parentGroup.Scene.EventManager.TriggerRezScript(LocalID, item.ItemID, script);
} if (rezAsset != null)
else {
{ string script = Helpers.FieldToUTF8String(rezAsset.Data);
m_log.Error(String.Format( m_parentGroup.Scene.EventManager.TriggerRezScript(LocalID, item.ItemID, script);
"[PRIMINVENTORY]: " +
"Couldn't start script {0}, {1} since asset ID {2} could not be found", }
item.Name, item.ItemID, item.AssetID)); 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));
}
} }
} }