diff options
| author | Melanie | 2012-10-30 01:29:51 +0000 |
|---|---|---|
| committer | Melanie | 2012-10-30 01:29:51 +0000 |
| commit | 4eaa64d863ca968dbada438b8d597ae3543cdc4e (patch) | |
| tree | d0649d7a30b2067769e5aedc89a8f0209a90b9a6 /OpenSim/Region | |
| parent | Put back the collision sound shim into SOP (diff) | |
| parent | Set the script state to new rez when a scriptis saved, rather than region start. (diff) | |
| download | opensim-SC-4eaa64d863ca968dbada438b8d597ae3543cdc4e.zip opensim-SC-4eaa64d863ca968dbada438b8d597ae3543cdc4e.tar.gz opensim-SC-4eaa64d863ca968dbada438b8d597ae3543cdc4e.tar.bz2 opensim-SC-4eaa64d863ca968dbada438b8d597ae3543cdc4e.tar.xz | |
Merge branch 'avination' into careminster
Diffstat (limited to 'OpenSim/Region')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index deb57ce..6208a57 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
| @@ -335,7 +335,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 335 | { | 335 | { |
| 336 | // Needs to determine which engine was running it and use that | 336 | // Needs to determine which engine was running it and use that |
| 337 | // | 337 | // |
| 338 | errors = part.Inventory.CreateScriptInstanceEr(item.ItemID, 0, false, DefaultScriptEngine, 0); | 338 | errors = part.Inventory.CreateScriptInstanceEr(item.ItemID, 0, false, DefaultScriptEngine, 1); |
| 339 | } | 339 | } |
| 340 | 340 | ||
| 341 | // Tell anyone managing scripts that a script has been reloaded/changed | 341 | // Tell anyone managing scripts that a script has been reloaded/changed |