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/Framework/Scenes | |
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 '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 22 |
3 files changed, 13 insertions, 13 deletions
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) |