diff options
| author | Diva Canto | 2010-06-12 12:08:45 -0700 |
|---|---|---|
| committer | Diva Canto | 2010-06-12 12:08:45 -0700 |
| commit | 66619b599654397fb09da0f40d3d7e69dafcfb41 (patch) | |
| tree | 77957a1062df07b5db7167bbff261c0c4133175d /OpenSim/Region/Framework/Scenes/Scene.cs | |
| parent | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC_OLD-66619b599654397fb09da0f40d3d7e69dafcfb41.zip opensim-SC_OLD-66619b599654397fb09da0f40d3d7e69dafcfb41.tar.gz opensim-SC_OLD-66619b599654397fb09da0f40d3d7e69dafcfb41.tar.bz2 opensim-SC_OLD-66619b599654397fb09da0f40d3d7e69dafcfb41.tar.xz | |
Added checks for failed UpdateAgent calls.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 2b2c04a..bcfb4c9 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
| @@ -3903,6 +3903,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 3903 | m_log.DebugFormat( | 3903 | m_log.DebugFormat( |
| 3904 | "[SCENE]: Incoming child agent update for {0} in {1}", cAgentData.AgentID, RegionInfo.RegionName); | 3904 | "[SCENE]: Incoming child agent update for {0} in {1}", cAgentData.AgentID, RegionInfo.RegionName); |
| 3905 | 3905 | ||
| 3906 | // XPTO: if this agent is not allowed here as root, always return false | ||
| 3907 | |||
| 3906 | // We have to wait until the viewer contacts this region after receiving EAC. | 3908 | // We have to wait until the viewer contacts this region after receiving EAC. |
| 3907 | // That calls AddNewClient, which finally creates the ScenePresence | 3909 | // That calls AddNewClient, which finally creates the ScenePresence |
| 3908 | ScenePresence childAgentUpdate = WaitGetScenePresence(cAgentData.AgentID); | 3910 | ScenePresence childAgentUpdate = WaitGetScenePresence(cAgentData.AgentID); |