diff options
| author | Diva Canto | 2013-05-11 07:15:31 -0700 |
|---|---|---|
| committer | Diva Canto | 2013-05-11 07:15:31 -0700 |
| commit | ab4d5304621c53555c28d05b3e801fba17260aba (patch) | |
| tree | 070b15dea6bf887e21fe47a725f8f445175ce908 /OpenSim/Region/Framework | |
| parent | Handle SetHome properly (diff) | |
| parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
| download | opensim-SC-ab4d5304621c53555c28d05b3e801fba17260aba.zip opensim-SC-ab4d5304621c53555c28d05b3e801fba17260aba.tar.gz opensim-SC-ab4d5304621c53555c28d05b3e801fba17260aba.tar.bz2 opensim-SC-ab4d5304621c53555c28d05b3e801fba17260aba.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 8cdde3f..80c4922 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
| @@ -4189,8 +4189,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 4189 | m_log.DebugFormat( | 4189 | m_log.DebugFormat( |
| 4190 | "[SCENE]: Incoming child agent update for {0} in {1}", cAgentData.AgentID, RegionInfo.RegionName); | 4190 | "[SCENE]: Incoming child agent update for {0} in {1}", cAgentData.AgentID, RegionInfo.RegionName); |
| 4191 | 4191 | ||
| 4192 | // XPTO: if this agent is not allowed here as root, always return false | ||
| 4193 | |||
| 4194 | // TODO: This check should probably be in QueryAccess(). | 4192 | // TODO: This check should probably be in QueryAccess(). |
| 4195 | ILandObject nearestParcel = GetNearestAllowedParcel(cAgentData.AgentID, Constants.RegionSize / 2, Constants.RegionSize / 2); | 4193 | ILandObject nearestParcel = GetNearestAllowedParcel(cAgentData.AgentID, Constants.RegionSize / 2, Constants.RegionSize / 2); |
| 4196 | if (nearestParcel == null) | 4194 | if (nearestParcel == null) |