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

Fix bug in HG attachment throttling code where attachments were never rezzed on any teleport within a foreign grid after the first. 

Bug was introduced in ghosts branch commit 69abade
ghosts
Justin Clark-Casey (justincc) 2014-11-21 21:34:18 +00:00
parent c18cecbeb7
commit 8b267b5bb5
1 changed files with 64 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
View File

@ -576,7 +576,14 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
// foreign user // foreign user
AgentCircuitData aCircuit = Scene.AuthenticateHandler.GetAgentCircuitData(so.OwnerID); AgentCircuitData aCircuit = Scene.AuthenticateHandler.GetAgentCircuitData(so.OwnerID);
if (aCircuit != null && (aCircuit.teleportFlags & (uint)Constants.TeleportFlags.ViaHGLogin) != 0) if (aCircuit != null)
{
if ((aCircuit.teleportFlags & (uint)Constants.TeleportFlags.ViaHGLogin) == 0)
{
// We have already pulled the necessary attachments from the source grid.
base.HandleIncomingSceneObject(so, newPosition);
}
else
{ {
if (aCircuit.ServiceURLs != null && aCircuit.ServiceURLs.ContainsKey("AssetServerURI")) if (aCircuit.ServiceURLs != null && aCircuit.ServiceURLs.ContainsKey("AssetServerURI"))
{ {
@ -653,6 +660,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
null); null);
} }
} }
}
return true; return true;
} }