diff options
| author | onefang | 2019-05-19 21:24:15 +1000 |
|---|---|---|
| committer | onefang | 2019-05-19 21:24:15 +1000 |
| commit | 5e4d6cab00cb29cd088ab7b62ab13aff103b64cb (patch) | |
| tree | a9fbc62df9eb2d1d9ba2698d8552eae71eca20d8 /OpenSim/Services/Connectors/Estate | |
| parent | Add a build script. (diff) | |
| download | opensim-SC-5e4d6cab00cb29cd088ab7b62ab13aff103b64cb.zip opensim-SC-5e4d6cab00cb29cd088ab7b62ab13aff103b64cb.tar.gz opensim-SC-5e4d6cab00cb29cd088ab7b62ab13aff103b64cb.tar.bz2 opensim-SC-5e4d6cab00cb29cd088ab7b62ab13aff103b64cb.tar.xz | |
Dump OpenSim 0.9.0.1 into it's own branch.
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Services/Connectors/Estate/EstateDataConnector.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Services/Connectors/Estate/EstateDataConnector.cs b/OpenSim/Services/Connectors/Estate/EstateDataConnector.cs index 6412bcd..b9a6281 100644 --- a/OpenSim/Services/Connectors/Estate/EstateDataConnector.cs +++ b/OpenSim/Services/Connectors/Estate/EstateDataConnector.cs | |||
| @@ -120,7 +120,7 @@ namespace OpenSim.Services.Connectors | |||
| 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)) |
| 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); |
| @@ -133,7 +133,7 @@ namespace OpenSim.Services.Connectors | |||
| 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)) |
| 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) |
| @@ -148,7 +148,7 @@ namespace OpenSim.Services.Connectors | |||
| 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)) |
| 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) |
| @@ -323,7 +323,7 @@ namespace OpenSim.Services.Connectors | |||
| 323 | } | 323 | } |
| 324 | else | 324 | else |
| 325 | m_log.Error(string.Format( | 325 | m_log.Error(string.Format( |
| 326 | "[ESTATE CONNECTOR]: WebException for {0} {1} {2} ", | 326 | "[ESTATE CONNECTOR]: WebException for {0} {1} {2} {3}", |
| 327 | verb, uri, formdata, e)); | 327 | verb, uri, formdata, e)); |
| 328 | } | 328 | } |
| 329 | } | 329 | } |