diff options
| author | UbitUmarov | 2015-11-17 03:00:27 +0000 |
|---|---|---|
| committer | UbitUmarov | 2015-11-17 03:00:27 +0000 |
| commit | 8567ef3c40f5619a3e4f91f9418cccad61938ec4 (patch) | |
| tree | 4bfdeb808fa29e7a42f9ca60d7bbb24a01e6a266 /OpenSim | |
| parent | work around some 'tests' errors: assets are modified by the test, on current... (diff) | |
| download | opensim-SC-8567ef3c40f5619a3e4f91f9418cccad61938ec4.zip opensim-SC-8567ef3c40f5619a3e4f91f9418cccad61938ec4.tar.gz opensim-SC-8567ef3c40f5619a3e4f91f9418cccad61938ec4.tar.bz2 opensim-SC-8567ef3c40f5619a3e4f91f9418cccad61938ec4.tar.xz | |
work around some 'tests' errors: test for null cacheItems
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs index cdcd6b9..cb210af 100644 --- a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs | |||
| @@ -358,6 +358,9 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory | |||
| 358 | // called on textures update | 358 | // called on textures update |
| 359 | public bool UpdateBakedTextureCache(IScenePresence sp, WearableCacheItem[] cacheItems) | 359 | public bool UpdateBakedTextureCache(IScenePresence sp, WearableCacheItem[] cacheItems) |
| 360 | { | 360 | { |
| 361 | if(cacheItems == null) | ||
| 362 | return false; | ||
| 363 | |||
| 361 | // npcs dont have baked cache | 364 | // npcs dont have baked cache |
| 362 | if (((ScenePresence)sp).isNPC) | 365 | if (((ScenePresence)sp).isNPC) |
| 363 | return true; | 366 | return true; |