aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/RegionInfo.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Framework/RegionInfo.cs')
-rw-r--r--OpenSim/Framework/RegionInfo.cs19
1 files changed, 18 insertions, 1 deletions
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
index daf0a25..d154bff 100644
--- a/OpenSim/Framework/RegionInfo.cs
+++ b/OpenSim/Framework/RegionInfo.cs
@@ -40,6 +40,7 @@ using OpenSim.Framework.Console;
40 40
41namespace OpenSim.Framework 41namespace OpenSim.Framework
42{ 42{
43 [Serializable]
43 public class RegionLightShareData : ICloneable 44 public class RegionLightShareData : ICloneable
44 { 45 {
45 public bool valid = false; 46 public bool valid = false;
@@ -347,6 +348,7 @@ namespace OpenSim.Framework
347 348
348 public bool commFailTF = false; 349 public bool commFailTF = false;
349 public ConfigurationMember configMember; 350 public ConfigurationMember configMember;
351 public string DataStore = String.Empty;
350 public string RegionFile = String.Empty; 352 public string RegionFile = String.Empty;
351 public bool isSandbox = false; 353 public bool isSandbox = false;
352 public bool Persistent = true; 354 public bool Persistent = true;
@@ -745,6 +747,10 @@ namespace OpenSim.Framework
745 m_regionLocX = Convert.ToUInt32(locationElements[0]); 747 m_regionLocX = Convert.ToUInt32(locationElements[0]);
746 m_regionLocY = Convert.ToUInt32(locationElements[1]); 748 m_regionLocY = Convert.ToUInt32(locationElements[1]);
747 749
750
751 // Datastore (is this implemented? Omitted from example!)
752 DataStore = config.GetString("Datastore", String.Empty);
753
748 // Internal IP 754 // Internal IP
749 IPAddress address; 755 IPAddress address;
750 756
@@ -841,6 +847,9 @@ namespace OpenSim.Framework
841 string location = String.Format("{0},{1}", m_regionLocX, m_regionLocY); 847 string location = String.Format("{0},{1}", m_regionLocX, m_regionLocY);
842 config.Set("Location", location); 848 config.Set("Location", location);
843 849
850 if (DataStore != String.Empty)
851 config.Set("Datastore", DataStore);
852
844 config.Set("InternalAddress", m_internalEndPoint.Address.ToString()); 853 config.Set("InternalAddress", m_internalEndPoint.Address.ToString());
845 config.Set("InternalPort", m_internalEndPoint.Port); 854 config.Set("InternalPort", m_internalEndPoint.Port);
846 855
@@ -1017,6 +1026,9 @@ namespace OpenSim.Framework
1017 case "sim_location_y": 1026 case "sim_location_y":
1018 m_regionLocY = (uint) configuration_result; 1027 m_regionLocY = (uint) configuration_result;
1019 break; 1028 break;
1029 case "datastore":
1030 DataStore = (string) configuration_result;
1031 break;
1020 case "internal_ip_address": 1032 case "internal_ip_address":
1021 IPAddress address = (IPAddress) configuration_result; 1033 IPAddress address = (IPAddress) configuration_result;
1022 m_internalEndPoint = new IPEndPoint(address, 0); 1034 m_internalEndPoint = new IPEndPoint(address, 0);
@@ -1164,6 +1176,11 @@ namespace OpenSim.Framework
1164 return regionInfo; 1176 return regionInfo;
1165 } 1177 }
1166 1178
1179 public int getInternalEndPointPort()
1180 {
1181 return m_internalEndPoint.Port;
1182 }
1183
1167 public Dictionary<string, object> ToKeyValuePairs() 1184 public Dictionary<string, object> ToKeyValuePairs()
1168 { 1185 {
1169 Dictionary<string, object> kvp = new Dictionary<string, object>(); 1186 Dictionary<string, object> kvp = new Dictionary<string, object>();
@@ -1182,4 +1199,4 @@ namespace OpenSim.Framework
1182 return kvp; 1199 return kvp;
1183 } 1200 }
1184 } 1201 }
1185} \ No newline at end of file 1202}