From 3aed77bd2c5fecc2a077fdad501774b2b00001b1 Mon Sep 17 00:00:00 2001
From: lbsa71
Date: Thu, 15 Nov 2007 19:53:10 +0000
Subject: *** BIG CHANGES : REGION STORAGE MOVED : UPDATE YOUR OpenSim.ini FROM
 OpenSim.ini.example ** * 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)

---
 OpenSim/Framework/Data.MySQL/MySQLDataStore.cs | 24 ++----------------------
 OpenSim/Framework/RegionInfo.cs                |  4 ++--
 2 files changed, 4 insertions(+), 24 deletions(-)

(limited to 'OpenSim/Framework')

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
          *
          **********************************************************************/
 
-        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);
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
             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);
-- 
cgit v1.1