diff options
| author | UbitUmarov | 2014-08-07 19:16:51 +0100 |
|---|---|---|
| committer | UbitUmarov | 2014-08-07 19:16:51 +0100 |
| commit | 38e2e5942cfe7d7534038e72d8c2ac9325bd8741 (patch) | |
| tree | 9cc6cb01aab87ca7b7a31c1838a7a42a64bad77b /OpenSim/Region | |
| parent | minor clean, dont check for cache if we aren't using it.. (diff) | |
| download | opensim-SC_OLD-38e2e5942cfe7d7534038e72d8c2ac9325bd8741.zip opensim-SC_OLD-38e2e5942cfe7d7534038e72d8c2ac9325bd8741.tar.gz opensim-SC_OLD-38e2e5942cfe7d7534038e72d8c2ac9325bd8741.tar.bz2 opensim-SC_OLD-38e2e5942cfe7d7534038e72d8c2ac9325bd8741.tar.xz | |
bug on upload new bakes decision
Diffstat (limited to 'OpenSim/Region')
| -rw-r--r-- | OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs index 2e5c58a..448f7b3 100644 --- a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs | |||
| @@ -417,9 +417,10 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory | |||
| 417 | { | 417 | { |
| 418 | wearableCache[idx].CacheId = cacheItems[i].CacheId; | 418 | wearableCache[idx].CacheId = cacheItems[i].CacheId; |
| 419 | validDirtyBakes++; | 419 | validDirtyBakes++; |
| 420 | hits++; | 420 | |
| 421 | //assuming this can only happen if asset is in cache | 421 | //assuming this can only happen if asset is in cache |
| 422 | } | 422 | } |
| 423 | hits++; | ||
| 423 | continue; | 424 | continue; |
| 424 | } | 425 | } |
| 425 | 426 | ||
| @@ -448,7 +449,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory | |||
| 448 | 449 | ||
| 449 | // if we got a full set of baked textures save all in BakedTextureModule | 450 | // if we got a full set of baked textures save all in BakedTextureModule |
| 450 | 451 | ||
| 451 | if (validDirtyBakes == cacheItems.Length) | 452 | if (validDirtyBakes > 0 && hits == cacheItems.Length) |
| 452 | { | 453 | { |
| 453 | IBakedTextureModule m_BakedTextureModule = m_scene.RequestModuleInterface<IBakedTextureModule>(); | 454 | IBakedTextureModule m_BakedTextureModule = m_scene.RequestModuleInterface<IBakedTextureModule>(); |
| 454 | if (m_BakedTextureModule != null) | 455 | if (m_BakedTextureModule != null) |