aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/RegionInfo.cs
diff options
context:
space:
mode:
authorUbitUmarov2019-04-04 18:52:28 +0100
committerUbitUmarov2019-04-04 18:52:28 +0100
commit07796d5ccfc8b5a8df0a50d6f4678a9c13847318 (patch)
treebdff92c18297ca93e63e570a86dd6812342fcacb /OpenSim/Framework/RegionInfo.cs
parentmantis 8512: add proposed detection of VS2019 to runprebuild (both this and v... (diff)
downloadopensim-SC-07796d5ccfc8b5a8df0a50d6f4678a9c13847318.zip
opensim-SC-07796d5ccfc8b5a8df0a50d6f4678a9c13847318.tar.gz
opensim-SC-07796d5ccfc8b5a8df0a50d6f4678a9c13847318.tar.bz2
opensim-SC-07796d5ccfc8b5a8df0a50d6f4678a9c13847318.tar.xz
change region cacheid on restart. This should not be needed in future if objects cache info is stored on region db
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/RegionInfo.cs5
1 files changed, 5 insertions, 0 deletions
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
index 75ed999..98ef5d5 100644
--- a/OpenSim/Framework/RegionInfo.cs
+++ b/OpenSim/Framework/RegionInfo.cs
@@ -180,6 +180,7 @@ namespace OpenSim.Framework
180 180
181 private Dictionary<String, String> m_extraSettings = new Dictionary<string, string>(); 181 private Dictionary<String, String> m_extraSettings = new Dictionary<string, string>();
182 182
183 public UUID CacheID { get; set;}
183 // Apparently, we're applying the same estatesettings regardless of whether it's local or remote. 184 // Apparently, we're applying the same estatesettings regardless of whether it's local or remote.
184 185
185 // MT: Yes. Estates can't span trust boundaries. Therefore, it can be 186 // MT: Yes. Estates can't span trust boundaries. Therefore, it can be
@@ -196,6 +197,7 @@ namespace OpenSim.Framework
196 public RegionInfo(string description, string filename, bool skipConsoleConfig, IConfigSource configSource, string configName) 197 public RegionInfo(string description, string filename, bool skipConsoleConfig, IConfigSource configSource, string configName)
197 { 198 {
198 // m_configSource = configSource; 199 // m_configSource = configSource;
200 CacheID = UUID.Random();
199 201
200 if (filename.ToLower().EndsWith(".ini")) 202 if (filename.ToLower().EndsWith(".ini"))
201 { 203 {
@@ -255,6 +257,7 @@ namespace OpenSim.Framework
255 ReadNiniConfig(source, name); 257 ReadNiniConfig(source, name);
256 258
257 m_serverURI = string.Empty; 259 m_serverURI = string.Empty;
260 CacheID = UUID.Random();
258 } 261 }
259 262
260 public RegionInfo(uint legacyRegionLocX, uint legacyRegionLocY, IPEndPoint internalEndPoint, string externalUri) 263 public RegionInfo(uint legacyRegionLocX, uint legacyRegionLocY, IPEndPoint internalEndPoint, string externalUri)
@@ -266,11 +269,13 @@ namespace OpenSim.Framework
266 m_internalEndPoint = internalEndPoint; 269 m_internalEndPoint = internalEndPoint;
267 m_externalHostName = externalUri; 270 m_externalHostName = externalUri;
268 m_serverURI = string.Empty; 271 m_serverURI = string.Empty;
272 CacheID = UUID.Random();
269 } 273 }
270 274
271 public RegionInfo() 275 public RegionInfo()
272 { 276 {
273 m_serverURI = string.Empty; 277 m_serverURI = string.Empty;
278 CacheID = UUID.Random();
274 } 279 }
275 280
276 public EstateSettings EstateSettings 281 public EstateSettings EstateSettings