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

minor: remove already processed avatar null check in Scene.RemoveClient() 

remove some now duplicated method doc
remove-scene-viewer
Justin Clark-Casey (justincc) 2011-08-30 23:36:45 +01:00
parent ddc733cd3d
commit 1809aaf74c
3 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
View File

@ -145,7 +145,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
{ {
grp.IsAttachment = false; grp.IsAttachment = false;
grp.AbsolutePosition = grp.RootPart.AttachedPos; grp.AbsolutePosition = grp.RootPart.AttachedPos;
// grp.DetachToInventoryPrep();
UpdateKnownItem(sp.ControllingClient, grp, grp.GetFromItemID(), grp.OwnerID); UpdateKnownItem(sp.ControllingClient, grp, grp.GetFromItemID(), grp.OwnerID);
grp.IsAttachment = true; grp.IsAttachment = true;
} }

2
OpenSim/Region/Framework/Scenes/Scene.cs
View File

@ -3162,7 +3162,7 @@ namespace OpenSim.Region.Framework.Scenes
m_eventManager.TriggerOnRemovePresence(agentID); m_eventManager.TriggerOnRemovePresence(agentID);
if (AttachmentsModule != null && avatar != null && (!avatar.IsChildAgent) && avatar.PresenceType != PresenceType.Npc) if (AttachmentsModule != null && !avatar.IsChildAgent && avatar.PresenceType != PresenceType.Npc)
AttachmentsModule.SaveChangedAttachments(avatar); AttachmentsModule.SaveChangedAttachments(avatar);
ForEachClient( ForEachClient(

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

@ -114,10 +114,6 @@ namespace OpenSim.Region.Framework.Scenes
} }
protected ScenePresenceAnimator m_animator; protected ScenePresenceAnimator m_animator;
/// <value>
/// The scene objects attached to this avatar. Do not change this list directly - use methods such as
/// AddAttachment() and RemoveAttachment(). Lock this list when performing any read operations upon it.
/// </value>
public List<SceneObjectGroup> Attachments public List<SceneObjectGroup> Attachments
{ {
get { return m_attachments; } get { return m_attachments; }