diff options
author | Melanie Thielker | 2009-04-15 23:59:15 +0000 |
---|---|---|
committer | Melanie Thielker | 2009-04-15 23:59:15 +0000 |
commit | c98287249e0fb3950d8c41b060fe10e2363f905a (patch) | |
tree | 1320951da9f3c37fdf10c16e78b33c27219d0e48 | |
parent | Prevent a nullref when no script engines are loaded (diff) | |
download | opensim-SC-c98287249e0fb3950d8c41b060fe10e2363f905a.zip opensim-SC-c98287249e0fb3950d8c41b060fe10e2363f905a.tar.gz opensim-SC-c98287249e0fb3950d8c41b060fe10e2363f905a.tar.bz2 opensim-SC-c98287249e0fb3950d8c41b060fe10e2363f905a.tar.xz |
Add the XML manifests needed to get the new style modules to load.
Scripting now works again
-rw-r--r-- | OpenSim/Region/ScriptEngine/DotNetEngine/Resources/DotNetEngine.addin.xml | 13 | ||||
-rw-r--r-- | OpenSim/Region/ScriptEngine/XEngine/Resources/XEngine.addin.xml | 13 | ||||
-rw-r--r-- | prebuild.xml | 2 |
3 files changed, 28 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/Resources/DotNetEngine.addin.xml b/OpenSim/Region/ScriptEngine/DotNetEngine/Resources/DotNetEngine.addin.xml new file mode 100644 index 0000000..78a8dca --- /dev/null +++ b/OpenSim/Region/ScriptEngine/DotNetEngine/Resources/DotNetEngine.addin.xml | |||
@@ -0,0 +1,13 @@ | |||
1 | <Addin id="OpenSim.Region.ScriptEngine.DotNetEngine" version="0.2"> | ||
2 | <Runtime> | ||
3 | <Import assembly="OpenSim.Region.ScriptEngine.DotNetEngine.dll"/> | ||
4 | </Runtime> | ||
5 | |||
6 | <Dependencies> | ||
7 | <Addin id="OpenSim" version="0.5" /> | ||
8 | </Dependencies> | ||
9 | |||
10 | <Extension path = "/OpenSim/RegionModules"> | ||
11 | <RegionModule id="DotNetEngine" type="OpenSim.Region.ScriptEngine.DotNetEngine.ScriptEngine" /> | ||
12 | </Extension> | ||
13 | </Addin> | ||
diff --git a/OpenSim/Region/ScriptEngine/XEngine/Resources/XEngine.addin.xml b/OpenSim/Region/ScriptEngine/XEngine/Resources/XEngine.addin.xml new file mode 100644 index 0000000..96c9c3a --- /dev/null +++ b/OpenSim/Region/ScriptEngine/XEngine/Resources/XEngine.addin.xml | |||
@@ -0,0 +1,13 @@ | |||
1 | <Addin id="OpenSim.Region.ScriptEngine.XEngine" version="0.2"> | ||
2 | <Runtime> | ||
3 | <Import assembly="OpenSim.Region.ScriptEngine.XEngine.dll"/> | ||
4 | </Runtime> | ||
5 | |||
6 | <Dependencies> | ||
7 | <Addin id="OpenSim" version="0.5" /> | ||
8 | </Dependencies> | ||
9 | |||
10 | <Extension path = "/OpenSim/RegionModules"> | ||
11 | <RegionModule id="XEngine" type="OpenSim.Region.ScriptEngine.XEngine.XEngine" /> | ||
12 | </Extension> | ||
13 | </Addin> | ||
diff --git a/prebuild.xml b/prebuild.xml index f36979d..21f8e5b 100644 --- a/prebuild.xml +++ b/prebuild.xml | |||
@@ -2263,6 +2263,7 @@ | |||
2263 | <Reference name="log4net.dll"/> | 2263 | <Reference name="log4net.dll"/> |
2264 | 2264 | ||
2265 | <Files> | 2265 | <Files> |
2266 | <Match pattern="*.addin.xml" path="Resources" buildAction="EmbeddedResource" recurse="true"/> | ||
2266 | <Match pattern="*.cs" recurse="true"> | 2267 | <Match pattern="*.cs" recurse="true"> |
2267 | <Exclude name="Tests" pattern="Tests" /> | 2268 | <Exclude name="Tests" pattern="Tests" /> |
2268 | </Match> | 2269 | </Match> |
@@ -2305,6 +2306,7 @@ | |||
2305 | <Reference name="Tools.dll"/> | 2306 | <Reference name="Tools.dll"/> |
2306 | 2307 | ||
2307 | <Files> | 2308 | <Files> |
2309 | <Match pattern="*.addin.xml" path="Resources" buildAction="EmbeddedResource" recurse="true"/> | ||
2308 | <Match pattern="*.cs" recurse="true"/> | 2310 | <Match pattern="*.cs" recurse="true"/> |
2309 | </Files> | 2311 | </Files> |
2310 | </Project> | 2312 | </Project> |