diff options
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index dacd9b6..4d0aa6f 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -437,6 +437,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
437 | { | 437 | { |
438 | if (m_simulationService == null) | 438 | if (m_simulationService == null) |
439 | m_simulationService = RequestModuleInterface<ISimulationService>(); | 439 | m_simulationService = RequestModuleInterface<ISimulationService>(); |
440 | |||
440 | return m_simulationService; | 441 | return m_simulationService; |
441 | } | 442 | } |
442 | } | 443 | } |
@@ -3217,7 +3218,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
3217 | try | 3218 | try |
3218 | { | 3219 | { |
3219 | m_log.DebugFormat( | 3220 | m_log.DebugFormat( |
3220 | "[SCENE]: Removing {0} agent {1} {2} from region {2}", | 3221 | "[SCENE]: Removing {0} agent {1} {2} from region {3}", |
3221 | (isChildAgent ? "child" : "root"), avatar.Name, agentID, RegionInfo.RegionName); | 3222 | (isChildAgent ? "child" : "root"), avatar.Name, agentID, RegionInfo.RegionName); |
3222 | 3223 | ||
3223 | m_sceneGraph.removeUserCount(!isChildAgent); | 3224 | m_sceneGraph.removeUserCount(!isChildAgent); |
@@ -3879,7 +3880,10 @@ namespace OpenSim.Region.Framework.Scenes | |||
3879 | ILandObject nearestParcel = GetNearestAllowedParcel(cAgentData.AgentID, Constants.RegionSize / 2, Constants.RegionSize / 2); | 3880 | ILandObject nearestParcel = GetNearestAllowedParcel(cAgentData.AgentID, Constants.RegionSize / 2, Constants.RegionSize / 2); |
3880 | if (nearestParcel == null) | 3881 | if (nearestParcel == null) |
3881 | { | 3882 | { |
3882 | m_log.DebugFormat("[SCENE]: Denying root agent entry to {0}: no allowed parcel", cAgentData.AgentID); | 3883 | m_log.DebugFormat( |
3884 | "[SCENE]: Denying root agent entry to {0} in {1}: no allowed parcel", | ||
3885 | cAgentData.AgentID, RegionInfo.RegionName); | ||
3886 | |||
3883 | return false; | 3887 | return false; |
3884 | } | 3888 | } |
3885 | 3889 | ||