ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-05 00:46:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Try disabling the inconsistent attachment state check to see if this actually has an impact.

Browse Source 
The code in question is over three years old and just be catching an inconsistency rather than being wholly necessary.
This commit still carries out the check and prints all the previous log warnings but a 'failure' no longer prevents avatar region crossing or teleport, and it doesn't give the client the error message.
This will have some kind of impact on http://opensimulator.org/mantis/view.php?id=5672
This commit is contained in:
Justin Clark-Casey (justincc)
2011-09-05 23:42:37 +01:00
parent 5e579b71fd
commit cf73afec35
3 changed files with 27 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3498,7 +3498,10 @@ namespace OpenSim.Region.Framework.Scenes
m_attachments.Clear();
}
public bool ValidateAttachments()
/// <summary>
/// This is currently just being done for information.
/// </summary>
public void ValidateAttachments()
{
lock (m_attachments)
{
@@ -3508,21 +3511,16 @@ namespace OpenSim.Region.Framework.Scenes
if (gobj == null)
{
m_log.WarnFormat(
"[SCENE PRESENCE]: Failed to validate an attachment for {0} since it was null", Name);
return false;
"[SCENE PRESENCE]: Failed to validate an attachment for {0} since it was null. Continuing", Name);
}
if (gobj.IsDeleted)
else if (gobj.IsDeleted)
{
m_log.WarnFormat(
"[SCENE PRESENCE]: Failed to validate attachment {0} {1} for {2} since it had been deleted",
"[SCENE PRESENCE]: Failed to validate attachment {0} {1} for {2} since it had been deleted. Continuing",
gobj.Name, gobj.UUID, Name);
return false;
}
}
}
return true;
}
/// <summary>