diff options
| author | UbitUmarov | 2016-08-02 01:37:47 +0100 |
|---|---|---|
| committer | UbitUmarov | 2016-08-02 01:37:47 +0100 |
| commit | 908b5e852667cd8e7cef71dd83ed89db9aa50e0f (patch) | |
| tree | 92d884b5b1b95b1dfacd2fef276eba81e2118098 /OpenSim/Services/Connectors | |
| parent | add a extra null check on epxirecache out ( ?? ) (diff) | |
| download | opensim-SC_OLD-908b5e852667cd8e7cef71dd83ed89db9aa50e0f.zip opensim-SC_OLD-908b5e852667cd8e7cef71dd83ed89db9aa50e0f.tar.gz opensim-SC_OLD-908b5e852667cd8e7cef71dd83ed89db9aa50e0f.tar.bz2 opensim-SC_OLD-908b5e852667cd8e7cef71dd83ed89db9aa50e0f.tar.xz | |
revert that and actually don't loose the estates :)
Diffstat (limited to 'OpenSim/Services/Connectors')
| -rw-r--r-- | OpenSim/Services/Connectors/Estate/EstateDataConnector.cs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Services/Connectors/Estate/EstateDataConnector.cs b/OpenSim/Services/Connectors/Estate/EstateDataConnector.cs index eed25cc..74935f3 100644 --- a/OpenSim/Services/Connectors/Estate/EstateDataConnector.cs +++ b/OpenSim/Services/Connectors/Estate/EstateDataConnector.cs | |||
| @@ -119,8 +119,8 @@ 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) || estates == null) | 122 | if (!m_EstateCache.TryGetValue("estates", out estates)) |
| 123 | LoadEstateSettingsAll(); | 123 | estates = LoadEstateSettingsAll(); |
| 124 | 124 | ||
| 125 | foreach (EstateSettings es in estates) | 125 | foreach (EstateSettings es in estates) |
| 126 | eids.Add((int)es.EstateID); | 126 | eids.Add((int)es.EstateID); |
| @@ -132,8 +132,8 @@ 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) || estates == null) | 135 | if (!m_EstateCache.TryGetValue("estates", out estates)) |
| 136 | LoadEstateSettingsAll(); | 136 | estates = LoadEstateSettingsAll(); |
| 137 | 137 | ||
| 138 | List<int> eids = new List<int>(); | 138 | List<int> eids = new List<int>(); |
| 139 | foreach (EstateSettings es in estates) | 139 | foreach (EstateSettings es in estates) |
| @@ -147,8 +147,8 @@ 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) || estates == null) | 150 | if (!m_EstateCache.TryGetValue("estates", out estates)) |
| 151 | LoadEstateSettingsAll(); | 151 | estates = LoadEstateSettingsAll(); |
| 152 | 152 | ||
| 153 | List<int> eids = new List<int>(); | 153 | List<int> eids = new List<int>(); |
| 154 | foreach (EstateSettings es in estates) | 154 | foreach (EstateSettings es in estates) |