aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorUbitUmarov2018-12-28 21:26:07 +0000
committerUbitUmarov2018-12-28 21:26:07 +0000
commit616fa8dbee0fb71003ed8ff970ad84b3aaafae5e (patch)
tree8ed834c56677d1b78309b4024e71b3453370ce5f /OpenSim/Region
parentremove silly double locking (diff)
downloadopensim-SC-616fa8dbee0fb71003ed8ff970ad84b3aaafae5e.zip
opensim-SC-616fa8dbee0fb71003ed8ff970ad84b3aaafae5e.tar.gz
opensim-SC-616fa8dbee0fb71003ed8ff970ad84b3aaafae5e.tar.bz2
opensim-SC-616fa8dbee0fb71003ed8ff970ad84b3aaafae5e.tar.xz
sog GetLinkNumber() forget avatars that did standup
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs5
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs4
2 files changed, 5 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 9c3f166..b5c8cf2 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -5526,11 +5526,12 @@ namespace OpenSim.Region.Framework.Scenes
5526 return -1; 5526 return -1;
5527 } 5527 }
5528 5528
5529 public void InvalidatePartsLinkMaps() 5529 public void InvalidatePartsLinkMaps(bool all = true)
5530 { 5530 {
5531 lock(m_partsNameToLinkMap) 5531 lock(m_partsNameToLinkMap)
5532 { 5532 {
5533 m_partsNameToLinkMap.Clear(); 5533 if(all)
5534 m_partsNameToLinkMap.Clear();
5534 GetLinkNumber_lastname = String.Empty; 5535 GetLinkNumber_lastname = String.Empty;
5535 GetLinkNumber_lastnumber = -1; 5536 GetLinkNumber_lastnumber = -1;
5536 } 5537 }
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index c549f5c..b427c1a 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -5638,8 +5638,8 @@ namespace OpenSim.Region.Framework.Scenes
5638 if (m_sittingAvatars.Count == 0) 5638 if (m_sittingAvatars.Count == 0)
5639 m_sittingAvatars = null; 5639 m_sittingAvatars = null;
5640 5640
5641 ParentGroup.m_sittingAvatars.Remove(sp); 5641 if(ParentGroup.m_sittingAvatars.Remove(sp))
5642 5642 ParentGroup.InvalidatePartsLinkMaps(false);
5643 return true; 5643 return true;
5644 } 5644 }
5645 5645