aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/RegionInfo.cs
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/RegionInfo.cs13
1 files changed, 13 insertions, 0 deletions
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
index 24b9c89..6dde62f 100644
--- a/OpenSim/Framework/RegionInfo.cs
+++ b/OpenSim/Framework/RegionInfo.cs
@@ -40,6 +40,7 @@ using OpenMetaverse.StructuredData;
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;
@@ -102,6 +103,7 @@ namespace OpenSim.Framework
102 103
103 public bool commFailTF = false; 104 public bool commFailTF = false;
104 public ConfigurationMember configMember; 105 public ConfigurationMember configMember;
106 public string DataStore = String.Empty;
105 public string RegionFile = String.Empty; 107 public string RegionFile = String.Empty;
106 public bool isSandbox = false; 108 public bool isSandbox = false;
107 public bool Persistent = true; 109 public bool Persistent = true;
@@ -707,6 +709,9 @@ namespace OpenSim.Framework
707 string location = String.Format("{0},{1}", m_regionLocX, m_regionLocY); 709 string location = String.Format("{0},{1}", m_regionLocX, m_regionLocY);
708 config.Set("Location", location); 710 config.Set("Location", location);
709 711
712 if (DataStore != String.Empty)
713 config.Set("Datastore", DataStore);
714
710 config.Set("InternalAddress", m_internalEndPoint.Address.ToString()); 715 config.Set("InternalAddress", m_internalEndPoint.Address.ToString());
711 config.Set("InternalPort", m_internalEndPoint.Port); 716 config.Set("InternalPort", m_internalEndPoint.Port);
712 717
@@ -921,6 +926,9 @@ namespace OpenSim.Framework
921 case "sim_location_y": 926 case "sim_location_y":
922 m_regionLocY = (uint) configuration_result; 927 m_regionLocY = (uint) configuration_result;
923 break; 928 break;
929 case "datastore":
930 DataStore = (string) configuration_result;
931 break;
924 case "internal_ip_address": 932 case "internal_ip_address":
925 IPAddress address = (IPAddress) configuration_result; 933 IPAddress address = (IPAddress) configuration_result;
926 m_internalEndPoint = new IPEndPoint(address, 0); 934 m_internalEndPoint = new IPEndPoint(address, 0);
@@ -1077,6 +1085,11 @@ namespace OpenSim.Framework
1077 return regionInfo; 1085 return regionInfo;
1078 } 1086 }
1079 1087
1088 public int getInternalEndPointPort()
1089 {
1090 return m_internalEndPoint.Port;
1091 }
1092
1080 public Dictionary<string, object> ToKeyValuePairs() 1093 public Dictionary<string, object> ToKeyValuePairs()
1081 { 1094 {
1082 Dictionary<string, object> kvp = new Dictionary<string, object>(); 1095 Dictionary<string, object> kvp = new Dictionary<string, object>();