aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Avatar
diff options
context:
space:
mode:
authorUbitUmarov2014-09-19 16:51:51 +0100
committerUbitUmarov2014-09-19 16:51:51 +0100
commit9c552212a983c7e076c53340af9f47584d641aff (patch)
treefafb3845ea011b23f80944f5f8a29a57b93f3d79 /OpenSim/Region/CoreModules/Avatar
parentfix positions on same frames transitions (diff)
downloadopensim-SC-9c552212a983c7e076c53340af9f47584d641aff.zip
opensim-SC-9c552212a983c7e076c53340af9f47584d641aff.tar.gz
opensim-SC-9c552212a983c7e076c53340af9f47584d641aff.tar.bz2
opensim-SC-9c552212a983c7e076c53340af9f47584d641aff.tar.xz
exclude npcs from baked cache
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs10
1 files changed, 10 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
index dc16593..bd243ad 100644
--- a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
@@ -366,6 +366,10 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
366 // called on textures update 366 // called on textures update
367 public bool UpdateBakedTextureCache(IScenePresence sp, WearableCacheItem[] cacheItems) 367 public bool UpdateBakedTextureCache(IScenePresence sp, WearableCacheItem[] cacheItems)
368 { 368 {
369 // npcs dont have baked cache
370 if (((ScenePresence)sp).isNPC)
371 return true;
372
369 // uploaded baked textures will be in assets local cache 373 // uploaded baked textures will be in assets local cache
370 IAssetService cache = m_scene.AssetService; 374 IAssetService cache = m_scene.AssetService;
371 375
@@ -485,6 +489,9 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
485 { 489 {
486 int hits = 0; 490 int hits = 0;
487 491
492 if (((ScenePresence)sp).isNPC)
493 return true;
494
488 lock (m_setAppearanceLock) 495 lock (m_setAppearanceLock)
489 { 496 {
490 IAssetService cache = m_scene.AssetService; 497 IAssetService cache = m_scene.AssetService;
@@ -650,6 +657,9 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
650 657
651 public int RequestRebake(IScenePresence sp, bool missingTexturesOnly) 658 public int RequestRebake(IScenePresence sp, bool missingTexturesOnly)
652 { 659 {
660 if (((ScenePresence)sp).isNPC)
661 return 0;
662
653 int texturesRebaked = 0; 663 int texturesRebaked = 0;
654 IImprovedAssetCache cache = m_scene.RequestModuleInterface<IImprovedAssetCache>(); 664 IImprovedAssetCache cache = m_scene.RequestModuleInterface<IImprovedAssetCache>();
655 665