diff options
author | UbitUmarov | 2014-08-22 20:01:07 +0100 |
---|---|---|
committer | UbitUmarov | 2014-08-22 20:01:07 +0100 |
commit | 0295e6822dd6408b6dc6580b4a7a92b0f057d4b8 (patch) | |
tree | 15c6b151ecc65459df94dddafc4c2fc7d4994d7a /OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |
parent | Merge branch 'master' into ubitworkmaster (diff) | |
download | opensim-SC-0295e6822dd6408b6dc6580b4a7a92b0f057d4b8.zip opensim-SC-0295e6822dd6408b6dc6580b4a7a92b0f057d4b8.tar.gz opensim-SC-0295e6822dd6408b6dc6580b4a7a92b0f057d4b8.tar.bz2 opensim-SC-0295e6822dd6408b6dc6580b4a7a92b0f057d4b8.tar.xz |
some cleanup ( well or not )
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index dd5ee65..d3dd5d7 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
@@ -2717,15 +2717,15 @@ namespace OpenSim.Region.Framework.Scenes | |||
2717 | return; | 2717 | return; |
2718 | } | 2718 | } |
2719 | } | 2719 | } |
2720 | 2720 | ||
2721 | RootPart.SendFullUpdateToAllClients(); | 2721 | RootPart.SendFullUpdateToAllClientsInternal(); |
2722 | 2722 | ||
2723 | SceneObjectPart[] parts = m_parts.GetArray(); | 2723 | SceneObjectPart[] parts = m_parts.GetArray(); |
2724 | for (int i = 0; i < parts.Length; i++) | 2724 | for (int i = 0; i < parts.Length; i++) |
2725 | { | 2725 | { |
2726 | SceneObjectPart part = parts[i]; | 2726 | SceneObjectPart part = parts[i]; |
2727 | if (part != RootPart) | 2727 | if (part != RootPart) |
2728 | part.SendFullUpdateToAllClients(); | 2728 | part.SendFullUpdateToAllClientsInternal(); |
2729 | } | 2729 | } |
2730 | } | 2730 | } |
2731 | 2731 | ||
@@ -2740,16 +2740,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
2740 | if (IsDeleted) | 2740 | if (IsDeleted) |
2741 | return; | 2741 | return; |
2742 | 2742 | ||
2743 | if (IsAttachment) | ||
2744 | { | ||
2745 | ScenePresence sp = m_scene.GetScenePresence(AttachedAvatar); | ||
2746 | if (sp != null) | ||
2747 | { | ||
2748 | sp.SendAttachmentUpdate(RootPart, UpdateRequired.TERSE); | ||
2749 | return; | ||
2750 | } | ||
2751 | } | ||
2752 | |||
2753 | RootPart.SendTerseUpdateToAllClients(); | 2743 | RootPart.SendTerseUpdateToAllClients(); |
2754 | } | 2744 | } |
2755 | 2745 | ||
@@ -2781,7 +2771,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2781 | 2771 | ||
2782 | SceneObjectPart[] parts = m_parts.GetArray(); | 2772 | SceneObjectPart[] parts = m_parts.GetArray(); |
2783 | for (int i = 0; i < parts.Length; i++) | 2773 | for (int i = 0; i < parts.Length; i++) |
2784 | parts[i].SendTerseUpdateToAllClients(); | 2774 | parts[i].SendTerseUpdateToAllClientsInternal(); |
2785 | } | 2775 | } |
2786 | 2776 | ||
2787 | /// <summary> | 2777 | /// <summary> |