Merge branch 'master' into careminster

3 files changed, 22 insertions, 60 deletions

diff --git a/OpenSim/Region/Physics/OdePlugin/OdeScene.cs b/OpenSim/Region/Physics/OdePlugin/OdeScene.cs
index c1a3e61..a6c2eca 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdeScene.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdeScene.cs
@@ -205,27 +205,9 @@ namespace OpenSim.Region.Physics.OdePlugin
         private readonly HashSet<OdePrim> _activeprims = new HashSet<OdePrim>();
 
         /// <summary>
-        /// Used to lock on manipulation of _taintedPrimL and _taintedPrimH
+        /// Prims that the simulator has created/deleted/updated and so need updating in ODE.
         /// </summary>
-        private readonly Object _taintedPrimLock = new Object();
-
-        /// <summary>
-        /// List of tainted prims.
-        /// </summary>
-        /// <remarks>
-        /// A tainted prim is one that has taints to process before performing any other operations.  The list is
-        /// cleared after processing.
-        /// </remarks>
-        private readonly List<OdePrim> _taintedPrimL = new List<OdePrim>();
-
-        /// <summary>
-        /// HashSet of tainted prims.
-        /// </summary>
-        /// <remarks>
-        /// A tainted prim is one that has taints to process before performing any other operations.  The hashset is
-        /// cleared after processing.
-        /// </remarks>
-        private readonly HashSet<OdePrim> _taintedPrimH = new HashSet<OdePrim>();
+        private readonly HashSet<OdePrim> _taintedPrims = new HashSet<OdePrim>();
 
         /// <summary>
         /// Record a character that has taints to be processed.
@@ -767,7 +749,7 @@ namespace OpenSim.Region.Physics.OdePlugin
                 }
                 catch (AccessViolationException)
                 {
-                    m_log.Warn("[ODE SCENE]: Unable to collide test a space");
+                    m_log.Error("[ODE SCENE]: Unable to collide test a space");
                     return;
                 }
                 //Colliding a space or a geom with a space or a geom. so drill down
@@ -829,7 +811,7 @@ namespace OpenSim.Region.Physics.OdePlugin
             }
             catch (Exception e)
             {
-                m_log.WarnFormat("[ODE SCENE]: Unable to collide test an object: {0}", e.Message);
+                m_log.ErrorFormat("[ODE SCENE]: Unable to collide test an object: {0}", e.Message);
                 return;
             }
 
@@ -1554,7 +1536,7 @@ namespace OpenSim.Region.Physics.OdePlugin
                 }
                 catch (AccessViolationException)
                 {
-                    m_log.WarnFormat("[ODE SCENE]: Unable to space collide {0}", Name);
+                    m_log.ErrorFormat("[ODE SCENE]: Unable to space collide {0}", Name);
                 }
                 
                 //float terrainheight = GetTerrainHeightAtXY(chr.Position.X, chr.Position.Y);
@@ -1585,13 +1567,14 @@ namespace OpenSim.Region.Physics.OdePlugin
                                     removeprims = new List<OdePrim>();
                                 }
                                 removeprims.Add(chr);
-                                m_log.Debug("[ODE SCENE]: unable to collide test active prim against space.  The space was zero, the geom was zero or it was in the process of being removed.  Removed it from the active prim list.  This needs to be fixed!");
+                                m_log.Error(
+                                    "[ODE SCENE]: unable to collide test active prim against space.  The space was zero, the geom was zero or it was in the process of being removed.  Removed it from the active prim list.  This needs to be fixed!");
                             }
                         }
                     }
                     catch (AccessViolationException)
                     {
-                        m_log.Warn("[ODE SCENE]: Unable to space collide");
+                        m_log.Error("[ODE SCENE]: Unable to space collide");
                     }
                 }
             }
@@ -2621,29 +2604,17 @@ namespace OpenSim.Region.Physics.OdePlugin
             if (actor is OdePrim)
             {
                 OdePrim taintedprim = ((OdePrim)actor);
-                lock (_taintedPrimLock)
-                {
-                    if (!(_taintedPrimH.Contains(taintedprim))) 
-                    {
-#if SPAM
-Console.WriteLine("AddPhysicsActorTaint to " + taintedprim.Name);
-#endif
-                        _taintedPrimH.Add(taintedprim);                    // HashSet for searching
-                        _taintedPrimL.Add(taintedprim);                    // List for ordered readout
-                    }
-                }
+                lock (_taintedPrims)
+                    _taintedPrims.Add(taintedprim);
             }
             else if (actor is OdeCharacter)
             {
                 OdeCharacter taintedchar = ((OdeCharacter)actor);
                 lock (_taintedActors)
                 {
-                    if (!(_taintedActors.Contains(taintedchar)))
-                    {
-                        _taintedActors.Add(taintedchar);
-                        if (taintedchar.bad)
-                            m_log.DebugFormat("[ODE SCENE]: Added BAD actor {0} to tainted actors", taintedchar.m_uuid);
-                    }
+                    _taintedActors.Add(taintedchar);
+                    if (taintedchar.bad)
+                        m_log.ErrorFormat("[ODE SCENE]: Added BAD actor {0} to tainted actors", taintedchar.m_uuid);
                 }
             }
         }
