diff options
author | Diva Canto | 2014-12-30 12:53:31 -0800 |
---|---|---|
committer | Diva Canto | 2014-12-30 12:53:31 -0800 |
commit | 7466ef0525f5465596c415684000bd994055b280 (patch) | |
tree | cd2566d4ab7e45f88476359a66658a8ea0dce012 /OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC-7466ef0525f5465596c415684000bd994055b280.zip opensim-SC-7466ef0525f5465596c415684000bd994055b280.tar.gz opensim-SC-7466ef0525f5465596c415684000bd994055b280.tar.bz2 opensim-SC-7466ef0525f5465596c415684000bd994055b280.tar.xz |
This cleans up versioning. Specifically:
- It establishes 4 digits for opensim versions
- It uses the same number between opensim releases and mono addins versions
It also eliminates the last addin.xml files that were still there, for consistency.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs index 906c6ee..f87d631 100644 --- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs +++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | |||
@@ -42,6 +42,7 @@ using OpenMetaverse.StructuredData; | |||
42 | using log4net; | 42 | using log4net; |
43 | using Nini.Config; | 43 | using Nini.Config; |
44 | using Amib.Threading; | 44 | using Amib.Threading; |
45 | using Mono.Addins; | ||
45 | using OpenSim.Framework; | 46 | using OpenSim.Framework; |
46 | using OpenSim.Framework.Console; | 47 | using OpenSim.Framework.Console; |
47 | using OpenSim.Region.Framework.Scenes; | 48 | using OpenSim.Region.Framework.Scenes; |
@@ -60,6 +61,7 @@ using ScriptCompileQueue = OpenSim.Framework.LocklessQueue<object[]>; | |||
60 | 61 | ||
61 | namespace OpenSim.Region.ScriptEngine.XEngine | 62 | namespace OpenSim.Region.ScriptEngine.XEngine |
62 | { | 63 | { |
64 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "XEngine")] | ||
63 | public class XEngine : INonSharedRegionModule, IScriptModule, IScriptEngine | 65 | public class XEngine : INonSharedRegionModule, IScriptModule, IScriptEngine |
64 | { | 66 | { |
65 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 67 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |