aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs20
1 files changed, 19 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 6c17be8..8a8dabc 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -2592,6 +2592,12 @@ namespace OpenSim.Region.Framework.Scenes
2592 /// <returns>True if the SceneObjectGroup was added, False if it was not</returns> 2592 /// <returns>True if the SceneObjectGroup was added, False if it was not</returns>
2593 public bool AddSceneObject(SceneObjectGroup sceneObject) 2593 public bool AddSceneObject(SceneObjectGroup sceneObject)
2594 { 2594 {
2595 if (sceneObject.OwnerID == UUID.Zero)
2596 {
2597 m_log.ErrorFormat("[SCENE]: Owner ID for {0} was zero", sceneObject.UUID);
2598 return false;
2599 }
2600
2595 // If the user is banned, we won't let any of their objects 2601 // If the user is banned, we won't let any of their objects
2596 // enter. Period. 2602 // enter. Period.
2597 // 2603 //
@@ -2641,15 +2647,27 @@ namespace OpenSim.Region.Framework.Scenes
2641 if (AttachmentsModule != null) 2647 if (AttachmentsModule != null)
2642 AttachmentsModule.AttachObject(sp.ControllingClient, grp, 0, false); 2648 AttachmentsModule.AttachObject(sp.ControllingClient, grp, 0, false);
2643 2649
2650 m_log.DebugFormat("[SCENE]: Attachment {0} arrived and scene presence was found, attaching", sceneObject.UUID);
2644 } 2651 }
2645 else 2652 else
2646 { 2653 {
2654 m_log.DebugFormat("[SCENE]: Attachment {0} arrived and scene presence was not found, setting to temp", sceneObject.UUID);
2647 RootPrim.RemFlag(PrimFlags.TemporaryOnRez); 2655 RootPrim.RemFlag(PrimFlags.TemporaryOnRez);
2648 RootPrim.AddFlag(PrimFlags.TemporaryOnRez); 2656 RootPrim.AddFlag(PrimFlags.TemporaryOnRez);
2649 } 2657 }
2658 if (sceneObject.OwnerID == UUID.Zero)
2659 {
2660 m_log.ErrorFormat("[SCENE]: Owner ID for {0} was zero after attachment processing. BUG!", sceneObject.UUID);
2661 return false;
2662 }
2650 } 2663 }
2651 else 2664 else
2652 { 2665 {
2666 if (sceneObject.OwnerID == UUID.Zero)
2667 {
2668 m_log.ErrorFormat("[SCENE]: Owner ID for non-attachment {0} was zero", sceneObject.UUID);
2669 return false;
2670 }
2653 AddRestoredSceneObject(sceneObject, true, false); 2671 AddRestoredSceneObject(sceneObject, true, false);
2654 2672
2655 if (!Permissions.CanObjectEntry(sceneObject.UUID, 2673 if (!Permissions.CanObjectEntry(sceneObject.UUID,
@@ -5333,4 +5351,4 @@ namespace OpenSim.Region.Framework.Scenes
5333 return offsets.ToArray(); 5351 return offsets.ToArray();
5334 } 5352 }
5335 } 5353 }
5336} \ No newline at end of file 5354}