diff options
| author | UbitUmarov | 2016-08-02 16:54:11 +0100 |
|---|---|---|
| committer | UbitUmarov | 2016-08-02 16:54:11 +0100 |
| commit | d0ccaead0e53cbf19fc1623689aa786f4c01b48b (patch) | |
| tree | 1db631378c4fac5ea63fd7eb8f6e2fd4fc8cf1d3 /OpenSim/Region/CoreModules/Avatar/BakedTextures/XBakesModule.cs | |
| parent | Merge branch 'master' into httptests (diff) | |
| parent | do not try to cache same asset twice with hg enabled (diff) | |
| download | opensim-SC-d0ccaead0e53cbf19fc1623689aa786f4c01b48b.zip opensim-SC-d0ccaead0e53cbf19fc1623689aa786f4c01b48b.tar.gz opensim-SC-d0ccaead0e53cbf19fc1623689aa786f4c01b48b.tar.bz2 opensim-SC-d0ccaead0e53cbf19fc1623689aa786f4c01b48b.tar.xz | |
Merge branch 'master' into httptests
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/BakedTextures/XBakesModule.cs')
| -rw-r--r-- | OpenSim/Region/CoreModules/Avatar/BakedTextures/XBakesModule.cs | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/BakedTextures/XBakesModule.cs b/OpenSim/Region/CoreModules/Avatar/BakedTextures/XBakesModule.cs index c0686d9..ea5bb64 100644 --- a/OpenSim/Region/CoreModules/Avatar/BakedTextures/XBakesModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/BakedTextures/XBakesModule.cs | |||
| @@ -131,7 +131,13 @@ namespace OpenSim.Region.CoreModules.Avatar.BakedTextures | |||
| 131 | if(sr.Name=="AssetBase") | 131 | if(sr.Name=="AssetBase") |
| 132 | { | 132 | { |
| 133 | AssetBase a = (AssetBase)m_serializer.Deserialize(sr); | 133 | AssetBase a = (AssetBase)m_serializer.Deserialize(sr); |
| 134 | ret.Add(new WearableCacheItem() { CacheId = lCacheId,TextureIndex = (uint)lTextureIndex,TextureAsset = a,TextureID = a.FullID }); | 134 | ret.Add(new WearableCacheItem() |
| 135 | { | ||
| 136 | CacheId = lCacheId, | ||
| 137 | TextureIndex = (uint)lTextureIndex, | ||
| 138 | TextureAsset = a, | ||
| 139 | TextureID = a.FullID | ||
| 140 | }); | ||
| 135 | sr.ReadEndElement(); | 141 | sr.ReadEndElement(); |
| 136 | } | 142 | } |
| 137 | } | 143 | } |