ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-07 01:35:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

*** BIG CHANGES : REGION STORAGE MOVED : UPDATE YOUR OpenSim.ini FROM OpenSim.ini.example **

Browse Source 
* Now moved region storage from region to application, so we have one storage per application, instead of one per region.
* Changed so that the region store providers use connectionstrings, not filenames
* Removed various unfit fields and properties (call me Darwin)
This commit is contained in:
lbsa71
2007-11-15 19:53:10 +00:00
parent 886f8b5548
commit 3aed77bd2c
10 changed files with 39 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
OpenSim/Framework/Data.MySQL/MySQLDataStore.cs
View File

@@ -36,7 +36,7 @@ namespace OpenSim.Framework.Data.MySQL
*
**********************************************************************/
public void Initialise(string connectionstring, string dbname)
public void Initialise(string connectionstring)
{
m_dataSet = new DataSet();
@@ -307,23 +307,6 @@ namespace OpenSim.Framework.Data.MySQL
}
}
//private void DisplayTableMappings( MySqlDataAdapter adapter )
//{
// DataTableMappingCollection mappings = adapter.TableMappings;
// foreach( DataTableMapping mapping in mappings )
// {
// Debug.WriteLine( String.Format( "Source Table: ", mapping.SourceTable ));
// DataColumnMappingCollection columnMappings = mapping.ColumnMappings;
// foreach (DataColumnMapping columnMapping in columnMappings)
// {
// Debug.WriteLine( String.Format( "DataSet [{0}] <-> Source [{1}]", columnMapping.DataSetColumn, columnMapping.SourceColumn ));
// }
// }
//}
public void Commit()
{
if (m_connection.State != ConnectionState.Open)
@@ -333,10 +316,7 @@ namespace OpenSim.Framework.Data.MySQL
lock (m_dataSet)
{
DisplayDataSet(m_dataSet, "Region DataSet");
//DisplayTableMappings(m_primDataAdapter);
// m_primDataAdapter.MissingMappingAction = MissingMappingAction.Error;
// DisplayDataSet(m_dataSet, "Region DataSet");
m_primDataAdapter.Update(m_primTable);
m_shapeDataAdapter.Update(m_shapeTable);

4
OpenSim/Framework/RegionInfo.cs
View File

@@ -249,7 +249,7 @@ namespace OpenSim.Framework
this.RegionName = source.Configs[sectionName].GetString("sim_name", "OpenSim Test");
this.m_regionLocX = Convert.ToUInt32(source.Configs[sectionName].GetString("sim_location_x", "1000"));
this.m_regionLocY = Convert.ToUInt32(source.Configs[sectionName].GetString("sim_location_y", "1000"));
this.DataStore = source.Configs[sectionName].GetString("datastore", "OpenSim.db");
// this.DataStore = source.Configs[sectionName].GetString("datastore", "OpenSim.db");
string ipAddress = source.Configs[sectionName].GetString("internal_ip_address", "0.0.0.0");
IPAddress ipAddressResult;
@@ -289,7 +289,7 @@ namespace OpenSim.Framework
configMember.addConfigurationOption("sim_name", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "Region Name", "OpenSim Test", false);
configMember.addConfigurationOption("sim_location_x", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, "Grid Location (X Axis)", "1000", false);
configMember.addConfigurationOption("sim_location_y", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, "Grid Location (Y Axis)", "1000", false);
configMember.addConfigurationOption("datastore", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "Filename for local storage", "OpenSim.db", false);
//configMember.addConfigurationOption("datastore", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "Filename for local storage", "OpenSim.db", false);
configMember.addConfigurationOption("internal_ip_address", ConfigurationOption.ConfigurationTypes.TYPE_IP_ADDRESS, "Internal IP Address for incoming UDP client connections", "0.0.0.0", false);
configMember.addConfigurationOption("internal_ip_port", ConfigurationOption.ConfigurationTypes.TYPE_INT32, "Internal IP Port for incoming UDP client connections", NetworkServersInfo.DefaultHttpListenerPort.ToString(), false);
configMember.addConfigurationOption("external_host_name", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "External Host Name", "127.0.0.1", false);