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

do not try xbakes on HG

melanie
UbitUmarov 2016-12-10 02:03:00 +00:00
parent a3e2a42f0d
commit f57403909f
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
OpenSim/Region/Framework/Scenes/ScenePresence.cs
View File

@ -2125,11 +2125,12 @@ namespace OpenSim.Region.Framework.Scenes
if (!gotCrossUpdate && !isNPC) if (!gotCrossUpdate && !isNPC)
Scene.SendLayerData(ControllingClient); Scene.SendLayerData(ControllingClient);
// HG delay // HG
if((m_teleportFlags & TeleportFlags.ViaHGLogin) != 0) bool isHGTP = (m_teleportFlags & TeleportFlags.ViaHGLogin) != 0;
if(isHGTP)
{ {
Thread.Sleep(500); // ControllingClient.SendNameReply(m_uuid, Firstname, Lastname);
m_log.DebugFormat("[CompleteMovement] HG delay: {0}ms", Util.EnvironmentTickCountSubtract(ts)); m_log.DebugFormat("[CompleteMovement] HG");
} }
m_previusParcelHide = false; m_previusParcelHide = false;
@ -2151,7 +2152,7 @@ namespace OpenSim.Region.Framework.Scenes
cachedbaked = true; cachedbaked = true;
else else
{ {
if (m_scene.AvatarFactory != null) if (m_scene.AvatarFactory != null && !isHGTP)
cachedbaked = m_scene.AvatarFactory.ValidateBakedTextureCache(this); cachedbaked = m_scene.AvatarFactory.ValidateBakedTextureCache(this);
// not sure we need this // not sure we need this