OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

change region cacheid on restart. This should not be needed in future if objects cache info is stored on region db

0.9.1.0-post-fixes
UbitUmarov 2019-04-04 18:52:28 +01:00
parent 42414bfa55
commit 07796d5ccf
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
OpenSim/Framework/RegionInfo.cs
View File

@ -180,6 +180,7 @@ namespace OpenSim.Framework
private Dictionary<String, String> m_extraSettings = new Dictionary<string, string>(); private Dictionary<String, String> m_extraSettings = new Dictionary<string, string>();
public UUID CacheID { get; set;}
// Apparently, we're applying the same estatesettings regardless of whether it's local or remote. // 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 // 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) public RegionInfo(string description, string filename, bool skipConsoleConfig, IConfigSource configSource, string configName)
{ {
// m_configSource = configSource; // m_configSource = configSource;
CacheID = UUID.Random();
if (filename.ToLower().EndsWith(".ini")) if (filename.ToLower().EndsWith(".ini"))
{ {
@ -255,6 +257,7 @@ namespace OpenSim.Framework
ReadNiniConfig(source, name); ReadNiniConfig(source, name);
m_serverURI = string.Empty; m_serverURI = string.Empty;
CacheID = UUID.Random();
} }
public RegionInfo(uint legacyRegionLocX, uint legacyRegionLocY, IPEndPoint internalEndPoint, string externalUri) public RegionInfo(uint legacyRegionLocX, uint legacyRegionLocY, IPEndPoint internalEndPoint, string externalUri)
@ -266,11 +269,13 @@ namespace OpenSim.Framework
m_internalEndPoint = internalEndPoint; m_internalEndPoint = internalEndPoint;
m_externalHostName = externalUri; m_externalHostName = externalUri;
m_serverURI = string.Empty; m_serverURI = string.Empty;
CacheID = UUID.Random();
} }
public RegionInfo() public RegionInfo()
{ {
m_serverURI = string.Empty; m_serverURI = string.Empty;
CacheID = UUID.Random();
} }
public EstateSettings EstateSettings public EstateSettings EstateSettings

2
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
View File

@ -929,7 +929,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
//BillableFactor //BillableFactor
zc.AddFloat(es.BillableFactor); zc.AddFloat(es.BillableFactor);
//CacheID //CacheID
zc.AddUUID(regionInfo.RegionID); // needs review when we actuall support cache zc.AddUUID(regionInfo.CacheID); // needs review when we actuall support cache
//TerrainBase0 //TerrainBase0
//TerrainBase1 //TerrainBase1
//TerrainBase2 //TerrainBase2