diff options
Diffstat (limited to '')
8 files changed, 21 insertions, 121 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index f556b35..a2634f7 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
@@ -2449,8 +2449,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
2449 | return; | 2449 | return; |
2450 | } | 2450 | } |
2451 | 2451 | ||
2452 | m_log.DebugFormat("[SCENE INVENTORY]: {0} {1} IsAttachment={2}", att.Name, att.LocalId, att.IsAttachment); | ||
2453 | Console.WriteLine("HERE X"); | ||
2454 | ScenePresence presence; | 2452 | ScenePresence presence; |
2455 | if (TryGetAvatar(remoteClient.AgentId, out presence)) | 2453 | if (TryGetAvatar(remoteClient.AgentId, out presence)) |
2456 | { | 2454 | { |
@@ -2458,12 +2456,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
2458 | InventoryItemBase item = new InventoryItemBase(itemID, remoteClient.AgentId); | 2456 | InventoryItemBase item = new InventoryItemBase(itemID, remoteClient.AgentId); |
2459 | item = InventoryService.GetItem(item); | 2457 | item = InventoryService.GetItem(item); |
2460 | presence.Appearance.SetAttachment((int)AttachmentPt, itemID, item.AssetID /*att.UUID*/); | 2458 | presence.Appearance.SetAttachment((int)AttachmentPt, itemID, item.AssetID /*att.UUID*/); |
2461 | Console.WriteLine("HERE Y"); | ||
2462 | 2459 | ||
2463 | if (m_AvatarFactory != null) | 2460 | if (m_AvatarFactory != null) |
2464 | m_AvatarFactory.UpdateDatabase(remoteClient.AgentId, presence.Appearance); | 2461 | m_AvatarFactory.UpdateDatabase(remoteClient.AgentId, presence.Appearance); |
2465 | |||
2466 | Console.WriteLine("HERE Z"); | ||
2467 | } | 2462 | } |
2468 | } | 2463 | } |
2469 | 2464 | ||
diff --git a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs index d8e604f..ac04dc7 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs | |||
@@ -124,7 +124,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
124 | { | 124 | { |
125 | if (((SceneObjectGroup)ent).LocalId == primLocalID) | 125 | if (((SceneObjectGroup)ent).LocalId == primLocalID) |
126 | { | 126 | { |
127 | m_log.DebugFormat("[SCENE]: Received full update request for {0} from {1}", primLocalID, remoteClient.Name); | ||
128 | ((SceneObjectGroup)ent).SendFullUpdateToClient(remoteClient); | 127 | ((SceneObjectGroup)ent).SendFullUpdateToClient(remoteClient); |
129 | return; | 128 | return; |
130 | } | 129 | } |
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index f8ca047..e8c4978 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -1850,31 +1850,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
1850 | /// true if the object was added, false if an object with the same uuid was already in the scene | 1850 | /// true if the object was added, false if an object with the same uuid was already in the scene |
1851 | /// </returns> | 1851 | /// </returns> |
1852 | public bool AddRestoredSceneObject( | 1852 | public bool AddRestoredSceneObject( |
1853 | SceneObjectGroup sceneObject, bool attachToBackup, bool alreadyPersisted, bool sendClientUpdates) | ||
1854 | { | ||
1855 | return m_sceneGraph.AddRestoredSceneObject(sceneObject, attachToBackup, alreadyPersisted, sendClientUpdates); | ||
1856 | } | ||
1857 | |||
1858 | /// <summary> | ||
1859 | /// Add an object into the scene that has come from storage | ||
1860 | /// </summary> | ||
1861 | /// | ||
1862 | /// <param name="sceneObject"></param> | ||
1863 | /// <param name="attachToBackup"> | ||
1864 | /// If true, changes to the object will be reflected in its persisted data | ||
1865 | /// If false, the persisted data will not be changed even if the object in the scene is changed | ||
1866 | /// </param> | ||
1867 | /// <param name="alreadyPersisted"> | ||
1868 | /// If true, we won't persist this object until it changes | ||
1869 | /// If false, we'll persist this object immediately | ||
1870 | /// </param> | ||
1871 | /// <returns> | ||
1872 | /// true if the object was added, false if an object with the same uuid was already in the scene | ||
1873 | /// </returns> | ||
1874 | public bool AddRestoredSceneObject( | ||
1875 | SceneObjectGroup sceneObject, bool attachToBackup, bool alreadyPersisted) | 1853 | SceneObjectGroup sceneObject, bool attachToBackup, bool alreadyPersisted) |
1876 | { | 1854 | { |
1877 | return AddRestoredSceneObject(sceneObject, attachToBackup, alreadyPersisted, true); | 1855 | return m_sceneGraph.AddRestoredSceneObject(sceneObject, attachToBackup, alreadyPersisted); |
1878 | } | 1856 | } |
1879 | 1857 | ||
1880 | /// <summary> | 1858 | /// <summary> |
@@ -2487,7 +2465,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2487 | /// <returns></returns> | 2465 | /// <returns></returns> |
2488 | public bool IncomingCreateObject(ISceneObject sog) | 2466 | public bool IncomingCreateObject(ISceneObject sog) |
2489 | { | 2467 | { |
2490 | m_log.Debug(" >>> IncomingCreateObject(sog) <<< " + ((SceneObjectGroup)sog).AbsolutePosition + " deleted? " + ((SceneObjectGroup)sog).IsDeleted); | 2468 | //m_log.Debug(" >>> IncomingCreateObject(sog) <<< " + ((SceneObjectGroup)sog).AbsolutePosition + " deleted? " + ((SceneObjectGroup)sog).IsDeleted); |
2491 | SceneObjectGroup newObject; | 2469 | SceneObjectGroup newObject; |
2492 | try | 2470 | try |
2493 | { | 2471 | { |
@@ -2559,12 +2537,10 @@ namespace OpenSim.Region.Framework.Scenes | |||
2559 | 2537 | ||
2560 | if (sceneObject.IsAttachmentCheckFull()) // Attachment | 2538 | if (sceneObject.IsAttachmentCheckFull()) // Attachment |
2561 | { | 2539 | { |
2562 | m_log.DebugFormat("[SCENE]: Adding attachment {0} {1}", sceneObject.Name, sceneObject.LocalId); | ||
2563 | |||
2564 | sceneObject.RootPart.AddFlag(PrimFlags.TemporaryOnRez); | 2540 | sceneObject.RootPart.AddFlag(PrimFlags.TemporaryOnRez); |
2565 | sceneObject.RootPart.AddFlag(PrimFlags.Phantom); | 2541 | sceneObject.RootPart.AddFlag(PrimFlags.Phantom); |
2566 | 2542 | ||
2567 | AddRestoredSceneObject(sceneObject, false, false, false); | 2543 | AddRestoredSceneObject(sceneObject, false, false); |
2568 | 2544 | ||
2569 | // Handle attachment special case | 2545 | // Handle attachment special case |
2570 | SceneObjectPart RootPrim = sceneObject.RootPart; | 2546 | SceneObjectPart RootPrim = sceneObject.RootPart; |
@@ -2572,8 +2548,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
2572 | // Fix up attachment Parent Local ID | 2548 | // Fix up attachment Parent Local ID |
2573 | ScenePresence sp = GetScenePresence(sceneObject.OwnerID); | 2549 | ScenePresence sp = GetScenePresence(sceneObject.OwnerID); |
2574 | 2550 | ||
2575 | Console.WriteLine("AAAA"); | ||
2576 | |||
2577 | //uint parentLocalID = 0; | 2551 | //uint parentLocalID = 0; |
2578 | if (sp != null) | 2552 | if (sp != null) |
2579 | { | 2553 | { |
@@ -2592,25 +2566,20 @@ namespace OpenSim.Region.Framework.Scenes | |||
2592 | //grp.SetFromAssetID(grp.RootPart.LastOwnerID); | 2566 | //grp.SetFromAssetID(grp.RootPart.LastOwnerID); |
2593 | m_log.DebugFormat( | 2567 | m_log.DebugFormat( |
2594 | "[ATTACHMENT]: Attach to avatar {0} at position {1}", sp.UUID, grp.AbsolutePosition); | 2568 | "[ATTACHMENT]: Attach to avatar {0} at position {1}", sp.UUID, grp.AbsolutePosition); |
2595 | 2569 | ||
2596 | RootPrim.RemFlag(PrimFlags.TemporaryOnRez); | ||
2597 | AttachObject( | 2570 | AttachObject( |
2598 | sp.ControllingClient, grp.LocalId, (uint)0, grp.GroupRotation, grp.AbsolutePosition, false); | 2571 | sp.ControllingClient, grp.LocalId, (uint)0, grp.GroupRotation, grp.AbsolutePosition, false); |
2599 | 2572 | RootPrim.RemFlag(PrimFlags.TemporaryOnRez); | |
2600 | //grp.SendGroupFullUpdate(); | 2573 | grp.SendGroupFullUpdate(); |
2601 | } | 2574 | } |
2602 | else | 2575 | else |
2603 | { | 2576 | { |
2604 | RootPrim.RemFlag(PrimFlags.TemporaryOnRez); | 2577 | RootPrim.RemFlag(PrimFlags.TemporaryOnRez); |
2605 | RootPrim.AddFlag(PrimFlags.TemporaryOnRez); | 2578 | RootPrim.AddFlag(PrimFlags.TemporaryOnRez); |
2606 | } | 2579 | } |
2607 | |||
2608 | Console.WriteLine("BBBB"); | ||
2609 | } | 2580 | } |
2610 | else | 2581 | else |
2611 | { | 2582 | { |
2612 | m_log.DebugFormat("[SCENE]: Adding ordinary object {0} {1}", sceneObject.Name, sceneObject.LocalId); | ||
2613 | |||
2614 | AddRestoredSceneObject(sceneObject, true, false); | 2583 | AddRestoredSceneObject(sceneObject, true, false); |
2615 | 2584 | ||
2616 | if (!Permissions.CanObjectEntry(sceneObject.UUID, | 2585 | if (!Permissions.CanObjectEntry(sceneObject.UUID, |
diff --git a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs index 50feb17..2f6a0db 100644 --- a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs +++ b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs | |||
@@ -1383,9 +1383,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1383 | // now we have a child agent in this region. Request all interesting data about other (root) agents | 1383 | // now we have a child agent in this region. Request all interesting data about other (root) agents |
1384 | agent.SendInitialFullUpdateToAllClients(); | 1384 | agent.SendInitialFullUpdateToAllClients(); |
1385 | 1385 | ||
1386 | Console.WriteLine("SCS 1"); | ||
1387 | agent.CrossAttachmentsIntoNewRegion(neighbourHandle, true); | 1386 | agent.CrossAttachmentsIntoNewRegion(neighbourHandle, true); |
1388 | Console.WriteLine("SCS 2"); | ||
1389 | 1387 | ||
1390 | // m_scene.SendKillObject(m_localId); | 1388 | // m_scene.SendKillObject(m_localId); |
1391 | 1389 | ||
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs index fa3c5eb..59a2f41 100644 --- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs +++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs | |||
@@ -216,15 +216,11 @@ namespace OpenSim.Region.Framework.Scenes | |||
216 | /// If true, we won't persist this object until it changes | 216 | /// If true, we won't persist this object until it changes |
217 | /// If false, we'll persist this object immediately | 217 | /// If false, we'll persist this object immediately |
218 | /// </param> | 218 | /// </param> |
219 | /// <param name="sendClientUpdate"> | ||
220 | /// If true, we send updates to the client to tell it about this object | ||
221 | /// If false, we leave it up to the caller to do this | ||
222 | /// </param> | ||
223 | /// <returns> | 219 | /// <returns> |
224 | /// true if the object was added, false if an object with the same uuid was already in the scene | 220 | /// true if the object was added, false if an object with the same uuid was already in the scene |
225 | /// </returns> | 221 | /// </returns> |
226 | protected internal bool AddRestoredSceneObject( | 222 | protected internal bool AddRestoredSceneObject( |
227 | SceneObjectGroup sceneObject, bool attachToBackup, bool alreadyPersisted, bool sendClientUpdates) | 223 | SceneObjectGroup sceneObject, bool attachToBackup, bool alreadyPersisted) |
228 | { | 224 | { |
229 | if (!alreadyPersisted) | 225 | if (!alreadyPersisted) |
230 | { | 226 | { |
@@ -232,29 +228,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
232 | sceneObject.HasGroupChanged = true; | 228 | sceneObject.HasGroupChanged = true; |
233 | } | 229 | } |
234 | 230 | ||
235 | return AddSceneObject(sceneObject, attachToBackup, sendClientUpdates); | 231 | return AddSceneObject(sceneObject, attachToBackup, true); |
236 | } | 232 | } |
237 | |||
238 | // /// <summary> | ||
239 | // /// Add an object into the scene that has come from storage | ||
240 | // /// </summary> | ||
241 | // /// <param name="sceneObject"></param> | ||
242 | // /// <param name="attachToBackup"> | ||
243 | // /// If true, changes to the object will be reflected in its persisted data | ||
244 | // /// If false, the persisted data will not be changed even if the object in the scene is changed | ||
245 | // /// </param> | ||
246 | // /// <param name="alreadyPersisted"> | ||
247 | // /// If true, we won't persist this object until it changes | ||
248 | // /// If false, we'll persist this object immediately | ||
249 | // /// </param> | ||
250 | // /// <returns> | ||
251 | // /// true if the object was added, false if an object with the same uuid was already in the scene | ||
252 | // /// </returns> | ||
253 | // protected internal bool AddRestoredSceneObject( | ||
254 | // SceneObjectGroup sceneObject, bool attachToBackup, bool alreadyPersisted) | ||
255 | // { | ||
256 | // AddRestoredSceneObject(sceneObject, attachToBackup, alreadyPersisted, true); | ||
257 | // } | ||
258 | 233 | ||
259 | /// <summary> | 234 | /// <summary> |
260 | /// Add a newly created object to the scene. This will both update the scene, and send information about the | 235 | /// Add a newly created object to the scene. This will both update the scene, and send information about the |
@@ -636,13 +611,11 @@ namespace OpenSim.Region.Framework.Scenes | |||
636 | protected internal bool AttachObject( | 611 | protected internal bool AttachObject( |
637 | IClientAPI remoteClient, uint objectLocalID, uint AttachmentPt, Quaternion rot, Vector3 attachPos, bool silent) | 612 | IClientAPI remoteClient, uint objectLocalID, uint AttachmentPt, Quaternion rot, Vector3 attachPos, bool silent) |
638 | { | 613 | { |
639 | Console.WriteLine("HERE A"); | ||
640 | SceneObjectGroup group = GetGroupByPrim(objectLocalID); | 614 | SceneObjectGroup group = GetGroupByPrim(objectLocalID); |
641 | if (group != null) | 615 | if (group != null) |
642 | { | 616 | { |
643 | if (m_parentScene.Permissions.CanTakeObject(group.UUID, remoteClient.AgentId)) | 617 | if (m_parentScene.Permissions.CanTakeObject(group.UUID, remoteClient.AgentId)) |
644 | { | 618 | { |
645 | Console.WriteLine("HERE -1"); | ||
646 | // If the attachment point isn't the same as the one previously used | 619 | // If the attachment point isn't the same as the one previously used |
647 | // set it's offset position = 0 so that it appears on the attachment point | 620 | // set it's offset position = 0 so that it appears on the attachment point |
648 | // and not in a weird location somewhere unknown. | 621 | // and not in a weird location somewhere unknown. |
@@ -681,12 +654,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
681 | itemId = group.GetFromItemID(); | 654 | itemId = group.GetFromItemID(); |
682 | } | 655 | } |
683 | 656 | ||
684 | Console.WriteLine("HERE 0"); | ||
685 | m_parentScene.AttachObject(remoteClient, AttachmentPt, itemId, group); | 657 | m_parentScene.AttachObject(remoteClient, AttachmentPt, itemId, group); |
686 | 658 | ||
687 | Console.WriteLine("HERE 1"); | ||
688 | group.AttachToAgent(remoteClient.AgentId, AttachmentPt, attachPos, silent); | 659 | group.AttachToAgent(remoteClient.AgentId, AttachmentPt, attachPos, silent); |
689 | Console.WriteLine("HERE 2"); | ||
690 | // In case it is later dropped again, don't let | 660 | // In case it is later dropped again, don't let |
691 | // it get cleaned up | 661 | // it get cleaned up |
692 | // | 662 | // |
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index ba3fde7..602b811 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
@@ -1494,10 +1494,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
1494 | 1494 | ||
1495 | public void SendFullUpdateToClient(IClientAPI remoteClient) | 1495 | public void SendFullUpdateToClient(IClientAPI remoteClient) |
1496 | { | 1496 | { |
1497 | if (IsAttachment) | ||
1498 | m_log.DebugFormat( | ||
1499 | "[SOG]: Sending full update to client {0} for {1} {2}", remoteClient.Name, Name, LocalId); | ||
1500 | |||
1501 | SendPartFullUpdate(remoteClient, RootPart, m_scene.Permissions.GenerateClientFlags(remoteClient.AgentId, RootPart.UUID)); | 1497 | SendPartFullUpdate(remoteClient, RootPart, m_scene.Permissions.GenerateClientFlags(remoteClient.AgentId, RootPart.UUID)); |
1502 | 1498 | ||
1503 | lock (m_parts) | 1499 | lock (m_parts) |
@@ -1517,9 +1513,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
1517 | /// <param name="part"></param> | 1513 | /// <param name="part"></param> |
1518 | internal void SendPartFullUpdate(IClientAPI remoteClient, SceneObjectPart part, uint clientFlags) | 1514 | internal void SendPartFullUpdate(IClientAPI remoteClient, SceneObjectPart part, uint clientFlags) |
1519 | { | 1515 | { |
1520 | if (IsAttachment) | 1516 | // m_log.DebugFormat( |
1521 | m_log.DebugFormat( | 1517 | // "[SOG]: Sending part full update to {0} for {1} {2}", remoteClient.Name, part.Name, part.LocalId); |
1522 | "[SOG]: Sending part full update to {0} for {1} {2}", remoteClient.Name, part.Name, part.LocalId); | ||
1523 | 1518 | ||
1524 | if (m_rootPart.UUID == part.UUID) | 1519 | if (m_rootPart.UUID == part.UUID) |
1525 | { | 1520 | { |
@@ -1999,8 +1994,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1999 | 1994 | ||
2000 | public void ScheduleFullUpdateToAvatar(ScenePresence presence) | 1995 | public void ScheduleFullUpdateToAvatar(ScenePresence presence) |
2001 | { | 1996 | { |
2002 | if (IsAttachment) | 1997 | // m_log.DebugFormat("[SOG]: Scheduling full update for {0} {1} just to avatar {2}", Name, UUID, presence.Name); |
2003 | m_log.DebugFormat("[SOG]: Scheduling full update for {0} {1} just to avatar {2}", Name, UUID, presence.Name); | ||
2004 | 1998 | ||
2005 | RootPart.AddFullUpdateToAvatar(presence); | 1999 | RootPart.AddFullUpdateToAvatar(presence); |
2006 | 2000 | ||
@@ -2032,8 +2026,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2032 | /// </summary> | 2026 | /// </summary> |
2033 | public void ScheduleGroupForFullUpdate() | 2027 | public void ScheduleGroupForFullUpdate() |
2034 | { | 2028 | { |
2035 | if (IsAttachment) | 2029 | // m_log.DebugFormat("[SOG]: Scheduling full update for {0} {1}", Name, UUID); |
2036 | m_log.DebugFormat("[SOG]: Scheduling full update for {0} {1}", Name, UUID); | ||
2037 | 2030 | ||
2038 | checkAtTargets(); | 2031 | checkAtTargets(); |
2039 | RootPart.ScheduleFullUpdate(); | 2032 | RootPart.ScheduleFullUpdate(); |
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 | } |
diff --git a/OpenSim/Region/Framework/Scenes/SceneViewer.cs b/OpenSim/Region/Framework/Scenes/SceneViewer.cs index 6f2bef9..e4296ef 100644 --- a/OpenSim/Region/Framework/Scenes/SceneViewer.cs +++ b/OpenSim/Region/Framework/Scenes/SceneViewer.cs | |||
@@ -27,7 +27,6 @@ | |||
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using System.Reflection; | ||
31 | using OpenMetaverse; | 30 | using OpenMetaverse; |
32 | using log4net; | 31 | using log4net; |
33 | using OpenSim.Framework; | 32 | using OpenSim.Framework; |
@@ -40,8 +39,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
40 | { | 39 | { |
41 | public class SceneViewer : ISceneViewer | 40 | public class SceneViewer : ISceneViewer |
42 | { | 41 | { |
43 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | ||
44 | |||
45 | protected ScenePresence m_presence; | 42 | protected ScenePresence m_presence; |
46 | protected UpdateQueue m_partsUpdateQueue = new UpdateQueue(); | 43 | protected UpdateQueue m_partsUpdateQueue = new UpdateQueue(); |
47 | protected Queue<SceneObjectGroup> m_pendingObjects; | 44 | protected Queue<SceneObjectGroup> m_pendingObjects; |
@@ -63,9 +60,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
63 | /// <param name="part"></param> | 60 | /// <param name="part"></param> |
64 | public void QueuePartForUpdate(SceneObjectPart part) | 61 | public void QueuePartForUpdate(SceneObjectPart part) |
65 | { | 62 | { |
66 | if (part.IsAttachment) | ||
67 | m_log.DebugFormat("[SCENE VIEWER]: Queueing part {0} {1} for update", part.Name, part.LocalId); | ||
68 | |||
69 | lock (m_partsUpdateQueue) | 63 | lock (m_partsUpdateQueue) |
70 | { | 64 | { |
71 | m_partsUpdateQueue.Enqueue(part); | 65 | m_partsUpdateQueue.Enqueue(part); |
@@ -140,7 +134,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
140 | } | 134 | } |
141 | else if (update.LastTerseUpdateTime <= part.TimeStampTerse) | 135 | else if (update.LastTerseUpdateTime <= part.TimeStampTerse) |
142 | { | 136 | { |
143 | // m_log.DebugFormat(AddFullUpdateToAvatar | 137 | // m_log.DebugFormat( |
144 | // "[SCENE PRESENCE]: Tersely updating prim {0}, {1} - part timestamp {2}", | 138 | // "[SCENE PRESENCE]: Tersely updating prim {0}, {1} - part timestamp {2}", |
145 | // part.Name, part.UUID, part.TimeStampTerse); | 139 | // part.Name, part.UUID, part.TimeStampTerse); |
146 | 140 | ||