aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs
diff options
context:
space:
mode:
authorTeravus Ovares (Dan Olivares)2009-11-11 02:47:17 -0500
committerTeravus Ovares (Dan Olivares)2009-11-11 02:47:17 -0500
commit4a2d82e14b4d00671b454d4848b6b4cef26d3e56 (patch)
treeb35be2bbaaaedbb1da94ebb360c0df653d526c0d /OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs
parent* Fix resources file mapping (diff)
downloadopensim-SC_OLD-4a2d82e14b4d00671b454d4848b6b4cef26d3e56.zip
opensim-SC_OLD-4a2d82e14b4d00671b454d4848b6b4cef26d3e56.tar.gz
opensim-SC_OLD-4a2d82e14b4d00671b454d4848b6b4cef26d3e56.tar.bz2
opensim-SC_OLD-4a2d82e14b4d00671b454d4848b6b4cef26d3e56.tar.xz
* Thanks to a little help from jhurliman, jradford, diva, mono's brajkovic, miguel, and the fabulous bug reports by our community members.. The workaround fix for the "ERROR:metadata.c:3211:mono_metadata_token_from_dor: code should not be reached" bug in the RegionCombinerModule.
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs5
1 files changed, 5 insertions, 0 deletions
diff --git a/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs b/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs
index 6180751..7ec1d4b 100644
--- a/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs
+++ b/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs
@@ -37,9 +37,14 @@ using OpenSim.Region.Framework.Interfaces;
37using OpenSim.Region.Framework.Scenes; 37using OpenSim.Region.Framework.Scenes;
38using OpenSim.Framework.Console; 38using OpenSim.Framework.Console;
39using OpenSim.Region.Physics.Manager; 39using OpenSim.Region.Physics.Manager;
40using Mono.Addins;
40 41
42[assembly: Addin("RegionCombinerModule", "0.1")]
43[assembly: AddinDependency("OpenSim", "0.5")]
41namespace OpenSim.Region.RegionCombinerModule 44namespace OpenSim.Region.RegionCombinerModule
42{ 45{
46
47 [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]
43 public class RegionCombinerModule : ISharedRegionModule 48 public class RegionCombinerModule : ISharedRegionModule
44 { 49 {
45 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 50 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);