Merge branch 'master' into BulletSim2017

.nant/local.include

@@ -145,7 +145,12 @@
   </exec>
   <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.services.inventoryservice.tests)==0}" /> 
 
-  <delete dir="%temp%"/>
+  <exec program="${nunitcmd}" failonerror="true" resultproperty="testresult.opensim.tests.permissions">
+    <arg value="./bin/OpenSim.Tests.Permissions.dll" />
+  </exec>
+  <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.tests.permissions)==0}" /> 
+  
+<delete dir="%temp%"/>
 </target>
 
 <target name="test-stress" depends="build, find-nunit">
@@ -260,6 +265,11 @@
     <arg value="-xml=test-results/OpenSim.Services.InventoryService.Tests.dll-Results.xml" />
   </exec>
 
+ <exec program="${nunitcmd}" failonerror="false" resultproperty="testresult.opensim.tests.permissions">
+    <arg value="./bin/OpenSim.Tests.Permissions.dll" />
+    <arg value="-xml=test-results/OpenSim.Tests.Permissions.dll-Results.xml" />
+  </exec>
+  
  <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.tests)==0}" /> 
  <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.framework.tests)==0}" /> 
  <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.framework.servers.tests)==0}" /> 
@@ -271,6 +281,7 @@
  <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.data.tests)==0}" /> 
  <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.capabilities.handlers.tests)==0}" /> 
  <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.services.inventoryservice.tests)==0}" /> 
+ <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.tests.permissions)==0}" /> 
 </target>
 
 <target name="doxygen">

OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs

@@ -657,6 +657,9 @@ namespace OpenSim.Region.Framework.Scenes
                 }
             }
 
+//            if(!m_scene.IsRunning)
+//                return sog;
+
             if (root.KeyframeMotion != null)
                 root.KeyframeMotion.StartCrossingCheck();
 
@@ -3018,12 +3021,13 @@ namespace OpenSim.Region.Framework.Scenes
 
             // If we somehow got here to updating the SOG and its root part is not scheduled for update,
             // check to see if the physical position or rotation warrant an update.
+/*
             if (m_rootPart.UpdateFlag == UpdateRequired.NONE)
             {
                 // rootpart SendScheduledUpdates will check if a update is needed
                 m_rootPart.UpdateFlag = UpdateRequired.TERSE;
             }
-
+*/
             if (IsAttachment)
             {
                 ScenePresence sp = m_scene.GetScenePresence(AttachedAvatar);

OpenSim/Region/Framework/Scenes/SceneObjectPart.cs

@@ -238,12 +238,6 @@ namespace OpenSim.Region.Framework.Scenes
         /// </remarks>
         public bool SoundQueueing { get; set; }
 
-        public uint TimeStampFull;
-
-        public uint TimeStampLastActivity; // Will be used for AutoReturn
-
-        public uint TimeStampTerse;
-
         [XmlIgnore]
         public Quaternion AttachRotation = Quaternion.Identity;
 
@@ -1219,6 +1213,7 @@ namespace OpenSim.Region.Framework.Scenes
         }
 
         public UpdateRequired UpdateFlag { get; set; }
+        private object UpdateFlagLock = new object();
 
         /// <summary>
         /// Used for media on a prim.
@@ -1641,8 +1636,10 @@ namespace OpenSim.Region.Framework.Scenes
                             PhysActor.SetMaterial((int)value);
                         }
                         if(ParentGroup != null)
+                        {
                             ParentGroup.HasGroupChanged = true;
-                        ScheduleFullUpdateIfNone();
+                            ScheduleFullUpdate();
+                        }
                     }
                 }
             }
