lotek/opensim
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Cleanup a bit for mantis 8366

Browse Source
This commit is contained in:
lickx
2025-12-27 14:18:22 +01:00
parent 5dcc178ea3
commit 9a0de63ae7
2 changed files with 4 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
View File

@@ -1319,7 +1319,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
protected virtual bool CreateAgent(ScenePresence sp, GridRegion reg, GridRegion finalDestination, AgentCircuitData agentCircuit, uint teleportFlags, EntityTransferContext ctx, out string reason, out bool logout)
{
if (sp.GotAttachmentsData == false)
if (!sp.GotAttachmentsData)
{
logout = false;
reason = "Cannot leave region yet, attachments are still loading";

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

@@ -258,7 +258,6 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
protected override bool CreateAgent(ScenePresence sp, GridRegion reg, GridRegion finalDestination, AgentCircuitData agentCircuit, uint teleportFlags, EntityTransferContext ctx, out string reason, out bool logout)
{
m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: CreateAgent {0} {1}", reg.ServerURI, finalDestination.ServerURI);
reason = string.Empty;
logout = false;
int flags = Scene.GridService.GetRegionFlags(m_sceneRegionInfo.ScopeID, reg.RegionID);
@@ -826,16 +825,6 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
}
else
{
if (sp.IsDeleted)
return false;
if (m_sceneRegionInfo.EstateSettings.IsBanned(sp.UUID))
{
m_log.DebugFormat(
"[HG ENTITY TRANSFER]: Denied Attachments for banned avatar {0}", sp.Name);
return false;
}
// Upstream does let the avi in, even if their assetserver can't be reached
// The visitor will obviously be without visible attachments in this case
if (aCircuit.ServiceURLs == null || !aCircuit.ServiceURLs.ContainsKey("AssetServerURI"))
@@ -939,8 +928,9 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
sp.GotAttachmentsData = true;
string loadtime = Convert.ToString(Environment.TickCount - requestStartTick);
remoteClient.SendAlertMessage("Your avatar has finished loading ("+loadtime+"ms)");
m_log.DebugFormat(
"[HG TRANSFER MODULE]: Attachments of avatar {0} took {1}ms. to load", sp.Name, loadtime);
// at this point the job engine is done
},
OwnerID.ToString());