ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-13 05:05:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Change improperly named isNPC to be IsNPC as a property should be uppercase

Browse Source
This commit is contained in:
Melanie Thielker
2017-01-07 20:30:51 +00:00
parent c41616b771
commit 6d44ee9099
11 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
View File

@@ -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;

2
OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
View File

@@ -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)

8
OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
View File

@@ -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,

2
OpenSim/Region/CoreModules/ServiceConnectorsOut/GridUser/ActivityDetector.cs
View File

@@ -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)

2
OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/PresenceDetector.cs
View File

@@ -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)

2
OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
View File

@@ -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;

2
OpenSim/Region/CoreModules/World/Land/LandObject.cs
View File

@@ -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;