OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix build

0.7.2-post-fixes
Justin Clark-Casey (justincc) 2011-12-12 20:08:49 +00:00
parent 5268334c61
commit d26ded4788
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
OpenSim/Region/Framework/Scenes/ScenePresence.cs
View File

@ -1163,13 +1163,8 @@ namespace OpenSim.Region.Framework.Scenes
//m_log.DebugFormat("[SCENE PRESENCE] Completed movement"); //m_log.DebugFormat("[SCENE PRESENCE] Completed movement");
<<<<<<< HEAD
m_controllingClient.MoveAgentIntoRegion(m_scene.RegionInfo, AbsolutePosition, look);
SendInitialData();
=======
ControllingClient.MoveAgentIntoRegion(m_scene.RegionInfo, AbsolutePosition, look); ControllingClient.MoveAgentIntoRegion(m_scene.RegionInfo, AbsolutePosition, look);
ValidateAndSendAppearanceAndAgentData(); 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 // Create child agents in neighbouring regions
if (openChildAgents && !m_isChildAgent) if (openChildAgents && !m_isChildAgent)