diff options
| author | Melanie | 2009-11-26 17:27:03 +0000 |
|---|---|---|
| committer | Melanie | 2009-11-26 17:27:03 +0000 |
| commit | 06f41bb0176990d2c8bf5f6077418e4fc3b3d6c6 (patch) | |
| tree | 7c0a0a90235a988d69482a4c93dad6c8bbf6a5fc /OpenSim/Region/Framework/Scenes/Scene.cs | |
| parent | Remove the old remoting-type interregion code for prim/script crossing (diff) | |
| parent | Fix a small bug. Trusted script crossings now work again (diff) | |
| download | opensim-SC-06f41bb0176990d2c8bf5f6077418e4fc3b3d6c6.zip opensim-SC-06f41bb0176990d2c8bf5f6077418e4fc3b3d6c6.tar.gz opensim-SC-06f41bb0176990d2c8bf5f6077418e4fc3b3d6c6.tar.bz2 opensim-SC-06f41bb0176990d2c8bf5f6077418e4fc3b3d6c6.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index f932659..5b13b73 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
| @@ -618,7 +618,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 618 | startupConfig.GetLong("MaximumTimeBeforePersistenceConsidered", DEFAULT_MAX_TIME_FOR_PERSISTENCE); | 618 | startupConfig.GetLong("MaximumTimeBeforePersistenceConsidered", DEFAULT_MAX_TIME_FOR_PERSISTENCE); |
| 619 | m_persistAfter *= 10000000; | 619 | m_persistAfter *= 10000000; |
| 620 | 620 | ||
| 621 | m_defaultScriptEngine = startupConfig.GetString("DefaultScriptEngine", "DotNetEngine"); | 621 | m_defaultScriptEngine = startupConfig.GetString("DefaultScriptEngine", "XEngine"); |
| 622 | 622 | ||
| 623 | IConfig packetConfig = m_config.Configs["PacketPool"]; | 623 | IConfig packetConfig = m_config.Configs["PacketPool"]; |
| 624 | if (packetConfig != null) | 624 | if (packetConfig != null) |