diff options
| author | UbitUmarov | 2017-04-25 17:59:53 +0100 |
|---|---|---|
| committer | UbitUmarov | 2017-04-25 17:59:53 +0100 |
| commit | a680d8b8d700f78beb1a9eea98b52d59118efe2e (patch) | |
| tree | dd084e74fb61400c704a14dcfa8689670acb9ec2 /OpenSim/Framework/WearableCacheItem.cs | |
| parent | Merge branch 'master' into httptests (diff) | |
| parent | move mesh pbs creation code out of mesh upload code into to PrimitiveBaseShap... (diff) | |
| download | opensim-SC-a680d8b8d700f78beb1a9eea98b52d59118efe2e.zip opensim-SC-a680d8b8d700f78beb1a9eea98b52d59118efe2e.tar.gz opensim-SC-a680d8b8d700f78beb1a9eea98b52d59118efe2e.tar.bz2 opensim-SC-a680d8b8d700f78beb1a9eea98b52d59118efe2e.tar.xz | |
fix merge
Diffstat (limited to 'OpenSim/Framework/WearableCacheItem.cs')
| -rw-r--r-- | OpenSim/Framework/WearableCacheItem.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Framework/WearableCacheItem.cs b/OpenSim/Framework/WearableCacheItem.cs index ccaf69e..427e149 100644 --- a/OpenSim/Framework/WearableCacheItem.cs +++ b/OpenSim/Framework/WearableCacheItem.cs | |||
| @@ -113,7 +113,8 @@ namespace OpenSim.Framework | |||
| 113 | { | 113 | { |
| 114 | if (dataCache.Check(item.TextureID.ToString())) | 114 | if (dataCache.Check(item.TextureID.ToString())) |
| 115 | { | 115 | { |
| 116 | AssetBase assetItem = dataCache.Get(item.TextureID.ToString()); | 116 | AssetBase assetItem; |
| 117 | dataCache.Get(item.TextureID.ToString(), out assetItem); | ||
| 117 | if (assetItem != null) | 118 | if (assetItem != null) |
| 118 | { | 119 | { |
| 119 | itemmap.Add("assetdata", OSD.FromBinary(assetItem.Data)); | 120 | itemmap.Add("assetdata", OSD.FromBinary(assetItem.Data)); |