aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorDev Random2014-03-21 20:43:26 -0400
committerMelanie2014-03-22 01:29:51 +0000
commit3d0778bcd6ca6711850257a7d666fc30919e7e66 (patch)
tree08d2f490e0b6b2e851492cb7ce67eb6063e59902 /OpenSim/Region
parentIf an object has it's temporary flag unset after being set, put it back in th... (diff)
downloadopensim-SC_OLD-3d0778bcd6ca6711850257a7d666fc30919e7e66.zip
opensim-SC_OLD-3d0778bcd6ca6711850257a7d666fc30919e7e66.tar.gz
opensim-SC_OLD-3d0778bcd6ca6711850257a7d666fc30919e7e66.tar.bz2
opensim-SC_OLD-3d0778bcd6ca6711850257a7d666fc30919e7e66.tar.xz
Allow Mono Plugin Registry setting for Regions
Signed-off-by: Melanie <melanie@t-data.com>
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Application/OpenSimBase.cs5
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index 0dc9306..8a27967 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -158,7 +158,10 @@ namespace OpenSim
158 158
159 protected virtual void LoadPlugins() 159 protected virtual void LoadPlugins()
160 { 160 {
161 using (PluginLoader<IApplicationPlugin> loader = new PluginLoader<IApplicationPlugin>(new ApplicationPluginInitialiser(this))) 161 IConfig startupConfig = Config.Configs["Startup"];
162 string registryLocation = (startupConfig != null) ? startupConfig.GetString("RegistryLocation",".") : ".";
163
164 using (PluginLoader<IApplicationPlugin> loader = new PluginLoader<IApplicationPlugin>(new ApplicationPluginInitialiser(this), registryLocation))
162 { 165 {
163 loader.Load("/OpenSim/Startup"); 166 loader.Load("/OpenSim/Startup");
164 m_plugins = loader.Plugins; 167 m_plugins = loader.Plugins;