diff options
| author | onefang | 2019-09-11 16:36:50 +1000 |
|---|---|---|
| committer | onefang | 2019-09-11 16:36:50 +1000 |
| commit | 50cd1ffd32f69228e566f2b0b89f86ea0d9fe489 (patch) | |
| tree | 52f2ab0c04f1a5d7d6ac5dc872981b4b156447e7 /OpenSim/Region/ClientStack/Linden/UDP/LLImageManager.cs | |
| parent | Renamed branch to SledjChisl. (diff) | |
| parent | Bump to release flavour, build 0. (diff) | |
| download | opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.zip opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.tar.gz opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.tar.bz2 opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.tar.xz | |
Merge branch 'SledjChisl'
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/UDP/LLImageManager.cs')
| -rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/LLImageManager.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLImageManager.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLImageManager.cs index 41dd4d1..deefd40 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLImageManager.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLImageManager.cs | |||
| @@ -82,7 +82,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
| 82 | 82 | ||
| 83 | if (pAssetCache != null) | 83 | if (pAssetCache != null) |
| 84 | m_missingImage = pAssetCache.Get("5748decc-f629-461c-9a36-a35a221fe21f"); | 84 | m_missingImage = pAssetCache.Get("5748decc-f629-461c-9a36-a35a221fe21f"); |
| 85 | 85 | ||
| 86 | if (m_missingImage == null) | 86 | if (m_missingImage == null) |
| 87 | m_log.Error("[ClientView] - Couldn't set missing image asset, falling back to missing image packet. This is known to crash the client"); | 87 | m_log.Error("[ClientView] - Couldn't set missing image asset, falling back to missing image packet. This is known to crash the client"); |
| 88 | 88 | ||