diff options
| author | Melanie | 2012-11-12 15:46:45 +0000 |
|---|---|---|
| committer | Melanie | 2012-11-12 15:46:45 +0000 |
| commit | d9b149b3756442224492ca24c2be3196a873489a (patch) | |
| tree | ec1e0649b7aef62ecb9475f78b467062f353866c /OpenSim/ApplicationPlugins | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Fix mantis #6425 (diff) | |
| download | opensim-SC_OLD-d9b149b3756442224492ca24c2be3196a873489a.zip opensim-SC_OLD-d9b149b3756442224492ca24c2be3196a873489a.tar.gz opensim-SC_OLD-d9b149b3756442224492ca24c2be3196a873489a.tar.bz2 opensim-SC_OLD-d9b149b3756442224492ca24c2be3196a873489a.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
OpenSim/Region/OptionalModules/Scripting/XmlRpcRouterModule/XmlRpcRouterModule.cs
OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
Diffstat (limited to 'OpenSim/ApplicationPlugins')
| -rw-r--r-- | OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs b/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs index 0065702..a8a3237 100644 --- a/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs +++ b/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs | |||
| @@ -99,12 +99,12 @@ namespace OpenSim.ApplicationPlugins.LoadRegions | |||
| 99 | RegionInfo[] regionsToLoad = regionLoader.LoadRegions(); | 99 | RegionInfo[] regionsToLoad = regionLoader.LoadRegions(); |
| 100 | 100 | ||
| 101 | m_log.Info("[LOAD REGIONS PLUGIN]: Loading specific shared modules..."); | 101 | m_log.Info("[LOAD REGIONS PLUGIN]: Loading specific shared modules..."); |
| 102 | m_log.Info("[LOAD REGIONS PLUGIN]: DynamicTextureModule..."); | 102 | //m_log.Info("[LOAD REGIONS PLUGIN]: DynamicTextureModule..."); |
| 103 | m_openSim.ModuleLoader.LoadDefaultSharedModule(new DynamicTextureModule()); | 103 | //m_openSim.ModuleLoader.LoadDefaultSharedModule(new DynamicTextureModule()); |
| 104 | m_log.Info("[LOAD REGIONS PLUGIN]: LoadImageURLModule..."); | 104 | //m_log.Info("[LOAD REGIONS PLUGIN]: LoadImageURLModule..."); |
| 105 | m_openSim.ModuleLoader.LoadDefaultSharedModule(new LoadImageURLModule()); | 105 | //m_openSim.ModuleLoader.LoadDefaultSharedModule(new LoadImageURLModule()); |
| 106 | m_log.Info("[LOAD REGIONS PLUGIN]: XMLRPCModule..."); | 106 | //m_log.Info("[LOAD REGIONS PLUGIN]: XMLRPCModule..."); |
| 107 | m_openSim.ModuleLoader.LoadDefaultSharedModule(new XMLRPCModule()); | 107 | //m_openSim.ModuleLoader.LoadDefaultSharedModule(new XMLRPCModule()); |
| 108 | // m_log.Info("[LOADREGIONSPLUGIN]: AssetTransactionModule..."); | 108 | // m_log.Info("[LOADREGIONSPLUGIN]: AssetTransactionModule..."); |
| 109 | // m_openSim.ModuleLoader.LoadDefaultSharedModule(new AssetTransactionModule()); | 109 | // m_openSim.ModuleLoader.LoadDefaultSharedModule(new AssetTransactionModule()); |
| 110 | m_log.Info("[LOAD REGIONS PLUGIN]: Done."); | 110 | m_log.Info("[LOAD REGIONS PLUGIN]: Done."); |