From d26ded478839705f544c72ca6f07827fac7eb8ef Mon Sep 17 00:00:00 2001 From: "Justin Clark-Casey (justincc)" Date: Mon, 12 Dec 2011 20:08:49 +0000 Subject: [PATCH] fix build --- OpenSim/Region/Framework/Scenes/ScenePresence.cs | 5 ----- 1 file changed, 5 deletions(-) diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 892463ba6d..d88ba71943 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs @@ -1163,13 +1163,8 @@ namespace OpenSim.Region.Framework.Scenes //m_log.DebugFormat("[SCENE PRESENCE] Completed movement"); -<<<<<<< HEAD - m_controllingClient.MoveAgentIntoRegion(m_scene.RegionInfo, AbsolutePosition, look); - SendInitialData(); -======= ControllingClient.MoveAgentIntoRegion(m_scene.RegionInfo, AbsolutePosition, look); ValidateAndSendAppearanceAndAgentData(); ->>>>>>> f61e548... On a new client circuit, send the initial reply ack to let the client know it's live before sending other data. // Create child agents in neighbouring regions if (openChildAgents && !m_isChildAgent)