From 0dce4964991c24f9ae47fe04f52a92dcfd22dc1b Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 2 Apr 2013 00:53:06 +0100
Subject: Fix what appears to be a bug in HGUserManagementModule where it
 enables on the base.Name rather than its own Name.

---
 .../CoreModules/Framework/UserManagement/HGUserManagementModule.cs     | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/HGUserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/HGUserManagementModule.cs
index 4ef57fe..8ce20e9 100644
--- a/OpenSim/Region/CoreModules/Framework/UserManagement/HGUserManagementModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/UserManagement/HGUserManagementModule.cs
@@ -50,12 +50,11 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
-
         #region ISharedRegionModule
 
         public new void Initialise(IConfigSource config)
         {
-            string umanmod = config.Configs["Modules"].GetString("UserManagementModule", base.Name);
+            string umanmod = config.Configs["Modules"].GetString("UserManagementModule", Name);
             if (umanmod == Name)
             {
                 m_Enabled = true;
-- 
cgit v1.1


From 69bc37acd66e9ac9938d4a657dc6b9a0ba9f021e Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 2 Apr 2013 01:00:55 +0100
Subject: minor: Remove unnecessary call to GetAttachments() in
 AttachmentsModule.UpdateUserInventoryWithAttachment()

---
 OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
index eec7ee5..7d16635 100644
--- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
@@ -434,8 +434,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
 
         private void UpdateUserInventoryWithAttachment(IScenePresence sp, SceneObjectGroup group, uint attachmentPt, bool append)
         {
-            List<SceneObjectGroup> attachments = sp.GetAttachments(attachmentPt);
-
             // Add the new attachment to inventory if we don't already have it.
             UUID newAttachmentItemID = group.FromItemID;
             if (newAttachmentItemID == UUID.Zero)
-- 
cgit v1.1