aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/World/Estate
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Estate')
-rw-r--r--OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs6
1 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
index 60e8c1a..e7ebab3 100644
--- a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
@@ -781,6 +781,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
781 LookupUUIDS icon = (LookupUUIDS)iar.AsyncState; 781 LookupUUIDS icon = (LookupUUIDS)iar.AsyncState;
782 icon.EndInvoke(iar); 782 icon.EndInvoke(iar);
783 } 783 }
784
784 private void LookupUUID(List<UUID> uuidLst) 785 private void LookupUUID(List<UUID> uuidLst)
785 { 786 {
786 LookupUUIDS d = LookupUUIDsAsync; 787 LookupUUIDS d = LookupUUIDsAsync;
@@ -789,6 +790,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
789 LookupUUIDSCompleted, 790 LookupUUIDSCompleted,
790 d); 791 d);
791 } 792 }
793
792 private void LookupUUIDsAsync(List<UUID> uuidLst) 794 private void LookupUUIDsAsync(List<UUID> uuidLst)
793 { 795 {
794 UUID[] uuidarr; 796 UUID[] uuidarr;
@@ -803,12 +805,12 @@ namespace OpenSim.Region.CoreModules.World.Estate
803 // string lookupname = m_scene.CommsManager.UUIDNameRequestString(uuidarr[i]); 805 // string lookupname = m_scene.CommsManager.UUIDNameRequestString(uuidarr[i]);
804 806
805 IUserManagement userManager = m_scene.RequestModuleInterface<IUserManagement>(); 807 IUserManagement userManager = m_scene.RequestModuleInterface<IUserManagement>();
806 string userName = "Unkown User";
807 if (userManager != null) 808 if (userManager != null)
808 userName = userManager.GetUserName(uuidarr[i]); 809 userManager.GetUserName(uuidarr[i]);
809 810
810 // we drop it. It gets cached though... so we're ready for the next request. 811 // we drop it. It gets cached though... so we're ready for the next request.
811 // diva commnent 11/21/2010: uh?!? wft? 812 // diva commnent 11/21/2010: uh?!? wft?
813 // justincc comment 21/01/2011: A side effect of userManager.GetUserName() I presume.
812 } 814 }
813 } 815 }
814 #endregion 816 #endregion