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 016f2a6..e7bed6a 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;
@@ -694,6 +696,9 @@ namespace OpenSim.Framework
694 string location = String.Format("{0},{1}", m_regionLocX, m_regionLocY); 696 string location = String.Format("{0},{1}", m_regionLocX, m_regionLocY);
695 config.Set("Location", location); 697 config.Set("Location", location);
696 698
699 if (DataStore != String.Empty)
700 config.Set("Datastore", DataStore);
701
697 config.Set("InternalAddress", m_internalEndPoint.Address.ToString()); 702 config.Set("InternalAddress", m_internalEndPoint.Address.ToString());
698 config.Set("InternalPort", m_internalEndPoint.Port); 703 config.Set("InternalPort", m_internalEndPoint.Port);
699 704
@@ -899,6 +904,9 @@ namespace OpenSim.Framework
899 case "sim_location_y": 904 case "sim_location_y":
900 m_regionLocY = (uint) configuration_result; 905 m_regionLocY = (uint) configuration_result;
901 break; 906 break;
907 case "datastore":
908 DataStore = (string) configuration_result;
909 break;
902 case "internal_ip_address": 910 case "internal_ip_address":
903 IPAddress address = (IPAddress) configuration_result; 911 IPAddress address = (IPAddress) configuration_result;
904 m_internalEndPoint = new IPEndPoint(address, 0); 912 m_internalEndPoint = new IPEndPoint(address, 0);
@@ -1052,6 +1060,11 @@ namespace OpenSim.Framework
1052 return regionInfo; 1060 return regionInfo;
1053 } 1061 }
1054 1062
1063 public int getInternalEndPointPort()
1064 {
1065 return m_internalEndPoint.Port;
1066 }
1067
1055 public Dictionary<string, object> ToKeyValuePairs() 1068 public Dictionary<string, object> ToKeyValuePairs()
1056 { 1069 {
1057 Dictionary<string, object> kvp = new Dictionary<string, object>(); 1070 Dictionary<string, object> kvp = new Dictionary<string, object>();