diff options
author | Justin Clark-Casey (justincc) | 2011-08-30 23:36:45 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-08-30 23:36:45 +0100 |
commit | 1809aaf74c3594ec40df8688a2dcc42074ddeec4 (patch) | |
tree | bcc348aae129905107460f211a0c32e762185ebe /OpenSim/Region | |
parent | refactor: move SP.SaveChangedAttachments() fully into AttachmentsModule (diff) | |
download | opensim-SC_OLD-1809aaf74c3594ec40df8688a2dcc42074ddeec4.zip opensim-SC_OLD-1809aaf74c3594ec40df8688a2dcc42074ddeec4.tar.gz opensim-SC_OLD-1809aaf74c3594ec40df8688a2dcc42074ddeec4.tar.bz2 opensim-SC_OLD-1809aaf74c3594ec40df8688a2dcc42074ddeec4.tar.xz |
minor: remove already processed avatar null check in Scene.RemoveClient()
remove some now duplicated method doc
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | 1 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 4 |
3 files changed, 1 insertions, 6 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs index 201ce7f..e2f6a9e 100644 --- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | |||
@@ -145,7 +145,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments | |||
145 | { | 145 | { |
146 | grp.IsAttachment = false; | 146 | grp.IsAttachment = false; |
147 | grp.AbsolutePosition = grp.RootPart.AttachedPos; | 147 | grp.AbsolutePosition = grp.RootPart.AttachedPos; |
148 | // grp.DetachToInventoryPrep(); | ||
149 | UpdateKnownItem(sp.ControllingClient, grp, grp.GetFromItemID(), grp.OwnerID); | 148 | UpdateKnownItem(sp.ControllingClient, grp, grp.GetFromItemID(), grp.OwnerID); |
150 | grp.IsAttachment = true; | 149 | grp.IsAttachment = true; |
151 | } | 150 | } |
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index e0e3884..9368285 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -3162,7 +3162,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
3162 | 3162 | ||
3163 | m_eventManager.TriggerOnRemovePresence(agentID); | 3163 | m_eventManager.TriggerOnRemovePresence(agentID); |
3164 | 3164 | ||
3165 | if (AttachmentsModule != null && avatar != null && (!avatar.IsChildAgent) && avatar.PresenceType != PresenceType.Npc) | 3165 | if (AttachmentsModule != null && !avatar.IsChildAgent && avatar.PresenceType != PresenceType.Npc) |
3166 | AttachmentsModule.SaveChangedAttachments(avatar); | 3166 | AttachmentsModule.SaveChangedAttachments(avatar); |
3167 | 3167 | ||
3168 | ForEachClient( | 3168 | ForEachClient( |
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 91e11eb..0a91989 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -114,10 +114,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
114 | } | 114 | } |
115 | protected ScenePresenceAnimator m_animator; | 115 | protected ScenePresenceAnimator m_animator; |
116 | 116 | ||
117 | /// <value> | ||
118 | /// The scene objects attached to this avatar. Do not change this list directly - use methods such as | ||
119 | /// AddAttachment() and RemoveAttachment(). Lock this list when performing any read operations upon it. | ||
120 | /// </value> | ||
121 | public List<SceneObjectGroup> Attachments | 117 | public List<SceneObjectGroup> Attachments |
122 | { | 118 | { |
123 | get { return m_attachments; } | 119 | get { return m_attachments; } |