Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmerge

5 files changed, 30 insertions, 58 deletions

diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 53f0f2e..245f258 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -82,16 +82,9 @@ namespace OpenSim.Region.Framework.Scenes
             m_log.Info("[PRIM INVENTORY]: Starting scripts in scene");
 
             IScriptModule[] engines = RequestModuleInterfaces<IScriptModule>();
-            if (engines != null)
-            {
-                foreach (IScriptModule engine in engines)
-                {
-                    if (engine != null)
-                    {
-                        engine.StartProcessing();
-                    }
-                }
-            }
+
+            foreach (IScriptModule engine in engines)
+                engine.StartProcessing();
         }
 
         public void AddUploadedInventoryItem(UUID agentID, InventoryItemBase item)
diff --git a/OpenSim/Region/Framework/Scenes/SceneBase.cs b/OpenSim/Region/Framework/Scenes/SceneBase.cs
index 73e9392..0fd5164 100644
--- a/OpenSim/Region/Framework/Scenes/SceneBase.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneBase.cs
@@ -451,7 +451,7 @@ namespace OpenSim.Region.Framework.Scenes
             }
             else
             {
-                return new T[] { default(T) };
+                return new T[] {};
             }
         }
         
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index e214f57..11040b7 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -252,7 +252,6 @@ namespace OpenSim.Region.Framework.Scenes
         private byte[] m_TextureAnimation;
         private byte m_clickAction;
         private Color m_color = Color.Black;
-        private string m_description = String.Empty;
         private readonly List<uint> m_lastColliders = new List<uint>();
         private int m_linkNum;
         
@@ -331,11 +330,14 @@ namespace OpenSim.Region.Framework.Scenes
         /// </summary>
         public SceneObjectPart()
         {
-            // It's not necessary to persist this
             m_TextureAnimation = Utils.EmptyBytes;
             m_particleSystem = Utils.EmptyBytes;
             Rezzed = DateTime.UtcNow;
-            
+            Description = String.Empty;
+
+            // Prims currently only contain a single folder (Contents).  From looking at the Second Life protocol,
+            // this appears to have the same UUID (!) as the prim.  If this isn't the case, one can't drag items from
+            // the prim into an agent inventory (Linden client reports that the "Object not found for drop" in its log
             m_inventory = new SceneObjectPartInventory(this);
         }
 
@@ -349,11 +351,10 @@ namespace OpenSim.Region.Framework.Scenes
         /// <param name="offsetPosition"></param>
         public SceneObjectPart(
             UUID ownerID, PrimitiveBaseShape shape, Vector3 groupPosition, 
-            Quaternion rotationOffset, Vector3 offsetPosition)
+            Quaternion rotationOffset, Vector3 offsetPosition) : this()
         {
             m_name = "Object";
 
-            Rezzed = DateTime.UtcNow;
             CreationDate = (int)Utils.DateTimeToUnixTime(Rezzed);
             LastOwnerID = CreatorID = OwnerID = ownerID;
             UUID = UUID.Random();
@@ -368,19 +369,10 @@ namespace OpenSim.Region.Framework.Scenes
             Velocity = Vector3.Zero;
             AngularVelocity = Vector3.Zero;
             Acceleration = Vector3.Zero;
-            m_TextureAnimation = Utils.EmptyBytes;
-            m_particleSystem = Utils.EmptyBytes;
-
-            // Prims currently only contain a single folder (Contents).  From looking at the Second Life protocol,
-            // this appears to have the same UUID (!) as the prim.  If this isn't the case, one can't drag items from
-            // the prim into an agent inventory (Linden client reports that the "Object not found for drop" in its log
-
             Flags = 0;
             CreateSelected = true;
 
             TrimPermissions();
-            
-            m_inventory = new SceneObjectPartInventory(this);
         }
 
         #endregion Constructors
@@ -938,19 +930,7 @@ namespace OpenSim.Region.Framework.Scenes
             set { m_acceleration = value; }
         }
 
-        public string Description
-        {
-            get { return m_description; }
-            set 
-            {
-                m_description = value;
-                PhysicsActor actor = PhysActor;
-                if (actor != null)
-                {
-                    actor.SOPDescription = value;
-                }
-            }
-        }
+        public string Description { get; set; }
 
         /// <value>
         /// Text color.
