diff options
author | MW | 2007-08-10 17:22:54 +0000 |
---|---|---|
committer | MW | 2007-08-10 17:22:54 +0000 |
commit | 79f0ac82e328e325df28f3af3d4c98a7885a44f5 (patch) | |
tree | 2322942186b99ad92990ad7dcb79e6abdd8bed83 /OpenSim/Framework/General/Util.cs | |
parent | Renamed Compiler.LSL to Compiler.LSO (diff) | |
download | opensim-SC-79f0ac82e328e325df28f3af3d4c98a7885a44f5.zip opensim-SC-79f0ac82e328e325df28f3af3d4c98a7885a44f5.tar.gz opensim-SC-79f0ac82e328e325df28f3af3d4c98a7885a44f5.tar.bz2 opensim-SC-79f0ac82e328e325df28f3af3d4c98a7885a44f5.tar.xz |
Some cleaning up and removed a few old files no longer in use.
Temporary have had to rename the OpenSim.DataStore.MonoSqlite project to OpenSim.DataStore.MonoSqlite1, as I'm not sure what was done to stop the old project name being included in the VS2005 solution.
Also some config changes:
OpenSim now has a INI (OpenSim.ini) file that it will read some config settings from (if the ini file exists).
Added Mono.Data.SqliteClient.dll so that we can use the same code for sqlite on Windows and mono/linux. (from what I can tell Mono class libraries have a MIT license so there should be no problems with us including this dll).
So now to get the basic prim storage working , you need to first create the sqlite database file from the sqlite3-prims.sql in share directory. Then in the OpenSim.ini file, change the storage_plugin so it points to OpenSim.DataStore.MonoSqlite1.dll (storage_plugin = OpenSim.DataStore.MonoSqlite1.dll). Then in your region.xml files change the DataStore value so it is the name of your database file (at the moment you need a different sqlite3 database file for each region).
Diffstat (limited to 'OpenSim/Framework/General/Util.cs')
-rw-r--r-- | OpenSim/Framework/General/Util.cs | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/OpenSim/Framework/General/Util.cs b/OpenSim/Framework/General/Util.cs index f3e2a01..f3a8c73 100644 --- a/OpenSim/Framework/General/Util.cs +++ b/OpenSim/Framework/General/Util.cs | |||
@@ -32,6 +32,8 @@ using System.Net; | |||
32 | using System.Text; | 32 | using System.Text; |
33 | using libsecondlife; | 33 | using libsecondlife; |
34 | 34 | ||
35 | using Nini.Config; | ||
36 | |||
35 | namespace OpenSim.Framework.Utilities | 37 | namespace OpenSim.Framework.Utilities |
36 | { | 38 | { |
37 | public class Util | 39 | public class Util |
@@ -313,5 +315,28 @@ namespace OpenSim.Framework.Utilities | |||
313 | { | 315 | { |
314 | 316 | ||
315 | } | 317 | } |
318 | |||
319 | // Nini (config) related Methods | ||
320 | public static IConfigSource ConvertDataRowToXMLConfig(System.Data.DataRow row, string fileName) | ||
321 | { | ||
322 | if(!File.Exists(fileName)) | ||
323 | { | ||
324 | //create new file | ||
325 | } | ||
326 | XmlConfigSource config = new XmlConfigSource(fileName); | ||
327 | AddDataRowToConfig(config, row); | ||
328 | config.Save(); | ||
329 | |||
330 | return config; | ||
331 | } | ||
332 | |||
333 | public static void AddDataRowToConfig(IConfigSource config, System.Data.DataRow row) | ||
334 | { | ||
335 | config.Configs.Add((string)row[0]); | ||
336 | for (int i = 0; i < row.Table.Columns.Count; i++) | ||
337 | { | ||
338 | config.Configs[(string)row[0]].Set(row.Table.Columns[i].ColumnName, row[i]); | ||
339 | } | ||
340 | } | ||
316 | } | 341 | } |
317 | } | 342 | } |