aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/Data.MySQL/MySQLDataStore.cs24
-rw-r--r--OpenSim/Framework/RegionInfo.cs4
2 files changed, 4 insertions, 24 deletions
diff --git a/OpenSim/Framework/Data.MySQL/MySQLDataStore.cs b/OpenSim/Framework/Data.MySQL/MySQLDataStore.cs
index c468414..343970e 100644
--- a/OpenSim/Framework/Data.MySQL/MySQLDataStore.cs
+++ b/OpenSim/Framework/Data.MySQL/MySQLDataStore.cs
@@ -36,7 +36,7 @@ namespace OpenSim.Framework.Data.MySQL
36 * 36 *
37 **********************************************************************/ 37 **********************************************************************/
38 38
39 public void Initialise(string connectionstring, string dbname) 39 public void Initialise(string connectionstring)
40 { 40 {
41 m_dataSet = new DataSet(); 41 m_dataSet = new DataSet();
42 42
@@ -307,23 +307,6 @@ namespace OpenSim.Framework.Data.MySQL
307 } 307 }
308 } 308 }
309 309
310 //private void DisplayTableMappings( MySqlDataAdapter adapter )
311 //{
312 // DataTableMappingCollection mappings = adapter.TableMappings;
313
314 // foreach( DataTableMapping mapping in mappings )
315 // {
316 // Debug.WriteLine( String.Format( "Source Table: ", mapping.SourceTable ));
317
318 // DataColumnMappingCollection columnMappings = mapping.ColumnMappings;
319
320 // foreach (DataColumnMapping columnMapping in columnMappings)
321 // {
322 // Debug.WriteLine( String.Format( "DataSet [{0}] <-> Source [{1}]", columnMapping.DataSetColumn, columnMapping.SourceColumn ));
323 // }
324 // }
325 //}
326
327 public void Commit() 310 public void Commit()
328 { 311 {
329 if (m_connection.State != ConnectionState.Open) 312 if (m_connection.State != ConnectionState.Open)
@@ -333,10 +316,7 @@ namespace OpenSim.Framework.Data.MySQL
333 316
334 lock (m_dataSet) 317 lock (m_dataSet)
335 { 318 {
336 DisplayDataSet(m_dataSet, "Region DataSet"); 319 // DisplayDataSet(m_dataSet, "Region DataSet");
337 //DisplayTableMappings(m_primDataAdapter);
338
339 // m_primDataAdapter.MissingMappingAction = MissingMappingAction.Error;
340 320
341 m_primDataAdapter.Update(m_primTable); 321 m_primDataAdapter.Update(m_primTable);
342 m_shapeDataAdapter.Update(m_shapeTable); 322 m_shapeDataAdapter.Update(m_shapeTable);
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
index 2a75dbc..cfd15fc 100644
--- a/OpenSim/Framework/RegionInfo.cs
+++ b/OpenSim/Framework/RegionInfo.cs
@@ -249,7 +249,7 @@ namespace OpenSim.Framework
249 this.RegionName = source.Configs[sectionName].GetString("sim_name", "OpenSim Test"); 249 this.RegionName = source.Configs[sectionName].GetString("sim_name", "OpenSim Test");
250 this.m_regionLocX = Convert.ToUInt32(source.Configs[sectionName].GetString("sim_location_x", "1000")); 250 this.m_regionLocX = Convert.ToUInt32(source.Configs[sectionName].GetString("sim_location_x", "1000"));
251 this.m_regionLocY = Convert.ToUInt32(source.Configs[sectionName].GetString("sim_location_y", "1000")); 251 this.m_regionLocY = Convert.ToUInt32(source.Configs[sectionName].GetString("sim_location_y", "1000"));
252 this.DataStore = source.Configs[sectionName].GetString("datastore", "OpenSim.db"); 252 // this.DataStore = source.Configs[sectionName].GetString("datastore", "OpenSim.db");
253 253
254 string ipAddress = source.Configs[sectionName].GetString("internal_ip_address", "0.0.0.0"); 254 string ipAddress = source.Configs[sectionName].GetString("internal_ip_address", "0.0.0.0");
255 IPAddress ipAddressResult; 255 IPAddress ipAddressResult;
@@ -289,7 +289,7 @@ namespace OpenSim.Framework
289 configMember.addConfigurationOption("sim_name", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "Region Name", "OpenSim Test", false); 289 configMember.addConfigurationOption("sim_name", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "Region Name", "OpenSim Test", false);
290 configMember.addConfigurationOption("sim_location_x", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, "Grid Location (X Axis)", "1000", false); 290 configMember.addConfigurationOption("sim_location_x", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, "Grid Location (X Axis)", "1000", false);
291 configMember.addConfigurationOption("sim_location_y", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, "Grid Location (Y Axis)", "1000", false); 291 configMember.addConfigurationOption("sim_location_y", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, "Grid Location (Y Axis)", "1000", false);
292 configMember.addConfigurationOption("datastore", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "Filename for local storage", "OpenSim.db", false); 292 //configMember.addConfigurationOption("datastore", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "Filename for local storage", "OpenSim.db", false);
293 configMember.addConfigurationOption("internal_ip_address", ConfigurationOption.ConfigurationTypes.TYPE_IP_ADDRESS, "Internal IP Address for incoming UDP client connections", "0.0.0.0", false); 293 configMember.addConfigurationOption("internal_ip_address", ConfigurationOption.ConfigurationTypes.TYPE_IP_ADDRESS, "Internal IP Address for incoming UDP client connections", "0.0.0.0", false);
294 configMember.addConfigurationOption("internal_ip_port", ConfigurationOption.ConfigurationTypes.TYPE_INT32, "Internal IP Port for incoming UDP client connections", NetworkServersInfo.DefaultHttpListenerPort.ToString(), false); 294 configMember.addConfigurationOption("internal_ip_port", ConfigurationOption.ConfigurationTypes.TYPE_INT32, "Internal IP Port for incoming UDP client connections", NetworkServersInfo.DefaultHttpListenerPort.ToString(), false);
295 configMember.addConfigurationOption("external_host_name", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "External Host Name", "127.0.0.1", false); 295 configMember.addConfigurationOption("external_host_name", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "External Host Name", "127.0.0.1", false);