diff options
author | Sean Dague | 2008-04-23 20:57:18 +0000 |
---|---|---|
committer | Sean Dague | 2008-04-23 20:57:18 +0000 |
commit | 3f95804911d1a1bc4b50518c047f073120306d72 (patch) | |
tree | 7e9b5e5ef5537676783c40a407e9d6c670b0b490 /OpenSim/Framework/AssetConfig.cs | |
parent | allow for Inventory database source to be specified in main (diff) | |
download | opensim-SC_OLD-3f95804911d1a1bc4b50518c047f073120306d72.zip opensim-SC_OLD-3f95804911d1a1bc4b50518c047f073120306d72.tar.gz opensim-SC_OLD-3f95804911d1a1bc4b50518c047f073120306d72.tar.bz2 opensim-SC_OLD-3f95804911d1a1bc4b50518c047f073120306d72.tar.xz |
add a database_connect field for the asset server config
which will let you specify a connection string. Required
for Nhibernate, optional for sqlite (there is a sane default),
ignored for mysql and mssql until someone implements the
Iniatialise(string) method.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/AssetConfig.cs | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/OpenSim/Framework/AssetConfig.cs b/OpenSim/Framework/AssetConfig.cs index 6f43693..85dbaa6 100644 --- a/OpenSim/Framework/AssetConfig.cs +++ b/OpenSim/Framework/AssetConfig.cs | |||
@@ -38,7 +38,9 @@ namespace OpenSim.Framework | |||
38 | 38 | ||
39 | public string DatabaseProvider = String.Empty; | 39 | public string DatabaseProvider = String.Empty; |
40 | 40 | ||
41 | public static uint DefaultHttpPort = 8003; | 41 | public string DatabaseConnect = String.Empty; |
42 | |||
43 | public const uint DefaultHttpPort = 8003; | ||
42 | public uint HttpPort = DefaultHttpPort; | 44 | public uint HttpPort = DefaultHttpPort; |
43 | 45 | ||
44 | private ConfigurationMember configMember; | 46 | private ConfigurationMember configMember; |
@@ -59,6 +61,9 @@ namespace OpenSim.Framework | |||
59 | configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING, | 61 | configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING, |
60 | "DLL for database provider", "OpenSim.Data.MySQL.dll", false); | 62 | "DLL for database provider", "OpenSim.Data.MySQL.dll", false); |
61 | 63 | ||
64 | configMember.addConfigurationOption("database_connect", ConfigurationOption.ConfigurationTypes.TYPE_STRING, | ||
65 | "Database connection string", "", false); | ||
66 | |||
62 | configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, | 67 | configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, |
63 | "Http Listener port", DefaultHttpPort.ToString(), false); | 68 | "Http Listener port", DefaultHttpPort.ToString(), false); |
64 | } | 69 | } |
@@ -73,6 +78,9 @@ namespace OpenSim.Framework | |||
73 | case "database_provider": | 78 | case "database_provider": |
74 | DatabaseProvider = (string) configuration_result; | 79 | DatabaseProvider = (string) configuration_result; |
75 | break; | 80 | break; |
81 | case "database_connect": | ||
82 | DatabaseConnect = (string) configuration_result; | ||
83 | break; | ||
76 | case "http_port": | 84 | case "http_port": |
77 | HttpPort = (uint) configuration_result; | 85 | HttpPort = (uint) configuration_result; |
78 | break; | 86 | break; |