diff options
-rw-r--r-- | OpenSim/Framework/RegionInfo.cs | 11 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 1 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneBase.cs | 2 |
3 files changed, 0 insertions, 14 deletions
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 | |||
347 | 347 | ||
348 | public bool commFailTF = false; | 348 | public bool commFailTF = false; |
349 | public ConfigurationMember configMember; | 349 | public ConfigurationMember configMember; |
350 | public string DataStore = String.Empty; | ||
351 | public string RegionFile = String.Empty; | 350 | public string RegionFile = String.Empty; |
352 | public bool isSandbox = false; | 351 | public bool isSandbox = false; |
353 | public bool Persistent = true; | 352 | public bool Persistent = true; |
@@ -746,10 +745,6 @@ namespace OpenSim.Framework | |||
746 | m_regionLocX = Convert.ToUInt32(locationElements[0]); | 745 | m_regionLocX = Convert.ToUInt32(locationElements[0]); |
747 | m_regionLocY = Convert.ToUInt32(locationElements[1]); | 746 | m_regionLocY = Convert.ToUInt32(locationElements[1]); |
748 | 747 | ||
749 | |||
750 | // Datastore (is this implemented? Omitted from example!) | ||
751 | DataStore = config.GetString("Datastore", String.Empty); | ||
752 | |||
753 | // Internal IP | 748 | // Internal IP |
754 | IPAddress address; | 749 | IPAddress address; |
755 | 750 | ||
@@ -846,9 +841,6 @@ namespace OpenSim.Framework | |||
846 | string location = String.Format("{0},{1}", m_regionLocX, m_regionLocY); | 841 | string location = String.Format("{0},{1}", m_regionLocX, m_regionLocY); |
847 | config.Set("Location", location); | 842 | config.Set("Location", location); |
848 | 843 | ||
849 | if (DataStore != String.Empty) | ||
850 | config.Set("Datastore", DataStore); | ||
851 | |||
852 | config.Set("InternalAddress", m_internalEndPoint.Address.ToString()); | 844 | config.Set("InternalAddress", m_internalEndPoint.Address.ToString()); |
853 | config.Set("InternalPort", m_internalEndPoint.Port); | 845 | config.Set("InternalPort", m_internalEndPoint.Port); |
854 | 846 | ||
@@ -1025,9 +1017,6 @@ namespace OpenSim.Framework | |||
1025 | case "sim_location_y": | 1017 | case "sim_location_y": |
1026 | m_regionLocY = (uint) configuration_result; | 1018 | m_regionLocY = (uint) configuration_result; |
1027 | break; | 1019 | break; |
1028 | case "datastore": | ||
1029 | DataStore = (string) configuration_result; | ||
1030 | break; | ||
1031 | case "internal_ip_address": | 1020 | case "internal_ip_address": |
1032 | IPAddress address = (IPAddress) configuration_result; | 1021 | IPAddress address = (IPAddress) configuration_result; |
1033 | m_internalEndPoint = new IPEndPoint(address, 0); | 1022 | 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 | |||
563 | m_regInfo = regInfo; | 563 | m_regInfo = regInfo; |
564 | m_regionHandle = m_regInfo.RegionHandle; | 564 | m_regionHandle = m_regInfo.RegionHandle; |
565 | m_regionName = m_regInfo.RegionName; | 565 | m_regionName = m_regInfo.RegionName; |
566 | m_datastore = m_regInfo.DataStore; | ||
567 | m_lastUpdate = Util.EnvironmentTickCount(); | 566 | m_lastUpdate = Util.EnvironmentTickCount(); |
568 | 567 | ||
569 | m_physicalPrim = physicalPrim; | 568 | 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 | |||
136 | get { return m_permissions; } | 136 | get { return m_permissions; } |
137 | } | 137 | } |
138 | 138 | ||
139 | protected string m_datastore; | ||
140 | |||
141 | /* Used by the loadbalancer plugin on GForge */ | 139 | /* Used by the loadbalancer plugin on GForge */ |
142 | protected RegionStatus m_regStatus; | 140 | protected RegionStatus m_regStatus; |
143 | public RegionStatus RegionStatus | 141 | public RegionStatus RegionStatus |