@@ -1730,7 +1727,12 @@ namespace OpenSim.Region.Framework.Scenes
 
         public byte PhysicsShapeType
         {
-            get { return m_physicsShapeType; }
+            get
+            {
+//                if (PhysActor != null)
+//                    m_physicsShapeType  = PhysActor.PhysicsShapeType;
+                return m_physicsShapeType;
+            }
             set
             {
                 byte oldv = m_physicsShapeType;
@@ -1781,10 +1783,12 @@ namespace OpenSim.Region.Framework.Scenes
                 {
                     m_density = value;
 
-                    ScheduleFullUpdateIfNone();
 
                     if (ParentGroup != null)
+                    {
                         ParentGroup.HasGroupChanged = true;
+                        ScheduleFullUpdate();
+                    }
 
                     PhysicsActor pa = PhysActor;
                     if (pa != null)
@@ -1802,10 +1806,11 @@ namespace OpenSim.Region.Framework.Scenes
                 {
                     m_gravitymod = value;
 
-                    ScheduleFullUpdateIfNone();
-
                     if (ParentGroup != null)
+                    {
                         ParentGroup.HasGroupChanged = true;
+                        ScheduleFullUpdate();
+                    }
 
                     PhysicsActor pa = PhysActor;
                     if (pa != null)
@@ -1823,10 +1828,11 @@ namespace OpenSim.Region.Framework.Scenes
                 {
                     m_friction = value;
 
-                    ScheduleFullUpdateIfNone();
-
                     if (ParentGroup != null)
+                    {
                         ParentGroup.HasGroupChanged = true;
+                        ScheduleFullUpdate();
+                    }
 
                     PhysicsActor pa = PhysActor;
                     if (pa != null)
@@ -1844,10 +1850,11 @@ namespace OpenSim.Region.Framework.Scenes
                 {
                     m_bounce = value;
 
-                    ScheduleFullUpdateIfNone();
-
                     if (ParentGroup != null)
+                    {
                         ParentGroup.HasGroupChanged = true;
+                        ScheduleFullUpdate();
+                    }
 
                     PhysicsActor pa = PhysActor;
                     if (pa != null)
@@ -1876,6 +1883,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// </summary>
         public void ClearUpdateSchedule()
         {
+            lock(UpdateFlagLock)
                 UpdateFlag = UpdateRequired.NONE;
         }
 
@@ -3239,17 +3247,6 @@ namespace OpenSim.Region.Framework.Scenes
             APIDActive = false;
         }
 
-        public void ScheduleFullUpdateIfNone()
-        {
-            if (ParentGroup == null)
-                return;
-
-// ???            ParentGroup.HasGroupChanged = true;
-
-            if (UpdateFlag != UpdateRequired.FULL)
-                ScheduleFullUpdate();
-        }
-
         /// <summary>
         /// Schedules this prim for a full update
         /// </summary>
@@ -3260,22 +3257,11 @@ namespace OpenSim.Region.Framework.Scenes
             if (ParentGroup == null)
                 return;
 
-            ParentGroup.QueueForUpdateCheck();
+            lock(UpdateFlagLock)
-
-            int timeNow = Util.UnixTimeSinceEpoch();
-
-            // If multiple updates are scheduled on the same second, we still need to perform all of them
-            // So we'll force the issue by bumping up the timestamp so that later processing sees these need
-            // to be performed.
-            if (timeNow <= TimeStampFull)
             {
-                TimeStampFull += 1;
+                ParentGroup.QueueForUpdateCheck(); // just in case
-            }
+                if(UpdateFlag != UpdateRequired.FULL)
-            else
                 {
-                TimeStampFull = (uint)timeNow;
-            }
-
                     UpdateFlag = UpdateRequired.FULL;
 
                     //            m_log.DebugFormat(
@@ -3285,6 +3271,8 @@ namespace OpenSim.Region.Framework.Scenes
                     if (ParentGroup.Scene != null)
                         ParentGroup.Scene.EventManager.TriggerSceneObjectPartUpdated(this, true);
                 }
+            }
+        }
 
         /// <summary>
         /// Schedule a terse update for this prim.  Terse updates only send position,
@@ -3304,12 +3292,13 @@ namespace OpenSim.Region.Framework.Scenes
                 return;
             }
 
+            lock(UpdateFlagLock)
+            {
                 if (UpdateFlag == UpdateRequired.NONE)
                 {
                     ParentGroup.HasGroupChanged = true;
                     ParentGroup.QueueForUpdateCheck();
 
-                TimeStampTerse = (uint) Util.UnixTimeSinceEpoch();
                     UpdateFlag = UpdateRequired.TERSE;
 
                 //                m_log.DebugFormat(
@@ -3320,6 +3309,7 @@ namespace OpenSim.Region.Framework.Scenes
                 if (ParentGroup.Scene != null)
                     ParentGroup.Scene.EventManager.TriggerSceneObjectPartUpdated(this, false);
             }
+        }
 
         public void ScriptSetPhysicsStatus(bool UsePhysics)
         {
@@ -3362,12 +3352,15 @@ namespace OpenSim.Region.Framework.Scenes
                 return;
 
             // Update the "last" values
+            lock(UpdateFlagLock)
+            {
                 m_lastPosition = AbsolutePosition;
                 m_lastRotation = RotationOffset;
                 m_lastVelocity = Velocity;
                 m_lastAcceleration = Acceleration;
                 m_lastAngularVelocity = AngularVelocity;
                 m_lastUpdateSentTime = Util.GetTimeStampMS();
+            }
 
             ParentGroup.Scene.ForEachScenePresence(delegate(ScenePresence avatar)
             {
@@ -3381,12 +3374,15 @@ namespace OpenSim.Region.Framework.Scenes
                 return;
 
             // Update the "last" values
+            lock(UpdateFlagLock)
+            {
                 m_lastPosition = AbsolutePosition;
                 m_lastRotation = RotationOffset;
                 m_lastVelocity = Velocity;
                 m_lastAcceleration = Acceleration;
                 m_lastAngularVelocity = AngularVelocity;
                 m_lastUpdateSentTime = Util.GetTimeStampMS();
+            }
 
             if (ParentGroup.IsAttachment)
             {
@@ -3443,16 +3439,22 @@ namespace OpenSim.Region.Framework.Scenes
         /// </summary>
         public void SendScheduledUpdates()
         {  
-            switch (UpdateFlag)
+            UpdateRequired currentUpdate;
+            lock(UpdateFlagLock)
+            {
+                currentUpdate = UpdateFlag;
+                ClearUpdateSchedule();
+            }
+
+            switch (currentUpdate)
             {
                 case UpdateRequired.NONE:
-                    ClearUpdateSchedule();
                     break;
 
                 case UpdateRequired.TERSE:
-
-                    ClearUpdateSchedule();
                     bool needupdate = true;
+                    lock(UpdateFlagLock)
+                    {
                         double now = Util.GetTimeStampMS();
                         Vector3 curvel = Velocity;
                         Vector3 curacc = Acceleration;
@@ -3543,7 +3545,11 @@ namespace OpenSim.Region.Framework.Scenes
                             m_lastAcceleration = curacc;
                             m_lastAngularVelocity = angvel;
                             m_lastUpdateSentTime = now;
+                        }
+                    }
 
+                    if(needupdate)
+                    {
                         ParentGroup.Scene.ForEachClient(delegate(IClientAPI client)
                         {
                             SendTerseUpdateToClient(client);
@@ -3552,7 +3558,6 @@ namespace OpenSim.Region.Framework.Scenes
                     break;
 
                 case UpdateRequired.FULL:
-                    ClearUpdateSchedule();
                     SendFullUpdateToAllClientsInternal();
                     break;
             }
@@ -3567,7 +3572,10 @@ namespace OpenSim.Region.Framework.Scenes
             if (ParentGroup == null || ParentGroup.Scene == null)
                 return;
 
-            ClearUpdateSchedule();
+            lock(UpdateFlagLock)
+            {
+                if(UpdateFlag != UpdateRequired.NONE)
+                    return;
 
                 // Update the "last" values
                 m_lastPosition = AbsolutePosition;
@@ -3576,6 +3584,7 @@ namespace OpenSim.Region.Framework.Scenes
                 m_lastAcceleration = Acceleration;
                 m_lastAngularVelocity = AngularVelocity;
                 m_lastUpdateSentTime = Util.GetTimeStampMS();
+            }
 
             ParentGroup.Scene.ForEachClient(delegate(IClientAPI client)
             {
@@ -3588,7 +3597,10 @@ namespace OpenSim.Region.Framework.Scenes
             if (ParentGroup == null || ParentGroup.Scene == null)
                 return;
 
-            ClearUpdateSchedule();
+            lock(UpdateFlagLock)
+            {
+                if(UpdateFlag != UpdateRequired.NONE)
+                    return;
 
                 // Update the "last" values
                 m_lastPosition = AbsolutePosition;
@@ -3597,6 +3609,7 @@ namespace OpenSim.Region.Framework.Scenes
                 m_lastAcceleration = Acceleration;
                 m_lastAngularVelocity = AngularVelocity;
                 m_lastUpdateSentTime = Util.GetTimeStampMS();
+            }
 
             if (ParentGroup.IsAttachment)
             {

OpenSim/Tests/Permissions/DirectTransferTests.cs

@@ -44,6 +44,13 @@ namespace OpenSim.Tests.Permissions
         [SetUp]
         public void SetUp()
         {
+            // In case we're dealing with some older version of nunit
+            if (Common.TheInstance == null)
+            {
+                Common.TheInstance = new Common();
+                Common.TheInstance.SetUp();
+            }
+
             Common.TheInstance.DeleteObjectsFolders();
         }
 

OpenSim/Tests/Permissions/IndirectTransferTests.cs

@@ -46,6 +46,12 @@ namespace OpenSim.Tests.Permissions
         [SetUp]
         public void SetUp()
         {
+            // In case we're dealing with some older version of nunit
+            if (Common.TheInstance == null)
+            {
+                Common.TheInstance = new Common();
+                Common.TheInstance.SetUp();
+            }
             Common.TheInstance.DeleteObjectsFolders();
         }
 
@@ -74,6 +80,7 @@ namespace OpenSim.Tests.Permissions
             // Try A2 takes copies of objects that cannot be copied. 
             for (int i = 0; i < 6; i++)
                 TakeOneBox(Common.TheScene.GetSceneObjectGroups(), names[i], perms[i]);
+            // Ad-hoc. Enough time to let the take work.
             Thread.Sleep(5000);
 
             List<InventoryItemBase> items = Common.TheScene.InventoryService.GetFolderItems(Common.TheAvatars[1].UUID, objsFolder.ID);
@@ -86,6 +93,7 @@ namespace OpenSim.Tests.Permissions
             // Try A2 takes copies of objects that can be copied. 
             for (int i = 0; i < 6; i++)
                 TakeOneBox(Common.TheScene.GetSceneObjectGroups(), names[i], perms[i]);
+            // Ad-hoc. Enough time to let the take work.
             Thread.Sleep(5000);
 
             items = Common.TheScene.InventoryService.GetFolderItems(Common.TheAvatars[1].UUID, objsFolder.ID);
@@ -101,6 +109,7 @@ namespace OpenSim.Tests.Permissions
 
         private void TakeOneBox(List<SceneObjectGroup> objs, string name, PermissionMask mask)
         {
+            // Find the object inworld
             SceneObjectGroup box = objs.Find(sog => sog.Name == name && sog.OwnerID == Common.TheAvatars[0].UUID);
             Assert.That(box, Is.Not.Null, name);