aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2010-06-07 16:07:43 +0100
committerJustin Clark-Casey (justincc)2010-06-07 19:14:30 +0100
commit693b5d08381a7672b3ebeb693ee50a82e8e59125 (patch)
tree53ad7a345866b29f0b23c5c8a116e6587a5d8e9e /OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
parentcommit code which stops full updates being fired multiple times when attachme... (diff)
downloadopensim-SC-693b5d08381a7672b3ebeb693ee50a82e8e59125.zip
opensim-SC-693b5d08381a7672b3ebeb693ee50a82e8e59125.tar.gz
opensim-SC-693b5d08381a7672b3ebeb693ee50a82e8e59125.tar.bz2
opensim-SC-693b5d08381a7672b3ebeb693ee50a82e8e59125.tar.xz
reapply fix for double sending of attachment update on standalone region crossing
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectPart.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs34
1 files changed, 17 insertions, 17 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index ffbb427..33624a2 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -1267,8 +1267,8 @@ namespace OpenSim.Region.Framework.Scenes
1267 1267
1268 public void AddFullUpdateToAvatar(ScenePresence presence) 1268 public void AddFullUpdateToAvatar(ScenePresence presence)
1269 { 1269 {
1270 if (IsAttachment) 1270// if (IsAttachment)
1271 m_log.DebugFormat("AddFullUpdateToAllAvatar() {0} for {1} {2}", presence.Name, Name, LocalId); 1271// m_log.DebugFormat("AddFullUpdateToAllAvatar() {0} for {1} {2}", presence.Name, Name, LocalId);
1272 1272
1273 presence.SceneViewer.QueuePartForUpdate(this); 1273 presence.SceneViewer.QueuePartForUpdate(this);
1274 } 1274 }
@@ -1293,8 +1293,8 @@ namespace OpenSim.Region.Framework.Scenes
1293 1293
1294 public void AddTerseUpdateToAvatar(ScenePresence presence) 1294 public void AddTerseUpdateToAvatar(ScenePresence presence)
1295 { 1295 {
1296 if (IsAttachment) 1296// if (IsAttachment)
1297 m_log.DebugFormat("AddTerseUpdateToAvatar() {0} for {1} {2}", presence.Name, Name, LocalId); 1297// m_log.DebugFormat("AddTerseUpdateToAvatar() {0} for {1} {2}", presence.Name, Name, LocalId);
1298 1298
1299 presence.SceneViewer.QueuePartForUpdate(this); 1299 presence.SceneViewer.QueuePartForUpdate(this);
1300 } 1300 }
@@ -2729,8 +2729,8 @@ namespace OpenSim.Region.Framework.Scenes
2729 /// </summary> 2729 /// </summary>
2730 public void ScheduleFullUpdate() 2730 public void ScheduleFullUpdate()
2731 { 2731 {
2732 if (IsAttachment) 2732// if (IsAttachment)
2733 m_log.DebugFormat("[SOP]: Scheduling full update for {0} {1}", Name, LocalId); 2733// m_log.DebugFormat("[SOP]: Scheduling full update for {0} {1}", Name, LocalId);
2734 2734
2735 if (m_parentGroup != null) 2735 if (m_parentGroup != null)
2736 { 2736 {
@@ -2843,9 +2843,9 @@ namespace OpenSim.Region.Framework.Scenes
2843 /// <param name="remoteClient"></param> 2843 /// <param name="remoteClient"></param>
2844 public void SendFullUpdate(IClientAPI remoteClient, uint clientFlags) 2844 public void SendFullUpdate(IClientAPI remoteClient, uint clientFlags)
2845 { 2845 {
2846 if (IsAttachment) 2846// if (IsAttachment)
2847 m_log.DebugFormat( 2847// m_log.DebugFormat(
2848 "[SCENE OBJECT PART]: Sending part full update to {0} for {1} {2}", remoteClient.Name, Name, LocalId); 2848// "[SCENE OBJECT PART]: Sending part full update to {0} for {1} {2}", remoteClient.Name, Name, LocalId);
2849 2849
2850 m_parentGroup.SendPartFullUpdate(remoteClient, this, clientFlags); 2850 m_parentGroup.SendPartFullUpdate(remoteClient, this, clientFlags);
2851 } 2851 }
@@ -2855,9 +2855,9 @@ namespace OpenSim.Region.Framework.Scenes
2855 /// </summary> 2855 /// </summary>
2856 public void SendFullUpdateToAllClients() 2856 public void SendFullUpdateToAllClients()
2857 { 2857 {
2858 if (IsAttachment) 2858// if (IsAttachment)
2859 m_log.DebugFormat( 2859// m_log.DebugFormat(
2860 "[SCENE OBJECT PART]: Sending full update for {0} {1} for all clients", Name, LocalId); 2860// "[SCENE OBJECT PART]: Sending full update for {0} {1} for all clients", Name, LocalId);
2861 2861
2862 ScenePresence[] avatars = m_parentGroup.Scene.GetScenePresences(); 2862 ScenePresence[] avatars = m_parentGroup.Scene.GetScenePresences();
2863 for (int i = 0; i < avatars.Length; i++) 2863 for (int i = 0; i < avatars.Length; i++)
@@ -2870,9 +2870,9 @@ namespace OpenSim.Region.Framework.Scenes
2870 2870
2871 public void SendFullUpdateToAllClientsExcept(UUID agentID) 2871 public void SendFullUpdateToAllClientsExcept(UUID agentID)
2872 { 2872 {
2873 if (IsAttachment) 2873// if (IsAttachment)
2874 m_log.DebugFormat( 2874// m_log.DebugFormat(
2875 "[SCENE OBJECT PART]: Sending full update for {0} {1} to all clients except {2}", Name, LocalId, agentID); 2875// "[SCENE OBJECT PART]: Sending full update for {0} {1} to all clients except {2}", Name, LocalId, agentID);
2876 2876
2877 ScenePresence[] avatars = m_parentGroup.Scene.GetScenePresences(); 2877 ScenePresence[] avatars = m_parentGroup.Scene.GetScenePresences();
2878 for (int i = 0; i < avatars.Length; i++) 2878 for (int i = 0; i < avatars.Length; i++)
@@ -2980,8 +2980,8 @@ namespace OpenSim.Region.Framework.Scenes
2980 { 2980 {
2981 if (m_updateFlag == 2) // is a new prim, just created/reloaded or has major changes 2981 if (m_updateFlag == 2) // is a new prim, just created/reloaded or has major changes
2982 { 2982 {
2983 if (IsAttachment) 2983// if (IsAttachment)
2984 m_log.DebugFormat("[SOP]: Sending scheduled full update for {0} {1}", Name, LocalId); 2984// m_log.DebugFormat("[SOP]: Sending scheduled full update for {0} {1}", Name, LocalId);
2985 2985
2986 AddFullUpdateToAllAvatars(); 2986 AddFullUpdateToAllAvatars();
2987 ClearUpdateSchedule(); 2987 ClearUpdateSchedule();