aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectPart.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs34
1 files changed, 8 insertions, 26 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index ffbb427..a85a4b3 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -1259,17 +1259,16 @@ namespace OpenSim.Region.Framework.Scenes
1259 /// Tell all scene presences that they should send updates for this part to their clients 1259 /// Tell all scene presences that they should send updates for this part to their clients
1260 /// </summary> 1260 /// </summary>
1261 public void AddFullUpdateToAllAvatars() 1261 public void AddFullUpdateToAllAvatars()
1262 { 1262 {
1263 ScenePresence[] avatars = m_parentGroup.Scene.GetScenePresences(); 1263 ScenePresence[] avatars = m_parentGroup.Scene.GetScenePresences();
1264 for (int i = 0; i < avatars.Length; i++) 1264 for (int i = 0; i < avatars.Length; i++)
1265 AddFullUpdateToAvatar(avatars[i]); 1265 {
1266 avatars[i].SceneViewer.QueuePartForUpdate(this);
1267 }
1266 } 1268 }
1267 1269
1268 public void AddFullUpdateToAvatar(ScenePresence presence) 1270 public void AddFullUpdateToAvatar(ScenePresence presence)
1269 { 1271 {
1270 if (IsAttachment)
1271 m_log.DebugFormat("AddFullUpdateToAllAvatar() {0} for {1} {2}", presence.Name, Name, LocalId);
1272
1273 presence.SceneViewer.QueuePartForUpdate(this); 1272 presence.SceneViewer.QueuePartForUpdate(this);
1274 } 1273 }
1275 1274
@@ -1288,14 +1287,13 @@ namespace OpenSim.Region.Framework.Scenes
1288 { 1287 {
1289 ScenePresence[] avatars = m_parentGroup.Scene.GetScenePresences(); 1288 ScenePresence[] avatars = m_parentGroup.Scene.GetScenePresences();
1290 for (int i = 0; i < avatars.Length; i++) 1289 for (int i = 0; i < avatars.Length; i++)
1291 AddTerseUpdateToAvatar(avatars[i]); 1290 {
1291 avatars[i].SceneViewer.QueuePartForUpdate(this);
1292 }
1292 } 1293 }
1293 1294
1294 public void AddTerseUpdateToAvatar(ScenePresence presence) 1295 public void AddTerseUpdateToAvatar(ScenePresence presence)
1295 { 1296 {
1296 if (IsAttachment)
1297 m_log.DebugFormat("AddTerseUpdateToAvatar() {0} for {1} {2}", presence.Name, Name, LocalId);
1298
1299 presence.SceneViewer.QueuePartForUpdate(this); 1297 presence.SceneViewer.QueuePartForUpdate(this);
1300 } 1298 }
1301 1299
@@ -2729,8 +2727,7 @@ namespace OpenSim.Region.Framework.Scenes
2729 /// </summary> 2727 /// </summary>
2730 public void ScheduleFullUpdate() 2728 public void ScheduleFullUpdate()
2731 { 2729 {
2732 if (IsAttachment) 2730// m_log.DebugFormat("[SCENE OBJECT PART]: Scheduling full update for {0} {1}", Name, LocalId);
2733 m_log.DebugFormat("[SOP]: Scheduling full update for {0} {1}", Name, LocalId);
2734 2731
2735 if (m_parentGroup != null) 2732 if (m_parentGroup != null)
2736 { 2733 {
@@ -2843,10 +2840,6 @@ namespace OpenSim.Region.Framework.Scenes
2843 /// <param name="remoteClient"></param> 2840 /// <param name="remoteClient"></param>
2844 public void SendFullUpdate(IClientAPI remoteClient, uint clientFlags) 2841 public void SendFullUpdate(IClientAPI remoteClient, uint clientFlags)
2845 { 2842 {
2846 if (IsAttachment)
2847 m_log.DebugFormat(
2848 "[SCENE OBJECT PART]: Sending part full update to {0} for {1} {2}", remoteClient.Name, Name, LocalId);
2849
2850 m_parentGroup.SendPartFullUpdate(remoteClient, this, clientFlags); 2843 m_parentGroup.SendPartFullUpdate(remoteClient, this, clientFlags);
2851 } 2844 }
2852 2845
@@ -2855,10 +2848,6 @@ namespace OpenSim.Region.Framework.Scenes
2855 /// </summary> 2848 /// </summary>
2856 public void SendFullUpdateToAllClients() 2849 public void SendFullUpdateToAllClients()
2857 { 2850 {
2858 if (IsAttachment)
2859 m_log.DebugFormat(
2860 "[SCENE OBJECT PART]: Sending full update for {0} {1} for all clients", Name, LocalId);
2861
2862 ScenePresence[] avatars = m_parentGroup.Scene.GetScenePresences(); 2851 ScenePresence[] avatars = m_parentGroup.Scene.GetScenePresences();
2863 for (int i = 0; i < avatars.Length; i++) 2852 for (int i = 0; i < avatars.Length; i++)
2864 { 2853 {
@@ -2870,10 +2859,6 @@ namespace OpenSim.Region.Framework.Scenes
2870 2859
2871 public void SendFullUpdateToAllClientsExcept(UUID agentID) 2860 public void SendFullUpdateToAllClientsExcept(UUID agentID)
2872 { 2861 {
2873 if (IsAttachment)
2874 m_log.DebugFormat(
2875 "[SCENE OBJECT PART]: Sending full update for {0} {1} to all clients except {2}", Name, LocalId, agentID);
2876
2877 ScenePresence[] avatars = m_parentGroup.Scene.GetScenePresences(); 2862 ScenePresence[] avatars = m_parentGroup.Scene.GetScenePresences();
2878 for (int i = 0; i < avatars.Length; i++) 2863 for (int i = 0; i < avatars.Length; i++)
2879 { 2864 {
@@ -2980,9 +2965,6 @@ namespace OpenSim.Region.Framework.Scenes
2980 { 2965 {
2981 if (m_updateFlag == 2) // is a new prim, just created/reloaded or has major changes 2966 if (m_updateFlag == 2) // is a new prim, just created/reloaded or has major changes
2982 { 2967 {
2983 if (IsAttachment)
2984 m_log.DebugFormat("[SOP]: Sending scheduled full update for {0} {1}", Name, LocalId);
2985
2986 AddFullUpdateToAllAvatars(); 2968 AddFullUpdateToAllAvatars();
2987 ClearUpdateSchedule(); 2969 ClearUpdateSchedule();
2988 } 2970 }