diff options
author | UbitUmarov | 2015-09-02 19:54:53 +0100 |
---|---|---|
committer | UbitUmarov | 2015-09-02 19:54:53 +0100 |
commit | a11edceb00b5b86f825bd957bdac9edb91f893dd (patch) | |
tree | c192eae26f3aadf365a66f32fc6d9ade2f0a0c61 /OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs | |
parent | bad merge? (diff) | |
download | opensim-SC_OLD-a11edceb00b5b86f825bd957bdac9edb91f893dd.zip opensim-SC_OLD-a11edceb00b5b86f825bd957bdac9edb91f893dd.tar.gz opensim-SC_OLD-a11edceb00b5b86f825bd957bdac9edb91f893dd.tar.bz2 opensim-SC_OLD-a11edceb00b5b86f825bd957bdac9edb91f893dd.tar.xz |
seems to compile ( tests comented out)
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs index 1e9cfba..0d3b39e 100644 --- a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs | |||
@@ -229,7 +229,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory | |||
229 | private void SendAppearance(ScenePresence sp) | 229 | private void SendAppearance(ScenePresence sp) |
230 | { | 230 | { |
231 | // Send the appearance to everyone in the scene | 231 | // Send the appearance to everyone in the scene |
232 | sp.SendAppearanceToAllOtherClients(); | 232 | sp.SendAppearanceToAllOtherAgents(); |
233 | 233 | ||
234 | // Send animations back to the avatar as well | 234 | // Send animations back to the avatar as well |
235 | sp.Animator.SendAnimPack(); | 235 | sp.Animator.SendAnimPack(); |
@@ -460,7 +460,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory | |||
460 | { | 460 | { |
461 | m_log.Debug("[UpdateBakedCache] uploading to bakedModule cache"); | 461 | m_log.Debug("[UpdateBakedCache] uploading to bakedModule cache"); |
462 | 462 | ||
463 | m_BakedTextureModule.Store(sp.UUID); | 463 | m_BakedTextureModule.Store(sp.UUID, wearableCache); |
464 | } | 464 | } |
465 | } | 465 | } |
466 | 466 | ||
@@ -529,12 +529,6 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory | |||
529 | ); | 529 | ); |
530 | } | 530 | } |
531 | } | 531 | } |
532 | <<<<<<< HEAD | ||
533 | |||
534 | // m_log.DebugFormat( | ||
535 | // "[AVFACTORY]: Looking for texture {0}, id {1} for {2} {3}", | ||
536 | // face.TextureID, idx, client.Name, client.AgentId); | ||
537 | ======= | ||
538 | */ | 532 | */ |
539 | bool wearableCacheValid = false; | 533 | bool wearableCacheValid = false; |
540 | if (wearableCache == null) | 534 | if (wearableCache == null) |
@@ -577,15 +571,9 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory | |||
577 | if (wearableCacheValid) | 571 | if (wearableCacheValid) |
578 | m_log.Debug("[ValidateBakedCache] have valid local cache"); | 572 | m_log.Debug("[ValidateBakedCache] have valid local cache"); |
579 | } | 573 | } |
580 | >>>>>>> avn/ubitvar | ||
581 | 574 | ||
582 | bool checkExternal = false; | 575 | bool checkExternal = false; |
583 | 576 | ||
584 | <<<<<<< HEAD | ||
585 | if (m_scene.AssetService.Get(face.TextureID.ToString()) == null) | ||
586 | return false; | ||
587 | } | ||
588 | ======= | ||
589 | if (!wearableCacheValid) | 577 | if (!wearableCacheValid) |
590 | { | 578 | { |
591 | // only use external bake module on login condition check | 579 | // only use external bake module on login condition check |
@@ -658,7 +646,6 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory | |||
658 | } | 646 | } |
659 | } | 647 | } |
660 | } | 648 | } |
661 | >>>>>>> avn/ubitvar | ||
662 | 649 | ||
663 | sp.Appearance.WearableCacheItems = wearableCache; | 650 | sp.Appearance.WearableCacheItems = wearableCache; |
664 | 651 | ||