@@ -2740,19 +2711,15 @@ Console.WriteLine("AddPhysicsActorTaint to " + taintedprim.Name);
                     {
                         lock (_taintedActors)
                         {
-                            if (_taintedActors.Count > 0)
-                            {
-                                foreach (OdeCharacter character in _taintedActors)
-                                    character.ProcessTaints();
+                            foreach (OdeCharacter character in _taintedActors)
+                                character.ProcessTaints();
 
-                                if (_taintedActors.Count > 0)
-                                    _taintedActors.Clear();
-                            }
+                            _taintedActors.Clear();
                         }
 
-                        lock (_taintedPrimLock)
+                        lock (_taintedPrims)
                         {
-                            foreach (OdePrim prim in _taintedPrimL)
+                            foreach (OdePrim prim in _taintedPrims)
                             {
                                 if (prim.m_taintremove)
                                 {
@@ -2777,12 +2744,7 @@ Console.WriteLine("AddPhysicsActorTaint to " + taintedprim.Name);
                             if (SupportsNINJAJoints)
                                 SimulatePendingNINJAJoints();
 
-                            if (_taintedPrimL.Count > 0)
-                            {
-//Console.WriteLine("Simulate calls Clear of _taintedPrim list");
-                                _taintedPrimH.Clear();
-                                _taintedPrimL.Clear();
-                            }
+                            _taintedPrims.Clear();
                         }
 
                         // Move characters
@@ -2854,7 +2816,7 @@ Console.WriteLine("AddPhysicsActorTaint to " + taintedprim.Name);
                 foreach (OdeCharacter actor in _characters)
                 {
                     if (actor.bad)
-                        m_log.WarnFormat("[ODE SCENE]: BAD Actor {0} in _characters list was not removed?", actor.m_uuid);
+                        m_log.ErrorFormat("[ODE SCENE]: BAD Actor {0} in _characters list was not removed?", actor.m_uuid);
 
                     actor.UpdatePositionAndVelocity(defects);
                 }
diff --git a/OpenSim/Tools/pCampBot/Behaviours/GrabbingBehaviour.cs b/OpenSim/Tools/pCampBot/Behaviours/GrabbingBehaviour.cs
index 6ad02b2..701881e 100644
--- a/OpenSim/Tools/pCampBot/Behaviours/GrabbingBehaviour.cs
+++ b/OpenSim/Tools/pCampBot/Behaviours/GrabbingBehaviour.cs
@@ -47,7 +47,7 @@ namespace pCampBot
         {
             Dictionary<UUID, Primitive> objects = Bot.Objects;
 
-            Primitive prim = objects.ElementAt(Bot.Random.Next(0, objects.Count)).Value;
+            Primitive prim = objects.ElementAt(Bot.Random.Next(0, objects.Count - 1)).Value;
 
             // This appears to be a typical message sent when a viewer user clicks a clickable object
             Bot.Client.Self.Grab(prim.LocalID);
diff --git a/OpenSim/Tools/pCampBot/pCampBot.cs b/OpenSim/Tools/pCampBot/pCampBot.cs
index 3f43cff..6249fae 100644
--- a/OpenSim/Tools/pCampBot/pCampBot.cs
+++ b/OpenSim/Tools/pCampBot/pCampBot.cs
@@ -111,7 +111,7 @@ namespace pCampBot
                 "  -firstname         first name for the bots\n" +
                 "  -lastname          lastname for the bots.  Each lastname will have _<bot-number> appended, e.g. Ima Bot_0\n" +
                 "  -password          password for the bots\n" +
-                "  -b, behaviours     behaviours for bots.  Comma separated, e.g. p,g.  Default is p\n",
+                "  -b, behaviours     behaviours for bots.  Comma separated, e.g. p,g.  Default is p\n" +
                 "    current options are:" +
                 "       p (physics)" +
                 "       g (grab)" +