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 -----------
 OpenSim/Region/Framework/Scenes/Scene.cs     |  1 -
 OpenSim/Region/Framework/Scenes/SceneBase.cs |  2 --
 3 files changed, 14 deletions(-)

(limited to 'OpenSim')

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);
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index d407a6f..353b7c2 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -563,7 +563,6 @@ namespace OpenSim.Region.Framework.Scenes
             m_regInfo = regInfo;
             m_regionHandle = m_regInfo.RegionHandle;
             m_regionName = m_regInfo.RegionName;
-            m_datastore = m_regInfo.DataStore;
             m_lastUpdate = Util.EnvironmentTickCount();
 
             m_physicalPrim = physicalPrim;
diff --git a/OpenSim/Region/Framework/Scenes/SceneBase.cs b/OpenSim/Region/Framework/Scenes/SceneBase.cs
index f343bc8..c4547f2 100644
--- a/OpenSim/Region/Framework/Scenes/SceneBase.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneBase.cs
@@ -136,8 +136,6 @@ namespace OpenSim.Region.Framework.Scenes
             get { return m_permissions; }
         }
 
-        protected string m_datastore;
-
          /* Used by the loadbalancer plugin on GForge */
         protected RegionStatus m_regStatus;
         public RegionStatus RegionStatus
-- 
cgit v1.1