diff options
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index f437bc8..05af942 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -639,7 +639,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
639 | m_sceneGridService = sceneGridService; | 639 | m_sceneGridService = sceneGridService; |
640 | m_SimulationDataService = simDataService; | 640 | m_SimulationDataService = simDataService; |
641 | m_EstateDataService = estateDataService; | 641 | m_EstateDataService = estateDataService; |
642 | m_regionHandle = m_regInfo.RegionHandle; | 642 | m_regionHandle = RegionInfo.RegionHandle; |
643 | m_lastIncoming = 0; | 643 | m_lastIncoming = 0; |
644 | m_lastOutgoing = 0; | 644 | m_lastOutgoing = 0; |
645 | 645 | ||
@@ -4156,7 +4156,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
4156 | // We have to wait until the viewer contacts this region after receiving EAC. | 4156 | // We have to wait until the viewer contacts this region after receiving EAC. |
4157 | // That calls AddNewClient, which finally creates the ScenePresence | 4157 | // That calls AddNewClient, which finally creates the ScenePresence |
4158 | int flags = GetUserFlags(cAgentData.AgentID); | 4158 | int flags = GetUserFlags(cAgentData.AgentID); |
4159 | if (m_regInfo.EstateSettings.IsBanned(cAgentData.AgentID, flags)) | 4159 | if (RegionInfo.EstateSettings.IsBanned(cAgentData.AgentID, flags)) |
4160 | { | 4160 | { |
4161 | m_log.DebugFormat("[SCENE]: Denying root agent entry to {0}: banned", cAgentData.AgentID); | 4161 | m_log.DebugFormat("[SCENE]: Denying root agent entry to {0}: banned", cAgentData.AgentID); |
4162 | return false; | 4162 | return false; |