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

Enhance NullEstateData to remember stored estate values and return 

them next time asked. This keeps any estate settings from being reset
when the estate dialog is opened in a region with null estate storage.
cpu-performance
Robert Adams 2013-07-11 20:55:32 -07:00
parent 1909ee70f8
commit 65239b059f
1 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
OpenSim/Data/Null/NullEstateData.cs
View File

@ -42,6 +42,22 @@ namespace OpenSim.Data.Null
// private string m_connectionString; // private string m_connectionString;
private Dictionary<uint, EstateSettings> m_knownEstates = new Dictionary<uint, EstateSettings>();
private EstateSettings m_estate = null;
private EstateSettings GetEstate()
{
if (m_estate == null)
{
// This fools the initialization caller into thinking an estate was fetched (a check in OpenSimBase).
// The estate info is pretty empty so don't try banning anyone.
m_estate = new EstateSettings();
m_estate.EstateID = 1;
m_estate.OnSave += StoreEstateSettings;
}
return m_estate;
}
protected virtual Assembly Assembly protected virtual Assembly Assembly
{ {
get { return GetType().Assembly; } get { return GetType().Assembly; }
@ -68,21 +84,18 @@ namespace OpenSim.Data.Null
public EstateSettings LoadEstateSettings(UUID regionID, bool create) public EstateSettings LoadEstateSettings(UUID regionID, bool create)
{ {
// This fools the initialization caller into thinking an estate was fetched (a check in OpenSimBase). return GetEstate();
// The estate info is pretty empty so don't try banning anyone.
EstateSettings oneEstate = new EstateSettings();
oneEstate.EstateID = 1;
return oneEstate;
} }
public void StoreEstateSettings(EstateSettings es) public void StoreEstateSettings(EstateSettings es)
{ {
m_estate = es;
return; return;
} }
public EstateSettings LoadEstateSettings(int estateID) public EstateSettings LoadEstateSettings(int estateID)
{ {
return new EstateSettings(); return GetEstate();
} }
public EstateSettings CreateNewEstate() public EstateSettings CreateNewEstate()
@ -93,13 +106,14 @@ namespace OpenSim.Data.Null
public List<EstateSettings> LoadEstateSettingsAll() public List<EstateSettings> LoadEstateSettingsAll()
{ {
List<EstateSettings> allEstateSettings = new List<EstateSettings>(); List<EstateSettings> allEstateSettings = new List<EstateSettings>();
allEstateSettings.Add(new EstateSettings()); allEstateSettings.Add(GetEstate());
return allEstateSettings; return allEstateSettings;
} }
public List<int> GetEstatesAll() public List<int> GetEstatesAll()
{ {
List<int> result = new List<int>(); List<int> result = new List<int>();
result.Add((int)GetEstate().EstateID);
return result; return result;
} }