@@ -1595,8 +1575,7 @@ namespace OpenSim.Region.Framework.Scenes
                     // Basic Physics returns null..  joy joy joy.
                     if (PhysActor != null)
                     {
-                        PhysActor.SOPName = this.Name; // save object name and desc into the PhysActor so ODE internals know the joint/body info
-                        PhysActor.SOPDescription = this.Description;
+                        PhysActor.SOPName = this.Name; // save object into the PhysActor so ODE internals know the joint/body info
                         PhysActor.SetMaterial(Material);
                         DoPhysicsPropertyUpdate(RigidBody, true);
                         PhysActor.SetVolumeDetect(VolumeDetectActive ? 1 : 0);
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
index 309f543..c485e87 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
@@ -282,8 +282,6 @@ namespace OpenSim.Region.Framework.Scenes
             ArrayList ret = new ArrayList();
 
             IScriptModule[] engines = m_part.ParentGroup.Scene.RequestModuleInterfaces<IScriptModule>();
-            if (engines == null) // No engine at all
-                return ret;
 
             foreach (IScriptModule e in engines)
             {
@@ -397,7 +395,7 @@ namespace OpenSim.Region.Framework.Scenes
         private void RestoreSavedScriptState(UUID oldID, UUID newID)
         {
             IScriptModule[] engines = m_part.ParentGroup.Scene.RequestModuleInterfaces<IScriptModule>();
-            if (engines == null) // No engine at all
+            if (engines.Length == 0) // No engine at all
                 return;
 
             if (m_part.ParentGroup.m_savedScriptState.ContainsKey(oldID))
@@ -437,6 +435,7 @@ namespace OpenSim.Region.Framework.Scenes
 
                     m_part.ParentGroup.m_savedScriptState[oldID] = newDoc.OuterXml;
                 }
+                
                 foreach (IScriptModule e in engines)
                 {
                     if (e != null)
@@ -445,6 +444,7 @@ namespace OpenSim.Region.Framework.Scenes
                             break;
                     }
                 }
+
                 m_part.ParentGroup.m_savedScriptState.Remove(oldID);
             }
         }
@@ -1327,7 +1327,7 @@ namespace OpenSim.Region.Framework.Scenes
             
             IScriptModule[] engines = m_part.ParentGroup.Scene.RequestModuleInterfaces<IScriptModule>();
             
-            if (engines == null) // No engine at all
+            if (engines.Length == 0) // No engine at all
                 return ret;
 
             Items.LockItemsForRead(true);
@@ -1365,7 +1365,7 @@ namespace OpenSim.Region.Framework.Scenes
         public void ResumeScripts()
         {
             IScriptModule[] engines = m_part.ParentGroup.Scene.RequestModuleInterfaces<IScriptModule>();
-            if (engines == null)
+            if (engines.Length == 0)
                 return;
 
 
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index d89c1c0..0eaac64 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -3535,23 +3535,23 @@ namespace OpenSim.Region.Framework.Scenes
         /// <param name="args">The arguments for the event</param>
         public void SendScriptEventToAttachments(string eventName, Object[] args)
         {
-            if (m_scriptEngines != null)
+            if (m_scriptEngines.Length == 0)
+                return;
+
+            lock (m_attachments)
             {
-                lock (m_attachments)
+                foreach (SceneObjectGroup grp in m_attachments)
                 {
-                    foreach (SceneObjectGroup grp in m_attachments)
+                    // 16384 is CHANGED_ANIMATION
+                    //
+                    // Send this to all attachment root prims
+                    //
+                    foreach (IScriptModule m in m_scriptEngines)
                     {
-                        // 16384 is CHANGED_ANIMATION
-                        //
-                        // Send this to all attachment root prims
-                        //
-                        foreach (IScriptModule m in m_scriptEngines)
-                        {
-                            if (m == null) // No script engine loaded
-                                continue;
+                        if (m == null) // No script engine loaded
+                            continue;
 
-                            m.PostObjectEvent(grp.RootPart.UUID, "changed", new Object[] { (int)Changed.ANIMATION });
-                        }
+                        m.PostObjectEvent(grp.RootPart.UUID, "changed", new Object[] { (int)Changed.ANIMATION });
                     }
                 }
             }