aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorSean Dague2008-05-02 18:59:12 +0000
committerSean Dague2008-05-02 18:59:12 +0000
commit1b7f1c956c86458bc0cee341ea95ee593be76703 (patch)
treeba16a52f1020567f61d8da08dd5b6e4c99697aa5 /OpenSim/Framework
parentadded user appearance mapping in nhibernate (diff)
downloadopensim-SC_OLD-1b7f1c956c86458bc0cee341ea95ee593be76703.zip
opensim-SC_OLD-1b7f1c956c86458bc0cee341ea95ee593be76703.tar.gz
opensim-SC_OLD-1b7f1c956c86458bc0cee341ea95ee593be76703.tar.bz2
opensim-SC_OLD-1b7f1c956c86458bc0cee341ea95ee593be76703.tar.xz
plumb in connection string to the user database paths. mysql and mssql
just ignore this for now, but it lets us get connect strings to sqlite and nhibernate.
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/Communications/UserManagerBase.cs8
-rw-r--r--OpenSim/Framework/IUserData.cs2
-rw-r--r--OpenSim/Framework/UserConfig.cs6
3 files changed, 11 insertions, 5 deletions
diff --git a/OpenSim/Framework/Communications/UserManagerBase.cs b/OpenSim/Framework/Communications/UserManagerBase.cs
index 29bfe22..51a5036 100644
--- a/OpenSim/Framework/Communications/UserManagerBase.cs
+++ b/OpenSim/Framework/Communications/UserManagerBase.cs
@@ -53,7 +53,7 @@ namespace OpenSim.Framework.Communications
53 /// Adds a new user server plugin - user servers will be requested in the order they were loaded. 53 /// Adds a new user server plugin - user servers will be requested in the order they were loaded.
54 /// </summary> 54 /// </summary>
55 /// <param name="FileName">The filename to the user server plugin DLL</param> 55 /// <param name="FileName">The filename to the user server plugin DLL</param>
56 public void AddPlugin(string FileName) 56 public void AddPlugin(string FileName, string connect)
57 { 57 {
58 if (!String.IsNullOrEmpty(FileName)) 58 if (!String.IsNullOrEmpty(FileName))
59 { 59 {
@@ -71,16 +71,16 @@ namespace OpenSim.Framework.Communications
71 { 71 {
72 IUserData plug = 72 IUserData plug =
73 (IUserData) Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString())); 73 (IUserData) Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
74 AddPlugin(plug); 74 AddPlugin(plug, connect);
75 } 75 }
76 } 76 }
77 } 77 }
78 } 78 }
79 } 79 }
80 80
81 public void AddPlugin(IUserData plug) 81 public void AddPlugin(IUserData plug, string connect)
82 { 82 {
83 plug.Initialise(); 83 plug.Initialise(connect);
84 _plugins.Add(plug.Name, plug); 84 _plugins.Add(plug.Name, plug);
85 m_log.Info("[USERSTORAGE]: Added IUserData Interface"); 85 m_log.Info("[USERSTORAGE]: Added IUserData Interface");
86 } 86 }
diff --git a/OpenSim/Framework/IUserData.cs b/OpenSim/Framework/IUserData.cs
index b75a229..1e557d3 100644
--- a/OpenSim/Framework/IUserData.cs
+++ b/OpenSim/Framework/IUserData.cs
@@ -173,7 +173,7 @@ namespace OpenSim.Framework
173 /// <summary> 173 /// <summary>
174 /// Initialises the plugin (artificial constructor) 174 /// Initialises the plugin (artificial constructor)
175 /// </summary> 175 /// </summary>
176 void Initialise(); 176 void Initialise(string connect);
177 177
178 /// <summary> 178 /// <summary>
179 /// Gets the user appearance 179 /// Gets the user appearance
diff --git a/OpenSim/Framework/UserConfig.cs b/OpenSim/Framework/UserConfig.cs
index c176bbf..3c0bdfa 100644
--- a/OpenSim/Framework/UserConfig.cs
+++ b/OpenSim/Framework/UserConfig.cs
@@ -38,6 +38,7 @@ namespace OpenSim.Framework
38 public static bool DefaultHttpSSL = false; 38 public static bool DefaultHttpSSL = false;
39 private ConfigurationMember configMember; 39 private ConfigurationMember configMember;
40 public string DatabaseProvider = String.Empty; 40 public string DatabaseProvider = String.Empty;
41 public string DatabaseConnect = String.Empty;
41 public string DefaultStartupMsg = String.Empty; 42 public string DefaultStartupMsg = String.Empty;
42 public uint DefaultX = 1000; 43 public uint DefaultX = 1000;
43 public uint DefaultY = 1000; 44 public uint DefaultY = 1000;
@@ -77,6 +78,8 @@ namespace OpenSim.Framework
77 false); 78 false);
78 configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING, 79 configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
79 "DLL for database provider", "OpenSim.Data.MySQL.dll", false); 80 "DLL for database provider", "OpenSim.Data.MySQL.dll", false);
81 configMember.addConfigurationOption("database_connect", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
82 "Connection String for Database", "", false);
80 83
81 configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, 84 configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
82 "Http Listener port", DefaultHttpPort.ToString(), false); 85 "Http Listener port", DefaultHttpPort.ToString(), false);
@@ -110,6 +113,9 @@ namespace OpenSim.Framework
110 case "database_provider": 113 case "database_provider":
111 DatabaseProvider = (string) configuration_result; 114 DatabaseProvider = (string) configuration_result;
112 break; 115 break;
116 case "database_connect":
117 DatabaseConnect = (string) configuration_result;
118 break;
113 case "http_port": 119 case "http_port":
114 HttpPort = (uint) configuration_result; 120 HttpPort = (uint) configuration_result;
115 break; 121 break;