diff options
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 0c2f991..d8478a2 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -994,9 +994,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
994 | 994 | ||
995 | // Loop it | 995 | // Loop it |
996 | if (m_frame == Int32.MaxValue) | 996 | if (m_frame == Int32.MaxValue) |
997 | m_frame = 0; | 997 | m_frame = 0; |
998 | |||
999 | |||
1000 | 998 | ||
1001 | otherMS = Environment.TickCount; | 999 | otherMS = Environment.TickCount; |
1002 | // run through all entities looking for updates (slow) | 1000 | // run through all entities looking for updates (slow) |
@@ -1017,7 +1015,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
1017 | m_sceneGraph.UpdateEntities(); | 1015 | m_sceneGraph.UpdateEntities(); |
1018 | } | 1016 | } |
1019 | 1017 | ||
1020 | |||
1021 | // run through entities that have scheduled themselves for | 1018 | // run through entities that have scheduled themselves for |
1022 | // updates looking for updates(faster) | 1019 | // updates looking for updates(faster) |
1023 | if (m_frame % m_update_entitiesquick == 0) | 1020 | if (m_frame % m_update_entitiesquick == 0) |
@@ -3253,10 +3250,11 @@ namespace OpenSim.Region.Framework.Scenes | |||
3253 | 3250 | ||
3254 | if (AuthorizationService != null) | 3251 | if (AuthorizationService != null) |
3255 | { | 3252 | { |
3256 | if (!AuthorizationService.IsAuthorizedForRegion(agent.AgentID.ToString(), RegionInfo.RegionID.ToString())) | 3253 | if (!AuthorizationService.IsAuthorizedForRegion(agent.AgentID.ToString(), RegionInfo.RegionID.ToString(),out reason)) |
3257 | { | 3254 | { |
3258 | m_log.WarnFormat("[CONNECTION BEGIN]: Denied access to: {0} ({1} {2}) at {3} because the user does not have access to the region", | 3255 | m_log.WarnFormat("[CONNECTION BEGIN]: Denied access to: {0} ({1} {2}) at {3} because the user does not have access to the region", |
3259 | agent.AgentID, agent.firstname, agent.lastname, RegionInfo.RegionName); | 3256 | agent.AgentID, agent.firstname, agent.lastname, RegionInfo.RegionName); |
3257 | //reason = String.Format("You are not currently on the access list for {0}",RegionInfo.RegionName); | ||
3260 | return false; | 3258 | return false; |
3261 | } | 3259 | } |
3262 | } | 3260 | } |