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:32:47 +00:00
parent 7a8dd539fd
commit 986f6b39ca
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -839,8 +839,8 @@ namespace OpenSim.Region.Framework.Scenes
//m_log.DebugFormat("[SCENE]: known regions in {0}: {1}", Scene.RegionInfo.RegionName, KnownChildRegionHandles.Count); //m_log.DebugFormat("[SCENE]: known regions in {0}: {1}", Scene.RegionInfo.RegionName, KnownChildRegionHandles.Count);
bool wasChild = m_isChildAgent; bool wasChild = IsChildAgent;
m_isChildAgent = false; IsChildAgent = false;
IGroupsModule gm = m_scene.RequestModuleInterface<IGroupsModule>(); IGroupsModule gm = m_scene.RequestModuleInterface<IGroupsModule>();
if (gm != null) if (gm != null)
@ -986,7 +986,7 @@ namespace OpenSim.Region.Framework.Scenes
// depending on the exact timing. This shouldn't matter anyway since child agent positions are not updated. // depending on the exact timing. This shouldn't matter anyway since child agent positions are not updated.
//Velocity = new Vector3(0, 0, 0); //Velocity = new Vector3(0, 0, 0);
m_isChildAgent = true; IsChildAgent = true;
m_scene.SwapRootAgentCount(true); m_scene.SwapRootAgentCount(true);
RemoveFromPhysicalScene(); RemoveFromPhysicalScene();
@ -1152,7 +1152,7 @@ namespace OpenSim.Region.Framework.Scenes
ValidateAndSendAppearanceAndAgentData(); ValidateAndSendAppearanceAndAgentData();
// Create child agents in neighbouring regions // Create child agents in neighbouring regions
if (openChildAgents && !m_isChildAgent) if (openChildAgents && !IsChildAgent)
{ {
IEntityTransferModule m_agentTransfer = m_scene.RequestModuleInterface<IEntityTransferModule>(); IEntityTransferModule m_agentTransfer = m_scene.RequestModuleInterface<IEntityTransferModule>();
if (m_agentTransfer != null) if (m_agentTransfer != null)
@ -2354,7 +2354,7 @@ namespace OpenSim.Region.Framework.Scenes
if (!sendingPrims) if (!sendingPrims)
Util.FireAndForget(delegate { sendingPrims = true; SendPrimUpdates(); sendingPrims = false; }); Util.FireAndForget(delegate { sendingPrims = true; SendPrimUpdates(); sendingPrims = false; });
if (m_isChildAgent == false) if (IsChildAgent == false)
{ {
// PhysicsActor actor = m_physicsActor; // PhysicsActor actor = m_physicsActor;