aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorMelanie2013-05-11 01:27:37 +0100
committerMelanie2013-05-11 01:27:37 +0100
commit81d8deb1a830765ec64948db5ec3902894761f24 (patch)
tree300a4abe329bf8cec3557dd390cca0b86063bf61 /OpenSim/Region/Framework
parentGuard the scene list when estates are updated (diff)
downloadopensim-SC_OLD-81d8deb1a830765ec64948db5ec3902894761f24.zip
opensim-SC_OLD-81d8deb1a830765ec64948db5ec3902894761f24.tar.gz
opensim-SC_OLD-81d8deb1a830765ec64948db5ec3902894761f24.tar.bz2
opensim-SC_OLD-81d8deb1a830765ec64948db5ec3902894761f24.tar.xz
Send up the part missing from the Avination Estate commit.
Warning - contains a small migration.
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs2
1 files changed, 0 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 2aba2dd..1fa2fc7 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -4188,8 +4188,6 @@ namespace OpenSim.Region.Framework.Scenes
4188 m_log.DebugFormat( 4188 m_log.DebugFormat(
4189 "[SCENE]: Incoming child agent update for {0} in {1}", cAgentData.AgentID, RegionInfo.RegionName); 4189 "[SCENE]: Incoming child agent update for {0} in {1}", cAgentData.AgentID, RegionInfo.RegionName);
4190 4190
4191 // XPTO: if this agent is not allowed here as root, always return false
4192
4193 // TODO: This check should probably be in QueryAccess(). 4191 // TODO: This check should probably be in QueryAccess().
4194 ILandObject nearestParcel = GetNearestAllowedParcel(cAgentData.AgentID, Constants.RegionSize / 2, Constants.RegionSize / 2); 4192 ILandObject nearestParcel = GetNearestAllowedParcel(cAgentData.AgentID, Constants.RegionSize / 2, Constants.RegionSize / 2);
4195 if (nearestParcel == null) 4193 if (nearestParcel == null)