aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs4
-rwxr-xr-xOpenSim/Region/Framework/Scenes/Scene.cs2
2 files changed, 3 insertions, 3 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 {