aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorUbitUmarov2018-10-20 14:04:11 +0100
committerUbitUmarov2018-10-20 14:04:11 +0100
commit6d063785bdc3bd8e8398c71f214dd25af965e588 (patch)
treee3005014b71d50c068fdf64c83e6252dd653c163
parentfix groups v2 agentUUI ofr uuid.zero case (diff)
downloadopensim-SC-6d063785bdc3bd8e8398c71f214dd25af965e588.zip
opensim-SC-6d063785bdc3bd8e8398c71f214dd25af965e588.tar.gz
opensim-SC-6d063785bdc3bd8e8398c71f214dd25af965e588.tar.bz2
opensim-SC-6d063785bdc3bd8e8398c71f214dd25af965e588.tar.xz
add RemoveUser to UserManagement
-rw-r--r--OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs13
-rw-r--r--OpenSim/Services/Interfaces/IUserManagement.cs2
2 files changed, 12 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
index 2695464..c82d45a 100644
--- a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
@@ -808,9 +808,9 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
808 808
809 public virtual void AddUser(UUID uuid, string first, string last, bool isNPC = false) 809 public virtual void AddUser(UUID uuid, string first, string last, bool isNPC = false)
810 { 810 {
811 lock(m_UserCache) 811 lock (m_UserCache)
812 { 812 {
813 if(!m_UserCache.ContainsKey(uuid)) 813 if (!m_UserCache.ContainsKey(uuid))
814 { 814 {
815 UserData user = new UserData(); 815 UserData user = new UserData();
816 user.Id = uuid; 816 user.Id = uuid;
@@ -954,6 +954,15 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
954 } 954 }
955 } 955 }
956 } 956 }
957
958 public bool RemoveUser(UUID uuid)
959 {
960 lock (m_UserCache)
961 {
962 return m_UserCache.Remove(uuid);
963 }
964 }
965
957 #endregion 966 #endregion
958 967
959 public virtual bool IsLocalGridUser(UUID uuid) 968 public virtual bool IsLocalGridUser(UUID uuid)
diff --git a/OpenSim/Services/Interfaces/IUserManagement.cs b/OpenSim/Services/Interfaces/IUserManagement.cs
index 91b344e..3bdf86d 100644
--- a/OpenSim/Services/Interfaces/IUserManagement.cs
+++ b/OpenSim/Services/Interfaces/IUserManagement.cs
@@ -92,7 +92,7 @@ namespace OpenSim.Services.Interfaces
92 /// <param name="firstName"></param> 92 /// <param name="firstName"></param>
93 /// <param name="profileURL"></param> 93 /// <param name="profileURL"></param>
94 void AddUser(UUID uuid, string firstName, string lastName, string homeURL); 94 void AddUser(UUID uuid, string firstName, string lastName, string homeURL);
95 95 bool RemoveUser(UUID uuid);
96 bool IsLocalGridUser(UUID uuid); 96 bool IsLocalGridUser(UUID uuid);
97 } 97 }
98} 98}