aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/MySQL
diff options
context:
space:
mode:
authorSean Dague2008-04-23 19:13:06 +0000
committerSean Dague2008-04-23 19:13:06 +0000
commita1cc0e436ff9081f3c0a76de861ed0673cd36142 (patch)
tree31d775f3e17109b5b6765e89b73da9f036172328 /OpenSim/Data/MySQL
parent* Fix a console issue where pressing return on some operating systems cause t... (diff)
downloadopensim-SC_OLD-a1cc0e436ff9081f3c0a76de861ed0673cd36142.zip
opensim-SC_OLD-a1cc0e436ff9081f3c0a76de861ed0673cd36142.tar.gz
opensim-SC_OLD-a1cc0e436ff9081f3c0a76de861ed0673cd36142.tar.bz2
opensim-SC_OLD-a1cc0e436ff9081f3c0a76de861ed0673cd36142.tar.xz
changes to allow asset_source to be specified in the opensim.ini
this will work for sqlite and nhibernate, but will be ignored for mysql and mssql (reverting to their ini files) until someone writes that bit.
Diffstat (limited to 'OpenSim/Data/MySQL')
-rw-r--r--OpenSim/Data/MySQL/MySQLAssetData.cs7
1 files changed, 7 insertions, 0 deletions
diff --git a/OpenSim/Data/MySQL/MySQLAssetData.cs b/OpenSim/Data/MySQL/MySQLAssetData.cs
index 111f7d1..b6545d7 100644
--- a/OpenSim/Data/MySQL/MySQLAssetData.cs
+++ b/OpenSim/Data/MySQL/MySQLAssetData.cs
@@ -170,6 +170,13 @@ namespace OpenSim.Data.MySQL
170 170
171 #region IPlugin Members 171 #region IPlugin Members
172 172
173 override public void Initialise(string connect)
174 {
175 // TODO: This will let you pass in the connect string in
176 // the config, though someone will need to write that.
177 Initialise();
178 }
179
173 override public void Initialise() 180 override public void Initialise()
174 { 181 {
175 IniFile GridDataMySqlFile = new IniFile("mysql_connection.ini"); 182 IniFile GridDataMySqlFile = new IniFile("mysql_connection.ini");