diff options
author | Melanie Thielker | 2010-04-19 12:54:33 +0200 |
---|---|---|
committer | Melanie Thielker | 2010-04-19 12:54:33 +0200 |
commit | 1667a29c88905e6734c1402a51a9365209114e1d (patch) | |
tree | 58f4ea6ef44b236331b034372c9e7e845c3ec760 /OpenSim/Region/Framework | |
parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
download | opensim-SC_OLD-1667a29c88905e6734c1402a51a9365209114e1d.zip opensim-SC_OLD-1667a29c88905e6734c1402a51a9365209114e1d.tar.gz opensim-SC_OLD-1667a29c88905e6734c1402a51a9365209114e1d.tar.bz2 opensim-SC_OLD-1667a29c88905e6734c1402a51a9365209114e1d.tar.xz |
And some more rez modes that weren't covered before
Diffstat (limited to 'OpenSim/Region/Framework')
-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 66ed64b..2f1a189 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
@@ -1281,6 +1281,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1281 | // "Rezzed script {0} into prim local ID {1} for user {2}", | 1281 | // "Rezzed script {0} into prim local ID {1} for user {2}", |
1282 | // item.inventoryName, localID, remoteClient.Name); | 1282 | // item.inventoryName, localID, remoteClient.Name); |
1283 | part.GetProperties(remoteClient); | 1283 | part.GetProperties(remoteClient); |
1284 | part.ParentGroup.ResumeScripts(); | ||
1284 | } | 1285 | } |
1285 | else | 1286 | else |
1286 | { | 1287 | { |
@@ -1350,6 +1351,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1350 | part.GetProperties(remoteClient); | 1351 | part.GetProperties(remoteClient); |
1351 | 1352 | ||
1352 | part.Inventory.CreateScriptInstance(taskItem, 0, false, DefaultScriptEngine, 0); | 1353 | part.Inventory.CreateScriptInstance(taskItem, 0, false, DefaultScriptEngine, 0); |
1354 | part.ParentGroup.ResumeScripts(); | ||
1353 | } | 1355 | } |
1354 | } | 1356 | } |
1355 | 1357 | ||