Merge branch 'avination' into careminster

Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
2026-08-07 01:35:46 +08:00 · 2013-03-06 00:15:54 +00:00
parent 81552f41c6 9ffa08ea6b
commit 339d8ef2a6
10 changed files with 68 additions and 42 deletions
--- a/OpenSim/Framework/AvatarAppearance.cs
+++ b/OpenSim/Framework/AvatarAppearance.cs
@@ -497,8 +497,6 @@ namespace OpenSim.Framework
        /// </remarks>
        public List<AvatarAttachment> GetAttachments()
        {
-            
-
            lock (m_attachments)
            {
 				List<AvatarAttachment> alist = new List<AvatarAttachment>();
@@ -508,7 +506,8 @@ namespace OpenSim.Framework
                        alist.Add(new AvatarAttachment(attach));
                }
 				return alist;
-			}        }
+			}
+        }

        internal void AppendAttachment(AvatarAttachment attach)
        {