From 6d44ee90991e1594d2072a5016d1b3b767220140 Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Sat, 7 Jan 2017 20:30:51 +0000
Subject: Change improperly named isNPC to be IsNPC as a property should be
 uppercase

---
 .../CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs       | 6 +++---
 OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs              | 2 +-
 .../Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs   | 8 ++++----
 .../CoreModules/ServiceConnectorsOut/GridUser/ActivityDetector.cs | 2 +-
 .../CoreModules/ServiceConnectorsOut/Presence/PresenceDetector.cs | 2 +-
 OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs     | 2 +-
 OpenSim/Region/CoreModules/World/Land/LandObject.cs               | 2 +-
 7 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'OpenSim/Region/CoreModules')

diff --git a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
index 0826a08..fb408a4 100644
--- a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
@@ -364,7 +364,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
                 return false;
 
             // npcs dont have baked cache
-            if (((ScenePresence)sp).isNPC)
+            if (((ScenePresence)sp).IsNPC)
                 return true;
 
             // uploaded baked textures will be in assets local cache
@@ -507,7 +507,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
         {
             int hits = 0;
 
-            if (((ScenePresence)sp).isNPC)
+            if (((ScenePresence)sp).IsNPC)
                 return true;
 
             lock (m_setAppearanceLock)
@@ -701,7 +701,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
 
         public int RequestRebake(IScenePresence sp, bool missingTexturesOnly)
         {
-            if (((ScenePresence)sp).isNPC)
+            if (((ScenePresence)sp).IsNPC)
                 return 0;
 
             int texturesRebaked = 0;
diff --git a/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs b/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
index 904c8c8..bb571d0 100644
--- a/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
@@ -165,7 +165,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Gods
             UUID agentID, UUID sessionID, UUID token, bool godLike)
         {
             ScenePresence sp = m_scene.GetScenePresence(agentID);
-            if(sp == null || sp.IsDeleted || sp.isNPC)
+            if(sp == null || sp.IsDeleted || sp.IsNPC)
                 return;
 
             if (sessionID != sp.ControllingClient.SessionId)
diff --git a/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs b/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
index 138c0f7..bc8aeca 100644
--- a/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
@@ -356,7 +356,7 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles
                 return;
 
             ScenePresence p = FindPresence(targetID);
-            if (p != null && p.isNPC)
+            if (p != null && p.IsNPC)
             {
                 remoteClient.SendAvatarClassifiedReply(targetID, classifieds);
                 return;
@@ -751,7 +751,7 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles
             Dictionary<UUID, string> picks = new Dictionary<UUID, string>();
 
             ScenePresence p = FindPresence(targetId);
-            if (p != null && p.isNPC)
+            if (p != null && p.IsNPC)
             {
                 remoteClient.SendAvatarPicksReply(targetId, picks);
                 return;
@@ -1165,7 +1165,7 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles
         public void NotesUpdate(IClientAPI remoteClient, UUID queryTargetID, string queryNotes)
         {
             ScenePresence p = FindPresence(queryTargetID);
-            if (p != null && p.isNPC)
+            if (p != null && p.IsNPC)
             {
                 remoteClient.SendAgentAlertMessage(
                         "Notes for NPCs not available", false);
@@ -1329,7 +1329,7 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles
             }
 
             ScenePresence p = FindPresence(avatarID);
-            if (p != null && p.isNPC)
+            if (p != null && p.IsNPC)
             {
                 remoteClient.SendAvatarProperties(avatarID, ((INPC)(p.ControllingClient)).profileAbout, ((INPC)(p.ControllingClient)).Born,
                       Utils.StringToBytes("Non Player Character (NPC)"), "NPCs have no life", 0x10,
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/GridUser/ActivityDetector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/GridUser/ActivityDetector.cs
index c780bcd..1529fc2 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/GridUser/ActivityDetector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/GridUser/ActivityDetector.cs
@@ -65,7 +65,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.GridUser
 
        public void OnMakeRootAgent(ScenePresence sp)
        {
-            if (sp.isNPC)
+            if (sp.IsNPC)
                 return;
 
             if(sp.gotCrossUpdate)
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/PresenceDetector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/PresenceDetector.cs
index aafd047..a7e62eb 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/PresenceDetector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/PresenceDetector.cs
@@ -68,7 +68,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Presence
 
         public void OnMakeRootAgent(ScenePresence sp)
         {
-            if (sp.isNPC)
+            if (sp.IsNPC)
                 return;
 
             if(sp.gotCrossUpdate)
diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
index 0122f47..5d12f8b 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
@@ -1285,7 +1285,7 @@ namespace OpenSim.Region.CoreModules.World.Land
                 UUID parcelID = land.LandData.GlobalID;
                 m_scene.ForEachScenePresence(delegate(ScenePresence avatar)
                 {
-                    if (avatar.IsDeleted || avatar.isNPC)
+                    if (avatar.IsDeleted || avatar.IsNPC)
                         return;
 
                     IClientAPI client = avatar.ControllingClient;
diff --git a/OpenSim/Region/CoreModules/World/Land/LandObject.cs b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
index fc2282d..73b4cb5 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandObject.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
@@ -718,7 +718,7 @@ namespace OpenSim.Region.CoreModules.World.Land
             if (!m_scene.TryGetScenePresence(avatar, out sp))
                 return true;
 
-            if(sp==null || !sp.isNPC)
+            if(sp==null || !sp.IsNPC)
                 return true;
 
             INPC npccli = (INPC)sp.ControllingClient;
-- 
cgit v1.1