From 29dc449cc835cf6597be07773bd39f966d97274c Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Thu, 4 Aug 2016 23:00:40 +0100 Subject: [PATCH] revert a variable rename --- OpenSim/Region/Framework/Scenes/ScenePresence.cs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 5c10345087..3a79376028 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs @@ -568,7 +568,7 @@ namespace OpenSim.Region.Framework.Scenes public string Firstname { get; private set; } public string Lastname { get; private set; } - public bool haveGroupUpdate; + public bool haveGroupInformation; public bool gotCrossUpdate; public byte crossingFlags; @@ -1508,7 +1508,7 @@ namespace OpenSim.Region.Framework.Scenes /// public void MakeChildAgent(ulong newRegionHandle) { - haveGroupUpdate = false; + haveGroupInformation = false; gotCrossUpdate = false; crossingFlags = 0; m_scene.EventManager.OnRegionHeartbeatEnd -= RegionHeartbeatEnd; @@ -1978,7 +1978,7 @@ namespace OpenSim.Region.Framework.Scenes m_log.DebugFormat("[CompleteMovement] MakeRootAgent: {0}ms", Util.EnvironmentTickCountSubtract(ts)); - if(!haveGroupUpdate && !IsChildAgent && !isNPC) + if(!haveGroupInformation && !IsChildAgent && !isNPC) { IGroupsModule gm = m_scene.RequestModuleInterface(); if (gm != null) @@ -2216,7 +2216,7 @@ namespace OpenSim.Region.Framework.Scenes // m_currentParcelHide = newhide; // } - haveGroupUpdate = false; + haveGroupInformation = false; gotCrossUpdate = false; crossingFlags = 0; @@ -4654,11 +4654,11 @@ namespace OpenSim.Region.Framework.Scenes crossingFlags = cAgent.CrossingFlags; gotCrossUpdate = (crossingFlags != 0); - haveGroupUpdate = false; + haveGroupInformation = false; // using this as protocol detection don't want to mess with the numbers for now if(cAgent.ActiveGroupTitle != null) { - haveGroupUpdate = true; + haveGroupInformation = true; COF = cAgent.agentCOF; if(ControllingClient.IsGroupMember(cAgent.ActiveGroupID)) {