From aea547cd11e4baa24cad12e13160e5ff2250a69f Mon Sep 17 00:00:00 2001 From: Justin Clark-Casey (justincc) Date: Tue, 15 Nov 2011 23:24:51 +0000 Subject: fix build break on UserManagementModule. This also adds time since started to "show threads". Unfortunately these two changes got mixed in. --- .../Framework/UserManagement/UserManagementModule.cs | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'OpenSim/Region/CoreModules/Framework/UserManagement') diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs index 55279cc..cb500b9 100644 --- a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs +++ b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs @@ -31,7 +31,6 @@ using System.Reflection; using OpenSim.Framework; using OpenSim.Framework.Console; - using OpenSim.Region.Framework; using OpenSim.Region.Framework.Interfaces; using OpenSim.Region.Framework.Scenes; @@ -44,13 +43,13 @@ using Nini.Config; namespace OpenSim.Region.CoreModules.Framework.UserManagement { - struct UserData + class UserData { - public UUID Id; - public string FirstName; - public string LastName; - public string HomeURL; - public Dictionary ServerURLs; + public UUID Id { get; set; } + public string FirstName { get; set; } + public string LastName { get; set; } + public string HomeURL { get; set; } + public Dictionary ServerURLs { get; set; } } public class UserManagementModule : ISharedRegionModule, IUserManagement @@ -253,6 +252,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement public string GetUserServerURL(UUID userID, string serverType) { + UserData userdata; lock (m_UserCache) m_UserCache.TryGetValue(userID, out userdata); @@ -287,6 +287,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement if (account != null) return userID.ToString(); + UserData ud; lock (m_UserCache) m_UserCache.TryGetValue(userID, out ud); -- cgit v1.1