diff options
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r-- | OpenSim/Region/Framework/Interfaces/IBakedTextureModule.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/IBakedTextureModule.cs b/OpenSim/Region/Framework/Interfaces/IBakedTextureModule.cs index d63898a..21ed44f 100644 --- a/OpenSim/Region/Framework/Interfaces/IBakedTextureModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IBakedTextureModule.cs | |||
@@ -13,7 +13,7 @@ namespace OpenSim.Services.Interfaces | |||
13 | { | 13 | { |
14 | public interface IBakedTextureModule | 14 | public interface IBakedTextureModule |
15 | { | 15 | { |
16 | AssetBase[] Get(UUID id); | 16 | WearableCacheItem[] Get(UUID id); |
17 | void Store(UUID id, AssetBase[] data); | 17 | void Store(UUID id, WearableCacheItem[] data); |
18 | } | 18 | } |
19 | } | 19 | } |
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 48212d0..1c27202 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -2741,6 +2741,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
2741 | return; | 2741 | return; |
2742 | } | 2742 | } |
2743 | 2743 | ||
2744 | m_lastSize = Appearance.AvatarSize; | ||
2745 | |||
2744 | int count = 0; | 2746 | int count = 0; |
2745 | m_scene.ForEachScenePresence(delegate(ScenePresence scenePresence) | 2747 | m_scene.ForEachScenePresence(delegate(ScenePresence scenePresence) |
2746 | { | 2748 | { |