aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie2011-01-27 05:30:39 +0000
committerMelanie2011-01-27 05:30:39 +0000
commit4cc8d842813dc6cc6dffc9f6895bdc71eb456edc (patch)
treea497dcc389b84e2cc9c4925ce451214aebdde978
parentMerge branch 'master' into careminster-presence-refactor (diff)
downloadopensim-SC_OLD-4cc8d842813dc6cc6dffc9f6895bdc71eb456edc.zip
opensim-SC_OLD-4cc8d842813dc6cc6dffc9f6895bdc71eb456edc.tar.gz
opensim-SC_OLD-4cc8d842813dc6cc6dffc9f6895bdc71eb456edc.tar.bz2
opensim-SC_OLD-4cc8d842813dc6cc6dffc9f6895bdc71eb456edc.tar.xz
Fix build break
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs1
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 56eaf06..7f308da 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -2578,6 +2578,7 @@ namespace OpenSim.Region.Framework.Scenes
2578 (aCircuit.teleportFlags & (uint)Constants.TeleportFlags.ViaLogin) != 0; 2578 (aCircuit.teleportFlags & (uint)Constants.TeleportFlags.ViaLogin) != 0;
2579 2579
2580 CheckHeartbeat(); 2580 CheckHeartbeat();
2581 ScenePresence presence;
2581 2582
2582 if (GetScenePresence(client.AgentId) == null) // ensure there is no SP here 2583 if (GetScenePresence(client.AgentId) == null) // ensure there is no SP here
2583 { 2584 {