OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'integration' of /home/opensim/var/repo/opensim

integration
BlueWall 2012-04-13 20:48:50 -04:00
parent f3f85c3106 7bcd6a6842
commit 0f96b9f41b
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
OpenSim/Services/IntegrationService/IntegrationServiceBase.cs
View File

@ -48,7 +48,7 @@ namespace OpenSim.Services.IntegrationService
{ {
void Init(IConfigSource PluginConfig, IHttpServer server, ServiceBase service); void Init(IConfigSource PluginConfig, IHttpServer server, ServiceBase service);
void Unload(); void Unload();
string Name{ get; } string Name { get; }
string ConfigName { get; } string ConfigName { get; }
string DefaultConfig { get; } string DefaultConfig { get; }
} }
@ -252,7 +252,7 @@ namespace OpenSim.Services.IntegrationService
IniConfigSource source = new IniConfigSource(); IniConfigSource source = new IniConfigSource();
IConfig Init = source.AddConfig("DatabaseService"); IConfig Init = source.AddConfig("DatabaseService");
Init.Set("StorageProvider",(string)DataService.GetString("StorageProvider")); Init.Set("StorageProvider",(string)DataService.GetString("StorageProvider"));
Init.Set("ConnectionString", (string)DataService.GetString("ConnectionString")); Init.Set("ConnectionString", String.Format ("\"{0}\"",DataService.GetString("ConnectionString")));
PlugConfig = Ux.LoadInitialConfig(plugin.DefaultConfig); PlugConfig = Ux.LoadInitialConfig(plugin.DefaultConfig);
@ -261,7 +261,8 @@ namespace OpenSim.Services.IntegrationService
source.Save(Path.Combine(m_IntegrationConfigLoc, plugin.ConfigName)); source.Save(Path.Combine(m_IntegrationConfigLoc, plugin.ConfigName));
PlugConfig = source; PlugConfig = Ux.GetConfigSource(m_IntegrationConfigLoc, plugin.ConfigName);
// PlugConfig = source;
} }
m_log.InfoFormat("[INTEGRATION SERVICE]: ****** In Loading Plugin {0}", plugin.Name); m_log.InfoFormat("[INTEGRATION SERVICE]: ****** In Loading Plugin {0}", plugin.Name);