diff options
| author | Melanie | 2010-04-13 04:36:08 +0100 |
|---|---|---|
| committer | Melanie | 2010-04-13 04:36:08 +0100 |
| commit | 9920e219dd4a98d1ac62bfa4aa4679d50aa32b8f (patch) | |
| tree | 0b57576deba41ef22c8fc0b29e6f2b92557fe3b0 /OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |
| parent | Merge branch 'careminster' into careminster-presence-refactor (diff) | |
| parent | Merge branch '0.6.9-post-fixes' into careminster (diff) | |
| download | opensim-SC-9920e219dd4a98d1ac62bfa4aa4679d50aa32b8f.zip opensim-SC-9920e219dd4a98d1ac62bfa4aa4679d50aa32b8f.tar.gz opensim-SC-9920e219dd4a98d1ac62bfa4aa4679d50aa32b8f.tar.bz2 opensim-SC-9920e219dd4a98d1ac62bfa4aa4679d50aa32b8f.tar.xz | |
Merge branch 'careminster' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.Inventory.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index 1875c48..357cdc4 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
| @@ -212,8 +212,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 212 | { | 212 | { |
| 213 | // Needs to determine which engine was running it and use that | 213 | // Needs to determine which engine was running it and use that |
| 214 | // | 214 | // |
| 215 | part.Inventory.CreateScriptInstance(item.ItemID, 0, false, DefaultScriptEngine, 0); | 215 | errors = part.Inventory.CreateScriptInstanceEr(item.ItemID, 0, false, DefaultScriptEngine, 0); |
| 216 | errors = part.Inventory.GetScriptErrors(item.ItemID); | ||
| 217 | } | 216 | } |
| 218 | else | 217 | else |
| 219 | { | 218 | { |