From 8022400bd4c852c3faf0db61006a2c60f5200342 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 31 Mar 2011 22:16:09 +0100
Subject: Remove unused Datastore parameter from RegionInfo (legacy from early
 2008)

---
 OpenSim/Framework/RegionInfo.cs | 11 -----------
 1 file changed, 11 deletions(-)

(limited to 'OpenSim/Framework/RegionInfo.cs')

diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
index 680e702..afedcf5 100644
--- a/OpenSim/Framework/RegionInfo.cs
+++ b/OpenSim/Framework/RegionInfo.cs
@@ -347,7 +347,6 @@ namespace OpenSim.Framework
 
         public bool commFailTF = false;
         public ConfigurationMember configMember;
-        public string DataStore = String.Empty;
         public string RegionFile = String.Empty;
         public bool isSandbox = false;
         public bool Persistent = true;
@@ -746,10 +745,6 @@ namespace OpenSim.Framework
             m_regionLocX = Convert.ToUInt32(locationElements[0]);
             m_regionLocY = Convert.ToUInt32(locationElements[1]);
 
-
-            // Datastore (is this implemented? Omitted from example!)
-            DataStore = config.GetString("Datastore", String.Empty);
-
             // Internal IP
             IPAddress address;
 
@@ -846,9 +841,6 @@ namespace OpenSim.Framework
             string location = String.Format("{0},{1}", m_regionLocX, m_regionLocY);
             config.Set("Location", location);
 
-            if (DataStore != String.Empty)
-                config.Set("Datastore", DataStore);
-
             config.Set("InternalAddress", m_internalEndPoint.Address.ToString());
             config.Set("InternalPort", m_internalEndPoint.Port);
 
@@ -1025,9 +1017,6 @@ namespace OpenSim.Framework
                 case "sim_location_y":
                     m_regionLocY = (uint) configuration_result;
                     break;
-                case "datastore":
-                    DataStore = (string) configuration_result;
-                    break;
                 case "internal_ip_address":
                     IPAddress address = (IPAddress) configuration_result;
                     m_internalEndPoint = new IPEndPoint(address, 0);
-- 
cgit v1.1


From 88bd38690a56f5e381f8038b971950c9f5842c51 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 31 Mar 2011 23:03:42 +0100
Subject: Remove unused RegionInfo.getInternalEndPointPort() in favour of
 RegionInfo.InternalEndPoint.Port

---
 OpenSim/Framework/RegionInfo.cs | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'OpenSim/Framework/RegionInfo.cs')

diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
index afedcf5..daf0a25 100644
--- a/OpenSim/Framework/RegionInfo.cs
+++ b/OpenSim/Framework/RegionInfo.cs
@@ -1164,11 +1164,6 @@ namespace OpenSim.Framework
             return regionInfo;
         }
 
-        public int getInternalEndPointPort()
-        {
-            return m_internalEndPoint.Port;
-        }
-
         public Dictionary<string, object> ToKeyValuePairs()
         {
             Dictionary<string, object> kvp = new Dictionary<string, object>();
@@ -1187,4 +1182,4 @@ namespace OpenSim.Framework
             return kvp;
         }
     }
-}
+}
\ No newline at end of file
-- 
cgit v1.1