aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie Thielker2017-01-07 20:30:51 +0000
committerMelanie Thielker2017-01-07 20:30:51 +0000
commit6d44ee90991e1594d2072a5016d1b3b767220140 (patch)
tree75a741b5a2e7aa446488a8eb8ed296459cb097aa
parentignore teleport flag GodLike. Perform checks acording to agent static (diff)
downloadopensim-SC_OLD-6d44ee90991e1594d2072a5016d1b3b767220140.zip
opensim-SC_OLD-6d44ee90991e1594d2072a5016d1b3b767220140.tar.gz
opensim-SC_OLD-6d44ee90991e1594d2072a5016d1b3b767220140.tar.bz2
opensim-SC_OLD-6d44ee90991e1594d2072a5016d1b3b767220140.tar.xz
Change improperly named isNPC to be IsNPC as a property should be uppercase
-rw-r--r--OpenSim/Framework/ISceneAgent.cs4
-rw-r--r--OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs6
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs2
-rw-r--r--OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs8
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/GridUser/ActivityDetector.cs2
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/PresenceDetector.cs2
-rw-r--r--OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs2
-rw-r--r--OpenSim/Region/CoreModules/World/Land/LandObject.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs22
11 files changed, 27 insertions, 27 deletions
diff --git a/OpenSim/Framework/ISceneAgent.cs b/OpenSim/Framework/ISceneAgent.cs
index 5534e24..5d70b83 100644
--- a/OpenSim/Framework/ISceneAgent.cs
+++ b/OpenSim/Framework/ISceneAgent.cs
@@ -56,7 +56,7 @@ namespace OpenSim.Framework
56 bool IsChildAgent { get; } 56 bool IsChildAgent { get; }
57 57
58 bool IsInTransit { get; } 58 bool IsInTransit { get; }
59 bool isNPC { get;} 59 bool IsNPC { get;}
60 60
61 bool Invulnerable { get; set; } 61 bool Invulnerable { get; set; }
62 /// <summary> 62 /// <summary>
@@ -83,4 +83,4 @@ namespace OpenSim.Framework
83 /// <remarks>Will be Vector3.Zero for a child agent.</remarks> 83 /// <remarks>Will be Vector3.Zero for a child agent.</remarks>
84 Vector3 Lookat { get; } 84 Vector3 Lookat { get; }
85 } 85 }
86} \ No newline at end of file 86}
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;
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 8fdb0f1..5928764 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -2302,7 +2302,7 @@ namespace OpenSim.Region.Framework.Scenes
2302 List<ScenePresence> sitters = GetSittingAvatars(); 2302 List<ScenePresence> sitters = GetSittingAvatars();
2303 foreach(ScenePresence sp in sitters) 2303 foreach(ScenePresence sp in sitters)
2304 { 2304 {
2305 if(!sp.IsDeleted && !sp.isNPC && sp.IsSatOnObject) 2305 if(!sp.IsDeleted && !sp.IsNPC && sp.IsSatOnObject)
2306 return; 2306 return;
2307 } 2307 }
2308 } 2308 }
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 99be06b..b8ac089 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -2723,7 +2723,7 @@ namespace OpenSim.Region.Framework.Scenes
2723 detobj.posVector = av.AbsolutePosition; 2723 detobj.posVector = av.AbsolutePosition;
2724 detobj.rotQuat = av.Rotation; 2724 detobj.rotQuat = av.Rotation;
2725 detobj.velVector = av.Velocity; 2725 detobj.velVector = av.Velocity;
2726 detobj.colliderType = av.isNPC ? 0x20 : 0x1; // OpenSim\Region\ScriptEngine\Shared\Helpers.cs 2726 detobj.colliderType = av.IsNPC ? 0x20 : 0x1; // OpenSim\Region\ScriptEngine\Shared\Helpers.cs
2727 if(av.IsSatOnObject) 2727 if(av.IsSatOnObject)
2728 detobj.colliderType |= 0x4; //passive 2728 detobj.colliderType |= 0x4; //passive
2729 else if(detobj.velVector != Vector3.Zero) 2729 else if(detobj.velVector != Vector3.Zero)
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index c38e8fc..58af505 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -90,7 +90,7 @@ namespace OpenSim.Region.Framework.Scenes
90 m_scene.EventManager.TriggerScenePresenceUpdated(this); 90 m_scene.EventManager.TriggerScenePresenceUpdated(this);
91 } 91 }
92 92
93 public bool isNPC { get; private set; } 93 public bool IsNPC { get; private set; }
94 94
95 // simple yes or no isGOD from god level >= 200 95 // simple yes or no isGOD from god level >= 200
96 // should only be set by GodController 96 // should only be set by GodController
@@ -106,7 +106,7 @@ namespace OpenSim.Region.Framework.Scenes
106 private set 106 private set
107 { 107 {
108 m_presenceType = value; 108 m_presenceType = value;
109 isNPC = (m_presenceType == PresenceType.Npc); 109 IsNPC = (m_presenceType == PresenceType.Npc);
110 } 110 }
111 } 111 }
112 112
@@ -1974,7 +1974,7 @@ namespace OpenSim.Region.Framework.Scenes
1974 try 1974 try
1975 { 1975 {
1976 // Make sure it's not a login agent. We don't want to wait for updates during login 1976 // Make sure it's not a login agent. We don't want to wait for updates during login
1977 if (!isNPC && !IsRealLogin(m_teleportFlags)) 1977 if (!IsNPC && !IsRealLogin(m_teleportFlags))
1978 { 1978 {
1979 1979
1980 // Let's wait until UpdateAgent (called by departing region) is done 1980 // Let's wait until UpdateAgent (called by departing region) is done
@@ -2012,7 +2012,7 @@ namespace OpenSim.Region.Framework.Scenes
2012 2012
2013 m_log.DebugFormat("[CompleteMovement] MakeRootAgent: {0}ms", Util.EnvironmentTickCountSubtract(ts)); 2013 m_log.DebugFormat("[CompleteMovement] MakeRootAgent: {0}ms", Util.EnvironmentTickCountSubtract(ts));
2014 2014
2015 if(!haveGroupInformation && !IsChildAgent && !isNPC) 2015 if(!haveGroupInformation && !IsChildAgent && !IsNPC)
2016 { 2016 {
2017 IGroupsModule gm = m_scene.RequestModuleInterface<IGroupsModule>(); 2017 IGroupsModule gm = m_scene.RequestModuleInterface<IGroupsModule>();
2018 if (gm != null) 2018 if (gm != null)
@@ -2086,7 +2086,7 @@ namespace OpenSim.Region.Framework.Scenes
2086 m_currentParcelHide = false; 2086 m_currentParcelHide = false;
2087 m_currentParcelUUID = UUID.Zero; 2087 m_currentParcelUUID = UUID.Zero;
2088 2088
2089 if(!isNPC) 2089 if(!IsNPC)
2090 { 2090 {
2091 GodController.SyncViewerState(); 2091 GodController.SyncViewerState();
2092 2092
@@ -2104,7 +2104,7 @@ namespace OpenSim.Region.Framework.Scenes
2104 // verify baked textures and cache 2104 // verify baked textures and cache
2105 bool cachedbaked = false; 2105 bool cachedbaked = false;
2106 2106
2107 if (isNPC) 2107 if (IsNPC)
2108 cachedbaked = true; 2108 cachedbaked = true;
2109 else 2109 else
2110 { 2110 {
@@ -2168,14 +2168,14 @@ namespace OpenSim.Region.Framework.Scenes
2168 m_log.DebugFormat("[CompleteMovement] ValidateAndSendAppearanceAndAgentData: {0}ms", Util.EnvironmentTickCountSubtract(ts)); 2168 m_log.DebugFormat("[CompleteMovement] ValidateAndSendAppearanceAndAgentData: {0}ms", Util.EnvironmentTickCountSubtract(ts));
2169 2169
2170 // attachments 2170 // attachments
2171 if (isNPC || IsRealLogin(m_teleportFlags)) 2171 if (IsNPC || IsRealLogin(m_teleportFlags))
2172 { 2172 {
2173 if (Scene.AttachmentsModule != null) 2173 if (Scene.AttachmentsModule != null)
2174 // Util.FireAndForget( 2174 // Util.FireAndForget(
2175 // o => 2175 // o =>
2176 // { 2176 // {
2177 2177
2178 if (!isNPC) 2178 if (!IsNPC)
2179 Scene.AttachmentsModule.RezAttachments(this); 2179 Scene.AttachmentsModule.RezAttachments(this);
2180 else 2180 else
2181 Util.FireAndForget(x => 2181 Util.FireAndForget(x =>
@@ -2235,7 +2235,7 @@ namespace OpenSim.Region.Framework.Scenes
2235 m_log.DebugFormat("[CompleteMovement] openChildAgents: {0}ms", Util.EnvironmentTickCountSubtract(ts)); 2235 m_log.DebugFormat("[CompleteMovement] openChildAgents: {0}ms", Util.EnvironmentTickCountSubtract(ts));
2236 2236
2237 // send the rest of the world 2237 // send the rest of the world
2238 if (m_teleportFlags > 0 && !isNPC || m_currentParcelHide) 2238 if (m_teleportFlags > 0 && !IsNPC || m_currentParcelHide)
2239 SendInitialDataToMe(); 2239 SendInitialDataToMe();
2240 2240
2241 // priority uses avatar position only 2241 // priority uses avatar position only
@@ -4470,7 +4470,7 @@ namespace OpenSim.Region.Framework.Scenes
4470 /// </summary> 4470 /// </summary>
4471 public void GrantGodlikePowers(UUID token, bool godStatus) 4471 public void GrantGodlikePowers(UUID token, bool godStatus)
4472 { 4472 {
4473 if (isNPC) 4473 if (IsNPC)
4474 return; 4474 return;
4475 4475
4476 bool wasgod = isViewerUIGod; 4476 bool wasgod = isViewerUIGod;
@@ -6194,7 +6194,7 @@ namespace OpenSim.Region.Framework.Scenes
6194 detobj.posVector = av.AbsolutePosition; 6194 detobj.posVector = av.AbsolutePosition;
6195 detobj.rotQuat = av.Rotation; 6195 detobj.rotQuat = av.Rotation;
6196 detobj.velVector = av.Velocity; 6196 detobj.velVector = av.Velocity;
6197 detobj.colliderType = av.isNPC ? 0x20 : 0x1; // OpenSim\Region\ScriptEngine\Shared\Helpers.cs 6197 detobj.colliderType = av.IsNPC ? 0x20 : 0x1; // OpenSim\Region\ScriptEngine\Shared\Helpers.cs
6198 if(av.IsSatOnObject) 6198 if(av.IsSatOnObject)
6199 detobj.colliderType |= 0x4; //passive 6199 detobj.colliderType |= 0x4; //passive
6200 else if(detobj.velVector != Vector3.Zero) 6200 else if(detobj.velVector != Vector3.Zero)