diff options
author | Justin Clark-Casey (justincc) | 2011-11-15 23:24:51 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-11-15 23:24:51 +0000 |
commit | aea547cd11e4baa24cad12e13160e5ff2250a69f (patch) | |
tree | 952386c40f3c794e1a7dea8d7c8a6564f941e618 /OpenSim/Region/CoreModules/Framework/UserManagement | |
parent | Do proper locking of UserManagementModule.m_UserCache when getting. (diff) | |
download | opensim-SC_OLD-aea547cd11e4baa24cad12e13160e5ff2250a69f.zip opensim-SC_OLD-aea547cd11e4baa24cad12e13160e5ff2250a69f.tar.gz opensim-SC_OLD-aea547cd11e4baa24cad12e13160e5ff2250a69f.tar.bz2 opensim-SC_OLD-aea547cd11e4baa24cad12e13160e5ff2250a69f.tar.xz |
fix build break on UserManagementModule.
This also adds time since started to "show threads". Unfortunately these two changes got mixed in.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs | 15 |
1 files changed, 8 insertions, 7 deletions
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; | |||
31 | 31 | ||
32 | using OpenSim.Framework; | 32 | using OpenSim.Framework; |
33 | using OpenSim.Framework.Console; | 33 | using OpenSim.Framework.Console; |
34 | |||
35 | using OpenSim.Region.Framework; | 34 | using OpenSim.Region.Framework; |
36 | using OpenSim.Region.Framework.Interfaces; | 35 | using OpenSim.Region.Framework.Interfaces; |
37 | using OpenSim.Region.Framework.Scenes; | 36 | using OpenSim.Region.Framework.Scenes; |
@@ -44,13 +43,13 @@ using Nini.Config; | |||
44 | 43 | ||
45 | namespace OpenSim.Region.CoreModules.Framework.UserManagement | 44 | namespace OpenSim.Region.CoreModules.Framework.UserManagement |
46 | { | 45 | { |
47 | struct UserData | 46 | class UserData |
48 | { | 47 | { |
49 | public UUID Id; | 48 | public UUID Id { get; set; } |
50 | public string FirstName; | 49 | public string FirstName { get; set; } |
51 | public string LastName; | 50 | public string LastName { get; set; } |
52 | public string HomeURL; | 51 | public string HomeURL { get; set; } |
53 | public Dictionary<string, object> ServerURLs; | 52 | public Dictionary<string, object> ServerURLs { get; set; } |
54 | } | 53 | } |
55 | 54 | ||
56 | public class UserManagementModule : ISharedRegionModule, IUserManagement | 55 | public class UserManagementModule : ISharedRegionModule, IUserManagement |
@@ -253,6 +252,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement | |||
253 | 252 | ||
254 | public string GetUserServerURL(UUID userID, string serverType) | 253 | public string GetUserServerURL(UUID userID, string serverType) |
255 | { | 254 | { |
255 | UserData userdata; | ||
256 | lock (m_UserCache) | 256 | lock (m_UserCache) |
257 | m_UserCache.TryGetValue(userID, out userdata); | 257 | m_UserCache.TryGetValue(userID, out userdata); |
258 | 258 | ||
@@ -287,6 +287,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement | |||
287 | if (account != null) | 287 | if (account != null) |
288 | return userID.ToString(); | 288 | return userID.ToString(); |
289 | 289 | ||
290 | UserData ud; | ||
290 | lock (m_UserCache) | 291 | lock (m_UserCache) |
291 | m_UserCache.TryGetValue(userID, out ud); | 292 | m_UserCache.TryGetValue(userID, out ud); |
292 | 293 | ||