diff options
author | Jonathan Freedman | 2010-10-03 18:04:38 -0400 |
---|---|---|
committer | Jonathan Freedman | 2010-10-03 18:04:38 -0400 |
commit | e3099d48f9ebfaa7b1feede2d6f2788bdc93552b (patch) | |
tree | 4bddd7ea4e3d4671c9c4956fc7f6105219d88338 /OpenSim/Region/CoreModules/Resources | |
parent | * additional serveruri cleanup (diff) | |
parent | Upgraded Mono.Addins.dll to 0.5, coming from here: http://monoaddins.codeplex... (diff) | |
download | opensim-SC_OLD-e3099d48f9ebfaa7b1feede2d6f2788bdc93552b.zip opensim-SC_OLD-e3099d48f9ebfaa7b1feede2d6f2788bdc93552b.tar.gz opensim-SC_OLD-e3099d48f9ebfaa7b1feede2d6f2788bdc93552b.tar.bz2 opensim-SC_OLD-e3099d48f9ebfaa7b1feede2d6f2788bdc93552b.tar.xz |
Merge branch 'master' of git://opensimulator.org/git/opensim
Diffstat (limited to 'OpenSim/Region/CoreModules/Resources')
-rw-r--r-- | OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml b/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml index ee07075..e85e4e9 100644 --- a/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml +++ b/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml | |||
@@ -18,6 +18,7 @@ | |||
18 | <RegionModule id="CapabilitiesModule" type="OpenSim.Region.CoreModules.Agent.Capabilities.CapabilitiesModule" /> | 18 | <RegionModule id="CapabilitiesModule" type="OpenSim.Region.CoreModules.Agent.Capabilities.CapabilitiesModule" /> |
19 | <RegionModule id="TerrainModule" type="OpenSim.Region.CoreModules.World.Terrain.TerrainModule" /> | 19 | <RegionModule id="TerrainModule" type="OpenSim.Region.CoreModules.World.Terrain.TerrainModule" /> |
20 | <RegionModule id="WorldMapModule" type="OpenSim.Region.CoreModules.World.WorldMap.WorldMapModule" /> | 20 | <RegionModule id="WorldMapModule" type="OpenSim.Region.CoreModules.World.WorldMap.WorldMapModule" /> |
21 | <RegionModule id="Warp3DImageModule" type="OpenSim.Region.CoreModules.World.Warp3DMap.Warp3DImageModule" /> | ||
21 | <RegionModule id="HGWorldMapModule" type="OpenSim.Region.CoreModules.Hypergrid.HGWorldMapModule" /> | 22 | <RegionModule id="HGWorldMapModule" type="OpenSim.Region.CoreModules.Hypergrid.HGWorldMapModule" /> |
22 | <RegionModule id="UrlModule" type="OpenSim.Region.CoreModules.Scripting.LSLHttp.UrlModule" /> | 23 | <RegionModule id="UrlModule" type="OpenSim.Region.CoreModules.Scripting.LSLHttp.UrlModule" /> |
23 | <RegionModule id="Chat" type="OpenSim.Region.CoreModules.Avatar.Chat.ChatModule" /> | 24 | <RegionModule id="Chat" type="OpenSim.Region.CoreModules.Avatar.Chat.ChatModule" /> |