OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bakemodule didnt like last changes

avinationmerge
UbitUmarov 2014-08-06 05:56:10 +01:00
parent 66dea8fe05
commit 552b4e45e8
2 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs
View File

@ -254,18 +254,16 @@ namespace OpenSim.Region.ClientStack.Linden
} }
} }
p.Appearance.WearableCacheItems = cacheItems; p.Appearance.WearableCacheItems = cacheItems;
if (m_BakedTextureModule != null) if (m_BakedTextureModule != null)
{ {
m_BakedTextureModule.Store(remoteClient.AgentId, cacheItems); m_BakedTextureModule.Store(remoteClient.AgentId, cacheItems);
p.Appearance.WearableCacheItemsDirty = true; p.Appearance.WearableCacheItemsDirty = true;
} }
else
p.Appearance.WearableCacheItemsDirty = false;
} }
} }

7
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
View File

@ -12037,20 +12037,17 @@ namespace OpenSim.Region.ClientStack.LindenUDP
ScenePresence p = m_scene.GetScenePresence(AgentId); ScenePresence p = m_scene.GetScenePresence(AgentId);
if (p.Appearance != null) if (p.Appearance != null)
{ {
if (p.Appearance.WearableCacheItems == null) if (p.Appearance.WearableCacheItems == null || p.Appearance.WearableCacheItemsDirty)
{ {
if (bakedTextureModule != null) if (bakedTextureModule != null)
{ {
m_log.Debug("[ HandleAgentTextureCached] bakedTextureModule"); m_log.Debug("[ HandleAgentTextureCached] bakedTextureModule");
try try
{
if (p.Appearance.WearableCacheItemsDirty)
{ {
cacheItems = bakedTextureModule.Get(AgentId); cacheItems = bakedTextureModule.Get(AgentId);
p.Appearance.WearableCacheItems = cacheItems; p.Appearance.WearableCacheItems = cacheItems;
p.Appearance.WearableCacheItemsDirty = false; p.Appearance.WearableCacheItemsDirty = false;
} }
}
/* /*
* The following Catch types DO NOT WORK, it jumps to the General Packet Exception Handler if you don't catch Exception! * The following Catch types DO NOT WORK, it jumps to the General Packet Exception Handler if you don't catch Exception!
@ -12074,7 +12071,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
} }
} }
if (p.Appearance.WearableCacheItems != null) else if (p.Appearance.WearableCacheItems != null)
{ {
cacheItems = p.Appearance.WearableCacheItems; cacheItems = p.Appearance.WearableCacheItems;
} }