diff options
author | Melanie | 2010-11-08 03:05:07 +0000 |
---|---|---|
committer | Melanie | 2010-11-08 03:05:07 +0000 |
commit | 8a97d58f09269afc3727a9792a90691dae11616c (patch) | |
tree | f5a309c19b5af9f443655c57c8aa1ef9e83c84d0 /OpenSim/Region | |
parent | Decrease min search length to 2 chars for map search. (diff) | |
parent | Fix merge artefacts (diff) | |
download | opensim-SC-8a97d58f09269afc3727a9792a90691dae11616c.zip opensim-SC-8a97d58f09269afc3727a9792a90691dae11616c.tar.gz opensim-SC-8a97d58f09269afc3727a9792a90691dae11616c.tar.bz2 opensim-SC-8a97d58f09269afc3727a9792a90691dae11616c.tar.xz |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | 12 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 7 |
2 files changed, 15 insertions, 4 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs index e453618..31eb319 100644 --- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | |||
@@ -179,12 +179,16 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments | |||
179 | UUID itemID = UUID.Zero; | 179 | UUID itemID = UUID.Zero; |
180 | if (sp != null) | 180 | if (sp != null) |
181 | { | 181 | { |
182 | foreach (SceneObjectGroup grp in sp.GetAttachments(AttachmentPt)) | 182 | foreach(SceneObjectGroup grp in sp.Attachments) |
183 | { | 183 | { |
184 | itemID = grp.GetFromItemID(); | 184 | if (grp.GetAttachmentPoint() == (byte)AttachmentPt) |
185 | if (itemID != UUID.Zero) | 185 | { |
186 | DetachSingleAttachmentToInv(itemID, remoteClient); | 186 | itemID = grp.GetFromItemID(); |
187 | break; | ||
188 | } | ||
187 | } | 189 | } |
190 | if (itemID != UUID.Zero) | ||
191 | DetachSingleAttachmentToInv(itemID, remoteClient); | ||
188 | } | 192 | } |
189 | 193 | ||
190 | if (group.GetFromItemID() == UUID.Zero) | 194 | if (group.GetFromItemID() == UUID.Zero) |
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index ae48c02..e3f0693 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -5165,6 +5165,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
5165 | }); | 5165 | }); |
5166 | } | 5166 | } |
5167 | 5167 | ||
5168 | <<<<<<< HEAD:OpenSim/Region/Framework/Scenes/Scene.cs | ||
5168 | if (objectsToDelete.Count > 0) | 5169 | if (objectsToDelete.Count > 0) |
5169 | { | 5170 | { |
5170 | m_log.DebugFormat("[SCENE]: Starting delete of {0} dropped attachments", objectsToDelete.Count); | 5171 | m_log.DebugFormat("[SCENE]: Starting delete of {0} dropped attachments", objectsToDelete.Count); |
@@ -5174,6 +5175,12 @@ namespace OpenSim.Region.Framework.Scenes | |||
5174 | DeleteSceneObject(grp, true); | 5175 | DeleteSceneObject(grp, true); |
5175 | } | 5176 | } |
5176 | m_log.Debug("[SCENE]: Finished dropped attachment deletion"); | 5177 | m_log.Debug("[SCENE]: Finished dropped attachment deletion"); |
5178 | ======= | ||
5179 | foreach (SceneObjectGroup grp in objectsToDelete) | ||
5180 | { | ||
5181 | m_log.InfoFormat("[SCENE]: Deleting dropped attachment {0} of user {1}", grp.UUID, grp.OwnerID); | ||
5182 | DeleteSceneObject(grp, true); | ||
5183 | >>>>>>> master:OpenSim/Region/Framework/Scenes/Scene.cs | ||
5177 | } | 5184 | } |
5178 | } | 5185 | } |
5179 | } | 5186 | } |