aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/Connectors/SimianGrid
diff options
context:
space:
mode:
authorUbitUmarov2017-04-25 17:59:53 +0100
committerUbitUmarov2017-04-25 17:59:53 +0100
commita680d8b8d700f78beb1a9eea98b52d59118efe2e (patch)
treedd084e74fb61400c704a14dcfa8689670acb9ec2 /OpenSim/Services/Connectors/SimianGrid
parentMerge branch 'master' into httptests (diff)
parentmove mesh pbs creation code out of mesh upload code into to PrimitiveBaseShap... (diff)
downloadopensim-SC-a680d8b8d700f78beb1a9eea98b52d59118efe2e.zip
opensim-SC-a680d8b8d700f78beb1a9eea98b52d59118efe2e.tar.gz
opensim-SC-a680d8b8d700f78beb1a9eea98b52d59118efe2e.tar.bz2
opensim-SC-a680d8b8d700f78beb1a9eea98b52d59118efe2e.tar.xz
fix merge
Diffstat (limited to '')
-rw-r--r--OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs16
1 files changed, 12 insertions, 4 deletions
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs
index 121e863..953bc2a 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs
@@ -136,7 +136,9 @@ namespace OpenSim.Services.Connectors.SimianGrid
136 // Cache fetch 136 // Cache fetch
137 if (m_cache != null) 137 if (m_cache != null)
138 { 138 {
139 AssetBase asset = m_cache.Get(id); 139 AssetBase asset;
140 if (!m_cache.Get(id, out asset))
141 return null;
140 if (asset != null) 142 if (asset != null)
141 return asset; 143 return asset;
142 } 144 }
@@ -147,8 +149,9 @@ namespace OpenSim.Services.Connectors.SimianGrid
147 149
148 public AssetBase GetCached(string id) 150 public AssetBase GetCached(string id)
149 { 151 {
152 AssetBase asset;
150 if (m_cache != null) 153 if (m_cache != null)
151 return m_cache.Get(id); 154 m_cache.Get(id, out asset);
152 155
153 return null; 156 return null;
154 } 157 }
@@ -169,7 +172,9 @@ namespace OpenSim.Services.Connectors.SimianGrid
169 // Cache fetch 172 // Cache fetch
170 if (m_cache != null) 173 if (m_cache != null)
171 { 174 {
172 AssetBase asset = m_cache.Get(id); 175 AssetBase asset;
176 if (!m_cache.Get(id, out asset))
177 return null;
173 if (asset != null) 178 if (asset != null)
174 return asset.Metadata; 179 return asset.Metadata;
175 } 180 }
@@ -212,7 +217,10 @@ namespace OpenSim.Services.Connectors.SimianGrid
212 // Cache fetch 217 // Cache fetch
213 if (m_cache != null) 218 if (m_cache != null)
214 { 219 {
215 AssetBase asset = m_cache.Get(id); 220 AssetBase asset;
221 if (!m_cache.Get(id, out asset))
222 return false;
223
216 if (asset != null) 224 if (asset != null)
217 { 225 {
218 handler(id, sender, asset); 226 handler(id, sender, asset);