add a extra null check on epxirecache out ( ?? )
parent
4ba4c9cf9e
commit
b1ef269dd3
|
@ -119,7 +119,7 @@ namespace OpenSim.Services.Connectors
|
||||||
List<int> eids = new List<int>();
|
List<int> eids = new List<int>();
|
||||||
// If we don't have them, load them from the server
|
// If we don't have them, load them from the server
|
||||||
List<EstateSettings> estates = null;
|
List<EstateSettings> estates = null;
|
||||||
if (!m_EstateCache.TryGetValue("estates", out estates))
|
if (!m_EstateCache.TryGetValue("estates", out estates) || estates == null)
|
||||||
LoadEstateSettingsAll();
|
LoadEstateSettingsAll();
|
||||||
|
|
||||||
foreach (EstateSettings es in estates)
|
foreach (EstateSettings es in estates)
|
||||||
|
@ -132,7 +132,7 @@ namespace OpenSim.Services.Connectors
|
||||||
{
|
{
|
||||||
// If we don't have them, load them from the server
|
// If we don't have them, load them from the server
|
||||||
List<EstateSettings> estates = null;
|
List<EstateSettings> estates = null;
|
||||||
if (!m_EstateCache.TryGetValue("estates", out estates))
|
if (!m_EstateCache.TryGetValue("estates", out estates) || estates == null)
|
||||||
LoadEstateSettingsAll();
|
LoadEstateSettingsAll();
|
||||||
|
|
||||||
List<int> eids = new List<int>();
|
List<int> eids = new List<int>();
|
||||||
|
@ -147,7 +147,7 @@ namespace OpenSim.Services.Connectors
|
||||||
{
|
{
|
||||||
// If we don't have them, load them from the server
|
// If we don't have them, load them from the server
|
||||||
List<EstateSettings> estates = null;
|
List<EstateSettings> estates = null;
|
||||||
if (!m_EstateCache.TryGetValue("estates", out estates))
|
if (!m_EstateCache.TryGetValue("estates", out estates) || estates == null)
|
||||||
LoadEstateSettingsAll();
|
LoadEstateSettingsAll();
|
||||||
|
|
||||||
List<int> eids = new List<int>();
|
List<int> eids = new List<int>();
|
||||||
|
|
Loading…
Reference in New Issue