From 07796d5ccfc8b5a8df0a50d6f4678a9c13847318 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Thu, 4 Apr 2019 18:52:28 +0100 Subject: [PATCH] change region cacheid on restart. This should not be needed in future if objects cache info is stored on region db --- OpenSim/Framework/RegionInfo.cs | 5 +++++ OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs index 75ed999601..98ef5d58e3 100644 --- a/OpenSim/Framework/RegionInfo.cs +++ b/OpenSim/Framework/RegionInfo.cs @@ -180,6 +180,7 @@ namespace OpenSim.Framework private Dictionary m_extraSettings = new Dictionary(); + public UUID CacheID { get; set;} // Apparently, we're applying the same estatesettings regardless of whether it's local or remote. // MT: Yes. Estates can't span trust boundaries. Therefore, it can be @@ -196,6 +197,7 @@ namespace OpenSim.Framework public RegionInfo(string description, string filename, bool skipConsoleConfig, IConfigSource configSource, string configName) { // m_configSource = configSource; + CacheID = UUID.Random(); if (filename.ToLower().EndsWith(".ini")) { @@ -255,6 +257,7 @@ namespace OpenSim.Framework ReadNiniConfig(source, name); m_serverURI = string.Empty; + CacheID = UUID.Random(); } public RegionInfo(uint legacyRegionLocX, uint legacyRegionLocY, IPEndPoint internalEndPoint, string externalUri) @@ -266,11 +269,13 @@ namespace OpenSim.Framework m_internalEndPoint = internalEndPoint; m_externalHostName = externalUri; m_serverURI = string.Empty; + CacheID = UUID.Random(); } public RegionInfo() { m_serverURI = string.Empty; + CacheID = UUID.Random(); } public EstateSettings EstateSettings diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs index 5ffea6297b..8d5980a22e 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs @@ -929,7 +929,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP //BillableFactor zc.AddFloat(es.BillableFactor); //CacheID - zc.AddUUID(regionInfo.RegionID); // needs review when we actuall support cache + zc.AddUUID(regionInfo.CacheID); // needs review when we actuall support cache //TerrainBase0 //TerrainBase1 //TerrainBase2