diff options
| author | UbitUmarov | 2016-08-02 01:15:53 +0100 |
|---|---|---|
| committer | UbitUmarov | 2016-08-02 01:15:53 +0100 |
| commit | b1ef269dd3cc0557c37dc1f205fe8929ac49f4e9 (patch) | |
| tree | 3eae87eff9916292ab36b3a6a98f5cb8a4c6c4f4 /OpenSim/Services/Connectors/Estate/EstateDataConnector.cs | |
| parent | missed a Math.sqrt ... (diff) | |
| download | opensim-SC-b1ef269dd3cc0557c37dc1f205fe8929ac49f4e9.zip opensim-SC-b1ef269dd3cc0557c37dc1f205fe8929ac49f4e9.tar.gz opensim-SC-b1ef269dd3cc0557c37dc1f205fe8929ac49f4e9.tar.bz2 opensim-SC-b1ef269dd3cc0557c37dc1f205fe8929ac49f4e9.tar.xz | |
add a extra null check on epxirecache out ( ?? )
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Services/Connectors/Estate/EstateDataConnector.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Services/Connectors/Estate/EstateDataConnector.cs b/OpenSim/Services/Connectors/Estate/EstateDataConnector.cs index 6412bcd..eed25cc 100644 --- a/OpenSim/Services/Connectors/Estate/EstateDataConnector.cs +++ b/OpenSim/Services/Connectors/Estate/EstateDataConnector.cs | |||
| @@ -119,7 +119,7 @@ namespace OpenSim.Services.Connectors | |||
| 119 | List<int> eids = new List<int>(); | 119 | List<int> eids = new List<int>(); |
| 120 | // If we don't have them, load them from the server | 120 | // If we don't have them, load them from the server |
| 121 | List<EstateSettings> estates = null; | 121 | List<EstateSettings> estates = null; |
| 122 | if (!m_EstateCache.TryGetValue("estates", out estates)) | 122 | if (!m_EstateCache.TryGetValue("estates", out estates) || estates == null) |
| 123 | LoadEstateSettingsAll(); | 123 | LoadEstateSettingsAll(); |
| 124 | 124 | ||
| 125 | foreach (EstateSettings es in estates) | 125 | foreach (EstateSettings es in estates) |
| @@ -132,7 +132,7 @@ namespace OpenSim.Services.Connectors | |||
| 132 | { | 132 | { |
| 133 | // If we don't have them, load them from the server | 133 | // If we don't have them, load them from the server |
| 134 | List<EstateSettings> estates = null; | 134 | List<EstateSettings> estates = null; |
| 135 | if (!m_EstateCache.TryGetValue("estates", out estates)) | 135 | if (!m_EstateCache.TryGetValue("estates", out estates) || estates == null) |
| 136 | LoadEstateSettingsAll(); | 136 | LoadEstateSettingsAll(); |
| 137 | 137 | ||
| 138 | List<int> eids = new List<int>(); | 138 | List<int> eids = new List<int>(); |
| @@ -147,7 +147,7 @@ namespace OpenSim.Services.Connectors | |||
| 147 | { | 147 | { |
| 148 | // If we don't have them, load them from the server | 148 | // If we don't have them, load them from the server |
| 149 | List<EstateSettings> estates = null; | 149 | List<EstateSettings> estates = null; |
| 150 | if (!m_EstateCache.TryGetValue("estates", out estates)) | 150 | if (!m_EstateCache.TryGetValue("estates", out estates) || estates == null) |
| 151 | LoadEstateSettingsAll(); | 151 | LoadEstateSettingsAll(); |
| 152 | 152 | ||
| 153 | List<int> eids = new List<int>(); | 153 | List<int> eids = new List<int>(); |