diff options
| author | lcc | 2010-04-10 23:52:10 +0200 |
|---|---|---|
| committer | lcc | 2010-04-10 23:52:10 +0200 |
| commit | 7ecd9b3f1ac4556125a35ab384224b2ca0401a11 (patch) | |
| tree | 63151eb7e3693485af9db8947f2004f586062ca5 /OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |
| parent | Adding ColdStart event (diff) | |
| parent | guarantee that a script engine's GetScriptErrors() will not be called (diff) | |
| download | opensim-SC-7ecd9b3f1ac4556125a35ab384224b2ca0401a11.zip opensim-SC-7ecd9b3f1ac4556125a35ab384224b2ca0401a11.tar.gz opensim-SC-7ecd9b3f1ac4556125a35ab384224b2ca0401a11.tar.bz2 opensim-SC-7ecd9b3f1ac4556125a35ab384224b2ca0401a11.tar.xz | |
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
resolved
Conflicts:
OpenSim/Region/Framework/Interfaces/ISnmpModule.cs
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 b04871e..6c57d18 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
| @@ -271,8 +271,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 271 | { | 271 | { |
| 272 | // Needs to determine which engine was running it and use that | 272 | // Needs to determine which engine was running it and use that |
| 273 | // | 273 | // |
| 274 | part.Inventory.CreateScriptInstance(item.ItemID, 0, false, DefaultScriptEngine, 0); | 274 | errors = part.Inventory.CreateScriptInstanceEr(item.ItemID, 0, false, DefaultScriptEngine, 0); |
| 275 | errors = part.Inventory.GetScriptErrors(item.ItemID); | ||
| 276 | } | 275 | } |
| 277 | else | 276 | else |
| 278 | { | 277 | { |