diff options
| author | Melanie Thielker | 2010-07-25 21:55:31 +0200 |
|---|---|---|
| committer | Melanie Thielker | 2010-07-25 21:55:31 +0200 |
| commit | 3e97b3ae3345d49b968ebf4ad12842bda4640d43 (patch) | |
| tree | 404f6c65f5752689fd1ecdfd0fb61f1bbb4796ff /OpenSim | |
| parent | Fix the XmlRpcRouterModule so it reads from the correct config section ([XMLR... (diff) | |
| download | opensim-SC-3e97b3ae3345d49b968ebf4ad12842bda4640d43.zip opensim-SC-3e97b3ae3345d49b968ebf4ad12842bda4640d43.tar.gz opensim-SC-3e97b3ae3345d49b968ebf4ad12842bda4640d43.tar.bz2 opensim-SC-3e97b3ae3345d49b968ebf4ad12842bda4640d43.tar.xz | |
Fix the XMREngine not starting scripts on region startup. Turns out it
was a dumb merge artefact that caused it.
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs index 9b16281..eefa6d0 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | |||
| @@ -210,11 +210,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 210 | if ((int)InventoryType.LSL == item.InvType) | 210 | if ((int)InventoryType.LSL == item.InvType) |
| 211 | { | 211 | { |
| 212 | CreateScriptInstance(item, startParam, postOnRez, engine, stateSource); | 212 | CreateScriptInstance(item, startParam, postOnRez, engine, stateSource); |
| 213 | if ((int)InventoryType.LSL == item.InvType) | ||
| 214 | { | ||
| 215 | CreateScriptInstance(item, startParam, postOnRez, engine, stateSource); | ||
| 216 | Thread.Sleep(10); // workaround for Mono cpu utilization > 100% bug | ||
| 217 | } | ||
| 218 | } | 213 | } |
| 219 | } | 214 | } |
| 220 | } | 215 | } |