From 6d44ee90991e1594d2072a5016d1b3b767220140 Mon Sep 17 00:00:00 2001 From: Melanie Thielker Date: Sat, 7 Jan 2017 20:30:51 +0000 Subject: [PATCH] Change improperly named isNPC to be IsNPC as a property should be uppercase --- OpenSim/Framework/ISceneAgent.cs | 4 ++-- .../AvatarFactory/AvatarFactoryModule.cs | 6 ++--- .../CoreModules/Avatar/Gods/GodsModule.cs | 2 +- .../Avatar/UserProfiles/UserProfileModule.cs | 8 +++---- .../GridUser/ActivityDetector.cs | 2 +- .../Presence/PresenceDetector.cs | 2 +- .../World/Land/LandManagementModule.cs | 2 +- .../CoreModules/World/Land/LandObject.cs | 2 +- .../Framework/Scenes/SceneObjectGroup.cs | 2 +- .../Framework/Scenes/SceneObjectPart.cs | 2 +- .../Region/Framework/Scenes/ScenePresence.cs | 22 +++++++++---------- 11 files changed, 27 insertions(+), 27 deletions(-) diff --git a/OpenSim/Framework/ISceneAgent.cs b/OpenSim/Framework/ISceneAgent.cs index 5534e24eaf..5d70b83357 100644 --- a/OpenSim/Framework/ISceneAgent.cs +++ b/OpenSim/Framework/ISceneAgent.cs @@ -56,7 +56,7 @@ namespace OpenSim.Framework bool IsChildAgent { get; } bool IsInTransit { get; } - bool isNPC { get;} + bool IsNPC { get;} bool Invulnerable { get; set; } /// @@ -83,4 +83,4 @@ namespace OpenSim.Framework /// Will be Vector3.Zero for a child agent. Vector3 Lookat { get; } } -} \ No newline at end of file +} diff --git a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs index 0826a08152..fb408a402d 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 904c8c8306..bb571d0a20 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 138c0f7496..bc8aeca002 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 picks = new Dictionary(); 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 c780bcde6c..1529fc2764 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 aafd047a2d..a7e62eb755 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 0122f47e30..5d12f8b31a 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 fc2282dd2a..73b4cb57a0 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; diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index 8fdb0f1370..5928764a24 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs @@ -2302,7 +2302,7 @@ namespace OpenSim.Region.Framework.Scenes List sitters = GetSittingAvatars(); foreach(ScenePresence sp in sitters) { - if(!sp.IsDeleted && !sp.isNPC && sp.IsSatOnObject) + if(!sp.IsDeleted && !sp.IsNPC && sp.IsSatOnObject) return; } } diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index 99be06bd01..b8ac089826 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs @@ -2723,7 +2723,7 @@ namespace OpenSim.Region.Framework.Scenes detobj.posVector = av.AbsolutePosition; detobj.rotQuat = av.Rotation; detobj.velVector = av.Velocity; - detobj.colliderType = av.isNPC ? 0x20 : 0x1; // OpenSim\Region\ScriptEngine\Shared\Helpers.cs + detobj.colliderType = av.IsNPC ? 0x20 : 0x1; // OpenSim\Region\ScriptEngine\Shared\Helpers.cs if(av.IsSatOnObject) detobj.colliderType |= 0x4; //passive else if(detobj.velVector != Vector3.Zero) diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index c38e8fc675..58af505a43 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs @@ -90,7 +90,7 @@ namespace OpenSim.Region.Framework.Scenes m_scene.EventManager.TriggerScenePresenceUpdated(this); } - public bool isNPC { get; private set; } + public bool IsNPC { get; private set; } // simple yes or no isGOD from god level >= 200 // should only be set by GodController @@ -106,7 +106,7 @@ namespace OpenSim.Region.Framework.Scenes private set { m_presenceType = value; - isNPC = (m_presenceType == PresenceType.Npc); + IsNPC = (m_presenceType == PresenceType.Npc); } } @@ -1974,7 +1974,7 @@ namespace OpenSim.Region.Framework.Scenes try { // Make sure it's not a login agent. We don't want to wait for updates during login - if (!isNPC && !IsRealLogin(m_teleportFlags)) + if (!IsNPC && !IsRealLogin(m_teleportFlags)) { // Let's wait until UpdateAgent (called by departing region) is done @@ -2012,7 +2012,7 @@ namespace OpenSim.Region.Framework.Scenes m_log.DebugFormat("[CompleteMovement] MakeRootAgent: {0}ms", Util.EnvironmentTickCountSubtract(ts)); - if(!haveGroupInformation && !IsChildAgent && !isNPC) + if(!haveGroupInformation && !IsChildAgent && !IsNPC) { IGroupsModule gm = m_scene.RequestModuleInterface(); if (gm != null) @@ -2086,7 +2086,7 @@ namespace OpenSim.Region.Framework.Scenes m_currentParcelHide = false; m_currentParcelUUID = UUID.Zero; - if(!isNPC) + if(!IsNPC) { GodController.SyncViewerState(); @@ -2104,7 +2104,7 @@ namespace OpenSim.Region.Framework.Scenes // verify baked textures and cache bool cachedbaked = false; - if (isNPC) + if (IsNPC) cachedbaked = true; else { @@ -2168,14 +2168,14 @@ namespace OpenSim.Region.Framework.Scenes m_log.DebugFormat("[CompleteMovement] ValidateAndSendAppearanceAndAgentData: {0}ms", Util.EnvironmentTickCountSubtract(ts)); // attachments - if (isNPC || IsRealLogin(m_teleportFlags)) + if (IsNPC || IsRealLogin(m_teleportFlags)) { if (Scene.AttachmentsModule != null) // Util.FireAndForget( // o => // { - if (!isNPC) + if (!IsNPC) Scene.AttachmentsModule.RezAttachments(this); else Util.FireAndForget(x => @@ -2235,7 +2235,7 @@ namespace OpenSim.Region.Framework.Scenes m_log.DebugFormat("[CompleteMovement] openChildAgents: {0}ms", Util.EnvironmentTickCountSubtract(ts)); // send the rest of the world - if (m_teleportFlags > 0 && !isNPC || m_currentParcelHide) + if (m_teleportFlags > 0 && !IsNPC || m_currentParcelHide) SendInitialDataToMe(); // priority uses avatar position only @@ -4470,7 +4470,7 @@ namespace OpenSim.Region.Framework.Scenes /// public void GrantGodlikePowers(UUID token, bool godStatus) { - if (isNPC) + if (IsNPC) return; bool wasgod = isViewerUIGod; @@ -6194,7 +6194,7 @@ namespace OpenSim.Region.Framework.Scenes detobj.posVector = av.AbsolutePosition; detobj.rotQuat = av.Rotation; detobj.velVector = av.Velocity; - detobj.colliderType = av.isNPC ? 0x20 : 0x1; // OpenSim\Region\ScriptEngine\Shared\Helpers.cs + detobj.colliderType = av.IsNPC ? 0x20 : 0x1; // OpenSim\Region\ScriptEngine\Shared\Helpers.cs if(av.IsSatOnObject) detobj.colliderType |= 0x4; //passive else if(detobj.velVector != Vector3.Zero)