aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorUbitUmarov2016-12-07 02:14:26 +0000
committerUbitUmarov2016-12-07 02:14:26 +0000
commitf1c6769ca5a2e49fcfa4aa17c27173af6b49df2f (patch)
tree7ef10184b8363ec3f25e3d90ce34574f4a48dd7d
parentif we have profile then npc is online (diff)
downloadopensim-SC-f1c6769ca5a2e49fcfa4aa17c27173af6b49df2f.zip
opensim-SC-f1c6769ca5a2e49fcfa4aa17c27173af6b49df2f.tar.gz
opensim-SC-f1c6769ca5a2e49fcfa4aa17c27173af6b49df2f.tar.bz2
opensim-SC-f1c6769ca5a2e49fcfa4aa17c27173af6b49df2f.tar.xz
set HasGridUserTried on usercache of NPCs
-rw-r--r--OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs4
-rwxr-xr-xOpenSim/Region/Framework/Scenes/Scene.cs2
-rw-r--r--OpenSim/Services/Interfaces/IUserManagement.cs2
3 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
index 5507526..2701912 100644
--- a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
@@ -805,7 +805,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
805 return !userdata.IsUnknownUser; 805 return !userdata.IsUnknownUser;
806 } 806 }
807 807
808 public virtual void AddUser(UUID uuid, string first, string last) 808 public virtual void AddUser(UUID uuid, string first, string last, bool isNPC = false)
809 { 809 {
810 lock(m_UserCache) 810 lock(m_UserCache)
811 { 811 {
@@ -816,7 +816,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
816 user.FirstName = first; 816 user.FirstName = first;
817 user.LastName = last; 817 user.LastName = last;
818 user.IsUnknownUser = false; 818 user.IsUnknownUser = false;
819 user.HasGridUserTried = false; 819 user.HasGridUserTried = isNPC;
820 m_UserCache.Add(uuid, user); 820 m_UserCache.Add(uuid, user);
821 } 821 }
822 } 822 }
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 09f0b19..e44f11a 100755
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -3226,7 +3226,7 @@ namespace OpenSim.Region.Framework.Scenes
3226 3226
3227 if (sp != null && sp.PresenceType == PresenceType.Npc) 3227 if (sp != null && sp.PresenceType == PresenceType.Npc)
3228 { 3228 {
3229 UserManagementModule.AddUser(aCircuit.AgentID, first, last); 3229 UserManagementModule.AddUser(aCircuit.AgentID, first, last, true);
3230 } 3230 }
3231 else 3231 else
3232 { 3232 {
diff --git a/OpenSim/Services/Interfaces/IUserManagement.cs b/OpenSim/Services/Interfaces/IUserManagement.cs
index 225560e..91b344e 100644
--- a/OpenSim/Services/Interfaces/IUserManagement.cs
+++ b/OpenSim/Services/Interfaces/IUserManagement.cs
@@ -79,7 +79,7 @@ namespace OpenSim.Services.Interfaces
79 /// <param name="uuid"></param> 79 /// <param name="uuid"></param>
80 /// <param name="firstName"></param> 80 /// <param name="firstName"></param>
81 /// <param name="lastName"></param> 81 /// <param name="lastName"></param>
82 void AddUser(UUID uuid, string firstName, string lastName); 82 void AddUser(UUID uuid, string first, string last, bool isNPC = false);
83 83
84 /// <summary> 84 /// <summary>
85 /// Add a user. 85 /// Add a user.