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

only try external baked texture module on login

avinationmerge
UbitUmarov 2014-08-14 03:47:18 +01:00
parent 395903d58f
commit ab4df26309
1 changed files with 36 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
View File

@ -551,13 +551,24 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
m_log.Debug("[ValidateBakedCache] have valid local cache"); m_log.Debug("[ValidateBakedCache] have valid local cache");
} }
bool checkExternal = false;
if (!wearableCacheValid) if (!wearableCacheValid)
{
ScenePresence ssp = null;
if (sp is ScenePresence)
{
ssp = (ScenePresence)sp;
checkExternal = (((uint)ssp.TeleportFlags & (uint)TeleportFlags.ViaLogin) != 0) &&
bakedModule != null;
}
}
if (checkExternal)
{ {
hits = 0; hits = 0;
bool gotbacked = false; bool gotbacked = false;
if (bakedModule != null)
{
m_log.Debug("[ValidateBakedCache] local cache invalid, calling bakedModule"); m_log.Debug("[ValidateBakedCache] local cache invalid, calling bakedModule");
try try
{ {
@ -589,7 +600,6 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
} }
gotbacked = true; gotbacked = true;
} }
}
if (gotbacked) if (gotbacked)
{ {