diff options
| author | Melanie | 2010-04-19 10:44:01 +0100 |
|---|---|---|
| committer | Melanie | 2010-04-19 10:44:01 +0100 |
| commit | efa7873ae11a0cd1326e22802f5e891625e9fe77 (patch) | |
| tree | abb19d3c3acfb21bd748fbb25a59ae6ac96f1365 /OpenSim | |
| parent | Merge branch 'careminster' into careminster-presence-refactor (diff) | |
| parent | Also enable scripts rezzed into prims (diff) | |
| download | opensim-SC_OLD-efa7873ae11a0cd1326e22802f5e891625e9fe77.zip opensim-SC_OLD-efa7873ae11a0cd1326e22802f5e891625e9fe77.tar.gz opensim-SC_OLD-efa7873ae11a0cd1326e22802f5e891625e9fe77.tar.bz2 opensim-SC_OLD-efa7873ae11a0cd1326e22802f5e891625e9fe77.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index bf4c91f..66ed64b 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
| @@ -1453,6 +1453,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1453 | destPart.Inventory.CreateScriptInstance(destTaskItem, start_param, false, DefaultScriptEngine, 0); | 1453 | destPart.Inventory.CreateScriptInstance(destTaskItem, start_param, false, DefaultScriptEngine, 0); |
| 1454 | } | 1454 | } |
| 1455 | 1455 | ||
| 1456 | destPart.ParentGroup.ResumeScripts(); | ||
| 1457 | |||
| 1456 | ScenePresence avatar; | 1458 | ScenePresence avatar; |
| 1457 | 1459 | ||
| 1458 | if (TryGetScenePresence(srcTaskItem.OwnerID, out avatar)) | 1460 | if (TryGetScenePresence(srcTaskItem.OwnerID, out avatar)) |