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

Fixed: after a Hypergrid teleport, attachments often either disappear, or appear both on the avatar AND as in-world objects. 

Another manifestation of this bug is that after a Hypergrid teleport, when you click on one of the avatar's attachments the object doesn't show its name. This means that the viewer knows the attachment is there, but the simulator does not.

The problem was caused by treating Hypergrid teleports as if they're Logins (because the teleport flag ViaLogin is enabled).

This may fix: http://opensimulator.org/mantis/view.php?id=7238
This may fix: http://opensimulator.org/mantis/view.php?id=7220
bullet-2.82
Oren Hurvitz 2014-07-20 18:53:11 +03:00
parent 712c50e0bf
commit 899bcb7acd
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1193,19 +1193,17 @@ namespace OpenSim.Region.Framework.Scenes
// and it has already rezzed the attachments and started their scripts. // and it has already rezzed the attachments and started their scripts.
// We do the following only for non-login agents, because their scripts // We do the following only for non-login agents, because their scripts
// haven't started yet. // haven't started yet.
if (PresenceType == PresenceType.Npc || (TeleportFlags & TeleportFlags.ViaLogin) != 0) if (PresenceType == PresenceType.Npc || IsRealLogin(m_teleportFlags))
{ {
// Viewers which have a current outfit folder will actually rez their own attachments. However, // Viewers which have a current outfit folder will actually rez their own attachments. However,
// viewers without (e.g. v1 viewers) will not, so we still need to make this call. // viewers without (e.g. v1 viewers) will not, so we still need to make this call.
if (Scene.AttachmentsModule != null) if (Scene.AttachmentsModule != null)
Util.FireAndForget( {
o => Util.FireAndForget(o =>
{ {
// if (PresenceType != PresenceType.Npc && Util.FireAndForgetMethod != FireAndForgetMethod.None) Scene.AttachmentsModule.RezAttachments(this);
// System.Threading.Thread.Sleep(7000); });
}
Scene.AttachmentsModule.RezAttachments(this);
});
} }
else else
{ {
@ -1267,6 +1265,11 @@ namespace OpenSim.Region.Framework.Scenes
return true; return true;
} }
private static bool IsRealLogin(TeleportFlags teleportFlags)
{
return ((teleportFlags & TeleportFlags.ViaLogin) != 0) && ((teleportFlags & TeleportFlags.ViaHGLogin) == 0);
}
/// <summary> /// <summary>
/// Force viewers to show the avatar's current name. /// Force viewers to show the avatar's current name.
/// </summary> /// </summary>
@ -1698,7 +1701,7 @@ namespace OpenSim.Region.Framework.Scenes
try try
{ {
// Make sure it's not a login agent. We don't want to wait for updates during login // Make sure it's not a login agent. We don't want to wait for updates during login
if (PresenceType != PresenceType.Npc && (m_teleportFlags & TeleportFlags.ViaLogin) == 0) if (!(PresenceType == PresenceType.Npc || IsRealLogin(m_teleportFlags)))
{ {
// Let's wait until UpdateAgent (called by departing region) is done // Let's wait until UpdateAgent (called by departing region) is done
if (!WaitForUpdateAgent(client)) if (!WaitForUpdateAgent(client))