aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid/AssetServer/Main.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Grid/AssetServer/Main.cs')
-rw-r--r--OpenSim/Grid/AssetServer/Main.cs8
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Grid/AssetServer/Main.cs b/OpenSim/Grid/AssetServer/Main.cs
index 4a4f8bf..6d46048 100644
--- a/OpenSim/Grid/AssetServer/Main.cs
+++ b/OpenSim/Grid/AssetServer/Main.cs
@@ -83,7 +83,7 @@ namespace OpenSim.Grid.AssetServer
83 public override void Startup() 83 public override void Startup()
84 { 84 {
85 base.Startup(); 85 base.Startup();
86 86
87 AssetConfig config = new AssetConfig("ASSET SERVER", (Path.Combine(Util.configDir(), "AssetServer_Config.xml"))); 87 AssetConfig config = new AssetConfig("ASSET SERVER", (Path.Combine(Util.configDir(), "AssetServer_Config.xml")));
88 88
89 m_log.Info("[ASSET]: Setting up asset DB"); 89 m_log.Info("[ASSET]: Setting up asset DB");
@@ -115,17 +115,17 @@ namespace OpenSim.Grid.AssetServer
115 115
116 public IAssetProviderPlugin LoadDatabasePlugin(string provider, string connect) 116 public IAssetProviderPlugin LoadDatabasePlugin(string provider, string connect)
117 { 117 {
118 PluginLoader<IAssetProviderPlugin> loader = 118 PluginLoader<IAssetProviderPlugin> loader =
119 new PluginLoader<IAssetProviderPlugin> (new AssetDataInitialiser (connect)); 119 new PluginLoader<IAssetProviderPlugin> (new AssetDataInitialiser (connect));
120 120
121 // loader will try to load all providers (MySQL, MSSQL, etc) 121 // loader will try to load all providers (MySQL, MSSQL, etc)
122 // unless it is constrainted to the correct "Provider" entry in the addin.xml 122 // unless it is constrainted to the correct "Provider" entry in the addin.xml
123 loader.Add ("/OpenSim/AssetData", new PluginProviderFilter (provider)); 123 loader.Add ("/OpenSim/AssetData", new PluginProviderFilter (provider));
124 loader.Load(); 124 loader.Load();
125 125
126 return loader.Plugin; 126 return loader.Plugin;
127 } 127 }
128 128
129 public void setupDB(AssetConfig config) 129 public void setupDB(AssetConfig config)
130 { 130 {
131 try 131 try