diff options
author | Melanie Thielker | 2017-01-07 20:30:51 +0000 |
---|---|---|
committer | Melanie Thielker | 2017-01-07 20:30:51 +0000 |
commit | 6d44ee90991e1594d2072a5016d1b3b767220140 (patch) | |
tree | 75a741b5a2e7aa446488a8eb8ed296459cb097aa /OpenSim/Region/CoreModules | |
parent | ignore teleport flag GodLike. Perform checks acording to agent static (diff) | |
download | opensim-SC-6d44ee90991e1594d2072a5016d1b3b767220140.zip opensim-SC-6d44ee90991e1594d2072a5016d1b3b767220140.tar.gz opensim-SC-6d44ee90991e1594d2072a5016d1b3b767220140.tar.bz2 opensim-SC-6d44ee90991e1594d2072a5016d1b3b767220140.tar.xz |
Change improperly named isNPC to be IsNPC as a property should be uppercase
Diffstat (limited to 'OpenSim/Region/CoreModules')
7 files changed, 12 insertions, 12 deletions
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 | |||
364 | return false; | 364 | return false; |
365 | 365 | ||
366 | // npcs dont have baked cache | 366 | // npcs dont have baked cache |
367 | if (((ScenePresence)sp).isNPC) | 367 | if (((ScenePresence)sp).IsNPC) |
368 | return true; | 368 | return true; |
369 | 369 | ||
370 | // uploaded baked textures will be in assets local cache | 370 | // uploaded baked textures will be in assets local cache |
@@ -507,7 +507,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory | |||
507 | { | 507 | { |
508 | int hits = 0; | 508 | int hits = 0; |
509 | 509 | ||
510 | if (((ScenePresence)sp).isNPC) | 510 | if (((ScenePresence)sp).IsNPC) |
511 | return true; | 511 | return true; |
512 | 512 | ||
513 | lock (m_setAppearanceLock) | 513 | lock (m_setAppearanceLock) |
@@ -701,7 +701,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory | |||
701 | 701 | ||
702 | public int RequestRebake(IScenePresence sp, bool missingTexturesOnly) | 702 | public int RequestRebake(IScenePresence sp, bool missingTexturesOnly) |
703 | { | 703 | { |
704 | if (((ScenePresence)sp).isNPC) | 704 | if (((ScenePresence)sp).IsNPC) |
705 | return 0; | 705 | return 0; |
706 | 706 | ||
707 | int texturesRebaked = 0; | 707 | 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 | |||
165 | UUID agentID, UUID sessionID, UUID token, bool godLike) | 165 | UUID agentID, UUID sessionID, UUID token, bool godLike) |
166 | { | 166 | { |
167 | ScenePresence sp = m_scene.GetScenePresence(agentID); | 167 | ScenePresence sp = m_scene.GetScenePresence(agentID); |
168 | if(sp == null || sp.IsDeleted || sp.isNPC) | 168 | if(sp == null || sp.IsDeleted || sp.IsNPC) |
169 | return; | 169 | return; |
170 | 170 | ||
171 | if (sessionID != sp.ControllingClient.SessionId) | 171 | 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 | |||
356 | return; | 356 | return; |
357 | 357 | ||
358 | ScenePresence p = FindPresence(targetID); | 358 | ScenePresence p = FindPresence(targetID); |
359 | if (p != null && p.isNPC) | 359 | if (p != null && p.IsNPC) |
360 | { | 360 | { |
361 | remoteClient.SendAvatarClassifiedReply(targetID, classifieds); | 361 | remoteClient.SendAvatarClassifiedReply(targetID, classifieds); |
362 | return; | 362 | return; |
@@ -751,7 +751,7 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles | |||
751 | Dictionary<UUID, string> picks = new Dictionary<UUID, string>(); | 751 | Dictionary<UUID, string> picks = new Dictionary<UUID, string>(); |
752 | 752 | ||
753 | ScenePresence p = FindPresence(targetId); | 753 | ScenePresence p = FindPresence(targetId); |
754 | if (p != null && p.isNPC) | 754 | if (p != null && p.IsNPC) |
755 | { | 755 | { |
756 | remoteClient.SendAvatarPicksReply(targetId, picks); | 756 | remoteClient.SendAvatarPicksReply(targetId, picks); |
757 | return; | 757 | return; |
@@ -1165,7 +1165,7 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles | |||
1165 | public void NotesUpdate(IClientAPI remoteClient, UUID queryTargetID, string queryNotes) | 1165 | public void NotesUpdate(IClientAPI remoteClient, UUID queryTargetID, string queryNotes) |
1166 | { | 1166 | { |
1167 | ScenePresence p = FindPresence(queryTargetID); | 1167 | ScenePresence p = FindPresence(queryTargetID); |
1168 | if (p != null && p.isNPC) | 1168 | if (p != null && p.IsNPC) |
1169 | { | 1169 | { |
1170 | remoteClient.SendAgentAlertMessage( | 1170 | remoteClient.SendAgentAlertMessage( |
1171 | "Notes for NPCs not available", false); | 1171 | "Notes for NPCs not available", false); |
@@ -1329,7 +1329,7 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles | |||
1329 | } | 1329 | } |
1330 | 1330 | ||
1331 | ScenePresence p = FindPresence(avatarID); | 1331 | ScenePresence p = FindPresence(avatarID); |
1332 | if (p != null && p.isNPC) | 1332 | if (p != null && p.IsNPC) |
1333 | { | 1333 | { |
1334 | remoteClient.SendAvatarProperties(avatarID, ((INPC)(p.ControllingClient)).profileAbout, ((INPC)(p.ControllingClient)).Born, | 1334 | remoteClient.SendAvatarProperties(avatarID, ((INPC)(p.ControllingClient)).profileAbout, ((INPC)(p.ControllingClient)).Born, |
1335 | Utils.StringToBytes("Non Player Character (NPC)"), "NPCs have no life", 0x10, | 1335 | 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 | |||
65 | 65 | ||
66 | public void OnMakeRootAgent(ScenePresence sp) | 66 | public void OnMakeRootAgent(ScenePresence sp) |
67 | { | 67 | { |
68 | if (sp.isNPC) | 68 | if (sp.IsNPC) |
69 | return; | 69 | return; |
70 | 70 | ||
71 | if(sp.gotCrossUpdate) | 71 | 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 | |||
68 | 68 | ||
69 | public void OnMakeRootAgent(ScenePresence sp) | 69 | public void OnMakeRootAgent(ScenePresence sp) |
70 | { | 70 | { |
71 | if (sp.isNPC) | 71 | if (sp.IsNPC) |
72 | return; | 72 | return; |
73 | 73 | ||
74 | if(sp.gotCrossUpdate) | 74 | 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 | |||
1285 | UUID parcelID = land.LandData.GlobalID; | 1285 | UUID parcelID = land.LandData.GlobalID; |
1286 | m_scene.ForEachScenePresence(delegate(ScenePresence avatar) | 1286 | m_scene.ForEachScenePresence(delegate(ScenePresence avatar) |
1287 | { | 1287 | { |
1288 | if (avatar.IsDeleted || avatar.isNPC) | 1288 | if (avatar.IsDeleted || avatar.IsNPC) |
1289 | return; | 1289 | return; |
1290 | 1290 | ||
1291 | IClientAPI client = avatar.ControllingClient; | 1291 | 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 | |||
718 | if (!m_scene.TryGetScenePresence(avatar, out sp)) | 718 | if (!m_scene.TryGetScenePresence(avatar, out sp)) |
719 | return true; | 719 | return true; |
720 | 720 | ||
721 | if(sp==null || !sp.isNPC) | 721 | if(sp==null || !sp.IsNPC) |
722 | return true; | 722 | return true; |
723 | 723 | ||
724 | INPC npccli = (INPC)sp.ControllingClient; | 724 | INPC npccli = (INPC)sp.ControllingClient; |