diff options
author | UbitUmarov | 2016-08-04 23:00:40 +0100 |
---|---|---|
committer | UbitUmarov | 2016-08-04 23:00:40 +0100 |
commit | 29dc449cc835cf6597be07773bd39f966d97274c (patch) | |
tree | c64d046a95fa71932118a85173e9db5e93f205cf /OpenSim/Region/Framework/Scenes/ScenePresence.cs | |
parent | cancel sending group powers on crossings, they are no longer needed. (diff) | |
download | opensim-SC_OLD-29dc449cc835cf6597be07773bd39f966d97274c.zip opensim-SC_OLD-29dc449cc835cf6597be07773bd39f966d97274c.tar.gz opensim-SC_OLD-29dc449cc835cf6597be07773bd39f966d97274c.tar.bz2 opensim-SC_OLD-29dc449cc835cf6597be07773bd39f966d97274c.tar.xz |
revert a variable rename
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/ScenePresence.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 5c10345..3a79376 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -568,7 +568,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
568 | public string Firstname { get; private set; } | 568 | public string Firstname { get; private set; } |
569 | public string Lastname { get; private set; } | 569 | public string Lastname { get; private set; } |
570 | 570 | ||
571 | public bool haveGroupUpdate; | 571 | public bool haveGroupInformation; |
572 | public bool gotCrossUpdate; | 572 | public bool gotCrossUpdate; |
573 | public byte crossingFlags; | 573 | public byte crossingFlags; |
574 | 574 | ||
@@ -1508,7 +1508,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1508 | /// </remarks> | 1508 | /// </remarks> |
1509 | public void MakeChildAgent(ulong newRegionHandle) | 1509 | public void MakeChildAgent(ulong newRegionHandle) |
1510 | { | 1510 | { |
1511 | haveGroupUpdate = false; | 1511 | haveGroupInformation = false; |
1512 | gotCrossUpdate = false; | 1512 | gotCrossUpdate = false; |
1513 | crossingFlags = 0; | 1513 | crossingFlags = 0; |
1514 | m_scene.EventManager.OnRegionHeartbeatEnd -= RegionHeartbeatEnd; | 1514 | m_scene.EventManager.OnRegionHeartbeatEnd -= RegionHeartbeatEnd; |
@@ -1978,7 +1978,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1978 | 1978 | ||
1979 | m_log.DebugFormat("[CompleteMovement] MakeRootAgent: {0}ms", Util.EnvironmentTickCountSubtract(ts)); | 1979 | m_log.DebugFormat("[CompleteMovement] MakeRootAgent: {0}ms", Util.EnvironmentTickCountSubtract(ts)); |
1980 | 1980 | ||
1981 | if(!haveGroupUpdate && !IsChildAgent && !isNPC) | 1981 | if(!haveGroupInformation && !IsChildAgent && !isNPC) |
1982 | { | 1982 | { |
1983 | IGroupsModule gm = m_scene.RequestModuleInterface<IGroupsModule>(); | 1983 | IGroupsModule gm = m_scene.RequestModuleInterface<IGroupsModule>(); |
1984 | if (gm != null) | 1984 | if (gm != null) |
@@ -2216,7 +2216,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2216 | // m_currentParcelHide = newhide; | 2216 | // m_currentParcelHide = newhide; |
2217 | // } | 2217 | // } |
2218 | 2218 | ||
2219 | haveGroupUpdate = false; | 2219 | haveGroupInformation = false; |
2220 | gotCrossUpdate = false; | 2220 | gotCrossUpdate = false; |
2221 | crossingFlags = 0; | 2221 | crossingFlags = 0; |
2222 | 2222 | ||
@@ -4654,11 +4654,11 @@ namespace OpenSim.Region.Framework.Scenes | |||
4654 | crossingFlags = cAgent.CrossingFlags; | 4654 | crossingFlags = cAgent.CrossingFlags; |
4655 | gotCrossUpdate = (crossingFlags != 0); | 4655 | gotCrossUpdate = (crossingFlags != 0); |
4656 | 4656 | ||
4657 | haveGroupUpdate = false; | 4657 | haveGroupInformation = false; |
4658 | // using this as protocol detection don't want to mess with the numbers for now | 4658 | // using this as protocol detection don't want to mess with the numbers for now |
4659 | if(cAgent.ActiveGroupTitle != null) | 4659 | if(cAgent.ActiveGroupTitle != null) |
4660 | { | 4660 | { |
4661 | haveGroupUpdate = true; | 4661 | haveGroupInformation = true; |
4662 | COF = cAgent.agentCOF; | 4662 | COF = cAgent.agentCOF; |
4663 | if(ControllingClient.IsGroupMember(cAgent.ActiveGroupID)) | 4663 | if(ControllingClient.IsGroupMember(cAgent.ActiveGroupID)) |
4664 | { | 4664 | { |