diff options
Diffstat (limited to 'OpenSim/Framework/RegionInfo.cs')
-rw-r--r-- | OpenSim/Framework/RegionInfo.cs | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs index 680e702..daf0a25 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); |
@@ -1175,11 +1164,6 @@ namespace OpenSim.Framework | |||
1175 | return regionInfo; | 1164 | return regionInfo; |
1176 | } | 1165 | } |
1177 | 1166 | ||
1178 | public int getInternalEndPointPort() | ||
1179 | { | ||
1180 | return m_internalEndPoint.Port; | ||
1181 | } | ||
1182 | |||
1183 | public Dictionary<string, object> ToKeyValuePairs() | 1167 | public Dictionary<string, object> ToKeyValuePairs() |
1184 | { | 1168 | { |
1185 | Dictionary<string, object> kvp = new Dictionary<string, object>(); | 1169 | Dictionary<string, object> kvp = new Dictionary<string, object>(); |
@@ -1198,4 +1182,4 @@ namespace OpenSim.Framework | |||
1198 | return kvp; | 1182 | return kvp; |
1199 | } | 1183 | } |
1200 | } | 1184 | } |
1201 | } | 1185 | } \ No newline at end of file |