diff options
author | Justin Clark-Casey (justincc) | 2010-02-12 21:32:03 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2010-02-12 21:32:03 +0000 |
commit | 802a969267da9ed2780ea66c736c3d531e336dfa (patch) | |
tree | 85b088d4e9b4cf3dbb800845a27cf8f42e6e4094 /OpenSim/Services | |
parent | Add missing refernce to prebuild (backport from presence-refactor) (diff) | |
download | opensim-SC-802a969267da9ed2780ea66c736c3d531e336dfa.zip opensim-SC-802a969267da9ed2780ea66c736c3d531e336dfa.tar.gz opensim-SC-802a969267da9ed2780ea66c736c3d531e336dfa.tar.bz2 opensim-SC-802a969267da9ed2780ea66c736c3d531e336dfa.tar.xz |
Fix http://opensimulator.org/mantis/view.php?id=4224
This resolves the problem where eyes and hair would turn white on standalone configurations
When a client receives body part information, for some insane reason or other it always ends up uploading this back to the server and then immediately re-requesting it.
This should have been okay since we stored that asset in cache. However, the standalone asset service connector was not checking this cache properly, so every time the client made the request for the asset it has just loaded it would get a big fat null back in the face, causing it to make clothes and hair white.
This bug did not affect grids since they use a different service connector.
Diffstat (limited to 'OpenSim/Services')
-rw-r--r-- | OpenSim/Services/AssetService/AssetService.cs | 8 | ||||
-rw-r--r-- | OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/OpenSim/Services/AssetService/AssetService.cs b/OpenSim/Services/AssetService/AssetService.cs index df33db2..a91b632 100644 --- a/OpenSim/Services/AssetService/AssetService.cs +++ b/OpenSim/Services/AssetService/AssetService.cs | |||
@@ -76,17 +76,19 @@ namespace OpenSim.Services.AssetService | |||
76 | }); | 76 | }); |
77 | } | 77 | } |
78 | 78 | ||
79 | m_log.Info("[ASSET CONNECTOR]: Local asset service enabled"); | 79 | m_log.Info("[ASSET SERVICE]: Local asset service enabled"); |
80 | } | 80 | } |
81 | } | 81 | } |
82 | 82 | ||
83 | public AssetBase Get(string id) | 83 | public AssetBase Get(string id) |
84 | { | 84 | { |
85 | //m_log.DebugFormat("[ASSET SERVICE]: Get asset {0}", id); | ||
86 | UUID assetID; | 85 | UUID assetID; |
87 | 86 | ||
88 | if (!UUID.TryParse(id, out assetID)) | 87 | if (!UUID.TryParse(id, out assetID)) |
88 | { | ||
89 | m_log.WarnFormat("[ASSET SERVICE]: Could not parse requested sset id {0}", id); | ||
89 | return null; | 90 | return null; |
91 | } | ||
90 | 92 | ||
91 | return m_Database.GetAsset(assetID); | 93 | return m_Database.GetAsset(assetID); |
92 | } | 94 | } |
diff --git a/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs b/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs index 8e311d7..6d442b7 100644 --- a/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs +++ b/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs | |||
@@ -93,7 +93,7 @@ namespace OpenSim.Services.Connectors | |||
93 | } | 93 | } |
94 | 94 | ||
95 | public AssetBase Get(string id) | 95 | public AssetBase Get(string id) |
96 | { | 96 | { |
97 | string uri = m_ServerURI + "/assets/" + id; | 97 | string uri = m_ServerURI + "/assets/" + id; |
98 | 98 | ||
99 | AssetBase asset = null; | 99 | AssetBase asset = null; |