diff options
| author | Sean Dague | 2008-04-24 12:27:24 +0000 |
|---|---|---|
| committer | Sean Dague | 2008-04-24 12:27:24 +0000 |
| commit | 2a2ef42e64e202c81762adf0cc0e4cb1393f71ef (patch) | |
| tree | 20768ffd9610712a51a4cc7f9f0ffbe667fbe2e2 /OpenSim/Region/Application | |
| parent | * Adds much better support for attachments that you right click on in world. (diff) | |
| download | opensim-SC-2a2ef42e64e202c81762adf0cc0e4cb1393f71ef.zip opensim-SC-2a2ef42e64e202c81762adf0cc0e4cb1393f71ef.tar.gz opensim-SC-2a2ef42e64e202c81762adf0cc0e4cb1393f71ef.tar.bz2 opensim-SC-2a2ef42e64e202c81762adf0cc0e4cb1393f71ef.tar.xz | |
replace hard tabs with 4 spaces to be consistant in the source.
Please adjust your editors to not use hard tabs.
Diffstat (limited to 'OpenSim/Region/Application')
| -rw-r--r-- | OpenSim/Region/Application/OpenSimMain.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs index b0ca496..2094578 100644 --- a/OpenSim/Region/Application/OpenSimMain.cs +++ b/OpenSim/Region/Application/OpenSimMain.cs | |||
| @@ -249,7 +249,7 @@ namespace OpenSim | |||
| 249 | config.Set("enabled", "false"); | 249 | config.Set("enabled", "false"); |
| 250 | } | 250 | } |
| 251 | 251 | ||
| 252 | if (DefaultConfig.Configs["Voice"] == null) | 252 | if (DefaultConfig.Configs["Voice"] == null) |
| 253 | DefaultConfig.AddConfig("Voice"); | 253 | DefaultConfig.AddConfig("Voice"); |
| 254 | config = DefaultConfig.Configs["Voice"]; | 254 | config = DefaultConfig.Configs["Voice"]; |
| 255 | if (config != null) | 255 | if (config != null) |
| @@ -522,8 +522,8 @@ namespace OpenSim | |||
| 522 | m_log.Info("[MODULES]: Loading Region's modules"); | 522 | m_log.Info("[MODULES]: Loading Region's modules"); |
| 523 | 523 | ||
| 524 | List<IRegionModule> modules = m_moduleLoader.PickupModules(scene, "."); | 524 | List<IRegionModule> modules = m_moduleLoader.PickupModules(scene, "."); |
| 525 | // This needs to be ahead of the script engine load, so the | 525 | // This needs to be ahead of the script engine load, so the |
| 526 | // script module can pick up events exposed by a module | 526 | // script module can pick up events exposed by a module |
| 527 | m_moduleLoader.InitialiseSharedModules(scene); | 527 | m_moduleLoader.InitialiseSharedModules(scene); |
| 528 | 528 | ||
| 529 | //m_moduleLoader.PickupModules(scene, "ScriptEngines"); | 529 | //m_moduleLoader.PickupModules(scene, "ScriptEngines"); |