aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.cs
diff options
context:
space:
mode:
authorDiva Canto2010-01-09 09:09:32 -0800
committerDiva Canto2010-01-09 09:09:32 -0800
commit25fdbd6cbcfc857c444042745d7d4fa8e495a982 (patch)
treed3b1479ca58d2348ba83b422dcfb5abb0bb58766 /OpenSim/Region/Framework/Scenes/Scene.cs
parentA few more inches... Old friends things removed. Less references to UserProfi... (diff)
downloadopensim-SC_OLD-25fdbd6cbcfc857c444042745d7d4fa8e495a982.zip
opensim-SC_OLD-25fdbd6cbcfc857c444042745d7d4fa8e495a982.tar.gz
opensim-SC_OLD-25fdbd6cbcfc857c444042745d7d4fa8e495a982.tar.bz2
opensim-SC_OLD-25fdbd6cbcfc857c444042745d7d4fa8e495a982.tar.xz
Less refs to UserProfileCacheService. Compiles but likely doesn't run.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs34
1 files changed, 32 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index ef62b79..90d476e 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -841,6 +841,36 @@ namespace OpenSim.Region.Framework.Scenes
841 return m_simulatorVersion; 841 return m_simulatorVersion;
842 } 842 }
843 843
844 public string[] GetUserNames(UUID uuid)
845 {
846 string[] returnstring = new string[0];
847
848 UserAccount account = UserAccountService.GetUserAccount(RegionInfo.ScopeID, uuid);
849
850 if (account != null)
851 {
852 returnstring = new string[2];
853 returnstring[0] = account.FirstName;
854 returnstring[1] = account.LastName;
855 }
856
857 return returnstring;
858 }
859
860 public string GetUserName(UUID uuid)
861 {
862 string[] names = GetUserNames(uuid);
863 if (names.Length == 2)
864 {
865 string firstname = names[0];
866 string lastname = names[1];
867
868 return firstname + " " + lastname;
869
870 }
871 return "(hippos)";
872 }
873
844 /// <summary> 874 /// <summary>
845 /// Another region is up. 875 /// Another region is up.
846 /// 876 ///
@@ -2804,7 +2834,7 @@ namespace OpenSim.Region.Framework.Scenes
2804 2834
2805 public virtual void SubscribeToClientGridEvents(IClientAPI client) 2835 public virtual void SubscribeToClientGridEvents(IClientAPI client)
2806 { 2836 {
2807 client.OnNameFromUUIDRequest += CommsManager.HandleUUIDNameRequest; 2837 client.OnNameFromUUIDRequest += HandleUUIDNameRequest;
2808 client.OnMoneyTransferRequest += ProcessMoneyTransferRequest; 2838 client.OnMoneyTransferRequest += ProcessMoneyTransferRequest;
2809 client.OnAvatarPickerRequest += ProcessAvatarPickerRequest; 2839 client.OnAvatarPickerRequest += ProcessAvatarPickerRequest;
2810 client.OnSetStartLocationRequest += SetHomeRezPoint; 2840 client.OnSetStartLocationRequest += SetHomeRezPoint;
@@ -2959,7 +2989,7 @@ namespace OpenSim.Region.Framework.Scenes
2959 2989
2960 public virtual void UnSubscribeToClientGridEvents(IClientAPI client) 2990 public virtual void UnSubscribeToClientGridEvents(IClientAPI client)
2961 { 2991 {
2962 client.OnNameFromUUIDRequest -= CommsManager.HandleUUIDNameRequest; 2992 client.OnNameFromUUIDRequest -= HandleUUIDNameRequest;
2963 client.OnMoneyTransferRequest -= ProcessMoneyTransferRequest; 2993 client.OnMoneyTransferRequest -= ProcessMoneyTransferRequest;
2964 client.OnAvatarPickerRequest -= ProcessAvatarPickerRequest; 2994 client.OnAvatarPickerRequest -= ProcessAvatarPickerRequest;
2965 client.OnSetStartLocationRequest -= SetHomeRezPoint; 2995 client.OnSetStartLocationRequest -= SetHomeRezPoint;