diff options
author | Justin Clark-Casey (justincc) | 2012-03-16 00:53:36 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-03-16 00:53:36 +0000 |
commit | 7df4a544fecb336d6f4b9cbc0faea98daf0b9edf (patch) | |
tree | 4347ad46f98edc48c41ec83f929d53475b686ba6 /OpenSim/Region/CoreModules | |
parent | Replace script-lines-per-second with the script execution time scaled by its ... (diff) | |
download | opensim-SC_OLD-7df4a544fecb336d6f4b9cbc0faea98daf0b9edf.zip opensim-SC_OLD-7df4a544fecb336d6f4b9cbc0faea98daf0b9edf.tar.gz opensim-SC_OLD-7df4a544fecb336d6f4b9cbc0faea98daf0b9edf.tar.bz2 opensim-SC_OLD-7df4a544fecb336d6f4b9cbc0faea98daf0b9edf.tar.xz |
Fix owner name display in "Top Colliders" and "Top Script" region reports.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs | 46 |
1 files changed, 1 insertions, 45 deletions
diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs index d363b15..1492861 100644 --- a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs +++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs | |||
@@ -47,8 +47,6 @@ namespace OpenSim.Region.CoreModules.World.Estate | |||
47 | { | 47 | { |
48 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 48 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
49 | 49 | ||
50 | private delegate void LookupUUIDS(List<UUID> uuidLst); | ||
51 | |||
52 | public Scene Scene { get; private set; } | 50 | public Scene Scene { get; private set; } |
53 | public IUserManagement UserManager { get; private set; } | 51 | public IUserManagement UserManager { get; private set; } |
54 | 52 | ||
@@ -920,9 +918,7 @@ namespace OpenSim.Region.CoreModules.World.Estate | |||
920 | lsri.TaskID = so.UUID; | 918 | lsri.TaskID = so.UUID; |
921 | lsri.TaskLocalID = so.LocalId; | 919 | lsri.TaskLocalID = so.LocalId; |
922 | lsri.TaskName = entry.Part.Name; | 920 | lsri.TaskName = entry.Part.Name; |
923 | lsri.OwnerName = "waiting"; | 921 | lsri.OwnerName = UserManager.GetUserName(so.OwnerID); |
924 | lock (uuidNameLookupList) | ||
925 | uuidNameLookupList.Add(so.OwnerID); | ||
926 | 922 | ||
927 | if (filter.Length != 0) | 923 | if (filter.Length != 0) |
928 | { | 924 | { |
@@ -943,48 +939,8 @@ namespace OpenSim.Region.CoreModules.World.Estate | |||
943 | } | 939 | } |
944 | 940 | ||
945 | remoteClient.SendLandStatReply(reportType, requestFlags, (uint)SceneReport.Count,SceneReport.ToArray()); | 941 | remoteClient.SendLandStatReply(reportType, requestFlags, (uint)SceneReport.Count,SceneReport.ToArray()); |
946 | |||
947 | if (uuidNameLookupList.Count > 0) | ||
948 | LookupUUID(uuidNameLookupList); | ||
949 | } | 942 | } |
950 | 943 | ||
951 | private static void LookupUUIDSCompleted(IAsyncResult iar) | ||
952 | { | ||
953 | LookupUUIDS icon = (LookupUUIDS)iar.AsyncState; | ||
954 | icon.EndInvoke(iar); | ||
955 | } | ||
956 | |||
957 | private void LookupUUID(List<UUID> uuidLst) | ||
958 | { | ||
959 | LookupUUIDS d = LookupUUIDsAsync; | ||
960 | |||
961 | d.BeginInvoke(uuidLst, | ||
962 | LookupUUIDSCompleted, | ||
963 | d); | ||
964 | } | ||
965 | |||
966 | private void LookupUUIDsAsync(List<UUID> uuidLst) | ||
967 | { | ||
968 | UUID[] uuidarr; | ||
969 | |||
970 | lock (uuidLst) | ||
971 | { | ||
972 | uuidarr = uuidLst.ToArray(); | ||
973 | } | ||
974 | |||
975 | for (int i = 0; i < uuidarr.Length; i++) | ||
976 | { | ||
977 | // string lookupname = m_scene.CommsManager.UUIDNameRequestString(uuidarr[i]); | ||
978 | |||
979 | IUserManagement userManager = Scene.RequestModuleInterface<IUserManagement>(); | ||
980 | if (userManager != null) | ||
981 | userManager.GetUserName(uuidarr[i]); | ||
982 | |||
983 | // we drop it. It gets cached though... so we're ready for the next request. | ||
984 | // diva commnent 11/21/2010: uh?!? wft? | ||
985 | // justincc comment 21/01/2011: A side effect of userManager.GetUserName() I presume. | ||
986 | } | ||
987 | } | ||
988 | #endregion | 944 | #endregion |
989 | 945 | ||
990 | #region Outgoing Packets | 946 | #region Outgoing Packets |