Merge branch 'master' of /home/opensim/var/repo/opensim

1 files changed, 54 insertions, 81 deletions

diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
index 37292d6..80ab30c 100644
--- a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
@@ -413,68 +413,71 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
             user.Id = uuid;
             user.FirstName = first;
             user.LastName = last;
-            // user.ProfileURL = we should initialize this to the default
 
             AddUserInternal(user);
         }
 
-        public void AddUser(UUID uuid, string first, string last, string profileURL)
+        public void AddUser(UUID uuid, string first, string last, string homeURL)
         {
-            AddUser(uuid, profileURL + ";" + first + " " + last);
+            AddUser(uuid, homeURL + ";" + first + " " + last);
         }
 
-        public void AddUser(UUID id, string creatorData)
+        public void AddUser (UUID id, string creatorData)
         {
-            lock (m_UserCache)
-            {
-                if (m_UserCache.ContainsKey(id))
-                    return;
-            }
-
-//            m_log.DebugFormat("[USER MANAGEMENT MODULE]: Adding user with id {0}, craetorData {1}", id, creatorData);
-
-            UserAccount account = m_Scenes[0].UserAccountService.GetUserAccount(m_Scenes[0].RegionInfo.ScopeID, id);
-
-            if (account != null)
-            {
-                AddUser(id, account.FirstName, account.LastName);
-            }
-            else
-            {
-                UserData user = new UserData();
-                user.Id = id;
-                user.Flags = -1;
-                user.Created = -1;
-
-                if (creatorData != null && creatorData != string.Empty)
-                {
-                    //creatorData = <endpoint>;<name>
-
-                    string[] parts = creatorData.Split(';');
-                    if (parts.Length >= 1)
-                    {
-                        user.HomeURL = parts[0];
-                        try
-                        {
-                            Uri uri = new Uri(parts[0]);
-                            user.LastName = "@" + uri.Authority;
-                        }
-                        catch (UriFormatException)
-                        {
-                            m_log.DebugFormat("[SCENE]: Unable to parse Uri {0}", parts[0]);
-                            user.LastName = "@unknown";
-                        }
+            UserData oldUser;
+            //lock the whole block - prevent concurrent update
+            lock (m_UserCache) {
+                m_UserCache.TryGetValue (id, out oldUser);
+                if (oldUser != null) {
+                    if (creatorData == null || creatorData == String.Empty) {
+                        //ignore updates without creator data
+                        return;
+                    }
+                    //try update unknown users
+                    //and creator's home URL's
+                    if ((oldUser.FirstName == "Unknown" && !creatorData.Contains ("Unknown")) || (oldUser.HomeURL != null && !creatorData.StartsWith (oldUser.HomeURL))) {
+                        m_UserCache.Remove (id);
+//                    m_log.DebugFormat("[USER MANAGEMENT MODULE]: Re-adding user with id {0}, creatorData [{1}] and old HomeURL {2}", id, creatorData,oldUser.HomeURL);
+                    } else {
+                        //we have already a valid user within the cache
+                        return;
                     }
-                    if (parts.Length >= 2)
-                        user.FirstName = parts[1].Replace(' ', '.');
                 }
-                else
-                {
-                    user.FirstName = "Unknown";
-                    user.LastName = "User";
+//                 m_log.DebugFormat("[USER MANAGEMENT MODULE]: Adding user with id {0}, creatorData {1}", id, creatorData);
+                
+                UserAccount account = m_Scenes[0].UserAccountService.GetUserAccount (m_Scenes[0].RegionInfo.ScopeID, id);
+                
+                if (account != null) {
+                    AddUser (id, account.FirstName, account.LastName);
+                } else {
+                    UserData user = new UserData ();
+                    user.Id = id;
+                    user.Flags = -1;
+                    user.Created = -1;
+                    
+                    if (creatorData != null && creatorData != string.Empty) {
+                        //creatorData = <endpoint>;<name>
+                        
+                        string[] parts = creatorData.Split (';');
+                        if (parts.Length >= 1) {
+                            user.HomeURL = parts[0];
+                            try {
+                                Uri uri = new Uri (parts[0]);
+                                user.LastName = "@" + uri.Authority;
+                            } catch (UriFormatException) {
+                                m_log.DebugFormat ("[SCENE]: Unable to parse Uri {0}", parts[0]);
+                                user.LastName = "@unknown";
+                            }
+                        }
+                        if (parts.Length >= 2)
+                            user.FirstName = parts[1].Replace (' ', '.');
+                    } else {
+                        user.FirstName = "Unknown";
+                        user.LastName = "User";
+                    }
+                    
+                    AddUserInternal (user);
                 }
-
-                AddUserInternal(user);
             }
         }
 
@@ -488,36 +491,6 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
 //                user.Id, user.FirstName, user.LastName, user.HomeURL);
         }
 
-        //public void AddUser(UUID uuid, string userData)
-        //{
-        //    if (m_UserCache.ContainsKey(uuid))
-        //        return;
-
-        //    UserData user = new UserData();
-        //    user.Id = uuid;
-
-        //    // userData = <profile url>;<name>
-        //    string[] parts = userData.Split(';');
-        //    if (parts.Length >= 1)
-        //        user.ProfileURL = parts[0].Trim();
-        //    if (parts.Length >= 2)
-        //    {
-        //        string[] name = parts[1].Trim().Split(' ');
-        //        if (name.Length >= 1)
-        //            user.FirstName = name[0];
-        //        if (name.Length >= 2)
-        //            user.LastName = name[1];
-        //        else
-        //            user.LastName = "?";
-        //    }
-
-        //    lock (m_UserCache)
-        //        m_UserCache.Add(uuid, user);
-
-        //    m_log.DebugFormat("[USER MANAGEMENT MODULE]: Added user {0} {1} {2} {3}", user.Id, user.FirstName, user.LastName, user.ProfileURL);
-
-        //}
-
         public bool IsLocalGridUser(UUID uuid)
         {
             UserAccount account = m_Scenes[0].UserAccountService.GetUserAccount(m_Scenes[0].RegionInfo.ScopeID, uuid);